kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

nrf5x_common: gpio: fix port 1 functionality

Browse Source 
Pins on GPIO port 1 were not correctly set.
This is resolved by using the (previously unused) pin_num function.
This commit is contained in:
Silke Hofstra 2018-10-12 18:12:22 +02:00
parent 8efeb4a4f1
commit 58e39da255
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cpu/nrf5x_common/periph/gpio.c
View File

@ -44,7 +44,7 @@ static gpio_isr_ctx_t exti_chan;
/**
* @brief Get the port's base address
*/
static inline NRF_GPIO_Type* port(gpio_t pin)
static inline NRF_GPIO_Type *port(gpio_t pin)
{
#if (CPU_FAM_NRF51)
(void) pin;
@ -77,7 +77,7 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
case GPIO_IN_PU:
case GPIO_OUT:
/* configure pin direction, input buffer and pull resistor state */
port(pin)->PIN_CNF[pin] = mode;
port(pin)->PIN_CNF[pin_num(pin)] = mode;
break;
default:
return -1;
@ -88,35 +88,36 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
int gpio_read(gpio_t pin)
{
if (port(pin)->DIR & (1 << pin)) {
return (port(pin)->OUT & (1 << pin)) ? 1 : 0;
if (port(pin)->DIR & (1 << pin_num(pin))) {
return (port(pin)->OUT & (1 << pin_num(pin))) ? 1 : 0;
}
else {
return (port(pin)->IN & (1 << pin)) ? 1 : 0;
return (port(pin)->IN & (1 << pin_num(pin))) ? 1 : 0;
}
}
void gpio_set(gpio_t pin)
{
port(pin)->OUTSET = (1 << pin);
port(pin)->OUTSET = (1 << pin_num(pin));
}
void gpio_clear(gpio_t pin)
{
port(pin)->OUTCLR = (1 << pin);
port(pin)->OUTCLR = (1 << pin_num(pin));
}
void gpio_toggle(gpio_t pin)
{
port(pin)->OUT ^= (1 << pin);
port(pin)->OUT ^= (1 << pin_num(pin));
}
void gpio_write(gpio_t pin, int value)
{
if (value) {
port(pin)->OUTSET = (1 << pin);
} else {
port(pin)->OUTCLR = (1 << pin);
port(pin)->OUTSET = (1 << pin_num(pin));
}
else {
port(pin)->OUTCLR = (1 << pin_num(pin));
}
}
@ -135,7 +136,7 @@ int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
NVIC_EnableIRQ(GPIOTE_IRQn);
/* configure the GPIOTE channel: set even mode, pin and active flank */
NRF_GPIOTE->CONFIG[0] = (GPIOTE_CONFIG_MODE_Event |
(pin << GPIOTE_CONFIG_PSEL_Pos) |
(pin_num(pin) << GPIOTE_CONFIG_PSEL_Pos) |
#ifdef CPU_MODEL_NRF52840XXAA
((pin & PORT_BIT) << 8) |
#endif