From 3c075f1cff9ab57bb1a4725240eab07560d03753 Mon Sep 17 00:00:00 2001 From: Martin Peschke Date: Fri, 5 Aug 2016 15:29:36 +0200 Subject: p9_ringId / p9_ring_identification: cleanup extern declarations There is whole bunch of extern declarations in p9_ring_identification.H which refer to stuff that is actually declared in p9_ringId.C. So the right place for these extern declaration is p9_ringId.H. Moving these allows to move a couple of structure definitions, which belong to p9_ringId as well. Besides an unused structure definition is removed entirely. Having these things fall into the right places has enabled cleaning up a few include statements. This makes sure that other code doesn't pick up stuff that it doesn't need. Change-Id: I01440fd967425e6396a74c54778d179f10949160 Original-Change-Id: Ic6e8748b8b56653859d1e146ea44e19b7243fd23 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27909 Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA Reviewed-by: Prachi Gupta Reviewed-by: Martin Peschke Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30310 Reviewed-by: Sachin Gupta --- .../p9/utils/imageProcs/p9_ring_identification.H | 137 --------------------- 1 file changed, 137 deletions(-) (limited to 'src') diff --git a/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H b/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H index a5e1a9a0..0b5bfcd8 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H +++ b/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H @@ -30,143 +30,6 @@ #include #include -// General Ring ID list structure -typedef struct -{ - const char* ringName; - uint8_t ringId; - uint8_t instanceIdMin; // the min instanceId - uint8_t instanceIdMax; // the max instanceId - const char* ringNameImg; // Ring name in image: ringName + "_ring" - uint8_t vpdKeyword; - uint8_t pllCopy; // 0,1,2,3,4,5 -- No of PLL copies required - uint64_t scanRegionType; -} GenRingIdList; - -typedef struct -{ - uint16_t ring_offset; - uint16_t ring_size; -} Ring_toc_entry; - -typedef struct -{ - uint8_t variant[3]; -} RingVariantOrder; - - -namespace PERV -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace N0 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace N1 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace N2 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace N3 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace XB -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace MC -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace OB0 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace OB1 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace OB2 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace OB3 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace PCI0 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace PCI1 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace PCI2 -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace EQ -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - -namespace EC -{ -extern const GenRingIdList RING_ID_LIST_COMMON[]; -extern const GenRingIdList RING_ID_LIST_INSTANCE[]; -extern const RingVariantOrder RING_VARIANT_ORDER[]; -} - // MVPD Ring ID list structure. typedef struct { -- cgit v1.2.1