Revision 38:f13e4e563d65, committed 2014-06-25

Comitter:

kishino

Date:

Wed Jun 25 00:04:11 2014 +0000

Parent:

37:f3a2053627c2

Child:

39:a1233ca02edf

Commit message:

Fixed a variable name of pointer type.

Changed in this revision

--- a/SNIC/SNIC_Core.cpp	Tue Jun 24 06:24:23 2014 +0000
+++ b/SNIC/SNIC_Core.cpp	Wed Jun 25 00:04:11 2014 +0000
@@ -86,14 +86,14 @@
 
 int C_SNIC_Core::initUart(PinName tx, PinName rx, int baud)
 {
-    mUartRequestSeq   = 0;
+    mUartRequestSeq = 0;
 
     mUart_p = new RawSerial( tx, rx );
     mUart_p->baud( baud );
     mUart_p->format(8, SerialBase::None, 1);
      
     // Initialize uart
-    gUART_RCVBUF_p    = NULL;
+    gUART_RCVBUF_p = NULL;
 
     mUart_p->attach( C_SNIC_Core::uartRecvCallback );
     // Create UART recv dispatch thread
@@ -106,11 +106,11 @@
 
     return 0;
 }
-unsigned int   C_SNIC_Core::preparationSendCommand( unsigned char cmd_id, unsigned char cmd_sid
+unsigned int C_SNIC_Core::preparationSendCommand( unsigned char cmd_id, unsigned char cmd_sid
                                             , unsigned char *req_buf_p,    unsigned int req_buf_len
                                             , unsigned char *response_buf_p, unsigned char *command_p )
 {
-    unsigned int   command_len = 0;
+    unsigned int command_len = 0;
     
     // Make all command request
     command_len = C_SNIC_UartMsgUtil::makeRequest( cmd_id, req_buf_p, req_buf_len, command_p );
@@ -275,7 +275,7 @@
             {
                 uartRecvBuf_p = (tagMEMPOOL_BLOCK_T *)evt.value.p;
 
-#if 0
+#if 0   /* for Debug */
                 {
                     int i;
                     for(i=0;i<uartRecvBuf_p->size;i++)

--- a/SNIC/SNIC_UartMsgUtil.cpp	Tue Jun 24 06:24:23 2014 +0000
+++ b/SNIC/SNIC_UartMsgUtil.cpp	Wed Jun 25 00:04:11 2014 +0000
@@ -73,8 +73,7 @@
                                             , unsigned char *command_id_p,  unsigned char *payload_p )
 {
     unsigned short payload_len  = 0;
-    unsigned char *buf = NULL;
-    bool isESC = false;
+    unsigned char *buf_p = NULL;
     int i;
     
     // get payload length
@@ -83,12 +82,12 @@
     // get Command ID
     *command_id_p = (recvdata_p[3] & ~0x80);
 
-    buf = &recvdata_p[4];
+    buf_p = &recvdata_p[4];
 
     // get payload data
-    for( i = 0; i < payload_len; i++, buf++ )
+    for( i = 0; i < payload_len; i++, buf_p++ )
     {
-        *payload_p = *buf;
+        *payload_p = *buf_p;
         payload_p++;
     }
 
@@ -131,7 +130,7 @@
         }
     }
 
-    int   addr  = ( (ipadr[0]<<24) | (ipadr[1]<<16) | (ipadr[2]<<8) | ipadr[3] );
+    int  addr  = ( (ipadr[0]<<24) | (ipadr[1]<<16) | (ipadr[2]<<8) | ipadr[3] );
 
     return addr;
 }

--- a/SNIC_WifiInterface.cpp	Tue Jun 24 06:24:23 2014 +0000
+++ b/SNIC_WifiInterface.cpp	Wed Jun 25 00:04:11 2014 +0000
@@ -44,10 +44,10 @@
     wait(1);
     /* Initialize SNIC API */
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("snic_init payload_buf NULL\r\n");
+        printf("snic_init payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -58,14 +58,14 @@
     req.buf_size[0] = 0x08;
     req.buf_size[1] = 0x00;
 
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(C_SNIC_Core::tagSNIC_INIT_REQ_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_INIT_REQ_T), payload_buf_p->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     int ret;
     // Wait UART response
@@ -73,7 +73,7 @@
     if( ret != 0 )
     {
         printf( "snic_init failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
@@ -82,7 +82,7 @@
         printf("snic_init status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
         ret = -1;
     }
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     
     return ret;
 }
@@ -93,10 +93,10 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = snic_core_p->getUartCommand();
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("getFWVersion payload_buf NULL\r\n");
+        printf("getFWVersion payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -105,32 +105,32 @@
     req.cmd_sid = UART_CMD_SID_GEN_FW_VER_GET_REQ;
     req.seq     = mUartRequestSeq++;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_GEN, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(C_SNIC_Core::tagGEN_FW_VER_GET_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagGEN_FW_VER_GET_REQ_T), payload_buf_p->buf, command_array_p );
 
     int ret;
     
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     // Wait UART response
     ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "getFWversion failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
     if( uartCmdMgr_p->getCommandStatus() == 0 )
     {
-        unsigned char version_len = payload_buf->buf[3];
-        memcpy( version_p, &payload_buf->buf[4], version_len );
+        unsigned char version_len = payload_buf_p->buf[3];
+        memcpy( version_p, &payload_buf_p->buf[4], version_len );
     }
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     return 0;
 }
 
@@ -155,10 +155,10 @@
     }
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("connect payload_buf NULL\r\n");
+        printf("connect payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -193,13 +193,13 @@
         }
     }
 
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_WIFI, UART_CMD_SID_WIFI_JOIN_REQ, buf
-                        , buf_len, payload_buf->buf, command_array );
+                        , buf_len, payload_buf_p->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     int ret;
     // Wait UART response
