Revert "P10 prep: Infrastructure (IS) ring Id metadata and API changes"

This reverts commit 52b76be222254e59959db984606c09dae854270b.
Accidental merge before ekb was complete.

Change-Id: I59412ecad661596322aaba5cb5cf83190727d64f
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67455
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 412 insertions, 119 deletions

diff --git a/src/import/chips/centaur/utils/imageProcs/cen_ringId.C b/src/import/chips/centaur/utils/imageProcs/cen_ringId.C
index f6184af42..2f2f050b0 100644
--- a/src/import/chips/centaur/utils/imageProcs/cen_ringId.C
+++ b/src/import/chips/centaur/utils/imageProcs/cen_ringId.C
@@ -28,24 +28,196 @@
 
 namespace CEN_RID
 {
+
 #include "cen_ringId.H"
+
+namespace CEN
+{
+
+const GenRingIdList RING_ID_LIST_COMMON[] =
+{
+    {"tcm_perv_cmsk", 0x00, 0x01, 0x01, CEN_RING, 0x0303400a},
+    {"tcm_perv_lbst", 0x01, 0x01, 0x01, CEN_RING, 0x03034004},
+    {"tcm_perv_gptr", 0x02, 0x01, 0x01, CEN_RING, 0x03034002},
+    {"tcm_perv_func", 0x03, 0x01, 0x01, CEN_RING, 0x03034000},
+    {"tcm_perv_time", 0x04, 0x01, 0x01, CEN_RING, 0x03034007},
+    {"tcm_perv_abst", 0x05, 0x01, 0x01, CEN_RING, 0x03034005},
+    {"tcm_perv_repr", 0x06, 0x01, 0x01, CEN_RING, 0x03034006},
+    {"tcm_perv_FARR", 0x07, 0x01, 0x01, CEN_RING, 0x03034009},
+    {"tcm_memn_time", 0x08, 0x01, 0x01, CEN_RING, 0x03032007},
+    {"tcm_memn_regf", 0x09, 0x01, 0x01, CEN_RING, 0x03032003},
+    {"tcm_memn_gptr", 0x0a, 0x01, 0x01, CEN_RING, 0x03032002},
+    {"tcm_memn_func", 0x0b, 0x01, 0x01, CEN_RING, 0x03032000},
+    {"tcm_memn_lbst", 0x0c, 0x01, 0x01, CEN_RING, 0x03032004},
+    {"tcm_memn_cmsk", 0x0d, 0x01, 0x01, CEN_RING, 0x0303200a},
+    {"tcm_memn_abst", 0x0e, 0x01, 0x01, CEN_RING, 0x03032005},
+    {"tcm_memn_repr", 0x0f, 0x01, 0x01, CEN_RING, 0x03032006},
+    {"tcm_memn_FARR", 0x10, 0x01, 0x01, CEN_RING, 0x03032009},
+    {"tcm_mems_time", 0x11, 0x01, 0x01, CEN_RING, 0x03031007},
+    {"tcm_mems_regf", 0x12, 0x01, 0x01, CEN_RING, 0x03031003},
+    {"tcm_mems_gptr", 0x13, 0x01, 0x01, CEN_RING, 0x03031002},
+    {"tcm_mems_func", 0x14, 0x01, 0x01, CEN_RING, 0x03031000},
+    {"tcm_mems_lbst", 0x15, 0x01, 0x01, CEN_RING, 0x03031004},
+    {"tcm_mems_cmsk", 0x16, 0x01, 0x01, CEN_RING, 0x0303100a},
+    {"tcm_mems_bndy", 0x17, 0x01, 0x01, CEN_RING, 0x03031008},
+    {"tcm_mems_abst", 0x18, 0x01, 0x01, CEN_RING, 0x03031005},
+    {"tcm_mems_repr", 0x19, 0x01, 0x01, CEN_RING, 0x03031006},
+    {"tcm_mems_FARR", 0x1a, 0x01, 0x01, CEN_RING, 0x03031009},
+    {"tcm_ddrn_bndy", 0x1b, 0x01, 0x01, CEN_RING, 0x03030408},
+    {"tcm_ddrn_gptr", 0x1c, 0x01, 0x01, CEN_RING, 0x03030402},
+    {"tcm_ddrn_func", 0x1d, 0x01, 0x01, CEN_RING, 0x03030400},
+    {"tcm_ddrn_cmsk", 0x1e, 0x01, 0x01, CEN_RING, 0x0303040a},
+    {"tcm_ddrn_lbst", 0x1f, 0x01, 0x01, CEN_RING, 0x03030404},
+    {"tcm_ddrs_bndy", 0x20, 0x01, 0x01, CEN_RING, 0x03030208},
+    {"tcm_ddrs_gptr", 0x21, 0x01, 0x01, CEN_RING, 0x03030202},
+    {"tcm_ddrs_func", 0x22, 0x01, 0x01, CEN_RING, 0x03030200},
+    {"tcm_ddrs_lbst", 0x23, 0x01, 0x01, CEN_RING, 0x03030204},
+    {"tcm_ddrs_cmsk", 0x24, 0x01, 0x01, CEN_RING, 0x0303020a},
+    {"tcn_perv_cmsk", 0x25, 0x01, 0x01, CEN_RING, 0x0203400a},
+    {"tcn_perv_lbst", 0x26, 0x01, 0x01, CEN_RING, 0x02034004},
+    {"tcn_perv_gptr", 0x27, 0x01, 0x01, CEN_RING, 0x02034002},
+    {"tcn_perv_func", 0x28, 0x01, 0x01, CEN_RING, 0x02034000},
+    {"tcn_perv_time", 0x29, 0x01, 0x01, CEN_RING, 0x02034007},
+    {"tcn_perv_FARR", 0x2a, 0x01, 0x01, CEN_RING, 0x02034009},
+    {"tcn_perv_abst", 0x2b, 0x01, 0x01, CEN_RING, 0x02034005},
+    {"tcn_mbi_FARR" , 0x2c, 0x01, 0x01, CEN_RING, 0x02032009},
+    {"tcn_mbi_time" , 0x2d, 0x01, 0x01, CEN_RING, 0x02032007},
+    {"tcn_mbi_repr" , 0x2e, 0x01, 0x01, CEN_RING, 0x02032006},
+    {"tcn_mbi_abst" , 0x2f, 0x01, 0x01, CEN_RING, 0x02032005},
+    {"tcn_mbi_regf" , 0x30, 0x01, 0x01, CEN_RING, 0x02032003},
+    {"tcn_mbi_gptr" , 0x31, 0x01, 0x01, CEN_RING, 0x02032002},
+    {"tcn_mbi_func" , 0x32, 0x01, 0x01, CEN_RING, 0x02032000},
+    {"tcn_mbi_cmsk" , 0x33, 0x01, 0x01, CEN_RING, 0x0203200a},
+    {"tcn_mbi_lbst" , 0x34, 0x01, 0x01, CEN_RING, 0x02032004},
+    {"tcn_dmi_bndy" , 0x35, 0x01, 0x01, CEN_RING, 0x02031008},
+    {"tcn_dmi_gptr" , 0x36, 0x01, 0x01, CEN_RING, 0x02031002},
+    {"tcn_dmi_func" , 0x37, 0x01, 0x01, CEN_RING, 0x02031000},
+    {"tcn_dmi_cmsk" , 0x38, 0x01, 0x01, CEN_RING, 0x0203100a},
+    {"tcn_dmi_lbst" , 0x39, 0x01, 0x01, CEN_RING, 0x02031004},
+    {"tcn_msc_gptr" , 0x3a, 0x01, 0x01, CEN_RING, 0x02030802},
+    {"tcn_msc_func" , 0x3b, 0x01, 0x01, CEN_RING, 0x02030800},
+    {"tcn_mbs_FARR" , 0x3c, 0x01, 0x01, CEN_RING, 0x02030409},
+    {"tcn_mbs_time" , 0x3d, 0x01, 0x01, CEN_RING, 0x02030407},
+    {"tcn_mbs_repr" , 0x3e, 0x01, 0x01, CEN_RING, 0x02030406},
+    {"tcn_mbs_abst" , 0x3f, 0x01, 0x01, CEN_RING, 0x02030405},
+    {"tcn_mbs_regf" , 0x40, 0x01, 0x01, CEN_RING, 0x02030403},
+    {"tcn_mbs_gptr" , 0x41, 0x01, 0x01, CEN_RING, 0x02030402},
+    {"tcn_mbs_func" , 0x42, 0x01, 0x01, CEN_RING, 0x02030400},
+    {"tcn_mbs_lbst" , 0x43, 0x01, 0x01, CEN_RING, 0x02030404},
+    {"tcn_mbs_cmsk" , 0x44, 0x01, 0x01, CEN_RING, 0x0203040a},
+    {"tcn_refr_cmsk", 0x45, 0x01, 0x01, CEN_RING, 0x0203010a},
+    {"tcn_refr_FARR", 0x46, 0x01, 0x01, CEN_RING, 0x02030109},
+    {"tcn_refr_time", 0x47, 0x01, 0x01, CEN_RING, 0x02030107},
+    {"tcn_refr_repr", 0x48, 0x01, 0x01, CEN_RING, 0x02030106},
+    {"tcn_refr_abst", 0x49, 0x01, 0x01, CEN_RING, 0x02030105},
+    {"tcn_refr_lbst", 0x4a, 0x01, 0x01, CEN_RING, 0x02030104},
+    {"tcn_refr_regf", 0x4b, 0x01, 0x01, CEN_RING, 0x02030103},
+    {"tcn_refr_gptr", 0x4c, 0x01, 0x01, CEN_RING, 0x02030102},
+    {"tcn_refr_func", 0x4d, 0x01, 0x01, CEN_RING, 0x02030100},
+    {"tcn_perv_repr", 0x4e, 0x01, 0x01, CEN_RING, 0x02034006},
+    {"tp_perv_func" , 0x4f, 0x01, 0x01, CEN_RING, 0x01034000},
+    {"tp_perv_gptr" , 0x50, 0x01, 0x01, CEN_RING, 0x01034002},
+    {"tp_perv_mode" , 0x51, 0x01, 0x01, CEN_RING, 0x01034001},
+    {"tp_perv_regf" , 0x52, 0x01, 0x01, CEN_RING, 0x01034003},
+    {"tp_perv_lbst" , 0x53, 0x01, 0x01, CEN_RING, 0x01034004},
+    {"tp_perv_abst" , 0x54, 0x01, 0x01, CEN_RING, 0x01034005},
+    {"tp_perv_repr" , 0x55, 0x01, 0x01, CEN_RING, 0x01034006},
+    {"tp_perv_time" , 0x56, 0x01, 0x01, CEN_RING, 0x01034007},
+    {"tp_perv_bndy" , 0x57, 0x01, 0x01, CEN_RING, 0x01034008},
+    {"tp_perv_farr" , 0x58, 0x01, 0x01, CEN_RING, 0x01034009},
+    {"tp_perv_cmsk" , 0x59, 0x01, 0x01, CEN_RING, 0x0103400a},
+    {"tp_pll_func"  , 0x5a, 0x01, 0x01, CEN_RING, 0x01030080},
+    {"tp_pll_gptr"  , 0x5b, 0x01, 0x01, CEN_RING, 0x01030082},
+    {"tp_net_func"  , 0x5c, 0x01, 0x01, CEN_RING, 0x00032000},
+    {"tp_net_gptr"  , 0x5d, 0x01, 0x01, CEN_RING, 0x00032002},
+    {"tp_net_abst"  , 0x5e, 0x01, 0x01, CEN_RING, 0x00032005},
+    {"tp_pib_func"  , 0x5f, 0x01, 0x01, CEN_RING, 0x00031000},
+    {"tp_pib_fuse"  , 0x60, 0x01, 0x01, CEN_RING, 0x00031005},
+    {"tp_pib_gptr"  , 0x61, 0x01, 0x01, CEN_RING, 0x00031002},
+    {"tp_pll_bndy"  , 0x62, 0x01, 0x01, CEN_RING, 0x01030088},
+    {"tp_pll_bndy_bucket_1", 0x63, 0x01, 0x01, CEN_RING, 0x01030088},
+    {"tp_pll_bndy_bucket_2", 0x64, 0x01, 0x01, CEN_RING, 0x01030088},
+    {"tp_pll_bndy_bucket_3", 0x65, 0x01, 0x01, CEN_RING, 0x01030088},
+    {"tp_pll_bndy_bucket_4", 0x66, 0x01, 0x01, CEN_RING, 0x01030088},
+    {"tp_pll_bndy_bucket_5", 0x67, 0x01, 0x01, CEN_RING, 0x01030088},
+    {"tp_pll_bndy_bucket_6", 0x68, 0x01, 0x01, CEN_RING, 0x01030088},
+    {"tp_pll_bndy_bucket_7", 0x69, 0x01, 0x01, CEN_RING, 0x01030088},
+    {"tp_pll_bndy_bucket_8", 0x6a, 0x01, 0x01, CEN_RING, 0x01030088},
 };
 
+const RingVariantOrder RING_VARIANT_ORDER[] = { RV_BASE, RV_RL, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT };
+
+}; // namespace CEN
+
+}; // namespace CEN_RID
+
 
 using namespace CEN_RID;
 
