Skip to content

Commit f1738c9

Browse files
0xc01700xc0170
authored
Merge pull request #6651 from tung7970/fix-warnings
rtl8195am - Fix more compiler warnings
2 parents c0f0a8e + e7286bc commit f1738c9

File tree

13 files changed

+109
-102
lines changed

13 files changed

+109
-102
lines changed

‎targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/i2c_api.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include <string.h>
18+
1719
#include "objects.h"
1820
#include "PinNames.h"
1921
#include "hal_i2c.h"
@@ -78,18 +80,18 @@ extern u32 ConfigDebugErr;
7880
extern u32 ConfigDebuginfo;
7981
void i2c_init(i2c_t *obj, PinName sda, PinName scl)
8082
{
81-
uint32_t i2c_sel;
82-
uint32_t i2c_idx;
83+
int i2c_sel;
84+
int i2c_idx;
8385
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
8486
PSAL_I2C_USERCB_ADPT pSalI2CUserCBAdpt = NULL;
8587
PSAL_I2C_HND pSalI2CHND = NULL;
8688

8789
// Determine the I2C to use
88-
uint32_t i2c_sda = (uint32_t)pinmap_peripheral(sda, PinMap_I2C_SDA);
89-
uint32_t i2c_scl = (uint32_t)pinmap_peripheral(scl, PinMap_I2C_SCL);
90+
int i2c_sda = (uint32_t)pinmap_peripheral(sda, PinMap_I2C_SDA);
91+
int i2c_scl = (uint32_t)pinmap_peripheral(scl, PinMap_I2C_SCL);
9092
ConfigDebugErr &= (~(_DBG_I2C_|_DBG_GDMA_));
9193
ConfigDebugInfo&= (~(_DBG_I2C_|_DBG_GDMA_));
92-
i2c_sel = (uint32_t)pinmap_merge(i2c_sda, i2c_scl);
94+
i2c_sel = pinmap_merge(i2c_sda, i2c_scl);
9395
i2c_idx = RTL_GET_PERI_IDX(i2c_sel);
9496
if (unlikely(i2c_idx == NC)) {
9597
DBG_8195A("%s: Cannot find matched UART\n", __FUNCTION__);
@@ -457,7 +459,6 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask)
457459
pSalI2CHND = &(pSalI2CMngtAdpt->pSalHndPriv->SalI2CHndPriv);
458460
address = (address & 0xFE ) >>1;
459461

460-
uint16_t i2c_default_addr = (uint16_t) pSalI2CHND->I2CAckAddr;
461462
uint16_t i2c_user_addr = (uint16_t) address;
462463

463464
if (i2c_target_addr[pSalI2CHND->DevNum] != i2c_user_addr) {

‎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

‎targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/pwmout_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static const PinMap PinMap_PWM[] = {
5353

5454
void pwmout_init(pwmout_t* obj, PinName pin)
5555
{
56-
uint32_t peripheral;
56+
int peripheral;
5757
u32 pwm_idx;
5858
u32 pin_sel;
5959

‎targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/spi_api.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,18 @@ void spi_init (spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName sse
6565
{
6666
SSI_DBG_ENTRANCE("spi_init()\n");
6767

68-
uint32_t ssi_mosi, ssi_miso, ssi_peri;
68+
int ssi_mosi, ssi_miso, ssi_peri;
6969
uint8_t ssi_idx, ssi_pinmux;
7070
PHAL_SSI_ADAPTOR pHalSsiAdaptor;
7171
PHAL_SSI_OP pHalSsiOp;
7272

7373
_memset((void*)obj, 0, sizeof(spi_t));
7474
obj->state = 0;
75-
uint32_t SystemClock = SystemGetCpuClk();
76-
uint32_t MaxSsiFreq = (SystemClock >> 2) >> 1;
7775

7876
/* SsiClockDivider doesn't support odd number */
7977

80-
DBG_SSI_INFO("SystemClock: %d\n", SystemClock);
81-
DBG_SSI_INFO("MaxSsiFreq : %d\n", MaxSsiFreq);
78+
DBG_SSI_INFO("SystemClock: %d\n", SystemGetCpuClk());
79+
DBG_SSI_INFO("MaxSsiFreq : %d\n", SystemGetCpuClk() >> 3);
8280

8381
ssi_mosi = pinmap_peripheral(mosi, PinMap_SSI_MOSI);
8482
ssi_miso = pinmap_peripheral(miso, PinMap_SSI_MISO);

‎targets/TARGET_Realtek/TARGET_AMEBA/rtw_emac.cpp

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,20 @@ static uint8_t wlan_get_hwaddr_size(emac_interface_t *emac)
5656

5757
static void wlan_get_hwaddr(emac_interface_t *emac, uint8_t *addr)
5858
{
59-
char mac[20];
60-
if(RTW_SUCCESS == wifi_get_mac_address(mac))
61-
{
62-
if (sscanf(mac, "%x:%x:%x:%x:%x:%x", &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]) != 6)
63-
printf("Get HW address failed\r\n");
64-
}else{
59+
char mac[20];
60+
int val[6];
61+
int i;
62+
63+
if (RTW_SUCCESS == wifi_get_mac_address(mac)) {
64+
if (sscanf(mac, "%x:%x:%x:%x:%x:%x",
65+
&val[0], &val[1], &val[2], &val[3], &val[4], &val[5]) != 6)
6566
printf("Get HW address failed\r\n");
67+
68+
for (i = 0; i < 6; i++) {
69+
addr[i] = (unsigned char) val[i];
70+
}
71+
} else {
72+
printf("Get HW address failed\r\n");
6673
}
6774
}
6875

@@ -196,11 +203,18 @@ void mbed_default_mac_address(char *mac) {
196203
void mbed_mac_address(char *mac)
197204
{
198205
char hwaddr[20];
199-
if(RTW_SUCCESS == wifi_get_mac_address(hwaddr))
200-
{
201-
if (sscanf(hwaddr, "%x:%x:%x:%x:%x:%x", &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]) != 6)
206+
int val[6];
207+
int i;
208+
209+
if (RTW_SUCCESS == wifi_get_mac_address(hwaddr)) {
210+
if (sscanf(hwaddr, "%x:%x:%x:%x:%x:%x",
211+
&val[0], &val[1], &val[2], &val[3], &val[4], &val[5]) != 6)
202212
printf("Get HW address failed\r\n");
203-
}else{
213+
214+
for (i = 0; i < 6; i++) {
215+
mac[i] = (unsigned char) val[i];
216+
}
217+
} else {
204218
printf("Get HW address failed\r\n");
205219
mbed_default_mac_address(mac);
206220
}

0 commit comments

Comments
 (0)