@@ -207,7 +207,7 @@
     if( ret != 0 )
     {
         printf( "join failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
@@ -217,7 +217,7 @@
         printf("join status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
         ret = -1;
     }
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
 
     return ret;
 }
@@ -228,10 +228,10 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = snic_core_p->getUartCommand();
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("disconnect payload_buf NULL\r\n");
+        printf("disconnect payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -240,14 +240,14 @@
     req.cmd_sid = UART_CMD_SID_WIFI_DISCONNECT_REQ;
     req.seq = mUartRequestSeq++;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(C_SNIC_Core::tagWIFI_DISCONNECT_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_DISCONNECT_REQ_T), payload_buf_p->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     int ret;
     // Wait UART response
@@ -255,7 +255,7 @@
     if( ret != 0 )
     {
         printf( "disconnect failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
@@ -264,7 +264,7 @@
         printf("disconnect status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
         ret = -1;
     }
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     return ret;
 }
 
@@ -275,10 +275,10 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = snic_core_p->getUartCommand();
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("scan payload_buf NULL\r\n");
+        printf("scan payload_buf_p NULL\r\n");
         return -1;
     }
     
@@ -315,17 +315,17 @@
     }
     buf_len++;
 
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , buf_len, payload_buf->buf, command_array );
+                        , buf_len, payload_buf_p->buf, command_array_p );
 
     // Set scan result callback 
     uartCmdMgr_p->setScanResultHandler( result_handler_p );
     
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     int ret;
     // Wait UART response
@@ -334,7 +334,7 @@
     if( ret != 0 )
     {
         printf( "scan failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
@@ -344,7 +344,7 @@
         ret = -1;
     }
 
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
 
     return ret;
 }
