Skip to content

Commit 538158b

Browse files
Placebo27Placebo27
authored
[bsp] fix mismatched function types in rt_pin_ops for all drv_gpio.c (#7457)
1 parent 3cf07f1 commit 538158b

File tree

51 files changed

+486
-485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+486
-485
lines changed

‎bsp/allwinner/libraries/drivers/drv_pin.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <rtdevice.h>
33
#include <hal_gpio.h>
44

5-
static void hal_pin_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode)
5+
static void hal_pin_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode)
66
{
77
switch (mode)
88
{
@@ -27,20 +27,20 @@ static void hal_pin_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode
2727
}
2828
}
2929

30-
static void hal_pin_write(struct rt_device *device, rt_base_t pin, rt_base_t value)
30+
static void hal_pin_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value)
3131
{
3232
hal_gpio_set_data(pin,value);
3333
}
3434

35-
static int hal_pin_read(struct rt_device *device, rt_base_t pin)
35+
static rt_int8_t hal_pin_read(struct rt_device *device, rt_base_t pin)
3636
{
3737
gpio_data_t value;
3838
hal_gpio_get_data(pin,&value);
39-
return (int)value;
39+
return (rt_int8_t)value;
4040
}
4141

42-
static rt_err_t hal_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
43-
rt_uint32_t mode, void (*hdr)(void *args),
42+
static rt_err_t hal_pin_attach_irq(struct rt_device *device, rt_base_t pin,
43+
rt_uint8_t mode, void (*hdr)(void *args),
4444
void *args)
4545
{
4646
rt_base_t level = 0;
@@ -68,7 +68,7 @@ static rt_err_t hal_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
6868
return RT_EOK;
6969
}
7070

71-
static rt_err_t hal_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
71+
static rt_err_t hal_pin_detach_irq(struct rt_device *device, rt_base_t pin)
7272
{
7373
rt_base_t level = 0;
7474
uint32_t irq;
@@ -92,7 +92,7 @@ static rt_err_t hal_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
9292
return RT_EOK;
9393
}
9494

95-
static rt_err_t hal_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
95+
static rt_err_t hal_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
9696
{
9797
uint32_t irq;
9898
int ret;

‎bsp/apollo2/board/gpio.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define APLLO2_PIN_NUMBERS 64 //[34, 64]
1919
struct rt_pin_irq_hdr am_pin_irq_hdr_tab[64];
2020

21-
void am_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
21+
void am_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
2222
{
2323
if (mode == PIN_MODE_OUTPUT)
2424
{
@@ -47,7 +47,7 @@ void am_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
4747
}
4848
}
4949

50-
void am_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
50+
void am_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
5151
{
5252
if (value == PIN_LOW)
5353
{
@@ -59,9 +59,9 @@ void am_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
5959
}
6060
}
6161

62-
int am_pin_read(rt_device_t dev, rt_base_t pin)
62+
rt_int8_t am_pin_read(rt_device_t dev, rt_base_t pin)
6363
{
64-
int value = PIN_LOW;
64+
rt_int8_t value = PIN_LOW;
6565

6666
if (am_hal_gpio_pin_config_read(pin) == AM_HAL_GPIO_OUTPUT)
6767
{
@@ -89,8 +89,8 @@ int am_pin_read(rt_device_t dev, rt_base_t pin)
8989
return value;
9090
}
9191

92-
rt_err_t am_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
93-
rt_uint32_t mode, void (*hdr)(void *args), void *args)
92+
rt_err_t am_pin_attach_irq(struct rt_device *device, rt_base_t pin,
93+
rt_uint8_t mode, void (*hdr)(void *args), void *args)
9494
{
9595
rt_base_t level;
9696
rt_int32_t irqindex = -1;
@@ -121,7 +121,7 @@ rt_err_t am_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
121121
return RT_EOK;
122122
}
123123

124-
rt_err_t am_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
124+
rt_err_t am_pin_dettach_irq(struct rt_device *device, rt_base_t pin)
125125
{
126126
rt_base_t level;
127127
rt_int32_t irqindex = -1;
@@ -143,7 +143,7 @@ rt_err_t am_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
143143
return RT_EOK;
144144
}
145145

146-
rt_err_t am_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
146+
rt_err_t am_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
147147
{
148148
rt_base_t level;
149149
rt_int32_t irqindex = -1;

‎bsp/beaglebone/drivers/gpio.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static const rt_isr_handler_t GPIO_ISRx[] =
137137
am33xx_gpio3_isr,
138138
};
139139

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

157-
static void am33xx_pin_write(struct rt_device *device, rt_base_t pin, rt_base_t value)
157+
static void am33xx_pin_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value)
158158
{
159159
RT_ASSERT(pin >= 0 && pin < 128);
160160
rt_base_t gpiox = pin >> 5;
@@ -170,7 +170,7 @@ static void am33xx_pin_write(struct rt_device *device, rt_base_t pin, rt_base_t
170170
}
171171
}
172172

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

