Fri Feb 18 13:01:22 2011 UTC ()
Cast pthread_self(3) to uintptr_t. ACPICA 20100915:

The ACPI_THREAD_ID type is no longer configurable, internally it is now
always UINT64.  This simplifies the ACPICA code, especially any printf
output.  UINT64 is the only common data type for all thread_id types across
all operating systems.  It is now up to the host OSL to cast the native
thread_id type to UINT64 before returning the value to ACPICA (via
AcpiOsGetThreadId).  Lin Ming, Bob Moore.


(jruoho)
diff -r1.1.1.2 -r1.2 src/sys/external/bsd/acpica/dist/osunixxf.c
cvs diff -r1.1.1.2 -r1.2 src/sys/external/bsd/acpica/dist/Attic/osunixxf.c (expand / switch to unified diff)

--- src/sys/external/bsd/acpica/dist/Attic/osunixxf.c 2011/02/17 10:00:51 1.1.1.2
+++ src/sys/external/bsd/acpica/dist/Attic/osunixxf.c 2011/02/18 13:01:22 1.2
@@ -1147,27 +1147,27 @@ AcpiOsWritable ( @@ -1147,27 +1147,27 @@ AcpiOsWritable (
1147 * PARAMETERS: None 1147 * PARAMETERS: None
1148 * 1148 *
1149 * RETURN: Id of the running thread 1149 * RETURN: Id of the running thread
1150 * 1150 *
1151 * DESCRIPTION: Get the ID of the current (running) thread 1151 * DESCRIPTION: Get the ID of the current (running) thread
1152 * 1152 *
1153 *****************************************************************************/ 1153 *****************************************************************************/
1154 1154
1155ACPI_THREAD_ID 1155ACPI_THREAD_ID
1156AcpiOsGetThreadId ( 1156AcpiOsGetThreadId (
1157 void) 1157 void)
1158{ 1158{
1159 1159
1160 return (ACPI_CAST_PTHREAD_T (pthread_self())); 1160 return (uintptr_t)(ACPI_CAST_PTHREAD_T (pthread_self()));
1161} 1161}
1162 1162
1163 1163
1164/****************************************************************************** 1164/******************************************************************************
1165 * 1165 *
1166 * FUNCTION: AcpiOsSignal 1166 * FUNCTION: AcpiOsSignal
1167 * 1167 *
1168 * PARAMETERS: Function - ACPI CA signal function code 1168 * PARAMETERS: Function - ACPI CA signal function code
1169 * Info - Pointer to function-dependent structure 1169 * Info - Pointer to function-dependent structure
1170 * 1170 *
1171 * RETURN: Status 1171 * RETURN: Status
1172 * 1172 *
1173 * DESCRIPTION: Miscellaneous functions. Example implementation only. 1173 * DESCRIPTION: Miscellaneous functions. Example implementation only.