osaf/libs/core/common/ncs_main_pub.c | 32 --------------------------------
osaf/libs/core/include/ncs_main_papi.h | 24 ------------------------
osaf/libs/core/include/ncsgl_defs.h | 8 --------
3 files changed, 0 insertions(+), 64 deletions(-)
Remove the old macro m_NCS_GET_PHYINFO_FROM_NODE_ID and the types
NCS_PHY_SLOT_ID and NCS_SUB_SLOT_ID, which have been replaced by the new
function GetChassisIdFromNodeId(), GetSlotSubslotIdFromNodeId(), and the new
type SlotSubslotId.
diff --git a/osaf/libs/core/common/ncs_main_pub.c
b/osaf/libs/core/common/ncs_main_pub.c
--- a/osaf/libs/core/common/ncs_main_pub.c
+++ b/osaf/libs/core/common/ncs_main_pub.c
@@ -801,35 +801,3 @@ char *ncs_util_search_argv_list(int argc
}
return NULL;
}
-
-
-/****************************************************************************
- Name : ncs_get_phyinfo_from_node_id
-
- Description : This function extracts chassis id,physical slot
- id and sub slot id from node_id
-
- Arguments : i_node_id - node id
- *o_chassis_id - chassis id
- *o_phy_slot_id - physical slot id
- *o_sub_slot_id - slot id
-
- Return Values : On Failure NCSCC_RC_FAILURE
- On Success NCSCC_RC_SUCCESS
-
- Notes : None.
-******************************************************************************/
-uint8_t ncs_get_phyinfo_from_node_id(NCS_NODE_ID i_node_id, NCS_CHASSIS_ID
*o_chassis_id,
- NCS_PHY_SLOT_ID *o_phy_slot_id,
NCS_SUB_SLOT_ID *o_sub_slot_id)
-{
- if (o_sub_slot_id != NULL)
- *o_sub_slot_id = ((NCS_SUB_SLOT_ID)i_node_id);
-
- if (o_chassis_id != NULL)
- *o_chassis_id = (NCS_CHASSIS_ID)(i_node_id >> 16);
-
- if (o_phy_slot_id != NULL)
- *o_phy_slot_id = (NCS_PHY_SLOT_ID)(i_node_id >> 8);
-
- return NCSCC_RC_SUCCESS;
-}
diff --git a/osaf/libs/core/include/ncs_main_papi.h
b/osaf/libs/core/include/ncs_main_papi.h
--- a/osaf/libs/core/include/ncs_main_papi.h
+++ b/osaf/libs/core/include/ncs_main_papi.h
@@ -88,30 +88,6 @@ extern "C" {
NCS_NODE_ID ncs_get_node_id(void);
#define m_NCS_GET_NODE_ID ncs_get_node_id()
-
-#define m_NCS_GET_PHYINFO_FROM_NODE_ID( i_node_id, o_chassis_id, o_phy_slot_id
,\
- o_sub_slot_id)
ncs_get_phyinfo_from_node_id( i_node_id,\
- o_chassis_id , o_phy_slot_id,
o_sub_slot_id)
-/****************************************************************************
- Name : ncs_get_phyinfo_from_node_id
-
- Description : This function extracts node_id from chassis id ,physical
- slot id and sub slot id into node_id
-
- Arguments : i_chassis_id - chassis id
- i_phy_slot_id - physical slot id
- i_sub_slot_id - slot id
- *o_node_id - node_id
-
- Return Values : On Failure NCSCC_RC_FAILURE
- On Success NCSCC_RC_SUCCESS
-
- Notes : None.
-******************************************************************************/
- uint8_t ncs_get_phyinfo_from_node_id(NCS_NODE_ID i_node_id,
- NCS_CHASSIS_ID *o_chassis_id,
- NCS_PHY_SLOT_ID
*o_phy_slot_id, NCS_SUB_SLOT_ID *o_sub_slot_id);
-
static inline NCS_CHASSIS_ID GetChassisIdFromNodeId(NCS_NODE_ID node_id)
{
uint32_t kChassisMask = 0xff;
diff --git a/osaf/libs/core/include/ncsgl_defs.h
b/osaf/libs/core/include/ncsgl_defs.h
--- a/osaf/libs/core/include/ncsgl_defs.h
+++ b/osaf/libs/core/include/ncsgl_defs.h
@@ -79,17 +79,9 @@ enum {
kMaxSlotsSubslots = 4096
};
-#define NCS_SLOT_MAX 16
-
-#define NCS_SUB_SLOT_MAX 16
-
-#define NCS_MAX_SLOTS ((NCS_SLOT_MAX * NCS_SUB_SLOT_MAX) + NCS_SLOT_MAX)
-
typedef uint64_t MDS_DEST;
typedef uint32_t NCS_NODE_ID;
typedef uint8_t NCS_CHASSIS_ID;
- typedef uint8_t NCS_PHY_SLOT_ID;
- typedef uint8_t NCS_SUB_SLOT_ID;
typedef uint32_t SlotSubslotId;
/* m_NCS_NODE_ID_FROM_MDS_DEST: Returns node-id if the MDS_DEST provided
------------------------------------------------------------------------------
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
