Skip to content

[bsp] fix mismatched function types in rt_pin_ops for all drv_gpio.c #7457

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

Merged
merged 4 commits into from
May 9, 2023
Merged

[bsp] fix mismatched function types in rt_pin_ops for all drv_gpio.c #7457

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68e69ee
[bsp] fix mismatched function types in rt_pin_ops
Placebo27 May 7, 2023
b976a5d
Merge branch 'RT-Thread:master' into master
Placebo27 May 7, 2023
a7c7b28
Merge branch 'RT-Thread:master' into master
Placebo27 May 7, 2023
50e6490
[bsp] Formatting Source code format
Placebo27 May 7, 2023
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
16 changes: 8 additions & 8 deletions bsp/allwinner/libraries/drivers/drv_pin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <rtdevice.h>
#include <hal_gpio.h>

static void hal_pin_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode)
static void hal_pin_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode)
{
switch (mode)
{
Expand All @@ -27,20 +27,20 @@ static void hal_pin_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode
}
}

static void hal_pin_write(struct rt_device *device, rt_base_t pin, rt_base_t value)
static void hal_pin_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value)
{
hal_gpio_set_data(pin,value);
}

static int hal_pin_read(struct rt_device *device, rt_base_t pin)
static rt_int8_t hal_pin_read(struct rt_device *device, rt_base_t pin)
{
gpio_data_t value;
hal_gpio_get_data(pin,&value);
return (int)value;
return (rt_int8_t)value;
}

static rt_err_t hal_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
rt_uint32_t mode, void (*hdr)(void *args),
static rt_err_t hal_pin_attach_irq(struct rt_device *device, rt_base_t pin,
rt_uint8_t mode, void (*hdr)(void *args),
void *args)
{
rt_base_t level = 0;
Expand Down Expand Up @@ -68,7 +68,7 @@ static rt_err_t hal_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return RT_EOK;
}

static rt_err_t hal_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
static rt_err_t hal_pin_detach_irq(struct rt_device *device, rt_base_t pin)
{
rt_base_t level = 0;
uint32_t irq;
Expand All @@ -92,7 +92,7 @@ static rt_err_t hal_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
return RT_EOK;
}

static rt_err_t hal_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
static rt_err_t hal_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
{
uint32_t irq;
int ret;
Expand Down
16 changes: 8 additions & 8 deletions bsp/apollo2/board/gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define APLLO2_PIN_NUMBERS 64 //[34, 64]
struct rt_pin_irq_hdr am_pin_irq_hdr_tab[64];

void am_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
void am_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
{
if (mode == PIN_MODE_OUTPUT)
{
Expand Down Expand Up @@ -47,7 +47,7 @@ void am_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
}
}

void am_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
void am_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
{
if (value == PIN_LOW)
{
Expand All @@ -59,9 +59,9 @@ void am_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
}
}

int am_pin_read(rt_device_t dev, rt_base_t pin)
rt_int8_t am_pin_read(rt_device_t dev, rt_base_t pin)
{
int value = PIN_LOW;
rt_int8_t value = PIN_LOW;

if (am_hal_gpio_pin_config_read(pin) == AM_HAL_GPIO_OUTPUT)
{
Expand Down Expand Up @@ -89,8 +89,8 @@ int am_pin_read(rt_device_t dev, rt_base_t pin)
return value;
}

rt_err_t am_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
rt_uint32_t mode, void (*hdr)(void *args), void *args)
rt_err_t am_pin_attach_irq(struct rt_device *device, rt_base_t pin,
rt_uint8_t mode, void (*hdr)(void *args), void *args)
{
rt_base_t level;
rt_int32_t irqindex = -1;
Expand Down Expand Up @@ -121,7 +121,7 @@ rt_err_t am_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return RT_EOK;
}

rt_err_t am_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
rt_err_t am_pin_dettach_irq(struct rt_device *device, rt_base_t pin)
{
rt_base_t level;
rt_int32_t irqindex = -1;
Expand All @@ -143,7 +143,7 @@ rt_err_t am_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
return RT_EOK;
}

rt_err_t am_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
rt_err_t am_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
{
rt_base_t level;
rt_int32_t irqindex = -1;
Expand Down
14 changes: 7 additions & 7 deletions bsp/beaglebone/drivers/gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static const rt_isr_handler_t GPIO_ISRx[] =
am33xx_gpio3_isr,
};

static void am33xx_pin_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode)
static void am33xx_pin_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode)
{
RT_ASSERT(pin >= 0 && pin < 128);
RT_ASSERT(mode != PIN_MODE_INPUT_PULLUP); /* Mode not supported */
Expand All @@ -154,7 +154,7 @@ static void am33xx_pin_mode(struct rt_device *device, rt_base_t pin, rt_base_t m
}
}

static void am33xx_pin_write(struct rt_device *device, rt_base_t pin, rt_base_t value)
static void am33xx_pin_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value)
{
RT_ASSERT(pin >= 0 && pin < 128);
rt_base_t gpiox = pin >> 5;
Expand All @@ -170,7 +170,7 @@ static void am33xx_pin_write(struct rt_device *device, rt_base_t pin, rt_base_t
}
}

