Changeset f3173c0 in rtems
- Timestamp:
- Nov 4, 2005, 12:23:28 AM (15 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- ab20575
- Parents:
- 0ac68b0
- Location:
- c/src/lib/libbsp/powerpc
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
r0ac68b0 rf3173c0 111 111 112 112 /* on the MVME5500, these are the GT64260B external GPP0 interrupt */ 113 #define BSP_ ISA_UART_COM2_IRQ (BSP_GPP_IRQ_LOWEST_OFFSET)114 #define BSP_ ISA_UART_COM1_IRQ (BSP_GPP_IRQ_LOWEST_OFFSET)113 #define BSP_UART_COM2_IRQ (BSP_GPP_IRQ_LOWEST_OFFSET) 114 #define BSP_UART_COM1_IRQ (BSP_GPP_IRQ_LOWEST_OFFSET) 115 115 #define BSP_GPP8_IRQ_OFFSET (BSP_GPP_IRQ_LOWEST_OFFSET+8) 116 116 #define BSP_GPP_PMC1_INTA (BSP_GPP8_IRQ_OFFSET) -
c/src/lib/libbsp/powerpc/psim/irq/irq.h
r0ac68b0 rf3173c0 106 106 #define BSP_ISA_KEYBOARD (1) 107 107 108 #define BSP_ ISA_UART_COM2_IRQ (3)108 #define BSP_UART_COM2_IRQ (3) 109 109 110 #define BSP_ ISA_UART_COM1_IRQ (4)110 #define BSP_UART_COM1_IRQ (4) 111 111 112 112 #define BSP_ISA_RT_TIMER1 (8) -
c/src/lib/libbsp/powerpc/shared/console/uart.c
r0ac68b0 rf3173c0 22 22 { 23 23 unsigned long ioBase; 24 int irq; 24 25 int hwFlow; 25 26 int baud; … … 42 43 #ifdef BSP_UART_IOBASE_COM1 43 44 BSP_UART_IOBASE_COM1, 45 BSP_UART_COM1_IRQ, 44 46 #else 45 47 UART_UNSUPP, 48 -1, 46 49 #endif 47 50 }, … … 49 52 #ifdef BSP_UART_IOBASE_COM2 50 53 BSP_UART_IOBASE_COM2, 54 BSP_UART_COM2_IRQ, 51 55 #else 52 56 UART_UNSUPP, 57 -1, 53 58 #endif 54 59 }, … … 136 141 /* Sanity check */ 137 142 SANITY_CHECK(uart); 143 144 /* Make sure any printk activity drains before 145 * re-initializing. 146 */ 147 while ( ! (uread(uart, LSR) & THRE) ) 148 ; 138 149 139 150 switch(baud) … … 461 472 int uart; 462 473 463 #if defined(mvme2100) 464 uart = BSP_UART_COM1; 465 #else 466 uart = (irq->name == BSP_ISA_UART_COM1_IRQ) ? 474 uart = (irq->name == BSP_UART_COM1_IRQ) ? 467 475 BSP_UART_COM1 : BSP_UART_COM2; 468 #endif 476 469 477 return uread(uart,IER); 470 478 } … … 474 482 { 475 483 rtems_irq_connect_data d={0}; 476 #if defined(mvme2100) 477 d.name = BSP_UART_COM1_IRQ; 478 #else 479 d.name = (uart == BSP_UART_COM1) ? 480 BSP_ISA_UART_COM1_IRQ : BSP_ISA_UART_COM2_IRQ; 481 #endif 484 d.name = uart_data[uart].irq; 482 485 d.off = d.on = uart_noop; 483 486 d.isOn = uart_isr_is_on; … … 489 492 BSP_uart_install_isr(int uart, rtems_irq_hdl handler) 490 493 { 494 /* Using shared interrupts by default might break things.. the 495 * shared IRQ installer uses malloc() and if a BSP had called this 496 * during early init it might not work... 497 */ 498 #ifdef BSP_UART_USE_SHARED_IRQS 499 return doit(uart, handler, BSP_install_rtems_shared_irq_handler); 500 #else 491 501 return doit(uart, handler, BSP_install_rtems_irq_handler); 502 #endif 492 503 } 493 504 -
c/src/lib/libbsp/powerpc/shared/irq/irq.h
r0ac68b0 rf3173c0 131 131 #define BSP_FRONT_PANEL_ABORT_IRQ (BSP_PCI_IRQ_LOWEST_OFFSET + 14) 132 132 #define BSP_RTC_IRQ (BSP_PCI_IRQ_LOWEST_OFFSET + 15) 133 #else 134 #define BSP_UART_COM1_IRQ BSP_ISA_UART_COM1_IRQ 135 #define BSP_UART_COM2_IRQ BSP_ISA_UART_COM2_IRQ 133 136 #endif 134 137
Note: See TracChangeset
for help on using the changeset viewer.