sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Legacy: Fix icsneoGetNetidforSlaveVNETs 

The NetID is written to the out* parameter, not returned.
add-device-sharing
Paul Hollinsky 2022-02-21 21:05:01 -05:00
parent 0219eccc94
commit c3469f5fb6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/icsneolegacy/icsneolegacy.cpp
View File

@ -147,16 +147,20 @@ static inline bool IdIsSlaveBRange2(unsigned int fullNetid)
return Within(fullNetid, PLASMA_SLAVE2_OFFSET_RANGE2, PLASMA_SLAVE3_OFFSET_RANGE2); return Within(fullNetid, PLASMA_SLAVE2_OFFSET_RANGE2, PLASMA_SLAVE3_OFFSET_RANGE2);
} }
static inline unsigned int GetVnetNetid(size_t simpleNetId, EPlasmaIonVnetChannel_t vnetSlot) static inline bool GetVnetNetid(size_t& netId, EPlasmaIonVnetChannel_t vnetSlot)
{ {
if (vnetSlot == 0 || vnetSlot >= sizeof(vnet_table)/sizeof(vnet_table[0])) if (vnetSlot == 0)
return simpleNetId; return true;
const auto offset = mp_netIDToVnetOffSet.find(simpleNetId); if (vnetSlot >= sizeof(vnet_table)/sizeof(vnet_table[0]))
return false;
const auto offset = mp_netIDToVnetOffSet.find(netId);
if (offset == mp_netIDToVnetOffSet.end()) if (offset == mp_netIDToVnetOffSet.end())
return simpleNetId; return false;
return offset->second + vnet_table[vnetSlot]; netId = offset->second + vnet_table[vnetSlot];
return true;
} }
/** /**