182-
static rt_err_t am33xx_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
183-
rt_uint32_t mode, void (*hdr)(void *args), void *args)
182+
static rt_err_t am33xx_pin_attach_irq(struct rt_device *device, rt_base_t pin,
183+
rt_uint8_t mode, void (*hdr)(void *args), void *args)
184184
{
185185
RT_ASSERT(pin >= 0 && pin < 128);
186186
rt_base_t gpiox = pin >> 5;
@@ -273,7 +273,7 @@ static rt_err_t am33xx_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
273273
return 0;
274274
}
275275

276-
static rt_err_t am33xx_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
276+
static rt_err_t am33xx_pin_detach_irq(struct rt_device *device, rt_base_t pin)
277277
{
278278
RT_ASSERT(pin >= 0 && pin < 128);
279279
rt_base_t gpiox = pin >> 5;
@@ -290,7 +290,7 @@ static rt_err_t am33xx_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
290290
return 0;
291291
}
292292

293-
static rt_err_t am33xx_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
293+
static rt_err_t am33xx_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
294294
{
295295
RT_ASSERT(pin >= 0 && pin < 128);
296296
rt_base_t gpiox = pin >> 5;

‎bsp/bouffalo_lab/libraries/rt_drivers/drv_gpio.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ static void gpio_isr(int irq, void *arg)
4040

4141
}
4242

43-
static void _pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
43+
static void _pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
4444
{
4545
if(value)
4646
bflb_gpio_set(gpio, pin);
4747
else
4848
bflb_gpio_reset(gpio, pin);
4949
}
5050

51-
static int _pin_read(rt_device_t dev, rt_base_t pin)
51+
static rt_int8_t _pin_read(rt_device_t dev, rt_base_t pin)
5252
{
5353
return bflb_gpio_read(gpio, pin);
5454
}
5555

56-
static void _pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
56+
static void _pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
5757
{
5858
rt_uint32_t cfgset = 0;
5959

@@ -88,8 +88,8 @@ static void _pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
8888
bflb_gpio_init(gpio, pin, cfgset);
8989
}
9090