@@ -362,10 +362,10 @@
     }
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("wifi_on payload_buf NULL\r\n");
+        printf("wifi_on payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -375,14 +375,14 @@
     req.seq = mUartRequestSeq++;
     memcpy( req.country, country_p, COUNTRYC_CODE_LENTH );
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(C_SNIC_Core::tagWIFI_ON_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_ON_REQ_T), payload_buf_p->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     int ret;
     // Wait UART response
@@ -390,7 +390,7 @@
     if( ret != 0 )
     {
         printf( "wifi_on failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
@@ -399,7 +399,7 @@
         printf("wifi_on status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
         ret = -1;
     }
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
 
     return ret;
 }
@@ -410,10 +410,10 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = snic_core_p->getUartCommand();
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("wifi_off payload_buf NULL\r\n");
+        printf("wifi_off payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -422,14 +422,14 @@
     req.cmd_sid = UART_CMD_SID_WIFI_OFF_REQ;
     req.seq = mUartRequestSeq++;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(C_SNIC_Core::tagWIFI_OFF_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_OFF_REQ_T), payload_buf_p->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     int ret;
     // Wait UART response
@@ -437,7 +437,7 @@
     if( ret != 0 )
     {
         printf( "wifi_off failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
@@ -446,7 +446,7 @@
         printf("wifi_off status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
         ret = -1;
     }
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
 
     return ret;
 }
@@ -462,10 +462,10 @@
     }
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("getRssi payload_buf NULL\r\n");
+        printf("getRssi payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -475,27 +475,27 @@
     req.cmd_sid = UART_CMD_SID_WIFI_GET_STA_RSSI_REQ;
     req.seq     = mUartRequestSeq++;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int   command_len;
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(C_SNIC_Core::tagWIFI_GET_STA_RSSI_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_GET_STA_RSSI_REQ_T), payload_buf_p->buf, command_array_p );
 
     int ret;
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     // Wait UART response
     ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "getRssi failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
-    *rssi_p = (signed char)payload_buf->buf[2];
+    *rssi_p = (signed char)payload_buf_p->buf[2];
 
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     return 0;
 }
 
@@ -511,10 +511,10 @@
     }
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("getWifiStatus payload_buf NULL\r\n");
+        printf("getWifiStatus payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -524,13 +524,13 @@
     req.seq     = mUartRequestSeq++;
     req.interface = 0;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int   command_len;
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(C_SNIC_Core::tagWIFI_GET_STATUS_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_GET_STATUS_REQ_T), payload_buf_p->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     int ret;
     // Wait UART response
@@ -538,26 +538,26 @@
     if( ret != 0 )
     {
         printf( "getWifiStatus failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
     // set status
-    status_p->status = (E_WIFI_STATUS)payload_buf->buf[2];
+    status_p->status = (E_WIFI_STATUS)payload_buf_p->buf[2];
     
     // set Mac address
     if( status_p->status != e_STATUS_OFF )
     {
-        memcpy( status_p->mac_address, &payload_buf->buf[3], BSSID_MAC_LENTH );
+        memcpy( status_p->mac_address, &payload_buf_p->buf[3], BSSID_MAC_LENTH );
     } 
 
     // set SSID
     if( ( status_p->status == e_STA_JOINED ) || ( status_p->status == e_AP_STARTED ) )
     {
-        memcpy( status_p->ssid, &payload_buf->buf[9], strlen( (char *)&payload_buf->buf[9]) );
+        memcpy( status_p->ssid, &payload_buf_p->buf[9], strlen( (char *)&payload_buf_p->buf[9]) );
     } 
 
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     return 0;
 }
 
@@ -578,14 +578,14 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = snic_core_p->getUartCommand();
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("setIPConfig payload_buf NULL\r\n");
+        printf("setIPConfig payload_buf_p NULL\r\n");
         return -1;
     }
 
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     if( is_DHCP == true )
     {
@@ -598,7 +598,7 @@
         
         // Preparation of command
         command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(C_SNIC_Core::tagSNIC_IP_CONFIG_REQ_DHCP_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_IP_CONFIG_REQ_DHCP_T), payload_buf_p->buf, command_array_p );
     }
     else
     {
@@ -620,10 +620,10 @@
 
         // Preparation of command
         command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(C_SNIC_Core::tagSNIC_IP_CONFIG_REQ_STATIC_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_IP_CONFIG_REQ_STATIC_T), payload_buf_p->buf, command_array_p );
     }
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     int ret;
     // Wait UART response
@@ -631,7 +631,7 @@
     if( ret != 0 )
     {
         printf( "setIPConfig failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
@@ -641,6 +641,6 @@
         ret = -1;
     }
 
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     return ret;
 }

--- a/Socket/Endpoint.cpp	Tue Jun 24 06:24:23 2014 +0000
+++ b/Socket/Endpoint.cpp	Wed Jun 25 00:04:11 2014 +0000
@@ -46,11 +46,11 @@
     mIpAddress[0] = '\0';
 }
 
