TcpSocket,LisnerのMutexをIPv4インスタンス直参照に変更

[mimic/MiMicSDK.git] / lib / src / uip / NyLPC_cTcpSocket.c

diff --git a/lib/src/uip/NyLPC_cTcpSocket.c b/lib/src/uip/NyLPC_cTcpSocket.c
index 15c33a2..661f409 100644 (file)
--- a/lib/src/uip/NyLPC_cTcpSocket.c
+++ b/lib/src/uip/NyLPC_cTcpSocket.c
@@ -67,11 +67,10 @@ static NyLPC_TUInt32 iss32=3939;
        #define DEBUG_RTO_LOG(i_inst)\r
 #endif\r
 \r
-\r
 //#define lockResource(i_inst) NyLPC_cMutex_lock(&((i_inst)->_smutex))\r
 //#define unlockResource(i_inst) NyLPC_cMutex_unlock(&((i_inst)->_smutex))\r
-#define lockResource(i_inst) NyLPC_cMutex_lock(((i_inst)->_smutex))\r
-#define unlockResource(i_inst) NyLPC_cMutex_unlock(((i_inst)->_smutex))\r
+#define lockResource(i_inst) NyLPC_cMutex_lock(NyLPC_cIPv4_getSockMutex(((i_inst)->_super._parent_ipv4)))\r
+#define unlockResource(i_inst) NyLPC_cMutex_unlock(NyLPC_cIPv4_getSockMutex(((i_inst)->_super._parent_ipv4)))\r
 \r
 static void sendRst(NyLPC_TcTcpSocket_t* i_inst);\r
 \r
@@ -335,7 +334,7 @@ NyLPC_TBool NyLPC_cTcpSocket_initialize(NyLPC_TcTcpSocket_t* i_inst,void* i_rbuf
 \r
        NyLPC_cFifoBuffer_initialize(&(i_inst->rxbuf),i_rbuf,i_rbuf_len);\r
        //      NyLPC_AbortIfNot(NyLPC_cMutex_initialize(&(i_inst->_smutex)));//個別Mutex\r
-       i_inst->_smutex=NyLPC_cIPv4_getSockMutex(&(srv->_tcpv4));//共有Mutex\r
+//     i_inst->_smutex=NyLPC_cIPv4_getSockMutex(&(srv->_tcpv4));//共有Mutex\r
        i_inst->tcpstateflags=UIP_CLOSED;\r
        i_inst->txbuf.rp=i_inst->txbuf.wp=0;\r
        for(i=0;i<NyLPC_TcTcpSocket_NUMBER_OF_TXQ;i++){\r