static int am33xx_pin_read(struct rt_device *device, rt_base_t pin)
static rt_int8_t am33xx_pin_read(struct rt_device *device, rt_base_t pin)
{
RT_ASSERT(pin >= 0 && pin < 128);
rt_base_t gpiox = pin >> 5;
Expand All @@ -179,8 +179,8 @@ static int am33xx_pin_read(struct rt_device *device, rt_base_t pin)
return reg(GPIO_BASE[gpiox] + GPIO_DATAIN) & (1 << pinNumber) ? 1 : 0;
}

static rt_err_t am33xx_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
rt_uint32_t mode, void (*hdr)(void *args), void *args)
static rt_err_t am33xx_pin_attach_irq(struct rt_device *device, rt_base_t pin,
rt_uint8_t mode, void (*hdr)(void *args), void *args)
{
RT_ASSERT(pin >= 0 && pin < 128);
rt_base_t gpiox = pin >> 5;
Expand Down Expand Up @@ -273,7 +273,7 @@ static rt_err_t am33xx_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return 0;
}

static rt_err_t am33xx_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
static rt_err_t am33xx_pin_detach_irq(struct rt_device *device, rt_base_t pin)
{
RT_ASSERT(pin >= 0 && pin < 128);
rt_base_t gpiox = pin >> 5;
Expand All @@ -290,7 +290,7 @@ static rt_err_t am33xx_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
return 0;
}

static rt_err_t am33xx_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
static rt_err_t am33xx_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
{
RT_ASSERT(pin >= 0 && pin < 128);
rt_base_t gpiox = pin >> 5;
Expand Down
14 changes: 7 additions & 7 deletions bsp/bouffalo_lab/libraries/rt_drivers/drv_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ static void gpio_isr(int irq, void *arg)

}

static void _pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
static void _pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
{
if(value)
bflb_gpio_set(gpio, pin);
else
bflb_gpio_reset(gpio, pin);
}

static int _pin_read(rt_device_t dev, rt_base_t pin)
static rt_int8_t _pin_read(rt_device_t dev, rt_base_t pin)
{
return bflb_gpio_read(gpio, pin);
}

static void _pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
static void _pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
{
rt_uint32_t cfgset = 0;

Expand Down Expand Up @@ -88,8 +88,8 @@ static void _pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
bflb_gpio_init(gpio, pin, cfgset);
}

static rt_err_t _pin_attach_irq(struct rt_device *device, rt_int32_t pin,
rt_uint32_t irq_mode, void (*hdr)(void *args), void *args)
static rt_err_t _pin_attach_irq(struct rt_device *device, rt_base_t pin,
rt_uint8_t irq_mode, void (*hdr)(void *args), void *args)
{
rt_base_t level;

Expand Down Expand Up @@ -119,7 +119,7 @@ static rt_err_t _pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return RT_EOK;
}

static rt_err_t _pin_detach_irq(struct rt_device *device, rt_int32_t pin)
static rt_err_t _pin_detach_irq(struct rt_device *device, rt_base_t pin)
{
rt_base_t level;

Expand All @@ -143,7 +143,7 @@ static rt_err_t _pin_detach_irq(struct rt_device *device, rt_int32_t pin)
}

static rt_err_t _pin_irq_enable(struct rt_device *device, rt_base_t pin,
rt_uint32_t enabled)
rt_uint8_t enabled)
{
rt_base_t level;
rt_uint8_t trig_mode = 0;
Expand Down
16 changes: 8 additions & 8 deletions bsp/essemi/es32f0654/drivers/drv_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ const struct pin_index *get_pin(uint8_t pin)
return index;
};

void es32f0_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
void es32f0_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
{
const struct pin_index *index;
index = get_pin(pin);
Expand All @@ -246,9 +246,9 @@ void es32f0_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
ald_gpio_write_pin(index->gpio, index->pin, value);
}

int es32f0_pin_read(rt_device_t dev, rt_base_t pin)
rt_int8_t es32f0_pin_read(rt_device_t dev, rt_base_t pin)
{
int value;
rt_int8_t value;
const struct pin_index *index;
value = PIN_LOW;
index = get_pin(pin);
Expand All @@ -260,7 +260,7 @@ int es32f0_pin_read(rt_device_t dev, rt_base_t pin)
return value;
}

void es32f0_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
void es32f0_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
{
const struct pin_index *index;
gpio_init_t gpio_initstruct;
Expand Down Expand Up @@ -328,8 +328,8 @@ rt_inline const struct pin_irq_map *get_pin_irq_map(rt_uint16_t gpio_pin)
return &pin_irq_map[map_index];
};

rt_err_t es32f0_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
rt_uint32_t mode, void (*hdr)(void *args), void *args)
rt_err_t es32f0_pin_attach_irq(struct rt_device *device, rt_base_t pin,
rt_uint8_t mode, void (*hdr)(void *args), void *args)
{
const struct pin_index *index;
rt_base_t level;
Expand Down Expand Up @@ -373,7 +373,7 @@ rt_err_t es32f0_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return RT_EOK;
}

