Changeset 583eb458 in rtems

Timestamp:

Jul 15, 2013, 9:34:45 AM (8 years ago)

Author:

Vipul Nayyar <nayyar_vipul@…>

Branches:

4.11, 5, master

Children:

c8d78ee

Parents:

818d4b0

git-author:

Vipul Nayyar <nayyar_vipul@…> (07/15/13 09:34:45)

git-committer:

Sebastian Huber <sebastian.huber@…> (07/15/13 09:51:50)

Message:

bsp/rtl22xx: Use IRQ extensions API

File:

• c/src/lib/libbsp/arm/rtl22xx/network/network.c (modified) (2 diffs)

c/src/lib/libbsp/arm/rtl22xx/network/network.c

@@ -4 +4 @@
 #include <bsp/irq.h>
 #include <libchip/cs8900.h>
+#include <assert.h>
 
 #define CS8900_BASE 0x20000300
 unsigned int bsp_cs8900_io_base = 0;
 unsigned int bsp_cs8900_memory_base = 0;
-cs8900_device *g_cs;
-void cs8900_isr(rtems_irq_hdl_param unused);
-rtems_irq_connect_data cs8900_isr_data = {LPC22xx_INTERRUPT_EINT2,
-                                         cs8900_isr,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          NULL};
+static void cs8900_isr(void *);
 
 char g_enetbuf[1520];
 
-void cs8900_isr(rtems_irq_hdl_param unused)
+static void cs8900_isr(void *arg)
 {
-    cs8900_interrupt(LPC22xx_INTERRUPT_EINT2, g_cs);
+    cs8900_interrupt(LPC22xx_INTERRUPT_EINT2, arg);
 }
 
@@ -70 +64 @@
 void cs8900_attach_interrupt (cs8900_device *cs)
 {
-    g_cs = cs;
-    BSP_install_rtems_irq_handler(&cs8900_isr_data);
+    rtems_status_code status = RTEMS_SUCCESSFUL;
+    status = rtems_interrupt_handler_install(
+        LPC22xx_INTERRUPT_EINT2,
+        "Network",
+        RTEMS_INTERRUPT_UNIQUE,
+        cs8900_isr,
+        cs
+    );
+    assert(status == RTEMS_SUCCESSFUL);
 }
 
 void cs8900_detach_interrupt (cs8900_device *cs)
 {
-    BSP_remove_rtems_irq_handler(&cs8900_isr_data);
+    rtems_status_code status = RTEMS_SUCCESSFUL;
+    status = rtems_interrupt_handler_remove(
+        LPC22xx_INTERRUPT_EINT2,
+        cs8900_isr,
+        cs
+    );
+    assert(status == RTEMS_SUCCESSFUL);
 }