diff --git a/sys/contrib/dev/acpica/dbcmds.c b/sys/contrib/dev/acpica/dbcmds.c index f9a8ef321e3f..f913d4b4e2c5 100644 --- a/sys/contrib/dev/acpica/dbcmds.c +++ b/sys/contrib/dev/acpica/dbcmds.c @@ -1738,7 +1738,7 @@ AcpiDbBusWalk ( /* Exit if there is no _PRT under this device */ - Status = AcpiGetHandle (Node, METHOD_NAME__PRT, &TempNode); + Status = AcpiGetHandle (Node, METHOD_NAME__PRT, (ACPI_HANDLE *) &TempNode); if (ACPI_FAILURE (Status)) { return (AE_OK); diff --git a/sys/contrib/dev/acpica/osunixxf.c b/sys/contrib/dev/acpica/osunixxf.c index b693305cb91c..91e11fda443c 100644 --- a/sys/contrib/dev/acpica/osunixxf.c +++ b/sys/contrib/dev/acpica/osunixxf.c @@ -187,7 +187,7 @@ AcpiOsGetRootPointer ( ACPI_POINTER *Address) { - return (AeLocalGetRootPointer(Flags, Address)); + return (AeLocalGetRootPointer(Flags, (ACPI_PHYSICAL_ADDRESS *) Address)); } diff --git a/sys/contrib/dev/acpica/rsdump.c b/sys/contrib/dev/acpica/rsdump.c index 8be18b5bbb9d..d59fb92a521e 100644 --- a/sys/contrib/dev/acpica/rsdump.c +++ b/sys/contrib/dev/acpica/rsdump.c @@ -452,11 +452,11 @@ AcpiRsDumpDescriptor ( /* Strings */ case ACPI_RSD_LITERAL: - AcpiRsOutString (Name, (char *) Table->Pointer); + AcpiRsOutString (Name, (char *) (uintptr_t) Table->Pointer); break; case ACPI_RSD_STRING: - AcpiRsOutString (Name, (char *) Target); + AcpiRsOutString (Name, (char *) (uintptr_t) Target); break; /* Data items, 8/16/32/64 bit */ @@ -480,13 +480,13 @@ AcpiRsDumpDescriptor ( /* Flags: 1-bit and 2-bit flags supported */ case ACPI_RSD_1BITFLAG: - AcpiRsOutString (Name, (char *) - ((const char **) Table->Pointer)[(*(UINT8 *) Target) & 0x01]); + AcpiRsOutString (Name, (char *) (uintptr_t) + ((const char **) (uintptr_t) Table->Pointer)[(*(UINT8 *) Target) & 0x01]); break; case ACPI_RSD_2BITFLAG: - AcpiRsOutString (Name, (char *) - ((const char **) Table->Pointer)[(*(UINT8 *) Target) & 0x03]); + AcpiRsOutString (Name, (char *) (uintptr_t) + ((const char **) (uintptr_t) Table->Pointer)[(*(UINT8 *) Target) & 0x03]); break; case ACPI_RSD_SHORTLIST: diff --git a/sys/contrib/dev/acpica/utdebug.c b/sys/contrib/dev/acpica/utdebug.c index 7d78a4cda3fb..884614075134 100644 --- a/sys/contrib/dev/acpica/utdebug.c +++ b/sys/contrib/dev/acpica/utdebug.c @@ -212,14 +212,14 @@ AcpiUtTrimFunctionName ( /* All Function names are longer than 4 chars, check is safe */ - if (*(ACPI_CAST_PTR (UINT32, FunctionName)) == ACPI_PREFIX_MIXED) + if (*((UINT32 *) (uintptr_t) FunctionName) == ACPI_PREFIX_MIXED) { /* This is the case where the original source has not been modified */ return (FunctionName + 4); } - if (*(ACPI_CAST_PTR (UINT32, FunctionName)) == ACPI_PREFIX_LOWER) + if (*((UINT32 *) (uintptr_t) FunctionName) == ACPI_PREFIX_LOWER) { /* This is the case where the source has been 'linuxized' */