Changeset 364 for asp3_tinet_ecnl_rx/trunk/ntshell/fatfs/ffarch.c

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_rx/trunk/ntshell/fatfs/ffarch.c (modified) (9 diffs)

asp3_tinet_ecnl_rx/trunk/ntshell/fatfs/ffarch.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 #include "t_stdlib.h"
 #include "syssvc/serial.h"
 #include "syssvc/syslog.h"
 #include "target_syssvc.h"
+#include "target_stddef.h"
 #include "kernel_cfg.h"
 #include "diskio.h"
 #include "mmc_rspi.h"
 #include "ff.h"
+#include "ffarch.h"
 #include "util/ntstdio.h"
 #include "mbed_api.h"
@@ -59 +62 @@
         FFS_IDLE,
         FFS_RETRY_WAIT,
+        FFS_DISABLE,
 };
 
@@ -118 +122 @@
 FATFS RomDisk;
 
-//gpio_t ins;
-//sdfs_t sdfs;
 #define WP() false
 
@@ -132 +134 @@
 bool_t SD_begin();
 
-#define P7_8 1
-#define P8_5 2
-#define P8_6 3
-#define P8_3 4
-#define P8_4 5
-
-int ffarch_init()
-{
-        int result = -1;
-
-        /* SD_CD */
-        //gpio_init_in(&ins, P7_8);
-
-        /* SDカードを初期化 */
-        //sdfs_init(&sdfs, P8_5, P8_6, P8_3, P8_4, "sd");
-
+void ffarch_init(void)
+{
+#ifdef TOPPERS_GRCITRUS
+        ffarch_state = FFS_DISABLE;
+        ffarch_timer = TMO_FEVR;
+        mmc_rspi_prev_status = STA_NODISK;
+#else
         ffarch_state = FFS_IDLE;
         ffarch_timer = 0;
@@ -156 +149 @@
 
         act_tsk(FFARCH_TASK);
-
+#endif
         if (romdisk_init()) {
                 ntstdio_printf(&ntstdio, "ROM disk (0:) OK!\n");
@@ -163 +156 @@
                 ntstdio_printf(&ntstdio, "ROM disk (0:) NG!\n");
         }
-
-        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
 }
 
 void ffarch_initialize()
 {
+#ifdef TOPPERS_GRCITRUS
+        ffarch_state = FFS_DISABLE;
+        ffarch_timer = TMO_FEVR;
+        mmc_rspi_prev_status = STA_NODISK;
+#else
         sta_cyc(MMC_RSPI_CYC);
+#endif
 }
 
@@ -284 +281 @@
 }
 
-int ffarch_get_timer()
+int ffarch_get_timer(void)
 {
         return ffarch_timer;
@@ -299 +296 @@
 }
 
-void ffarch_timeout()
+void ffarch_timeout(void)
 {
         if (ffarch_timer != 0)
@@ -317 +314 @@
                 //goto case FFS_IDLE;
         case FFS_IDLE:
-                /* SDカードが入れられた場合 */
-                if (((mmc_rspi_prev_status & STA_NODISK) != 0) && ((mmc_rspi_status() & STA_NODISK) == 0)) {
+                /* SDカードが入れられた場合 */
+                if (((mmc_rspi_prev_status & STA_NODISK) != 0) && ((mmc_rspi_status() & STA_NODISK) == 0)) {
                         ntstdio_printf(&ntstdio, "SD card initializing ...\n");