Changeset 602aee20 in rtems
- Timestamp:
- 10/10/08 15:50:15 (14 years ago)
- Branches:
- 4.10, 4.11, 5, master
- Children:
- da6142f
- Parents:
- 7495494
- Location:
- c/src/lib/libcpu
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libcpu/ChangeLog
r7495494 r602aee20 1 2008-09-23 Sebastian Huber <sebastian.huber@embedded-brains.de> 2 3 * shared/include/utility.h: Removed file. 4 1 5 2008-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> 2 6 -
c/src/lib/libcpu/powerpc/ChangeLog
r7495494 r602aee20 1 2008-10-02 Sebastian Huber <sebastian.huber@embedded-brains.de> 2 3 * shared/include/powerpc-utility.h: Use constraint "b" for address 4 base registers in inline assembler statements. 5 6 * mpc55xx/dspi/dspi.c, mpc55xx/edma/edma.c, mpc55xx/esci/esci.c, 7 mpc55xx/irq/irq.c, mpc83xx/gtm/gtm.c: Update for status-checks.h 8 changes. 9 1 10 2008-10-01 Ralf Corsépius <ralf.corsepius@rtems.org> 2 11 -
c/src/lib/libcpu/powerpc/mpc55xx/dspi/dspi.c
r7495494 r602aee20 163 163 &e->edma_channel_receive_update 164 164 ); 165 CHECK_SC( sc, "Create receive update semaphore");165 RTEMS_CHECK_SC( sc, "Create receive update semaphore"); 166 166 167 167 sc = mpc55xx_edma_obtain_channel( e->edma_channel_receive, &e->edma_channel_receive_error, e->edma_channel_receive_update); 168 CHECK_SC( sc, "Obtain receive eDMA channel");168 RTEMS_CHECK_SC( sc, "Obtain receive eDMA channel"); 169 169 170 170 /* eDMA transmit */ … … 176 176 &e->edma_channel_transmit_update 177 177 ); 178 CHECK_SC( sc, "Create transmit update semaphore");178 RTEMS_CHECK_SC( sc, "Create transmit update semaphore"); 179 179 180 180 sc = mpc55xx_edma_obtain_channel( e->edma_channel_transmit, &e->edma_channel_transmit_error, e->edma_channel_transmit_update); 181 CHECK_SC( sc, "Obtain transmit eDMA channel");181 RTEMS_CHECK_SC( sc, "Obtain transmit eDMA channel"); 182 182 183 183 sc = mpc55xx_edma_obtain_channel( e->edma_channel_push, NULL, RTEMS_ID_NONE); 184 CHECK_SC( sc, "Obtain push eDMA channel");184 RTEMS_CHECK_SC( sc, "Obtain push eDMA channel"); 185 185 186 186 tcd_push.SADDR = mpc55xx_dspi_push_data_address( e); … … 425 425 n_c = (int) mpc55xx_cache_aligned_size( in, (size_t) n); 426 426 if (n_c > EDMA_TCD_BITER_LINKED_SIZE) { 427 SYSLOG_WARNING( "Buffer size out of range, cannot use eDMA\n");427 RTEMS_SYSLOG_WARNING( "Buffer size out of range, cannot use eDMA\n"); 428 428 n_nc = n; 429 429 n_c = 0; 430 430 } else if (n_nc + n_c != n) { 431 SYSLOG_WARNING( "Input buffer not proper cache aligned, cannot use eDMA\n");431 RTEMS_SYSLOG_WARNING( "Input buffer not proper cache aligned, cannot use eDMA\n"); 432 432 n_nc = n; 433 433 n_c = 0; … … 437 437 #ifdef DEBUG 438 438 if (e->regs->SR.B.TXCTR != e->regs->SR.B.RXCTR) { 439 SYSLOG_WARNING( "FIFO counter not equal\n");439 RTEMS_SYSLOG_WARNING( "FIFO counter not equal\n"); 440 440 } 441 441 #endif /* DEBUG */ … … 578 578 /* Enable hardware requests */ 579 579 sc = mpc55xx_edma_enable_hardware_requests( e->edma_channel_receive, true); 580 CHECK_SCRV( sc, "Enable receive hardware requests");580 RTEMS_CHECK_SC_RV( sc, "Enable receive hardware requests"); 581 581 sc = mpc55xx_edma_enable_hardware_requests( e->edma_channel_transmit, true); 582 CHECK_SCRV( sc, "Enable transmit hardware requests");582 RTEMS_CHECK_SC_RV( sc, "Enable transmit hardware requests"); 583 583 584 584 /* Wait for transmit update */ 585 585 sc = rtems_semaphore_obtain( e->edma_channel_transmit_update, RTEMS_WAIT, RTEMS_NO_TIMEOUT); 586 CHECK_SCRV( sc, "Transmit update");586 RTEMS_CHECK_SC_RV( sc, "Transmit update"); 587 587 if (e->edma_channel_transmit_error != 0) { 588 SYSLOG_ERROR( "Transmit error status: 0x%08x\n", e->edma_channel_transmit_error);588 RTEMS_SYSLOG_ERROR( "Transmit error status: 0x%08x\n", e->edma_channel_transmit_error); 589 589 e->edma_channel_transmit_error = 0; 590 590 return -RTEMS_IO_ERROR; … … 593 593 /* Wait for receive update */ 594 594 sc = rtems_semaphore_obtain( e->edma_channel_receive_update, RTEMS_WAIT, RTEMS_NO_TIMEOUT); 595 CHECK_SCRV( sc, "Receive update");595 RTEMS_CHECK_SC_RV( sc, "Receive update"); 596 596 if (e->edma_channel_receive_error != 0) { 597 SYSLOG_ERROR( "Receive error status: 0x%08x\n", e->edma_channel_receive_error);597 RTEMS_SYSLOG_ERROR( "Receive error status: 0x%08x\n", e->edma_channel_receive_error); 598 598 e->edma_channel_receive_error = 0; 599 599 return -RTEMS_IO_ERROR; -
c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c
r7495494 r602aee20 61 61 #ifdef DEBUG 62 62 uint32_t citer = EDMA.TCD [e->channel].CITERE_LINK ? EDMA.TCD [e->channel].CITER & EDMA_TCD_BITER_LINKED_MASK : EDMA.TCD [e->channel].CITER; 63 DEBUG_PRINT( "Channel %i (CITER = %i)\n", e->channel, citer);63 RTEMS_DEBUG_PRINT( "Channel %i (CITER = %i)\n", e->channel, citer); 64 64 #endif /* DEBUG */ 65 65 EDMA.CIRQR.R = e->channel; 66 66 sc = rtems_semaphore_release( e->transfer_update); 67 SYSLOG_WARNING_SC( sc, "Transfer update semaphore release");67 RTEMS_SYSLOG_WARNING_SC( sc, "Transfer update semaphore release"); 68 68 } 69 69 … … 96 96 error_register = EDMA.ERH.R; 97 97 } 98 DEBUG_PRINT( "Error register %s: 0x%08x\n", channel_start < 32 ? "low" : "high", error_register);98 RTEMS_DEBUG_PRINT( "Error register %s: 0x%08x\n", channel_start < 32 ? "low" : "high", error_register); 99 99 100 100 /* Fill channel link table */ … … 127 127 } 128 128 sc = mpc55xx_edma_enable_hardware_requests( i, false); 129 SYSLOG_ERROR_SC( sc, "Disable hardware requests, channel = %i", i);129 RTEMS_SYSLOG_ERROR_SC( sc, "Disable hardware requests"); 130 130 sc = rtems_semaphore_release( e->transfer_update); 131 SYSLOG_WARNING_SC( sc, "Transfer update semaphore release, channel = %i", i);131 RTEMS_SYSLOG_WARNING_SC( sc, "Transfer update semaphore release"); 132 132 } 133 133 } … … 180 180 &mpc55xx_edma_channel_occupation_mutex 181 181 ); 182 CHECK_SC( sc, "Create channel occupation mutex");182 RTEMS_CHECK_SC( sc, "Create channel occupation mutex"); 183 183 184 184 /* Arbitration mode: round robin */ … … 205 205 &mpc55xx_edma_irq_error_low_channel 206 206 ); 207 CHECK_SC( sc, "Install low error interrupt handler");207 RTEMS_CHECK_SC( sc, "Install low error interrupt handler"); 208 208 sc = mpc55xx_interrupt_handler_install( 209 209 MPC55XX_IRQ_EDMA_ERROR_HIGH, … … 214 214 &mpc55xx_edma_irq_error_high_channel 215 215 ); 216 CHECK_SC( sc, "Install high error interrupt handler");216 RTEMS_CHECK_SC( sc, "Install high error interrupt handler"); 217 217 218 218 return RTEMS_SUCCESSFUL; … … 230 230 /* Check occupation */ 231 231 sc = rtems_semaphore_obtain( mpc55xx_edma_channel_occupation_mutex, RTEMS_WAIT, 0); 232 CHECK_SC( sc, "Obtain channel occupation mutex");232 RTEMS_CHECK_SC( sc, "Obtain channel occupation mutex"); 233 233 if (channel < 32) { 234 234 channel_occupied = mpc55xx_edma_channel_occupation_low & (0x1 << channel); … … 244 244 if (channel_occupied) { 245 245 sc = rtems_semaphore_release( mpc55xx_edma_channel_occupation_mutex); 246 SYSLOG_WARNING_SC( sc, "Release occupation mutex");246 RTEMS_SYSLOG_WARNING_SC( sc, "Release occupation mutex"); 247 247 return RTEMS_RESOURCE_IN_USE; 248 248 } else { 249 249 sc = rtems_semaphore_release( mpc55xx_edma_channel_occupation_mutex); 250 CHECK_SC( sc, "Release channel occupation mutex");250 RTEMS_CHECK_SC( sc, "Release channel occupation mutex"); 251 251 } 252 252 … … 264 264 &mpc55xx_edma_channel_table [channel] 265 265 ); 266 CHECK_SC( sc, "Install channel interrupt handler");266 RTEMS_CHECK_SC( sc, "Install channel interrupt handler"); 267 267 268 268 /* Enable error interrupts */ 269 269 sc = mpc55xx_edma_enable_error_interrupts( channel, true); 270 CHECK_SC( sc, "Enable error interrupts");270 RTEMS_CHECK_SC( sc, "Enable error interrupts"); 271 271 272 272 return RTEMS_SUCCESSFUL; -
c/src/lib/libcpu/powerpc/mpc55xx/esci/esci.c
r7495494 r602aee20 459 459 e = &mpc55xx_esci_driver_table [i]; 460 460 sc = rtems_io_register_name ( e->device_name, major, i); 461 CHECK_SC( sc, "Register IO device");461 RTEMS_CHECK_SC( sc, "Register IO device"); 462 462 if (e->console) { 463 463 if (console_done) { 464 SYSLOG_WARNING( "Multiple console ports defined\n");464 RTEMS_SYSLOG_WARNING( "Multiple console ports defined\n"); 465 465 } else { 466 466 console_done = 1; 467 467 if (e->use_interrupts) { 468 SYSLOG_WARNING( "Cannot use interrupts for console port\n");468 RTEMS_SYSLOG_WARNING( "Cannot use interrupts for console port\n"); 469 469 } 470 470 sc = rtems_io_register_name( CONSOLE_DEVICE_NAME, major, i); 471 CHECK_SC( sc, "Register IO device");471 RTEMS_CHECK_SC( sc, "Register IO device"); 472 472 } 473 473 } … … 486 486 e 487 487 ); 488 CHECK_SC( sc, "Install IRQ handler");488 RTEMS_CHECK_SC( sc, "Install IRQ handler"); 489 489 } 490 490 } -
c/src/lib/libcpu/powerpc/mpc55xx/irq/irq.c
r7495494 r602aee20 104 104 if (MPC55XX_IRQ_IS_VALID( vector) && MPC55XX_INTC_IS_VALID_PRIORITY( priority)) { 105 105 sc = rtems_interrupt_handler_install( vector, info, options, handler, arg); 106 CHECK_SC( sc, "Install interrupt handler");106 RTEMS_CHECK_SC( sc, "Install interrupt handler"); 107 107 return mpc55xx_intc_set_priority( vector, priority); 108 108 } else { -
c/src/lib/libcpu/powerpc/mpc83xx/gtm/gtm.c
r7495494 r602aee20 66 66 67 67 sc = mpc83xx_gtm_set_clock( timer, clock); 68 CHECK_SC( sc, "Set clock");68 RTEMS_CHECK_SC( sc, "Set clock"); 69 69 70 70 sc = mpc83xx_gtm_set_value( timer, 0); 71 CHECK_SC( sc, "Set value");71 RTEMS_CHECK_SC( sc, "Set value"); 72 72 73 73 sc = mpc83xx_gtm_set_reference( timer, 0); 74 CHECK_SC( sc, "Set reference");74 RTEMS_CHECK_SC( sc, "Set reference"); 75 75 76 76 sc = mpc83xx_gtm_set_prescale( timer, 0); 77 CHECK_SC( sc, "Set prescale");77 RTEMS_CHECK_SC( sc, "Set prescale"); 78 78 79 79 return RTEMS_SUCCESSFUL; -
c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h
r7495494 r602aee20 54 54 "lbz %0, 0(%1)" 55 55 : "=r" (value) 56 : " r" (src)56 : "b" (src) 57 57 ); 58 58 … … 70 70 "lhz %0, 0(%1)" 71 71 : "=r" (value) 72 : " r" (src)72 : "b" (src) 73 73 ); 74 74 … … 86 86 "lwz %0, 0(%1)" 87 87 : "=r" (value) 88 : " r" (src)88 : "b" (src) 89 89 ); 90 90 … … 100 100 "stb %0, 0(%1)" 101 101 : 102 : "r" (value), " r" (dest)102 : "r" (value), "b" (dest) 103 103 ); 104 104 } … … 112 112 "sth %0, 0(%1)" 113 113 : 114 : "r" (value), " r" (dest)114 : "r" (value), "b" (dest) 115 115 ); 116 116 } … … 123 123 asm volatile ( 124 124 "stw %0, 0(%1)" : 125 : "r" (value), " r" (dest)125 : "r" (value), "b" (dest) 126 126 ); 127 127 }
Note: See TracChangeset
for help on using the changeset viewer.