rtl8195am - Fix more compiler warnings

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/i2c_api.c

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include <string.h>
+
 #include "objects.h"
 #include "PinNames.h"
 #include "hal_i2c.h"
@@ -78,18 +80,18 @@ extern u32 ConfigDebugErr;
 extern u32 ConfigDebuginfo;
 void i2c_init(i2c_t *obj, PinName sda, PinName scl)
 {    
-    uint32_t i2c_sel;
-    uint32_t i2c_idx;
+    int i2c_sel;
+    int i2c_idx;
     PSAL_I2C_MNGT_ADPT      pSalI2CMngtAdpt     = NULL;
     PSAL_I2C_USERCB_ADPT    pSalI2CUserCBAdpt   = NULL;
     PSAL_I2C_HND            pSalI2CHND          = NULL;
 
     // Determine the I2C to use
-    uint32_t i2c_sda = (uint32_t)pinmap_peripheral(sda, PinMap_I2C_SDA);
-    uint32_t i2c_scl = (uint32_t)pinmap_peripheral(scl, PinMap_I2C_SCL);
+    int i2c_sda = (uint32_t)pinmap_peripheral(sda, PinMap_I2C_SDA);
+    int i2c_scl = (uint32_t)pinmap_peripheral(scl, PinMap_I2C_SCL);
     ConfigDebugErr &= (~(_DBG_I2C_|_DBG_GDMA_));
     ConfigDebugInfo&= (~(_DBG_I2C_|_DBG_GDMA_));
-    i2c_sel = (uint32_t)pinmap_merge(i2c_sda, i2c_scl);
+    i2c_sel = pinmap_merge(i2c_sda, i2c_scl);
     i2c_idx = RTL_GET_PERI_IDX(i2c_sel);
     if (unlikely(i2c_idx == NC)) {
         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)
     pSalI2CHND              = &(pSalI2CMngtAdpt->pSalHndPriv->SalI2CHndPriv);
     address = (address & 0xFE ) >>1;
 
-    uint16_t i2c_default_addr   = (uint16_t) pSalI2CHND->I2CAckAddr;
     uint16_t i2c_user_addr      = (uint16_t) address;
 
     if (i2c_target_addr[pSalI2CHND->DevNum] != i2c_user_addr) {

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/log_uart_api.c

@@ -55,7 +55,7 @@ int32_t log_uart_init (log_uart_t *obj, int baudrate, int data_bits, SerialParit
     pUartAdapter = &obj->log_hal_uart;
     // Check Baud rate
     for (i=0; log_uart_support_rate[i]!=0xFFFFFF; i++) {
-        if (log_uart_support_rate[i] == baudrate) {
+        if (log_uart_support_rate[i] == (u32)baudrate) {
             break;
         }
     }    
@@ -148,7 +148,7 @@ void log_uart_baud(log_uart_t *obj, int baudrate)
     pUartAdapter = &obj->log_hal_uart;
     // Check Baud rate
     for (i=0; log_uart_support_rate[i]!=0xFFFFFFFF; i++) {
-        if (log_uart_support_rate[i] == baudrate) {
+        if (log_uart_support_rate[i] == (u32)baudrate) {
             break;
         }
     }
@@ -257,23 +257,18 @@ void log_uart_irq_set(log_uart_t *obj, LOG_UART_INT_ID irq, uint32_t enable)
 
 char log_uart_getc(log_uart_t *obj) 
 {
-    HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
-
     while (!log_uart_readable(obj));
     return (char)(HAL_UART_READ32(UART_REV_BUF_OFF) & 0xFF);
 }
 
 void log_uart_putc(log_uart_t *obj, char c) 
 {
-    HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
-
     while (!log_uart_writable(obj));
     HAL_UART_WRITE8(UART_TRAN_HOLD_OFF, c);
 }
 
 int log_uart_readable(log_uart_t *obj) 
 {
-    HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
     volatile u8 line_status;
 
     line_status = HAL_UART_READ8(UART_LINE_STATUS_REG_OFF);
@@ -287,7 +282,6 @@ int log_uart_readable(log_uart_t *obj)
 
 int log_uart_writable(log_uart_t *obj) 
 {
-    HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
     volatile u8 line_status;
 
     line_status = HAL_UART_READ8(UART_LINE_STATUS_REG_OFF);
@@ -325,7 +319,6 @@ void log_uart_clear_rx(log_uart_t *obj)
 
 void log_uart_break_set(log_uart_t *obj) 
 {
-    HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
     u32 RegValue;
 
     RegValue = HAL_UART_READ32(UART_LINE_CTL_REG_OFF);
@@ -335,7 +328,6 @@ void log_uart_break_set(log_uart_t *obj)
 
 void log_uart_break_clear(log_uart_t *obj) 
 {
-    HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
     u32 RegValue;
 
     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)
 int32_t log_uart_recv (log_uart_t *obj, char *prxbuf, uint32_t len, uint32_t timeout_ms)
 {
     HAL_LOG_UART_ADAPTER *pUartAdapter=&(obj->log_hal_uart);
-    int ret;
 
-    ret = (int)HalLogUartRecv(pUartAdapter, prxbuf, len, timeout_ms);
-    return (ret);
+    return (int32_t)HalLogUartRecv(pUartAdapter, (u8 *)prxbuf, len, timeout_ms);
 }
 
 // Blocked(busy wait) send, return transmitted bytes count
 int32_t log_uart_send (log_uart_t *obj, char *ptxbuf, uint32_t len, uint32_t timeout_ms)
 {
     HAL_LOG_UART_ADAPTER *pUartAdapter=&(obj->log_hal_uart);
-    int ret;
 
-    ret = (int)HalLogUartSend(pUartAdapter, ptxbuf, len, timeout_ms);
-    return (ret);
+    return (int32_t)HalLogUartSend(pUartAdapter, (u8 *)ptxbuf, len, timeout_ms);
 }
 
 // Interrupt mode(no wait) receive, return HAL function result

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/pwmout_api.c

@@ -53,7 +53,7 @@ static const PinMap PinMap_PWM[] = {
 
 void pwmout_init(pwmout_t* obj, PinName pin) 
 {
-    uint32_t peripheral;
+    int peripheral;
     u32 pwm_idx;
     u32 pin_sel;
 

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/spi_api.c

@@ -65,20 +65,18 @@ void spi_init (spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName sse
 {
     SSI_DBG_ENTRANCE("spi_init()\n");
 
-    uint32_t ssi_mosi, ssi_miso, ssi_peri;
+    int ssi_mosi, ssi_miso, ssi_peri;
     uint8_t  ssi_idx, ssi_pinmux;
     PHAL_SSI_ADAPTOR pHalSsiAdaptor;
     PHAL_SSI_OP pHalSsiOp;
 
     _memset((void*)obj, 0, sizeof(spi_t));
     obj->state = 0;
-    uint32_t SystemClock = SystemGetCpuClk();
-    uint32_t MaxSsiFreq  = (SystemClock >> 2) >> 1;
 
     /* SsiClockDivider doesn't support odd number */
 
-    DBG_SSI_INFO("SystemClock: %d\n", SystemClock);
-    DBG_SSI_INFO("MaxSsiFreq : %d\n", MaxSsiFreq);
+    DBG_SSI_INFO("SystemClock: %d\n", SystemGetCpuClk());
+    DBG_SSI_INFO("MaxSsiFreq : %d\n", SystemGetCpuClk() >> 3);
 
     ssi_mosi = pinmap_peripheral(mosi, PinMap_SSI_MOSI);
     ssi_miso = pinmap_peripheral(miso, PinMap_SSI_MISO);

targets/TARGET_Realtek/TARGET_AMEBA/rtw_emac.cpp

@@ -56,13 +56,20 @@ static uint8_t wlan_get_hwaddr_size(emac_interface_t *emac)
 
 static void wlan_get_hwaddr(emac_interface_t *emac, uint8_t *addr)
 {
-    char mac[20];    
-    if(RTW_SUCCESS == wifi_get_mac_address(mac))
-    {
-        if (sscanf(mac, "%x:%x:%x:%x:%x:%x", &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]) != 6)
-            printf("Get HW address failed\r\n");
-    }else{
+    char mac[20];
+    int val[6];
+    int i;
+
+    if (RTW_SUCCESS == wifi_get_mac_address(mac)) {
+        if (sscanf(mac, "%x:%x:%x:%x:%x:%x",
+                   &val[0], &val[1], &val[2], &val[3], &val[4], &val[5]) != 6)
             printf("Get HW address failed\r\n");
+
+        for (i = 0; i < 6; i++) {
+            addr[i] = (unsigned char) val[i];
+        }
+    } else {
+        printf("Get HW address failed\r\n");
     }
 }
 
@@ -196,11 +203,18 @@ void mbed_default_mac_address(char *mac) {
 void mbed_mac_address(char *mac)
 {
     char hwaddr[20];    
-    if(RTW_SUCCESS == wifi_get_mac_address(hwaddr))
-    {
-        if (sscanf(hwaddr, "%x:%x:%x:%x:%x:%x", &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]) != 6)
+    int val[6];
+    int i;
+
+    if (RTW_SUCCESS == wifi_get_mac_address(hwaddr)) {
+        if (sscanf(hwaddr, "%x:%x:%x:%x:%x:%x",
+                   &val[0], &val[1], &val[2], &val[3], &val[4], &val[5]) != 6)
             printf("Get HW address failed\r\n");
-    }else{
+
+        for (i = 0; i < 6; i++) {
+            mac[i] = (unsigned char) val[i];
+        }
+    } else {
         printf("Get HW address failed\r\n");
         mbed_default_mac_address(mac);
     }