Revision 22:a9ec0cad4f84, committed 2014-03-27

Comitter:

kishino

Date:

Thu Mar 27 07:37:55 2014 +0000

Parent:

21:dda155fe5048

Child:

23:4ff2231ff9ba

Commit message:

Refactoring

Changed in this revision

--- a/SNIC/SNIC_Core.cpp	Thu Mar 27 07:14:21 2014 +0000
+++ b/SNIC/SNIC_Core.cpp	Thu Mar 27 07:37:55 2014 +0000
@@ -119,7 +119,7 @@
     return ret;
 }
 
-tagMEMPOOL_BLOCK_T *C_SNIC_Core::allocCmdBuf()
+C_SNIC_Core::tagMEMPOOL_BLOCK_T *C_SNIC_Core::allocCmdBuf()
 {
     // Get buffer from MemoryPool
     return mMemPoolPayload.alloc();
@@ -130,7 +130,7 @@
     mMemPoolPayload.free( buf_p );
 }
 
-tagCONNECT_INFO_T  *C_SNIC_Core::getConnectInfo( int socket_id )
+C_SNIC_Core::tagCONNECT_INFO_T  *C_SNIC_Core::getConnectInfo( int socket_id )
 {
     if( (socket_id < 0) || (socket_id > MAX_SOCKET_ID) )
     {

--- a/SNIC/SNIC_Core.h	Thu Mar 27 07:14:21 2014 +0000
+++ b/SNIC/SNIC_Core.h	Thu Mar 27 07:37:55 2014 +0000
@@ -26,21 +26,8 @@
 
 #define MEMPOOL_BLOCK_SIZE  2048
 #define MEMPOOL_PAYLOAD_NUM 1
-typedef struct
-{
-    unsigned char buf[MEMPOOL_BLOCK_SIZE];
-}tagMEMPOOL_BLOCK_T;
-
 #define MAX_SOCKET_ID   5
 
-/** Connection information
-*/
-typedef struct {
-    CircBuffer<unsigned char>    *recvbuf_p;
-    bool                is_connected;
-    bool                is_received;
-}tagCONNECT_INFO_T;
-
 /** Wi-Fi security
  */
 typedef enum SECURITY {
@@ -58,15 +45,6 @@
     e_SEC_WPA_AES    = 0x07
 }E_SECURITY;
 
-/** Wi-Fi Network type
- */
-typedef enum NETWORK_TYPE {
-    /** Infrastructure */
-    e_INFRA = 0,
-    /** Adhoc */
-    e_ADHOC = 1
-}E_NETWORK_TYPE;
-
 /** Wi-Fi status
  */
 typedef enum WIFI_STATUS {
@@ -80,102 +58,6 @@
     e_AP_STARTED
 }E_WIFI_STATUS;
 
-/** GEN_FW_VER_GET_REQ Command */
-typedef struct 
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-}tagGEN_FW_VER_GET_REQ_T;
-
-/** SNIC_INIT_REQ */
-typedef struct
-{
-    unsigned char  cmd_sid;
-    unsigned char  seq;
-    unsigned short buf_size;
-}tagSNIC_INIT_REQ_T;
-
-/** SNIC_TCP_CREATE_SOCKET_REQ */
-typedef struct
-{
-    unsigned char  cmd_sid;
-    unsigned char  seq;
-    unsigned char  bind;
-    unsigned char  local_addr[4];
-    unsigned char  local_port[2];
-}tagSNIC_TCP_CREATE_SOCKET_REQ_T;
-
-/** SNIC_TCP_SEND_FROM_SOCKET_REQ */
-typedef struct
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-    unsigned char socket_id;
-    unsigned char option;
-    unsigned char payload_len[2];
-}tagSNIC_TCP_SEND_FROM_SOCKET_REQ_T;
-
-/** SNIC_TCP_CONNECT_TO_SERVER_REQ */
-typedef struct
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-    unsigned char socket_id;
-    unsigned char remote_addr[4];
-    unsigned char remote_port[2];
-    unsigned char recv_bufsize[2];
-    unsigned char timeout;
-}tagSNIC_TCP_CONNECT_TO_SERVER_REQ_T;
-
-/** WIFI_ON_REQ Command */
-typedef struct 
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-    char country[COUNTRYC_CODE_LENTH];
-}tagWIFI_ON_REQ_T;
-
-/** WIFI_OFF_REQ Command */
-typedef struct 
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-}tagWIFI_OFF_REQ_T;
-
-/** WIFI_DISCONNECT_REQ Command */
-typedef struct 
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-}tagWIFI_DISCONNECT_REQ_T;
-
-/** WIFI_GET_STA_RSSI_REQ Command */
-typedef struct 
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-}tagWIFI_GET_STA_RSSI_REQ_T;
-
-/** WIFI_GET_STATUS_REQ Command */
-typedef struct 
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-    unsigned char interface;
-}tagWIFI_GET_STATUS_REQ_T;
-
-/** WIFI_SCAN_REQ Command */
-typedef struct 
-{
-    unsigned char cmd_sid;
-    unsigned char seq;
-    unsigned char scan_type;
-    unsigned char bss_type;
-    unsigned char bssid[BSSID_MAC_LENTH];
-    unsigned char chan_list;
-    unsigned char ssid[SSID_MAX_LENGTH+1];
-}tagWIFI_SCAN_REQ_T;
-
 /** C_SNIC_Core class
  */
 class C_SNIC_Core
