}\r
\r
PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
- StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
- mPcdDatabase->DxeDb.Init.StringTable;\r
+ StringTable = (UINT16 *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.StringTable[0] :\r
+ &mPcdDatabase->DxeDb.Init.StringTable[0]);\r
\r
Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
\r
break;\r
\r
case PCD_TYPE_HII:\r
- GuidTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
- mPcdDatabase->DxeDb.Init.GuidTable;\r
+ GuidTable = (EFI_GUID *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.GuidTable[0] :\r
+ &mPcdDatabase->DxeDb.Init.GuidTable[0]);\r
\r
VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
\r
\r
PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
\r
- StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
- mPcdDatabase->DxeDb.Init.StringTable;\r
+ StringTable = (UINT16 *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.StringTable[0] :\r
+ &mPcdDatabase->DxeDb.Init.StringTable[0]);\r
\r
InternalData = PcdDb + Offset;\r
\r
Alignment < BANNER_COLUMNS + (UINT8) LocalScreen.LeftColumn;\r
Alignment++\r
) {\r
- RowIdx = Line - (UINT8) LocalScreen.TopRow;\r
- ColumnIdx = Alignment - (UINT8) LocalScreen.LeftColumn;\r
+ RowIdx = (UINT8) (Line - (UINT8) LocalScreen.TopRow);\r
+ ColumnIdx = (UINT8) (Alignment - (UINT8) LocalScreen.LeftColumn);\r
\r
ASSERT (RowIdx < BANNER_HEIGHT);\r
ASSERT (ColumnIdx < BANNER_COLUMNS);\r