diff options
| author | lpleahy <lpleahy@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-02-17 23:45:45 +0000 |
|---|---|---|
| committer | lpleahy <lpleahy@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-02-17 23:45:45 +0000 |
| commit | 53c31c516489d4cd46d20d59a3705720be3443f1 (patch) | |
| tree | fb25082296530930d1bc195b3f7d7c70eaa24a1d /AppPkg/Applications/Sockets/WebServer/ACPI.c | |
| parent | 7700f0f5c0ab90bf052e33fa0ddd2f2aa7e7893e (diff) | |
| download | edk2-53c31c516489d4cd46d20d59a3705720be3443f1.tar.gz edk2-53c31c516489d4cd46d20d59a3705720be3443f1.tar.bz2 edk2-53c31c516489d4cd46d20d59a3705720be3443f1.zip | |
Fix the errors detected by the GCC compiler:
* Add EFIAPI to the timer callbacks
* Fix 32-bit pointer casts
Signed-off-by: lpleahy
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13024 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'AppPkg/Applications/Sockets/WebServer/ACPI.c')
| -rw-r--r-- | AppPkg/Applications/Sockets/WebServer/ACPI.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/AppPkg/Applications/Sockets/WebServer/ACPI.c b/AppPkg/Applications/Sockets/WebServer/ACPI.c index 18321d2b12..7387439f59 100644 --- a/AppPkg/Applications/Sockets/WebServer/ACPI.c +++ b/AppPkg/Applications/Sockets/WebServer/ACPI.c @@ -180,14 +180,14 @@ LocateRsdt ( //
Status = EfiGetSystemConfigurationTable ( &gEfiAcpiTableGuid, (VOID **)&pRsdp30 );
if ( !EFI_ERROR ( Status )) {
- pRsdt = (ACPI_RSDT *)pRsdp30->RsdtAddress;
+ pRsdt = (ACPI_RSDT *)(UINTN)pRsdp30->RsdtAddress;
}
else {
Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&pRsdp10b );
if ( EFI_ERROR ( Status )) {
break;
}
- pRsdt = (ACPI_RSDT *)pRsdp10b->RsdtAddress;
+ pRsdt = (ACPI_RSDT *)(UINTN)pRsdp10b->RsdtAddress;
}
break;
}
@@ -229,14 +229,14 @@ LocateTable ( //
Status = EfiGetSystemConfigurationTable ( &gEfiAcpiTableGuid, (VOID **)&pRsdp30 );
if ( !EFI_ERROR ( Status )) {
- pRsdt = (ACPI_RSDT *)pRsdp30->RsdtAddress;
+ pRsdt = (ACPI_RSDT *)(UINTN)pRsdp30->RsdtAddress;
}
else {
Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&pRsdp10b );
if ( EFI_ERROR ( Status )) {
break;
}
- pRsdt = (ACPI_RSDT *)pRsdp10b->RsdtAddress;
+ pRsdt = (ACPI_RSDT *)(UINTN)pRsdp10b->RsdtAddress;
}
//
@@ -249,9 +249,9 @@ LocateTable ( // The entry is actually a 32-bit physical table address
// The first entry in the table is the 32-bit table signature
//
- pSignature = (UINT32 *)*pEntry;
+ pSignature = (UINT32 *)(UINTN)*pEntry;
if ( *pSignature == Signature ) {
- return (CONST VOID *) *pEntry;
+ return (CONST VOID *)(UINTN)*pEntry;
}
//
@@ -1082,7 +1082,7 @@ AcpiFadtPage ( Status = RowPointer ( SocketFD,
pPort,
"FIRMWARE_CTRL",
- (CONST VOID *)pFadt->FirmwareCtrl,
+ (CONST VOID *)(UINTN)pFadt->FirmwareCtrl,
NULL );
if ( EFI_ERROR ( Status )) {
break;
@@ -1090,7 +1090,7 @@ AcpiFadtPage ( Status = RowPointer ( SocketFD,
pPort,
"DSDT",
- (CONST VOID *)pFadt->DSDT,
+ (CONST VOID *)(UINTN)pFadt->DSDT,
( pFadt->DSDT == pFadt->XDsdt ) ? PAGE_ACPI_DSDT : NULL );
if ( EFI_ERROR ( Status )) {
break;
@@ -1593,7 +1593,7 @@ AcpiRsdp10Page ( Status = RowPointer ( SocketFD,
pPort,
"RsdtAddress",
- (VOID *)pRsdp10b->RsdtAddress,
+ (VOID *)(UINTN)pRsdp10b->RsdtAddress,
PAGE_ACPI_RSDT );
if ( EFI_ERROR ( Status )) {
break;
@@ -1696,7 +1696,7 @@ AcpiRsdp30Page ( Status = RowPointer ( SocketFD,
pPort,
"RsdtAddress",
- (VOID *)pRsdp30->RsdtAddress,
+ (VOID *)(UINTN)pRsdp30->RsdtAddress,
PAGE_ACPI_RSDT );
if ( EFI_ERROR ( Status )) {
break;
@@ -1881,7 +1881,7 @@ AcpiRsdtPage ( // The entry is actually a 32-bit physical table address
// The first entry in the table is the 32-bit table signature
//
- TableName[ 0 ] = *(UINT32 *)*pEntry;
+ TableName[ 0 ] = *(UINT32 *)(UINTN)*pEntry;
pWebPage = SignatureLookup ( &TableName[ 0 ], &pTableName );
//
@@ -1890,7 +1890,7 @@ AcpiRsdtPage ( Status = RowPointer ( SocketFD,
pPort,
pTableName,
- (VOID *)*pEntry,
+ (VOID *)(UINTN)*pEntry,
pWebPage );
if ( EFI_ERROR ( Status )) {
break;
|