@@ -186,11 +68,131 @@
 friend class Socket;
 
 private:
+    /** Memorypool for SNIC UART Response
+     */
+    typedef struct
+    {
+        unsigned char buf[MEMPOOL_BLOCK_SIZE];
+    }tagMEMPOOL_BLOCK_T;
+
+    /** Wi-Fi Network type
+     */
+    typedef enum NETWORK_TYPE {
+        /** Infrastructure */
+        e_INFRA = 0,
+        /** Adhoc */
+        e_ADHOC = 1
+    }E_NETWORK_TYPE;
+
+    /** Connection information
+    */
+    typedef struct {
+        CircBuffer<unsigned char>    *recvbuf_p;
+        bool                is_connected;
+        bool                is_received;
+    }tagCONNECT_INFO_T;
+
+    /** GEN_FW_VER_GET_REQ Command */
+    typedef struct 
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+    }tagGEN_FW_VER_GET_REQ_T;
+
+    /** SNIC_INIT_REQ */
+    typedef struct
+    {
+        unsigned char  cmd_sid;
+        unsigned char  seq;
+        unsigned short buf_size;
+    }tagSNIC_INIT_REQ_T;
+    
+    /** SNIC_TCP_CREATE_SOCKET_REQ */
+    typedef struct
+    {
+        unsigned char  cmd_sid;
+        unsigned char  seq;
+        unsigned char  bind;
+        unsigned char  local_addr[4];
+        unsigned char  local_port[2];
+    }tagSNIC_TCP_CREATE_SOCKET_REQ_T;
+    
+    /** SNIC_TCP_SEND_FROM_SOCKET_REQ */
+    typedef struct
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+        unsigned char socket_id;
+        unsigned char option;
+        unsigned char payload_len[2];
+    }tagSNIC_TCP_SEND_FROM_SOCKET_REQ_T;
+    
+    /** SNIC_TCP_CONNECT_TO_SERVER_REQ */
+    typedef struct
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+        unsigned char socket_id;
+        unsigned char remote_addr[4];
+        unsigned char remote_port[2];
+        unsigned char recv_bufsize[2];
+        unsigned char timeout;
+    }tagSNIC_TCP_CONNECT_TO_SERVER_REQ_T;
+    
+    /** WIFI_ON_REQ Command */
+    typedef struct 
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+        char country[COUNTRYC_CODE_LENTH];
+    }tagWIFI_ON_REQ_T;
+    
+    /** WIFI_OFF_REQ Command */
+    typedef struct 
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+    }tagWIFI_OFF_REQ_T;
+    
+    /** WIFI_DISCONNECT_REQ Command */
+    typedef struct 
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+    }tagWIFI_DISCONNECT_REQ_T;
+    
+    /** WIFI_GET_STA_RSSI_REQ Command */
+    typedef struct 
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+    }tagWIFI_GET_STA_RSSI_REQ_T;
+    
+    /** WIFI_GET_STATUS_REQ Command */
+    typedef struct 
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+        unsigned char interface;
+    }tagWIFI_GET_STATUS_REQ_T;
+    
+    /** WIFI_SCAN_REQ Command */
+    typedef struct 
+    {
+        unsigned char cmd_sid;
+        unsigned char seq;
+        unsigned char scan_type;
+        unsigned char bss_type;
+        unsigned char bssid[BSSID_MAC_LENTH];
+        unsigned char chan_list;
+        unsigned char ssid[SSID_MAX_LENGTH+1];
+    }tagWIFI_SCAN_REQ_T;
+
 
     /** Get buffer for command from memory pool.
         @return Pointer of buffer
      */
