rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-27 21:54:30 +01:00
Code Issues Releases Activity

{attach,detach}Interrupt() on Due selects directly pin number instead of interrupt number.

Browse Source
This commit is contained in:
Cristian Maglie 2012-11-02 19:48:04 +01:00
parent 7b946264d5
commit 0f23634230
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hardware/arduino/sam/cores/arduino/WInterrupts.c
View File

@ -20,8 +20,6 @@
typedef void (*interruptCB)(void); typedef void (*interruptCB)(void);
static int pinMapping[EXTERNAL_NUM_INTERRUPTS] = { 2, 3, 4, 5, 6, 7, 8 };
static interruptCB callbacksPioA[32]; static interruptCB callbacksPioA[32];
static interruptCB callbacksPioB[32]; static interruptCB callbacksPioB[32];
static interruptCB callbacksPioC[32]; static interruptCB callbacksPioC[32];
@ -55,11 +53,8 @@ static void __initialize() {
} }
void attachInterrupt(uint32_t interruptNum, void (*callback)(void), uint32_t mode) void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode)
{ {
if (interruptNum >= EXTERNAL_NUM_INTERRUPTS)
return;
static int enabled = 0; static int enabled = 0;
if (!enabled) { if (!enabled) {
__initialize(); __initialize();
@ -67,7 +62,6 @@ void attachInterrupt(uint32_t interruptNum, void (*callback)(void), uint32_t mod
} }
// Retrieve pin information // Retrieve pin information
uint32_t pin = pinMapping[interruptNum];
Pio *pio = g_APinDescription[pin].pPort; Pio *pio = g_APinDescription[pin].pPort;
uint32_t mask = g_APinDescription[pin].ulPin; uint32_t mask = g_APinDescription[pin].ulPin;
uint32_t pos = 0; uint32_t pos = 0;
@ -115,13 +109,9 @@ void attachInterrupt(uint32_t interruptNum, void (*callback)(void), uint32_t mod
pio->PIO_IER = mask; pio->PIO_IER = mask;
} }
void detachInterrupt( uint32_t interruptNum ) void detachInterrupt(uint32_t pin)
{ {
if (interruptNum >= EXTERNAL_NUM_INTERRUPTS)
return;
// Retrieve pin information // Retrieve pin information
uint32_t pin = pinMapping[interruptNum];
Pio *pio = g_APinDescription[pin].pPort; Pio *pio = g_APinDescription[pin].pPort;
uint32_t mask = g_APinDescription[pin].ulPin; uint32_t mask = g_APinDescription[pin].ulPin;

4
hardware/arduino/sam/cores/arduino/WInterrupts.h
View File

@ -25,9 +25,9 @@
extern "C" { extern "C" {
#endif #endif
void attachInterrupt(uint32_t interruptNum, void (*callback)(void), uint32_t mode); void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode);
void detachInterrupt(uint32_t interruptNum); void detachInterrupt(uint32_t pin);
#ifdef __cplusplus #ifdef __cplusplus
} }