From owner-acpi-jp@jp.FreeBSD.org Fri Jan 24 10:22:43 2003
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id h0O1MhR37627;
	Fri, 24 Jan 2003 10:22:43 +0900 (JST)
	(envelope-from owner-acpi-jp@jp.FreeBSD.org)
Received: from sana.home.local (takawata.st.wakwak.ne.jp [61.115.75.145])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id h0O1MgJ37622
	for <acpi-jp@jp.FreeBSD.org>; Fri, 24 Jan 2003 10:22:42 +0900 (JST)
	(envelope-from takawata@takawata.st.wakwak.ne.jp)
Received: from takawata.st.wakwak.ne.jp (localhost [127.0.0.1])
	by sana.home.local (8.12.6/8.12.6) with ESMTP id h0O1LCc4028036
	for <acpi-jp@jp.FreeBSD.org>; Fri, 24 Jan 2003 10:21:13 +0900 (JST)
	(envelope-from takawata@takawata.st.wakwak.ne.jp)
Message-Id: <200301240121.h0O1LCc4028036@sana.home.local>
To: acpi-jp@jp.FreeBSD.org
In-reply-to: Your message of "Thu, 23 Jan 2003 16:14:07 PST."
             <20030124001407.GA768@athlon.pn.xcllnt.net>
From: Takanori Watanabe <takawata@takawata.st.wakwak.ne.jp>
Reply-To: acpi-jp@jp.FreeBSD.org
Precedence: list
Date: Fri, 24 Jan 2003 10:21:12 +0900
X-Sequence: acpi-jp 2073
Subject: [acpi-jp 2073] Re: psm0 not found on a Sony Vaio w/ 5.0-RELEASE
Errors-To: owner-acpi-jp@jp.FreeBSD.org
Sender: owner-acpi-jp@jp.FreeBSD.org
X-Originator: takawata@takawata.st.wakwak.ne.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+030107

In message <20030124001407.GA768@athlon.pn.xcllnt.net>, Marcel Moolenaar wrote:
>On Fri, Jan 24, 2003 at 08:24:20AM +0900, takawata@axe-inc.co.jp wrote:
>> >
>> >Hmmm.... That PnP id is a generic id (has the PNP prefix). A Sony
>> >specific PnP id is 0x####d94d... Your Id is one for an ACPI embedded
>> >controller and I don't think it has to be a mouse. I suspect there's
>> >a _CID value as well and that it's a generic PS/2 mouse id...
>> 
>> Quick Hack for _CID.(Compiler passes, but not tested yet actually.)
>
>I does compile, but does not work. Note that I don't have hints
>for the psm device anymore, so that might as well be the problem.
>I don't have more details right now, but may get back to this
>later.

Hmm, is this fix the problem?

--- acpi.c.prev	Fri Jan 24 10:14:10 2003
+++ acpi.c	Fri Jan 24 10:15:24 2003
@@ -757,7 +757,7 @@
 acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids)
 {
     int			result;
-    u_int32_t		pnpid;
+    u_int32_t		pnpid, compatid;
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
@@ -770,8 +770,10 @@
 
     /* scan the supplied IDs for a match */
     pnpid = acpi_isa_get_logicalid(child);
+    compatid = acpi_isa_get_compatid(child);
     while (ids && ids->ip_id) {
-	if (pnpid == ids->ip_id) {
+	if (pnpid == ids->ip_id||
+	    compatid == ids->ip_id) {
 	    result = 0;
 	    goto out;
 	}