-    tagMEMPOOL_BLOCK_T *allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *allocCmdBuf();
     
     /** Release buffer to memory pool.
         @param buf_p Pointer of buffer
@@ -226,7 +228,7 @@
         @param socket_id    Socket ID
         @return The pointer of connection information
     */
-    tagCONNECT_INFO_T   *getConnectInfo( int socket_id );
+    C_SNIC_Core::tagCONNECT_INFO_T   *getConnectInfo( int socket_id );
 
     /**
         Get pointer of the instance of C_SNIC_UartCommandManager.

--- a/SNIC/SNIC_UartCommandManager.cpp	Thu Mar 27 07:14:21 2014 +0000
+++ b/SNIC/SNIC_UartCommandManager.cpp	Thu Mar 27 07:37:55 2014 +0000
@@ -154,7 +154,7 @@
     // Get socket id from payload
     socket_id = payload_p[2];
     // Get Connection information
-    tagCONNECT_INFO_T *con_info_p = instance_p->getConnectInfo( socket_id );
+    C_SNIC_Core::tagCONNECT_INFO_T *con_info_p = instance_p->getConnectInfo( socket_id );
     if( con_info_p == NULL )
     {
         return;

--- a/SNIC_WifiInterface.cpp	Thu Mar 27 07:14:21 2014 +0000
+++ b/SNIC_WifiInterface.cpp	Thu Mar 27 07:37:55 2014 +0000
@@ -36,14 +36,14 @@
 
     /* Initialize SNIC API */
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("snic_init payload_buf NULL\r\n");
         return -1;
     }
 
-    tagSNIC_INIT_REQ_T req;
+    C_SNIC_Core::tagSNIC_INIT_REQ_T req;
     // Make request
     req.cmd_sid  = UART_CMD_SID_SNIC_INIT_REQ;
     req.seq      = mUartRequestSeq++;
@@ -53,7 +53,7 @@
     unsigned int  command_len;
     // Preparation of command
     command_len = mSNICWifi_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(tagSNIC_INIT_REQ_T), payload_buf->buf, command_array );
+                            , sizeof(C_SNIC_Core::tagSNIC_INIT_REQ_T), payload_buf->buf, command_array );
 
     // Send uart command request
     mSNICWifi_p->sendUart( command_len, command_array );
@@ -83,14 +83,14 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = mSNICWifi_p->getUartCommand();
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("getFWVersion payload_buf NULL\r\n");
         return -1;
     }
 
-    tagGEN_FW_VER_GET_REQ_T req;
+    C_SNIC_Core::tagGEN_FW_VER_GET_REQ_T req;
     // Make request
     req.cmd_sid = UART_CMD_SID_GEN_FW_VER_GET_REQ;
     req.seq     = mUartRequestSeq++;
@@ -99,7 +99,7 @@
     unsigned int  command_len;
     // Preparation of command
     command_len = mSNICWifi_p->preparationSendCommand( UART_CMD_ID_GEN, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(tagGEN_FW_VER_GET_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagGEN_FW_VER_GET_REQ_T), payload_buf->buf, command_array );
 
     int ret;
     
@@ -144,7 +144,7 @@
     }
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("connect payload_buf NULL\r\n");
@@ -215,14 +215,14 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = mSNICWifi_p->getUartCommand();
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("disconnect payload_buf NULL\r\n");
         return -1;
     }
 
-    tagWIFI_DISCONNECT_REQ_T req;
+    C_SNIC_Core::tagWIFI_DISCONNECT_REQ_T req;
     // Make request
     req.cmd_sid = UART_CMD_SID_WIFI_DISCONNECT_REQ;
     req.seq = mUartRequestSeq++;
@@ -231,7 +231,7 @@
     unsigned int  command_len;
     // Preparation of command
     command_len = mSNICWifi_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(tagWIFI_DISCONNECT_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_DISCONNECT_REQ_T), payload_buf->buf, command_array );
 
     // Send uart command request
     mSNICWifi_p->sendUart( command_len, command_array );
@@ -261,17 +261,17 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = mSNICWifi_p->getUartCommand();
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("scan payload_buf NULL\r\n");
         return -1;
     }
     
-    tagWIFI_SCAN_REQ_T req;
+    C_SNIC_Core::tagWIFI_SCAN_REQ_T req;
     unsigned int  buf_len = 0;
     
