Date: Thu, 29 May 2003 01:30:05 +0900 (JST) From: Takayoshi Kochi <kochi@netbsd.org> To: acpi-jp@jp.FreeBSD.org, nate@root.org Cc: current@freebsd.org Subject: Re: [acpi-jp 2267] Re: HEADSUP: acpi patches in the tree Message-ID: <20030529.013005.68552731.kochi@netbsd.org> In-Reply-To: <20030529.012349.68555656.kochi@netbsd.org> References: <20030528071116.2db41659.yosimoto@waishi.jp> <20030527165526.E6842@root.org> <20030529.012349.68555656.kochi@netbsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
----Next_Part(Thu_May_29_01:30:05_2003_834)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: Takayoshi Kochi <kochi@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
----Next_Part(Thu_May_29_01:30:05_2003_834)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="table_id_dsdt.diff"
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
@@ -214,12 +214,8 @@
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
@@ -429,7 +429,7 @@
/* 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
@@ -177,7 +177,7 @@
/* 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);
@@ -221,7 +221,7 @@
/* 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
@@ -314,7 +314,7 @@
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
@@ -275,7 +275,7 @@
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
@@ -166,7 +166,7 @@
/* 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
@@ -355,7 +355,7 @@
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
@@ -264,7 +264,7 @@
/* 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);
----Next_Part(Thu_May_29_01:30:05_2003_834)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030529.013005.68552731.kochi>