Changeset 374 for asp3_tinet_ecnl_arm/trunk/ntshell/fatfs/ffarch.c

Timestamp:

Apr 5, 2019, 9:26:53 PM (5 years ago)

Author:

coas-nagasima

Message:

mbed関連を更新
シリアルドライバをmbedのHALを使うよう変更
ファイルディスクリプタの処理を更新

File:

• asp3_tinet_ecnl_arm/trunk/ntshell/fatfs/ffarch.c (modified) (13 diffs)

asp3_tinet_ecnl_arm/trunk/ntshell/fatfs/ffarch.c

@@ -51 +51 @@
 #include "sdfs.h"
 #include "ff.h"
-#include "util/ntstdio.h"
-
-extern ntstdio_t ntstdio;
+#include <stdio.h>
+#include "hal/rtc_api.h"
+#include "ffarch.h"
 
 enum ffarch_state_t {
@@ -80 +80 @@
         ret2 = get_tim(&now);
         if (ret2 != E_OK){
-                ntstdio_printf(&ntstdio, "[ffarch] get_tim error: %s",
+                printf("[ffarch] get_tim error: %s",
                         itron_strerror(ret2));
                 return;
@@ -94 +94 @@
                 ret = tslp_tsk(timer);
                 if ((ret != E_OK) && (ret != E_TMOUT)) {
-                        ntstdio_printf(&ntstdio, "[ffarch] tslp_tsk error: %s %d",
+                        printf("[ffarch] tslp_tsk error: %s %d",
                                 itron_strerror(ret), timer);
                         break;
@@ -101 +101 @@
                 ret2 = get_tim(&now);
                 if (ret2 != E_OK) {
-                        ntstdio_printf(&ntstdio, "[ffarch] get_tim error: %s",
+                        printf("[ffarch] get_tim error: %s",
                                 itron_strerror(ret2));
                         break;
@@ -150 +150 @@
 
         if (romdisk_init()) {
-                ntstdio_printf(&ntstdio, "ROM disk (0:) OK!\n");
+                printf("ROM disk (0:) OK!\n");
         }
         else {
-                ntstdio_printf(&ntstdio, "ROM disk (0:) NG!\n");
-        }
-
-        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+                printf("ROM disk (0:) NG!\n");
+        }
 }
 
@@ -272 +270 @@
 {
         DRESULT res;
-        uint32_t *dp = (uint32_t *)buff, st, ed;
+        uint32_t *dp = (uint32_t *)buff;
         uint8_t *ptr = (uint8_t *)buff;
 
@@ -333 +331 @@
 {
         BYTE s = 0;
-
+             
         /* Write protected */
         if (WP())
@@ -377 +375 @@
         case FFS_RETRY_WAIT:
                 if (ffarch_retry_count == 0) {
-                        ntstdio_printf(&ntstdio, "SD card (1:) initialize tired...\n");
+                        printf("SD card (1:) initialize tired...\n");
 
                         ffarch_state = FFS_IDLE;
@@ -390 +388 @@
                 if ((sdfs._is_initialized & STA_NOINIT)
                         || (((sdfs_prev_status & STA_NODISK) != 0) && ((sdfs_new_status & STA_NODISK) == 0))) {
-                        ntstdio_printf(&ntstdio, "SD card initializing ...\n");
+                        printf("SD card initializing ...\n");
 
                         if (SD_begin()) {
-                                ntstdio_printf(&ntstdio, "SD card (1:) OK!\n");
+                                printf("SD card (1:) OK!\n");
 
                                 /* uploadディレクトリを作成しておく */
@@ -403 +401 @@
                         }
                         else {
-                                ntstdio_printf(&ntstdio, "SD card (1:) NG!\n");
+                                printf("SD card (1:) NG!\n");
                                 ffarch_state = FFS_RETRY_WAIT;
                                 ffarch_timer = 1000 * 1000;
@@ -410 +408 @@
                 /* SDカードが抜かれた場合 */
                 else if (((sdfs_prev_status & STA_NODISK) == 0) && ((sdfs_new_status & STA_NODISK) != 0)) {
-                        ntstdio_printf(&ntstdio, "SD card unmount\n");
+                        printf("SD card unmount\n");
 
                         f_mount(&Sd.FatFs, "1:", 0);
@@ -428 +426 @@
 }
 
-int ff_cre_syncobj(BYTE vol, _SYNC_t* sobj)
+int ff_cre_syncobj(BYTE vol, FF_SYNC_t* sobj)
 {
         return 1;
 }
 
-int ff_req_grant(_SYNC_t sobj)
+int ff_req_grant(FF_SYNC_t sobj)
 {
         ER ret;
@@ -440 +438 @@
 }
 
-void ff_rel_grant(_SYNC_t sobj)
+void ff_rel_grant(FF_SYNC_t sobj)
 {
         sig_sem(SEM_FILESYSTEM);
 }
 
-int ff_del_syncobj(_SYNC_t sobj)
+int ff_del_syncobj(FF_SYNC_t sobj)
 {
         return 1;