Changeset 374 for asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter

Timestamp:

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

Author:

coas-nagasima

Message:

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

Location:

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter

Files:

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

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/Debug/Makefile

@@ -158 +158 @@
 
 #
+#  mbedサービスの定義
+#
+
+include $(SRCDIR)/mbed/Makefile.mbed
+
+#
 #  共通コンパイルオプションの定義
 #
@@ -193 +199 @@
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) mbed_api.o netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 
 #

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/DebugCitrus/Makefile

@@ -158 +158 @@
 
 #
+#  mbedサービスの定義
+#
+
+include $(SRCDIR)/mbed/Makefile.mbed
+
+#
 #  共通コンパイルオプションの定義
 #
@@ -193 +199 @@
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) mbed_api.o netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 
 #

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/DebugEther/Makefile

@@ -158 +158 @@
 
 #
+#  mbedサービスの定義
+#
+
+include $(SRCDIR)/mbed/Makefile.mbed
+
+#
 #  共通コンパイルオプションの定義
 #
@@ -193 +199 @@
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) mbed_api.o netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 
 #

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/client.c

@@ -33 +33 @@
  *  の責任を負わない．
  *
- *  @(#) $Id: client.c 1729 2019-01-09 14:44:36Z coas-nagasima $
+ *  @(#) $Id$
  */
 #include <lib/curl_config.h>
@@ -47 +47 @@
 #include "kernel_cfg.h"
 #include "ff.h"
-#include "util/ntstdio.h"
+#include <stdio.h>
 #include "client.h"
 #include "jsonsl.h"

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/client.h

@@ -33 +33 @@
  *  の責任を負わない．
  * 
- *  @(#) $Id: client.h 1784 2019-02-06 01:11:25Z coas-nagasima $
+ *  @(#) $Id$
  */
 

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/main.c

@@ -68 +68 @@
 #include "core/ntshell.h"
 #include "core/ntlibc.h"
-#include "util/ntstdio.h"
+#include <stdio.h>
 #include "usrcmd.h"
 #include "util/ntopt.h"
 #include "socket_stub.h"
-#include "mbed_api.h"
+#include "gpio_api.h"
 #include "usb_hbth.h"
 #include "ntshell_main.h"
@@ -188 +188 @@
 {
         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);
-
         //wolfSSL_Debugging_ON();
 
-        ntshell_task_init(uart_read, uart_write, &main_obj);
+        ntshell_task_init(SIO_PORTID);
 
         main_obj.timer = TMO_FEVR;