projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v3.0: Add some real drawing stuff
[fw/altos]
/
src
/
samd21
/
ao_exti_samd21.c
diff --git
a/src/samd21/ao_exti_samd21.c
b/src/samd21/ao_exti_samd21.c
index 962197837713975d0950d9e7db048fe0ae0f5050..688f64337be88510c06529700228f8222ea68666 100644
(file)
--- a/
src/samd21/ao_exti_samd21.c
+++ b/
src/samd21/ao_exti_samd21.c
@@
-21,8
+21,8
@@
struct ao_samd21_exti {
void (*callback)(void);
struct ao_samd21_exti {
void (*callback)(void);
-
struct samd21_port *port
;
- uint8_t pin;
+
uint8_t pmux
;
+ uint8_t pin
cfg
;
};
static struct ao_samd21_exti ao_samd21_exti[SAMD21_NUM_EIC];
};
static struct ao_samd21_exti ao_samd21_exti[SAMD21_NUM_EIC];
@@
-87,16
+87,21
@@
ao_exti_setup (struct samd21_port *port, uint8_t pin, uint8_t mode, void (*callb
uint8_t id = pin_id(port,pin);
struct ao_samd21_exti *exti = &ao_samd21_exti[id];
uint8_t id = pin_id(port,pin);
struct ao_samd21_exti *exti = &ao_samd21_exti[id];
- if (exti->
port
)
+ if (exti->
callback
)
ao_panic(AO_PANIC_EXTI);
ao_panic(AO_PANIC_EXTI);
- if (!(mode & AO_EXTI_PIN_NOCONFIGURE))
+ if (mode & AO_EXTI_PIN_NOCONFIGURE) {
+ ao_enable_port(port);
+ samd21_port_dir_set(port, pin, SAMD21_PORT_DIR_IN);
+ samd21_port_pincfg_set(port, pin,
+ (1 << SAMD21_PORT_PINCFG_INEN),
+ (1 << SAMD21_PORT_PINCFG_INEN));
+ } else {
ao_enable_input(port, pin, mode);
ao_enable_input(port, pin, mode);
+ }
ao_arch_block_interrupts();
ao_arch_block_interrupts();
- exti->port = port;
- exti->pin = pin;
exti->callback = callback;
/* Set edge triggered */
exti->callback = callback;
/* Set edge triggered */
@@
-131,9
+136,13
@@
ao_exti_enable(struct samd21_port *port, uint8_t pin)
uint8_t id = pin_id(port,pin);
ao_arch_block_interrupts();
uint8_t id = pin_id(port,pin);
ao_arch_block_interrupts();
- samd21_eic.intenset = 1 << id;
/* configure gpio to interrupt routing */
/* configure gpio to interrupt routing */
+ if ((samd21_eic.intenset & (1 << id)) == 0) {
+ ao_samd21_exti[id].pmux = samd21_port_pmux_get(port, pin);
+ ao_samd21_exti[id].pincfg = samd21_port_pincfg_get(port, pin);
+ }
samd21_port_pmux_set(port, pin, SAMD21_PORT_PMUX_FUNC_A);
samd21_port_pmux_set(port, pin, SAMD21_PORT_PMUX_FUNC_A);
+ samd21_eic.intenset = 1 << id;
ao_arch_release_interrupts();
}
ao_arch_release_interrupts();
}
@@
-144,8
+153,11
@@
ao_exti_disable(struct samd21_port *port, uint8_t pin)
ao_arch_block_interrupts();
samd21_eic.intenclr = 1 << id;
ao_arch_block_interrupts();
samd21_eic.intenclr = 1 << id;
- /* configure gpio to interrupt routing */
- samd21_port_pmux_clr(port, pin);
+ /* restore gpio config */
+ if (ao_samd21_exti[id].pincfg & (1 << SAMD21_PORT_PINCFG_PMUXEN))
+ samd21_port_pmux_set(port, pin, ao_samd21_exti[id].pmux);
+ else
+ samd21_port_pmux_clr(port, pin);
ao_arch_release_interrupts();
}
ao_arch_release_interrupts();
}