Skip to content

Commit c143842

Browse files
ttnwosaymysterywolf
ttnwosay
authored and
mysterywolf
committed
Update fix warnings and builds.
1 parent d9e74b0 commit c143842

File tree

27 files changed

+195
-179
lines changed

27 files changed

+195
-179
lines changed

‎bsp/nuvoton/libraries/m031/rtt_port/drv_gpio.c

+37-38
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929

3030
/* Private functions ------------------------------------------------------------*/
3131

32-
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode);
33-
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_base_t value);
34-
static int nu_gpio_read(struct rt_device *device, rt_base_t pin);
35-
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint32_t mode, void (*hdr)(void *args), void *args);
32+
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode);
33+
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value);
34+
static rt_int8_t nu_gpio_read(struct rt_device *device, rt_base_t pin);
35+
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint8_t mode, void (*hdr)(void *args), void *args);
3636
static rt_err_t nu_gpio_detach_irq(struct rt_device *device, rt_int32_t pin);
37-
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled);
38-
static rt_base_t nu_gpio_get(const char *name);
37+
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled);
38+
static rt_base_t nu_gpio_pin_get(const char *name);
3939

4040
/* Private variables ------------------------------------------------------------*/
4141
static struct rt_pin_irq_hdr pin_irq_hdr_tab[IRQ_MAX_NUM];
@@ -47,7 +47,7 @@ static struct rt_pin_ops nu_gpio_ops =
4747
nu_gpio_attach_irq,
4848
nu_gpio_detach_irq,
4949
nu_gpio_irq_enable,
50-
nu_gpio_get,
50+
nu_gpio_pin_get,
5151
};
5252

5353
static rt_uint32_t g_u32PinIrqMask = 0x0;
@@ -102,7 +102,32 @@ static void pin_irq_hdr(rt_uint32_t irq_status, rt_uint32_t port_index)
102102
}
103103
}
104104

105-
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode)
105+
static rt_base_t nu_gpio_pin_get(const char *name)
106+
{
107+
/* Get pin number by name,such as PA.0, PF12 */
108+
if ((name[2] == '\0') || ((name[2] == '.') && (name[3] == '\0')))
109+
return -(RT_EINVAL);
110+
111+
long number;
112+
113+
if ((name[2] == '.'))
114+
number = atol(&name[3]);
115+
else
116+
number = atol(&name[2]);
117+
118+
if (number > 15)
119+
return -(RT_EINVAL);
120+
121+
if (name[1] >= 'A' && name[1] <= 'H')
122+
return ((name[1] - 'A') * 0x10) + number;
123+
124+
if (name[1] >= 'a' && name[1] <= 'h')
125+
return ((name[1] - 'a') * 0x10) + number;
126+
127+
return -(RT_EINVAL);
128+
}
129+
130+
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode)
106131
{
107132
GPIO_T *PORT;
108133

@@ -140,23 +165,23 @@ static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode
140165
#endif
141166
}
142167

143-
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_base_t value)
168+
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value)
144169
{
145170
if (nu_port_check(pin))
146171
return;
147172

148173
GPIO_PIN_DATA(NU_GET_PORT(pin), NU_GET_PINS(pin)) = value;
149174
}
150175

151-
static int nu_gpio_read(struct rt_device *device, rt_base_t pin)
176+
static rt_int8_t nu_gpio_read(struct rt_device *device, rt_base_t pin)
152177
{
153178
if (nu_port_check(pin))
154179
return PIN_LOW;
155180

156181
return GPIO_PIN_DATA(NU_GET_PORT(pin), NU_GET_PINS(pin));
157182
}
158183

159-
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint32_t mode, void (*hdr)(void *args), void *args)
184+
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint8_t mode, void (*hdr)(void *args), void *args)
160185
{
161186
rt_base_t level;
162187
rt_int32_t irqindex;
@@ -223,7 +248,7 @@ static rt_err_t nu_gpio_detach_irq(struct rt_device *device, rt_int32_t pin)
223248
return RT_EOK;
224249
}
225250

226-
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
251+
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
227252
{
228253
GPIO_T *PORT;
229254
rt_base_t level;
@@ -282,32 +307,6 @@ static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_u
282307
return -(ret);
283308
}
284309

