Changeset d1e10fe6 in rtems

Timestamp:

Feb 15, 2011, 11:25:24 PM (9 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, master

Children:

a0323a9f

Parents:

fa47ade

Message:

2011-02-15 Jennifer Averett

• libchip/serial/ns16550.c, libchip/serial/ns16550_p.h: Support i386 style IRQs.

Location:

c/src

Files:

• ChangeLog (modified) (1 diff)
• libchip/serial/ns16550.c (modified) (5 diffs)
• libchip/serial/ns16550_p.h (modified) (1 diff)

c/src/ChangeLog

@@ +1 @@
+2011-02-15      Jennifer Averett
+
+        * libchip/serial/ns16550.c, libchip/serial/ns16550_p.h: Support i386
+        style IRQs.
+
 2011-02-11      Ralf Corsépius <ralf.corsepius@rtems.org>
 

c/src/libchip/serial/ns16550.c

@@ -50 +50 @@
     #define BSP_FEATURE_IRQ_LEGACY_SHARED_HANDLER_SUPPORT
   #endif
+#elif defined(__i386__)
+  #include <bsp/irq.h>
 #endif
 
@@ -473 +475 @@
 }
 
-#if defined(BSP_FEATURE_IRQ_EXTENSION) || defined(BSP_FEATURE_IRQ_LEGACY)
 
 /**
@@ -522 +523 @@
   } while ((get( port, NS16550_INTERRUPT_ID) & SP_IID_0) == 0);
 }
+#if defined(BSP_FEATURE_IRQ_EXTENSION) || defined(BSP_FEATURE_IRQ_LEGACY)
 #endif
 
@@ -579 +581 @@
 }
 
+ NS16550_STATIC rtems_isr ns16550_isr(void *arg)
+ {
+    int minor = (int) arg;
+
+    ns16550_process( minor);
+ }
+
+/*
+ *  ns16550_initialize_interrupts
+ *
+ *  This routine initializes the port to operate in interrupt driver mode.
+ */
+NS16550_STATIC void ns16550_initialize_interrupts( int minor)
+{
 #if defined(BSP_FEATURE_IRQ_EXTENSION) || defined(BSP_FEATURE_IRQ_LEGACY)
-  NS16550_STATIC rtems_isr ns16550_isr(void *arg)
-  {
-    int minor = (int) arg;
-
-    ns16550_process( minor);
-  }
 #endif
-
-/*
- *  ns16550_initialize_interrupts
- *
- *  This routine initializes the port to operate in interrupt driver mode.
- */
-NS16550_STATIC void ns16550_initialize_interrupts( int minor)
-{
-#if defined(BSP_FEATURE_IRQ_EXTENSION) || defined(BSP_FEATURE_IRQ_LEGACY)
   console_tbl *c = &Console_Port_Tbl [minor];
-#endif
   console_data *d = &Console_Port_Data [minor];
 
@@ -649 +649 @@
       }
     }
+  #elif defined(__i386__)
+    {
+      int rv = 0;
+      rtems_irq_connect_data cd = {
+        c->ulIntVector,
+        ns16550_isr,
+        (void *) minor,
+        NULL,
+        NULL,
+        NULL
+      };
+      rv = BSP_install_rtems_irq_handler( &cd);
+      if (rv == 0) {
+        printk( "%s: Error: Install interrupt handler\n", __func__);
+        rtems_fatal_error_occurred( 0xdeadbeef);
+      }
+    }
   #endif
 }

c/src/libchip/serial/ns16550_p.h

@@ -28 +28 @@
  */
 
-#define NS16550_STATIC static
+#define NS16550_STATIC
 
 #define NS16550_RECEIVE_BUFFER   0