cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmRtSys.h/c,cmUiRTSysMstr.c:Allow access to cmRtNetH_t via cmRtSys.

Browse Source
This commit is contained in:
kpl 2013-05-04 23:52:56 -07:00
parent c1116f6fc0
commit 32125efcf5
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmRtSys.c
View File

@ -29,7 +29,7 @@ typedef enum
kDisableCbCmdId kDisableCbCmdId
} kRtCmdId_t; } kRtCmdId_t;
cmRtSysH_t cmRtSysNullHandle = { NULL }; cmRtSysH_t cmRtSysNullHandle = cmSTATIC_NULL_HANDLE;
struct cmRt_str; struct cmRt_str;
@ -961,7 +961,7 @@ cmRtRC_t cmRtSysCfg( cmRtSysH_t h, const cmRtSysSubSys_t* ss, unsigned rtSubIdx
for(j=0; j<ss->endptCnt; ++j) for(j=0; j<ss->endptCnt; ++j)
{ {
cmRtSysNetEndpt_t* ep = ss->endptArray + j; cmRtSysNetEndpt_t* ep = ss->endptArray + j;
if( cmRtNetRegisterEndPoint( cp->netH, ep->label, ep->id ) != kOkNetRC ) if( cmRtNetRegisterEndPoint( cp->netH, cp->ctx.rtSubIdx, ep->label, ep->id ) != kOkNetRC )
{ {
rc = _cmRtError(p,kNetErrRtRC,"Network end point allocation failed on label:%s id:%i.",cmStringNullGuard(ep->label),ep->id); rc = _cmRtError(p,kNetErrRtRC,"Network end point allocation failed on label:%s id:%i.",cmStringNullGuard(ep->label),ep->id);
goto errLabel; goto errLabel;
@ -1280,6 +1280,23 @@ cmRtRC_t cmRtSysNetReport( cmRtSysH_t h )
} }
cmRtRC_t cmRtSysNetGetHandle( cmRtSysH_t h, unsigned rtSubIdx, cmRtNetH_t* hp )
{
cmRtRC_t rc = kOkRtRC;
cmRt_t* p = _cmRtHandleToPtr(h);
assert( rtSubIdx < p->ssCnt );
if( rtSubIdx < p->ssCnt )
{
*hp = p->ssArray[rtSubIdx].netH;
return rc;
}
return cmErrMsg(&p->err,kInvalidArgRtRC,"The rtSubIdx %i is out of range %i.",rtSubIdx,p->ssCnt);
}
//=========================================================================================================================== //===========================================================================================================================
// //

2
cmRtSys.h
View File

@ -322,7 +322,7 @@ extern "C" {
bool cmRtSysNetIsInitialized( cmRtSysH_t h ); bool cmRtSysNetIsInitialized( cmRtSysH_t h );
cmRtRC_t cmRtSysNetDoSync( cmRtSysH_t h ); cmRtRC_t cmRtSysNetDoSync( cmRtSysH_t h );
cmRtRC_t cmRtSysNetReport( cmRtSysH_t h ); cmRtRC_t cmRtSysNetReport( cmRtSysH_t h );
cmRtRC_t cmRtSysNetGetHandle( cmRtSysH_t h, unsigned rtSubIdx, cmRtNetH_t* hp );
#ifdef __cplusplus #ifdef __cplusplus

1
cmUiRtSysMstr.c
View File

@ -9,6 +9,7 @@
#include "cmThread.h" #include "cmThread.h"
#include "cmUdpPort.h" #include "cmUdpPort.h"
#include "cmRtSysMsg.h" #include "cmRtSysMsg.h"
#include "cmRtNet.h"
#include "cmRtSys.h" #include "cmRtSys.h"
#include "cmUiDrvr.h" #include "cmUiDrvr.h"
#include "cmUi.h" #include "cmUi.h"