-    memset( &req, 0, sizeof(tagWIFI_SCAN_REQ_T) );
+    memset( &req, 0, sizeof(C_SNIC_Core::tagWIFI_SCAN_REQ_T) );
     // Make request
     req.cmd_sid = UART_CMD_SID_WIFI_SCAN_REQ;
     buf_len++;
@@ -347,14 +347,14 @@
     }
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("wifi_on payload_buf NULL\r\n");
         return -1;
     }
 
-    tagWIFI_ON_REQ_T req;
+    C_SNIC_Core::tagWIFI_ON_REQ_T req;
     // Make request
     req.cmd_sid = UART_CMD_SID_WIFI_ON_REQ;
     req.seq = mUartRequestSeq++;
@@ -364,7 +364,7 @@
     unsigned int  command_len;
     // Preparation of command
     command_len = mSNICWifi_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(tagWIFI_ON_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_ON_REQ_T), payload_buf->buf, command_array );
 
     // Send uart command request
     mSNICWifi_p->sendUart( command_len, command_array );
@@ -394,14 +394,14 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = mSNICWifi_p->getUartCommand();
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("wifi_off payload_buf NULL\r\n");
         return -1;
     }
 
-    tagWIFI_OFF_REQ_T req;
+    C_SNIC_Core::tagWIFI_OFF_REQ_T req;
     // Make request
     req.cmd_sid = UART_CMD_SID_WIFI_OFF_REQ;
     req.seq = mUartRequestSeq++;
@@ -410,7 +410,7 @@
     unsigned int  command_len;
     // Preparation of command
     command_len = mSNICWifi_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(tagWIFI_OFF_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_OFF_REQ_T), payload_buf->buf, command_array );
 
     // Send uart command request
     mSNICWifi_p->sendUart( command_len, command_array );
@@ -445,14 +445,14 @@
     }
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("getRssi payload_buf NULL\r\n");
         return -1;
     }
 
-    tagWIFI_GET_STA_RSSI_REQ_T req;
+    C_SNIC_Core::tagWIFI_GET_STA_RSSI_REQ_T req;
     
     // Make request
     req.cmd_sid = UART_CMD_SID_WIFI_GET_STA_RSSI_REQ;
@@ -461,7 +461,7 @@
     unsigned char  command_array[UART_REQUEST_PAYLOAD_MAX];
     unsigned int   command_len;
     command_len = mSNICWifi_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(tagWIFI_GET_STA_RSSI_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_GET_STA_RSSI_REQ_T), payload_buf->buf, command_array );
 
     int ret;
     // Send uart command request
@@ -493,14 +493,14 @@
     }
     
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSNICWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("getWifiStatus payload_buf NULL\r\n");
         return -1;
     }
 
-    tagWIFI_GET_STATUS_REQ_T req;
+    C_SNIC_Core::tagWIFI_GET_STATUS_REQ_T req;
     // Make request
     req.cmd_sid = UART_CMD_SID_WIFI_GET_STATUS_REQ;
     req.seq     = mUartRequestSeq++;
@@ -509,7 +509,7 @@
     unsigned char  command_array[UART_REQUEST_PAYLOAD_MAX];
     unsigned int   command_len;
     command_len = mSNICWifi_p->preparationSendCommand( UART_CMD_ID_WIFI, req.cmd_sid, (unsigned char *)&req
-                        , sizeof(tagWIFI_GET_STATUS_REQ_T), payload_buf->buf, command_array );
+                        , sizeof(C_SNIC_Core::tagWIFI_GET_STATUS_REQ_T), payload_buf->buf, command_array );
 
     // Send uart command request
     mSNICWifi_p->sendUart( command_len, command_array );

--- a/Socket/Socket.cpp	Thu Mar 27 07:14:21 2014 +0000
+++ b/Socket/Socket.cpp	Thu Mar 27 07:37:55 2014 +0000
@@ -67,14 +67,14 @@
 {
     C_SNIC_UartCommandManager *uartCmdMgr_p = mSnicWifi_p->getUartCommand();
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSnicWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSnicWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("createSocket payload_buf NULL\r\n");
         return -1;
     }
 
-    tagSNIC_TCP_CREATE_SOCKET_REQ_T req;
+    C_SNIC_Core::tagSNIC_TCP_CREATE_SOCKET_REQ_T req;
     int req_len = 0;
     
     // Make request