+ChipletType_t CEN_RID::ringid_get_chiplet(RingId_t i_ringId)
+{
+    return RING_PROPERTIES[i_ringId].iv_type;
+}
+
 void CEN_RID::ringid_get_chiplet_properties(
     ChipletType_t      i_chipletType,
-    ChipletData_t**    o_chipletData)
+    ChipletData_t**    o_cpltData,
+    GenRingIdList**    o_ringComm,
+    GenRingIdList**    o_ringInst,
+    RingVariantOrder** o_varOrder,
+    uint8_t*           o_numVariants)
 {
     switch (i_chipletType)
     {
         case CEN_TYPE :
-            *o_chipletData = (ChipletData_t*)&CEN::g_chipletData;
+            *o_cpltData = (ChipletData_t*)   &CEN::g_chipletData;
+            *o_ringComm = (GenRingIdList*)    CEN::RING_ID_LIST_COMMON;
+            *o_ringInst = NULL;
+            *o_varOrder = (RingVariantOrder*) CEN::RING_VARIANT_ORDER;
+            *o_numVariants = (*(*o_cpltData)).iv_num_common_ring_variants;
             break;
 
         default :
-            *o_chipletData = NULL;
+            *o_cpltData = NULL;
+            *o_ringComm = NULL;
+            *o_ringInst = NULL;
+            *o_varOrder = NULL;
+            *o_numVariants = 0;
             break;
     }
 }
