osaf/libs/common/cpsv/include/cpd_cb.h | 1 -
osaf/services/saf/cpsv/cpd/cpd_db.c | 15 ++-------------
osaf/services/saf/cpsv/cpnd/cpnd_db.c | 15 ++-------------
3 files changed, 4 insertions(+), 27 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/libs/common/cpsv/include/cpd_cb.h
b/osaf/libs/common/cpsv/include/cpd_cb.h
--- a/osaf/libs/common/cpsv/include/cpd_cb.h
+++ b/osaf/libs/common/cpsv/include/cpd_cb.h
@@ -180,7 +180,6 @@ typedef struct cpd_cb_tag {
bool is_quiesced_set;
MDS_DEST loc_cpnd_dest;
MDS_DEST rem_cpnd_dest;
- /*MDS_DEST cpnd_dests[NCS_MAX_SLOTS]; */
NCS_PATRICIA_TREE cpnd_tree;
diff --git a/osaf/services/saf/cpsv/cpd/cpd_db.c
b/osaf/services/saf/cpsv/cpd/cpd_db.c
--- a/osaf/services/saf/cpsv/cpd/cpd_db.c
+++ b/osaf/services/saf/cpsv/cpd/cpd_db.c
@@ -1209,12 +1209,7 @@ uint32_t cpd_process_cpnd_del(CPD_CB *cb
uint32_t cpd_get_slot_sub_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));
}
/********************************************************************************
@@ -1228,13 +1223,7 @@ uint32_t cpd_get_slot_sub_id_from_mds_de
uint32_t cpd_get_slot_sub_slot_id_from_node_id(NCS_NODE_ID i_node_id)
{
- NCS_PHY_SLOT_ID phy_slot;
- NCS_SUB_SLOT_ID sub_slot;
-
- m_NCS_GET_PHYINFO_FROM_NODE_ID(i_node_id, NULL, &phy_slot, &sub_slot);
-
- return ((sub_slot * NCS_SUB_SLOT_MAX) + (phy_slot));
-
+ return GetSlotSubslotIdFromNodeId(i_node_id);
}
/*******************************************************************************************
diff --git a/osaf/services/saf/cpsv/cpnd/cpnd_db.c
b/osaf/services/saf/cpsv/cpnd/cpnd_db.c
--- a/osaf/services/saf/cpsv/cpnd/cpnd_db.c
+++ b/osaf/services/saf/cpsv/cpnd/cpnd_db.c
@@ -756,12 +756,7 @@ void cpnd_allrepl_write_evt_node_tree_de
*********************************************************************************/
uint32_t cpnd_get_slot_sub_slot_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));
}
/***********************************************************************************
@@ -772,13 +767,7 @@ uint32_t cpnd_get_slot_sub_slot_id_from_
*********************************************************************************/
uint32_t cpnd_get_slot_sub_slot_id_from_node_id(NCS_NODE_ID i_node_id)
{
- NCS_PHY_SLOT_ID phy_slot;
- NCS_SUB_SLOT_ID sub_slot;
-
- m_NCS_GET_PHYINFO_FROM_NODE_ID(i_node_id, NULL, &phy_slot, &sub_slot);
-
- return ((sub_slot * NCS_SUB_SLOT_MAX) + (phy_slot));
-
+ return GetSlotSubslotIdFromNodeId(i_node_id);
}
/******************************************************************************************
------------------------------------------------------------------------------
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
