diff options
author | Bill Hoffa <wghoffa@us.ibm.com> | 2016-06-08 10:55:59 -0500 |
---|---|---|
committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-06-14 14:10:29 -0400 |
commit | d6673ab6f0f6e6166d1916261fa08ec6e1c8a1bd (patch) | |
tree | c8e1ced2f46f6dac097ac8077ea9162d7da1646a | |
parent | 918f269885f117ff35673b054a9c0c06ced63688 (diff) | |
download | talos-hostboot-d6673ab6f0f6e6166d1916261fa08ec6e1c8a1bd.tar.gz talos-hostboot-d6673ab6f0f6e6166d1916261fa08ec6e1c8a1bd.zip |
Add P9_TOR namespace to avoid naming collisions
Change-Id: I5494b98fdc439c7bf08c3f5ddd47c5285563ee99
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25509
Tested-by: Jenkins Server
Tested-by: PPE CI
Tested-by: Hostboot CI
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25513
Tested-by: FSP CI Jenkins
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
-rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_tor.C | 4 | ||||
-rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_tor.H | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/import/chips/p9/utils/imageProcs/p9_tor.C b/src/import/chips/p9/utils/imageProcs/p9_tor.C index 3e3cdaea7..afa80531d 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_tor.C +++ b/src/import/chips/p9/utils/imageProcs/p9_tor.C @@ -34,6 +34,9 @@ #include "p9_tor.H" #include "p9_xip_image.h" +namespace P9_TOR +{ + // // PPE type names: // These strings must adhere precisely to the enum of PpeType. @@ -1809,3 +1812,4 @@ int tor_get_block_of_rings ( void* i_ringSectionPt, return rc; } +}; diff --git a/src/import/chips/p9/utils/imageProcs/p9_tor.H b/src/import/chips/p9/utils/imageProcs/p9_tor.H index f1f547cf2..ea2136e17 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_tor.H +++ b/src/import/chips/p9/utils/imageProcs/p9_tor.H @@ -23,6 +23,9 @@ #include "p9_ringId.H" #include "p9_infrastruct_help.H" +namespace P9_TOR +{ + #define NUM_RING_IDS P9_NUM_RINGS typedef struct @@ -252,6 +255,6 @@ int tor_get_block_of_rings ( void* void** io_ringBlockPtr, // Addr of ring buffer uint32_t& io_ringBlockSize // size of ring data ); - +}; #endif //_P9_TOR_H_ |