Skip to content

Allow GPIO pin #'s > 7. In functions treating GPIO pin types as part of a bitmask, use the type that's used for this purpose and appropriately set for our target to be wide enough to be used. BL602 has 23 GPIOs, so holding them in a bitmask in a uint8_t works poorly. #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow GPIO pin #'s > 7. In functions treating GPIO pin types as part of a bitmask, use the type that's used for this purpose and appropriately set for our target to be wide enough to be used. BL602 has 23 GPIOs, so holding them in a bitmask in a uint8_t works poorly. #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions arch/risc-v/src/bl602/bl602_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ int bl602_configgpio(gpio_pinset_t cfgset)
uint32_t mask;
uintptr_t regaddr;
uint32_t cfg = 0;
uint8_t pin = (cfgset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
gpio_pinset_t pin = (cfgset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;

if (pin > 27)
{
Expand Down Expand Up @@ -151,7 +151,7 @@ int bl602_configgpio(gpio_pinset_t cfgset)
*
****************************************************************************/

int bl602_gpio_deinit(uint8_t pin)
int bl602_gpio_deinit(gpio_pinset_t pin)
{
bl602_configgpio(GPIO_INPUT | GPIO_FLOAT | pin);
return OK;
Expand All @@ -173,7 +173,7 @@ int bl602_gpio_deinit(uint8_t pin)
int bl602_config_uart_sel(gpio_pinset_t pinset, uint8_t sig_sel)
{
irqstate_t flags;
uint8_t pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
gpio_pinset_t pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
uint8_t sel_idx;
uint32_t reg;

Expand Down Expand Up @@ -204,7 +204,7 @@ int bl602_config_uart_sel(gpio_pinset_t pinset, uint8_t sig_sel)

void bl602_gpiowrite(gpio_pinset_t pinset, bool value)
{
uint8_t pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
gpio_pinset_t pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
if (value)
{
modifyreg32(BL602_GPIO_CFGCTL32, 0, (1 << pin));
Expand All @@ -225,6 +225,6 @@ void bl602_gpiowrite(gpio_pinset_t pinset, bool value)

bool bl602_gpioread(gpio_pinset_t pinset)
{
uint8_t pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
gpio_pinset_t pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
return ((getreg32(BL602_GPIO_CFGCTL30) & (1 << pin)) ? 1 : 0);
}
2 changes: 1 addition & 1 deletion arch/risc-v/src/bl602/bl602_gpio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ int bl602_configgpio(gpio_pinset_t cfgset);
*
****************************************************************************/

int bl602_gpio_deinit(uint8_t pin);
int bl602_gpio_deinit(gpio_pinset_t pin);

/****************************************************************************
* Name: bl602_config_uart_sel
Expand Down