osaf/services/saf/immsv/immd/immd_db.c | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
Use the new support function GetSlotSubslotIdFromNodeId() to extract a 32-bit
integer containing the slot ID and subslot ID from a Node ID.
diff --git a/osaf/services/saf/immsv/immd/immd_db.c
b/osaf/services/saf/immsv/immd/immd_db.c
--- a/osaf/services/saf/immsv/immd/immd_db.c
+++ b/osaf/services/saf/immsv/immd/immd_db.c
@@ -296,12 +296,7 @@ uint32_t immd_cb_db_destroy(IMMD_CB *cb)
*****************************************************************************/
uint32_t immd_get_slot_and_subslot_id_from_mds_dest(MDS_DEST dest)
{
- NCS_PHY_SLOT_ID phy_slot;
- NCS_SUB_SLOT_ID sub_slot;
-
- m_NCS_GET_PHYINFO_FROM_NODE_ID(m_NCS_NODE_ID_FROM_MDS_DEST(dest), NULL,
&phy_slot, &sub_slot);
-
- return ((sub_slot * NCS_SUB_SLOT_MAX) + (phy_slot));
+ return GetSlotSubslotIdFromNodeId(m_NCS_NODE_ID_FROM_MDS_DEST(dest));
}
/*****************************************************************************
@@ -313,12 +308,8 @@ uint32_t immd_get_slot_and_subslot_id_fr
*****************************************************************************/
uint32_t immd_get_slot_and_subslot_id_from_node_id(NCS_NODE_ID node_id)
{
- NCS_PHY_SLOT_ID phy_slot;
- NCS_SUB_SLOT_ID sub_slot;
- m_NCS_GET_PHYINFO_FROM_NODE_ID(node_id, NULL, &phy_slot, &sub_slot);
-
- return ((sub_slot * NCS_SUB_SLOT_MAX) + (phy_slot));
+ return GetSlotSubslotIdFromNodeId(node_id);
}
void immd_db_save_fevs(IMMD_CB *cb, IMMSV_FEVS *fevs_msg)
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
