Changeset f3173c0 in rtems

Timestamp:

Nov 4, 2005, 12:23:28 AM (14 years ago)

Author:

Till Straumann <strauman@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

ab20575

Parents:

0ac68b0

Message:

2005-11-03 <strauman@…>

• mvme5500/irq/irq.h, psim/irq/irq.h, shared/console/uart.c, shared/irq/irq.h: Renamed BSP_ISA_UART_COMx_IRQ -> BSP_UART_COMx_IRQ

(uart driver is ISA independent).
Removed ugly #ifdef mvme2100. Added test for

BSP_UART_USE_SHARED_IRQS symbol which a BSP can define to request
that the serial interrupt be shared.

Location:

c/src/lib/libbsp/powerpc

Files:

• mvme5500/irq/irq.h (modified) (1 diff)
• psim/irq/irq.h (modified) (1 diff)
• shared/console/uart.c (modified) (7 diffs)
• shared/irq/irq.h (modified) (1 diff)

c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h

@@ -111 +111 @@
 
   /* on the MVME5500, these are the GT64260B external GPP0 interrupt */
-#define BSP_ISA_UART_COM2_IRQ           (BSP_GPP_IRQ_LOWEST_OFFSET)
-#define BSP_ISA_UART_COM1_IRQ           (BSP_GPP_IRQ_LOWEST_OFFSET)
+#define BSP_UART_COM2_IRQ               (BSP_GPP_IRQ_LOWEST_OFFSET)
+#define BSP_UART_COM1_IRQ               (BSP_GPP_IRQ_LOWEST_OFFSET)
 #define BSP_GPP8_IRQ_OFFSET             (BSP_GPP_IRQ_LOWEST_OFFSET+8)
 #define BSP_GPP_PMC1_INTA               (BSP_GPP8_IRQ_OFFSET)

c/src/lib/libbsp/powerpc/psim/irq/irq.h

@@ -106 +106 @@
 #define BSP_ISA_KEYBOARD                (1)
 
-#define BSP_ISA_UART_COM2_IRQ           (3)
+#define BSP_UART_COM2_IRQ               (3)
 
-#define BSP_ISA_UART_COM1_IRQ           (4)
+#define BSP_UART_COM1_IRQ               (4)
 
 #define BSP_ISA_RT_TIMER1               (8)

c/src/lib/libbsp/powerpc/shared/console/uart.c

@@ -22 +22 @@
 {
   unsigned long                 ioBase;
+  int                                   irq;
   int                                   hwFlow;
   int                                   baud;
@@ -42 +43 @@
 #ifdef  BSP_UART_IOBASE_COM1
                 BSP_UART_IOBASE_COM1,
+                BSP_UART_COM1_IRQ,
 #else
                 UART_UNSUPP,
+                -1,
 #endif
         },
@@ -49 +52 @@
 #ifdef  BSP_UART_IOBASE_COM2
                 BSP_UART_IOBASE_COM2,
+                BSP_UART_COM2_IRQ,
 #else
                 UART_UNSUPP,
+                -1,
 #endif
         },
@@ -136 +141 @@
   /* Sanity check */
   SANITY_CHECK(uart);
+  
+  /* Make sure any printk activity drains before
+   * re-initializing.
+   */
+  while ( ! (uread(uart, LSR) & THRE) )
+        ;
 
   switch(baud)
@@ -461 +472 @@
   int uart;
 
-#if defined(mvme2100)
-  uart = BSP_UART_COM1;
-#else
-  uart = (irq->name == BSP_ISA_UART_COM1_IRQ) ?
+  uart = (irq->name == BSP_UART_COM1_IRQ) ?
                         BSP_UART_COM1 : BSP_UART_COM2;
-#endif
+
   return uread(uart,IER);
 }
@@ -474 +482 @@
 {
         rtems_irq_connect_data d={0};
-#if defined(mvme2100)
-        d.name = BSP_UART_COM1_IRQ;
-#else
-        d.name = (uart == BSP_UART_COM1) ?
-                        BSP_ISA_UART_COM1_IRQ : BSP_ISA_UART_COM2_IRQ;
-#endif
+        d.name = uart_data[uart].irq;
         d.off  = d.on = uart_noop;
         d.isOn = uart_isr_is_on;
@@ -489 +492 @@
 BSP_uart_install_isr(int uart, rtems_irq_hdl handler)
 {
+/* Using shared interrupts by default might break things.. the
+ * shared IRQ installer uses malloc() and if a BSP had called this
+ * during early init it might not work...
+ */
+#ifdef BSP_UART_USE_SHARED_IRQS
+        return doit(uart, handler, BSP_install_rtems_shared_irq_handler);
+#else
         return doit(uart, handler, BSP_install_rtems_irq_handler);
+#endif
 }
 

c/src/lib/libbsp/powerpc/shared/irq/irq.h

@@ -131 +131 @@
 #define BSP_FRONT_PANEL_ABORT_IRQ       (BSP_PCI_IRQ_LOWEST_OFFSET + 14)
 #define BSP_RTC_IRQ                     (BSP_PCI_IRQ_LOWEST_OFFSET + 15)
+#else
+#define BSP_UART_COM1_IRQ               BSP_ISA_UART_COM1_IRQ
+#define BSP_UART_COM2_IRQ               BSP_ISA_UART_COM2_IRQ
 #endif