Changeset 342 for asp3_tinet_ecnl_rx/trunk/bnep_bridge

Timestamp:

Apr 27, 2018, 2:26:14 PM (6 years ago)

Author:

coas-nagasima

Message:

syscallが関数呼びになるよう変更
他更新

Location:

asp3_tinet_ecnl_rx/trunk/bnep_bridge

Files:

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

asp3_tinet_ecnl_rx/trunk/bnep_bridge/Debug/Makefile

@@ -383 +383 @@
 tecs $(TECSGEN_SRCS) $(TECS_HEADERS): $(TECSGEN_TIMESTAMP) ;
 $(TECSGEN_TIMESTAMP): $(APPL_CDL) $(TECS_IMPORTS)
-        $(TECSGEN) $< -R $(INCLUDES) --cpp "$(TECS_CPP)" -g $(TECSGENDIR)
+        $(TECSGEN) $< -R $(INCLUDES) --cpp "$(subst ", \", $(TECS_CPP))" -g $(TECSGENDIR)
 
 #

asp3_tinet_ecnl_rx/trunk/bnep_bridge/src/main.c

@@ -143 +143 @@
 
 ntshell_t ntshell;
-#if !defined(_MSC_VER)
-void _start_c(long *p);
 
 /*
@@ -150 +148 @@
  */
 void main_task(intptr_t exinf)
-{
-        long args[] = {
-                1,
-                (long)"ntshell",
-        };
-        _start_c(args);
-}
-
-int main(int argc, char **argv)
 {
         // NAP mode
@@ -168 +157 @@
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
-
-        return 0;
-}
-#else
-void main_task(intptr_t exinf)
-{
-        main_initialize();
-
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
-        ntshell_set_prompt(&ntshell, "NTShell>");
-        ntshell_execute(&ntshell);
-}
-#endif
+}
+
 /*
  * 初期化
@@ -192 +170 @@
         fno.lfsize = _MAX_LFN + 1;
 #endif
-        ER ret2;
+        ER ret;
 
         ntshell_task_init();
@@ -226 +204 @@
         usbhost_init(USBHOST_TASK);
 
-        ret2 = get_tim(&main_obj.now);
-        if (ret2 != E_OK) {
+        ret = get_tim(&main_obj.now);
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 ext_tsk();

asp3_tinet_ecnl_rx/trunk/bnep_bridge/src/main.cfg

@@ -48 +48 @@
 INCLUDE("ntshell_main.cfg");
 
-CRE_TSK(MAIN_TASK, { TA_ACT, 0, main_task, MAIN_PRIORITY, MAIN_STACK_SIZE, NULL });
+CRE_TSK(MAIN_TASK, { TA_NULL, 0, main_task, MAIN_PRIORITY, MAIN_STACK_SIZE, NULL });
 CRE_TSK(ETHER_INPUT_TASK,  { TA_ACT, 0, ether_input_task,  ETHER_INPUT_PRIORITY,  ETHER_INPUT_STACK_SIZE,  NULL });
 CRE_DTQ(MAIN_DATAQUEUE, { TA_TFIFO, NUM_MAIN_DATAQUEUE, NULL });