| Andrew Geissler | 35238d9 | 2015-02-28 09:07:05 -0600 | [diff] [blame] | 1 | From 93266f96f39f038fc8ad396a5df316c07980f4bf Mon Sep 17 00:00:00 2001 |
| 2 | From: Dan Crowell <dcrowell@us.ibm.com> |
| 3 | Date: Sat, 28 Feb 2015 11:54:47 -0600 |
| 4 | Subject: [PATCH 3/4] Downgrade OCC Config Data Version if no FIR Master |
| 5 | |
| 6 | Change-Id: Idc48298a9c3068da2216172da474ebff93eb3839 |
| 7 | (cherry picked from commit f84f34cc5628d9e7d7d55d0e95462b3fe22d80d5) |
| 8 | --- |
| 9 | src/include/usr/hwpf/hwp/occ/occ_common.H | 2 ++ |
| 10 | src/usr/hwpf/hwp/occ/occ_common.C | 3 +++ |
| 11 | 2 files changed, 5 insertions(+), 0 deletions(-) |
| 12 | |
| 13 | diff --git a/src/include/usr/hwpf/hwp/occ/occ_common.H b/src/include/usr/hwpf/hwp/occ/occ_common.H |
| 14 | index ca7ab39..7ddb302 100644 |
| 15 | --- a/src/include/usr/hwpf/hwp/occ/occ_common.H |
| 16 | +++ b/src/include/usr/hwpf/hwp/occ/occ_common.H |
| 17 | @@ -58,6 +58,8 @@ namespace HBOCC |
| 18 | enum |
| 19 | { |
| 20 | OccHostDataVersion = 3, |
| 21 | + PRE_FIR_MASTER_VERSION = 2, |
| 22 | + |
| 23 | OCC_LIDID = 0x81e00430, |
| 24 | OCC_IBSCOM_RANGE_IN_MB = MEGABYTE, |
| 25 | |
| 26 | diff --git a/src/usr/hwpf/hwp/occ/occ_common.C b/src/usr/hwpf/hwp/occ/occ_common.C |
| 27 | index 98e6382..0373727 100644 |
| 28 | --- a/src/usr/hwpf/hwp/occ/occ_common.C |
| 29 | +++ b/src/usr/hwpf/hwp/occ/occ_common.C |
| 30 | @@ -170,6 +170,9 @@ namespace HBOCC |
| 31 | } |
| 32 | #else |
| 33 | config_data->firMaster = 0; |
| 34 | + //force to an older version so we can support |
| 35 | + // older levels of OCC |
| 36 | + config_data->version = PRE_FIR_MASTER_VERSION; |
| 37 | #endif |
| 38 | |
| 39 | TRACUCOMP( g_fapiTd, |
| 40 | -- |
| 41 | 1.7.4.1 |
| 42 | |