+
+GenRingIdList* CEN_RID::_ringid_get_ring_list(RingId_t i_ringId)
+{
+    ChipletData_t*    l_cpltData;
+    GenRingIdList*    l_ringList[2];    // 0: common, 1: instance
+    RingVariantOrder* l_varOrder;
+    uint8_t           l_numVariants;;
+    int               i, j, n;
+
+    CEN_RID::ringid_get_chiplet_properties(
+        CEN_RID::ringid_get_chiplet(i_ringId),
+        &l_cpltData, &l_ringList[0], &l_ringList[1], &l_varOrder, &l_numVariants);
+
+    if (!l_ringList[0])
+    {
+        return NULL;
+    }
+
+    for (j = 0; j < 2; j++)     // 0: common, 1: instance
+    {
+        n = (j ? l_cpltData->iv_num_instance_rings
+             : l_cpltData->iv_num_common_rings);
+
+        for (i = 0; i < n; i++)
+        {
+            if (!strcmp(l_ringList[j][i].ringName,
+                        RING_PROPERTIES[i_ringId].iv_name))
+            {
+                return &(l_ringList[j][i]);
+            }
+        }
+    }
+
+    return NULL;
+}
diff --git a/src/import/chips/centaur/utils/imageProcs/cen_ringId.H b/src/import/chips/centaur/utils/imageProcs/cen_ringId.H
index bf097d194..6ddd397e2 100644
--- a/src/import/chips/centaur/utils/imageProcs/cen_ringId.H
+++ b/src/import/chips/centaur/utils/imageProcs/cen_ringId.H
@@ -31,14 +31,16 @@
 #include <common_ringId.H>
 #include <cen_ring_id.h>
 
