Changeset 279 for EcnlProtoTool/trunk/ntshell/webserver/httpd-fs.c

Timestamp:

Apr 29, 2017, 4:33:37 PM (7 years ago)

Author:

coas-nagasima

Message:

ファイルを追加、更新。

File:

• EcnlProtoTool/trunk/ntshell/webserver/httpd-fs.c (modified) (8 diffs)

EcnlProtoTool/trunk/ntshell/webserver/httpd-fs.c

@@ -60 +60 @@
 #include "kernel_cfg.h"
 #include "syssvc/syslog.h"
-#include "arduino.h"
+#include "ntstdio.h"
 
 #ifndef _MSC_VER
@@ -96 +96 @@
                         fn = fno.fname;
                         if (fno.fattrib & AM_DIR) {
-                                sprintf(&path[i], "0:/%s", fn);
+                                ntstdio_sprintf(&path[i], "0:/%s", fn);
                                 res = scan_files(path, size);
                                 if (res != FR_OK) break;
@@ -112 +112 @@
 /*-----------------------------------------------------------------------------------*/
 int
-httpd_fs_open_ul(char *name, int len, struct httpd_fs_file *file)
+httpd_fs_open(char *name, int len, struct httpd_fs_file *file)
 {
         FRESULT res;
@@ -157 +157 @@
 }
 
-int
-httpd_fs_open(char *name, int len, struct httpd_fs_file *file)
-{
-        int result;
-
-        wai_sem(SEM_FILESYSTEM);
-
-        result = httpd_fs_open_ul(name, len, file);
-
-        sig_sem(SEM_FILESYSTEM);
-
-        return result;
-}
-/*-----------------------------------------------------------------------------------*/
-int
-httpd_fs_create_ul(char *name, struct httpd_fs_file *file)
+/*-----------------------------------------------------------------------------------*/
+int
+httpd_fs_create(char *name, struct httpd_fs_file *file)
 {
         FRESULT res;
@@ -196 +183 @@
 }
 
-int
-httpd_fs_create(char *name, struct httpd_fs_file *file)
-{
-        int result;
-
-        wai_sem(SEM_FILESYSTEM);
-
-        result = httpd_fs_create_ul(name, file);
-
-        sig_sem(SEM_FILESYSTEM);
-
-        return result;
-}
-/*-----------------------------------------------------------------------------------*/
-int
-httpd_fs_read_ul(struct httpd_fs_file *file, void *dst, int len)
+/*-----------------------------------------------------------------------------------*/
+int
+httpd_fs_read(struct httpd_fs_file *file, void *dst, int len)
 {
         FRESULT ret;
@@ -236 +210 @@
 }
 
-int
-httpd_fs_read(struct httpd_fs_file *file, void *dst, int len)
-{
-        int result;
-
-        wai_sem(SEM_FILESYSTEM);
-
-        result = httpd_fs_read_ul(file, dst, len);
-
-        sig_sem(SEM_FILESYSTEM);
-
-        return result;
-}
-/*-----------------------------------------------------------------------------------*/
-int
-httpd_fs_write_ul(struct httpd_fs_file *file, const void *src, int len)
+/*-----------------------------------------------------------------------------------*/
+int
+httpd_fs_write(struct httpd_fs_file *file, const void *src, int len)
 {
         FRESULT ret;
@@ -279 +240 @@
 }
 
-int
-httpd_fs_write(struct httpd_fs_file *file, const void *src, int len)
-{
-        int result;
-
-        wai_sem(SEM_FILESYSTEM);
-
-        result = httpd_fs_write_ul(file, src, len);
-
-        sig_sem(SEM_FILESYSTEM);
-
-        return result;
-}
-/*-----------------------------------------------------------------------------------*/
-int httpd_fs_close_ul(struct httpd_fs_file *file)
+/*-----------------------------------------------------------------------------------*/
+int httpd_fs_close(struct httpd_fs_file *file)
 {
         FRESULT ret;
@@ -307 +255 @@
         return 1;
 }
-
-int httpd_fs_close(struct httpd_fs_file *file)
-{
-        int result;
-
-        wai_sem(SEM_FILESYSTEM);
-
-        result = httpd_fs_close_ul(file);
-
-        sig_sem(SEM_FILESYSTEM);
-
-        return result;
-}