diff -ur acpica-unix-20051202.old/compiler/aslcompiler.h acpica-unix-20051202/compiler/aslcompiler.h --- acpica-unix-20051202.old/compiler/aslcompiler.h Fri Dec 2 18:27:09 2005 +++ acpica-unix-20051202/compiler/aslcompiler.h Mon Dec 5 15:34:36 2005 @@ -310,7 +310,7 @@ ACPI_STATUS AeLocalGetRootPointer ( UINT32 Flags, - ACPI_PHYSICAL_ADDRESS *RsdpPhysicalAddress); + ACPI_POINTER *Address); /* diff -ur acpica-unix-20051202.old/compiler/asllisting.c acpica-unix-20051202/compiler/asllisting.c --- acpica-unix-20051202.old/compiler/asllisting.c Fri Dec 2 18:27:10 2005 +++ acpica-unix-20051202/compiler/asllisting.c Mon Dec 5 15:34:36 2005 @@ -367,7 +367,7 @@ { UINT8 FileByte; UINT32 i; - UINT32 FileId = (UINT32) Context; + UINT32 FileId = (UINT32) ACPI_TO_INTEGER (Context); LsWriteNodeToListing (Op, FileId); diff -ur acpica-unix-20051202.old/compiler/aslstubs.c acpica-unix-20051202/compiler/aslstubs.c --- acpica-unix-20051202.old/compiler/aslstubs.c Fri Dec 2 18:27:11 2005 +++ acpica-unix-20051202/compiler/aslstubs.c Mon Dec 5 15:34:36 2005 @@ -132,7 +132,7 @@ ACPI_STATUS AeLocalGetRootPointer ( UINT32 Flags, - ACPI_PHYSICAL_ADDRESS *RsdpPhysicalAddress) + ACPI_POINTER *Address) { return AE_ERROR; } diff -ur acpica-unix-20051202.old/debugger/dbfileio.c acpica-unix-20051202/debugger/dbfileio.c --- acpica-unix-20051202.old/debugger/dbfileio.c Fri Dec 2 18:27:12 2005 +++ acpica-unix-20051202/debugger/dbfileio.c Mon Dec 5 15:35:25 2005 @@ -140,6 +140,8 @@ /* Local prototypes */ +#ifdef ACPI_APPLICATION + static ACPI_STATUS AcpiDbCheckTextModeCorruption ( UINT8 *Table, @@ -150,6 +152,7 @@ AeLocalLoadTable ( ACPI_TABLE_HEADER *TablePtr); +#endif /******************************************************************************* * diff -ur acpica-unix-20051202.old/disassembler/dmopcode.c acpica-unix-20051202/disassembler/dmopcode.c --- acpica-unix-20051202.old/disassembler/dmopcode.c Fri Dec 2 18:27:13 2005 +++ acpica-unix-20051202/disassembler/dmopcode.c Mon Dec 5 15:35:41 2005 @@ -346,8 +346,8 @@ } else { - AcpiOsPrintf ("%s", (char *) - AcpiGbl_MatchOps[(ACPI_SIZE) Op->Common.Value.Integer]); + AcpiOsPrintf ("%s", + ACPI_CAST_PTR (char, AcpiGbl_MatchOps[(ACPI_SIZE) Op->Common.Value.Integer])); } } diff -ur acpica-unix-20051202.old/hardware/hwregs.c acpica-unix-20051202/hardware/hwregs.c --- acpica-unix-20051202.old/hardware/hwregs.c Fri Dec 2 18:27:15 2005 +++ acpica-unix-20051202/hardware/hwregs.c Mon Dec 5 15:35:58 2005 @@ -236,7 +236,7 @@ Info.Parameters = NULL; Info.ReturnObject = NULL; - SleepStateName = (char *) AcpiGbl_SleepStateNames[SleepState]; + SleepStateName = ACPI_CAST_PTR (char, AcpiGbl_SleepStateNames[SleepState]); Status = AcpiNsEvaluateByName (SleepStateName, &Info); if (ACPI_FAILURE (Status)) diff -ur acpica-unix-20051202.old/include/acmacros.h acpica-unix-20051202/include/acmacros.h --- acpica-unix-20051202.old/include/acmacros.h Fri Dec 2 18:27:16 2005 +++ acpica-unix-20051202/include/acmacros.h Mon Dec 5 15:33:00 2005 @@ -193,8 +193,13 @@ /* Pointer manipulation */ +#ifdef ACPI_USE_UINTPTR_TYPE +#define ACPI_CAST_PTR(t, p) ((t *)(uintptr_t)(p)) +#define ACPI_CAST_INDIRECT_PTR(t, p) ((t **)(uintptr_t)(p)) +#else #define ACPI_CAST_PTR(t, p) ((t *)(void *)(p)) #define ACPI_CAST_INDIRECT_PTR(t, p) ((t **)(void *)(p)) +#endif #define ACPI_ADD_PTR(t,a,b) ACPI_CAST_PTR (t, (ACPI_CAST_PTR (UINT8, (a)) + (ACPI_NATIVE_UINT)(b))) #define ACPI_PTR_DIFF(a,b) (ACPI_NATIVE_UINT) ((char *)(a) - (char *)(b)) diff -ur acpica-unix-20051202.old/include/platform/acfreebsd.h acpica-unix-20051202/include/platform/acfreebsd.h --- acpica-unix-20051202.old/include/platform/acfreebsd.h Fri Dec 2 18:27:19 2005 +++ acpica-unix-20051202/include/platform/acfreebsd.h Mon Dec 5 15:33:00 2005 @@ -169,6 +169,11 @@ /* Always use FreeBSD code over our local versions */ #define ACPI_USE_SYSTEM_CLIBRARY +#define ACPI_USE_LOCAL_CACHE +#define ACPI_USE_UINTPTR_TYPE + +#define __cdecl + #ifdef _KERNEL /* Or strstr (used in debugging mode, also move to libkern) */ static __inline char * diff -ur acpica-unix-20051202.old/osunixxf.c acpica-unix-20051202/osunixxf.c --- acpica-unix-20051202.old/osunixxf.c Fri Dec 2 18:27:25 2005 +++ acpica-unix-20051202/osunixxf.c Mon Dec 5 15:34:11 2005 @@ -190,7 +190,7 @@ ACPI_POINTER *Address) { - return (AeLocalGetRootPointer (Flags, (ACPI_PHYSICAL_ADDRESS *) Address)); + return (AeLocalGetRootPointer (Flags, Address)); } diff -ur acpica-unix-20051202.old/resources/rsinfo.c acpica-unix-20051202/resources/rsinfo.c --- acpica-unix-20051202.old/resources/rsinfo.c Fri Dec 2 18:27:26 2005 +++ acpica-unix-20051202/resources/rsinfo.c Mon Dec 5 15:36:15 2005 @@ -255,36 +255,36 @@ { /* Small descriptors */ - {0}, - {0}, - {0}, - {0}, - {ACPI_RS_SIZE (ACPI_RESOURCE_IRQ)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_DMA)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_START_DEPENDENT)}, - {ACPI_RS_SIZE_MIN}, - {ACPI_RS_SIZE (ACPI_RESOURCE_IO)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_FIXED_IO)}, - {0}, - {0}, - {0}, - {0}, - {ACPI_RS_SIZE (ACPI_RESOURCE_VENDOR)}, - {ACPI_RS_SIZE_MIN}, + 0, + 0, + 0, + 0, + ACPI_RS_SIZE (ACPI_RESOURCE_IRQ), + ACPI_RS_SIZE (ACPI_RESOURCE_DMA), + ACPI_RS_SIZE (ACPI_RESOURCE_START_DEPENDENT), + ACPI_RS_SIZE_MIN, + ACPI_RS_SIZE (ACPI_RESOURCE_IO), + ACPI_RS_SIZE (ACPI_RESOURCE_FIXED_IO), + 0, + 0, + 0, + 0, + ACPI_RS_SIZE (ACPI_RESOURCE_VENDOR), + ACPI_RS_SIZE_MIN, /* Large descriptors */ - {0}, - {ACPI_RS_SIZE (ACPI_RESOURCE_MEMORY24)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_GENERIC_REGISTER)}, - {0}, - {ACPI_RS_SIZE (ACPI_RESOURCE_VENDOR)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_MEMORY32)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_FIXED_MEMORY32)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_ADDRESS32)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_ADDRESS16)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_EXTENDED_IRQ)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_ADDRESS64)}, - {ACPI_RS_SIZE (ACPI_RESOURCE_EXTENDED_ADDRESS64)} + 0, + ACPI_RS_SIZE (ACPI_RESOURCE_MEMORY24), + ACPI_RS_SIZE (ACPI_RESOURCE_GENERIC_REGISTER), + 0, + ACPI_RS_SIZE (ACPI_RESOURCE_VENDOR), + ACPI_RS_SIZE (ACPI_RESOURCE_MEMORY32), + ACPI_RS_SIZE (ACPI_RESOURCE_FIXED_MEMORY32), + ACPI_RS_SIZE (ACPI_RESOURCE_ADDRESS32), + ACPI_RS_SIZE (ACPI_RESOURCE_ADDRESS16), + ACPI_RS_SIZE (ACPI_RESOURCE_EXTENDED_IRQ), + ACPI_RS_SIZE (ACPI_RESOURCE_ADDRESS64), + ACPI_RS_SIZE (ACPI_RESOURCE_EXTENDED_ADDRESS64) }; diff -ur acpica-unix-20051202.old/tools/acpiexec/aeexec.c acpica-unix-20051202/tools/acpiexec/aeexec.c --- acpica-unix-20051202.old/tools/acpiexec/aeexec.c Fri Dec 2 18:27:28 2005 +++ acpica-unix-20051202/tools/acpiexec/aeexec.c Mon Dec 5 15:37:22 2005 @@ -1034,7 +1034,7 @@ ACPI_HANDLE Handle; ACPI_BUFFER ReturnBuf; char Buffer[32]; - ACPI_VENDOR_UUID Uuid = {0, ACPI_INIT_UUID (0,0,0,0,0,0,0,0,0,0,0)}; + ACPI_VENDOR_UUID Uuid = {0, {ACPI_INIT_UUID (0,0,0,0,0,0,0,0,0,0,0)}}; ACPI_STATUS Status; diff -ur acpica-unix-20051202.old/utilities/utalloc.c acpica-unix-20051202/utilities/utalloc.c --- acpica-unix-20051202.old/utilities/utalloc.c Fri Dec 2 18:27:29 2005 +++ acpica-unix-20051202/utilities/utalloc.c Mon Dec 5 15:36:22 2005 @@ -123,6 +123,7 @@ /* Local prototypes */ +#ifdef ACPI_DBG_TRACK_ALLOCATIONS static ACPI_DEBUG_MEM_BLOCK * AcpiUtFindAllocation ( void *Allocation); @@ -143,7 +144,6 @@ char *Module, UINT32 Line); -#ifdef ACPI_DBG_TRACK_ALLOCATIONS static ACPI_STATUS AcpiUtCreateList ( char *ListName, diff -ur acpica-unix-20051202.old/utilities/uteval.c acpica-unix-20051202/utilities/uteval.c --- acpica-unix-20051202.old/utilities/uteval.c Fri Dec 2 18:27:29 2005 +++ acpica-unix-20051202/utilities/uteval.c Mon Dec 5 15:36:22 2005 @@ -184,7 +184,7 @@ for (i = 0; i < ACPI_NUM_OSI_STRINGS; i++) { if (!ACPI_STRCMP (StringDesc->String.Pointer, - (char *) AcpiGbl_ValidOsiStrings[i])) + ACPI_CAST_PTR (char, AcpiGbl_ValidOsiStrings[i]))) { /* This string is supported */ @@ -788,7 +788,7 @@ { Highest[i] = 0xFF; Status = AcpiUtEvaluateObject (DeviceNode, - (char *) AcpiGbl_HighestDstateNames[i], + ACPI_CAST_PTR (char, AcpiGbl_HighestDstateNames[i]), ACPI_BTYPE_INTEGER, &ObjDesc); if (ACPI_FAILURE (Status)) { @@ -796,7 +796,7 @@ { ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%s on Device %4.4s, %s\n", - (char *) AcpiGbl_HighestDstateNames[i], + ACPI_CAST_PTR (char, AcpiGbl_HighestDstateNames[i]), AcpiUtGetNodeName (DeviceNode), AcpiFormatException (Status))); diff -ur acpica-unix-20051202.old/utilities/utglobal.c acpica-unix-20051202/utilities/utglobal.c --- acpica-unix-20051202.old/utilities/utglobal.c Fri Dec 2 18:27:29 2005 +++ acpica-unix-20051202/utilities/utglobal.c Mon Dec 5 15:36:22 2005 @@ -520,7 +520,7 @@ return ("InvalidSpaceId"); } - return ((char *) AcpiGbl_RegionTypes[SpaceId]); + return (ACPI_CAST_PTR (char, AcpiGbl_RegionTypes[SpaceId])); } @@ -560,7 +560,7 @@ return ("InvalidEventID"); } - return ((char *) AcpiGbl_EventTypes[EventId]); + return (ACPI_CAST_PTR (char, AcpiGbl_EventTypes[EventId])); } @@ -633,10 +633,10 @@ if (Type > ACPI_TYPE_INVALID) { - return ((char *) AcpiGbl_BadType); + return (ACPI_CAST_PTR (char, AcpiGbl_BadType)); } - return ((char *) AcpiGbl_NsTypeNames[Type]); + return (ACPI_CAST_PTR (char, AcpiGbl_NsTypeNames[Type])); } @@ -757,10 +757,10 @@ if (ACPI_GET_DESCRIPTOR_TYPE (Object) > ACPI_DESC_TYPE_MAX) { - return ((char *) AcpiGbl_BadType); + return (ACPI_CAST_PTR (char, AcpiGbl_BadType)); } - return ((char *) AcpiGbl_DescTypeNames[ACPI_GET_DESCRIPTOR_TYPE (Object)]); + return (ACPI_CAST_PTR (char, AcpiGbl_DescTypeNames[ACPI_GET_DESCRIPTOR_TYPE (Object)])); } diff -ur acpica-unix-20051202.old/utilities/utmisc.c acpica-unix-20051202/utilities/utmisc.c --- acpica-unix-20051202.old/utilities/utmisc.c Fri Dec 2 18:27:30 2005 +++ acpica-unix-20051202/utilities/utmisc.c Mon Dec 5 15:36:22 2005 @@ -273,7 +273,7 @@ /* Zero is not a valid OwnerID */ - if ((OwnerId == 0) || (OwnerId > 255)) + if (OwnerId == 0) { ACPI_REPORT_ERROR (("Invalid OwnerId: %2.2X\n", OwnerId)); return_VOID;