From c193baadaf4ba825374104b150eceaed203800b0 Mon Sep 17 00:00:00 2001 From: Thomas Doerfler Date: Fri, 9 Apr 2010 20:24:57 +0000 Subject: unify irq data types and code, merge s3c2400/s3c2410 support --- c/src/lib/libbsp/arm/ChangeLog | 6 ++ c/src/lib/libbsp/arm/csb336/ChangeLog | 5 + c/src/lib/libbsp/arm/csb336/network/network.c | 2 +- c/src/lib/libbsp/arm/csb336/startup/bspstart.c | 2 + c/src/lib/libbsp/arm/csb337/ChangeLog | 5 + c/src/lib/libbsp/arm/csb337/network/network.c | 12 +-- c/src/lib/libbsp/arm/csb337/startup/bspstart.c | 1 + c/src/lib/libbsp/arm/edb7312/ChangeLog | 6 ++ c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c | 5 +- c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c | 2 - c/src/lib/libbsp/arm/edb7312/irq/irq.h | 106 +------------------- c/src/lib/libbsp/arm/edb7312/network/network.c | 17 ++-- c/src/lib/libbsp/arm/edb7312/startup/bspstart.c | 1 + c/src/lib/libbsp/arm/gba/ChangeLog | 5 + c/src/lib/libbsp/arm/gba/clock/clockdrv.c | 6 +- c/src/lib/libbsp/arm/gba/console/console.c | 2 +- c/src/lib/libbsp/arm/gba/irq/irq.h | 109 +-------------------- c/src/lib/libbsp/arm/gba/irq/irq_init.c | 2 +- c/src/lib/libbsp/arm/gp32/ChangeLog | 5 + c/src/lib/libbsp/arm/gp32/Makefile.am | 6 +- c/src/lib/libbsp/arm/gp32/startup/bspstart.c | 1 + c/src/lib/libbsp/arm/gumstix/ChangeLog | 4 + c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c | 13 ++- c/src/lib/libbsp/arm/nds/ChangeLog | 6 ++ c/src/lib/libbsp/arm/nds/Makefile.am | 2 - c/src/lib/libbsp/arm/nds/clock/clock.c | 16 ++- c/src/lib/libbsp/arm/nds/fb/fb.c | 2 +- c/src/lib/libbsp/arm/nds/irq/irq.c | 7 +- c/src/lib/libbsp/arm/nds/irq/irq.h | 62 ------------ c/src/lib/libbsp/arm/nds/preinstall.am | 4 - c/src/lib/libbsp/arm/nds/sound/sound.c | 2 +- c/src/lib/libbsp/arm/nds/startup/bspstart.c | 1 + c/src/lib/libbsp/arm/nds/touchscreen/touchscreen.c | 2 +- c/src/lib/libbsp/arm/nds/wifi/wifi.c | 2 +- c/src/lib/libbsp/arm/rtl22xx/ChangeLog | 5 + c/src/lib/libbsp/arm/rtl22xx/network/network.c | 15 ++- c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c | 1 + c/src/lib/libbsp/arm/shared/irq/irq_init.c | 2 +- .../libbsp/arm/shared/lpc/clock/lpc-clock-config.c | 6 +- .../libbsp/arm/shared/lpc/network/lpc-ethernet.c | 29 +++--- c/src/lib/libbsp/arm/shared/start/start.S | 3 +- c/src/lib/libbsp/arm/smdk2410/ChangeLog | 4 + c/src/lib/libbsp/arm/smdk2410/Makefile.am | 6 +- c/src/lib/libbsp/shared/ChangeLog | 4 + c/src/lib/libbsp/shared/umon/umonrtemsglue.c | 4 +- 45 files changed, 148 insertions(+), 360 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/nds/irq/irq.h (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/arm/ChangeLog b/c/src/lib/libbsp/arm/ChangeLog index fe374dcae0..0279196665 100644 --- a/c/src/lib/libbsp/arm/ChangeLog +++ b/c/src/lib/libbsp/arm/ChangeLog @@ -1,3 +1,9 @@ +2010-04-09 Thomas Doerfler + + * shared/irq/irq_init.c, shared/lpc/clock/lpc-clock-config.c, + shared/lpc/network/lpc-ethernet.c, shared/start/start.S: make + irq data types consistent + 2010-04-09 Sebastian Huber * shared/lpc/include/lpc-dma.h: New file. diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index acbd1f9137..61203d077f 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Thomas Doerfler + + * startup/bspstart.c, network/network.c: make irq data types + consistent + 2010-04-07 Joel Sherrill * console/uart.c: Eliminate warnings. diff --git a/c/src/lib/libbsp/arm/csb336/network/network.c b/c/src/lib/libbsp/arm/csb336/network/network.c index fa6f903a4d..8f642a9ba9 100644 --- a/c/src/lib/libbsp/arm/csb336/network/network.c +++ b/c/src/lib/libbsp/arm/csb336/network/network.c @@ -49,7 +49,7 @@ static int enet_isr_is_on(const rtems_irq_connect_data *irq); /* Replace the first value with the clock's interrupt name. */ rtems_irq_connect_data mc9328mxl_enet_isr_data = { .name = BSP_INT_GPIO_PORTA, - .hdl = (rtems_irq_hdl)enet_isr, + .hdl = enet_isr, .handle = (void *)BSP_INT_GPIO_PORTA, .on = enet_isr_on, .off = enet_isr_off, diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c index bb22eca0a0..e3081e1f79 100644 --- a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c @@ -16,6 +16,8 @@ #include extern void rtems_irq_mngt_init(void); +extern void rtems_exception_init_mngt(void); + extern void mmu_set_cpu_async_mode(void); /* diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index 1794020b1a..10bd660acf 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Thomas Doerfler + + * startup/bspstart.c, network/network.c: make irq data types + consistent + 2009-12-08 Fernando Nicodemos * console/font8x16.h, console/sed1356.c: Fix typos. diff --git a/c/src/lib/libbsp/arm/csb337/network/network.c b/c/src/lib/libbsp/arm/csb337/network/network.c index 34f8a7b5bc..e16b646035 100644 --- a/c/src/lib/libbsp/arm/csb337/network/network.c +++ b/c/src/lib/libbsp/arm/csb337/network/network.c @@ -84,7 +84,7 @@ /* RTEMS event used to start transmit daemon. */ #define START_TRANSMIT_EVENT RTEMS_EVENT_2 -rtems_isr at91rm9200_emac_isr(rtems_vector_number vector); +static void at91rm9200_emac_isr (rtems_irq_hdl_param unused); static void at91rm9200_emac_isr_on(const rtems_irq_connect_data *unused); static void at91rm9200_emac_isr_off(const rtems_irq_connect_data *unused); static int at91rm9200_emac_isr_is_on(const rtems_irq_connect_data *irq); @@ -92,12 +92,12 @@ static int at91rm9200_emac_isr_is_on(const rtems_irq_connect_data *irq); /* Replace the first value with the clock's interrupt name. */ rtems_irq_connect_data at91rm9200_emac_isr_data = { AT91RM9200_INT_EMAC, - (rtems_irq_hdl)at91rm9200_emac_isr, + at91rm9200_emac_isr, + NULL, at91rm9200_emac_isr_on, at91rm9200_emac_isr_off, - at91rm9200_emac_isr_is_on, - 3, /* unused for ARM */ - 0 }; /* unused for ARM */ + at91rm9200_emac_isr_is_on +}; /* use the values defined in linkcmds for our use of SRAM */ @@ -847,7 +847,7 @@ at91rm9200_emac_ioctl (struct ifnet *ifp, ioctl_command_t command, caddr_t data) } /* interrupt handler */ -rtems_isr at91rm9200_emac_isr (rtems_vector_number v) +static void at91rm9200_emac_isr (rtems_irq_hdl_param unused) { unsigned long status32; diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c index 5857d04429..9546ceadbd 100644 --- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c @@ -25,6 +25,7 @@ /* Function prototypes */ extern void rtems_irq_mngt_init(void); +extern void rtems_exception_init_mngt(void); void bsp_libc_init( void *, uint32_t, int ); static void fix_mac_addr(void); void bsp_usart_init(void); diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index 06bc90a53f..5c7e32ed1c 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,9 @@ +2010-04-09 Thomas Doerfler + + * clock/clockdrv.c, irq/bsp_irq_init.c, irq/irq.h + startup/bspstart.c, network/network.c: make irq data types + consistent + 2010-04-07 Joel Sherrill * start/start.S: Verify boot_card() is passed a NULL. diff --git a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c index c081e8c31c..32d185501d 100644 --- a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c @@ -27,11 +27,10 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq); rtems_irq_connect_data clock_isr_data = {BSP_TC1OI, (rtems_irq_hdl)Clock_isr, + NULL, clock_isr_on, clock_isr_off, - clock_isr_is_on, - 3, - 0 }; + clock_isr_is_on}; #define CLOCK_VECTOR 0 diff --git a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c index 228e5c6f77..a9cc5f2171 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c +++ b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c @@ -17,8 +17,6 @@ #include #include -extern void default_int_handler(void); - void BSP_rtems_irq_mngt_init(void) { long int_stat; diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.h b/c/src/lib/libbsp/arm/edb7312/irq/irq.h index c96479e8d2..8debeaee74 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/irq.h +++ b/c/src/lib/libbsp/arm/edb7312/irq/irq.h @@ -30,9 +30,10 @@ extern "C" { * Include some preprocessor value also used by assember code */ +#include #include -extern void default_int_handler(); +extern void default_int_handler(rtems_irq_hdl_param unused); /*-------------------------------------------------------------------------+ | Constants +--------------------------------------------------------------------------*/ @@ -66,62 +67,6 @@ typedef unsigned int rtems_irq_number; #define BSP_DAIINT 21 #define BSP_MAX_INT 22 -/* - * Type definition for RTEMS managed interrupts - */ -typedef unsigned char rtems_irq_level; -typedef unsigned char rtems_irq_trigger; - -struct __rtems_irq_connect_data__; /* forward declaratiuon */ - -typedef void (*rtems_irq_hdl) (void); -typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__*); -typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__*); -typedef int (*rtems_irq_is_enabled)(const struct __rtems_irq_connect_data__*); - -typedef struct __rtems_irq_connect_data__ { - /* - * IRQ line - */ - rtems_irq_number name; - /* - * handler. See comment on handler properties below in function prototype. - */ - rtems_irq_hdl hdl; - /* - * function for enabling interrupts at device level (ONLY!). - * The BSP code will automatically enable it at i8259s level. - * RATIONALE : anyway such code has to exist in current driver code. - * It is usually called immediately AFTER connecting the interrupt handler. - * RTEMS may well need such a function when restoring normal interrupt - * processing after a debug session. - * - */ - rtems_irq_enable on; - /* - * function for disabling interrupts at device level (ONLY!). - * The code will disable it at i8259s level. RATIONALE : anyway - * such code has to exist for clean shutdown. It is usually called - * BEFORE disconnecting the interrupt. RTEMS may well need such - * a function when disabling normal interrupt processing for - * a debug session. May well be a NOP function. - */ - rtems_irq_disable off; - /* - * function enabling to know what interrupt may currently occur - * if someone manipulates the i8259s interrupt mask without care... - */ - rtems_irq_is_enabled isOn; - /* - * priority level at the vplus level - */ - rtems_irq_level irqLevel; - /* - * Trigger way : Rising or falling edge or High or low level - */ - rtems_irq_trigger irqTrigger; -} rtems_irq_connect_data; - /*-------------------------------------------------------------------------+ | Function Prototypes. +--------------------------------------------------------------------------*/ @@ -134,53 +79,6 @@ typedef struct __rtems_irq_connect_data__ { */ void BSP_rtems_irq_mngt_init(); -/* - * function to connect a particular irq handler. This hanlder will NOT be called - * directly as the result of the corresponding interrupt. Instead, a RTEMS - * irq prologue will be called that will : - * - * 1) save the C scratch registers, - * 2) switch to a interrupt stack if the interrupt is not nested, - * 3) store the current i8259s' interrupt masks - * 4) modify them to disable the current interrupt at 8259 level (and may - * be others depending on software priorities) - * 5) aknowledge the i8259s', - * 6) demask the processor, - * 7) call the application handler - * - * As a result the hdl function provided - * - * a) can perfectly be written is C, - * b) may also well directly call the part of the RTEMS API that can be used - * from interrupt level, - * c) It only responsible for handling the jobs that need to be done at - * the device level including (aknowledging/re-enabling the interrupt at device, - * level, getting the data,...) - * - * When returning from the function, the following will be performed by - * the RTEMS irq epilogue : - * - * 1) masks the interrupts again, - * 2) restore the original i8259s' interrupt masks - * 3) switch back on the orinal stack if needed, - * 4) perform rescheduling when necessary, - * 5) restore the C scratch registers... - * 6) restore initial execution flow - * - */ - -int BSP_install_rtems_irq_handler (const rtems_irq_connect_data*); -/* - * function to get the current RTEMS irq handler for ptr->name. It enables to - * define hanlder chain... - */ -int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* ptr); -/* - * function to get disconnect the RTEMS irq handler for ptr->name. - * This function checks that the value given is the current one for safety reason. - * The user can use the previous function to get it. - */ -int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data*); #endif /* __asm__ */ diff --git a/c/src/lib/libbsp/arm/edb7312/network/network.c b/c/src/lib/libbsp/arm/edb7312/network/network.c index 236176f171..1ce1cae4ba 100644 --- a/c/src/lib/libbsp/arm/edb7312/network/network.c +++ b/c/src/lib/libbsp/arm/edb7312/network/network.c @@ -7,20 +7,19 @@ unsigned int bsp_cs8900_io_base = 0; unsigned int bsp_cs8900_memory_base = 0; cs8900_device *g_cs; -rtems_isr cs8900_isr(rtems_vector_number v); +void cs8900_isr(rtems_irq_hdl_param unused); rtems_irq_connect_data cs8900_isr_data = {BSP_EINT3, - (rtems_irq_hdl)cs8900_isr, - NULL, - NULL, - NULL, - 0, - 0 }; + cs8900_isr, + NULL, + NULL, + NULL, + NULL}; char g_enetbuf[1520]; -rtems_isr cs8900_isr(rtems_vector_number v) +void cs8900_isr(rtems_irq_hdl_param unused) { - cs8900_interrupt(v, g_cs); + cs8900_interrupt(BSP_EINT3, g_cs); } /* cs8900_io_set_reg - set one of the I/O addressed registers */ diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c index cda42969a9..9189162d24 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c @@ -18,6 +18,7 @@ * Function prototypes */ extern void rtems_irq_mngt_init(void); +extern void rtems_exception_init_mngt(void); /* * NAME: bsp_start_default - BSP initialization function diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog index 769f222cfc..2f81f044ef 100644 --- a/c/src/lib/libbsp/arm/gba/ChangeLog +++ b/c/src/lib/libbsp/arm/gba/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Thomas Doerfler + + * clock/clockdrv.c, console/console.c, irq/irq.c, irq/irq.h, + irq/irq_init.c: make irq data types consistent + 2010-04-07 Joel Sherrill * start/start.S: Verify boot_card() is passed a NULL. diff --git a/c/src/lib/libbsp/arm/gba/clock/clockdrv.c b/c/src/lib/libbsp/arm/gba/clock/clockdrv.c index 3e1a5bd4c8..82678f3480 100644 --- a/c/src/lib/libbsp/arm/gba/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/gba/clock/clockdrv.c @@ -31,11 +31,10 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq); rtems_irq_connect_data clock_isr_data = {BSP_IRQ_TIMER3, (rtems_irq_hdl)Clock_isr, + NULL, clock_isr_on, clock_isr_off, - clock_isr_is_on, - 0, - 0 }; + clock_isr_is_on}; #define CLOCK_VECTOR 0 @@ -44,6 +43,7 @@ rtems_irq_connect_data clock_isr_data = {BSP_IRQ_TIMER3, #define Clock_driver_support_install_isr( _new, _old ) \ do { \ BSP_install_rtems_irq_handler(&clock_isr_data); \ + _old = NULL; \ } while(0) #define Clock_driver_support_shutdown_hardware() \ diff --git a/c/src/lib/libbsp/arm/gba/console/console.c b/c/src/lib/libbsp/arm/gba/console/console.c index 3059c9b94f..43554c508a 100644 --- a/c/src/lib/libbsp/arm/gba/console/console.c +++ b/c/src/lib/libbsp/arm/gba/console/console.c @@ -49,7 +49,7 @@ static int gba_pollRead(int minor) * @return character code * */ -static int gba_write(int minor, const char *buf, int len) +static ssize_t gba_write(int minor, const char *buf, size_t len) { int i; diff --git a/c/src/lib/libbsp/arm/gba/irq/irq.h b/c/src/lib/libbsp/arm/gba/irq/irq.h index 3ba5f4ebac..7bb00e456a 100644 --- a/c/src/lib/libbsp/arm/gba/irq/irq.h +++ b/c/src/lib/libbsp/arm/gba/irq/irq.h @@ -31,9 +31,10 @@ extern "C" { #define VECTOR_TABLE (&irq_vector_table[0]) #include +#include #include -extern void default_int_handler(); +extern void default_int_handler(rtems_irq_hdl_param unused); /*---------------------------------------------------------------------------* * MACROS * @@ -67,67 +68,10 @@ typedef enum { BSP_MAX_INT = 16 /**< BSP_MAX_INT <= _irq_max_vector in linkcmds */ } rtems_irq_symbolic_name; -/* - * Type definition for RTEMS managed interrupts - */ -typedef unsigned char rtems_irq_level; -typedef unsigned char rtems_irq_trigger; extern void _irq_max_vector; /**< defined in lincmds */ extern uint32_t irq_vector_table[BSP_MAX_INT]; /**< allocated in linkcmds */ - -struct __rtems_irq_connect_data__; /* forward declaratiuon */ - -typedef void (*rtems_irq_hdl) (void); -typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__*); -typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__*); -typedef int (*rtems_irq_is_enabled) (const struct __rtems_irq_connect_data__*); - -/** irq connection data structure */ -typedef struct __rtems_irq_connect_data__ { - /** - * IRQ line - */ - rtems_irq_symbolic_name name; - /** - * handler. See comment on handler properties below in function prototype. - */ - rtems_irq_hdl hdl; - /** - * function for enabling interrupts at device level (ONLY!). - * The BSP code will automatically enable it at PIC level. - * RATIONALE : anyway such code has to exist in current driver code. - * It is usually called immediately AFTER connecting the interrupt handler. - * RTEMS may well need such a function when restoring normal interrupt - * processing after a debug session. - * - */ - rtems_irq_enable on; - /** - * function for disabling interrupts at device level (ONLY!). - * The code will disable it at PIC level. RATIONALE : anyway - * such code has to exist for clean shutdown. It is usually called - * BEFORE disconnecting the interrupt. RTEMS may well need such - * a function when disabling normal interrupt processing for - * a debug session. May well be a NOP function. - */ - rtems_irq_disable off; - /** - * function enabling to know what interrupt may currently occur - * if someone manipulates the PIC interrupt mask without care... - */ - rtems_irq_is_enabled isOn; - /** - * irq priority level - */ - rtems_irq_level irqLevel; - /** - * Trigger way : Rising or falling edge or High or low level - */ - rtems_irq_trigger irqTrigger; -} rtems_irq_connect_data; - /*-------------------------------------------------------------------------+ | Function Prototypes. +--------------------------------------------------------------------------*/ @@ -140,55 +84,6 @@ typedef struct __rtems_irq_connect_data__ { */ void BSP_rtems_irq_mngt_init(); - -/** - * @brief function to connect a particular irq handler. - * This hanlder will NOT be called directly as the result of the corresponding interrupt. - * Instead, a RTEMS irq prologue will be called that will : - * 1) save the C scratch registers, - * 2) switch to a interrupt stack if the interrupt is not nested, - * 3) store the current i8259s' interrupt masks - * 4) modify them to disable the current interrupt at 8259 level (and may - * be others depending on software priorities) - * 5) aknowledge the i8259s', - * 6) demask the processor, - * 7) call the application handler - * - * As a result the hdl function provided - * a) can perfectly be written is C, - * b) may also well directly call the part of the RTEMS API that can be used - * from interrupt level, - * c) It only responsible for handling the jobs that need to be done at - * the device level including (aknowledging/re-enabling the interrupt at device, - * level, getting the data,...) - * - * When returning from the function, the following will be performed by - * the RTEMS irq epilogue : - * - * 1) masks the interrupts again, - * 2) restore the original i8259s' interrupt masks - * 3) switch back on the orinal stack if needed, - * 4) perform rescheduling when necessary, - * 5) restore the C scratch registers... - * 6) restore initial execution flow - * - */ -int BSP_install_rtems_irq_handler (const rtems_irq_connect_data*); - -/** - * function to get the current RTEMS irq handler for ptr->name. It enables to - * define hanlder chain... - */ -int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* ptr); - -/** - * @brief function to get disconnect the RTEMS irq handler for ptr->name. - * This function checks that the value given is the current one for safety reason. - * The user can use the previous function to get it. - */ -int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data*); - - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/arm/gba/irq/irq_init.c b/c/src/lib/libbsp/arm/gba/irq/irq_init.c index 136188804a..dfa6ec2744 100644 --- a/c/src/lib/libbsp/arm/gba/irq/irq_init.c +++ b/c/src/lib/libbsp/arm/gba/irq/irq_init.c @@ -35,7 +35,7 @@ extern void _irq_max_vector; * @param None * @return None */ -void default_int_handler(void) +void default_int_handler(rtems_irq_hdl_param unused) { printk("raw_idt_notify has been called \n"); } diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog index 6d66c1d271..d4e639ceef 100644 --- a/c/src/lib/libbsp/arm/gp32/ChangeLog +++ b/c/src/lib/libbsp/arm/gp32/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Thomas Doerfler + + * Makefile.am, startup/bspstart.c: make irq data types consistent, + use common code for s3c24xx + 2010-04-07 Joel Sherrill * start/start.S: Verify boot_card() is passed a NULL. diff --git a/c/src/lib/libbsp/arm/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am index abdc52934c..0eadacd9f3 100644 --- a/c/src/lib/libbsp/arm/gp32/Makefile.am +++ b/c/src/lib/libbsp/arm/gp32/Makefile.am @@ -44,9 +44,9 @@ libbsp_a_SOURCES += ../shared/abort/abort.c libbsp_a_SOURCES += smc/smc.c smc/smc.h libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel + ../../../libcpu/@RTEMS_CPU@/s3c24xx/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/s3c24xx/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/s3c24xx/irq.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c index be211505bd..eca433c11e 100644 --- a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c @@ -22,6 +22,7 @@ * External Prototypes */ extern void rtems_irq_mngt_init(void); +extern void rtems_exception_init_mngt(void); /* * BSP specific Idle task diff --git a/c/src/lib/libbsp/arm/gumstix/ChangeLog b/c/src/lib/libbsp/arm/gumstix/ChangeLog index 857cca8d15..f3661ad819 100644 --- a/c/src/lib/libbsp/arm/gumstix/ChangeLog +++ b/c/src/lib/libbsp/arm/gumstix/ChangeLog @@ -1,3 +1,7 @@ +2010-04-09 Thomas Doerfler + + * rtl8019/rtl8019.c: make irq data types consistent + 2010-04-07 Joel Sherrill * start/start.S: Verify boot_card() is passed a NULL. diff --git a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c index 4754e0e67e..ab1f5378f4 100644 --- a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c +++ b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c @@ -352,12 +352,10 @@ ne_check_status (struct ne_softc *sc, int from_irq_handler) /* Handle an NE2000 interrupt. */ static void -ne_interrupt_handler (uint32_t cdata) +ne_interrupt_handler (rtems_irq_hdl_param handle) { - rtems_vector_number v = (rtems_vector_number) cdata; - struct ne_softc *sc; + struct ne_softc *sc = handle; - sc = ne_device_for_irno (v); if (sc == NULL) return; @@ -502,15 +500,16 @@ ne_init_hardware (struct ne_softc *sc) /* Set up interrupts. */ static void -ne_init_irq_handler(int irno) +ne_init_irq_handler(ne_softc *sc) { rtems_irq_connect_data irq; #ifdef DEBUG_NE printk("ne_init_irq_handler(%d)\n", irno); #endif - irq.name = irno; + irq.name = sc->irno; irq.hdl = ne_interrupt_handler; + irq.handle = sc; irq.on = ne_interrupt_on; irq.off = ne_interrupt_off; irq.isOn = ne_interrupt_is_on; @@ -976,7 +975,7 @@ ne_init (void *arg) sc->rx_daemon_tid = rtems_bsdnet_newproc ("SCrx", 4096, ne_rx_daemon, sc); /* install rtems irq handler */ - ne_init_irq_handler(sc->irno); + ne_init_irq_handler(sc); } ifp->if_flags |= IFF_RUNNING; diff --git a/c/src/lib/libbsp/arm/nds/ChangeLog b/c/src/lib/libbsp/arm/nds/ChangeLog index 6d9cdc9a29..9033313dcc 100644 --- a/c/src/lib/libbsp/arm/nds/ChangeLog +++ b/c/src/lib/libbsp/arm/nds/ChangeLog @@ -1,3 +1,9 @@ +2010-04-09 Thomas Doerfler + + * Makefile.am, clock/clock.c, fb/fb.c, irq/irq.c, sound/sound.c, + startup/bspstart.c, touchscreen/touchscreen.c, wifi/wifi.c: make + irq data types consistent + 2010-04-07 Joel Sherrill * start/start.S: Verify boot_card() is passed a NULL. diff --git a/c/src/lib/libbsp/arm/nds/Makefile.am b/c/src/lib/libbsp/arm/nds/Makefile.am index f169d163dd..d35c3ba6e3 100644 --- a/c/src/lib/libbsp/arm/nds/Makefile.am +++ b/c/src/lib/libbsp/arm/nds/Makefile.am @@ -88,8 +88,6 @@ block_rel_SOURCES = block/block.c block_rel_CPPFLAGS = $(AM_CPPFLAGS) -DARM9 -I$(srcdir)/libnds/include -DNDS -I$(srcdir)/libfat/source/disc_io block_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_HEADERS += irq/irq.h - noinst_PROGRAMS += irq.rel irq_rel_SOURCES = irq/irq.c irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -DARM9 -I$(srcdir)/libnds/include diff --git a/c/src/lib/libbsp/arm/nds/clock/clock.c b/c/src/lib/libbsp/arm/nds/clock/clock.c index 50445a6620..ea7c01f05d 100644 --- a/c/src/lib/libbsp/arm/nds/clock/clock.c +++ b/c/src/lib/libbsp/arm/nds/clock/clock.c @@ -13,7 +13,7 @@ #include #include -#include "../irq/irq.h" +#include #include #define CLOCK_VECTOR IRQ_TIMER0 @@ -34,8 +34,7 @@ static rtems_irq_connect_data clock_isr_data = { NULL, NULL, NULL, - 0, - 0 + NULL }; void update_touchscreen (void); @@ -52,12 +51,11 @@ void update_touchscreen (void); * install isr for clock driver. */ -void -Clock_driver_support_install_isr (rtems_isr_entry new, rtems_isr_entry old) -{ - BSP_install_rtems_irq_handler (&clock_isr_data); -} - +#define Clock_driver_support_install_isr( _new, _old ) \ + do { \ + _old = NULL; \ + BSP_install_rtems_irq_handler(&clock_isr_data); \ + } while (0) /* * disable clock. */ diff --git a/c/src/lib/libbsp/arm/nds/fb/fb.c b/c/src/lib/libbsp/arm/nds/fb/fb.c index f41294d332..9e3d1013c9 100644 --- a/c/src/lib/libbsp/arm/nds/fb/fb.c +++ b/c/src/lib/libbsp/arm/nds/fb/fb.c @@ -17,7 +17,7 @@ #include #include -#include "../irq/irq.h" +#include #include #include diff --git a/c/src/lib/libbsp/arm/nds/irq/irq.c b/c/src/lib/libbsp/arm/nds/irq/irq.c index fe8d36a18d..17755c2b59 100644 --- a/c/src/lib/libbsp/arm/nds/irq/irq.c +++ b/c/src/lib/libbsp/arm/nds/irq/irq.c @@ -12,7 +12,7 @@ */ #include -#include "irq.h" +#include #include /* @@ -55,7 +55,10 @@ BSP_install_rtems_irq_handler (const rtems_irq_connect_data * irq) rtems_interrupt_disable (level); - irqSet (irq->name, irq->hdl); + /* + * FIXME: irq_hdl will probably not be called with its parameter + */ + irqSet (irq->name, (VoidFunctionPointer)irq->hdl); if (irq->on != NULL) irq->on (irq); diff --git a/c/src/lib/libbsp/arm/nds/irq/irq.h b/c/src/lib/libbsp/arm/nds/irq/irq.h deleted file mode 100644 index bab571646a..0000000000 --- a/c/src/lib/libbsp/arm/nds/irq/irq.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008 by Matthieu Bucchianeri - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * - * http://www.rtems.com/license/LICENSE - * - * $Id$ - */ - -#ifndef _IRQ_H_ -#define _IRQ_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif - -/* - * Type definition for RTEMS managed interrupts - */ - - typedef unsigned char rtems_irq_name; - typedef unsigned char rtems_irq_level; - typedef unsigned char rtems_irq_trigger; - - struct __rtems_irq_connect_data__; /* forward declaratiuon */ - - typedef void (*rtems_irq_hdl) (void); - typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__ - *); - typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__ - *); - typedef int (*rtems_irq_is_enabled) (const struct __rtems_irq_connect_data__ - *); - -/** irq connection data structure */ - typedef struct __rtems_irq_connect_data__ - { - rtems_irq_name name; - rtems_irq_hdl hdl; - rtems_irq_enable on; - rtems_irq_disable off; - rtems_irq_is_enabled isOn; - rtems_irq_level irqLevel; - rtems_irq_trigger irqTrigger; - } rtems_irq_connect_data; - - void BSP_rtems_irq_mngt_init (void); - - int BSP_install_rtems_irq_handler (const rtems_irq_connect_data *); - - int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data *); - - int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data *); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/c/src/lib/libbsp/arm/nds/preinstall.am b/c/src/lib/libbsp/arm/nds/preinstall.am index 48e2aced92..e0555de37f 100644 --- a/c/src/lib/libbsp/arm/nds/preinstall.am +++ b/c/src/lib/libbsp/arm/nds/preinstall.am @@ -78,10 +78,6 @@ $(PROJECT_INCLUDE)/nds/sound.h: sound/sound.h $(PROJECT_INCLUDE)/nds/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nds/sound.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/nds/sound.h -$(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h - $(PROJECT_INCLUDE)/libnds/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/libnds @: > $(PROJECT_INCLUDE)/libnds/$(dirstamp) diff --git a/c/src/lib/libbsp/arm/nds/sound/sound.c b/c/src/lib/libbsp/arm/nds/sound/sound.c index 9278926f89..20bcbc4153 100644 --- a/c/src/lib/libbsp/arm/nds/sound/sound.c +++ b/c/src/lib/libbsp/arm/nds/sound/sound.c @@ -17,7 +17,7 @@ #include #include -#include "../irq/irq.h" +#include #include #include diff --git a/c/src/lib/libbsp/arm/nds/startup/bspstart.c b/c/src/lib/libbsp/arm/nds/startup/bspstart.c index 7719f306a3..2da9933691 100644 --- a/c/src/lib/libbsp/arm/nds/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/nds/startup/bspstart.c @@ -15,6 +15,7 @@ #include #include +extern void BSP_rtems_irq_mngt_init (void); /* * start the platform. */ diff --git a/c/src/lib/libbsp/arm/nds/touchscreen/touchscreen.c b/c/src/lib/libbsp/arm/nds/touchscreen/touchscreen.c index 92daf39193..9e4cd16f57 100644 --- a/c/src/lib/libbsp/arm/nds/touchscreen/touchscreen.c +++ b/c/src/lib/libbsp/arm/nds/touchscreen/touchscreen.c @@ -17,7 +17,7 @@ #include #include -#include "../irq/irq.h" +#include #include #include diff --git a/c/src/lib/libbsp/arm/nds/wifi/wifi.c b/c/src/lib/libbsp/arm/nds/wifi/wifi.c index c8c6f56701..013fd0fe4a 100644 --- a/c/src/lib/libbsp/arm/nds/wifi/wifi.c +++ b/c/src/lib/libbsp/arm/nds/wifi/wifi.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index a81d2b2f51..b9e14fe895 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Thomas Doerfler + + * network/network.c, startup/bspstart.c: make + irq data types consistent + 2010-04-07 Joel Sherrill * include/bsp.h: Rename poorly named define "M" to "JOEL_M" since diff --git a/c/src/lib/libbsp/arm/rtl22xx/network/network.c b/c/src/lib/libbsp/arm/rtl22xx/network/network.c index 6777bbf1a5..d2bdf832dc 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/network/network.c +++ b/c/src/lib/libbsp/arm/rtl22xx/network/network.c @@ -8,20 +8,19 @@ unsigned int bsp_cs8900_io_base = 0; unsigned int bsp_cs8900_memory_base = 0; cs8900_device *g_cs; -rtems_isr cs8900_isr(rtems_vector_number v); +void cs8900_isr(rtems_irq_hdl_param unused); rtems_irq_connect_data cs8900_isr_data = {LPC22xx_INTERRUPT_EINT2, (rtems_irq_hdl)cs8900_isr, - NULL, - NULL, - NULL, - 0, - 0 }; + NULL, + NULL, + NULL, + NULL}; char g_enetbuf[1520]; -rtems_isr cs8900_isr(rtems_vector_number v) +void cs8900_isr(rtems_irq_hdl_param unused) { - cs8900_interrupt(v, g_cs); + cs8900_interrupt(LPC22xx_INTERRUPT_EINT2, g_cs); } /* cs8900_io_set_reg - set one of the I/O addressed registers */ diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c index 39824fac30..bb741130a0 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c @@ -17,6 +17,7 @@ * Function prototypes */ extern void rtems_irq_mngt_init(void); +extern void rtems_exception_init_mngt(void); extern void UART0_Ini(void); extern void printi(unsigned long); diff --git a/c/src/lib/libbsp/arm/shared/irq/irq_init.c b/c/src/lib/libbsp/arm/shared/irq/irq_init.c index 77f120edab..d48c11c2d7 100644 --- a/c/src/lib/libbsp/arm/shared/irq/irq_init.c +++ b/c/src/lib/libbsp/arm/shared/irq/irq_init.c @@ -17,7 +17,7 @@ #include #include -void default_int_handler(void) +void default_int_handler(rtems_irq_hdl_param unused) { printk("raw_idt_notify has been called \n"); } diff --git a/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c b/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c index 1fa80409df..ee28b5af90 100644 --- a/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c +++ b/c/src/lib/libbsp/arm/shared/lpc/clock/lpc-clock-config.c @@ -112,7 +112,11 @@ static uint32_t lpc_clock_nanoseconds_since_last_tick(void) #define Clock_driver_support_at_tick() lpc_clock_at_tick() #define Clock_driver_support_initialize_hardware() lpc_clock_initialize() #define Clock_driver_support_install_isr(isr, old_isr) \ - lpc_clock_handler_install() + do { \ + lpc_clock_handler_install(); \ + old_isr = NULL; \ + } while (0) + #define Clock_driver_support_shutdown_hardware() lpc_clock_cleanup() #define Clock_driver_nanoseconds_since_last_tick \ lpc_clock_nanoseconds_since_last_tick diff --git a/c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c b/c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c index f0a354bea3..51dc21c82f 100644 --- a/c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c +++ b/c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c @@ -467,7 +467,8 @@ static bool lpc_eth_add_new_mbuf( | ETH_RX_CTRL_INTERRUPT; /* Cache flush of descriptor */ - rtems_cache_flush_multiple_data_lines(&desc [i], sizeof(desc [0])); + rtems_cache_flush_multiple_data_lines((void *)&desc [i], + sizeof(desc [0])); /* Add mbuf to table */ mbufs [i] = m; @@ -580,10 +581,10 @@ static void lpc_eth_receive_task(void *arg) struct mbuf *m = mbufs [receive_index]; /* Fragment status */ - rtems_cache_invalidate_multiple_data_lines( - &status [receive_index], - sizeof(status [0]) - ); + rtems_cache_invalidate_multiple_data_lines + ((void *)&status [receive_index], + sizeof(status [0]) + ); stat = status [receive_index].info; /* Remove mbuf from table */ @@ -908,10 +909,10 @@ static void lpc_eth_transmit_task(void *arg) ); desc [produce_index].start = mtod(m, uint32_t); desc [produce_index].control = ctrl; - rtems_cache_flush_multiple_data_lines( - &desc [produce_index], - sizeof(desc [0]) - ); + rtems_cache_flush_multiple_data_lines + ((void *)&desc [produce_index], + sizeof(desc [0]) + ); mbufs [produce_index] = m; LPC_ETH_PRINTF( @@ -966,7 +967,7 @@ static void lpc_eth_transmit_task(void *arg) if ((ctrl & ETH_TX_CTRL_LAST) != 0) { /* Finalize descriptor */ - desc [produce_index].control = ctrl & ~ETH_TX_CTRL_SIZE_MASK + desc [produce_index].control = (ctrl & ~ETH_TX_CTRL_SIZE_MASK) | (new_frame_length - 1); LPC_ETH_PRINTF( @@ -982,10 +983,10 @@ static void lpc_eth_transmit_task(void *arg) ); /* Cache flush of descriptor */ - rtems_cache_flush_multiple_data_lines( - &desc [produce_index], - sizeof(desc [0]) - ); + rtems_cache_flush_multiple_data_lines + ((void *)&desc [produce_index], + sizeof(desc [0]) + ); /* Next produce index */ produce_index = p; diff --git a/c/src/lib/libbsp/arm/shared/start/start.S b/c/src/lib/libbsp/arm/shared/start/start.S index a135feb25a..c4a5d806a7 100644 --- a/c/src/lib/libbsp/arm/shared/start/start.S +++ b/c/src/lib/libbsp/arm/shared/start/start.S @@ -17,8 +17,9 @@ */ #include +#include #include - + #include #include diff --git a/c/src/lib/libbsp/arm/smdk2410/ChangeLog b/c/src/lib/libbsp/arm/smdk2410/ChangeLog index b20151c7b6..4b198df592 100644 --- a/c/src/lib/libbsp/arm/smdk2410/ChangeLog +++ b/c/src/lib/libbsp/arm/smdk2410/ChangeLog @@ -1,3 +1,7 @@ +2010-04-09 Thomas Doerfler + + * Makefile.am: use common code for s3c24xx + 2009-10-21 Ralf Corsépius * make/custom/smdk2410.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index ae9b5b76bb..06192e2a6d 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -44,9 +44,9 @@ libbsp_a_SOURCES += ../shared/abort/abort.c libbsp_a_SOURCES += ../gp32/smc/smc.c ../gp32/smc/smc.h libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel + ../../../libcpu/@RTEMS_CPU@/s3c24xx/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/s3c24xx/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/s3c24xx/irq.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index a559e0ad17..4541127727 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,7 @@ +2010-04-09 Thomas Doerfler + + * umon/umonrtemsglue.c: change type to avoid warning + 2010-03-25 Thomas Doerfler * src/irq-generic.c: fix warning diff --git a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c index 82392405de..3d4e245b4c 100644 --- a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c +++ b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c @@ -20,7 +20,7 @@ static int rtems_umon_connected = 0; void rtems_umon_connect(void) { - void *moncomptr; + int(*moncomptr)(int,void *,void *,void *); if ( rtems_umon_connected ) return; @@ -29,7 +29,7 @@ void rtems_umon_connect(void) moncomptr = rtems_bsp_get_umon_monptr(); monConnect( - (int(*)())(*(unsigned long *)moncomptr), /* monitor base */ + moncomptr, /* monitor base */ (void *)0, /* lock */ (void *)0 /* unlock */ ); -- cgit v1.2.3