From d63d58ac0b3fe9f785598ac2a02bc764a9e26461 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 31 Aug 2020 13:02:32 +0200 Subject: [PATCH] pkg: use inline function for GPIO comparison The expandable GPIO API requires the comparison of structured GPIO types. This means that inline functions must be used instead of direct comparisons. For the migration process, packages must first be changed so that they use the inline comparison functions. --- pkg/openwsn/contrib/debugpins.c | 8 ++++---- pkg/openwsn/contrib/leds.c | 8 ++++---- pkg/u8g2/contrib/u8x8_riotos.c | 12 ++++++------ pkg/ucglib/contrib/ucg_riotos.c | 12 ++++++------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/openwsn/contrib/debugpins.c b/pkg/openwsn/contrib/debugpins.c index b2f22f5cad..02b6fda2ce 100644 --- a/pkg/openwsn/contrib/debugpins.c +++ b/pkg/openwsn/contrib/debugpins.c @@ -39,7 +39,7 @@ static debugpins_config_t _configuration = { static void _set_checked(gpio_t pin) { if (IS_USED(MODULE_OPENWSN_DEBUGPINS)) { - if (pin != GPIO_UNDEF){ + if (gpio_is_valid(pin)){ gpio_set(pin); } } @@ -48,7 +48,7 @@ static void _set_checked(gpio_t pin) static void _clear_checked(gpio_t pin) { if (IS_USED(MODULE_OPENWSN_DEBUGPINS)) { - if (pin != GPIO_UNDEF){ + if (gpio_is_valid(pin)){ gpio_clear(pin); } } @@ -57,7 +57,7 @@ static void _clear_checked(gpio_t pin) static void _toggle_checked(gpio_t pin) { if (IS_USED(MODULE_OPENWSN_DEBUGPINS)) { - if (pin != GPIO_UNDEF){ + if (gpio_is_valid(pin)){ gpio_toggle(pin); } } @@ -66,7 +66,7 @@ static void _toggle_checked(gpio_t pin) static void _init_checked(gpio_t pin) { if (IS_USED(MODULE_OPENWSN_DEBUGPINS)) { - if (pin != GPIO_UNDEF){ + if (gpio_is_valid(pin)){ gpio_init(pin, GPIO_OUT); } } diff --git a/pkg/openwsn/contrib/leds.c b/pkg/openwsn/contrib/leds.c index dc944be7ce..b064978ade 100644 --- a/pkg/openwsn/contrib/leds.c +++ b/pkg/openwsn/contrib/leds.c @@ -41,7 +41,7 @@ static leds_config_t _configuration = { static void _toggle_checked(gpio_t pin) { if (IS_USED(MODULE_OPENWSN_LEDS)) { - if (pin != GPIO_UNDEF) { + if (gpio_is_valid(pin)) { gpio_toggle(pin); } } @@ -50,7 +50,7 @@ static void _toggle_checked(gpio_t pin) static void _init_checked(gpio_t pin) { if (IS_USED(MODULE_OPENWSN_LEDS)) { - if (pin != GPIO_UNDEF) { + if (gpio_is_valid(pin)) { gpio_init(pin, GPIO_OUT); } } @@ -59,7 +59,7 @@ static void _init_checked(gpio_t pin) static void _write_checked(gpio_t pin, uint8_t on_state) { if (IS_USED(MODULE_OPENWSN_LEDS)) { - if (pin != GPIO_UNDEF) { + if (gpio_is_valid(pin)) { gpio_write(pin, on_state); } } @@ -70,7 +70,7 @@ static uint8_t _is_on_checked(gpio_t pin) if (IS_USED(MODULE_OPENWSN_LEDS)) { uint8_t ret = 0; - if (pin != GPIO_UNDEF) { + if (gpio_is_valid(pin)) { ret = gpio_read(pin); } return ret; diff --git a/pkg/u8g2/contrib/u8x8_riotos.c b/pkg/u8g2/contrib/u8x8_riotos.c index a7446a39a1..3243802a10 100644 --- a/pkg/u8g2/contrib/u8x8_riotos.c +++ b/pkg/u8g2/contrib/u8x8_riotos.c @@ -70,15 +70,15 @@ static void _enable_pins(const u8x8_riotos_t *u8x8_riot_ptr) return; } - if (u8x8_riot_ptr->pin_cs != GPIO_UNDEF) { + if (gpio_is_valid(u8x8_riot_ptr->pin_cs)) { gpio_init(u8x8_riot_ptr->pin_cs, GPIO_OUT); } - if (u8x8_riot_ptr->pin_dc != GPIO_UNDEF) { + if (gpio_is_valid(u8x8_riot_ptr->pin_dc)) { gpio_init(u8x8_riot_ptr->pin_dc, GPIO_OUT); } - if (u8x8_riot_ptr->pin_reset != GPIO_UNDEF) { + if (gpio_is_valid(u8x8_riot_ptr->pin_reset)) { gpio_init(u8x8_riot_ptr->pin_reset, GPIO_OUT); } } @@ -106,17 +106,17 @@ uint8_t u8x8_gpio_and_delay_riotos(u8x8_t *u8g2, uint8_t msg, uint8_t arg_int, v xtimer_nanosleep(arg_int * 100); break; case U8X8_MSG_GPIO_CS: - if (u8x8_riot_ptr != NULL && u8x8_riot_ptr->pin_cs != GPIO_UNDEF) { + if (u8x8_riot_ptr != NULL && gpio_is_valid(u8x8_riot_ptr->pin_cs)) { gpio_write(u8x8_riot_ptr->pin_cs, arg_int); } break; case U8X8_MSG_GPIO_DC: - if (u8x8_riot_ptr != NULL && u8x8_riot_ptr->pin_dc != GPIO_UNDEF) { + if (u8x8_riot_ptr != NULL && gpio_is_valid(u8x8_riot_ptr->pin_dc)) { gpio_write(u8x8_riot_ptr->pin_dc, arg_int); } break; case U8X8_MSG_GPIO_RESET: - if (u8x8_riot_ptr != NULL && u8x8_riot_ptr->pin_reset != GPIO_UNDEF) { + if (u8x8_riot_ptr != NULL && gpio_is_valid(u8x8_riot_ptr->pin_reset)) { gpio_write(u8x8_riot_ptr->pin_reset, arg_int); } break; diff --git a/pkg/ucglib/contrib/ucg_riotos.c b/pkg/ucglib/contrib/ucg_riotos.c index 6a415cdced..a5f0acd973 100644 --- a/pkg/ucglib/contrib/ucg_riotos.c +++ b/pkg/ucglib/contrib/ucg_riotos.c @@ -59,15 +59,15 @@ static void _enable_pins(const ucg_riotos_t *ucg_riot_ptr) return; } - if (ucg_riot_ptr->pin_cs != GPIO_UNDEF) { + if (gpio_is_valid(ucg_riot_ptr->pin_cs)) { gpio_init(ucg_riot_ptr->pin_cs, GPIO_OUT); } - if (ucg_riot_ptr->pin_cd != GPIO_UNDEF) { + if (gpio_is_valid(ucg_riot_ptr->pin_cd)) { gpio_init(ucg_riot_ptr->pin_cd, GPIO_OUT); } - if (ucg_riot_ptr->pin_reset != GPIO_UNDEF) { + if (gpio_is_valid(ucg_riot_ptr->pin_reset)) { gpio_init(ucg_riot_ptr->pin_reset, GPIO_OUT); } } @@ -100,17 +100,17 @@ int16_t ucg_com_hw_spi_riotos(ucg_t *ucg, int16_t msg, uint16_t arg, uint8_t *da xtimer_usleep(arg); break; case UCG_COM_MSG_CHANGE_RESET_LINE: - if (ucg_riot_ptr != NULL && ucg_riot_ptr->pin_reset != GPIO_UNDEF) { + if (ucg_riot_ptr != NULL && gpio_is_valid(ucg_riot_ptr->pin_reset)) { gpio_write(ucg_riot_ptr->pin_reset, arg); } break; case UCG_COM_MSG_CHANGE_CS_LINE: - if (ucg_riot_ptr != NULL && ucg_riot_ptr->pin_cs != GPIO_UNDEF) { + if (ucg_riot_ptr != NULL && gpio_is_valid(ucg_riot_ptr->pin_cs)) { gpio_write(ucg_riot_ptr->pin_cs, arg); } break; case UCG_COM_MSG_CHANGE_CD_LINE: - if (ucg_riot_ptr != NULL && ucg_riot_ptr->pin_cd != GPIO_UNDEF) { + if (ucg_riot_ptr != NULL && gpio_is_valid(ucg_riot_ptr->pin_cd)) { gpio_write(ucg_riot_ptr->pin_cd, arg); } break;