Re: [acpi-jp 2267] Re: HEADSUP: acpi patches in the tree

From: Takayoshi Kochi <kochi_at_netbsd.org>
Subject: Re: [acpi-jp 2267] Re: HEADSUP: acpi patches in the tree
Date: Thu, 29 May 2003 01:23:49 +0900 (JST)

> Attached is the patch and should apply to the FreeBSD tree with
> some appropriate option.

Oops, I attached a wrong one.  Please ignore the last posting.

---
Takayoshi Kochi

Index: aclocal.h
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Subsystem/aclocal.h,v
retrieving revision 1.5
diff -u -r1.5 aclocal.h
--- aclocal.h	2003/03/04 17:25:10	1.5
+++ aclocal.h	2003/05/28 07:24:46
_at__at_ -214,12 +214,8 _at__at_
 typedef UINT16                          ACPI_OWNER_ID;
 #define ACPI_OWNER_TYPE_TABLE           0x0
 #define ACPI_OWNER_TYPE_METHOD          0x1
-#define ACPI_FIRST_METHOD_ID            0x0000
-#define ACPI_FIRST_TABLE_ID             0x8000
-
-/* TBD: [Restructure] get rid of the need for this! */
-
-#define TABLE_ID_DSDT                   (ACPI_OWNER_ID) 0x8000
+#define ACPI_FIRST_METHOD_ID            0x0001
+#define ACPI_FIRST_TABLE_ID             0xF000
 
 
 /* Field access granularities */
Index: dbutils.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Subsystem/dbutils.c,v
retrieving revision 1.6
diff -u -r1.6 dbutils.c
--- dbutils.c	2003/03/04 17:25:12	1.6
+++ dbutils.c	2003/05/28 07:24:51
_at__at_ -429,7 +429,7 _at__at_
 
             /* Create a new walk state for the parse */
 
-            WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT,
+            WalkState = AcpiDsCreateWalkState (0,
                                             NULL, NULL, NULL);
             if (!WalkState)
             {
Index: dsopcode.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Subsystem/dsopcode.c,v
retrieving revision 1.6
diff -u -r1.6 dsopcode.c
--- dsopcode.c	2003/03/04 17:25:13	1.6
+++ dsopcode.c	2003/05/28 07:24:54
_at__at_ -177,7 +177,7 _at__at_
 
     /* Create and initialize a new parser state */
 
-    WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT, NULL, NULL, NULL);
+    WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL);
     if (!WalkState)
     {
         return_ACPI_STATUS (AE_NO_MEMORY);
_at__at_ -221,7 +221,7 _at__at_
 
     /* Create and initialize a new parser state */
 
-    WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT, NULL, NULL, NULL);
+    WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL);
     if (!WalkState)
     {
         return_ACPI_STATUS (AE_NO_MEMORY);
Index: nsalloc.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Subsystem/nsalloc.c,v
retrieving revision 1.8
diff -u -r1.8 nsalloc.c
--- nsalloc.c	2003/05/13 13:29:00	1.8
+++ nsalloc.c	2003/05/28 07:24:56
_at__at_ -314,7 +314,7 _at__at_
     ACPI_NAMESPACE_NODE     *Node,          /* New Child*/
     ACPI_OBJECT_TYPE        Type)
 {
-    UINT16                  OwnerId = TABLE_ID_DSDT;
+    UINT16                  OwnerId = 0;
     ACPI_NAMESPACE_NODE     *ChildNode;
 #ifdef ACPI_ALPHABETIC_NAMESPACE
 
Index: nsload.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Subsystem/nsload.c,v
retrieving revision 1.6
diff -u -r1.6 nsload.c
--- nsload.c	2003/03/04 17:25:22	1.6
+++ nsload.c	2003/05/28 07:24:57
_at__at_ -275,7 +275,7 _at__at_
             goto UnlockAndExit;
         }
 
-        TableDesc->TableId = TABLE_ID_DSDT;
+        TableDesc->TableId = 0;
 
         /* Now load the single DSDT */
 
Index: nsparse.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Subsystem/nsparse.c,v
retrieving revision 1.2
diff -u -r1.2 nsparse.c
--- nsparse.c	2003/02/13 14:16:23	1.2
+++ nsparse.c	2003/05/28 07:24:58
_at__at_ -166,7 +166,7 _at__at_
 
     /* Create and initialize a new walk state */
 
-    WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT,
+    WalkState = AcpiDsCreateWalkState (0,
                                     NULL, NULL, NULL);
     if (!WalkState)
     {
Index: pswalk.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Subsystem/pswalk.c,v
retrieving revision 1.6
diff -u -r1.6 pswalk.c
--- pswalk.c	2003/03/04 17:25:25	1.6
+++ pswalk.c	2003/05/28 07:24:59
_at__at_ -355,7 +355,7 _at__at_
         return_VOID;
     }
 
-    WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT, NULL, NULL, Thread);
+    WalkState = AcpiDsCreateWalkState (0, NULL, NULL, Thread);
     if (!WalkState)
     {
         return_VOID;
Index: psxface.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Subsystem/psxface.c,v
retrieving revision 1.6
diff -u -r1.6 psxface.c
--- psxface.c	2003/03/04 17:25:25	1.6
+++ psxface.c	2003/05/28 07:24:59
_at__at_ -264,7 +264,7 _at__at_
 
     /* Create and initialize a new walk state */
 
-    WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT, NULL, NULL, NULL);
+    WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL);
     if (!WalkState)
     {
         return_ACPI_STATUS (AE_NO_MEMORY);