From 2b34c3fe630ca813f15fe198caf971cd6a92c775 Mon Sep 17 00:00:00 2001 From: qwang12 Date: Tue, 23 Jan 2007 08:28:43 +0000 Subject: [PATCH] Corrected a small bugs: The macro name generated in autogen should match that in the Service.h. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2281 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/Universal/PCD/Dxe/Service.h | 4 ++-- EdkModulePkg/Universal/PCD/Pei/Service.h | 4 ++-- .../GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h index bfeb81db71..8796affeb2 100644 --- a/EdkModulePkg/Universal/PCD/Dxe/Service.h +++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h @@ -22,13 +22,13 @@ Module Name: Service.h // Please make sure the PCD Serivce PEIM Version is consistent with // the version of PCD Database generation tool // -#define PCD_DXE_SERVICE_DRIVER_VERSION 2 +#define PCD_SERVICE_DXE_DRIVER_VERSION 2 // // PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h // and generated by PCD Database generation tool. // -#if (PCD_DXE_SERVICE_PEIM_VERSION != PCD_DXE_DATABASE_GENTOOL_VERSION) +#if (PCD_SERVICE_DXE_DRIVER_VERSION != PCD_DXE_SERVICE_DRIVER_AUTOGEN_VERSION) #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches" #endif diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.h b/EdkModulePkg/Universal/PCD/Pei/Service.h index 39737acb83..674197b0cf 100644 --- a/EdkModulePkg/Universal/PCD/Pei/Service.h +++ b/EdkModulePkg/Universal/PCD/Pei/Service.h @@ -22,13 +22,13 @@ Module Name: Service.h // Please make sure the PCD Serivce PEIM Version is consistent with // the version of PCD Database generation tool // -#define PCD_PEI_SERVICE_DRIVER_VERSION 2 +#define PCD_SERVICE_PEIM_VERSION 2 // // PCD_PEI_DATABASE_GENTOOL_VERSION is defined in Autogen.h // and generated by PCD Database generation tool. // -#if (PCD_PEI_SERVICE_PEIM_VERSION != PCD_PEI_DATABASE_GENTOOL_VERSION) +#if (PCD_SERVICE_PEIM_VERSION != PCD_PEI_SERVICE_DRIVER_AUTOGEN_VERSION ) #error "Please make sure the version of PCD Service PEIM and PCD PEI Database Generation Tool matches" #endif diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java index e03317b633..d848d1f561 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java @@ -1205,7 +1205,7 @@ public class PcdDatabase { hString += result.get("initDeclStr"); hString += result.get("uninitDeclStr"); - hString += String.format("#define PCD_%s_SERVICE_DRIVER_VERSION %d", phase, version); + hString += String.format("#define PCD_%s_SERVICE_DRIVER_AUTOGEN_VERSION %d", phase, version); cString = newLine + newLine + result.get("initInstStr"); -- 2.39.2