Changeset 433

Timestamp:

May 23, 2018, 7:49:00 PM (7 years ago)

Author:

rlwalsh

Message:

acpi: update acpi-related code and headers to v3.23.04;
patch submitted by David Azarewicz

Location:

trunk

Files:

• include/helpers/acpih.h (modified) (2 diffs)
• src/helpers/acpih.c (modified) (4 diffs)

trunk/include/helpers/acpih.h

@@ -41 +41 @@
 
     // Extracted from acpi.h actype.h etc.
-    typedef APIRET APIENTRY ACPISTARTAPI(ACPI_API_HANDLE *);
-    typedef ACPISTARTAPI *PACPISTARTAPI;
+    typedef APIRET APIENTRY ACPITKSTARTAPI(ACPI_API_HANDLE *);
+    typedef ACPITKSTARTAPI *PACPITKSTARTAPI;
 
-    typedef APIRET APIENTRY ACPIENDAPI(ACPI_API_HANDLE *);
-    typedef ACPIENDAPI *PACPIENDAPI;
+    typedef APIRET APIENTRY ACPITKENDAPI(ACPI_API_HANDLE *);
+    typedef ACPITKENDAPI *PACPITKENDAPI;
 
-    typedef APIRET APIENTRY ACPIGOTOSLEEP(ACPI_API_HANDLE *, UCHAR);
-    typedef ACPIGOTOSLEEP *PACPIGOTOSLEEP;
+    typedef APIRET APIENTRY ACPITKGOTOSLEEP(ACPI_API_HANDLE *, UCHAR);
+    typedef ACPITKGOTOSLEEP *PACPITKGOTOSLEEP;
 
     // @@added V1.0.9 (2012-12-10) [slevine]: sync with current ACPI toolkit
@@ -77 +77 @@
     BOOL acpihHasBattery(VOID);
 
-    #define ORD_ACPISTARTAPI    16
-    #define ORD_ACPIENDAPI      17
-    #define ORD_ACPIGOTOSLEEP   19
-    #define ORD_ACPITKGETOBJECTINFOALLOC 35
+    #define ORD_ACPITKSTARTAPI    67
+    #define ORD_ACPITKENDAPI      68
+    #define ORD_ACPITKGOTOSLEEP   70
+    #define ORD_ACPITKGETOBJECTINFOALLOC3 35
     #define ORD_ACPITKGETHANDLE 65
     #define ORD_ACPITKOSFREE 66

trunk/src/helpers/acpih.c

@@ -59 +59 @@
 ULONG         G_uiAlreadyWalked = 0;
 
-ACPISTARTAPI  *pAcpiStartApi = NULL;
-ACPIENDAPI    *pAcpiEndApi = NULL;
-ACPIGOTOSLEEP *pAcpiGoToSleep = NULL;
+ACPITKSTARTAPI  *pAcpiStartApi = NULL;
+ACPITKENDAPI    *pAcpiEndApi = NULL;
+ACPITKGOTOSLEEP *pAcpiGoToSleep = NULL;
 
 ACPITKGETOBJECTINFOALLOC *pAcpiTkGetObjectInfoAlloc = NULL;
@@ -95 +95 @@
         {
             arc = DosQueryProcAddr(G_hmodACPI,
-                                   ORD_ACPISTARTAPI,
+                                   ORD_ACPITKSTARTAPI,
                                    NULL,
                                    (PFN *) &pAcpiStartApi);
             if (!arc)
                 arc = DosQueryProcAddr(G_hmodACPI,
-                                       ORD_ACPIENDAPI,
+                                       ORD_ACPITKENDAPI,
                                        NULL,
                                        (PFN *) &pAcpiEndApi);
@@ -106 +106 @@
             if (!arc)
                 arc = DosQueryProcAddr(G_hmodACPI,
-                                       ORD_ACPIGOTOSLEEP,
+                                       ORD_ACPITKGOTOSLEEP,
                                        NULL,
                                        (PFN *) &pAcpiGoToSleep);
@@ -120 +120 @@
 
             // @@added V1.0.9 (2012-02-20) [slevine]: additional ACPI support, code from David Azarewicz
-            DosQueryProcAddr(G_hmodACPI, ORD_ACPITKGETOBJECTINFOALLOC,
+            DosQueryProcAddr(G_hmodACPI, ORD_ACPITKGETOBJECTINFOALLOC3,
                              NULL, (PFN *) &pAcpiTkGetObjectInfoAlloc);
             DosQueryProcAddr(G_hmodACPI, ORD_ACPITKGETHANDLE,