285-
static rt_base_t nu_gpio_get(const char *name)
286-
{
287-
/* Get pin number by name,such as PA.0, PF12 */
288-
if ((name[2] == '\0')||((name[2] == '.')&&(name[3] == '\0')))
289-
return -(RT_EINVAL);
290-
291-
long number;
292-
293-
if ((name[2] == '.'))
294-
number = atol(&name[3]);
295-
else
296-
number = atol(&name[2]);
297-
298-
if (number > 15)
299-
return -(RT_EINVAL);
300-
301-
if (name[1] >= 'A' && name[1] <= 'H')
302-
return ((name[1] - 'A') * 0x10) + number;
303-
304-
if (name[1] >= 'a' && name[1] <= 'h')
305-
return ((name[1] - 'a') * 0x10) + number;
306-
307-
return -(RT_EINVAL);
308-
309-
}
310-
311310
int rt_hw_gpio_init(void)
312311
{
313312
rt_int32_t irqindex;

‎bsp/nuvoton/libraries/m031/rtt_port/drv_usbd.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
#include <rtconfig.h>
1414

15-
#ifdef BSP_USING_USBD
15+
#if defined(BSP_USING_USBD)
16+
1617
#include <rtthread.h>
1718
#include <rtdevice.h>
1819
#include <string.h>
@@ -191,7 +192,7 @@ static rt_err_t _ep_disable(uep_t ep)
191192
return RT_EOK;
192193
}
193194

194-
static rt_ssize_t _ep_read(rt_uint8_t address, void *buffer)
195+
static rt_size_t _ep_read(rt_uint8_t address, void *buffer)
195196
{
196197
rt_size_t size = 0;
197198
rt_uint8_t *buf;
@@ -207,7 +208,7 @@ static rt_ssize_t _ep_read(rt_uint8_t address, void *buffer)
207208
return size;
208209
}
209210

210-
static rt_ssize_t _ep_read_prepare(rt_uint8_t address, void *buffer, rt_size_t size)
211+
static rt_size_t _ep_read_prepare(rt_uint8_t address, void *buffer, rt_size_t size)
211212
{
212213
RT_ASSERT(!(address & USB_DIR_IN));
213214

@@ -216,7 +217,7 @@ static rt_ssize_t _ep_read_prepare(rt_uint8_t address, void *buffer, rt_size_t s
216217
return size;
217218
}
218219

219-
static rt_ssize_t _ep_write(rt_uint8_t address, void *buffer, rt_size_t size)
220+
static rt_size_t _ep_write(rt_uint8_t address, void *buffer, rt_size_t size)
220221
{
221222
RT_ASSERT((address & USB_DIR_IN));
222223

‎bsp/nuvoton/libraries/m2354/rtt_port/drv_gpio.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
/* Private functions ------------------------------------------------------------*/
3131

32-
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode);
33-
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_base_t value);
34-
static int nu_gpio_read(struct rt_device *device, rt_base_t pin);
35-
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint32_t mode, void (*hdr)(void *args), void *args);
32+
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode);
33+
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value);
34+
static rt_int8_t nu_gpio_read(struct rt_device *device, rt_base_t pin);
35+
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint8_t mode, void (*hdr)(void *args), void *args);
3636
static rt_err_t nu_gpio_detach_irq(struct rt_device *device, rt_int32_t pin);
37-
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled);
37+
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled);
3838
static rt_base_t nu_gpio_pin_get(const char *name);
3939

4040
/* Private variables ------------------------------------------------------------*/
@@ -129,7 +129,7 @@ static rt_base_t nu_gpio_pin_get(const char *name)
129129
return -(RT_EINVAL);
130130
}
131131

132-
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode)
132+
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode)
133133
{
134134
GPIO_T *PORT;
135135

@@ -164,23 +164,23 @@ static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode
164164
}
165165
}
166166

167-
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_base_t value)
167+
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value)
168168
{
169169
if (nu_port_check(pin))
170170
return;
171171

172172
GPIO_PIN_DATA_S(NU_GET_PORT(pin), NU_GET_PINS(pin)) = value;
173173
}
174174

175-
static int nu_gpio_read(struct rt_device *device, rt_base_t pin)
175+
static rt_int8_t nu_gpio_read(struct rt_device *device, rt_base_t pin)
176176
{
177177
if (nu_port_check(pin))
178178
return PIN_LOW;
179179

180180
return GPIO_PIN_DATA_S(NU_GET_PORT(pin), NU_GET_PINS(pin));
181181
}
182182

