Skip to content

Commit

Permalink
changes for sdcc (#145)
Browse files Browse the repository at this point in the history
Co-authored-by: the-snork <none>
thanks @the-snork !
  • Loading branch information
the-snork authored Nov 2, 2023
1 parent 6e17f4e commit 382f968
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions firmware/appFHSSNIC.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 *****************************/
Expand Down Expand Up @@ -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];

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion firmware/cc1111_vcom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions firmware/cc1111rf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions firmware/chipcon_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion firmware/global.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ++;
}
Expand Down
4 changes: 2 additions & 2 deletions firmware/include/cc1111rf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions firmware/include/global.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 382f968

Please sign in to comment.