From 3ff48feae1e83761563a554a6b10faa8ebcc6356 Mon Sep 17 00:00:00 2001 From: Bhuvanchandra DV Date: Fri, 17 Feb 2017 21:19:07 +0530 Subject: vf6xx: gpio_vf6xx: correct the GPIO toggle control Drop unnecessary parameter gpio_pin_action_t and use the port toggle register to toggle the pin. Signed-off-by: Bhuvanchandra DV Signed-off-by: Stefan Agner --- examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c | 2 +- platform/drivers/inc/gpio_vf6xx.h | 7 +++++-- platform/drivers/src/gpio_vf6xx.c | 8 -------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c b/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c index 8b29c54..8a78759 100644 --- a/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c +++ b/examples/vf6xx_colibri_m4/demo_apps/gpio_sample/main.c @@ -62,7 +62,7 @@ void switch_task(void *p) void led_toggle_task(void *p) { for (;;) { - GPIO_TogglePinOutput(GPIO(39), 39, gpioPinSet); + GPIO_TogglePinOutput(GPIO(39), 39); vTaskDelay(500); } diff --git a/platform/drivers/inc/gpio_vf6xx.h b/platform/drivers/inc/gpio_vf6xx.h index e420b84..c191e07 100644 --- a/platform/drivers/inc/gpio_vf6xx.h +++ b/platform/drivers/inc/gpio_vf6xx.h @@ -88,8 +88,6 @@ extern "C" { */ void GPIO_Init(GPIO_Type* base, gpio_init_t* initStruct); -void GPIO_TogglePinOutput(GPIO_Type* base, uint32_t pin, gpio_pin_action_t pinVal); - /*@}*/ /*! @@ -203,6 +201,11 @@ static inline uint8_t GPIO_ReadPadStatus(GPIO_Type* base, uint32_t pin) return (uint8_t)((GPIO_PSOR_REG(base) >> (pin & 0x1f)) & 1U); } +static inline void GPIO_TogglePinOutput(GPIO_Type* base, uint32_t pin) +{ + GPIO_PTOR_REG(base) |= GPIO_OFFSET(pin); +} + /*@}*/ #if defined(__cplusplus) diff --git a/platform/drivers/src/gpio_vf6xx.c b/platform/drivers/src/gpio_vf6xx.c index 5f9326c..637080a 100644 --- a/platform/drivers/src/gpio_vf6xx.c +++ b/platform/drivers/src/gpio_vf6xx.c @@ -86,14 +86,6 @@ void GPIO_WritePinOutput(GPIO_Type* base, uint32_t pin, gpio_pin_action_t pinVal GPIO_PSOR_REG(base) &= ~(GPIO_OFFSET(pin)); /* Set pin output to low level.*/ } -void GPIO_TogglePinOutput(GPIO_Type* base, uint32_t pin, gpio_pin_action_t pinVal) -{ - if (pinVal == gpioPinSet) - GPIO_PTOR_REG(base) |= GPIO_OFFSET(pin); /* Set pin output to high level.*/ - else - GPIO_PTOR_REG(base) &= ~(GPIO_OFFSET(pin)); /* Set pin output to low level.*/ -} - /******************************************************************************* * EOF ******************************************************************************/ -- cgit v1.2.3