Skip to content

Commit 80ca6ee

Browse files
tung7970adbridge
authored andcommitted
rtl8195am - fix log_uart_api.c warnings
Fix the following warnings: [Warning] log_uart_api.c@58,38: comparison between signed and unsigned integer expressions [-Wsign-compare] [Warning] log_uart_api.c@151,38: comparison between signed and unsigned integer expressions [-Wsign-compare] [Warning] log_uart_api.c@260,27: unused variable 'pUartAdapter' [-Wunused-variable] [Warning] log_uart_api.c@268,27: unused variable 'pUartAdapter' [-Wunused-variable] [Warning] log_uart_api.c@276,27: unused variable 'pUartAdapter' [-Wunused-variable] [Warning] log_uart_api.c@290,27: unused variable 'pUartAdapter' [-Wunused-variable] [Warning] log_uart_api.c@328,27: unused variable 'pUartAdapter' [-Wunused-variable] [Warning] log_uart_api.c@338,27: unused variable 'pUartAdapter' [-Wunused-variable] [Warning] log_uart_api.c@376,45: pointer targets in passing argument 2 of 'HalLogUartRecv' differ in signedness [-Wpointer-sign] [Warning] log_uart_api.c@386,45: pointer targets in passing argument 2 of 'HalLogUartSend' differ in signedness [-Wpointer-sign] Signed-off-by: Tony Wu <[email protected]>
1 parent d611d7b commit 80ca6ee

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/log_uart_api.c

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int32_t log_uart_init (log_uart_t *obj, int baudrate, int data_bits, SerialParit
5555
pUartAdapter = &obj->log_hal_uart;
5656
// Check Baud rate
5757
for (i=0; log_uart_support_rate[i]!=0xFFFFFF; i++) {
58-
if (log_uart_support_rate[i] == baudrate) {
58+
if (log_uart_support_rate[i] == (u32)baudrate) {
5959
break;
6060
}
6161
}
@@ -148,7 +148,7 @@ void log_uart_baud(log_uart_t *obj, int baudrate)
148148
pUartAdapter = &obj->log_hal_uart;
149149
// Check Baud rate
150150
for (i=0; log_uart_support_rate[i]!=0xFFFFFFFF; i++) {
151-
if (log_uart_support_rate[i] == baudrate) {
151+
if (log_uart_support_rate[i] == (u32)baudrate) {
152152
break;
153153
}
154154
}
@@ -257,23 +257,18 @@ void log_uart_irq_set(log_uart_t *obj, LOG_UART_INT_ID irq, uint32_t enable)
257257

258258
char log_uart_getc(log_uart_t *obj)
259259
{
260-
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
261-
262260
while (!log_uart_readable(obj));
263261
return (char)(HAL_UART_READ32(UART_REV_BUF_OFF) & 0xFF);
264262
}
265263

266264
void log_uart_putc(log_uart_t *obj, char c)
267265
{
268-
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
269-
270266
while (!log_uart_writable(obj));
271267
HAL_UART_WRITE8(UART_TRAN_HOLD_OFF, c);
272268
}
273269

274270
int log_uart_readable(log_uart_t *obj)
275271
{
276-
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
277272
volatile u8 line_status;
278273

279274
line_status = HAL_UART_READ8(UART_LINE_STATUS_REG_OFF);
@@ -287,7 +282,6 @@ int log_uart_readable(log_uart_t *obj)
287282

288283
int log_uart_writable(log_uart_t *obj)
289284
{
290-
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
291285
volatile u8 line_status;
292286

293287
line_status = HAL_UART_READ8(UART_LINE_STATUS_REG_OFF);
@@ -325,7 +319,6 @@ void log_uart_clear_rx(log_uart_t *obj)
325319

326320
void log_uart_break_set(log_uart_t *obj)
327321
{
328-
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
329322
u32 RegValue;
330323

331324
RegValue = HAL_UART_READ32(UART_LINE_CTL_REG_OFF);
@@ -335,7 +328,6 @@ void log_uart_break_set(log_uart_t *obj)
335328

336329
void log_uart_break_clear(log_uart_t *obj)
337330
{
338-
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
339331
u32 RegValue;
340332

341333
RegValue = HAL_UART_READ32(UART_LINE_CTL_REG_OFF);
@@ -371,20 +363,16 @@ void log_uart_line_status_handler(log_uart_t *obj, void *handler, uint32_t id)
371363
int32_t log_uart_recv (log_uart_t *obj, char *prxbuf, uint32_t len, uint32_t timeout_ms)
372364
{
373365
HAL_LOG_UART_ADAPTER *pUartAdapter=&(obj->log_hal_uart);
374-
int ret;
375366

376-
ret = (int)HalLogUartRecv(pUartAdapter, prxbuf, len, timeout_ms);
377-
return (ret);
367+
return (int32_t)HalLogUartRecv(pUartAdapter, (u8 *)prxbuf, len, timeout_ms);
378368
}
379369

380370
// Blocked(busy wait) send, return transmitted bytes count
381371
int32_t log_uart_send (log_uart_t *obj, char *ptxbuf, uint32_t len, uint32_t timeout_ms)
382372
{
383373
HAL_LOG_UART_ADAPTER *pUartAdapter=&(obj->log_hal_uart);
384-
int ret;
385374

386-
ret = (int)HalLogUartSend(pUartAdapter, ptxbuf, len, timeout_ms);
387-
return (ret);
375+
return (int32_t)HalLogUartSend(pUartAdapter, (u8 *)ptxbuf, len, timeout_ms);
388376
}
389377

390378
// Interrupt mode(no wait) receive, return HAL function result

0 commit comments

Comments
 (0)