[PATCH] Updated legacy code in arm edb7312

Vipul Nayyar nayyar_vipul at yahoo.com
Fri Jul 12 17:22:33 UTC 2013


---
 c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c  |  3 +--
 c/src/lib/libbsp/arm/edb7312/network/network.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c
index af0448ff7..761387f 100644
--- a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c
+++ b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c
@@ -18,8 +18,7 @@
   #define CLOCK_DRIVER_USE_FAST_IDLE
 #endif
 
-void Clock_isr(rtems_irq_hdl_param arg);
-uint32_t clock_driver_get_nanoseconds_since_last_tick(void);
+void Clock_isr(void * arg);
 
 #define Clock_driver_support_at_tick()                \
   do {                                                \
diff --git a/c/src/lib/libbsp/arm/edb7312/network/network.c b/c/src/lib/libbsp/arm/edb7312/network/network.c
index ce139ec..2e018af 100644
--- a/c/src/lib/libbsp/arm/edb7312/network/network.c
+++ b/c/src/lib/libbsp/arm/edb7312/network/network.c
@@ -7,14 +7,14 @@
 #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);
+void cs8900_isr(void *);
 
 char g_enetbuf[1520];
 
-void cs8900_isr(rtems_irq_hdl_param unused)
+void cs8900_isr(void *arg)
 {
-    cs8900_interrupt(BSP_EINT3, g_cs);
+    cs8900_device *cs = arg;
+    cs8900_interrupt(BSP_EINT3, cs);
 }
 
 /* cs8900_io_set_reg - set one of the I/O addressed registers */
@@ -61,10 +61,9 @@ unsigned short cs8900_mem_get_reg (cs8900_device *cs, unsigned long reg)
     return cs8900_io_get_reg(cs, CS8900_IO_PP_DATA_PORT0);
 }
 
-void cs8900_attach_interrupt (cs8900_device *cs)
+void cs8900_attach_interrupt (void)
 {
     rtems_status_code status = RTEMS_SUCCESSFUL;
-    g_cs = cs;
 
     status = rtems_interrupt_handler_install(
         BSP_EINT3,
@@ -76,7 +75,7 @@ void cs8900_attach_interrupt (cs8900_device *cs)
     assert(status == RTEMS_SUCCESSFUL);
 }
 
-void cs8900_detach_interrupt (cs8900_device *cs)
+void cs8900_detach_interrupt (void)
 {
     rtems_status_code status = RTEMS_SUCCESSFUL;
 
-- 
1.7.11.7




More information about the devel mailing list