From ec69ba1cbb98211358fc33d4fd035fc2e9213b73 Mon Sep 17 00:00:00 2001 From: Martin Peschke Date: Fri, 1 Jul 2016 12:18:25 +0200 Subject: 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 Tested-by: Hostboot CI Reviewed-by: Prachi Gupta Reviewed-by: Claus M. Olsen Reviewed-by: Martin Peschke --- import/chips/p9/utils/imageProcs/p9_scan_compression.C | 4 ++-- 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 */ /// @} -- cgit v1.2.3