91-
static rt_err_t _pin_attach_irq(struct rt_device *device, rt_int32_t pin,
92-
rt_uint32_t irq_mode, void (*hdr)(void *args), void *args)
91+
static rt_err_t _pin_attach_irq(struct rt_device *device, rt_base_t pin,
92+
rt_uint8_t irq_mode, void (*hdr)(void *args), void *args)
9393
{
9494
rt_base_t level;
9595

@@ -119,7 +119,7 @@ static rt_err_t _pin_attach_irq(struct rt_device *device, rt_int32_t pin,
119119
return RT_EOK;
120120
}
121121

122-
static rt_err_t _pin_detach_irq(struct rt_device *device, rt_int32_t pin)
122+
static rt_err_t _pin_detach_irq(struct rt_device *device, rt_base_t pin)
123123
{
124124
rt_base_t level;
125125

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

145145
static rt_err_t _pin_irq_enable(struct rt_device *device, rt_base_t pin,
146-
rt_uint32_t enabled)
146+
rt_uint8_t enabled)
147147
{
148148
rt_base_t level;
149149
rt_uint8_t trig_mode = 0;

‎bsp/essemi/es32f0654/drivers/drv_gpio.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ const struct pin_index *get_pin(uint8_t pin)
235235
return index;
236236
};
237237

238-
void es32f0_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
238+
void es32f0_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
239239
{
240240
const struct pin_index *index;
241241
index = get_pin(pin);
@@ -246,9 +246,9 @@ void es32f0_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
246246
ald_gpio_write_pin(index->gpio, index->pin, value);
247247
}
248248

249-
int es32f0_pin_read(rt_device_t dev, rt_base_t pin)
249+
rt_int8_t es32f0_pin_read(rt_device_t dev, rt_base_t pin)
250250
{
251-
int value;
251+
rt_int8_t value;
252252
const struct pin_index *index;
253253
value = PIN_LOW;
254254
index = get_pin(pin);
@@ -260,7 +260,7 @@ int es32f0_pin_read(rt_device_t dev, rt_base_t pin)
260260
return value;
261261
}
262262

263-
void es32f0_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
263+
void es32f0_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
264264
{
265265
const struct pin_index *index;
266266
gpio_init_t gpio_initstruct;
@@ -328,8 +328,8 @@ rt_inline const struct pin_irq_map *get_pin_irq_map(rt_uint16_t gpio_pin)
328328
return &pin_irq_map[map_index];
329329
};
330330

331-
rt_err_t es32f0_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
332-
rt_uint32_t mode, void (*hdr)(void *args), void *args)
331+
rt_err_t es32f0_pin_attach_irq(struct rt_device *device, rt_base_t pin,
332+
rt_uint8_t mode, void (*hdr)(void *args), void *args)
333333
{
334334
const struct pin_index *index;
335335
rt_base_t level;
@@ -373,7 +373,7 @@ rt_err_t es32f0_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
373373
return RT_EOK;
374374
}
375375

376-
rt_err_t es32f0_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
376+
rt_err_t es32f0_pin_detach_irq(struct rt_device *device, rt_base_t pin)
377377
{
378378
const struct pin_index *index;
379379
rt_base_t level;
@@ -403,7 +403,7 @@ rt_err_t es32f0_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
403403
}
404404

405405
rt_err_t es32f0_pin_irq_enable(struct rt_device *device, rt_base_t pin,
406-
rt_uint32_t enabled)
406+
rt_uint8_t enabled)
407407
{
408408
const struct pin_index *index;
409409
const struct pin_irq_map *irqmap;

‎bsp/essemi/es32f369x/drivers/drv_gpio.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ const struct pin_index *get_pin(uint8_t pin)
236236
return index;
237237
};
238238

239-
void es32f3_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
239+
void es32f3_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
240240
{
241241
const struct pin_index *index;
242242
index = get_pin(pin);
@@ -247,9 +247,9 @@ void es32f3_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
247247
ald_gpio_write_pin(index->gpio, index->pin, value);
248248
}
249249

250-
int es32f3_pin_read(rt_device_t dev, rt_base_t pin)
250+
rt_int8_t es32f3_pin_read(rt_device_t dev, rt_base_t pin)
251251
{
252-
int value;
252+
rt_int8_t value;
253253
const struct pin_index *index;
254254
value = PIN_LOW;
255255
index = get_pin(pin);
@@ -261,7 +261,7 @@ int es32f3_pin_read(rt_device_t dev, rt_base_t pin)
261261
return value;
262262
}
263263

264-
void es32f3_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
264+
void es32f3_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
265265
{
266266
const struct pin_index *index;
267267
gpio_init_t gpio_initstruct;
@@ -330,8 +330,8 @@ rt_inline const struct pin_irq_map *get_pin_irq_map(rt_uint16_t gpio_pin)
330330
return &pin_irq_map[map_index];
331331
};
332332