rt_err_t es32f0_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
rt_err_t es32f0_pin_detach_irq(struct rt_device *device, rt_base_t pin)
{
const struct pin_index *index;
rt_base_t level;
Expand Down Expand Up @@ -403,7 +403,7 @@ rt_err_t es32f0_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
}

rt_err_t es32f0_pin_irq_enable(struct rt_device *device, rt_base_t pin,
rt_uint32_t enabled)
rt_uint8_t enabled)
{
const struct pin_index *index;
const struct pin_irq_map *irqmap;
Expand Down
16 changes: 8 additions & 8 deletions bsp/essemi/es32f369x/drivers/drv_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ const struct pin_index *get_pin(uint8_t pin)
return index;
};

void es32f3_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
void es32f3_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
{
const struct pin_index *index;
index = get_pin(pin);
Expand All @@ -247,9 +247,9 @@ void es32f3_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
ald_gpio_write_pin(index->gpio, index->pin, value);
}

int es32f3_pin_read(rt_device_t dev, rt_base_t pin)
rt_int8_t es32f3_pin_read(rt_device_t dev, rt_base_t pin)
{
int value;
rt_int8_t value;
const struct pin_index *index;
value = PIN_LOW;
index = get_pin(pin);
Expand All @@ -261,7 +261,7 @@ int es32f3_pin_read(rt_device_t dev, rt_base_t pin)
return value;
}

void es32f3_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
void es32f3_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
{
const struct pin_index *index;
gpio_init_t gpio_initstruct;
Expand Down Expand Up @@ -330,8 +330,8 @@ rt_inline const struct pin_irq_map *get_pin_irq_map(rt_uint16_t gpio_pin)
return &pin_irq_map[map_index];
};

rt_err_t es32f3_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
rt_uint32_t mode, void (*hdr)(void *args), void *args)
rt_err_t es32f3_pin_attach_irq(struct rt_device *device, rt_base_t pin,
rt_uint8_t mode, void (*hdr)(void *args), void *args)
{
const struct pin_index *index;
rt_base_t level;
Expand Down Expand Up @@ -375,7 +375,7 @@ rt_err_t es32f3_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return RT_EOK;
}

rt_err_t es32f3_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
rt_err_t es32f3_pin_detach_irq(struct rt_device *device, rt_base_t pin)
{
const struct pin_index *index;
rt_base_t level;
Expand Down Expand Up @@ -412,7 +412,7 @@ rt_err_t es32f3_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
}

rt_err_t es32f3_pin_irq_enable(struct rt_device *device, rt_base_t pin,
rt_uint32_t enabled)
rt_uint8_t enabled)
{
const struct pin_index *index;
const struct pin_irq_map *irqmap;
Expand Down
16 changes: 8 additions & 8 deletions bsp/fm33lc026/libraries/HAL_Drivers/drv_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static rt_base_t fm33_pin_get(const char *name)
return pin;
}

static void fm33_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
static void fm33_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
{
GPIO_Type *gpio_port;
uint16_t gpio_pin;
Expand All @@ -148,11 +148,11 @@ static void fm33_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
}
}

static int fm33_pin_read(rt_device_t dev, rt_base_t pin)
static rt_int8_t fm33_pin_read(rt_device_t dev, rt_base_t pin)
{
GPIO_Type *gpio_port;
uint16_t gpio_pin;
int value = PIN_LOW;
rt_int8_t value = PIN_LOW;

if (PIN_PORT(pin) < PIN_STPORT_MAX)
{
Expand All @@ -164,7 +164,7 @@ static int fm33_pin_read(rt_device_t dev, rt_base_t pin)
return value;
}

static void fm33_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
static void fm33_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
{
FL_GPIO_InitTypeDef GPIO_InitStruct;

Expand Down Expand Up @@ -237,8 +237,8 @@ rt_inline const struct pin_irq_map *get_pin_irq_map(rt_base_t pin)
return &pin_irq_map[mapindex];
};

static rt_err_t fm33_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
rt_uint32_t mode, void (*hdr)(void *args), void *args)
static rt_err_t fm33_pin_attach_irq(struct rt_device *device, rt_base_t pin,
rt_uint8_t mode, void (*hdr)(void *args), void *args)
{
rt_base_t level;
rt_int32_t irqindex = -1;
Expand Down Expand Up @@ -277,7 +277,7 @@ static rt_err_t fm33_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
return RT_EOK;
}

static rt_err_t fm33_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
static rt_err_t fm33_pin_dettach_irq(struct rt_device *device, rt_base_t pin)
{
rt_base_t level;
rt_int32_t irqindex = -1;
Expand Down Expand Up @@ -309,7 +309,7 @@ static rt_err_t fm33_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
}

static rt_err_t fm33_pin_irq_enable(struct rt_device *device, rt_base_t pin,
rt_uint32_t enabled)
rt_uint8_t enabled)
{
const struct pin_irq_map *irqmap;
rt_base_t level;
Expand Down
Loading