Date: Mon, 18 Mar 2002 18:42:11 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 7900 for review Message-ID: <200203190242.g2J2gBl76687@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7900 Change 7900 by peter@peter_daintree on 2002/03/18 18:41:37 Revert to vendor for this, Intel fixed it elsewhere. Affected files ... ... //depot/projects/ia64/sys/contrib/dev/acpica/acgcc.h#7 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#7 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rsaddr.c#6 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#5 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#5 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rsmisc.c#5 edit Differences ... ==== //depot/projects/ia64/sys/contrib/dev/acpica/acgcc.h#7 (text+ko) ==== @@ -121,7 +121,6 @@ #ifdef __ia64__ #define _IA64 -#define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long /* @@ -199,7 +198,6 @@ #else /* DO IA32 */ -#define COMPILER_DEPENDENT_INT64 long long #define COMPILER_DEPENDENT_UINT64 unsigned long long /* ==== //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#7 (text+ko) ==== @@ -148,7 +148,6 @@ typedef unsigned short UINT16; typedef int INT32; typedef unsigned int UINT32; -typedef COMPILER_DEPENDENT_INT64 INT64; typedef COMPILER_DEPENDENT_UINT64 UINT64; typedef UINT64 NATIVE_UINT; @@ -1207,7 +1206,7 @@ #define ACPI_RESOURCE_LENGTH 12 #define ACPI_RESOURCE_LENGTH_NO_DATA 8 /* Id + Length fields */ -#define ACPI_SIZEOF_RESOURCE(Type) ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RESOURCE_LENGTH_NO_DATA + sizeof (Type)) +#define ACPI_SIZEOF_RESOURCE(Type) (ACPI_RESOURCE_LENGTH_NO_DATA + sizeof (Type)) #define ACPI_NEXT_RESOURCE(Res) (ACPI_RESOURCE *)((UINT8 *) Res + Res->length) ==== //depot/projects/ia64/sys/contrib/dev/acpica/rsaddr.c#6 (text+ko) ==== @@ -326,7 +326,7 @@ * StructSize to the next 32-bit boundary. */ Temp8 = (UINT8) (Index + 1); - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp8); } else { @@ -723,7 +723,7 @@ * StructSize to the next 32-bit boundary. */ Temp8 = (UINT8) (Index + 1); - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp8); } else { @@ -1122,7 +1122,7 @@ * StructSize to the next 32-bit boundary. */ Temp8 = (UINT8) (Index + 1); - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp8); } else { ==== //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#5 (text+ko) ==== @@ -439,7 +439,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp16 = (UINT16) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp16); + Temp16 = (UINT16) ACPI_ROUND_UP_TO_32BITS (Temp16); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_VENDOR) + (Temp16 * sizeof (UINT8)); @@ -540,7 +540,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp8 = (UINT8) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + Temp8 = (UINT8) ACPI_ROUND_UP_TO_32BITS (Temp8); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_ADDRESS32) + (Temp8 * sizeof (UINT8)); @@ -580,7 +580,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp8 = (UINT8) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + Temp8 = (UINT8) ACPI_ROUND_UP_TO_32BITS (Temp8); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_ADDRESS16) + (Temp8 * sizeof (UINT8)); @@ -634,7 +634,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp8 = (UINT8) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + Temp8 = (UINT8) ACPI_ROUND_UP_TO_32BITS (Temp8); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_EXT_IRQ) + (AdditionalBytes * sizeof (UINT8)) + @@ -777,7 +777,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp8 = (UINT8) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + Temp8 = (UINT8) ACPI_ROUND_UP_TO_32BITS (Temp8); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_VENDOR) + (Temp8 * sizeof (UINT8)); break; ==== //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#5 (text+ko) ==== @@ -517,7 +517,7 @@ * StructSize to the next 32-bit boundary. */ Temp8 = (UINT8) (Index + 1); - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp8); } else { ==== //depot/projects/ia64/sys/contrib/dev/acpica/rsmisc.c#5 (text+ko) ==== @@ -326,7 +326,7 @@ * calculate the length of the vendor string and expand the * StructSize to the next 32-bit boundary. */ - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp16); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp16); /* * Set the Length parameter To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203190242.g2J2gBl76687>