acpi5 20040715

[Andreas Hauser]

Hoi,

tried to get my acpi to do S1 and thought maybe the new intel release helps.
It did not :(

Besides the patch one needs the source for sys/contrib from intel:
http://www.intel.com/technology/iapc/acpi/downloads/acpica-unix-20040715.tar.gz

Andy

http://ftp.fortunaty.net/DragonFly/inofficial/patches/acpi5-20040715.patch

Index: sys/dev/acpica5/Makefile.inc
===================================================================
RCS file: /home/dcvs/src/sys/dev/acpica5/Makefile.inc,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile.inc
--- sys/dev/acpica5/Makefile.inc	5 Jul 2004 00:07:35 -0000	1.2
+++ sys/dev/acpica5/Makefile.inc	26 Sep 2004 22:34:13 -0000
@@ -1,4 +1,4 @@
 # $DragonFly: src/sys/dev/acpica5/Makefile.inc,v 1.2 2004/07/05 00:07:35 dillon Exp $
 
-SYSACPICA_VERSION?=	20040527
+SYSACPICA_VERSION?=	20040715
 SYSACPICA?= contrib/dev/acpica-unix-${SYSACPICA_VERSION}
Index: sys/dev/acpica5/acpi_thermal.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/acpica5/acpi_thermal.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 acpi_thermal.c
--- sys/dev/acpica5/acpi_thermal.c	5 Jul 2004 00:07:35 -0000	1.3
+++ sys/dev/acpica5/acpi_thermal.c	26 Sep 2004 22:55:13 -0000
@@ -690,7 +690,7 @@ acpi_tz_notify_handler(ACPI_HANDLE h, UI
     case TZ_NOTIFY_LEVELS:
 	/* Zone devices/setpoints changed */
 	AcpiOsQueueForExecution(OSD_PRIORITY_HIGH,
-				(OSD_EXECUTION_CALLBACK)acpi_tz_establish, sc);
+				(ACPI_OSD_EXEC_CALLBACK)acpi_tz_establish, sc);
 	break;
     default:
 	ACPI_VPRINT(sc->tz_dev, acpi_device_get_parent_softc(sc->tz_dev),
@@ -761,7 +761,7 @@ acpi_tz_power_profile(void *arg)
 	} else {
 	    /* We have to re-evaluate the entire zone now */
 	    AcpiOsQueueForExecution(OSD_PRIORITY_HIGH,
-				    (OSD_EXECUTION_CALLBACK)acpi_tz_establish,
+				    (ACPI_OSD_EXEC_CALLBACK)acpi_tz_establish,
 				    sc);
 	}
     }
Index: sys/dev/acpica5/Osd/OsdInterrupt.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/acpica5/Osd/OsdInterrupt.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 OsdInterrupt.c
--- sys/dev/acpica5/Osd/OsdInterrupt.c	27 Jun 2004 08:52:42 -0000	1.2
+++ sys/dev/acpica5/Osd/OsdInterrupt.c	26 Sep 2004 23:07:19 -0000
@@ -47,12 +47,12 @@ ACPI_MODULE_NAME("INTERRUPT")
 
 static void		InterruptWrapper(void *arg);
 
-static OSD_HANDLER	InterruptHandler;
+static ACPI_OSD_HANDLER	InterruptHandler;
 static UINT32		InterruptOverride = 0;
 
 ACPI_STATUS
 AcpiOsInstallInterruptHandler(UINT32 InterruptNumber,
-    OSD_HANDLER ServiceRoutine, void *Context)
+    ACPI_OSD_HANDLER ServiceRoutine, void *Context)
 {
     struct acpi_softc	*sc;
 
@@ -115,7 +115,7 @@ error:
 }
 
 ACPI_STATUS
-AcpiOsRemoveInterruptHandler(UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine)
+AcpiOsRemoveInterruptHandler(UINT32 InterruptNumber, ACPI_OSD_HANDLER ServiceRoutine)
 {
     struct acpi_softc	*sc;
 
Index: sys/dev/acpica5/Osd/OsdSchedule.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/acpica5/Osd/OsdSchedule.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 OsdSchedule.c
--- sys/dev/acpica5/Osd/OsdSchedule.c	2 Aug 2004 19:51:09 -0000	1.4
+++ sys/dev/acpica5/Osd/OsdSchedule.c	26 Sep 2004 23:14:06 -0000
@@ -66,7 +66,7 @@ static void	acpi_autofree_reply(lwkt_por
 
 struct acpi_task {
     struct lwkt_msg		at_msg;
-    OSD_EXECUTION_CALLBACK	at_function;
+    ACPI_OSD_EXEC_CALLBACK	at_function;
     void			*at_context;
     int				at_priority;
 };
@@ -93,12 +93,12 @@ acpi_task_thread_init(void)
 static void
 acpi_task_thread(void *arg)
 {
-    OSD_EXECUTION_CALLBACK func;
+    ACPI_OSD_EXEC_CALLBACK func;
     struct acpi_task *at;
 
     for (;;) {
 	at = (void *)lwkt_waitport(&curthread->td_msgport, NULL);
-	func = (OSD_EXECUTION_CALLBACK)at->at_function;
+	func = (ACPI_OSD_EXEC_CALLBACK)at->at_function;
 	func((void *)at->at_context);
 	lwkt_replymsg(&at->at_msg, 0);
     }
@@ -111,7 +111,7 @@ acpi_task_thread(void *arg)
  * to automatically free the message.
  */
 ACPI_STATUS
-AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function,
+AcpiOsQueueForExecution(UINT32 Priority, ACPI_OSD_EXEC_CALLBACK Function,
     void *Context)
 {
     struct acpi_task	*at;