From owner-FreeBSD-users-jp@jp.freebsd.org  Tue Aug  8 22:30:54 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA54942;
	Tue, 8 Aug 2000 22:30:54 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from pixy.netlab.is.tsukuba.ac.jp (qmailr@netlab-83.netlab.is.tsukuba.ac.jp [130.158.83.243])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with SMTP id WAA54934
	for <FreeBSD-users-jp@jp.freebsd.org>; Tue, 8 Aug 2000 22:30:54 +0900 (JST)
	(envelope-from ush@netlab.is.tsukuba.ac.jp)
Received: (qmail 88182 invoked from network); 8 Aug 2000 13:30:52 -0000
Received: from unicorn.netlab.is.tsukuba.ac.jp (HELO localhost) (ush@130.158.85.5)
  by pixy.netlab.is.tsukuba.ac.jp with SMTP; 8 Aug 2000 13:30:52 -0000
To: FreeBSD-users-jp@jp.freebsd.org
In-Reply-To: <20000807181046B.ush@netlab.is.tsukuba.ac.jp>
References: <200008041655.BAA18869@pov10.pov.co.jp>
	<861z04o1yl.wl@zenchan.katsurajima.seya.yokohama.jp>
	<20000807181046B.ush@netlab.is.tsukuba.ac.jp>
X-Mailer: Mew version 1.94 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000808223052Z.ush@netlab.is.tsukuba.ac.jp>
Date: Tue, 08 Aug 2000 22:30:52 +0900
From: Ushine Hiroyuki <ush@netlab.is.tsukuba.ac.jp>
X-Dispatcher: imput version 990905(IM130)
Lines: 80
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: FreeBSD-users-jp 54042
Subject: [FreeBSD-users-jp 54042] Re: ICH audio driver
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org
X-Originator: ush@netlab.is.tsukuba.ac.jp

ush> ICH$B$H(B ICH2$B$N%I%-%e%a%s%H$r8+Hf$Y$?=j(B
ush> $B7KEg$5$s$N(B ich.c $B$N(B ich_devs[]=$B$K(B
ush> {0x24458086, 0, "Intel 82801BA AC'97 audio", NULL},
ush> $B%(%s%H%j$rDI2C$7$F$_$l$P(B ICH2 $B$X$NBP1~$O=*$o$j$=$&$J5$G[$G$9$N$G!$(B
ush> $B:#Lk$K$G$b<B83$7$F$_$^$9!%(B
ABIT SE6 (815E) $B$r;H$C$F$N7k2L$G$9$,!$$$$^$N$H$3$m$&$^$/9T$C$F$$$^$;$s!%(B

kernel -v$B$G$N7k2L$G$O(B
pcm1: <Intel 82801BA AC'97 audio> port 0xdc00-0xdc3f,0xd800-0xd8ff
 irq 5 at device 31.5 on pci0
pcm1: ac97 codec id 0x414c432f
pcm1: ac97 codec features 5 bit master volume, Realtek 3D Stereo Enhancement
pcm1: ac97 primary codec extended features AMAP
pcm: setmap 81000, 10000; 0xc946a000 -> 81000
pcm1: icpchan_init():setmap(0x75e000, 0x100)
pcm1: chn_init() for record:0 failed
codec$B$OG'<1$7$F$$$k$b$N$N(B, $B$"$H>/$7$+$J$H!%(B

$B<!$N%Q%C%A$G(B ICH2$B$N(B AC'97$B%3%s%H%m!<%i$,G'<1$5$l$^$9!%(B

*** ich.c.orig     Tue Aug  8 01:10:52 2000
--- ich.c       Tue Aug  8 01:12:11 2000
***************
*** 167,171 ****
        {0x71958086, 0, "Intel 443MX AC'97 audio", NULL},
        {0x24158086, 0, "Intel 82801AA AC'97 audio", NULL},
!       {0x24258086, 0, "Intel 82901AB AC'97 audio", NULL},
        {0, 0, NULL, NULL}
  };
--- 167,172 ----
        {0x71958086, 0, "Intel 443MX AC'97 audio", NULL},
        {0x24158086, 0, "Intel 82801AA AC'97 audio", NULL},
!       {0x24258086, 0, "Intel 82801AB AC'97 audio", NULL},
!       {0x24458086, 0, "Intel 82801BA AC'97 audio", NULL},
        {0, 0, NULL, NULL}
  };


$B$*$^$1(B ICH2$B$N(B UHCI$BItJ,$NG'<1ItJ,$G$9!%(B/usr/src/sys/pci/uhci_pci.c

*** uhci_pci.c.orig        Tue Aug  7 22:23:05 2000
--- uhci_pci.c  Tue Aug  8 00:55:02 2000
***************
*** 88,91 ****
--- 88,95 ----
  #define PCI_UHCI_DEVICEID_ICH0                0x24228086
  static const char *uhci_device_ich0   = "Intel 82801AB (ICH0) USB controller";
+ #define PCI_UHCI_DEVICEID_ICH2A               0x24428086
+ static const char *uhci_device_ich2a  = "Intel 82801BA (ICH2) USB controller 2442";
+ #define PCI_UHCI_DEVICEID_ICH2B               0x24448086
+ static const char *uhci_device_ich2b  = "Intel 82801BA (ICH2) USB controller 2444";
  #define PCI_UHCI_DEVICEID_440MX               0x719a8086
  static const char *uhci_device_440mx  = "Intel 82443MX USB controller";
***************
*** 142,145 ****
--- 146,153 ----
        } else if (device_id == PCI_UHCI_DEVICEID_ICH0) {
                return (uhci_device_ich0);
+       } else if (device_id == PCI_UHCI_DEVICEID_ICH2A) {
+               return (uhci_device_ich2a);
+       } else if (device_id == PCI_UHCI_DEVICEID_ICH2B) {
+               return (uhci_device_ich2b);
        } else if (device_id == PCI_UHCI_DEVICEID_440MX) {
                return (uhci_device_440mx);
***************
*** 235,238 ****
--- 243,254 ----
                device_set_desc(sc->sc_bus.bdev, uhci_device_ich0);
                sprintf(sc->sc_vendor, "Intel");
+               break;
+       case PCI_UHCI_DEVICEID_ICH2A:
+               device_set_desc(sc->sc_bus.bdev, uhci_device_ich2a);
+               sprintf(sc->sc_vendor, "Intel");
+               break;
+       case PCI_UHCI_DEVICEID_ICH2B:
+               device_set_desc(sc->sc_bus.bdev, uhci_device_ich2b);
+               sprintf(sc->sc_vendor, "Intel");        
                break;
        case PCI_UHCI_DEVICEID_440MX:

