Changeset 364 for asp3_tinet_ecnl_arm/trunk/bnep_bridge
- Timestamp:
- Feb 1, 2019, 9:57:09 PM (5 years ago)
- Location:
- asp3_tinet_ecnl_arm/trunk/bnep_bridge
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
asp3_tinet_ecnl_arm/trunk/bnep_bridge/.cproject
r352 r364 22 22 <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo"> 23 23 <option id="toolchain.id" value="gcc-arm-embedded"/> 24 <option id="toolchain.version" value=" 5.4.1.20160919"/>24 <option id="toolchain.version" value="6.3.1.20170620"/> 25 25 </storageModule> 26 26 <storageModule moduleId="cdtBuildSystem" version="4.0.0"> … … 59 59 <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.606825282" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/> 60 60 <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1276126881" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/> 61 <builder buildPath="${workspace_loc:/bnep_bridge}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.691118394" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn=" false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>61 <builder buildPath="${workspace_loc:/bnep_bridge}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.691118394" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/> 62 62 <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1838763743" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler"> 63 63 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1323004654" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/> … … 127 127 <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo"> 128 128 <option id="toolchain.id" value="gcc-arm-embedded"/> 129 <option id="toolchain.version" value=" 5.4.1.20160919"/>129 <option id="toolchain.version" value="6.3.1.20170620"/> 130 130 </storageModule> 131 131 <storageModule moduleId="cdtBuildSystem" version="4.0.0"> -
asp3_tinet_ecnl_arm/trunk/bnep_bridge/Debug/Makefile
r352 r364 153 153 endif 154 154 155 TINETDIR = 156 155 157 # 156 158 # mbedサービスの定義 … … 180 182 -I$(SRCDIR)/../usbhost/src \ 181 183 $(INCLUDES) 182 LDFLAGS := $(LDFLAGS) - Wl,-Map=$(OBJNAME).map,--cref -L.184 LDFLAGS := $(LDFLAGS) -L. 183 185 LIBS := $(LIBS) $(CXXLIBS) 184 186 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES) 185 187 186 APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src187 APPL_COBJS := $(APPL_COBJS) ntshell_main.o fdtable.o io_stub.o ffarch.o diskio.o ff.o sdfs.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.o188 189 188 # 190 189 # アプリケーションプログラムに関する定義 191 190 # 192 191 APPLNAME = bnep_bridge 193 APPLDIRS := $(APPLDIRS) ../src192 APPLDIRS = ../src ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src $(SRCDIR)/$(TINETDIR)/netapp 194 193 APPL_CFG = main.cfg 195 194 APPL_CDL = main.cdl 195 196 APPL_COBJS := $(APPL_COBJS) ntshell_main.o fdtable.o io_stub.o ffarch.o diskio.o ff.o sdfs.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 196 197 197 198 APPL_DIRS := $(APPLDIRS) $(SRCDIR)/library … … 210 211 endif 211 212 212 TINETDIR =213 213 ifdef TINETDIR 214 214 # … … 216 216 # 217 217 NO_USE_TINET_LIBRARY = true 218 218 219 219 # ネットワークインタフェースの選択、何れか一つ選択する。 220 220 NET_IF = ether 221 221 222 222 # イーサネット・ディバイスドライバの選択 223 223 NET_DEV = if_mbed … … 430 430 431 431 # 432 # 並列makeのための依存関係の定義 433 # 434 $(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp 435 $(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \ 436 | offset.timestamp 437 438 # 432 439 # 特別な依存関係の定義 433 440 # … … 438 445 # 439 446 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP) 440 $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \447 $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \ 441 448 $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \ 442 449 -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS) -
asp3_tinet_ecnl_arm/trunk/bnep_bridge/src/main.c
r359 r364 118 118 static void main_timeout(); 119 119 120 extern int ntshell_exit; 121 120 122 int uart_read(char *buf, int cnt, void *extobj) 121 123 { 122 return serial_rea_dat(SIO_PORTID, (char *)buf, cnt); 124 struct main_t *obj = (struct main_t *)extobj; 125 int result; 126 ER ret; 127 int timer; 128 129 obj->prev = obj->now; 130 131 /* タイマー取得 */ 132 timer = main_get_timer(); 133 134 /* 待ち */ 135 ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer); 136 if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) { 137 syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer); 138 ntshell_exit = 1; 139 return -1; 140 } 141 result = (int)ret; 142 143 ret = get_tim(&obj->now); 144 if (ret != E_OK) { 145 syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret)); 146 ntshell_exit = 1; 147 return -1; 148 } 149 150 /* 時間経過 */ 151 int elapse = obj->now - obj->prev; 152 main_progress(elapse); 153 154 /* タイムアウト処理 */ 155 main_timeout(); 156 157 return result; 123 158 } 124 159 … … 126 161 { 127 162 return serial_wri_dat(SIO_PORTID, buf, cnt); 128 }129 130 unsigned char ntstdio_xi(struct ntstdio_t *handle)131 {132 char buf[1];133 if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)134 return -EIO;135 return buf[0];136 }137 138 void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)139 {140 char buf[1];141 buf[0] = c;142 serial_wri_dat(SIO_PORTID, buf, 1);143 163 } 144 164 … … 155 175 main_initialize(); 156 176 157 ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);177 ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj); 158 178 ntshell_set_prompt(&ntshell, "NTShell>"); 159 179 ntshell_execute(&ntshell); … … 173 193 ER ret; 174 194 175 ntshell_task_init(); 195 #ifdef TOPPERS_OMIT_TECS 196 serial_opn_por(SIO_PORTID); 197 #endif 198 serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV); 199 200 ntshell_task_init(uart_read, uart_write, &main_obj); 176 201 177 202 main_obj.timer = TMO_FEVR;
Note:
See TracChangeset
for help on using the changeset viewer.