-enum Chiplets
+enum CHIPLET_TYPE
 {
     CEN_TYPE,
-    CEN_NUM_CHIPLETS
+    CEN_NOOF_CHIPLETS
 };
 
 namespace CEN
 {
+extern const GenRingIdList RING_ID_LIST_COMMON[];
+extern const RingVariantOrder RING_VARIANT_ORDER[];
 
 enum RingOffset
 {
@@ -156,145 +158,264 @@ enum RingOffset
 
 static const ChipletData_t g_chipletData =
 {
-    0x01,         // Base chiplet/instance ID
-    1,            // Number of chiplet instances
+    0x01,         // Centaur chiplet ID
     NUM_RING_IDS, // Num of common rings for Centaur chiplet
     0,            // Num of instance rings for Centaur chiplet
     0,
     2,            // Num of ring variants: BASE, RL
-    { RV_BASE, RV_RL, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT }
 };
-
 }; // namespace CEN
 
 #ifndef __PPE__
 
 static const RingProperties_t RING_PROPERTIES[NUM_RING_IDS] =
 {
-    { "tcm_perv_cmsk",        0x0303400a, CEN::tcm_perv_cmsk,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_perv_lbst",        0x03034004, CEN::tcm_perv_lbst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_perv_gptr",        0x03034002, CEN::tcm_perv_gptr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_perv_func",        0x03034000, CEN::tcm_perv_func,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_perv_time",        0x03034007, CEN::tcm_perv_time,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_perv_abst",        0x03034005, CEN::tcm_perv_abst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_perv_repr",        0x03034006, CEN::tcm_perv_repr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_perv_FARR",        0x03034009, CEN::tcm_perv_FARR,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_time",        0x03032007, CEN::tcm_memn_time,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_regf",        0x03032003, CEN::tcm_memn_regf,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_gptr",        0x03032002, CEN::tcm_memn_gptr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_func",        0x03032000, CEN::tcm_memn_func,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_lbst",        0x03032004, CEN::tcm_memn_lbst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_cmsk",        0x0303200a, CEN::tcm_memn_cmsk,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_abst",        0x03032005, CEN::tcm_memn_abst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_repr",        0x03032006, CEN::tcm_memn_repr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_memn_FARR",        0x03032009, CEN::tcm_memn_FARR,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_time",        0x03031007, CEN::tcm_mems_time,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_regf",        0x03031003, CEN::tcm_mems_regf,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_gptr",        0x03031002, CEN::tcm_mems_gptr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_func",        0x03031000, CEN::tcm_mems_func,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_lbst",        0x03031004, CEN::tcm_mems_lbst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_cmsk",        0x0303100a, CEN::tcm_mems_cmsk,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_bndy",        0x03031008, CEN::tcm_mems_bndy,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_abst",        0x03031005, CEN::tcm_mems_abst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_repr",        0x03031006, CEN::tcm_mems_repr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_mems_FARR",        0x03031009, CEN::tcm_mems_FARR,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrn_bndy",        0x03030408, CEN::tcm_ddrn_bndy,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrn_gptr",        0x03030402, CEN::tcm_ddrn_gptr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrn_func",        0x03030400, CEN::tcm_ddrn_func,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrn_cmsk",        0x0303040a, CEN::tcm_ddrn_cmsk,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrn_lbst",        0x03030404, CEN::tcm_ddrn_lbst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrs_bndy",        0x03030208, CEN::tcm_ddrs_bndy,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrs_gptr",        0x03030202, CEN::tcm_ddrs_gptr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrs_func",        0x03030200, CEN::tcm_ddrs_func,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrs_lbst",        0x03030204, CEN::tcm_ddrs_lbst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcm_ddrs_cmsk",        0x0303020a, CEN::tcm_ddrs_cmsk,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_perv_cmsk",        0x0203400a, CEN::tcn_perv_cmsk,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_perv_lbst",        0x02034004, CEN::tcn_perv_lbst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_perv_gptr",        0x02034002, CEN::tcn_perv_gptr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_perv_func",        0x02034000, CEN::tcn_perv_func,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_perv_time",        0x02034007, CEN::tcn_perv_time,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_perv_FARR",        0x02034009, CEN::tcn_perv_FARR,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_perv_abst",        0x02034005, CEN::tcn_perv_abst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_FARR" ,        0x02032009, CEN::tcn_mbi_FARR ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_time" ,        0x02032007, CEN::tcn_mbi_time ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_repr" ,        0x02032006, CEN::tcn_mbi_repr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_abst" ,        0x02032005, CEN::tcn_mbi_abst ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_regf" ,        0x02032003, CEN::tcn_mbi_regf ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_gptr" ,        0x02032002, CEN::tcn_mbi_gptr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_func" ,        0x02032000, CEN::tcn_mbi_func ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_cmsk" ,        0x0203200a, CEN::tcn_mbi_cmsk ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbi_lbst" ,        0x02032004, CEN::tcn_mbi_lbst ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_dmi_bndy" ,        0x02031008, CEN::tcn_dmi_bndy ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_dmi_gptr" ,        0x02031002, CEN::tcn_dmi_gptr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_dmi_func" ,        0x02031000, CEN::tcn_dmi_func ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_dmi_cmsk" ,        0x0203100a, CEN::tcn_dmi_cmsk ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_dmi_lbst" ,        0x02031004, CEN::tcn_dmi_lbst ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_msc_gptr" ,        0x02030802, CEN::tcn_msc_gptr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_msc_func" ,        0x02030800, CEN::tcn_msc_func ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_FARR" ,        0x02030409, CEN::tcn_mbs_FARR ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_time" ,        0x02030407, CEN::tcn_mbs_time ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_repr" ,        0x02030406, CEN::tcn_mbs_repr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_abst" ,        0x02030405, CEN::tcn_mbs_abst ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_regf" ,        0x02030403, CEN::tcn_mbs_regf ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_gptr" ,        0x02030402, CEN::tcn_mbs_gptr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_func" ,        0x02030400, CEN::tcn_mbs_func ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_lbst" ,        0x02030404, CEN::tcn_mbs_lbst ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_mbs_cmsk" ,        0x0203040a, CEN::tcn_mbs_cmsk ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_cmsk",        0x0203010a, CEN::tcn_refr_cmsk,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_FARR",        0x02030109, CEN::tcn_refr_FARR,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_time",        0x02030107, CEN::tcn_refr_time,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_repr",        0x02030106, CEN::tcn_refr_repr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_abst",        0x02030105, CEN::tcn_refr_abst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_lbst",        0x02030104, CEN::tcn_refr_lbst,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_regf",        0x02030103, CEN::tcn_refr_regf,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_gptr",        0x02030102, CEN::tcn_refr_gptr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_refr_func",        0x02030100, CEN::tcn_refr_func,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tcn_perv_repr",        0x02034006, CEN::tcn_perv_repr,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_func" ,        0x01034000, CEN::tp_perv_func ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_gptr" ,        0x01034002, CEN::tp_perv_gptr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_mode" ,        0x01034001, CEN::tp_perv_mode ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_regf" ,        0x01034003, CEN::tp_perv_regf ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_lbst" ,        0x01034004, CEN::tp_perv_lbst ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_abst" ,        0x01034005, CEN::tp_perv_abst ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_repr" ,        0x01034006, CEN::tp_perv_repr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_time" ,        0x01034007, CEN::tp_perv_time ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_bndy" ,        0x01034008, CEN::tp_perv_bndy ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_farr" ,        0x01034009, CEN::tp_perv_farr ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_perv_cmsk" ,        0x0103400a, CEN::tp_perv_cmsk ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_pll_func"  ,        0x01030080, CEN::tp_pll_func  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_pll_gptr"  ,        0x01030082, CEN::tp_pll_gptr  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_net_func"  ,        0x00032000, CEN::tp_net_func  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_net_gptr"  ,        0x00032002, CEN::tp_net_gptr  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_net_abst"  ,        0x00032005, CEN::tp_net_abst  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_pib_func"  ,        0x00031000, CEN::tp_pib_func  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_pib_fuse"  ,        0x00031005, CEN::tp_pib_fuse  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_pib_gptr"  ,        0x00031002, CEN::tp_pib_gptr  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy"  ,        0x01030088, CEN::tp_pll_bndy  ,        CEN_TYPE, RCLS_ROOT_RING | RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy_bucket_1", 0x01030088, CEN::tp_pll_bndy_bucket_1, CEN_TYPE,                  RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy_bucket_2", 0x01030088, CEN::tp_pll_bndy_bucket_2, CEN_TYPE,                  RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy_bucket_3", 0x01030088, CEN::tp_pll_bndy_bucket_3, CEN_TYPE,                  RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy_bucket_4", 0x01030088, CEN::tp_pll_bndy_bucket_4, CEN_TYPE,                  RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy_bucket_5", 0x01030088, CEN::tp_pll_bndy_bucket_5, CEN_TYPE,                  RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy_bucket_6", 0x01030088, CEN::tp_pll_bndy_bucket_6, CEN_TYPE,                  RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy_bucket_7", 0x01030088, CEN::tp_pll_bndy_bucket_7, CEN_TYPE,                  RCLS_EKB_CEN_RING },
-    { "tp_pll_bndy_bucket_8", 0x01030088, CEN::tp_pll_bndy_bucket_8, CEN_TYPE,                  RCLS_EKB_CEN_RING }
+    { CEN::tcm_perv_cmsk, "tcm_perv_cmsk", CEN_TYPE },
+    { CEN::tcm_perv_lbst, "tcm_perv_lbst", CEN_TYPE },
+    { CEN::tcm_perv_gptr, "tcm_perv_gptr", CEN_TYPE },
+    { CEN::tcm_perv_func, "tcm_perv_func", CEN_TYPE },
+    { CEN::tcm_perv_time, "tcm_perv_time", CEN_TYPE },
+    { CEN::tcm_perv_abst, "tcm_perv_abst", CEN_TYPE },
+    { CEN::tcm_perv_repr, "tcm_perv_repr", CEN_TYPE },
+    { CEN::tcm_perv_FARR, "tcm_perv_FARR", CEN_TYPE },
+    { CEN::tcm_memn_time, "tcm_memn_time", CEN_TYPE },
+    { CEN::tcm_memn_regf, "tcm_memn_regf", CEN_TYPE },
+    { CEN::tcm_memn_gptr, "tcm_memn_gptr", CEN_TYPE },
+    { CEN::tcm_memn_func, "tcm_memn_func", CEN_TYPE },
+    { CEN::tcm_memn_lbst, "tcm_memn_lbst", CEN_TYPE },
+    { CEN::tcm_memn_cmsk, "tcm_memn_cmsk", CEN_TYPE },
+    { CEN::tcm_memn_abst, "tcm_memn_abst", CEN_TYPE },
+    { CEN::tcm_memn_repr, "tcm_memn_repr", CEN_TYPE },
+    { CEN::tcm_memn_FARR, "tcm_memn_FARR", CEN_TYPE },
+    { CEN::tcm_mems_time, "tcm_mems_time", CEN_TYPE },
+    { CEN::tcm_mems_regf, "tcm_mems_regf", CEN_TYPE },
+    { CEN::tcm_mems_gptr, "tcm_mems_gptr", CEN_TYPE },
+    { CEN::tcm_mems_func, "tcm_mems_func", CEN_TYPE },
+    { CEN::tcm_mems_lbst, "tcm_mems_lbst", CEN_TYPE },
+    { CEN::tcm_mems_cmsk, "tcm_mems_cmsk", CEN_TYPE },
+    { CEN::tcm_mems_bndy, "tcm_mems_bndy", CEN_TYPE },
+    { CEN::tcm_mems_abst, "tcm_mems_abst", CEN_TYPE },
+    { CEN::tcm_mems_repr, "tcm_mems_repr", CEN_TYPE },
+    { CEN::tcm_mems_FARR, "tcm_mems_FARR", CEN_TYPE },
+    { CEN::tcm_ddrn_bndy, "tcm_ddrn_bndy", CEN_TYPE },
+    { CEN::tcm_ddrn_gptr, "tcm_ddrn_gptr", CEN_TYPE },
+    { CEN::tcm_ddrn_func, "tcm_ddrn_func", CEN_TYPE },
+    { CEN::tcm_ddrn_cmsk, "tcm_ddrn_cmsk", CEN_TYPE },
+    { CEN::tcm_ddrn_lbst, "tcm_ddrn_lbst", CEN_TYPE },
+    { CEN::tcm_ddrs_bndy, "tcm_ddrs_bndy", CEN_TYPE },
+    { CEN::tcm_ddrs_gptr, "tcm_ddrs_gptr", CEN_TYPE },
+    { CEN::tcm_ddrs_func, "tcm_ddrs_func", CEN_TYPE },
+    { CEN::tcm_ddrs_lbst, "tcm_ddrs_lbst", CEN_TYPE },
+    { CEN::tcm_ddrs_cmsk, "tcm_ddrs_cmsk", CEN_TYPE },
+    { CEN::tcn_perv_cmsk, "tcn_perv_cmsk", CEN_TYPE },
+    { CEN::tcn_perv_lbst, "tcn_perv_lbst", CEN_TYPE },
+    { CEN::tcn_perv_gptr, "tcn_perv_gptr", CEN_TYPE },
+    { CEN::tcn_perv_func, "tcn_perv_func", CEN_TYPE },
+    { CEN::tcn_perv_time, "tcn_perv_time", CEN_TYPE },
+    { CEN::tcn_perv_FARR, "tcn_perv_FARR", CEN_TYPE },
+    { CEN::tcn_perv_abst, "tcn_perv_abst", CEN_TYPE },
+    { CEN::tcn_mbi_FARR , "tcn_mbi_FARR" , CEN_TYPE },
+    { CEN::tcn_mbi_time , "tcn_mbi_time" , CEN_TYPE },
+    { CEN::tcn_mbi_repr , "tcn_mbi_repr" , CEN_TYPE },
+    { CEN::tcn_mbi_abst , "tcn_mbi_abst" , CEN_TYPE },
+    { CEN::tcn_mbi_regf , "tcn_mbi_regf" , CEN_TYPE },
+    { CEN::tcn_mbi_gptr , "tcn_mbi_gptr" , CEN_TYPE },
+    { CEN::tcn_mbi_func , "tcn_mbi_func" , CEN_TYPE },
+    { CEN::tcn_mbi_cmsk , "tcn_mbi_cmsk" , CEN_TYPE },
+    { CEN::tcn_mbi_lbst , "tcn_mbi_lbst" , CEN_TYPE },
+    { CEN::tcn_dmi_bndy , "tcn_dmi_bndy" , CEN_TYPE },
+    { CEN::tcn_dmi_gptr , "tcn_dmi_gptr" , CEN_TYPE },
+    { CEN::tcn_dmi_func , "tcn_dmi_func" , CEN_TYPE },
+    { CEN::tcn_dmi_cmsk , "tcn_dmi_cmsk" , CEN_TYPE },
+    { CEN::tcn_dmi_lbst , "tcn_dmi_lbst" , CEN_TYPE },
+    { CEN::tcn_msc_gptr , "tcn_msc_gptr" , CEN_TYPE },
+    { CEN::tcn_msc_func , "tcn_msc_func" , CEN_TYPE },
+    { CEN::tcn_mbs_FARR , "tcn_mbs_FARR" , CEN_TYPE },
+    { CEN::tcn_mbs_time , "tcn_mbs_time" , CEN_TYPE },
+    { CEN::tcn_mbs_repr , "tcn_mbs_repr" , CEN_TYPE },
+    { CEN::tcn_mbs_abst , "tcn_mbs_abst" , CEN_TYPE },
+    { CEN::tcn_mbs_regf , "tcn_mbs_regf" , CEN_TYPE },
+    { CEN::tcn_mbs_gptr , "tcn_mbs_gptr" , CEN_TYPE },
+    { CEN::tcn_mbs_func , "tcn_mbs_func" , CEN_TYPE },
+    { CEN::tcn_mbs_lbst , "tcn_mbs_lbst" , CEN_TYPE },
+    { CEN::tcn_mbs_cmsk , "tcn_mbs_cmsk" , CEN_TYPE },
+    { CEN::tcn_refr_cmsk, "tcn_refr_cmsk", CEN_TYPE },
+    { CEN::tcn_refr_FARR, "tcn_refr_FARR", CEN_TYPE },
+    { CEN::tcn_refr_time, "tcn_refr_time", CEN_TYPE },
+    { CEN::tcn_refr_repr, "tcn_refr_repr", CEN_TYPE },
+    { CEN::tcn_refr_abst, "tcn_refr_abst", CEN_TYPE },
+    { CEN::tcn_refr_lbst, "tcn_refr_lbst", CEN_TYPE },
+    { CEN::tcn_refr_regf, "tcn_refr_regf", CEN_TYPE },
+    { CEN::tcn_refr_gptr, "tcn_refr_gptr", CEN_TYPE },
+    { CEN::tcn_refr_func, "tcn_refr_func", CEN_TYPE },
+    { CEN::tcn_perv_repr, "tcn_perv_repr", CEN_TYPE },
+    { CEN::tp_perv_func , "tp_perv_func" , CEN_TYPE },
+    { CEN::tp_perv_gptr , "tp_perv_gptr" , CEN_TYPE },
+    { CEN::tp_perv_mode , "tp_perv_mode" , CEN_TYPE },
+    { CEN::tp_perv_regf , "tp_perv_regf" , CEN_TYPE },
+    { CEN::tp_perv_lbst , "tp_perv_lbst" , CEN_TYPE },
+    { CEN::tp_perv_abst , "tp_perv_abst" , CEN_TYPE },
+    { CEN::tp_perv_repr , "tp_perv_repr" , CEN_TYPE },
+    { CEN::tp_perv_time , "tp_perv_time" , CEN_TYPE },
+    { CEN::tp_perv_bndy , "tp_perv_bndy" , CEN_TYPE },
+    { CEN::tp_perv_farr , "tp_perv_farr" , CEN_TYPE },
+    { CEN::tp_perv_cmsk , "tp_perv_cmsk" , CEN_TYPE },
+    { CEN::tp_pll_func  , "tp_pll_func"  , CEN_TYPE },
+    { CEN::tp_pll_gptr  , "tp_pll_gptr"  , CEN_TYPE },
+    { CEN::tp_net_func  , "tp_net_func"  , CEN_TYPE },
+    { CEN::tp_net_gptr  , "tp_net_gptr"  , CEN_TYPE },
+    { CEN::tp_net_abst  , "tp_net_abst"  , CEN_TYPE },
+    { CEN::tp_pib_func  , "tp_pib_func"  , CEN_TYPE },
+    { CEN::tp_pib_fuse  , "tp_pib_fuse"  , CEN_TYPE },
+    { CEN::tp_pib_gptr  , "tp_pib_gptr"  , CEN_TYPE },
+    { CEN::tp_pll_bndy  , "tp_pll_bndy"  , CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_1, "tp_pll_bndy_bucket_1", CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_2, "tp_pll_bndy_bucket_2", CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_3, "tp_pll_bndy_bucket_3", CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_4, "tp_pll_bndy_bucket_4", CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_5, "tp_pll_bndy_bucket_5", CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_6, "tp_pll_bndy_bucket_6", CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_7, "tp_pll_bndy_bucket_7", CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_8, "tp_pll_bndy_bucket_8", CEN_TYPE }
 };
 
 #else
 
 static const RingProperties_t RING_PROPERTIES[NUM_RING_IDS] =
 {
-    // Not needed in SBE code
+    { CEN::tcm_perv_cmsk, CEN_TYPE },
+    { CEN::tcm_perv_lbst, CEN_TYPE },
+    { CEN::tcm_perv_gptr, CEN_TYPE },
+    { CEN::tcm_perv_func, CEN_TYPE },
+    { CEN::tcm_perv_time, CEN_TYPE },
+    { CEN::tcm_perv_abst, CEN_TYPE },
+    { CEN::tcm_perv_repr, CEN_TYPE },
+    { CEN::tcm_perv_FARR, CEN_TYPE },
+    { CEN::tcm_memn_time, CEN_TYPE },
+    { CEN::tcm_memn_regf, CEN_TYPE },
+    { CEN::tcm_memn_gptr, CEN_TYPE },
+    { CEN::tcm_memn_func, CEN_TYPE },
+    { CEN::tcm_memn_lbst, CEN_TYPE },
+    { CEN::tcm_memn_cmsk, CEN_TYPE },
+    { CEN::tcm_memn_abst, CEN_TYPE },
+    { CEN::tcm_memn_repr, CEN_TYPE },
+    { CEN::tcm_memn_FARR, CEN_TYPE },
+    { CEN::tcm_mems_time, CEN_TYPE },
+    { CEN::tcm_mems_regf, CEN_TYPE },
+    { CEN::tcm_mems_gptr, CEN_TYPE },
+    { CEN::tcm_mems_func, CEN_TYPE },
+    { CEN::tcm_mems_lbst, CEN_TYPE },
+    { CEN::tcm_mems_cmsk, CEN_TYPE },
+    { CEN::tcm_mems_bndy, CEN_TYPE },
+    { CEN::tcm_mems_abst, CEN_TYPE },
+    { CEN::tcm_mems_repr, CEN_TYPE },
+    { CEN::tcm_mems_FARR, CEN_TYPE },
+    { CEN::tcm_ddrn_bndy, CEN_TYPE },
+    { CEN::tcm_ddrn_gptr, CEN_TYPE },
+    { CEN::tcm_ddrn_func, CEN_TYPE },
+    { CEN::tcm_ddrn_cmsk, CEN_TYPE },
+    { CEN::tcm_ddrn_lbst, CEN_TYPE },
+    { CEN::tcm_ddrs_bndy, CEN_TYPE },
+    { CEN::tcm_ddrs_gptr, CEN_TYPE },
+    { CEN::tcm_ddrs_func, CEN_TYPE },
+    { CEN::tcm_ddrs_lbst, CEN_TYPE },
+    { CEN::tcm_ddrs_cmsk, CEN_TYPE },
+    { CEN::tcn_perv_cmsk, CEN_TYPE },
+    { CEN::tcn_perv_lbst, CEN_TYPE },
+    { CEN::tcn_perv_gptr, CEN_TYPE },
+    { CEN::tcn_perv_func, CEN_TYPE },
+    { CEN::tcn_perv_time, CEN_TYPE },
+    { CEN::tcn_perv_FARR, CEN_TYPE },
+    { CEN::tcn_perv_abst, CEN_TYPE },
+    { CEN::tcn_mbi_FARR , CEN_TYPE },
+    { CEN::tcn_mbi_time , CEN_TYPE },
+    { CEN::tcn_mbi_repr , CEN_TYPE },
+    { CEN::tcn_mbi_abst , CEN_TYPE },
+    { CEN::tcn_mbi_regf , CEN_TYPE },
+    { CEN::tcn_mbi_gptr , CEN_TYPE },
+    { CEN::tcn_mbi_func , CEN_TYPE },
+    { CEN::tcn_mbi_cmsk , CEN_TYPE },
+    { CEN::tcn_mbi_lbst , CEN_TYPE },
+    { CEN::tcn_dmi_bndy , CEN_TYPE },
+    { CEN::tcn_dmi_gptr , CEN_TYPE },
+    { CEN::tcn_dmi_func , CEN_TYPE },
+    { CEN::tcn_dmi_cmsk , CEN_TYPE },
+    { CEN::tcn_dmi_lbst , CEN_TYPE },
+    { CEN::tcn_msc_gptr , CEN_TYPE },
+    { CEN::tcn_msc_func , CEN_TYPE },
+    { CEN::tcn_mbs_FARR , CEN_TYPE },
+    { CEN::tcn_mbs_time , CEN_TYPE },
+    { CEN::tcn_mbs_repr , CEN_TYPE },
+    { CEN::tcn_mbs_abst , CEN_TYPE },
+    { CEN::tcn_mbs_regf , CEN_TYPE },
+    { CEN::tcn_mbs_gptr , CEN_TYPE },
+    { CEN::tcn_mbs_func , CEN_TYPE },
+    { CEN::tcn_mbs_lbst , CEN_TYPE },
+    { CEN::tcn_mbs_cmsk , CEN_TYPE },
+    { CEN::tcn_refr_cmsk, CEN_TYPE },
+    { CEN::tcn_refr_FARR, CEN_TYPE },
+    { CEN::tcn_refr_time, CEN_TYPE },
+    { CEN::tcn_refr_repr, CEN_TYPE },
+    { CEN::tcn_refr_abst, CEN_TYPE },
+    { CEN::tcn_refr_lbst, CEN_TYPE },
+    { CEN::tcn_refr_regf, CEN_TYPE },
+    { CEN::tcn_refr_gptr, CEN_TYPE },
+    { CEN::tcn_refr_func, CEN_TYPE },
+    { CEN::tcn_perv_repr, CEN_TYPE },
+    { CEN::tp_perv_func , CEN_TYPE },
+    { CEN::tp_perv_gptr , CEN_TYPE },
+    { CEN::tp_perv_mode , CEN_TYPE },
+    { CEN::tp_perv_regf , CEN_TYPE },
+    { CEN::tp_perv_lbst , CEN_TYPE },
+    { CEN::tp_perv_abst , CEN_TYPE },
+    { CEN::tp_perv_repr , CEN_TYPE },
+    { CEN::tp_perv_time , CEN_TYPE },
+    { CEN::tp_perv_bndy , CEN_TYPE },
+    { CEN::tp_perv_farr , CEN_TYPE },
+    { CEN::tp_perv_cmsk , CEN_TYPE },
+    { CEN::tp_pll_func  , CEN_TYPE },
+    { CEN::tp_pll_gptr  , CEN_TYPE },
+    { CEN::tp_net_func  , CEN_TYPE },
+    { CEN::tp_net_gptr  , CEN_TYPE },
+    { CEN::tp_net_abst  , CEN_TYPE },
+    { CEN::tp_pib_func  , CEN_TYPE },
+    { CEN::tp_pib_fuse  , CEN_TYPE },
+    { CEN::tp_pib_gptr  , CEN_TYPE },
+    { CEN::tp_pll_bndy  , CEN_TYPE },
+    { CEN::tp_pib_repr  , CEN_TYPE },
+    { CEN::tp_vitl      , CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_1, CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_2, CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_3, CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_4, CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_5, CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_6, CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_7, CEN_TYPE },
+    { CEN::tp_pll_bndy_bucket_8, CEN_TYPE }
 };
 
 #endif // __PPE__
 
 
-// Returns data structures associated with chipletType
+
+// returns our own chiplet enum value for this ringId
+ChipletType_t
+ringid_get_chiplet(RingId_t i_ringId);
+
+// returns data structures defined for chiplet type
+// as determined by ringId
 void
 ringid_get_chiplet_properties(
     ChipletType_t      i_chipletType,
-    ChipletData_t**    o_chipletData);
+    ChipletData_t**    o_cpltData,
+    GenRingIdList**    o_ringComm,
+    GenRingIdList**    o_ringInst,
+    RingVariantOrder** o_varOrder,
+    uint8_t*           o_numVariants);
+
+// returns properties of a ring as determined by ringId
+GenRingIdList*
+_ringid_get_ring_list(RingId_t i_ringId);
 
 
 #endif // _CEN_RINGID_H_