2005-11-03 <strauman@slac.stanford.edu>

	* 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.

4 files changed, 29 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h b/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
index f7c5811207..e80ff78857 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
@@ -110,8 +110,8 @@
 #define BSP_MAIN_GPP31_24_IRQ         (BSP_MICH_IRQ_LOWEST_OFFSET+27)
 
   /* 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)
 #define BSP_GPP16_IRQ_OFFSET          (BSP_GPP_IRQ_LOWEST_OFFSET+16)
diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq.h b/c/src/lib/libbsp/powerpc/psim/irq/irq.h
index 45eab0c561..793128bdc6 100644
--- a/c/src/lib/libbsp/powerpc/psim/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/psim/irq/irq.h
@@ -105,9 +105,9 @@
 
 #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)
   
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.c b/c/src/lib/libbsp/powerpc/shared/console/uart.c
index ab48bb399d..0fe0388cb5 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/uart.c
@@ -21,6 +21,7 @@
 struct uart_data
 {
   unsigned long			ioBase;
+  int					irq;
   int					hwFlow;
   int					baud;
   BSP_UartBreakCbRec	breakCallback;
@@ -41,15 +42,19 @@ static struct uart_data uart_data[2] = {
 	{
 #ifdef	BSP_UART_IOBASE_COM1
 		BSP_UART_IOBASE_COM1,
+		BSP_UART_COM1_IRQ,
 #else
 		UART_UNSUPP,
+		-1,
 #endif
 	},
 	{
 #ifdef	BSP_UART_IOBASE_COM2
 		BSP_UART_IOBASE_COM2,
+		BSP_UART_COM2_IRQ,
 #else
 		UART_UNSUPP,
+		-1,
 #endif
 	},
 };
@@ -135,6 +140,12 @@ BSP_uart_init(int uart, int baud, int hwFlow)
 
   /* Sanity check */
   SANITY_CHECK(uart);
+  
+  /* Make sure any printk activity drains before
+   * re-initializing.
+   */
+  while ( ! (uread(uart, LSR) & THRE) )
+	;
 
   switch(baud)
     {
@@ -460,12 +471,9 @@ uart_isr_is_on(const rtems_irq_connect_data *irq)
 {
   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);
 }
 
@@ -473,12 +481,7 @@ static int
 doit(int uart, rtems_irq_hdl handler, int (*p)(const rtems_irq_connect_data*))
 {
 	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;
 	d.hdl  = handler;
@@ -488,7 +491,15 @@ doit(int uart, rtems_irq_hdl handler, int (*p)(const rtems_irq_connect_data*))
 int
 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
 }
 
 int
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.h b/c/src/lib/libbsp/powerpc/shared/irq/irq.h
index 650e831454..1a983f8832 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.h
@@ -130,6 +130,9 @@ extern "C" {
 #define BSP_UART_COM1_IRQ               (BSP_PCI_IRQ_LOWEST_OFFSET + 13)
 #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
 
 /*