-int Endpoint::set_address(const char* host, const int port)
+int Endpoint::set_address(const char* host_p, const int port)
 {
     reset_address();
     
-    strcpy( mIpAddress, host );
+    strcpy( mIpAddress, host_p );
     mPort = port;
     
     return 0;

--- a/Socket/Endpoint.h	Tue Jun 24 06:24:23 2014 +0000
+++ b/Socket/Endpoint.h	Wed Jun 25 00:04:11 2014 +0000
@@ -50,11 +50,11 @@
     void reset_address(void);
     
     /** Set the address of this endpoint
-    \param host The endpoint address (it can either be an IP Address or a hostname that will be resolved with DNS).
+    \param host_p The endpoint address (it can either be an IP Address or a hostname that will be resolved with DNS).
     \param port The endpoint port
     \return 0 on success, -1 on failure (when an hostname cannot be resolved by DNS).
      */
-    int  set_address(const char* host, const int port);
+    int  set_address(const char* host_p, const int port);
     
     /** Get the IP address of this endpoint
     \return The IP address of this endpoint.

--- a/Socket/Socket.cpp	Tue Jun 24 06:24:23 2014 +0000
+++ b/Socket/Socket.cpp	Wed Jun 25 00:04:11 2014 +0000
@@ -73,14 +73,14 @@
     req.seq       = mUartRequestSeq++;
     req.socket_id = mSocketID;
 
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(C_SNIC_Core::tagSNIC_CLOSE_SOCKET_REQ_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_CLOSE_SOCKET_REQ_T), payload_buf->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     int ret;
     // Wait UART response
@@ -103,13 +103,6 @@
     return 0;
 }
 
-#if 0
-int Socket::select(struct timeval *timeout, bool read, bool write)
-{
-    return 0;
-}
-#endif
-
 int Socket::createSocket( unsigned char bind, unsigned int local_addr, unsigned short port )
 {
     C_SNIC_Core               *snic_core_p  = C_SNIC_Core::getInstance();
@@ -142,13 +135,13 @@
         req_len = sizeof(C_SNIC_Core::tagSNIC_TCP_CREATE_SOCKET_REQ_T);
     }
 
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , req_len, payload_buf->buf, command_array );
+                            , req_len, payload_buf->buf, command_array_p );
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     int ret;
     // Wait UART response
@@ -192,32 +185,32 @@
         return -1;
     }
     
-    unsigned char *buf = (unsigned char *)getSocketSendBuf();
+    unsigned char *buf_p = (unsigned char *)getSocketSendBuf();
     unsigned int  buf_len = 0;
 
-    memset( buf, 0, UART_REQUEST_PAYLOAD_MAX );
+    memset( buf_p, 0, UART_REQUEST_PAYLOAD_MAX );
     // Make request
-    buf[0] = UART_CMD_SID_SNIC_RESOLVE_NAME_REQ;
+    buf_p[0] = UART_CMD_SID_SNIC_RESOLVE_NAME_REQ;
     buf_len++;
-    buf[1] = mUartRequestSeq++;
+    buf_p[1] = mUartRequestSeq++;
     buf_len++;
     // Interface 
-    buf[2] = 0;
+    buf_p[2] = 0;
     buf_len++;
     
     // Host name length
     int hostname_len = strlen(host_p);
-    buf[3] = (unsigned char)hostname_len;
+    buf_p[3] = (unsigned char)hostname_len;
     buf_len++;
-    memcpy( &buf[4], host_p, hostname_len );
+    memcpy( &buf_p[4], host_p, hostname_len );
     buf_len += hostname_len;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int   command_len;
-    command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, UART_CMD_SID_SNIC_RESOLVE_NAME_REQ, buf
-                        , buf_len, payload_buf->buf, command_array );
+    command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, UART_CMD_SID_SNIC_RESOLVE_NAME_REQ, buf_p
+                        , buf_len, payload_buf->buf, command_array_p );
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     int ret;
     // Wait UART response

--- a/Socket/TCPSocketConnection.cpp	Tue Jun 24 06:24:23 2014 +0000
+++ b/Socket/TCPSocketConnection.cpp	Wed Jun 25 00:04:11 2014 +0000
@@ -61,10 +61,10 @@
     }
         
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("connect payload_buf NULL\r\n");
+        printf("connect payload_buf_p NULL\r\n");
         return -1;
     }
     
@@ -86,34 +86,34 @@
     req.recv_bufsize[1] = (SNIC_UART_RECVBUF_SIZE & 0xFF);
     req.timeout         = 60;
 
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(C_SNIC_Core::tagSNIC_TCP_CONNECT_TO_SERVER_REQ_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_TCP_CONNECT_TO_SERVER_REQ_T), payload_buf_p->buf, command_array_p );
 
     uartCmdMgr_p->setCommandSID( UART_CMD_SID_SNIC_TCP_CONNECTION_STATUS_IND );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     // Wait UART response
     ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "connect failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
     if( uartCmdMgr_p->getCommandStatus() != UART_CMD_RES_SNIC_CONNECTION_UP )
     {
         printf("connect status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
 
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
 
     // Initialize connection information
     C_SNIC_Core::tagCONNECT_INFO_T *con_info_p = snic_core_p->getConnectInfo( mSocketID );
@@ -141,10 +141,10 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = snic_core_p->getUartCommand();
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("connect payload_buf NULL\r\n");
+        printf("connect payload_buf_p NULL\r\n");
         return -1;
     }
     
@@ -162,31 +162,31 @@
     memcpy( send_buf_p, &req, req_size );
     memcpy( &send_buf_p[req_size], data_p, length );
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int   command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)send_buf_p
-                            , req_size + length, payload_buf->buf, command_array );
+                            , req_size + length, payload_buf_p->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     // Wait UART response
     int ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "send failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
     if( uartCmdMgr_p->getCommandStatus() != UART_CMD_RES_SNIC_SUCCESS )
     {
         printf("send status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
 
     // SNIC_SEND_FROM_SOCKET_REQ
     return 0;

--- a/Socket/TCPSocketServer.cpp	Tue Jun 24 06:24:23 2014 +0000
+++ b/Socket/TCPSocketServer.cpp	Wed Jun 25 00:04:11 2014 +0000
@@ -48,10 +48,10 @@
     
     // Get local ip address.
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("bind payload_buf NULL\r\n");
+        printf("bind payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -61,35 +61,35 @@
     req.seq          = mUartRequestSeq++;
     req.interface    = 0;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(C_SNIC_Core::tagSNIC_GET_DHCP_INFO_REQ_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_GET_DHCP_INFO_REQ_T), payload_buf_p->buf, command_array_p );
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     // Wait UART response
     ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "bind failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
     if( uartCmdMgr_p->getCommandStatus() != UART_CMD_RES_SNIC_SUCCESS )
     {
         printf("bind status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     
-    unsigned int local_addr = (payload_buf->buf[9]  << 24)
-                            | (payload_buf->buf[10] << 16)
-                            | (payload_buf->buf[11] << 8)
-                            | (payload_buf->buf[12]);
+    unsigned int local_addr = (payload_buf_p->buf[9]  << 24)
+                            | (payload_buf_p->buf[10] << 16)
+                            | (payload_buf_p->buf[11] << 8)
+                            | (payload_buf_p->buf[12]);
    
     // Socket create
     ret = createSocket( 1, local_addr, port );
@@ -108,10 +108,10 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = snic_core_p->getUartCommand();
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("listen payload_buf NULL\r\n");
+        printf("listen payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -124,34 +124,34 @@
     req.recv_bufsize[1] = (SNIC_UART_RECVBUF_SIZE & 0xFF);
     req.max_client      = max;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(C_SNIC_Core::tagSNIC_TCP_CREATE_CONNECTION_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagSNIC_TCP_CREATE_CONNECTION_REQ_T), payload_buf_p->buf, command_array_p );
 
     int ret;
     
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     
     // Wait UART response
     ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "listen failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
     if( uartCmdMgr_p->getCommandStatus() != 0 )
     {
         printf("listen status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
 
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     return 0;
 }
 

--- a/Socket/UDPSocket.cpp	Tue Jun 24 06:24:23 2014 +0000
+++ b/Socket/UDPSocket.cpp	Wed Jun 25 00:04:11 2014 +0000
@@ -52,10 +52,10 @@
     
     // Get local ip address.
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("UDP bind payload_buf NULL\r\n");
+        printf("UDP bind payload_buf_p NULL\r\n");
         return -1;
     }
 
@@ -65,33 +65,33 @@
     req.seq          = mUartRequestSeq++;
     req.interface    = 0;
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int  command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(C_SNIC_Core::tagSNIC_GET_DHCP_INFO_REQ_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_GET_DHCP_INFO_REQ_T), payload_buf_p->buf, command_array_p );
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
     // Wait UART response
     ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "UDP bind failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
     if( uartCmdMgr_p->getCommandStatus() != UART_CMD_RES_SNIC_SUCCESS )
     {
         printf("UDP bind status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
-    unsigned int local_addr = (payload_buf->buf[9]  << 24)
-                            | (payload_buf->buf[10] << 16)
-                            | (payload_buf->buf[11] << 8)
-                            | (payload_buf->buf[12]);
+    unsigned int local_addr = (payload_buf_p->buf[9]  << 24)
+                            | (payload_buf_p->buf[10] << 16)
+                            | (payload_buf_p->buf[11] << 8)
+                            | (payload_buf_p->buf[12]);
 
 
     C_SNIC_Core::tagSNIC_UDP_CREATE_SOCKET_REQ_T create_req;
@@ -107,26 +107,26 @@
 
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, create_req.cmd_sid, (unsigned char *)&create_req
-                            , sizeof(C_SNIC_Core::tagSNIC_UDP_CREATE_SOCKET_REQ_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_UDP_CREATE_SOCKET_REQ_T), payload_buf_p->buf, command_array_p );
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     // Wait UART response
     ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "UDP bind failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
 
     if( uartCmdMgr_p->getCommandStatus() != 0 )
     {
         printf("UDP bind status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
-    mSocketID = payload_buf->buf[3];
+    mSocketID = payload_buf_p->buf[3];
     
     C_SNIC_Core::tagSNIC_UDP_START_RECV_REQ_T recv_start_req;
     
@@ -139,27 +139,27 @@
 
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, recv_start_req.cmd_sid, (unsigned char *)&recv_start_req
-                            , sizeof(C_SNIC_Core::tagSNIC_UDP_START_RECV_REQ_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_UDP_START_RECV_REQ_T), payload_buf_p->buf, command_array_p );
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     // Wait UART response
     ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "UDP recv start failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
 
     if( uartCmdMgr_p->getCommandStatus() != 0 )
     {
         printf("UDP recv start status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
 
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
     
     return 0;
 }
@@ -171,10 +171,10 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = snic_core_p->getUartCommand();
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = snic_core_p->allocCmdBuf();
-    if( payload_buf == NULL )
+    tagMEMPOOL_BLOCK_T *payload_buf_p = snic_core_p->allocCmdBuf();
+    if( payload_buf_p == NULL )
     {
-        printf("connect payload_buf NULL\r\n");
+        printf("connect payload_buf_p NULL\r\n");
         return -1;
     }
     
@@ -197,31 +197,31 @@
     memcpy( send_buf_p, &req, req_size );
     memcpy( &send_buf_p[req_size], packet, length );
     
-    unsigned char *command_array = snic_core_p->getCommandBuf();
+    unsigned char *command_array_p = snic_core_p->getCommandBuf();
     unsigned int   command_len;
     // Preparation of command
     command_len = snic_core_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)send_buf_p
-                            , req_size + length, payload_buf->buf, command_array );
+                            , req_size + length, payload_buf_p->buf, command_array_p );
 
     // Send uart command request
-    snic_core_p->sendUart( command_len, command_array );
+    snic_core_p->sendUart( command_len, command_array_p );
 
     // Wait UART response
     int ret = uartCmdMgr_p->wait();
     if( ret != 0 )
     {
         printf( "send failed\r\n" );
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
     
     if( uartCmdMgr_p->getCommandStatus() != UART_CMD_RES_SNIC_SUCCESS )
     {
         printf("send status:%02x\r\n", uartCmdMgr_p->getCommandStatus());
-        snic_core_p->freeCmdBuf( payload_buf );
+        snic_core_p->freeCmdBuf( payload_buf_p );
         return -1;
     }
-    snic_core_p->freeCmdBuf( payload_buf );
+    snic_core_p->freeCmdBuf( payload_buf_p );
 
     // SNIC_SEND_FROM_SOCKET_REQ
     return 0;