Changeset 279 for EcnlProtoTool/trunk/asp3_dcre
- Timestamp:
- Apr 29, 2017, 4:33:37 PM (7 years ago)
- Location:
- EcnlProtoTool/trunk/asp3_dcre
- Files:
-
- 3 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/core_support.S
r270 r279 267 267 #else /* TOPPERS_CUSTOM_IDLE */ 268 268 msr cpsr_c, #CPSR_SVC_MODE /* å²è¾¼ã¿ã許å¯ï¼ã¹ã¼ããã¤ã¶ã¢ã¼ãï¼*/ 269 ALABEL(dispatcher_2) 270 b dispatcher_ 2/* å²è¾¼ã¿å¾269 #endif /* TOPPERS_CUSTOM_IDLE */ 270 b dispatcher_1 /* å²è¾¼ã¿å¾ 271 271 ã¡ */ 272 #endif /* TOPPERS_CUSTOM_IDLE */273 272 274 273 /* -
EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/gic_support.S
r270 r279 5 5 * Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory 6 6 * Toyohashi Univ. of Technology, JAPAN 7 * Copyright (C) 2006-201 6by Embedded and Real-Time Systems Laboratory7 * Copyright (C) 2006-2017 by Embedded and Real-Time Systems Laboratory 8 8 * Graduate School of Information Science, Nagoya Univ., JAPAN 9 9 * -
EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/rza1/chip_timer.c
r270 r279 4 4 * Advanced Standard Profile Kernel 5 5 * 6 * Copyright (C) 2006-201 6by Embedded and Real-Time Systems Laboratory6 * Copyright (C) 2006-2017 by Embedded and Real-Time Systems Laboratory 7 7 * Graduate School of Information Science, Nagoya Univ., JAPAN 8 8 * -
EcnlProtoTool/trunk/asp3_dcre/kernel/dataqueue.c
r270 r279 6 6 * Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory 7 7 * Toyohashi Univ. of Technology, JAPAN 8 * Copyright (C) 2005-201 6by Embedded and Real-Time Systems Laboratory8 * Copyright (C) 2005-2017 by Embedded and Real-Time Systems Laboratory 9 9 * Graduate School of Information Science, Nagoya Univ., JAPAN 10 10 * … … 612 612 CHECK_ID(VALID_DTQID(dtqid)); 613 613 p_dtqcb = get_dtqcb(dtqid); 614 CHECK_ILUSE(p_dtqcb->p_dtqinib->dtqcnt > 0U);615 614 616 615 lock_cpu(); 617 616 if (p_dtqcb->p_dtqinib->dtqatr == TA_NOEXS) { 618 617 ercd = E_NOEXS; 618 } 619 else if (!(p_dtqcb->p_dtqinib->dtqcnt > 0U)) { 620 ercd = E_ILUSE; 619 621 } 620 622 else { … … 628 630 } 629 631 } 630 }631 632 ercd = E_OK; 633 } 632 634 unlock_cpu(); 633 635 -
EcnlProtoTool/trunk/asp3_dcre/kernel/eventflag.c
r270 r279 6 6 * Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory 7 7 * Toyohashi Univ. of Technology, JAPAN 8 * Copyright (C) 2005-201 6by Embedded and Real-Time Systems Laboratory8 * Copyright (C) 2005-2017 by Embedded and Real-Time Systems Laboratory 9 9 * Graduate School of Information Science, Nagoya Univ., JAPAN 10 10 * … … 250 250 ercd = FLGID(p_flgcb); 251 251 } 252 unlock_cpu(); 252 253 253 254 error_exit: -
EcnlProtoTool/trunk/asp3_dcre/kernel/task_manage.c
r270 r279 388 388 ercd = E_NOEXS; /*ï¼»NGKI3617ï¼½*/ 389 389 } 390 else if (TSTAT_DORMANT(tstat)) { /*ï¼»NGKI3620ï¼½*/ 391 *p_tskstat = TTS_DMT; 392 } 393 else if (TSTAT_SUSPENDED(tstat)) { 394 if (TSTAT_WAITING(tstat)) { 395 *p_tskstat = TTS_WAS; 390 else { 391 if (TSTAT_DORMANT(tstat)) { /*ï¼»NGKI3620ï¼½*/ 392 *p_tskstat = TTS_DMT; 393 } 394 else if (TSTAT_SUSPENDED(tstat)) { 395 if (TSTAT_WAITING(tstat)) { 396 *p_tskstat = TTS_WAS; 397 } 398 else { 399 *p_tskstat = TTS_SUS; 400 } 401 } 402 else if (TSTAT_WAITING(tstat)) { 403 *p_tskstat = TTS_WAI; 404 } 405 else if (p_tcb == p_runtsk) { 406 *p_tskstat = TTS_RUN; 396 407 } 397 408 else { 398 *p_tskstat = TTS_SUS; 399 } 400 } 401 else if (TSTAT_WAITING(tstat)) { 402 *p_tskstat = TTS_WAI; 403 } 404 else if (p_tcb == p_runtsk) { 405 *p_tskstat = TTS_RUN; 406 } 407 else { 408 *p_tskstat = TTS_RDY; 409 } 410 ercd = E_OK; 409 *p_tskstat = TTS_RDY; 410 } 411 ercd = E_OK; 412 } 411 413 unlock_cpu(); 412 414 -
EcnlProtoTool/trunk/asp3_dcre/kernel/time_manage.c
r270 r279 6 6 * Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory 7 7 * Toyohashi Univ. of Technology, JAPAN 8 * Copyright (C) 2005-201 5by Embedded and Real-Time Systems Laboratory8 * Copyright (C) 2005-2017 by Embedded and Real-Time Systems Laboratory 9 9 * Graduate School of Information Science, Nagoya Univ., JAPAN 10 10 * … … 280 280 } 281 281 switch (p_nfyinfo->nfymode & ~0x0fU) { 282 case 0: 283 break; 282 284 case TENFY_SETVAR: 283 285 CHECK_PAR(INTPTR_ALIGN(p_nfyinfo->enfy.setvar.p_var)); … … 352 354 break; 353 355 case TNFY_SNDDTQ: 354 ercd = snd_dtq(p_nfyinfo->nfy.snddtq.dtqid,356 ercd = psnd_dtq(p_nfyinfo->nfy.snddtq.dtqid, 355 357 p_nfyinfo->nfy.snddtq.data); 356 358 break; … … 384 386 break; 385 387 case TENFY_SNDDTQ: 386 (void) snd_dtq(p_nfyinfo->enfy.snddtq.dtqid, (intptr_t) ercd);388 (void) psnd_dtq(p_nfyinfo->enfy.snddtq.dtqid, (intptr_t) ercd); 387 389 break; 388 390 default: -
EcnlProtoTool/trunk/asp3_dcre/library/vasyslog.c
r270 r279 66 66 67 67 void 68 syslog(uint_t prio, const char *format, ...)68 vsyslog(uint_t prio, const char *format, va_list ap) 69 69 { 70 70 SYSLOG logbuf; 71 va_list ap;72 71 uint_t i; 73 72 char sz; … … 77 76 logbuf.logpar[0] = (LOGPAR) format; 78 77 i = 1U; 79 va_start(ap, format);80 78 81 79 while ((c = *format++) != '\0' && i < TNUM_LOGPAR) { … … 124 122 } 125 123 } 126 va_end(ap);127 124 (void) tSysLog_eSysLog_write(prio, &logbuf); 128 125 } 129 126 127 void 128 syslog(uint_t prio, const char *format, ...) 129 { 130 va_list ap; 131 va_start(ap, format); 132 vsyslog(prio, format, ap); 133 va_end(ap); 134 } 135 136 /* mbed weak error function */ 137 void 138 error(const char* format, ...) { 139 va_list arg; 140 va_start(arg, format); 141 vsyslog(LOG_ERROR, format, arg); 142 va_end(arg); 143 ext_ker(); 144 } 145 130 146 #endif /* TOPPERS_OMIT_SYSLOG */ -
EcnlProtoTool/trunk/asp3_dcre/mbed/Makefile.mbed
r270 r279 61 61 START_OBJS = startup_RZ1AH.o 62 62 SYSSVC_COBJS := $(SYSSVC_COBJS)\ 63 assert.o board.o error.ogpio.o lp_ticker_api.o mbed_interface.o\63 assert.o board.o gpio.o lp_ticker_api.o mbed_interface.o\ 64 64 pinmap_common.o rtc_time.o semihost_api.o ticker_api.o us_ticker_api.o\ 65 65 RZ_A1_Init.o cmsis_nvic.o gic.o mbed_sf_boot.o mmu_Renesas_RZ_A1.o\ -
EcnlProtoTool/trunk/asp3_dcre/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/mmu_Renesas_RZ_A1.c
r270 r279 160 160 //Define Image 161 161 __TTSection (&Image$$TTB$$ZI$$Base, (uint32_t)&Image$$RO_DATA$$Base, RO_DATA_SIZE, Sect_Normal_RO); 162 __TTSection (&Image$$TTB$$ZI$$Base, 0x18200000, 4, Sect_Normal_Cod); 162 163 __TTSection (&Image$$TTB$$ZI$$Base, (uint32_t)&Image$$VECTORS$$Base, VECTORS_SIZE, Sect_Normal_Cod); 163 164 __TTSection (&Image$$TTB$$ZI$$Base, (uint32_t)&Image$$RW_DATA$$Base, RW_DATA_SIZE, Sect_Normal_RW); -
EcnlProtoTool/trunk/asp3_dcre/target/gr_peach_gcc/target_kernel_impl.c
r270 r279 298 298 target_exit(void) 299 299 { 300 static int first = 1; 301 300 302 /* 301 303 * ãããä¾åã®çµäºå¦ç … … 306 308 * bkptå½ä»¤ã«ãããããã¬ã«å¶å¾¡ã移ãï¼ãã©ã¡ã¼ã¿ãä½ãè¯ããæªæ¤è¨ï¼ 307 309 */ 308 Asm("bkpt #0"); 310 if (first){ 311 first = 0; 312 Asm("bkpt #0"); 313 } 309 314 310 315 while (true) ; -
EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/udp_usrreq.c
r270 r279 485 485 return E_NOEXS; 486 486 487 return E_ PAR;487 return E_OK/*E_PAR*/; 488 488 } 489 489 … … 518 518 return E_NOEXS; 519 519 520 return E_ PAR;520 return E_OK/*E_PAR*/; 521 521 } 522 522 -
EcnlProtoTool/trunk/asp3_dcre/tinet/tcpip_api.def
r270 r279 5 5 UDP_CRE_CEP #udp4_cepid* { .udp4_cepatr { &ipv4addr &portno } &callback } 6 6 UDP6_CRE_CEP #udp6_cepid* { .udp6_cepatr { &ipv6addr &portno } &callback } 7 VRID_TCP _REP #vrid_tcp4_repid*8 VRID_TCP _CEP #vrid_tcp4_cepid*7 VRID_TCP4_REP #vrid_tcp4_repid* 8 VRID_TCP4_CEP #vrid_tcp4_cepid* 9 9 VRID_TCP6_REP #vrid_tcp6_repid* 10 10 VRID_TCP6_CEP #vrid_tcp6_cepid* 11 VRID_UDP _CEP #vrid_udp4_cepid*11 VRID_UDP4_CEP #vrid_udp4_cepid* 12 12 VRID_UDP6_CEP #vrid_udp6_cepid* -
EcnlProtoTool/trunk/asp3_dcre/tinet/tinet.trb
r270 r279 78 78 $tinetCfgH.add("#define #{params[:udp6_cepid]} #{params[:udp6_cepid].val}") 79 79 end 80 $cfgData[:VRID_TCP _REP].each do |key, params|81 $tinetCfgH.add("#define #{params[: tcp4_repid]} #{params[:tcp4_repid].val + $cfgData[:TCP_CRE_REP].size}")82 end 83 $cfgData[:VRID_TCP _CEP].each do |key, params|84 $tinetCfgH.add("#define #{params[: tcp4_cepid]} #{params[:tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}")80 $cfgData[:VRID_TCP4_REP].each do |key, params| 81 $tinetCfgH.add("#define #{params[:vrid_tcp4_repid]} #{params[:vrid_tcp4_repid].val + $cfgData[:TCP_CRE_REP].size}") 82 end 83 $cfgData[:VRID_TCP4_CEP].each do |key, params| 84 $tinetCfgH.add("#define #{params[:vrid_tcp4_cepid]} #{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}") 85 85 end 86 86 $cfgData[:VRID_TCP6_REP].each do |key, params| 87 $tinetCfgH.add("#define #{params[: tcp6_repid]} #{params[:tcp6_repid].val + $cfgData[:TCP6_CRE_REP].size}")87 $tinetCfgH.add("#define #{params[:vrid_tcp6_repid]} #{params[:vrid_tcp6_repid].val + $cfgData[:TCP6_CRE_REP].size}") 88 88 end 89 89 $cfgData[:VRID_TCP6_CEP].each do |key, params| 90 $tinetCfgH.add("#define #{params[: tcp6_cepid]} #{params[:tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}")91 end 92 $cfgData[:VRID_UDP _CEP].each do |key, params|93 $tinetCfgH.add("#define #{params[: udp4_cepid]} #{params[:udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size}")90 $tinetCfgH.add("#define #{params[:vrid_tcp6_cepid]} #{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}") 91 end 92 $cfgData[:VRID_UDP4_CEP].each do |key, params| 93 $tinetCfgH.add("#define #{params[:vrid_udp4_cepid]} #{params[:vrid_udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size}") 94 94 end 95 95 $cfgData[:VRID_UDP6_CEP].each do |key, params| 96 $tinetCfgH.add("#define #{params[: udp6_cepid]} #{params[:udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size}")96 $tinetCfgH.add("#define #{params[:vrid_udp6_cepid]} #{params[:vrid_udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size}") 97 97 end 98 98 $tinetCfgH.add() … … 144 144 145 145 # // TCP (IPv4) åä»å£ 146 if $cfgData[:TCP_CRE_REP].size > 0 || $cfgData[:VRID_TCP _REP].size > 0147 $tinetCfgC.add() 148 $tinetCfgC.add("#define TNUM_TCP_REPID #{$cfgData[:TCP_CRE_REP].size + $cfgData[:VRID_TCP _REP].size}")146 if $cfgData[:TCP_CRE_REP].size > 0 || $cfgData[:VRID_TCP4_REP].size > 0 147 $tinetCfgC.add() 148 $tinetCfgC.add("#define TNUM_TCP_REPID #{$cfgData[:TCP_CRE_REP].size + $cfgData[:VRID_TCP4_REP].size}") 149 149 $tinetCfgC.add() 150 150 $tinetCfgC.add("const ID tmax_tcp_repid = (TMIN_TCP_REPID + TNUM_TCP_REPID - 1);") … … 161 161 $tinetCfgC.add("\t\t},") 162 162 end 163 $cfgData[:VRID_TCP _REP].each do |key, params|163 $cfgData[:VRID_TCP4_REP].each do |key, params| 164 164 $tinetCfgC.add("\t{") 165 165 $tinetCfgC.add("\t\t0,") … … 167 167 $tinetCfgC.add("#if defined(TCP_CFG_EXTENTIONS)") 168 168 $tinetCfgC.add("\t\tTCP_REP_FLG_DYNAMIC,") 169 $tinetCfgC.add("\t\tSEM_TCP_REP_LOCK#{params[: tcp4_repid].val + $cfgData[:TCP_CRE_REP].size},")169 $tinetCfgC.add("\t\tSEM_TCP_REP_LOCK#{params[:vrid_tcp4_repid].val + $cfgData[:TCP_CRE_REP].size},") 170 170 $tinetCfgC.add("#endif") 171 171 $tinetCfgC.add("\t\t},") … … 198 198 $tinetCfgC.add("#if defined(TCP_CFG_EXTENTIONS)") 199 199 $tinetCfgC.add("\t\tTCP_REP_FLG_DYNAMIC,") 200 $tinetCfgC.add("\t\tSEM_TCP_REP_LOCK#{params[: tcp6_repid].val + $cfgData[:TCP6_CRE_REP].size},")200 $tinetCfgC.add("\t\tSEM_TCP_REP_LOCK#{params[:vrid_tcp6_repid].val + $cfgData[:TCP6_CRE_REP].size},") 201 201 $tinetCfgC.add("#endif") 202 202 $tinetCfgC.add("\t\t},") … … 206 206 207 207 # // TCP (IPv4) éä¿¡ç«¯ç¹ 208 if $cfgData[:TCP_CRE_CEP].size > 0 || $cfgData[:VRID_TCP _CEP].size > 0209 $tinetCfgC.add() 210 $tinetCfgC.add("#define TNUM_TCP_CEPID #{$cfgData[:TCP_CRE_CEP].size + $cfgData[:VRID_TCP _CEP].size}")208 if $cfgData[:TCP_CRE_CEP].size > 0 || $cfgData[:VRID_TCP4_CEP].size > 0 209 $tinetCfgC.add() 210 $tinetCfgC.add("#define TNUM_TCP_CEPID #{$cfgData[:TCP_CRE_CEP].size + $cfgData[:VRID_TCP4_CEP].size}") 211 211 $tinetCfgC.add() 212 212 $tinetCfgC.add("const ID tmax_tcp_cepid = (TMIN_TCP_CEPID + TNUM_TCP_CEPID - 1);") … … 228 228 $tinetCfgC.add("\t\t},") 229 229 end 230 $cfgData[:VRID_TCP _CEP].each do |key, params|230 $cfgData[:VRID_TCP4_CEP].each do |key, params| 231 231 $tinetCfgC.add("\t{") 232 232 $tinetCfgC.add("\t\t0,") … … 237 237 $tinetCfgC.add("\t\t(t_tcp_callback)(FP)NULL,") 238 238 $tinetCfgC.add("\t\tTCP_CEP_FLG_DYNAMIC,") 239 $tinetCfgC.add("\t\tSEM_TCP_CEP_LOCK#{params[: tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size},")240 $tinetCfgC.add("\t\tFLG_TCP_CEP_EST#{params[: tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size},")241 $tinetCfgC.add("\t\tFLG_TCP_CEP_SND#{params[: tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size},")242 $tinetCfgC.add("\t\tFLG_TCP_CEP_RCV#{params[: tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size},")239 $tinetCfgC.add("\t\tSEM_TCP_CEP_LOCK#{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size},") 240 $tinetCfgC.add("\t\tFLG_TCP_CEP_EST#{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size},") 241 $tinetCfgC.add("\t\tFLG_TCP_CEP_SND#{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size},") 242 $tinetCfgC.add("\t\tFLG_TCP_CEP_RCV#{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size},") 243 243 $tinetCfgC.add("\t\t},") 244 244 end … … 278 278 $tinetCfgC.add("\t\t(t_tcp_callback)(FP)NULL,") 279 279 $tinetCfgC.add("\t\tTCP_CEP_FLG_DYNAMIC,") 280 $tinetCfgC.add("\t\tSEM_TCP_CEP_LOCK#{params[: tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size},")281 $tinetCfgC.add("\t\tFLG_TCP_CEP_EST#{params[: tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size},")282 $tinetCfgC.add("\t\tFLG_TCP_CEP_SND#{params[: tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size},")283 $tinetCfgC.add("\t\tFLG_TCP_CEP_RCV#{params[: tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size},")280 $tinetCfgC.add("\t\tSEM_TCP_CEP_LOCK#{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size},") 281 $tinetCfgC.add("\t\tFLG_TCP_CEP_EST#{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size},") 282 $tinetCfgC.add("\t\tFLG_TCP_CEP_SND#{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size},") 283 $tinetCfgC.add("\t\tFLG_TCP_CEP_RCV#{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size},") 284 284 $tinetCfgC.add("\t\t},") 285 285 end … … 288 288 289 289 # // UDP (IPv4) éä¿¡ç«¯ç¹ 290 if $cfgData[:UDP_CRE_CEP].size > 0 || $cfgData[:VRID_UDP _CEP].size > 0291 $tinetCfgC.add() 292 $tinetCfgC.add("#define TNUM_UDP_CEPID #{$cfgData[:UDP_CRE_CEP].size + $cfgData[:VRID_UDP _CEP].size}")290 if $cfgData[:UDP_CRE_CEP].size > 0 || $cfgData[:VRID_UDP4_CEP].size > 0 291 $tinetCfgC.add() 292 $tinetCfgC.add("#define TNUM_UDP_CEPID #{$cfgData[:UDP_CRE_CEP].size + $cfgData[:VRID_UDP4_CEP].size}") 293 293 $tinetCfgC.add() 294 294 $tinetCfgC.add("const ID tmax_udp_cepid = (TMIN_UDP_CEPID + TNUM_UDP_CEPID - 1);") … … 307 307 $tinetCfgC.add("\t\t},") 308 308 end 309 $cfgData[:VRID_UDP _CEP].each do |key, params|309 $cfgData[:VRID_UDP4_CEP].each do |key, params| 310 310 $tinetCfgC.add("\t{") 311 311 $tinetCfgC.add("\t\t0,") … … 313 313 $tinetCfgC.add("\t\t(t_udp_callback)(FP)NULL,") 314 314 $tinetCfgC.add("\t\tUDP_CEP_FLG_DYNAMIC,") 315 $tinetCfgC.add("\t\tSEM_UDP_CEP_LOCK#{params[: udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size},")316 $tinetCfgC.add("\t\tTA_NULL,") 317 $tinetCfgC.add("\t\tTA_NULL,") 318 $tinetCfgC.add("\t\tDTQ_UDP_RCVQ#{params[: udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size},")315 $tinetCfgC.add("\t\tSEM_UDP_CEP_LOCK#{params[:vrid_udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size},") 316 $tinetCfgC.add("\t\tTA_NULL,") 317 $tinetCfgC.add("\t\tTA_NULL,") 318 $tinetCfgC.add("\t\tDTQ_UDP_RCVQ#{params[:vrid_udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size},") 319 319 $tinetCfgC.add("\t\t},") 320 320 end … … 348 348 $tinetCfgC.add("\t\t(t_udp_callback)(FP)NULL,") 349 349 $tinetCfgC.add("\t\tUDP_CEP_FLG_DYNAMIC,") 350 $tinetCfgC.add("\t\tSEM_UDP_CEP_LOCK#{params[: udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size},")351 $tinetCfgC.add("\t\tTA_NULL,") 352 $tinetCfgC.add("\t\tTA_NULL,") 353 $tinetCfgC.add("\t\tDTQ_UDP_RCVQ#{params[: udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size},")350 $tinetCfgC.add("\t\tSEM_UDP_CEP_LOCK#{params[:vrid_udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size},") 351 $tinetCfgC.add("\t\tTA_NULL,") 352 $tinetCfgC.add("\t\tTA_NULL,") 353 $tinetCfgC.add("\t\tDTQ_UDP_RCVQ#{params[:vrid_udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size},") 354 354 $tinetCfgC.add("\t\t},") 355 355 end … … 362 362 363 363 # // TCP (IPv4) åä»å£ 364 if $cfgData[:TCP_CRE_REP].size > 0 || $cfgData[:VRID_TCP _REP].size > 0364 if $cfgData[:TCP_CRE_REP].size > 0 || $cfgData[:VRID_TCP4_REP].size > 0 365 365 $cfgData[:TCP_CRE_REP].each do |key, params| 366 366 cfgInfo = { APINAME: "CRE_SEM" } … … 371 371 $cfgFileInfo.push(cfgInfo) 372 372 end 373 $cfgData[:VRID_TCP _REP].each do |key, params|374 cfgInfo = { APINAME: "CRE_SEM" } 375 cfgInfo["semid"] = "SEM_TCP_REP_LOCK#{params[: tcp4_repid].val + $cfgData[:TCP_CRE_REP].size}"373 $cfgData[:VRID_TCP4_REP].each do |key, params| 374 cfgInfo = { APINAME: "CRE_SEM" } 375 cfgInfo["semid"] = "SEM_TCP_REP_LOCK#{params[:vrid_tcp4_repid].val + $cfgData[:TCP_CRE_REP].size}" 376 376 cfgInfo["sematr"] = NumStr.new($TA_TPRI, "TA_TPRI") 377 377 cfgInfo["isemcnt"] = 1 … … 393 393 $cfgData[:VRID_TCP6_REP].each do |key, params| 394 394 cfgInfo = { APINAME: "CRE_SEM" } 395 cfgInfo["semid"] = "SEM_TCP_REP_LOCK#{params[: tcp6_repid].val + $cfgData[:TCP6_CRE_REP].size}"395 cfgInfo["semid"] = "SEM_TCP_REP_LOCK#{params[:vrid_tcp6_repid].val + $cfgData[:TCP6_CRE_REP].size}" 396 396 cfgInfo["sematr"] = NumStr.new($TA_TPRI, "TA_TPRI") 397 397 cfgInfo["isemcnt"] = 1 … … 402 402 403 403 # // TCP (IPv4) éä¿¡ç«¯ç¹ 404 if $cfgData[:TCP_CRE_CEP].size > 0 || $cfgData[:VRID_TCP _CEP].size > 0404 if $cfgData[:TCP_CRE_CEP].size > 0 || $cfgData[:VRID_TCP4_CEP].size > 0 405 405 $cfgData[:TCP_CRE_CEP].each do |key, params| 406 406 cfgInfo = { APINAME: "CRE_SEM" } … … 429 429 $cfgFileInfo.push(cfgInfo) 430 430 end 431 $cfgData[:VRID_TCP _CEP].each do |key, params|432 cfgInfo = { APINAME: "CRE_SEM" } 433 cfgInfo["semid"] = "SEM_TCP_CEP_LOCK#{params[: tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}"434 cfgInfo["sematr"] = NumStr.new($TA_TPRI, "TA_TPRI") 435 cfgInfo["isemcnt"] = 1 436 cfgInfo["maxsem"] = 1 437 $cfgFileInfo.push(cfgInfo) 438 439 cfgInfo = { APINAME: "CRE_FLG" } 440 cfgInfo["flgid"] = "FLG_TCP_CEP_EST#{params[: tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}"441 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 442 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") 443 $cfgFileInfo.push(cfgInfo) 444 445 cfgInfo = { APINAME: "CRE_FLG" } 446 cfgInfo["flgid"] = "FLG_TCP_CEP_SND#{params[: tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}"447 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 448 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") 449 $cfgFileInfo.push(cfgInfo) 450 451 cfgInfo = { APINAME: "CRE_FLG" } 452 cfgInfo["flgid"] = "FLG_TCP_CEP_RCV#{params[: tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}"431 $cfgData[:VRID_TCP4_CEP].each do |key, params| 432 cfgInfo = { APINAME: "CRE_SEM" } 433 cfgInfo["semid"] = "SEM_TCP_CEP_LOCK#{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}" 434 cfgInfo["sematr"] = NumStr.new($TA_TPRI, "TA_TPRI") 435 cfgInfo["isemcnt"] = 1 436 cfgInfo["maxsem"] = 1 437 $cfgFileInfo.push(cfgInfo) 438 439 cfgInfo = { APINAME: "CRE_FLG" } 440 cfgInfo["flgid"] = "FLG_TCP_CEP_EST#{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}" 441 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 442 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") 443 $cfgFileInfo.push(cfgInfo) 444 445 cfgInfo = { APINAME: "CRE_FLG" } 446 cfgInfo["flgid"] = "FLG_TCP_CEP_SND#{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}" 447 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 448 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") 449 $cfgFileInfo.push(cfgInfo) 450 451 cfgInfo = { APINAME: "CRE_FLG" } 452 cfgInfo["flgid"] = "FLG_TCP_CEP_RCV#{params[:vrid_tcp4_cepid].val + $cfgData[:TCP_CRE_CEP].size}" 453 453 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 454 454 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") … … 487 487 $cfgData[:VRID_TCP6_CEP].each do |key, params| 488 488 cfgInfo = { APINAME: "CRE_SEM" } 489 cfgInfo["semid"] = "SEM_TCP_CEP_LOCK#{params[: tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}"490 cfgInfo["sematr"] = NumStr.new($TA_TPRI, "TA_TPRI") 491 cfgInfo["isemcnt"] = 1 492 cfgInfo["maxsem"] = 1 493 $cfgFileInfo.push(cfgInfo) 494 495 cfgInfo = { APINAME: "CRE_FLG" } 496 cfgInfo["flgid"] = "FLG_TCP_CEP_EST#{params[: tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}"497 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 498 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") 499 $cfgFileInfo.push(cfgInfo) 500 501 cfgInfo = { APINAME: "CRE_FLG" } 502 cfgInfo["flgid"] = "FLG_TCP_CEP_SND#{params[: tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}"503 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 504 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") 505 $cfgFileInfo.push(cfgInfo) 506 507 cfgInfo = { APINAME: "CRE_FLG" } 508 cfgInfo["flgid"] = "FLG_TCP_CEP_RCV#{params[: tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}"489 cfgInfo["semid"] = "SEM_TCP_CEP_LOCK#{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}" 490 cfgInfo["sematr"] = NumStr.new($TA_TPRI, "TA_TPRI") 491 cfgInfo["isemcnt"] = 1 492 cfgInfo["maxsem"] = 1 493 $cfgFileInfo.push(cfgInfo) 494 495 cfgInfo = { APINAME: "CRE_FLG" } 496 cfgInfo["flgid"] = "FLG_TCP_CEP_EST#{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}" 497 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 498 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") 499 $cfgFileInfo.push(cfgInfo) 500 501 cfgInfo = { APINAME: "CRE_FLG" } 502 cfgInfo["flgid"] = "FLG_TCP_CEP_SND#{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}" 503 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 504 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") 505 $cfgFileInfo.push(cfgInfo) 506 507 cfgInfo = { APINAME: "CRE_FLG" } 508 cfgInfo["flgid"] = "FLG_TCP_CEP_RCV#{params[:vrid_tcp6_cepid].val + $cfgData[:TCP6_CRE_CEP].size}" 509 509 cfgInfo["flgatr"] = NumStr.new($TA_TFIFO | $TA_WSGL, "TA_TFIFO|TA_WSGL") 510 510 cfgInfo["iflgptn"] = NumStr.new($TCP_CEP_EVT_CLOSED, "TCP_CEP_EVT_CLOSED") … … 514 514 515 515 # // UDP (IPv4) éä¿¡ç«¯ç¹ 516 if $cfgData[:UDP_CRE_CEP].size > 0 || $cfgData[:VRID_UDP _CEP].size > 0516 if $cfgData[:UDP_CRE_CEP].size > 0 || $cfgData[:VRID_UDP4_CEP].size > 0 517 517 $cfgData[:UDP_CRE_CEP].each do |key, params| 518 518 cfgInfo = { APINAME: "CRE_SEM" } … … 530 530 $cfgFileInfo.push(cfgInfo) 531 531 end 532 $cfgData[:VRID_UDP _CEP].each do |key, params|533 cfgInfo = { APINAME: "CRE_SEM" } 534 cfgInfo["semid"] = "SEM_UDP_CEP_LOCK#{params[: udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size}"532 $cfgData[:VRID_UDP4_CEP].each do |key, params| 533 cfgInfo = { APINAME: "CRE_SEM" } 534 cfgInfo["semid"] = "SEM_UDP_CEP_LOCK#{params[:vrid_udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size}" 535 535 cfgInfo["sematr"] = NumStr.new($TA_TPRI, "TA_TPRI") 536 536 cfgInfo["isemcnt"] = 1 … … 539 539 540 540 cfgInfo = { APINAME: "CRE_DTQ" } 541 cfgInfo["dtqid"] = "DTQ_UDP_RCVQ#{params[: udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size}"541 cfgInfo["dtqid"] = "DTQ_UDP_RCVQ#{params[:vrid_udp4_cepid].val + $cfgData[:UDP_CRE_CEP].size}" 542 542 cfgInfo["dtqatr"] = NumStr.new($TA_TFIFO, "TA_TFIFO") 543 543 cfgInfo["dtqcnt"] = NumStr.new($NUM_DTQ_UDP_RCVQ, "NUM_DTQ_UDP_RCVQ") … … 566 566 $cfgData[:VRID_UDP6_CEP].each do |key, params| 567 567 cfgInfo = { APINAME: "CRE_SEM" } 568 cfgInfo["semid"] = "SEM_UDP_CEP_LOCK#{params[: udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size}"568 cfgInfo["semid"] = "SEM_UDP_CEP_LOCK#{params[:vrid_udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size}" 569 569 cfgInfo["sematr"] = NumStr.new($TA_TPRI, "TA_TPRI") 570 570 cfgInfo["isemcnt"] = 1 … … 573 573 574 574 cfgInfo = { APINAME: "CRE_DTQ" } 575 cfgInfo["dtqid"] = "DTQ_UDP_RCVQ#{params[: udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size}"575 cfgInfo["dtqid"] = "DTQ_UDP_RCVQ#{params[:vrid_udp6_cepid].val + $cfgData[:UDP6_CRE_CEP].size}" 576 576 cfgInfo["dtqatr"] = NumStr.new($TA_TFIFO, "TA_TFIFO") 577 577 cfgInfo["dtqcnt"] = NumStr.new($NUM_DTQ_UDP_RCVQ, "NUM_DTQ_UDP_RCVQ")
Note:
See TracChangeset
for help on using the changeset viewer.