Changeset 374 for asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot

Timestamp:

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

Author:

coas-nagasima

Message:

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

Location:

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot

Files:

• Debug/Makefile (modified) (2 diffs)
• DebugEther/Makefile (modified) (2 diffs)
• src/main.c (modified) (2 diffs)
• src/main.cfg (modified) (1 diff)

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/Debug/Makefile

@@ -163 +163 @@
 #  共通コンパイルオプションの定義
 #
-COPTS := -g -std=gnu99 $(COPTS)
+COPTS := -g -std=gnu99 -ffunction-sections -fdata-sections $(COPTS)
 ifndef OMIT_WARNING_ALL
         COPTS := -Wall $(COPTS)
@@ -208 +208 @@
         APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o
 endif
-APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o
+APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o mbed_stub.o
 APPL_BINOBJS := rom_fs.o
 APPL_CFLAGS := $(APPL_CFLAGS) -nostdinc

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/DebugEther/Makefile

@@ -161 +161 @@
 #  共通コンパイルオプションの定義
 #
-COPTS := -g -std=gnu99 $(COPTS)
+COPTS := -g -std=gnu99 -ffunction-sections -fdata-sections $(COPTS)
 ifndef OMIT_WARNING_ALL
         COPTS := -Wall $(COPTS)
@@ -206 +206 @@
         APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o
 endif
-APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o
+APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o mbed_stub.o
 APPL_BINOBJS := rom_fs.o
 APPL_CFLAGS := $(APPL_CFLAGS) -nostdinc

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/src/main.c

@@ -67 +67 @@
 #include "core/ntshell.h"
 #include "core/ntlibc.h"
-#include "util/ntstdio.h"
+#include <stdio.h>
 #include "usrcmd.h"
 #include "util/ntopt.h"
@@ -183 +183 @@
 {
         FILINFO fno;
-#if _USE_LFN
-        char lfn[_MAX_LFN + 1];
+#if FF_USE_LFN
+        char lfn[FF_MAX_LFN + 1];
         fno.lfname = lfn;
-        fno.lfsize = _MAX_LFN + 1;
+        fno.lfsize = FF_MAX_LFN + 1;
 #endif
         ER ret;
 
-#ifdef TOPPERS_OMIT_TECS
-        serial_opn_por(SIO_PORTID);
-#endif
-        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
-
-        ntshell_task_init(uart_read, uart_write, &main_obj);
+        ntshell_task_init(SIO_PORTID);
 
         main_obj.timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/src/main.cfg

@@ -51 +51 @@
 
 INCLUDE("tecsgen.cfg");
+INCLUDE("mbed_stub.cfg");
 
 INCLUDE("tinet/tinet_asp.cfg");