cpu/atmega_common: external interrupt fix and refactor #8951
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ | |
| #include "cpu.h" | ||
| #include "periph/gpio.h" | ||
| #include "periph_conf.h" | ||
| #include "periph_cpu.h" | ||
|
|
||
| #define GPIO_BASE_PORT_A (0x20) | ||
| #define GPIO_OFFSET_PORT_H (0xCB) | ||
|
|
@@ -40,18 +41,18 @@ | |
| * @brief Define GPIO interruptions for an specific atmega CPU, by default | ||
| * 2 (for small atmega CPUs) | ||
| */ | ||
| #if defined(INT7_vect) | ||
| #define GPIO_EXT_INT_NUMOF (8U) | ||
| #elif defined(INT6_vect) | ||
| #define GPIO_EXT_INT_NUMOF (7U) | ||
| #elif defined(INT5_vect) | ||
| #define GPIO_EXT_INT_NUMOF (6U) | ||
| #elif defined(INT4_vect) | ||
| #define GPIO_EXT_INT_NUMOF (5U) | ||
| #elif defined(INT3_vect) | ||
| #define GPIO_EXT_INT_NUMOF (4U) | ||
| #elif defined(INT2_vect) | ||
| #define GPIO_EXT_INT_NUMOF (3U) | ||
| #else | ||
| #define GPIO_EXT_INT_NUMOF (2U) | ||
| #endif | ||
|
|
@@ -109,6 +110,21 @@ static inline uint16_t _pin_addr(gpio_t pin) | |
| return (_port_addr(pin) - 0x02); | ||
| } | ||
|
|
||
| static inline int8_t _int_num(gpio_t pin) | ||
| { | ||
| uint8_t num; | ||
| const gpio_t ext_ints[GPIO_EXT_INT_NUMOF] = CPU_ATMEGA_EXT_INTS; | ||
|
|
||
| /* find pin in ext_ints array to get the interrupt number */ | ||
| for (num = 0; num < GPIO_EXT_INT_NUMOF; num++) { | ||
| if (pin == ext_ints[num]) { | ||
| return num; | ||
| } | ||
| } | ||
|
|
||
| return -1; | ||
| } | ||
|
|
||
| int gpio_init(gpio_t pin, gpio_mode_t mode) | ||
| { | ||
| switch (mode) { | ||
|
|
@@ -132,20 +148,14 @@ int gpio_init(gpio_t pin, gpio_mode_t mode) | |
| int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank, | ||
| gpio_cb_t cb, void *arg) | ||
| { | ||
| int8_t int_num = _int_num(pin); | ||
|
|
||
| if ((mode != GPIO_IN) && (mode != GPIO_IN_PU)) { | ||
| return -1; | ||
| } | ||
|
|
||
| /* not a valid interrupt pin */ | ||
| if (int_num < 0) { | ||
| return -1; | ||
| } | ||
|
|
||
|
|
@@ -154,35 +164,27 @@ int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank, | |
| /* clear global interrupt flag */ | ||
| cli(); | ||
|
|
||
| /* enable interrupt number int_num */ | ||
| EIMSK |= (1 << int_num); | ||
|
|
||
| /* configure the flank */ | ||
| if (flank > GPIO_RISING) { | ||
| return -1; | ||
| } | ||
|
|
||
| /* apply flank to interrupt number int_num */ | ||
| if (int_num < 4) { | ||
| EICRA |= (flank << (int_num * 2)); | ||
| } | ||
| #if defined(EICRB) | ||
| else { | ||
| EICRB |= (flank << ((int_num % 4) * 2)); | ||
| } | ||
| #endif | ||
|
|
||
| /* set callback */ | ||
| config[int_num].cb = cb; | ||
| config[int_num].arg = arg; | ||
|
|
||
| /* set global interrupt flag */ | ||
| sei(); | ||
|
|
@@ -192,38 +194,12 @@ int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank, | |
|
|
||
| void gpio_irq_enable(gpio_t pin) | ||
| { | ||
| EIMSK |= (1 << _int_num(pin)); | ||
|
Contributor
There was a problem hiding this comment. One Question: If I try to enable the IRQ for a non valid PIN, _pin_num will return -1. Is shifting with a negative shift count valid? According to this: https://stackoverflow.com/questions/4945703/left-shifting-with-a-negative-shift-count the behaviour for this is not defined.
Contributor
Author
There was a problem hiding this comment. The pin validity is checked in gpio_init_int and afterwards presumed valid. |
||
| } | ||
|
|
||
| void gpio_irq_disable(gpio_t pin) | ||
| { | ||
| EIMSK &= ~(1 << _int_num(pin)); | ||
| } | ||
|
|
||
| int gpio_read(gpio_t pin) | ||
|
|
@@ -261,10 +237,10 @@ void gpio_write(gpio_t pin, int value) | |
| } | ||
| } | ||
|
|
||
| static inline void irq_handler(uint8_t int_num) | ||
| { | ||
| __enter_isr(); | ||
| config[int_num].cb(config[int_num].arg); | ||
| __exit_isr(); | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you tell more about this change? At a first glance it looks like the same, but I know there's a difference. I also wonder how it worked in the past.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here is an example if int_num == 6:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, thanks for the explanation!