diff options
| author | klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-11-26 17:59:34 +0000 |
|---|---|---|
| committer | klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-11-26 17:59:34 +0000 |
| commit | e188a609341e9cdb5e6de6bf80b870e42b8a4ddc (patch) | |
| tree | a137e1e7978a523a3dd20c6115e2ccf6e6457261 /DuetPkg/EfiLdr | |
| parent | 35d297c7acce7d72863c22ddae95eb39827f3cd3 (diff) | |
| download | edk2-platforms-e188a609341e9cdb5e6de6bf80b870e42b8a4ddc.tar.xz | |
Fix bundle of issue for ICC build
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6740 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'DuetPkg/EfiLdr')
| -rw-r--r-- | DuetPkg/EfiLdr/Debug.c | 6 | ||||
| -rw-r--r-- | DuetPkg/EfiLdr/Debug.h | 2 | ||||
| -rw-r--r-- | DuetPkg/EfiLdr/EfiLdr.h | 2 | ||||
| -rw-r--r-- | DuetPkg/EfiLdr/EfiLoader.c | 4 | ||||
| -rw-r--r-- | DuetPkg/EfiLdr/PeLoader.c | 8 | ||||
| -rw-r--r-- | DuetPkg/EfiLdr/TianoDecompress.c | 1 |
6 files changed, 11 insertions, 12 deletions
diff --git a/DuetPkg/EfiLdr/Debug.c b/DuetPkg/EfiLdr/Debug.c index 2cc8c73a1e..13d9c74c46 100644 --- a/DuetPkg/EfiLdr/Debug.c +++ b/DuetPkg/EfiLdr/Debug.c @@ -65,9 +65,9 @@ PrintValue ( UINT8 Char;
for (Index = 0; Index < 8; Index++) {
- Char = (UINT8)((Value >> ((7 - Index) * 4)) & 0x0f) + '0';
+ Char = (UINT8)(((Value >> ((7 - Index) * 4)) & 0x0f) + '0');
if (Char > '9') {
- Char = Char - '0' - 10 + 'A';
+ Char = (UINT8) (Char - '0' - 10 + 'A');
}
*mCursor = Char;
mCursor += 2;
@@ -76,7 +76,7 @@ PrintValue ( VOID
PrintString (
- UINT8 *String
+ CHAR8 *String
)
{
UINT32 Index;
diff --git a/DuetPkg/EfiLdr/Debug.h b/DuetPkg/EfiLdr/Debug.h index 9939109e91..ea091774ca 100644 --- a/DuetPkg/EfiLdr/Debug.h +++ b/DuetPkg/EfiLdr/Debug.h @@ -38,7 +38,7 @@ PrintValue64 ( VOID
PrintString (
- UINT8 *String
+ CHAR8 *String
);
VOID
diff --git a/DuetPkg/EfiLdr/EfiLdr.h b/DuetPkg/EfiLdr/EfiLdr.h index 58b9c220c0..979ed1d691 100644 --- a/DuetPkg/EfiLdr/EfiLdr.h +++ b/DuetPkg/EfiLdr/EfiLdr.h @@ -89,4 +89,4 @@ VOID IN EFILDRHANDOFF *Handoff
);
-#endif //_DUET_EFI_LOADER_H_
\ No newline at end of file +#endif //_DUET_EFI_LOADER_H_
diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c index 88bce2f074..6f214d2930 100644 --- a/DuetPkg/EfiLdr/EfiLoader.c +++ b/DuetPkg/EfiLdr/EfiLoader.c @@ -40,7 +40,7 @@ EfiLoader ( )
{
BIOS_MEMORY_MAP *BiosMemoryMap;
- EFILDR_HEADER *EFILDRHeader;
+ //EFILDR_HEADER *EFILDRHeader;
EFILDR_IMAGE *EFILDRImage;
EFI_MEMORY_DESCRIPTOR EfiMemoryDescriptor[EFI_MAX_MEMORY_DESCRIPTORS];
EFI_STATUS Status;
@@ -78,7 +78,7 @@ EfiLoader ( // Get information on where the image is in memory
//
- EFILDRHeader = (EFILDR_HEADER *)(UINTN)(EFILDR_HEADER_ADDRESS);
+ //EFILDRHeader = (EFILDR_HEADER *)(UINTN)(EFILDR_HEADER_ADDRESS);
EFILDRImage = (EFILDR_IMAGE *)(UINTN)(EFILDR_HEADER_ADDRESS + sizeof(EFILDR_HEADER));
diff --git a/DuetPkg/EfiLdr/PeLoader.c b/DuetPkg/EfiLdr/PeLoader.c index 721befb32e..c4cbbe34c4 100644 --- a/DuetPkg/EfiLdr/PeLoader.c +++ b/DuetPkg/EfiLdr/PeLoader.c @@ -477,7 +477,7 @@ PrintHeader ('P'); case EFI_IMAGE_REL_BASED_LOW:
F16 = (UINT16 *) Fixup;
- *F16 = *F16 + (UINT16) Adjust;
+ *F16 = (UINT16) (*F16 + (UINT16) Adjust);
if (FixupData != NULL) {
*(UINT16 *) FixupData = *F16;
FixupData = FixupData + sizeof(UINT16);
@@ -618,19 +618,19 @@ EfiLdrPeCoffCheckImageMachineType ( Status = EFI_UNSUPPORTED;
-#if EFI32
+#ifdef EFI32
if (MachineType == EFI_IMAGE_MACHINE_IA32) {
Status = EFI_SUCCESS;
}
#endif
-#if EFIX64
+#ifdef EFIX64
if (MachineType == EFI_IMAGE_MACHINE_X64) {
Status = EFI_SUCCESS;
}
#endif
-#if EFI64
+#ifdef EFI64
if (MachineType == EFI_IMAGE_MACHINE_IA64) {
Status = EFI_SUCCESS;
}
diff --git a/DuetPkg/EfiLdr/TianoDecompress.c b/DuetPkg/EfiLdr/TianoDecompress.c index 6e4bba7b36..cac9938146 100644 --- a/DuetPkg/EfiLdr/TianoDecompress.c +++ b/DuetPkg/EfiLdr/TianoDecompress.c @@ -632,7 +632,6 @@ Returns: (VOID) }
}
- return ;
}
EFI_STATUS
|