Fix some errors detected by the GCC 4.4 compiler.

Signed-off-by: lpleahy

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13007 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lpleahy
2012-02-10 03:46:25 +00:00
parent 826f9005c2
commit d3a595ceb9
15 changed files with 59 additions and 40 deletions

View File

@@ -28,7 +28,9 @@ Intel Corporation.
#include <IndustryStandard/Acpi10.h>
#include <IndustryStandard/Acpi30.h>
#if defined(_MSC_VER) // Handle Microsoft VC++ compiler specifics.
#pragma warning ( disable : 4305 )
#endif // defined(_MSC_VER)
//
// Ensure proper structure formats
@@ -848,7 +850,7 @@ AcpiDsdtPage (
Status = EFI_NOT_FOUND;
break;
}
pDsdt = (VOID *)pFadt->XDsdt;
pDsdt = (VOID *)(UINTN)pFadt->XDsdt;
//
// Send the page and table header
@@ -895,7 +897,7 @@ AcpiDsdtPage (
pPort,
"OEMID",
sizeof ( pDsdt->OemId ),
&pDsdt->OemId[ 0 ]);
(CONST CHAR8 *)&pDsdt->OemId[ 0 ]);
if ( EFI_ERROR ( Status )) {
break;
}
@@ -903,7 +905,7 @@ AcpiDsdtPage (
pPort,
"OEM Table ID",
sizeof ( pDsdt->OemTableId ),
&pDsdt->OemTableId[ 0 ]);
(CONST CHAR8 *)&pDsdt->OemTableId[ 0 ]);
if ( EFI_ERROR ( Status )) {
break;
}
@@ -1039,7 +1041,7 @@ AcpiFadtPage (
pPort,
"OEMID",
sizeof ( pFadt->OemId ),
&pFadt->OemId[ 0 ]);
(CONST CHAR8 *)&pFadt->OemId[ 0 ]);
if ( EFI_ERROR ( Status )) {
break;
}
@@ -1047,7 +1049,7 @@ AcpiFadtPage (
pPort,
"OEM Table ID",
sizeof ( pFadt->OemTableId ),
&pFadt->OemTableId[ 0 ]);
(CONST CHAR8 *)&pFadt->OemTableId[ 0 ]);
if ( EFI_ERROR ( Status )) {
break;
}
@@ -1576,7 +1578,7 @@ AcpiRsdp10Page (
pPort,
"OemId",
sizeof ( pRsdp10b->OemId ),
&pRsdp10b->OemId[ 0 ]);
(CONST CHAR8 *)&pRsdp10b->OemId[ 0 ]);
if ( EFI_ERROR ( Status )) {
break;
}
@@ -1679,7 +1681,7 @@ AcpiRsdp30Page (
pPort,
"OemId",
sizeof ( pRsdp30->OemId ),
&pRsdp30->OemId[ 0 ]);
(CONST CHAR8 *)&pRsdp30->OemId[ 0 ]);
if ( EFI_ERROR ( Status )) {
break;
}
@@ -1709,7 +1711,7 @@ AcpiRsdp30Page (
Status = RowPointer ( SocketFD,
pPort,
"XsdtAddress",
(VOID *)pRsdp30->XsdtAddress,
(VOID *)(UINTN)pRsdp30->XsdtAddress,
NULL );
if ( EFI_ERROR ( Status )) {
break;
@@ -1833,7 +1835,7 @@ AcpiRsdtPage (
pPort,
"OEMID",
sizeof ( pRsdt->OemId ),
&pRsdt->OemId[ 0 ]);
(CONST CHAR8 *)&pRsdt->OemId[ 0 ]);
if ( EFI_ERROR ( Status )) {
break;
}
@@ -1841,7 +1843,7 @@ AcpiRsdtPage (
pPort,
"OEM Table ID",
sizeof ( pRsdt->OemTableId ),
&pRsdt->OemTableId[ 0 ]);
(CONST CHAR8 *)&pRsdt->OemTableId[ 0 ]);
if ( EFI_ERROR ( Status )) {
break;
}

View File

@@ -151,7 +151,7 @@ DhcpOptionsPage (
Status = gBS->OpenProtocol ( *pHandle,
// Dhcp4Handle,
&gEfiDhcp4ProtocolGuid,
&pDhcp4,
(VOID **)&pDhcp4,
NULL,
gImageHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL );

View File

@@ -918,7 +918,7 @@ HttpSendDump (
Status = HttpSendHexBits ( SocketFD,
pPort,
sizeof ( pData ) * 8,
(UINT64)pData );
(UINT64)(UINTN)pData );
if ( EFI_ERROR ( Status )) {
break;
}
@@ -1663,25 +1663,25 @@ HttpSendValue (
CONST UINT64 * pEnd;
CONST UINT64 * pDivisor;
CONST UINT64 pDivisors[ ] = {
10000000000000000000L,
1000000000000000000L,
100000000000000000L,
10000000000000000L,
1000000000000000L,
100000000000000L,
10000000000000L,
1000000000000L,
100000000000L,
10000000000L,
1000000000L,
100000000L,
10000000L,
1000000L,
100000L,
10000L,
1000L,
100L,
10L
10000000000000000000ULL,
1000000000000000000ULL,
100000000000000000ULL,
10000000000000000ULL,
1000000000000000ULL,
100000000000000ULL,
10000000000000ULL,
1000000000000ULL,
100000000000ULL,
10000000000ULL,
1000000000ULL,
100000000ULL,
10000000ULL,
1000000ULL,
100000ULL,
10000ULL,
1000ULL,
100ULL,
10ULL
};
EFI_STATUS Status;
UINT64 Temp;

View File

@@ -358,7 +358,7 @@ RowPointer (
Status = HttpSendHexBits ( SocketFD,
pPort,
sizeof ( pAddress ) * 8,
(UINT64) pAddress );
(UINT64)(UINTN)pAddress );
if ( EFI_ERROR ( Status )) {
break;
}
@@ -586,7 +586,7 @@ TableHeader (
Status = HttpSendHexBits ( SocketFD,
pPort,
sizeof ( pTable ) * 8,
(UINT64)pTable );
(UINT64)(UINTN)pTable );
if ( EFI_ERROR ( Status )) {
break;
}

View File

@@ -34,8 +34,10 @@
#include <sys/poll.h>
#include <sys/socket.h>
#if defined(_MSC_VER) // Handle Microsoft VC++ compiler specifics.
#pragma warning ( disable : 4054 )
#pragma warning ( disable : 4152 )
#endif // defined(_MSC_VER)
//------------------------------------------------------------------------------
// Pages