333-
rt_err_t es32f3_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
334-
rt_uint32_t mode, void (*hdr)(void *args), void *args)
333+
rt_err_t es32f3_pin_attach_irq(struct rt_device *device, rt_base_t pin,
334+
rt_uint8_t mode, void (*hdr)(void *args), void *args)
335335
{
336336
const struct pin_index *index;
337337
rt_base_t level;
@@ -375,7 +375,7 @@ rt_err_t es32f3_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
375375
return RT_EOK;
376376
}
377377

378-
rt_err_t es32f3_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
378+
rt_err_t es32f3_pin_detach_irq(struct rt_device *device, rt_base_t pin)
379379
{
380380
const struct pin_index *index;
381381
rt_base_t level;
@@ -412,7 +412,7 @@ rt_err_t es32f3_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
412412
}
413413

414414
rt_err_t es32f3_pin_irq_enable(struct rt_device *device, rt_base_t pin,
415-
rt_uint32_t enabled)
415+
rt_uint8_t enabled)
416416
{
417417
const struct pin_index *index;
418418
const struct pin_irq_map *irqmap;

‎bsp/fm33lc026/libraries/HAL_Drivers/drv_gpio.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static rt_base_t fm33_pin_get(const char *name)
127127
return pin;
128128
}
129129

130-
static void fm33_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
130+
static void fm33_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
131131
{
132132
GPIO_Type *gpio_port;
133133
uint16_t gpio_pin;
@@ -148,11 +148,11 @@ static void fm33_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
148148
}
149149
}
150150

151-
static int fm33_pin_read(rt_device_t dev, rt_base_t pin)
151+
static rt_int8_t fm33_pin_read(rt_device_t dev, rt_base_t pin)
152152
{
153153
GPIO_Type *gpio_port;
154154
uint16_t gpio_pin;
155-
int value = PIN_LOW;
155+
rt_int8_t value = PIN_LOW;
156156

157157
if (PIN_PORT(pin) < PIN_STPORT_MAX)
158158
{
@@ -164,7 +164,7 @@ static int fm33_pin_read(rt_device_t dev, rt_base_t pin)
164164
return value;
165165
}
166166

167-
static void fm33_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
167+
static void fm33_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
168168
{
169169
FL_GPIO_InitTypeDef GPIO_InitStruct;
170170

@@ -237,8 +237,8 @@ rt_inline const struct pin_irq_map *get_pin_irq_map(rt_base_t pin)
237237
return &pin_irq_map[mapindex];
238238
};
239239

240-
static rt_err_t fm33_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
241-
rt_uint32_t mode, void (*hdr)(void *args), void *args)
240+
static rt_err_t fm33_pin_attach_irq(struct rt_device *device, rt_base_t pin,
241+
rt_uint8_t mode, void (*hdr)(void *args), void *args)
242242
{
243243
rt_base_t level;
244244
rt_int32_t irqindex = -1;
@@ -277,7 +277,7 @@ static rt_err_t fm33_pin_attach_irq(struct rt_device *device, rt_int32_t pin,
277277
return RT_EOK;
278278
}
279279

280-
static rt_err_t fm33_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
280+
static rt_err_t fm33_pin_dettach_irq(struct rt_device *device, rt_base_t pin)
281281
{
282282
rt_base_t level;
283283
rt_int32_t irqindex = -1;
@@ -309,7 +309,7 @@ static rt_err_t fm33_pin_dettach_irq(struct rt_device *device, rt_int32_t pin)
309309
}
310310

311311
static rt_err_t fm33_pin_irq_enable(struct rt_device *device, rt_base_t pin,
312-
rt_uint32_t enabled)
312+
rt_uint8_t enabled)
313313
{
314314
const struct pin_irq_map *irqmap;
315315
rt_base_t level;

0 commit comments

Comments
 (0)