update code to pass K8.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7536 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
hchen30 2009-02-17 09:13:35 +00:00
parent 058bf46eef
commit 309e31222f

View File

@ -106,8 +106,13 @@ GetWorker (
} }
PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb); PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);
StringTable = (UINT16 *) (IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :
mPcdDatabase->DxeDb.Init.StringTable); if (IsPeiDb) {
StringTable = (UINT16 *) (&mPcdDatabase->PeiDb.Init.StringTable[0]);
} else {
StringTable = (UINT16 *) (&mPcdDatabase->DxeDb.Init.StringTable[0]);
}
Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK; Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;
@ -118,8 +123,11 @@ GetWorker (
break; break;
case PCD_TYPE_HII: case PCD_TYPE_HII:
GuidTable = (EFI_GUID *) (IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable : if (IsPeiDb) {
mPcdDatabase->DxeDb.Init.GuidTable); GuidTable = (EFI_GUID *) (&mPcdDatabase->PeiDb.Init.GuidTable[0]);
} else {
GuidTable = (EFI_GUID *) (&mPcdDatabase->DxeDb.Init.GuidTable[0]);
}
VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset); VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);
@ -761,8 +769,12 @@ SetWorker (
PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb); PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);
StringTable = (UINT16*) (IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable : if (IsPeiDb) {
mPcdDatabase->DxeDb.Init.StringTable); StringTable = (UINT16 *) (&mPcdDatabase->PeiDb.Init.StringTable[0]);
} else {
StringTable = (UINT16 *) (&mPcdDatabase->DxeDb.Init.StringTable[0]);
}
InternalData = PcdDb + Offset; InternalData = PcdDb + Offset;
@ -789,8 +801,11 @@ SetWorker (
} }
} }
GuidTable = (EFI_GUID *)(IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable : if (IsPeiDb) {
mPcdDatabase->DxeDb.Init.GuidTable); GuidTable = (EFI_GUID *) (&mPcdDatabase->PeiDb.Init.GuidTable[0]);
} else {
GuidTable = (EFI_GUID *) (&mPcdDatabase->DxeDb.Init.GuidTable[0]);
}
VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset); VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);