|
@@ -539,29 +539,14 @@ void _cmRtSysMidiCallback( const cmMidiPacket_t* pktArray, unsigned pktCnt )
|
539
|
539
|
}
|
540
|
540
|
|
541
|
541
|
// This funciton is called from the real-time thread
|
542
|
|
-void _cmRtNetRecv( void* cbArg, const char* data, unsigned dataByteCnt, const struct sockaddr_in* fromAddr )
|
|
542
|
+void _cmRtSysNetRecv( void* cbArg, const char* data, unsigned dataByteCnt, const struct sockaddr_in* fromAddr )
|
543
|
543
|
{
|
544
|
544
|
_cmRtCfg_t* cp = (_cmRtCfg_t*)cbArg;
|
545
|
|
- cmRtSysMsgHdr_t* hdr = (cmRtSysMsgHdr_t*)data;
|
546
|
|
-
|
547
|
|
- // is this a network sync. msg.
|
548
|
|
- if( hdr->selId == kNetSyncSelRtId )
|
549
|
|
- {
|
550
|
|
- if( cmRtNetSyncModeRecv(cp->netH, data, dataByteCnt, fromAddr ) != kOkNetRC )
|
551
|
|
- cmErrMsg(&cp->p->err,kNetErrRtRC,"Network sync mode receive failed.");
|
552
|
|
- }
|
553
|
|
- else
|
554
|
|
- {
|
555
|
|
- cmRtSysH_t h;
|
556
|
|
- h.h = cp->p;
|
557
|
|
- cmRtSysDeliverMsg(h,data,dataByteCnt,cmInvalidId);
|
558
|
|
- }
|
559
|
|
-
|
560
|
|
- // If the network is in sync mode
|
561
|
|
- if( cmRtNetIsValid(cp->netH) && cmRtNetIsInSyncMode(cp->netH) )
|
562
|
|
- if( cmRtNetSyncModeSend(cp->netH) != kOkNetRC )
|
563
|
|
- cmErrMsg(&cp->p->err,kNetErrRtRC,"Net sync send failed.");
|
564
|
545
|
|
|
546
|
+ cmRtSysH_t h;
|
|
547
|
+ h.h = cp->p;
|
|
548
|
+ cmRtSysDeliverMsg(h,data,dataByteCnt,cmInvalidId);
|
|
549
|
+
|
565
|
550
|
}
|
566
|
551
|
|
567
|
552
|
|
|
@@ -953,7 +938,7 @@ cmRtRC_t cmRtSysCfg( cmRtSysH_t h, const cmRtSysSubSys_t* ss, unsigned rtSubIdx
|
953
|
938
|
|
954
|
939
|
|
955
|
940
|
// allocate the network mgr
|
956
|
|
- if( cmRtNetAlloc(p->ctx,&cp->netH, _cmRtNetRecv, cp ) != kOkNetRC )
|
|
941
|
+ if( cmRtNetAlloc(p->ctx,&cp->netH, _cmRtSysNetRecv, cp ) != kOkNetRC )
|
957
|
942
|
{
|
958
|
943
|
rc = _cmRtError(p,kNetErrRtRC,"Network allocation failed.");
|
959
|
944
|
goto errLabel;
|
|
@@ -963,7 +948,7 @@ cmRtRC_t cmRtSysCfg( cmRtSysH_t h, const cmRtSysSubSys_t* ss, unsigned rtSubIdx
|
963
|
948
|
for(j=0; j<ss->netNodeCnt; ++j)
|
964
|
949
|
{
|
965
|
950
|
cmRtSysNetNode_t* nn = ss->netNodeArray + j;
|
966
|
|
- if( cmRtNetCreateNode( cp->netH, nn->label, nn->ipAddr, nn->ipPort) != kOkNetRC )
|
|
951
|
+ if( cmRtNetRegisterLocalNode( cp->netH, nn->label, nn->ipAddr, nn->ipPort) != kOkNetRC )
|
967
|
952
|
{
|
968
|
953
|
rc = _cmRtError(p,kNetErrRtRC,"Network node allocation failed on label:%s addr:%s port:%i.",cmStringNullGuard(nn->label),cmStringNullGuard(nn->ipAddr),nn->ipPort);
|
969
|
954
|
goto errLabel;
|