Changeset 434 for EcnlProtoTool/trunk/ntshell/ntshell/usrcmd.c

Timestamp:

Jul 5, 2020, 10:12:16 PM (4 years ago)

Author:

coas-nagasima

Message:

FATFSのマクロ名を変更

File:

• EcnlProtoTool/trunk/ntshell/ntshell/usrcmd.c (modified) (7 diffs)

EcnlProtoTool/trunk/ntshell/ntshell/usrcmd.c

@@ -249 +249 @@
         char *fn;
 
-#if _USE_LFN
+#if FF_USE_LFN
         fn = *fno->lfname ? fno->lfname : fno->fname;
 #else
@@ -289 +289 @@
 }
 
-#define LFN_BUF_SIZE (_MAX_LFN + 1)
+#define LFN_BUF_SIZE (FF_MAX_LFN + 1)
 /* lsコマンド dir内 表示 */
 void print_ls(char *path_p, char *pattern_p, BYTE list_option)
@@ -295 +295 @@
         FRESULT res;
         FILINFO fno;
-        DIR dir;
+        FATFS_DIR dir;
         char *fn;   /* This function assumes non-Unicode configuration */
 
@@ -308 +308 @@
         }
 
-#if _USE_LFN
+#if FF_USE_LFN
         char *lfn = NULL;
         lfn = ff_memalloc(LFN_BUF_SIZE);
@@ -330 +330 @@
 
         while ((res == FR_OK) && (fno.fname[0] != 0)) {
-                if (pattern_p != NULL && (fno.fattrib & AM_DIR) && ((fno.fname[0] == '.') ? (pattern_p[0] == '.') : 1)) {/* DIR とパターンマッチしている場合は DIR 内部を ls する */
-#if _USE_LFN
+                if (pattern_p != NULL && (fno.fattrib & AM_DIR) && ((fno.fname[0] == '.') ? (pattern_p[0] == '.') : 1)) {/* FATFS_DIR とパターンマッチしている場合は FATFS_DIR 内部を ls する */
+#if FF_USE_LFN
                         fn = *fno.lfname ? fno.lfname : fno.fname;
 #else
@@ -381 +381 @@
 {
         char *pattern_p = NULL, *basename_p = NULL, *dirname_p = NULL;
-        char default_pattern[_MAX_LFN] = "";
+        char default_pattern[FF_MAX_LFN] = "";
         int c;
         BYTE list_option = 0;
@@ -443 +443 @@
                 return 0;
 
-#if _USE_LFN
+#if FF_USE_LFN
         /* LFN buffer alloc */
         lfn = ff_memalloc(LFN_BUF_SIZE);