--- a/Socket/TCPSocketConnection.cpp	Thu Mar 27 07:14:21 2014 +0000
+++ b/Socket/TCPSocketConnection.cpp	Thu Mar 27 07:37:55 2014 +0000
@@ -50,14 +50,14 @@
     }
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSnicWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSnicWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("connect payload_buf NULL\r\n");
         return -1;
     }
 
-    tagSNIC_TCP_CONNECT_TO_SERVER_REQ_T req;
+    C_SNIC_Core::tagSNIC_TCP_CONNECT_TO_SERVER_REQ_T req;
     // Make request
     req.cmd_sid      = UART_CMD_SID_SNIC_TCP_CONNECT_TO_SERVER_REQ;
     req.seq          = mUartRequestSeq++;
@@ -78,7 +78,7 @@
     unsigned int  command_len;
     // Preparation of command
     command_len = mSnicWifi_p->preparationSendCommand( UART_CMD_ID_SNIC, req.cmd_sid, (unsigned char *)&req
-                            , sizeof(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->buf, command_array );
 
     // Send uart command request
     mSnicWifi_p->sendUart( command_len, command_array );
@@ -103,7 +103,7 @@
     mSnicWifi_p->freeCmdBuf( payload_buf );
 
     // Initialize connection information
-    tagCONNECT_INFO_T *con_info_p = mSnicWifi_p->getConnectInfo( mSocketID );
+    C_SNIC_Core::tagCONNECT_INFO_T *con_info_p = mSnicWifi_p->getConnectInfo( mSocketID );
     if( con_info_p->recvbuf_p == NULL )
     {
         printf( "create recv buffer[socket:%d]\r\n", mSocketID);
@@ -117,7 +117,7 @@
 
 bool TCPSocketConnection::is_connected(void)
 {
-    tagCONNECT_INFO_T *con_info_p = mSnicWifi_p->getConnectInfo( mSocketID );
+    C_SNIC_Core::tagCONNECT_INFO_T *con_info_p = mSnicWifi_p->getConnectInfo( mSocketID );
     return con_info_p->is_connected;
 }
 
@@ -127,14 +127,14 @@
     C_SNIC_UartCommandManager *uartCmdMgr_p = mSnicWifi_p->getUartCommand();
 
     // Get buffer for response payload from MemoryPool
-    tagMEMPOOL_BLOCK_T *payload_buf = mSnicWifi_p->allocCmdBuf();
+    C_SNIC_Core::tagMEMPOOL_BLOCK_T *payload_buf = mSnicWifi_p->allocCmdBuf();
     if( payload_buf == NULL )
     {
         printf("connect payload_buf NULL\r\n");
         return -1;
     }
 
-    tagSNIC_TCP_SEND_FROM_SOCKET_REQ_T req;
+    C_SNIC_Core::tagSNIC_TCP_SEND_FROM_SOCKET_REQ_T req;
     // Make request
     req.cmd_sid       = UART_CMD_SID_SNIC_SEND_FROM_SOCKET_REQ;
     req.seq           = mUartRequestSeq++;
@@ -143,7 +143,7 @@
     req.payload_len[0]= ( (length & 0xFF00) >> 8 );
     req.payload_len[1]= (length & 0xFF);
     
-    int req_size = sizeof(tagSNIC_TCP_SEND_FROM_SOCKET_REQ_T);
+    int req_size = sizeof(C_SNIC_Core::tagSNIC_TCP_SEND_FROM_SOCKET_REQ_T);
     memcpy( gTCP_SEND_BUF, &req, req_size );
     memcpy( &gTCP_SEND_BUF[req_size], data_p, length );
     
@@ -156,8 +156,6 @@
     // Send uart command request
     mSnicWifi_p->sendUart( command_len, command_array );
 
-//    mSnicWifi_p->mUartCommand.setCommandSID( req.cmd_sid );
-
     // Wait UART response
     int ret = uartCmdMgr_p->wait();
     if( ret != 0 )
@@ -190,7 +188,7 @@
     }
     
     // Initialize connection information
-    tagCONNECT_INFO_T *con_info_p = mSnicWifi_p->getConnectInfo( mSocketID );
+    C_SNIC_Core::tagCONNECT_INFO_T *con_info_p = mSnicWifi_p->getConnectInfo( mSocketID );
     if( con_info_p->recvbuf_p == NULL )
     {
         printf("TCPSocketConnection::receive Conncection info error\r\n");