diff options
| author | Bill Hoffa <wghoffa@us.ibm.com> | 2016-06-08 10:55:59 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-09-26 02:35:46 -0400 |
| commit | 9ced40288f5e2b64dee44056ddd327128db3ecb9 (patch) | |
| tree | 6b1ab386dc7c04a50dc2cf1940ab65abb541a819 /src | |
| parent | 5f647ca5442029d5c282468a6310557f3fac607c (diff) | |
| download | talos-sbe-9ced40288f5e2b64dee44056ddd327128db3ecb9.tar.gz talos-sbe-9ced40288f5e2b64dee44056ddd327128db3ecb9.zip | |
Add P9_TOR namespace to avoid naming collisions
Change-Id: I9ce499958d23e49ea26831ac3b2f1f7f6732c43a
Original-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/30241
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src')
| -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 | ||||
| -rw-r--r-- | src/import/tools/imageProcs/p9_ipl_build.C | 2 |
3 files changed, 10 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 fc2002a3..4e9353de 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_tor.C +++ b/src/import/chips/p9/utils/imageProcs/p9_tor.C @@ -40,6 +40,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. @@ -1815,3 +1818,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 83cbaa14..5c3bde16 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_tor.H +++ b/src/import/chips/p9/utils/imageProcs/p9_tor.H @@ -29,6 +29,9 @@ #include "p9_ringId.H" #include "p9_infrastruct_help.H" +namespace P9_TOR +{ + #define NUM_RING_IDS P9_NUM_RINGS typedef struct @@ -258,6 +261,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_ diff --git a/src/import/tools/imageProcs/p9_ipl_build.C b/src/import/tools/imageProcs/p9_ipl_build.C index e69ab6b6..3e372476 100644 --- a/src/import/tools/imageProcs/p9_ipl_build.C +++ b/src/import/tools/imageProcs/p9_ipl_build.C @@ -52,6 +52,8 @@ #include <p9_xip_image.h> #include <p9_tor.H> +using namespace P9_TOR; + // prefix of our debug file name const char* CHIP_TYPE = "p9_"; |