183-
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint32_t mode, void (*hdr)(void *args), void *args)
183+
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint8_t mode, void (*hdr)(void *args), void *args)
184184
{
185185
rt_base_t level;
186186
rt_int32_t irqindex;
@@ -247,7 +247,7 @@ static rt_err_t nu_gpio_detach_irq(struct rt_device *device, rt_int32_t pin)
247247
return RT_EOK;
248248
}
249249

250-
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
250+
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
251251
{
252252
GPIO_T *PORT;
253253
rt_base_t level;

‎bsp/nuvoton/libraries/m2354/rtt_port/drv_qspi.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ enum
3939

4040
/* Private functions ------------------------------------------------------------*/
4141
static rt_err_t nu_qspi_bus_configure(struct rt_spi_device *device, struct rt_spi_configuration *configuration);
42-
static rt_uint32_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message);
42+
static rt_ssize_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message);
4343
static int nu_qspi_register_bus(struct nu_spi *qspi_bus, const char *name);
4444

4545
/* Public functions -------------------------------------------------------------*/
@@ -207,7 +207,7 @@ static int nu_qspi_mode_config(struct nu_spi *qspi_bus, rt_uint8_t *tx, rt_uint8
207207
return qspi_lines;
208208
}
209209

210-
static rt_uint32_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message)
210+
static rt_ssize_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message)
211211
{
212212
struct nu_spi *qspi_bus;
213213
struct rt_qspi_configuration *qspi_configuration;
@@ -217,7 +217,7 @@ static rt_uint32_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_
217217
#endif
218218
rt_uint8_t bytes_per_word;
219219
QSPI_T *qspi_base;
220-
rt_uint32_t u32len = 0;
220+
rt_ssize_t u32len = 0;
221221

222222
RT_ASSERT(device != RT_NULL);
223223
RT_ASSERT(message != RT_NULL);

‎bsp/nuvoton/libraries/m2354/rtt_port/drv_spi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ enum
5757
static void nu_spi_transmission_with_poll(struct nu_spi *spi_bus,
5858
uint8_t *send_addr, uint8_t *recv_addr, int length, uint8_t bytes_per_word);
5959
static int nu_spi_register_bus(struct nu_spi *spi_bus, const char *name);
60-
static rt_uint32_t nu_spi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message);
60+
static rt_ssize_t nu_spi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message);
6161
static rt_err_t nu_spi_bus_configure(struct rt_spi_device *device, struct rt_spi_configuration *configuration);
6262

6363
#if defined(BSP_USING_SPI_PDMA)
@@ -588,7 +588,7 @@ void nu_spi_transfer(struct nu_spi *spi_bus, uint8_t *tx, uint8_t *rx, int lengt
588588
#endif
589589
}
590590

591-
static rt_uint32_t nu_spi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message)
591+
static rt_ssize_t nu_spi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message)
592592
{
593593
struct nu_spi *spi_bus;
594594
struct rt_spi_configuration *configuration;

‎bsp/nuvoton/libraries/m2354/rtt_port/drv_usbd.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ static rt_err_t _ep_disable(uep_t ep)
229229
return RT_EOK;
230230
}
231231

232-
static rt_ssize_t _ep_read(rt_uint8_t address, void *buffer)
232+
static rt_size_t _ep_read(rt_uint8_t address, void *buffer)
233233
{
234234
rt_size_t size = 0;
235235
rt_uint8_t *buf;
@@ -245,7 +245,7 @@ static rt_ssize_t _ep_read(rt_uint8_t address, void *buffer)
245245
return size;
246246
}
247247

