* 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
@param [in] pContext Context for this routine\r
**/\r
VOID\r
@param [in] pContext Context for this routine\r
**/\r
VOID\r
TimerCallback (\r
IN EFI_EVENT Event,\r
IN VOID * pContext\r
TimerCallback (\r
IN EFI_EVENT Event,\r
IN VOID * pContext\r
@param [in] pContext Context for this routine\r
**/\r
VOID\r
@param [in] pContext Context for this routine\r
**/\r
VOID\r
TimerCallback (\r
IN EFI_EVENT Event,\r
IN VOID * pContext\r
TimerCallback (\r
IN EFI_EVENT Event,\r
IN VOID * pContext\r
Print ( L"ERROR - network not found, errno: %d\r\n", errno );\r
}\r
else {\r
Print ( L"ERROR - network not found, errno: %d\r\n", errno );\r
}\r
else {\r
- pIpAddress = (UINT8 *)pNetwork->n_net;\r
+ pIpAddress = (UINT8 *)(UINTN)&pNetwork->n_net;\r
Print ( L"%a: Type %d, %d.%d.%d.%d\r\n",\r
pNetwork->n_name,\r
pNetwork->n_addrtype,\r
Print ( L"%a: Type %d, %d.%d.%d.%d\r\n",\r
pNetwork->n_name,\r
pNetwork->n_addrtype,\r
//\r
Status = EfiGetSystemConfigurationTable ( &gEfiAcpiTableGuid, (VOID **)&pRsdp30 );\r
if ( !EFI_ERROR ( Status )) {\r
//\r
Status = EfiGetSystemConfigurationTable ( &gEfiAcpiTableGuid, (VOID **)&pRsdp30 );\r
if ( !EFI_ERROR ( Status )) {\r
- pRsdt = (ACPI_RSDT *)pRsdp30->RsdtAddress;\r
+ pRsdt = (ACPI_RSDT *)(UINTN)pRsdp30->RsdtAddress;\r
}\r
else {\r
Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&pRsdp10b );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
}\r
}\r
else {\r
Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&pRsdp10b );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
}\r
- pRsdt = (ACPI_RSDT *)pRsdp10b->RsdtAddress;\r
+ pRsdt = (ACPI_RSDT *)(UINTN)pRsdp10b->RsdtAddress;\r
//\r
Status = EfiGetSystemConfigurationTable ( &gEfiAcpiTableGuid, (VOID **)&pRsdp30 );\r
if ( !EFI_ERROR ( Status )) {\r
//\r
Status = EfiGetSystemConfigurationTable ( &gEfiAcpiTableGuid, (VOID **)&pRsdp30 );\r
if ( !EFI_ERROR ( Status )) {\r
- pRsdt = (ACPI_RSDT *)pRsdp30->RsdtAddress;\r
+ pRsdt = (ACPI_RSDT *)(UINTN)pRsdp30->RsdtAddress;\r
}\r
else {\r
Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&pRsdp10b );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
}\r
}\r
else {\r
Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&pRsdp10b );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
}\r
- pRsdt = (ACPI_RSDT *)pRsdp10b->RsdtAddress;\r
+ pRsdt = (ACPI_RSDT *)(UINTN)pRsdp10b->RsdtAddress;\r
// The entry is actually a 32-bit physical table address\r
// The first entry in the table is the 32-bit table signature\r
//\r
// The entry is actually a 32-bit physical table address\r
// The first entry in the table is the 32-bit table signature\r
//\r
- pSignature = (UINT32 *)*pEntry;\r
+ pSignature = (UINT32 *)(UINTN)*pEntry;\r
if ( *pSignature == Signature ) {\r
if ( *pSignature == Signature ) {\r
- return (CONST VOID *) *pEntry;\r
+ return (CONST VOID *)(UINTN)*pEntry;\r
Status = RowPointer ( SocketFD,\r
pPort,\r
"FIRMWARE_CTRL",\r
Status = RowPointer ( SocketFD,\r
pPort,\r
"FIRMWARE_CTRL",\r
- (CONST VOID *)pFadt->FirmwareCtrl,\r
+ (CONST VOID *)(UINTN)pFadt->FirmwareCtrl,\r
NULL );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
NULL );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
Status = RowPointer ( SocketFD,\r
pPort,\r
"DSDT",\r
Status = RowPointer ( SocketFD,\r
pPort,\r
"DSDT",\r
- (CONST VOID *)pFadt->DSDT,\r
+ (CONST VOID *)(UINTN)pFadt->DSDT,\r
( pFadt->DSDT == pFadt->XDsdt ) ? PAGE_ACPI_DSDT : NULL );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
( pFadt->DSDT == pFadt->XDsdt ) ? PAGE_ACPI_DSDT : NULL );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
Status = RowPointer ( SocketFD,\r
pPort,\r
"RsdtAddress",\r
Status = RowPointer ( SocketFD,\r
pPort,\r
"RsdtAddress",\r
- (VOID *)pRsdp10b->RsdtAddress,\r
+ (VOID *)(UINTN)pRsdp10b->RsdtAddress,\r
PAGE_ACPI_RSDT );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
PAGE_ACPI_RSDT );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
Status = RowPointer ( SocketFD,\r
pPort,\r
"RsdtAddress",\r
Status = RowPointer ( SocketFD,\r
pPort,\r
"RsdtAddress",\r
- (VOID *)pRsdp30->RsdtAddress,\r
+ (VOID *)(UINTN)pRsdp30->RsdtAddress,\r
PAGE_ACPI_RSDT );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
PAGE_ACPI_RSDT );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
// The entry is actually a 32-bit physical table address\r
// The first entry in the table is the 32-bit table signature\r
//\r
// The entry is actually a 32-bit physical table address\r
// The first entry in the table is the 32-bit table signature\r
//\r
- TableName[ 0 ] = *(UINT32 *)*pEntry;\r
+ TableName[ 0 ] = *(UINT32 *)(UINTN)*pEntry;\r
pWebPage = SignatureLookup ( &TableName[ 0 ], &pTableName );\r
\r
//\r
pWebPage = SignatureLookup ( &TableName[ 0 ], &pTableName );\r
\r
//\r
Status = RowPointer ( SocketFD,\r
pPort,\r
pTableName,\r
Status = RowPointer ( SocketFD,\r
pPort,\r
pTableName,\r
+ (VOID *)(UINTN)*pEntry,\r
pWebPage );\r
if ( EFI_ERROR ( Status )) {\r
break;\r
pWebPage );\r
if ( EFI_ERROR ( Status )) {\r
break;\r