RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 10:32:44 +01:00
Code Releases Activity

cpu/atmega_common: Fix atmega_port_addr()

Browse Source 
In 04ab5a74f3 a bug was introduced in
the calculation of the GPIO port address by refactoring code. This
fixes the issue by extracting the GPIO port first from the pin.
This commit is contained in:
Marian Buschsieweke 2022-06-27 15:58:36 +02:00
parent d9fc082686
commit b72cafb169
No known key found for this signature in database
GPG Key ID: CB8E3238CE715A94
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cpu/atmega_common/include/atmega_gpio.h
View File

@ -24,6 +24,7 @@
#ifndef ATMEGA_GPIO_H
#define ATMEGA_GPIO_H
#include <stddef.h>
#include <stdio.h>
#include <avr/interrupt.h>
@ -55,11 +56,11 @@ static inline uint8_t atmega_port_num(gpio_t pin)
}
/**
* @brief Generate the PORTx address of the give pin.
* @brief Generate the PINx address of the given pin.
*/
static inline uint16_t atmega_port_addr(gpio_t pin)
static inline uint16_t atmega_pin_addr(gpio_t pin)
{
return (uintptr_t)(&atmega_gpio_port(pin)->port);
return (uintptr_t)atmega_gpio_port(atmega_port_num(pin));
}
/**
@ -67,15 +68,15 @@ static inline uint16_t atmega_port_addr(gpio_t pin)
*/
static inline uint16_t atmega_ddr_addr(gpio_t pin)
{
return (atmega_port_addr(pin) - 0x01);
return atmega_pin_addr(pin) + offsetof(atmega_gpio_port_t, ddr);
}
/**
* @brief Generate the PINx address of the given pin.
* @brief Generate the PORTx address of the give pin.
*/
static inline uint16_t atmega_pin_addr(gpio_t pin)
static inline uint16_t atmega_port_addr(gpio_t pin)
{
return (atmega_port_addr(pin) - 0x02);
return atmega_pin_addr(pin) + offsetof(atmega_gpio_port_t, port);
}
#ifdef __cplusplus