248-
static rt_ssize_t _ep_read_prepare(rt_uint8_t address, void *buffer, rt_size_t size)
248+
static rt_size_t _ep_read_prepare(rt_uint8_t address, void *buffer, rt_size_t size)
249249
{
250250
RT_ASSERT(!(address & USB_DIR_IN));
251251

@@ -254,7 +254,7 @@ static rt_ssize_t _ep_read_prepare(rt_uint8_t address, void *buffer, rt_size_t s
254254
return size;
255255
}
256256

257-
static rt_ssize_t _ep_write(rt_uint8_t address, void *buffer, rt_size_t size)
257+
static rt_size_t _ep_write(rt_uint8_t address, void *buffer, rt_size_t size)
258258
{
259259
RT_ASSERT((address & USB_DIR_IN));
260260

‎bsp/nuvoton/libraries/m460/rtt_port/drv_gpio.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
/* Private functions ------------------------------------------------------------*/
3131

32-
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode);
33-
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_base_t value);
34-
static int nu_gpio_read(struct rt_device *device, rt_base_t pin);
35-
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint32_t mode, void (*hdr)(void *args), void *args);
32+
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode);
33+
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value);
34+
static rt_int8_t nu_gpio_read(struct rt_device *device, rt_base_t pin);
35+
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint8_t mode, void (*hdr)(void *args), void *args);
3636
static rt_err_t nu_gpio_detach_irq(struct rt_device *device, rt_int32_t pin);
37-
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled);
37+
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled);
3838
static rt_base_t nu_gpio_pin_get(const char *name);
3939

4040
/* Private variables ------------------------------------------------------------*/
@@ -129,7 +129,7 @@ static rt_base_t nu_gpio_pin_get(const char *name)
129129
return -(RT_EINVAL);
130130
}
131131

132-
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode)
132+
static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_uint8_t mode)
133133
{
134134
GPIO_T *PORT;
135135

@@ -164,23 +164,23 @@ static void nu_gpio_mode(struct rt_device *device, rt_base_t pin, rt_base_t mode
164164
}
165165
}
166166

167-
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_base_t value)
167+
static void nu_gpio_write(struct rt_device *device, rt_base_t pin, rt_uint8_t value)
168168
{
169169
if (nu_port_check(pin))
170170
return;
171171

172172
GPIO_PIN_DATA(NU_GET_PORT(pin), NU_GET_PINS(pin)) = value;
173173
}
174174

175-
static int nu_gpio_read(struct rt_device *device, rt_base_t pin)
175+
static rt_int8_t nu_gpio_read(struct rt_device *device, rt_base_t pin)
176176
{
177177
if (nu_port_check(pin))
178178
return PIN_LOW;
179179

180180
return GPIO_PIN_DATA(NU_GET_PORT(pin), NU_GET_PINS(pin));
181181
}
182182

183-
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint32_t mode, void (*hdr)(void *args), void *args)
183+
static rt_err_t nu_gpio_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint8_t mode, void (*hdr)(void *args), void *args)
184184
{
185185
rt_base_t level;
186186
rt_int32_t irqindex;
@@ -247,7 +247,7 @@ static rt_err_t nu_gpio_detach_irq(struct rt_device *device, rt_int32_t pin)
247247
return RT_EOK;
248248
}
249249

250-
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
250+
static rt_err_t nu_gpio_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
251251
{
252252
GPIO_T *PORT;
253253
rt_base_t level;

‎bsp/nuvoton/libraries/m460/rtt_port/drv_qspi.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ enum
4242

4343
/* Private functions ------------------------------------------------------------*/
4444
static rt_err_t nu_qspi_bus_configure(struct rt_spi_device *device, struct rt_spi_configuration *configuration);
45-
static rt_uint32_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message);
45+
static rt_ssize_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message);
4646
static int nu_qspi_register_bus(struct nu_spi *qspi_bus, const char *name);
4747

4848
/* Public functions -------------------------------------------------------------*/
@@ -225,16 +225,15 @@ static int nu_qspi_mode_config(struct nu_spi *qspi_bus, rt_uint8_t *tx, rt_uint8
225225
return qspi_lines;
226226
}
227227

228-
static rt_uint32_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message)
228+
static rt_ssize_t nu_qspi_bus_xfer(struct rt_spi_device *device, struct rt_spi_message *message)
229229
{
230230
struct nu_spi *qspi_bus;
231231
struct rt_qspi_configuration *qspi_configuration;
232232
struct rt_qspi_message *qspi_message;
233233
rt_uint8_t u8last = 1;
234-
235234
rt_uint8_t bytes_per_word;
236235
QSPI_T *qspi_base;
237-
rt_uint32_t u32len = 0;
236+
rt_ssize_t u32len = 0;
238237

239238
RT_ASSERT(device != RT_NULL);
240239
RT_ASSERT(message != RT_NULL);

0 commit comments

Comments
 (0)