Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed return type of interrupt handlers

Browse Source
This commit is contained in:
Markus Fröschle
2015-01-10 17:44:04 +00:00
parent 00b29437d8
commit 504d11dbfd
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaS_gcc/dma/dma.c
View File

@@ -556,7 +556,7 @@ void dma_free_channel(int requestor)
/* /*
* This is the catch-all interrupt handler for the mult-channel DMA * This is the catch-all interrupt handler for the mult-channel DMA
*/ */
int dma_interrupt_handler(void *arg1, void *arg2) bool dma_interrupt_handler(void *arg1, void *arg2)
{ {
int i, interrupts; int i, interrupts;
uint32_t ipl; uint32_t ipl;

2
BaS_gcc/include/dma.h
View File

@@ -37,7 +37,7 @@ extern int dma_set_initiator(int initiator);
extern void dma_free_initiator(int initiator); extern void dma_free_initiator(int initiator);
extern void dma_irq_enable(uint8_t lvl, uint8_t pri); extern void dma_irq_enable(uint8_t lvl, uint8_t pri);
extern void dma_irq_disable(void); extern void dma_irq_disable(void);
extern int dma_interrupt_handler(void *arg1, void *arg2); extern bool dma_interrupt_handler(void *arg1, void *arg2);
#endif /* _DMA_H_ */ #endif /* _DMA_H_ */

4
BaS_gcc/include/fec.h
View File

@@ -87,8 +87,8 @@ extern int fec1_send(NIF *, uint8_t *, uint8_t *, uint16_t , NBUF *);
extern void fec_irq_enable(uint8_t, uint8_t, uint8_t); extern void fec_irq_enable(uint8_t, uint8_t, uint8_t);
extern void fec_irq_disable(uint8_t); extern void fec_irq_disable(uint8_t);
extern void fec_interrupt_handler(uint8_t); extern void fec_interrupt_handler(uint8_t);
extern int fec0_interrupt_handler(void *, void *); extern bool fec0_interrupt_handler(void *, void *);
extern int fec1_interrupt_handler(void *, void *); extern bool fec1_interrupt_handler(void *, void *);
extern void fec_eth_setup(uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t *); extern void fec_eth_setup(uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t *);
extern void fec_eth_reset(uint8_t); extern void fec_eth_reset(uint8_t);
extern void fec_eth_stop(uint8_t); extern void fec_eth_stop(uint8_t);

4
BaS_gcc/include/interrupts.h
View File

@@ -147,8 +147,8 @@
extern void isr_init(void); extern void isr_init(void);
extern bool isr_set_prio_and_level(int int_source, int priority, int level); extern bool isr_set_prio_and_level(int int_source, int priority, int level);
extern bool isr_enable_int_source(int int_source); extern bool isr_enable_int_source(int int_source);
extern bool isr_register_handler(int vector, int level, int priority, int (*handler)(void *, void *), void *hdev, void *harg); extern bool isr_register_handler(int vector, int level, int priority, bool (*handler)(void *, void *), void *hdev, void *harg);
extern void isr_remove_handler(int (*handler)(void *, void *)); extern void isr_remove_handler(bool (*handler)(void *, void *));
extern bool isr_execute_handler(int vector); extern bool isr_execute_handler(int vector);
extern int pic_interrupt_handler(void *arg1, void *arg2); extern int pic_interrupt_handler(void *arg1, void *arg2);
extern int xlbpci_interrupt_handler(void *arg1, void *arg2); extern int xlbpci_interrupt_handler(void *arg1, void *arg2);

8
BaS_gcc/net/fec.c
View File

@@ -1290,24 +1290,24 @@ static void fec_irq_handler(uint8_t ch)
* handler for FEC interrupts * handler for FEC interrupts
* arg2 is a pointer to the nif in this case * arg2 is a pointer to the nif in this case
*/ */
int fec0_interrupt_handler(void* arg1, void* arg2) bool fec0_interrupt_handler(void* arg1, void* arg2)
{ {
(void) arg1; /* not used */ (void) arg1; /* not used */
(void) arg2; (void) arg2;
fec_irq_handler(0); fec_irq_handler(0);
return 1; return true; /* handled */
} }
int fec1_interrupt_handler(void* arg1, void* arg2) bool fec1_interrupt_handler(void* arg1, void* arg2)
{ {
(void) arg1; /* not used */ (void) arg1; /* not used */
(void) arg2; (void) arg2;
fec_irq_handler(1); fec_irq_handler(1);
return 1; return true; /* handled */
} }
/* /*

6
BaS_gcc/sys/interrupts.c
View File

@@ -54,7 +54,7 @@
struct isrentry struct isrentry
{ {
int vector; int vector;
int (*handler)(void *, void *); bool (*handler)(void *, void *);
void *hdev; void *hdev;
void *harg; void *harg;
}; };
@@ -122,7 +122,7 @@ bool isr_enable_int_source(int int_source)
* pointer to the device itself, and the second a pointer to a data * pointer to the device itself, and the second a pointer to a data
* structure used by the device driver for that particular device. * structure used by the device driver for that particular device.
*/ */
bool isr_register_handler(int vector, int level, int priority, int (*handler)(void *, void *), void *hdev, void *harg) bool isr_register_handler(int vector, int level, int priority, bool (*handler)(void *, void *), void *hdev, void *harg)
{ {
int index; int index;
int int_source; int int_source;
@@ -173,7 +173,7 @@ bool isr_register_handler(int vector, int level, int priority, int (*handler)(vo
return false; /* no available slots */ return false; /* no available slots */
} }
void isr_remove_handler(int (*handler)(void *, void *)) void isr_remove_handler(bool (*handler)(void *, void *))
{ {
/* /*
* This routine removes from the ISR table all * This routine removes from the ISR table all