summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>2007-02-12 08:12:05 +0000
committerxli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>2007-02-12 08:12:05 +0000
commit15f83a8852a33624902bf4476a20ac9e5f3adae5 (patch)
tree53dc5377107369741c110c471dfb459f32b00e52
parent2419bd23d2bc617af79dfd89fdbf3a05fa6251fe (diff)
downloadedk2-platforms-15f83a8852a33624902bf4476a20ac9e5f3adae5.tar.xz
Update MDE and EdkModule packages for ICC build with /W4 /WX /Ox switches, for some latest modifications break it.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2366 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--EdkModulePkg/Application/HelloWorld/HelloWorld.msa2
-rw-r--r--EdkModulePkg/Core/Dxe/Mem/Page.c11
-rw-r--r--MdePkg/Library/BaseLib/CheckSum.c4
-rw-r--r--MdePkg/Library/BaseLib/String.c8
4 files changed, 15 insertions, 10 deletions
diff --git a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
index b12337a828..85e2db15d4 100644
--- a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
+++ b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
@@ -32,7 +32,7 @@
<Keyword>UefiBootServicesTableLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
- <Keyword>UefiApplicationEntryPoint</Keyword>
+ <Keyword>UefiDriverEntryPoint</Keyword>
</LibraryClass>
</LibraryClassDefinitions>
<SourceFiles>
diff --git a/EdkModulePkg/Core/Dxe/Mem/Page.c b/EdkModulePkg/Core/Dxe/Mem/Page.c
index 47b41671bd..c4f3274906 100644
--- a/EdkModulePkg/Core/Dxe/Mem/Page.c
+++ b/EdkModulePkg/Core/Dxe/Mem/Page.c
@@ -134,8 +134,9 @@ RemoveMemoryMapEntry (
STATIC
MEMORY_MAP *
-AllocateMemoryMapEntry (
- );
+AllocateMemoryMapEntry (
+ VOID
+ );
VOID
CoreAcquireMemoryLock (
@@ -651,9 +652,11 @@ Returns:
}
}
+STATIC
MEMORY_MAP *
-AllocateMemoryMapEntry (
- )
+AllocateMemoryMapEntry (
+ VOID
+ )
/*++
Routine Description:
diff --git a/MdePkg/Library/BaseLib/CheckSum.c b/MdePkg/Library/BaseLib/CheckSum.c
index 957a2224f9..e851164998 100644
--- a/MdePkg/Library/BaseLib/CheckSum.c
+++ b/MdePkg/Library/BaseLib/CheckSum.c
@@ -47,7 +47,7 @@ CalculateSum8 (
ASSERT (Length <= (MAX_ADDRESS - ((UINTN) Buffer) + 1));
for (Sum = 0, Count = 0; Count < Length; Count++) {
- Sum = Sum + *(Buffer + Count);
+ Sum = (UINT8) (Sum + *(Buffer + Count));
}
return Sum;
@@ -126,7 +126,7 @@ CalculateSum16 (
for (Sum = 0, Count = 0; Count < Length; Count++) {
- Sum = Sum + *(Buffer + Count);
+ Sum = (UINT16) (Sum + *(Buffer + Count));
}
return Sum;
diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 402d676631..fefadc4337 100644
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -528,7 +528,7 @@ InternalCharToUpper (
)
{
if (Char >= L'a' && Char <= L'z') {
- return Char - (L'a' - L'A');
+ return (CHAR16) (Char - (L'a' - L'A'));
}
return Char;
@@ -919,7 +919,8 @@ StrHexToUint64 (
(InternalHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))
);
- Result = LShiftU64 (Result, 4) + InternalHexCharToUintn (*String);
+ Result = LShiftU64 (Result, 4);
+ Result = Result + InternalHexCharToUintn (*String);
String++;
}
@@ -1930,7 +1931,8 @@ AsciiStrHexToUint64 (
(InternalAsciiHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))
);
- Result = LShiftU64 (Result, 4) + InternalAsciiHexCharToUintn (*String);
+ Result = LShiftU64 (Result, 4);
+ Result = Result + InternalAsciiHexCharToUintn (*String);
String++;
}