Changeset 331 for EcnlProtoTool/trunk/ntshell/fatfs

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

Location:

EcnlProtoTool/trunk/ntshell/fatfs

Files:

• ff.c (modified) (2 diffs)
• ff.h (modified) (1 diff)
• ffarch.c (modified) (4 diffs)
• fftime.c (moved) (moved from EcnlProtoTool/trunk/ntshell/fatfs/time.c ) (5 diffs)
• sdfs.h (modified) (1 diff)

EcnlProtoTool/trunk/ntshell/fatfs/ff.c

@@ -19 +19 @@
 #include "ff.h"                 /* Declarations of FatFs API */
 #include "diskio.h"             /* Declarations of disk I/O functions */
-
+#include "util/ntstdio.h"
+#include "shellif.h"
 
 /*--------------------------------------------------------------------------
@@ -3909 +3910 @@
                                         if (dir[DIR_Attr] & AM_DIR) {   /* The new object is a directory */
                                                 temp_new_path = (TCHAR *)ff_memalloc((_MAX_LFN + 1) * sizeof(WCHAR));
-                                                snprintf(temp_new_path, _MAX_LFN, "%s/%s", path_new, basename((char *)path_old));
+                                                ntstdio_snprintf(temp_new_path, _MAX_LFN, "%s/%s", path_new, basename((char *)path_old));
                                                 res = follow_path(&djn, temp_new_path);
                                         }

EcnlProtoTool/trunk/ntshell/fatfs/ff.h

@@ -162 +162 @@
         const TCHAR*    pat;    /* Pointer to the name matching pattern */
 #endif
-        struct dirent *dirent;
 } DIR;
 

EcnlProtoTool/trunk/ntshell/fatfs/ffarch.c

@@ -39 +39 @@
  */
 
+#include "shellif.h"
 #include <kernel.h>
 #include <stdlib.h>
@@ -50 +51 @@
 #include "ff.h"
 #include "tlsf.h"
-#include "ntstdio.h"
+#include "util/ntstdio.h"
 
 #define SIO_PORTID 1
@@ -58 +59 @@
 static pool_t sys_pool;
 
-uint32_t  __HeapBase;
-uint32_t  __HeapLimit;
+uint8_t shell_heap[64 * 1024];
 FATFS RomDisk;
 
@@ -118 +118 @@
 void sys_init(void)
 {
-        sys_tlsf = tlsf_create(&__HeapBase);
+        sys_tlsf = tlsf_create(&shell_heap);
         if (sys_tlsf == NULL)
                 return;
 
-        sys_pool = tlsf_add_pool(sys_tlsf, ((uint8_t *)&__HeapBase) + tlsf_size(), ((size_t)&__HeapLimit - (size_t)&__HeapBase) - tlsf_size());
+        sys_pool = tlsf_add_pool(sys_tlsf, ((uint8_t *)&shell_heap) + tlsf_size(), sizeof(shell_heap) - tlsf_size());
 }
 

EcnlProtoTool/trunk/ntshell/fatfs/fftime.c

@@ -30 +30 @@
 #include "ff.h"
 
+int shell_errno;
+
 /* 2000-03-01 (mod 400 year, immediately after feb29 */
 #define LEAPOCH (946684800LL + 86400*(31+29))
@@ -200 +202 @@
         * __secs_to_zone cannot safely handle them. */
         if (*t < INT_MIN * 31622400LL || *t > INT_MAX * 31622400LL) {
-                errno = EOVERFLOW;
+                shell_errno = EOVERFLOW;
                 return 0;
         }
         //TODO:__secs_to_zone(*t, 0, &tm->tm_isdst, &tm->__tm_gmtoff, 0, &tm->__tm_zone);
         if (__secs_to_tm((long long)*t /*+ tm->__tm_gmtoff*/, tm) < 0) {
-                errno = EOVERFLOW;
+                shell_errno = EOVERFLOW;
                 return 0;
         }
@@ -220 +222 @@
 {
         if (__secs_to_tm(*t, tm) < 0) {
-                errno = EOVERFLOW;
+                shell_errno = EOVERFLOW;
                 return 0;
         }
@@ -249 +251 @@
 
 error:
-        errno = EOVERFLOW;
+        shell_errno = EOVERFLOW;
         return -1;
 }
@@ -258 +260 @@
         struct tm _tm;
 
-        time(&temp);
+        temp = rtc_read();
         gmtime_r(&temp, &_tm);
 

EcnlProtoTool/trunk/ntshell/fatfs/sdfs.h

@@ -24 +24 @@
 
 #include <stdint.h>
-#include <time.h>
+//#include <time.h>
+#define __NEED_time_t
+#include "../musl-1.1.18/include/bits/alltypes.h"
 #include "gpio_api.h"
 #include "spi_api.h"