From a45a0e0898f323d0b2a6e7094734ec2dd2754977 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 5 Jul 2021 10:47:09 +0200 Subject: [PATCH] GPIO: correctly stub known ports - Use the correct port name in the #define - Fully qualify all references --- src/hal/gpio.h | 22 +++++++++++----------- tests/unit/modules/stubs/stub_gpio.cpp | 1 - 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/hal/gpio.h b/src/hal/gpio.h index ad8be82..e29546d 100644 --- a/src/hal/gpio.h +++ b/src/hal/gpio.h @@ -104,16 +104,16 @@ extern hal::gpio::GPIO_TypeDef _GPIOJ; extern hal::gpio::GPIO_TypeDef _GPIOK; extern hal::gpio::GPIO_TypeDef _GPIOL; -#define GPIOA (&_GPIOB) -#define GPIOB (&_GPIOB) -#define GPIOC (&_GPIOB) -#define GPIOD (&_GPIOB) -#define GPIOE (&_GPIOB) -#define GPIOF (&_GPIOB) -#define GPIOG (&_GPIOB) -#define GPIOH (&_GPIOB) -#define GPIOJ (&_GPIOB) -#define GPIOK (&_GPIOB) -#define GPIOL (&_GPIOB) +#define GPIOA (&::_GPIOA) +#define GPIOB (&::_GPIOB) +#define GPIOC (&::_GPIOC) +#define GPIOD (&::_GPIOD) +#define GPIOE (&::_GPIOE) +#define GPIOF (&::_GPIOF) +#define GPIOG (&::_GPIOG) +#define GPIOH (&::_GPIOH) +#define GPIOJ (&::_GPIOJ) +#define GPIOK (&::_GPIOK) +#define GPIOL (&::_GPIOL) #endif diff --git a/tests/unit/modules/stubs/stub_gpio.cpp b/tests/unit/modules/stubs/stub_gpio.cpp index 2c4b49b..e6493b0 100644 --- a/tests/unit/modules/stubs/stub_gpio.cpp +++ b/tests/unit/modules/stubs/stub_gpio.cpp @@ -8,7 +8,6 @@ hal::gpio::GPIO_TypeDef _GPIOE; hal::gpio::GPIO_TypeDef _GPIOF; hal::gpio::GPIO_TypeDef _GPIOG; hal::gpio::GPIO_TypeDef _GPIOH; -hal::gpio::GPIO_TypeDef _GPIOI; hal::gpio::GPIO_TypeDef _GPIOJ; hal::gpio::GPIO_TypeDef _GPIOK; hal::gpio::GPIO_TypeDef _GPIOL;