Index: dbcmds.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/dbcmds.c,v retrieving revision 1.1.1.25 retrieving revision 1.18 diff -u -r1.1.1.25 -r1.18 --- dbcmds.c 1 Nov 2005 22:10:48 -0000 1.1.1.25 +++ dbcmds.c 3 Nov 2005 20:27:38 -0000 1.18 @@ -1734,7 +1738,7 @@ /* Exit if there is no _PRT under this device */ - Status = AcpiGetHandle (Node, METHOD_NAME__PRT, &TempNode); + Status = AcpiGetHandle (Node, METHOD_NAME__PRT, (ACPI_HANDLE *) (uintptr_t) &TempNode); if (ACPI_FAILURE (Status)) { return (AE_OK); Index: osunixxf.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/osunixxf.c,v retrieving revision 1.1.1.12 retrieving revision 1.2 diff -u -r1.1.1.12 -r1.2 --- osunixxf.c 1 Nov 2005 22:18:47 -0000 1.1.1.12 +++ osunixxf.c 1 Nov 2005 22:30:52 -0000 1.2 @@ -187,7 +187,7 @@ ACPI_POINTER *Address) { - return (AeLocalGetRootPointer(Flags, Address)); + return (AeLocalGetRootPointer(Flags, (ACPI_PHYSICAL_ADDRESS *) Address)); } Index: rsdump.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/rsdump.c,v retrieving revision 1.1.1.19 retrieving revision 1.2 diff -u -r1.1.1.19 -r1.2 --- rsdump.c 1 Nov 2005 22:11:06 -0000 1.1.1.19 +++ rsdump.c 1 Nov 2005 22:30:52 -0000 1.2 @@ -452,11 +452,11 @@ /* 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 @@ /* 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: Index: utdebug.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/utdebug.c,v retrieving revision 1.1.1.23 retrieving revision 1.2 diff -u -r1.1.1.23 -r1.2 --- utdebug.c 1 Nov 2005 22:11:09 -0000 1.1.1.23 +++ utdebug.c 1 Nov 2005 22:30:52 -0000 1.2 @@ -212,14 +212,14 @@ /* 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' */