Skip to content

Support extra parameter on `attachInterrupt() #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Support extra parameter on `attachInterrupt() #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions cores/arduino/WInterrupts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,18 @@

#include "WInterrupts.h"

typedef void (*interruptCB)(void);
typedef void (*interruptCB)(void*);

static interruptCB callbacksPioA[32];
static interruptCB callbacksPioB[32];
static interruptCB callbacksPioC[32];
static interruptCB callbacksPioD[32];

static void* callbackParamsPioA[32];
static void* callbackParamsPioB[32];
static void* callbackParamsPioC[32];
static void* callbackParamsPioD[32];

/* Configure PIO interrupt sources */
static void __initialize() {
int i;
Expand Down Expand Up @@ -60,8 +65,17 @@ static void __initialize() {
NVIC_EnableIRQ(PIOD_IRQn);
}

void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode) {
// THIS IMPLEMENTATION IS NOT PORTABLE!
//
// On ARM's calling convention, calling a function with more arguments than it declares
// is OK - The extra parameter is ignored and causes no harm
//
// This implementation takes advantage of it to support callbacks with and without parameters with minimum overhead.
attachInterruptParam(pin, (void (*)(void*))callback, mode, NULL);
}

void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode)
void attachInterruptParam(uint32_t pin, void (*callback)(void*), uint32_t mode, void* param)
{
static int enabled = 0;
if (!enabled) {
Expand All @@ -79,14 +93,19 @@ void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode)
;

// Set callback function
if (pio == PIOA)
if (pio == PIOA) {
callbacksPioA[pos] = callback;
if (pio == PIOB)
callbackParamsPioA[pos] = param;
} else if (pio == PIOB) {
callbacksPioB[pos] = callback;
if (pio == PIOC)
callbackParamsPioB[pos] = param;
} else if (pio == PIOC) {
callbacksPioC[pos] = callback;
if (pio == PIOD)
callbackParamsPioC[pos] = param;
} else if (pio == PIOD) {
callbacksPioD[pos] = callback;
callbackParamsPioD[pos] = param;
}

// Configure the interrupt mode
if (mode == CHANGE) {
Expand Down Expand Up @@ -139,7 +158,7 @@ void PIOA_Handler(void) {
while((leading_zeros=__CLZ(isr))<32)
{
uint8_t pin=32-leading_zeros-1;
if(callbacksPioA[pin]) callbacksPioA[pin]();
if(callbacksPioA[pin]) callbacksPioA[pin](callbackParamsPioA[pin]);
isr=isr&(~(1<<pin));
}
}
Expand All @@ -150,7 +169,7 @@ void PIOB_Handler(void) {
while((leading_zeros=__CLZ(isr))<32)
{
uint8_t pin=32-leading_zeros-1;
if(callbacksPioB[pin]) callbacksPioB[pin]();
if(callbacksPioB[pin]) callbacksPioB[pin](callbackParamsPioB[pin]);
isr=isr&(~(1<<pin));
}
}
Expand All @@ -161,7 +180,7 @@ void PIOC_Handler(void) {
while((leading_zeros=__CLZ(isr))<32)
{
uint8_t pin=32-leading_zeros-1;
if(callbacksPioC[pin]) callbacksPioC[pin]();
if(callbacksPioC[pin]) callbacksPioC[pin](callbackParamsPioC[pin]);
isr=isr&(~(1<<pin));
}
}
Expand All @@ -172,7 +191,7 @@ void PIOD_Handler(void) {
while((leading_zeros=__CLZ(isr))<32)
{
uint8_t pin=32-leading_zeros-1;
if(callbacksPioD[pin]) callbacksPioD[pin]();
if(callbacksPioD[pin]) callbacksPioD[pin](callbackParamsPioD[pin]);
isr=isr&(~(1<<pin));
}
}
Expand Down
2 changes: 1 addition & 1 deletion cores/arduino/WInterrupts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extern "C" {
#endif

void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode);

void attachInterruptParam(uint32_t pin, void (*callback)(void*), uint32_t mode, void* param);
void detachInterrupt(uint32_t pin);

#ifdef __cplusplus
Expand Down