Changeset 62 for asp_wo_cfg/trunk/kernel
- Timestamp:
- Oct 19, 2013, 12:38:33 AM (11 years ago)
- Location:
- asp_wo_cfg/trunk/kernel
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
asp_wo_cfg/trunk/kernel/dataqueue.c
r49 r62 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 2by Embedded and Real-Time Systems Laboratory8 * Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory 9 9 * Graduate School of Information Science, Nagoya Univ., JAPAN 10 10 * … … 303 303 304 304 bool_t 305 send_data(DTQCB *p_dtqcb, intptr_t data, bool_t *p_ reqdsp)305 send_data(DTQCB *p_dtqcb, intptr_t data, bool_t *p_dspreq) 306 306 { 307 307 TCB *p_tcb; … … 310 310 p_tcb = (TCB *) queue_delete_next(&(p_dtqcb->rwait_queue)); 311 311 ((WINFO_DTQ *)(p_tcb->p_winfo))->data = data; 312 *p_ reqdsp= wait_complete(p_tcb);312 *p_dspreq = wait_complete(p_tcb); 313 313 return(true); 314 314 } 315 315 else if (p_dtqcb->count < p_dtqcb->p_dtqinib->dtqcnt) { 316 316 enqueue_data(p_dtqcb, data); 317 *p_ reqdsp= false;317 *p_dspreq = false; 318 318 return(true); 319 319 } … … 354 354 355 355 bool_t 356 receive_data(DTQCB *p_dtqcb, intptr_t *p_data, bool_t *p_ reqdsp)356 receive_data(DTQCB *p_dtqcb, intptr_t *p_data, bool_t *p_dspreq) 357 357 { 358 358 TCB *p_tcb; … … 365 365 data = ((WINFO_DTQ *)(p_tcb->p_winfo))->data; 366 366 enqueue_data(p_dtqcb, data); 367 *p_ reqdsp= wait_complete(p_tcb);367 *p_dspreq = wait_complete(p_tcb); 368 368 } 369 369 else { 370 *p_ reqdsp= false;370 *p_dspreq = false; 371 371 } 372 372 return(true); … … 375 375 p_tcb = (TCB *) queue_delete_next(&(p_dtqcb->swait_queue)); 376 376 *p_data = ((WINFO_DTQ *)(p_tcb->p_winfo))->data; 377 *p_ reqdsp= wait_complete(p_tcb);377 *p_dspreq = wait_complete(p_tcb); 378 378 return(true); 379 379 } … … 395 395 DTQCB *p_dtqcb; 396 396 WINFO_DTQ winfo_dtq; 397 bool_t reqdsp;397 bool_t dspreq; 398 398 ER ercd; 399 399 … … 405 405 406 406 t_lock_cpu(); 407 if (send_data(p_dtqcb, data, & reqdsp)) {408 if ( reqdsp) {407 if (send_data(p_dtqcb, data, &dspreq)) { 408 if (dspreq) { 409 409 dispatch(); 410 410 } … … 436 436 { 437 437 DTQCB *p_dtqcb; 438 bool_t reqdsp;438 bool_t dspreq; 439 439 ER ercd; 440 440 … … 446 446 447 447 t_lock_cpu(); 448 if (send_data(p_dtqcb, data, & reqdsp)) {449 if ( reqdsp) {448 if (send_data(p_dtqcb, data, &dspreq)) { 449 if (dspreq) { 450 450 dispatch(); 451 451 } … … 473 473 { 474 474 DTQCB *p_dtqcb; 475 bool_t reqdsp;475 bool_t dspreq; 476 476 ER ercd; 477 477 … … 483 483 484 484 i_lock_cpu(); 485 if (send_data(p_dtqcb, data, & reqdsp)) {486 if ( reqdsp) {485 if (send_data(p_dtqcb, data, &dspreq)) { 486 if (dspreq) { 487 487 reqflg = true; 488 488 } … … 512 512 WINFO_DTQ winfo_dtq; 513 513 TMEVTB tmevtb; 514 bool_t reqdsp;514 bool_t dspreq; 515 515 ER ercd; 516 516 … … 523 523 524 524 t_lock_cpu(); 525 if (send_data(p_dtqcb, data, & reqdsp)) {526 if ( reqdsp) {525 if (send_data(p_dtqcb, data, &dspreq)) { 526 if (dspreq) { 527 527 dispatch(); 528 528 } … … 623 623 DTQCB *p_dtqcb; 624 624 WINFO_DTQ winfo_dtq; 625 bool_t reqdsp;625 bool_t dspreq; 626 626 ER ercd; 627 627 … … 633 633 634 634 t_lock_cpu(); 635 if (receive_data(p_dtqcb, p_data, & reqdsp)) {636 if ( reqdsp) {635 if (receive_data(p_dtqcb, p_data, &dspreq)) { 636 if (dspreq) { 637 637 dispatch(); 638 638 } … … 669 669 { 670 670 DTQCB *p_dtqcb; 671 bool_t reqdsp;671 bool_t dspreq; 672 672 ER ercd; 673 673 … … 679 679 680 680 t_lock_cpu(); 681 if (receive_data(p_dtqcb, p_data, & reqdsp)) {682 if ( reqdsp) {681 if (receive_data(p_dtqcb, p_data, &dspreq)) { 682 if (dspreq) { 683 683 dispatch(); 684 684 } … … 708 708 WINFO_DTQ winfo_dtq; 709 709 TMEVTB tmevtb; 710 bool_t reqdsp;710 bool_t dspreq; 711 711 ER ercd; 712 712 … … 719 719 720 720 t_lock_cpu(); 721 if (receive_data(p_dtqcb, p_data, & reqdsp)) {722 if ( reqdsp) {721 if (receive_data(p_dtqcb, p_data, &dspreq)) { 722 if (dspreq) { 723 723 dispatch(); 724 724 } -
asp_wo_cfg/trunk/kernel/dataqueue.h
r49 r62 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 2by Embedded and Real-Time Systems Laboratory8 * Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory 9 9 * Graduate School of Information Science, Nagoya Univ., JAPAN 10 10 * … … 144 144 * データキューへのデータ送信 145 145 */ 146 extern bool_t send_data(DTQCB *p_dtqcb, intptr_t data, bool_t *p_ reqdsp);146 extern bool_t send_data(DTQCB *p_dtqcb, intptr_t data, bool_t *p_dspreq); 147 147 148 148 /* … … 155 155 */ 156 156 extern bool_t receive_data(DTQCB *p_dtqcb, intptr_t *p_data, 157 bool_t *p_ reqdsp);157 bool_t *p_dspreq); 158 158 159 159 #endif /* TOPPERS_DATAQUEUE_H */ -
asp_wo_cfg/trunk/kernel/pridataq.c
r49 r62 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 2by Embedded and Real-Time Systems Laboratory8 * Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory 9 9 * Graduate School of Information Science, Nagoya Univ., JAPAN 10 10 * … … 292 292 293 293 bool_t 294 send_pridata(PDQCB *p_pdqcb, intptr_t data, PRI datapri, bool_t *p_ reqdsp)294 send_pridata(PDQCB *p_pdqcb, intptr_t data, PRI datapri, bool_t *p_dspreq) 295 295 { 296 296 TCB *p_tcb; … … 300 300 ((WINFO_PDQ *)(p_tcb->p_winfo))->data = data; 301 301 ((WINFO_PDQ *)(p_tcb->p_winfo))->datapri = datapri; 302 *p_ reqdsp= wait_complete(p_tcb);302 *p_dspreq = wait_complete(p_tcb); 303 303 return(true); 304 304 } 305 305 else if (p_pdqcb->count < p_pdqcb->p_pdqinib->pdqcnt) { 306 306 enqueue_pridata(p_pdqcb, data, datapri); 307 *p_ reqdsp= false;307 *p_dspreq = false; 308 308 return(true); 309 309 } … … 322 322 bool_t 323 323 receive_pridata(PDQCB *p_pdqcb, intptr_t *p_data, 324 PRI *p_datapri, bool_t *p_ reqdsp)324 PRI *p_datapri, bool_t *p_dspreq) 325 325 { 326 326 TCB *p_tcb; … … 335 335 datapri = ((WINFO_PDQ *)(p_tcb->p_winfo))->datapri; 336 336 enqueue_pridata(p_pdqcb, data, datapri); 337 *p_ reqdsp= wait_complete(p_tcb);337 *p_dspreq = wait_complete(p_tcb); 338 338 } 339 339 else { 340 *p_ reqdsp= false;340 *p_dspreq = false; 341 341 } 342 342 return(true); … … 346 346 *p_data = ((WINFO_PDQ *)(p_tcb->p_winfo))->data; 347 347 *p_datapri = ((WINFO_PDQ *)(p_tcb->p_winfo))->datapri; 348 *p_ reqdsp= wait_complete(p_tcb);348 *p_dspreq = wait_complete(p_tcb); 349 349 return(true); 350 350 } … … 366 366 PDQCB *p_pdqcb; 367 367 WINFO_PDQ winfo_pdq; 368 bool_t reqdsp;368 bool_t dspreq; 369 369 ER ercd; 370 370 … … 377 377 378 378 t_lock_cpu(); 379 if (send_pridata(p_pdqcb, data, datapri, & reqdsp)) {380 if ( reqdsp) {379 if (send_pridata(p_pdqcb, data, datapri, &dspreq)) { 380 if (dspreq) { 381 381 dispatch(); 382 382 } … … 409 409 { 410 410 PDQCB *p_pdqcb; 411 bool_t reqdsp;411 bool_t dspreq; 412 412 ER ercd; 413 413 … … 420 420 421 421 t_lock_cpu(); 422 if (send_pridata(p_pdqcb, data, datapri, & reqdsp)) {423 if ( reqdsp) {422 if (send_pridata(p_pdqcb, data, datapri, &dspreq)) { 423 if (dspreq) { 424 424 dispatch(); 425 425 } … … 447 447 { 448 448 PDQCB *p_pdqcb; 449 bool_t reqdsp;449 bool_t dspreq; 450 450 ER ercd; 451 451 … … 458 458 459 459 i_lock_cpu(); 460 if (send_pridata(p_pdqcb, data, datapri, & reqdsp)) {461 if ( reqdsp) {460 if (send_pridata(p_pdqcb, data, datapri, &dspreq)) { 461 if (dspreq) { 462 462 reqflg = true; 463 463 } … … 487 487 WINFO_PDQ winfo_pdq; 488 488 TMEVTB tmevtb; 489 bool_t reqdsp;489 bool_t dspreq; 490 490 ER ercd; 491 491 … … 499 499 500 500 t_lock_cpu(); 501 if (send_pridata(p_pdqcb, data, datapri, & reqdsp)) {502 if ( reqdsp) {501 if (send_pridata(p_pdqcb, data, datapri, &dspreq)) { 502 if (dspreq) { 503 503 dispatch(); 504 504 } … … 536 536 PDQCB *p_pdqcb; 537 537 WINFO_PDQ winfo_pdq; 538 bool_t reqdsp;538 bool_t dspreq; 539 539 ER ercd; 540 540 … … 546 546 547 547 t_lock_cpu(); 548 if (receive_pridata(p_pdqcb, p_data, p_datapri, & reqdsp)) {549 if ( reqdsp) {548 if (receive_pridata(p_pdqcb, p_data, p_datapri, &dspreq)) { 549 if (dspreq) { 550 550 dispatch(); 551 551 } … … 583 583 { 584 584 PDQCB *p_pdqcb; 585 bool_t reqdsp;585 bool_t dspreq; 586 586 ER ercd; 587 587 … … 593 593 594 594 t_lock_cpu(); 595 if (receive_pridata(p_pdqcb, p_data, p_datapri, & reqdsp)) {596 if ( reqdsp) {595 if (receive_pridata(p_pdqcb, p_data, p_datapri, &dspreq)) { 596 if (dspreq) { 597 597 dispatch(); 598 598 } … … 622 622 WINFO_PDQ winfo_pdq; 623 623 TMEVTB tmevtb; 624 bool_t reqdsp;624 bool_t dspreq; 625 625 ER ercd; 626 626 … … 633 633 634 634 t_lock_cpu(); 635 if (receive_pridata(p_pdqcb, p_data, p_datapri, & reqdsp)) {636 if ( reqdsp) {635 if (receive_pridata(p_pdqcb, p_data, p_datapri, &dspreq)) { 636 if (dspreq) { 637 637 dispatch(); 638 638 } -
asp_wo_cfg/trunk/kernel/pridataq.h
r49 r62 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 2by Embedded and Real-Time Systems Laboratory8 * Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory 9 9 * Graduate School of Information Science, Nagoya Univ., JAPAN 10 10 * … … 148 148 */ 149 149 extern bool_t send_pridata(PDQCB *p_pdqcb, intptr_t data, 150 PRI datapri, bool_t *p_ reqdsp);150 PRI datapri, bool_t *p_dspreq); 151 151 152 152 /* … … 154 154 */ 155 155 extern bool_t receive_pridata(PDQCB *p_pdqcb, intptr_t *p_data, 156 PRI *p_datapri, bool_t *p_ reqdsp);156 PRI *p_datapri, bool_t *p_dspreq); 157 157 158 158 #endif /* TOPPERS_PRIDATAQ_H */
Note:
See TracChangeset
for help on using the changeset viewer.