diff --git a/firmware/appFHSSNIC.c b/firmware/appFHSSNIC.c index f8f5042..11c5156 100644 --- a/firmware/appFHSSNIC.c +++ b/firmware/appFHSSNIC.c @@ -60,8 +60,8 @@ __xdata u16 g_NIC_ID; __xdata u8 g_txMsgQueue[MAX_TX_MSGS][MAX_TX_MSGLEN+1]; ////////// internal functions ///////// -void t2IntHandler(void) __interrupt T2_VECTOR; -void t3IntHandler(void) __interrupt T3_VECTOR; +void t2IntHandler(void) __interrupt (T2_VECTOR); +void t3IntHandler(void) __interrupt (T3_VECTOR); int appHandleEP5(); /**************************** PHY LAYER *****************************/ @@ -387,7 +387,7 @@ __xdata u8 MAC_getNextChannel() /************************** Timer Interrupt Vectors **************************/ -void t2IntHandler(void) __interrupt T2_VECTOR // interrupt handler should trigger on T2 overflow +void t2IntHandler(void) __interrupt (T2_VECTOR) // interrupt handler should trigger on T2 overflow { __xdata u8 packet[28]; @@ -513,7 +513,7 @@ void t2IntHandler(void) __interrupt T2_VECTOR // interrupt handler should trigg } } -void t3IntHandler(void) __interrupt T3_VECTOR +void t3IntHandler(void) __interrupt (T3_VECTOR) { // transmit one message from queue... possibly more, if time allows // must check the time left when tx completes diff --git a/firmware/cc1111_vcom.c b/firmware/cc1111_vcom.c index 9a54f23..032cf0e 100644 --- a/firmware/cc1111_vcom.c +++ b/firmware/cc1111_vcom.c @@ -291,7 +291,7 @@ static void vcom_ep0() // This interrupt is shared with port 2, // so when we hook that up, fix this -void usbIntHandler(void) __interrupt P2INT_VECTOR +void usbIntHandler(void) __interrupt (P2INT_VECTOR) { USBIF = 0; usb_iif |= USBIIF; diff --git a/firmware/cc1111rf.c b/firmware/cc1111rf.c index 4eb0de1..bbb6187 100644 --- a/firmware/cc1111rf.c +++ b/firmware/cc1111rf.c @@ -515,14 +515,14 @@ void RepeaterStop() /* End Repeater mode... */ -//void dmaIntHandler(void) __interrupt DMA_VECTOR // Interrupt handler for DMA */ +//void dmaIntHandler(void) __interrupt (DMA_VECTOR) // Interrupt handler for DMA */ // DEBUGGING... #include "FHSS.h" -void rfTxRxIntHandler(void) __interrupt RFTXRX_VECTOR // interrupt handler should transmit or receive the next byte +void rfTxRxIntHandler(void) __interrupt (RFTXRX_VECTOR) // interrupt handler should transmit or receive the next byte { lastCode[0] = LC_RFTXRX_VECTOR; @@ -616,7 +616,7 @@ void rfTxRxIntHandler(void) __interrupt RFTXRX_VECTOR // interrupt handler shou } } -void rfIntHandler(void) __interrupt RF_VECTOR // interrupt handler should trigger on rf events +void rfIntHandler(void) __interrupt (RF_VECTOR) // interrupt handler should trigger on rf events { u8 encoffset= 0; // which events trigger this interrupt is determined by RFIM (set in init_RF()) diff --git a/firmware/chipcon_usb.c b/firmware/chipcon_usb.c index af2ad85..907de62 100644 --- a/firmware/chipcon_usb.c +++ b/firmware/chipcon_usb.c @@ -1355,7 +1355,7 @@ void usbProcessEvents(void) /************************************************************************************************* * Interrupt Service Routines * ************************************************************************************************/ -void usbIntHandler(void) __interrupt P2INT_VECTOR +void usbIntHandler(void) __interrupt (P2INT_VECTOR) { while (!IS_XOSC_STABLE()); @@ -1385,7 +1385,7 @@ void usbIntHandler(void) __interrupt P2INT_VECTOR } -void p0IntHandler(void) __interrupt P0INT_VECTOR // P0_7's interrupt is used as the USB RESUME interrupt +void p0IntHandler(void) __interrupt (P0INT_VECTOR) // P0_7's interrupt is used as the USB RESUME interrupt { while (!IS_XOSC_STABLE()); EA=0; diff --git a/firmware/global.c b/firmware/global.c index f65d09a..bd0ae40 100644 --- a/firmware/global.c +++ b/firmware/global.c @@ -211,7 +211,7 @@ void io_init(void) } -void t1IntHandler(void) __interrupt T1_VECTOR // interrupt handler should trigger on T1 overflow +void t1IntHandler(void) __interrupt (T1_VECTOR) // interrupt handler should trigger on T1 overflow { clock ++; } diff --git a/firmware/include/cc1111rf.h b/firmware/include/cc1111rf.h index 65b042c..de52186 100644 --- a/firmware/include/cc1111rf.h +++ b/firmware/include/cc1111rf.h @@ -84,8 +84,8 @@ extern __xdata u16 txTotal; // debugger extern volatile u8 rfif; -void rfTxRxIntHandler(void) __interrupt RFTXRX_VECTOR; // interrupt handler should transmit or receive the next byte -void rfIntHandler(void) __interrupt RF_VECTOR; // interrupt handler should trigger on rf events +void rfTxRxIntHandler(void) __interrupt (RFTXRX_VECTOR); // interrupt handler should transmit or receive the next byte +void rfIntHandler(void) __interrupt (RF_VECTOR); // interrupt handler should trigger on rf events // set semi-permanent states void RxMode(void); // set defaults to return to RX and calls RFRX diff --git a/firmware/include/global.h b/firmware/include/global.h index f87736a..fb4475d 100644 --- a/firmware/include/global.h +++ b/firmware/include/global.h @@ -146,8 +146,8 @@ extern __xdata u8 ledMode; #else #define SLEEPTIMER 1100 #define PLATFORM_CLOCK_FREQ 24 -void usbIntHandler(void) __interrupt P2INT_VECTOR; -void p0IntHandler(void) __interrupt P0INT_VECTOR; +void usbIntHandler(void) __interrupt (P2INT_VECTOR); +void p0IntHandler(void) __interrupt (P0INT_VECTOR); #if defined DONSDONGLES // CC1111 USB Dongle with breakout debugging pins (EMK?) - 24mhz @@ -198,7 +198,7 @@ void p0IntHandler(void) __interrupt P0INT_VECTOR; /* function declarations */ void sleepMillis(int ms); void sleepMicros(int us); -void t1IntHandler(void) __interrupt T1_VECTOR; // interrupt handler should trigger on T1 overflow +void t1IntHandler(void) __interrupt (T1_VECTOR); // interrupt handler should trigger on T1 overflow void clock_init(void); void io_init(void); //void blink(u16 on_cycles, u16 off_cycles);