diff options
| author | Martin Peschke <mpeschke@de.ibm.com> | 2016-07-01 12:18:25 +0200 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 16:10:16 -0500 |
| commit | ec69ba1cbb98211358fc33d4fd035fc2e9213b73 (patch) | |
| tree | 520feb4d3bd0973df5c2fb19c2f3420f8862d4a8 | |
| parent | 0df1a02ca50bfef2405962364f85c4f2a0ff0523 (diff) | |
| download | talos-hcode-ec69ba1cbb98211358fc33d4fd035fc2e9213b73.tar.gz talos-hcode-ec69ba1cbb98211358fc33d4fd035fc2e9213b73.zip | |
p9_scan_compression: RS4v2 compression version fix
The version number contained inside the RS4 magic value
should be bumped up from 1 to 2. Users need to be able to
distinguish both versions, because some encoded nibbles
have a different meaning.
Change-Id: I593b8b6991f4646a7237e9f4170433f5f0aa813b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26532
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
| -rw-r--r-- | import/chips/p9/utils/imageProcs/p9_scan_compression.C | 4 | ||||
| -rw-r--r-- | import/chips/p9/utils/imageProcs/p9_scan_compression.H | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/import/chips/p9/utils/imageProcs/p9_scan_compression.C b/import/chips/p9/utils/imageProcs/p9_scan_compression.C index 24038f5c..b5efb049 100644 --- a/import/chips/p9/utils/imageProcs/p9_scan_compression.C +++ b/import/chips/p9/utils/imageProcs/p9_scan_compression.C @@ -155,8 +155,8 @@ // unique names to support concurrent update. Most routines defined here have // some variant of 'rs4' in their names; others should be inherently unique. -#if COMPRESSED_SCAN_DATA_VERSION != 1 - #error This code assumes CompressedScanData structure version 1 layout +#if COMPRESSED_SCAN_DATA_VERSION != 2 + #error This code assumes CompressedScanData structure version 2 layout #endif void diff --git a/import/chips/p9/utils/imageProcs/p9_scan_compression.H b/import/chips/p9/utils/imageProcs/p9_scan_compression.H index 5851b368..1cf3100f 100644 --- a/import/chips/p9/utils/imageProcs/p9_scan_compression.H +++ b/import/chips/p9/utils/imageProcs/p9_scan_compression.H @@ -320,7 +320,7 @@ rs4_redundant(const CompressedScanData* i_data, int* o_redundant); /// /// This constant is required to be a #define to guarantee consistency between /// the header format and cmopiled code. -#define COMPRESSED_SCAN_DATA_VERSION 1 +#define COMPRESSED_SCAN_DATA_VERSION 2 /// The size of the CompressedScanData structure #define COMPRESSED_SCAN_DATA_SIZE (uint8_t)24 @@ -331,7 +331,7 @@ rs4_redundant(const CompressedScanData* i_data, int* o_redundant); /// @ { /// RS4 Magic -#define RS4_MAGIC (uint32_t)0x52533401 /* "RS4" + Version 0x01 */ +#define RS4_MAGIC (uint32_t)0x52533402 /* "RS4" + Version 0x02 */ /// @} |
