PERFORCE change 79104 for review

Peter Wemm peter at FreeBSD.org
Tue Jun 28 19:56:24 GMT 2005


http://perforce.freebsd.org/chv.cgi?CH=79104

Change 79104 by peter at peter_daintree on 2005/06/28 19:55:52

	IFC @79084

Affected files ...

.. //depot/projects/hammer/contrib/netcat/nc.1#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#78 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml#4 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#17 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#2 integrate
.. //depot/projects/hammer/share/man/man4/if_bridge.4#3 integrate
.. //depot/projects/hammer/sys/conf/Makefile.arm#9 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#15 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#34 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#26 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csa.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csareg.h#2 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csavar.h#2 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#33 integrate
.. //depot/projects/hammer/sys/net/if_bridge.c#2 integrate
.. //depot/projects/hammer/sys/net/if_gre.c#23 integrate
.. //depot/projects/hammer/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias.c#3 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_ftp.c#3 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_irc.c#3 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_local.h#3 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_proxy.c#3 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_skinny.c#3 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_smedia.c#3 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_util.c#4 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#51 integrate
.. //depot/projects/hammer/sys/netinet/tcp_sack.c#20 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#32 integrate
.. //depot/projects/hammer/sys/sys/ucred.h#8 integrate
.. //depot/projects/hammer/sys/vm/uma_dbg.c#13 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.1#19 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#10 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/plist.c#7 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/hostapd.8#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/hostapd.conf.5#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd_cli/hostapd_cli.8#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_cli/wpa_cli.8#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate

Differences ...

==== //depot/projects/hammer/contrib/netcat/nc.1#2 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.3 2005/02/07 05:34:34 delphij Exp $
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.4 2005/06/27 07:07:55 ru Exp $
 .\"
 .Dd January 30, 2005
 .Dt NC 1
@@ -37,7 +37,7 @@
 .Nm nc
 .Bk -words
 .Op Fl 46DEdhklnorStUuvz
-.Op Fl e Ar IPsec policy
+.Op Fl e Ar IPsec_policy
 .Op Fl i Ar interval
 .Op Fl p Ar source_port
 .Op Fl s Ar source_ip_address
@@ -103,8 +103,12 @@
 .Nm
 help.
 .It Fl E
-Shortcut for "-e 'in ipsec esp/transport//require' -e 'out ipsec
-esp/transport//require'", which enables IPsec ESP transport mode in both
+Shortcut for
+.Qo
+.Li "-e 'in ipsec esp/transport//require'"
+.Li "-e 'out ipsec esp/transport//require'" 
+.Qc ,
+which enables IPsec ESP transport mode in both
 directions.
 .It Fl e
 If IPsec support is available, then one can specify the IPsec policies
@@ -384,10 +388,14 @@
 .Pp
 Open a TCP connection to port 42 of example.host using 10.1.2.3 as the
 IP for the local end of the connection:
-.It Li "nc -E example.host 42"
+.Pp
+.Dl "nc -E example.host 42"
+.Pp
 Open a TCP connection to port 42 of example.host using IPsec ESP for
 incoming and outgoing traffic.
-.It Li "nc -e 'out ipsec esp/transport//require' example.host 42"
+.Pp
+.Dl "nc -e 'out ipsec esp/transport//require' example.host 42"
+.Pp
 Open a TCP connection to port 42 of example.host using IPsec ESP for
 outgoing traffic only.
 .Pp

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#78 (text+ko) ====

@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.281 2005/05/22 17:12:42 brueffer Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.282 2005/06/27 14:54:49 rushani Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -78,57 +78,6 @@
 
     &hwlist.ct;
 
-    <para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (bs driver)
-      <itemizedlist>
-        <listitem>
-          <para>NEC PC-9801-55, 92 and their compatibles</para>
-          <para>ICM IF-2660</para>
-          <para>Midori-Denshi MDC-554NA</para>
-          <para>Logitec LHA-N151</para>
-          <note>
-            <para>"flags 0x00000" is necessary in kernel configuration
-            for DMA transfer mode.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>I-O DATA SC-98II</para>
-          <note>
-            <para>"flags 0x10000" is necessary in kernel configuration
-            for DMA transfer mode.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>TEXA HA-55BS2 and later</para>
-          <para>Midori-Denshi MDC-926Rs</para>
-          <note>
-            <para>"flags 0x20000" is necessary in kernel configuration
-            for Bus-master transfer mode.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>ELECOM Bus-master SCSI interfaces</para>
-          <note>
-            <para>"flags 0x30000" is necessary in kernel configuration
-            for Bus-master transfer mode.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>All SMIT transfer type SCSI interfaces</para>
-          <note>
-            <para>"flags 0x40000" is necessary in kernel configuration
-            for SMIT transfer mode.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>Logitec LHA-20x series</para>
-          <para>ICM IF-2766, IF-2766ET, IF-2767 and IF-2769</para>
-          <note>
-            <para>"flags 0x50000" is necessary in kernel configuration
-            for Bus-master transfer mode.</para>
-          </note>
-        </listitem>
-      </itemizedlist>
-    </para>
     &hwlist.adv;
 
     &hwlist.adw;

==== //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml#4 (text+ko) ====

@@ -1,12 +1,12 @@
 <!--
-    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml,v 1.3 2004/09/20 11:19:32 hrs Exp $
-    Original revision: 1.5
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml,v 1.4 2005/06/27 17:48:19 rushani Exp $
+    Original revision: 1.7
 -->
 
 <articleinfo>
   <title>&os;/&arch; &release.current; ¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</title>
 
-  <corpauthor>The FreeBSD Documentation Project</corpauthor>
+  <corpauthor>The &os; Documentation Project</corpauthor>
 
   <copyright>
     <year>2000</year>
@@ -14,6 +14,7 @@
     <year>2002</year>
     <year>2003</year>
     <year>2004</year>
-    <holder role="mailto:doc at FreeBSD.org">The FreeBSD Documentation Project</holder>
+    <year>2005</year>
+    <holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 </articleinfo>

==== //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#17 (text+ko) ====

@@ -26,13 +26,13 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 
-        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.27 2005/03/06 14:50:42 rushani Exp $
-        Original revision: 1.269
+        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.28 2005/06/27 17:48:19 rushani Exp $
+        Original revision: 1.282
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.27 2005/03/06 14:50:42 rushani Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.28 2005/06/27 17:48:19 rushani Exp $</pubdate>
   </sect1info>
 
   <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
@@ -85,112 +85,6 @@
 
     &hwlist.ct;
 
-    <para arch="pc98">NEC PC-9801-55, 92 ¤ª¤è¤Ó¤½¤Î¸ß´¹ C-Bus SCSI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹ (ct ¥É¥é¥¤¥Ð)
-      <itemizedlist>
-        <listitem>
-          <para>NEC PC-9801-55, 92 ¤ª¤è¤Ó¤½¤Î¸ß´¹µ¡´ï</para>
-          <para>ICM IF-2660</para>
-          <para>Midori-Denshi MDC-554NA</para>
-          <para>Logitec LHA-N151</para>
-          <note>
-            <para>DMA žÁ÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë
-              <literal>flags 0x00000</literal> ¤¬É¬Í×.
-	    </para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>I-O DATA SC-98II</para>
-          <note>
-            <para>DMA žÁ÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë
-              <literal>flags 0x10000</literal> ¤¬É¬Í×.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>TEXA HA-55BS2 ¤ª¤è¤Ó¸å·Ñµ¡</para>
-          <para>Midori-Denshi MDC-926Rs</para>
-          <note>
-            <para>¥Ð¥¹¥Þ¥¹¥¿Å¾Á÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë
-              <literal>flags 0x20000</literal> ¤¬É¬Í×.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>ELECOM Bus-master SCSI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</para>
-          <note>
-            <para>¥Ð¥¹¥Þ¥¹¥¿Å¾Á÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë
-              <literal>flags 0x30000</literal> ¤¬É¬Í×.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>¤¹¤Ù¤Æ¤Î SMIT žÁ÷¼° SCSI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</para>
-          <note>
-            <para>SMIT žÁ÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë
-              <literal>flags 0x40000</literal> ¤¬É¬Í×.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>Logitec LHA-20x ¥·¥ê¡¼¥º</para>
-          <para>ICM IF-2766, IF-2766ET, IF-2767, IF-2769</para>
-          <note>
-            <para>¥Ð¥¹¥Þ¥¹¥¿Å¾Á÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë
-              <literal>flags 0x50000</literal> ¤¬É¬Í×.</para>
-          </note>
-        </listitem>
-      </itemizedlist>
-    </para>
-
-    <para arch="pc98">NEC PC-9801-55, 92 ¤ª¤è¤Ó¤½¤Î¸ß´¹ C-Bus SCSI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹ (bs ¥É¥é¥¤¥Ð)
-      <itemizedlist>
-        <listitem>
-          <para>NEC PC-9801-55, 92 ¤ª¤è¤Ó¤½¤Î¸ß´¹µ¡´ï</para>
-          <para>ICM IF-2660</para>
-          <para>Midori-Denshi MDC-554NA</para>
-          <para>Logitec LHA-N151</para>
-          <note>
-            <para>DMA žÁ÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë "flags 0x00000" ¤¬É¬Í×.
-	    </para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>I-O DATA SC-98II</para>
-          <note>
-            <para>DMA žÁ÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë "flags 0x10000" ¤¬É¬Í×.
-	    </para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>TEXA HA-55BS2 ¤ª¤è¤Ó¸å·Ñµ¡</para>
-          <para>Midori-Denshi MDC-926Rs</para>
-          <note>
-            <para>¥Ð¥¹¥Þ¥¹¥¿Å¾Á÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë "flags 0x20000"
-	      ¤¬É¬Í×.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>ELECOM Bus-master SCSI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</para>
-          <note>
-            <para>¥Ð¥¹¥Þ¥¹¥¿Å¾Á÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë "flags 0x30000"
-	      ¤¬É¬Í×.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>¤¹¤Ù¤Æ¤Î SMIT žÁ÷¼° SCSI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</para>
-          <note>
-            <para>SMIT žÁ÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë "flags 0x40000" ¤¬É¬Í×.
-	    </para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>Logitec LHA-20x ¥·¥ê¡¼¥º</para>
-          <para>ICM IF-2766, IF-2766ET, IF-2767, IF-2769</para>
-          <note>
-            <para>¥Ð¥¹¥Þ¥¹¥¿Å¾Á÷¥â¡¼¥É¤Ë¤Ï¥«¡¼¥Í¥ëÀßÄê¤Ë "flags 0x50000"
-	      ¤¬É¬Í×.</para>
-          </note>
-        </listitem>
-      </itemizedlist>
-    </para>
-
-
     &hwlist.adv;
 
     &hwlist.adw;
@@ -211,6 +105,8 @@
 	¤³¤ì¤é¤Î¥³¥ó¥È¥í¡¼¥é¤«¤é¤Îµ¯Æ°¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£</para>
     </note>
 
+    &hwlist.arcmsr;
+
     &hwlist.mlx;
 
       <note>
@@ -407,8 +303,17 @@
 
     &hwlist.vge;
 
+    &hwlist.nve;
+
   </sect2>
 
+  <sect2 id="tokenring">
+    <title>¥È¡¼¥¯¥ó¥ê¥ó¥°¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹</title>
+
+    &hwlist.oltr;
+
+  </sect2>
+
   <sect2 id="fddi">
     <title>FDDI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</title>
     <para arch="i386,pc98,alpha">DEC DEFPA PCI (&man.fpa.4; ¥É¥é¥¤¥Ð)</para>
@@ -697,17 +602,9 @@
       </itemizedlist>
     </para>
 
-    <para arch="i386">SDL Communication ¥·¥ê¥¢¥ë¥Ü¡¼¥É
-      <itemizedlist>
-        <listitem>
-	  <para>SDL Communications Riscom/8 ¥·¥ê¥¢¥ë¥Ü¡¼¥É (rc ¥É¥é¥¤¥Ð)</para>
-	</listitem>
-        <listitem>
-	  <para>SDL Communications RISCom/N2 ¤ª¤è¤Ó N2pci
-            ¹â®Ʊ´ü¼°¥·¥ê¥¢¥ë¥«¡¼¥É (&man.sr.4; ¥É¥é¥¤¥Ð)</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.rc;
+
+    &hwlist.sr;
 
     <!-- 2002/03/03 hrs: "enhanced" is a part of product name? -->
     <para arch="i386,amd64">Specialix SI/XIO/SX ¥Þ¥ë¥Á¥Ý¡¼¥È¥·¥ê¥¢¥ë¥«¡¼¥É¡£
@@ -770,96 +667,53 @@
 
   </sect2>
 
-  <sect2 id="audio">
-    <title>¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹</title>
+  <sect2 id="sound">
+    <title>¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹</title>
+
+    &hwlist.sound;
 
     &hwlist.snd.ad1816;
 
-    &hwlist.snd.cs4281;
+    &hwlist.snd.als4000;
 
-    &hwlist.snd.solo;
+    &hwlist.snd.audiocs;
 
-    <para arch="i386,amd64">Advance (&man.sbc.4; ¥É¥é¥¤¥Ð)
-      <itemizedlist>
-        <listitem>
-	  <para>Asound 100 ¤ª¤è¤Ó 110</para>
-	</listitem>
-        <listitem>
-	  <para>Logic ALS120 ¤ª¤è¤Ó ALS4000</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.cmi;
 
-    &hwlist.snd.cmi;
+    &hwlist.snd.cs4281;
 
     &hwlist.snd.csa;
 
+    &hwlist.snd.ds1;
+
+    &hwlist.snd.emu10k1;
+
     &hwlist.snd.es137x;
 
     &hwlist.snd.ess;
 
-    <para arch="i386,alpha,amd64">ESS
-      <itemizedlist>
-        <listitem>
-	  <para>ES1868, ES1869, ES1879, ES1888 (&man.sbc.4; ¥É¥é¥¤¥Ð)</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.fm801;
 
-    &hwlist.snd.maestro;
-
-    &hwlist.snd.maestro3;
-
-    <para arch="i386,amd64">ForteMedia fm801</para>
-
     &hwlist.snd.gusc;
 
-    <para arch="i386,amd64">Intel 443MX, 810, 815, 815E Æâ¢¤Î¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹
-      (&man.pcm.4; ¥É¥é¥¤¥Ð)</para>
+    &hwlist.snd.ich;
 
-    <para arch="i386,alpha,amd64">MSS/WSS ¸ß´¹ DSP (&man.pcm.4; ¥É¥é¥¤¥Ð)</para>
+    &hwlist.snd.maestro;
 
-    <para arch="i386,amd64">NeoMagic 256AV/ZX (&man.pcm.4; ¥É¥é¥¤¥Ð)</para>
+    &hwlist.snd.maestro3;
 
-    <para arch="i386,amd64">OPTi 931/82C931 (&man.pcm.4; ¥É¥é¥¤¥Ð)</para>
+    &hwlist.snd.neomagic;
 
-    <para arch="i386,amd64">S3 Sonicvibes</para>
+    &hwlist.snd.sbc;
 
-    <para arch="i386,alpha,amd64">Creative Technologies SoundBlaster ¥·¥ê¡¼¥º (&man.sbc.4; ¥É¥é¥¤¥Ð)
-      <itemizedlist>
-        <listitem>
-	  <para>SoundBlaster</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster Pro</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster AWE-32</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster AWE-64</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster AWE-64 GOLD</para>
-	</listitem>
-        <listitem>
-	  <para>SoundBlaster ViBRA-16</para>
-	</listitem>
-      </itemizedlist>
-    </para>
+    &hwlist.snd.solo;
 
-    &hwlist.snd.emu10k1;
+    &hwlist.snd.via8233;
 
-    <para arch="i386,amd64">Trident 4DWave DX/NX (&man.pcm.4; ¥É¥é¥¤¥Ð)</para>
+    &hwlist.snd.via82c686;
 
-    <para arch="i386,amd64">VIA Technologies VT82C686A</para>
+    &hwlist.snd.vibes;
 
-    &hwlist.snd.ds1;
-
-    &hwlist.snd.ich;
-
-    &hwlist.snd.audiocs;
-
     <para arch="pc98">NEC PC-9801-73, 86 ¤ª¤è¤Ó¤½¤Î¸ß´¹ÉÊ (nss ¥É¥é¥¤¥Ð)
       <itemizedlist>
         <listitem>
@@ -885,16 +739,13 @@
         </listitem>
       </itemizedlist>
     </para>
-
-    <para arch="pc98">SoundBlaster(98) ¤Î¥¸¥ç¥¤¥¹¥Æ¥£¥Ã¥¯¥Ý¡¼¥È (&man.joy.4
-      ¥É¥é¥¤¥Ð)</para>
   </sect2>
 
   <sect2 id="camera">
     <title>¥«¥á¥é¤ª¤è¤Ó¥Ó¥Ç¥ª¥­¥ã¥×¥Á¥ã¥Ç¥Ð¥¤¥¹</title>
 
-    <para arch="i386,pc98">Brooktree Bt848/849/878/879 ¥Ù¡¼¥¹¤Î¥Õ¥ì¡¼¥à¥°¥é¥Ð
-      (&man.bktr.4; ¥É¥é¥¤¥Ð)</para>      
+    &hwlist.bktr;
+
     <para arch="i386">Connectix QuickCam</para>
   </sect2>
 
@@ -1028,8 +879,8 @@
 
       <note>
         <para>ÆÃÄê¤Î¥Ó¥Ç¥ª¥«¡¼¥É¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤È
-          <application>XFree86</application> ¤È¤Î¸ß´¹À­¤Ï <ulink
-            url="http://www.xfree86.org/"></ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+          <application>Xorg</application> ¤È¤Î¸ß´¹À­¤Ï <ulink
+            url="http://www.x.org/"></ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
       </note>
     </para>
 
@@ -1070,8 +921,8 @@
       <note>
        <para>&os; ¤Ç¥Ý¥¤¥ó¥Æ¥£¥ó¥°¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ëºÝ¤Î¾Ü¤·¤¤¾ðÊó¤Ï
          ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸ &man.moused.8; ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-         <application>XFree86</application> ¤ÇÍøÍѤ¹¤ëºÝ¤Î¾ðÊó¤Ï
-         <ulink url="http://www.xfree86.org/"></ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+         <application>Xorg</application> ¤ÇÍøÍѤ¹¤ëºÝ¤Î¾ðÊó¤Ï
+         <ulink url="http://www.x.org/"></ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
       </note>
 
     </para>

==== //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml,v 1.1 2004/10/24 14:31:27 hrs Exp $ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml,v 1.2 2005/06/27 17:48:20 rushani Exp $ -->
 
 <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e '&man.aac.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.43922be022d49dabc274b2afffd0db8b '&man.adv.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë SCSI ¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
@@ -12,7 +12,8 @@
 <!ENTITY hwlist.4e2067474092f3601ed4a08e40e51ff2 'SCSI ¤òÆâ¢¤·¤¿Â¿¤¯¤Î¥Þ¥¶¡¼¥Ü¡¼¥É'>
 <!ENTITY hwlist.ccfe391ca2c0ac72c3d85d4d1c21d9fb '&man.ahd.4; ¥É¥é¥¤¥Ð¤Ï°Ê²¼¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.b2f83b643fc8ceb4ac19e22a28600786 '&man.amd.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.605e6ab5496571df6899f2fd107669ba '&man.amr.4; ¥É¥é¥¤¥Ð¤Ï°Ê²¼¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.72f6158faefdb12346bc627163794c6a '&man.amr.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.b15e9a237ad4fd8ff4d1e302d35b5d0e '&man.arcmsr.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.a6a898c40c4bbb090be33d01b44c3542 '&man.asr.4; ¤¬¸½ºßÂбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.24043b14b616a68778dd242eea1f8910 '&man.ath.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.b7fbd0ed7571b68cbe9428ac3c2255af 'ºÇ¿·¤Î¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï <ulink url=&#34;http:&#47;&#47;customerproducts&#46;atheros&#46;com&#47;customerproducts&#34;><&#47;ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£'>
@@ -24,10 +25,11 @@
 <!ENTITY hwlist.bbffe48fbcd41cee6022c6d7af523161 '¥ª¥ê¥¸¥Ê¥ë¤Î Xircom Netwave AirSurfer ¤Ë¤Ä¤¤¤Æ¤Ï cnw&#40;4&#41; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.a47714c8ac79c305dc24de117983c1b2 '&man.axe.4; ¥É¥é¥¤¥Ð¤Ï ASIX Electronics AX88172 ¥Ù¡¼¥¹¤Î USB Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.4ef588c76d5000d7934c88d3ea8dc374 '&man.bge.4; ¥É¥é¥¤¥Ð¤Ï Broadcom BCM570x ¥Õ¥¡¥ß¥ê Gigabit Ethernet ¥³¥ó¥È¥í¡¼¥é¥Á¥Ã¥×¥Ù¡¼¥¹¤Î¤µ¤Þ¤¶¤Þ¤Ê NIC ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.6df0411510c2b97e8f2fb11895a1e0e1 '&man.bktr.4; ¥É¥é¥¤¥Ð¤Ï Brooktree Bt848&#47;849&#47;878&#47;879 ¥Á¥Ã¥×¥Ù¡¼¥¹¤Î¥Ó¥Ç¥ª¥­¥ã¥×¥Á¥ã¥«¡¼¥É¤ª¤è¤Ó Pinnacle PCTV ¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.18fa1a4af00956e506712b4ea27b097d '&man.bt.4; ¥É¥é¥¤¥Ð¤Ï BusLogic MultiMaster <quote>W<&#47;quote>&#44; <quote>C<&#47;quote>&#44; <quote>S<&#47;quote> ¤ª¤è¤Ó <quote>A<&#47;quote> ¥·¥ê¡¼¥º¤È¤½¤Î¸ß´¹ SCSI ¥Û¥¹¥È¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.363522c4c2f26972a4496dca682abf79 '&man.bt.4; ¥É¥é¥¤¥Ð¤Ï BusLogic MultiMaster ¤Î´°Á´¤Ê¥¯¥í¡¼¥ó¤Ç¤¢¤ë AMI FastDisk ¥Û¥¹¥È¥¢¥À¥×¥¿¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.8a0f71d10104f37e0bdbf8e1c391066d '&man.ciss.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.721bf0142a0546b1be757afc78e97b4f '&man.cm.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¥â¥¸¥å¡¼¥ë¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.721bf0142a0546b1be757afc78e97b4f '&man.cm.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¥â¥Ç¥ë¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.cdfe34e989d5b63c24ef681f56b3d3a9 '&man.cnw.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.64c9c7e0823d41af15e7c00a85703d14 '&man.cue.4; ¥É¥é¥¤¥Ð¤Ï CATC USB&#45;EL1210A ¥Ù¡¼¥¹¤Î USB Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.a2e170e7151d1b581466e61a99335688 '&man.dc.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥Á¥Ã¥×¥»¥Ã¥È¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
@@ -40,15 +42,16 @@
 <!ENTITY hwlist.43d766ad53c1d29a1fd650c658080277 '&man.dpt.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë RAID ¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.5c7012c07d39cdb76bde008815240fb6 '&man.ed.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë Ethernet NIC ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.5c3574b72fb272c7edea557474a2b54c 'C&#45;Bus&#44; ISA&#44; PCI ¤ª¤è¤Ó PC Card ¥Ç¥Ð¥¤¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
-<!ENTITY hwlist.8b106ed08294ac206b18bc26e0a441e6 '&man.em.4; ¥É¥é¥¤¥Ð¤Ï Intel 82540&#44; 82541PI&#44; 82542&#44; 82543&#44; 82544&#44; 82546&#44; 82546EB ¤ª¤è¤Ó 82547 ¥³¥ó¥È¥í¡¼¥é¥Á¥Ã¥×¥Ù¡¼¥¹¤Î Gigabit Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
-<!ENTITY hwlist.0f1fafddd537ac0bdb17319af4353735 '&man.fwohci.4; ¥É¥é¥¤¥Ð¤Ï PCI&#47;CardBus firewire ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë IEEE 1394 OHCI ¥Á¥Ã¥×¥»¥Ã¥È¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.ffb8b63e66eb017d1fb18754c80430d7 '&man.em.4; ¥É¥é¥¤¥Ð¤Ï Intel 82540&#44; 82541ER&#44; 82541PI&#44; 82542&#44; 82543&#44; 82544&#44; 82545&#44; 82546&#44; 82546EB&#44; 82546GB&#44; 82547 ¤ª¤è¤Ó 82573 ¥³¥ó¥È¥í¡¼¥é¥Á¥Ã¥×¥Ù¡¼¥¹¤Î Gigabit Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.e2b591911c3076569a942543c565671d '&man.fwohci.4; ¥É¥é¥¤¥Ð¤Ï PCI&#47;CardBus FireWire ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë IEEE 1394 OHCI ¥Á¥Ã¥×¥»¥Ã¥È¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.9dfd22a483b0fe25691900103983587a '&man.fxp.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.b6d8bafb641a9a90c6cf5cc47795697d 'Intel À½¥Þ¥¶¡¼¥Ü¡¼¥É¤ËÆâ¢¤µ¤ì¤Æ¤¤¤ë¿¤¯¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹'>
 <!ENTITY hwlist.4b7a23108cafef2da95c563c85259f3c '&man.gem.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.33ae232115e1314115c765212edf588a '&man.gx.4; ¥É¥é¥¤¥Ð¤Ï Intel 82542 ¤ª¤è¤Ó 82543 ¥³¥ó¥È¥í¡¼¥é¥Á¥Ã¥×¥Ù¡¼¥¹¤Î Gigabit Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
-<!ENTITY hwlist.ff14b57bb9797076cefd645b2b169719 '°Ê²¼¤Î¥Ç¥Ð¥¤¥¹¤Ë¸½ºßÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.1e96956d4d3fb40f42f78f602705c3ba '&man.hfa.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.ea2a57034a0f12ef1fa0b0035234674b '&man.hifn.4; ¥É¥é¥¤¥Ð¤Ï Hifn 7751&#44; 7951&#44; 7811&#44; 7955 ¤ª¤è¤Ó 7956 ¥Á¥Ã¥×¥»¥Ã¥È¤ò´Þ¤à¤µ¤Þ¤¶¤Þ¤Ê¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.f56cdcc9214f4834064f0eec2ffb3c6c '&man.hme.4; ¥É¥é¥¤¥Ð¤Ï¿ô¿¤¯¤Î Sun UltraSPARC ¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤ª¤è¤Ó¥µ¡¼¥Ð¥â¥Ç¥ëÆâ¢¤Î Ethernet ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£&man.hme.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.9e7fa064c78912746e7f5475717f7566 '&man.hptmv.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë ATA RAID ¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.94511dcc4f50af600597c880ea0d6f9c '&man.ida.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.0e2a9ca39513c2f31f4a4270e5acb6af '&man.iir.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.260cb4f7d35db411e8c8acf1134db9cb 'Intel ¤«¤éÍøÍѲÄǽ¤ÊºÇ¿·¤Î¥Õ¥¡¡¼¥à¥¦¥§¥¢¤ò»È¤Ã¤Æ SRCU31 ¤ª¤è¤Ó SRCU31L ¤ò¹¹¿·¤Ç¤­¤Þ¤¹¡£'>
@@ -61,17 +64,23 @@
 <!ENTITY hwlist.1626a467342e2a1f87355565ce2846c8 '¼çÍפʥê¥Ó¥¸¥ç¥ó&#40;2&#46;x&#44; 3&#46;x&#44; 4&#46;x ¤ª¤è¤Ó 5&#46;x&#41; ¤Î¥Õ¥¡¡¼¥à¥¦¥§¥¢¤¹¤Ù¤Æ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¤¬¡¢¥³¥ó¥È¥í¡¼¥é¤ÇÍøÍѲÄǽ¤ÊºÇ¿·¤Î¥Õ¥¡¡¼¥à¥¦¥§¥¢¤Ë¹¹¿·¤¹¤ë¤³¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤¤ Mylex ¥³¥ó¥È¥í¡¼¥é¤Î¸ß´¹Éʤ⤪¤½¤é¤¯Æ°ºî¤¹¤ë¤È»×¤ï¤ì¤Þ¤¹¤¬¡¢»î¸³¤Ï¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'>
 <!ENTITY hwlist.b2d78d641e881d4993824d51db88272b '&man.mly.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.a5109377f7126bd130f0b7dde68a3665 '¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤¤ Mylex ¥³¥ó¥È¥í¡¼¥é¤Î¸ß´¹Éʤ⤪¤½¤é¤¯Æ°ºî¤¹¤ë¤È»×¤ï¤ì¤Þ¤¹¤¬¡¢»î¸³¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'>
+<!ENTITY hwlist.0fecf03242b8c2b439f69e438051ac74 '&man.mn.4; ¥É¥é¥¤¥Ð¤Ï Siemens Easy321&#45;R1 E1&#47;T1 ¥ê¥Õ¥¡¥ì¥ó¥¹Àß·×¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.2aba100fbd3734b5402a30fc860ded2c '&man.mpt.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.e8a6bb9169393b0aa0bd2e0cf7ffcaef '&man.mpt.4; ¥É¥é¥¤¥Ð¤Ï¿¤¯¤Î¥·¥¹¥Æ¥à¤¬Æâ¢¤·¤Æ¤¤¤ë SCSI ¥³¥ó¥È¥í¡¼¥é¥Á¥Ã¥×¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.8d40cd179c0ba2baab86acc5651afd2a '&man.mpt.4; ¥É¥é¥¤¥Ð¤Ï¿¤¯¤Î¥·¥¹¥Æ¥à¤¬Æâ¢¤·¤Æ¤¤¤ë SCSI ¥³¥ó¥È¥í¡¼¥é¥Á¥Ã¥×¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.0a0d6824695fb31496685bb3c197f660 '&man.my.4; ¥É¥é¥¤¥Ð¤Ï Myson ¥Á¥Ã¥×¥»¥Ã¥È¥Ù¡¼¥¹¤Î¤µ¤Þ¤¶¤Þ¤Ê NIC ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£Âбþ¤·¤Æ¤¤¤ë¥â¥Ç¥ë¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.679e16db9880a62847fb27373e91eb6d '&man.ncr.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë NCR&#47;Symbios SCSI ¥³¥ó¥È¥í¡¼¥é¥Á¥Ã¥×¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.1537270cb758f4bede2e7a81bafe7018 '°Ê²¼¤Î³°Éեܡ¼¥É¤Ë¤âÂбþ¤·¤Æ¤¤¤ë¤³¤È¤¬ÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.0ead896f8221a4e58c9bba9f054d0703 '&man.ncv.4; ¥É¥é¥¤¥Ð¤¬¸½ºßÂбþ¤·¤Æ¤¤¤ë¥Ç¥Ð¥¤¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.1bd2c4e4dbf8e49e1dfd69ddb89a6db2 '&man.ng.bt3c.4; ¥É¥é¥¤¥Ð¤Ï 3Com&#47;HP 3CRWB6096&#45;A PCCARD bluetooth ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.584e542589112934a1074c60a7371df0 '&man.ng.ubt.4; ¥É¥é¥¤¥Ð¤Ï Bluetooth v1&#46;1 ¼ÂÁõ¤Ë½àµò¤·¤¿¤¹¤Ù¤Æ¤Î Bluetooth USB ¥Ç¥Ð¥¤¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.768431e3e056920765911205a692d4f6 '&man.nge.4; ¥É¥é¥¤¥Ð¤Ï National Semiconductor DP83820 ¤ª¤è¤Ó DP83821 ¥Ù¡¼¥¹¤Î Gigabit Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.3f1863e7149bd75205c4c470508849ab '&man.nsp.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.d6e390f3eeb18215bf7061d249e6fd8d '&man.nve.4; ¥É¥é¥¤¥Ð¤Ï°Ê²¼¤Î¥Á¥Ã¥×¥»¥Ã¥È¤òÅëºÜ¤·¤¿¥Þ¥¶¡¼¥Ü¡¼¥É¤Î NVIDIA MCP ¥ª¥ó¥Ü¡¼¥É¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.54163214a88d94b4fbb628765a6d15e9 '&man.ohci.4; ¥É¥é¥¤¥Ð¤Ï OHCI v1&#46;0 ½àµò¤Î¤¹¤Ù¤Æ¤Î¥³¥ó¥È¥í¡¼¥é¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.2a4b7e254ff87dc83da1876043a7c007 '&man.sound.4; ¥É¥é¥¤¥Ð¤Ï°Ê²¼¤Î¥µ¥¦¥ó¥É¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.532133face40ce3dfa3792b6090bf113 '&man.pcn.4; ¥É¥é¥¤¥Ð¤Ï AMD PCnet&#47;FAST&#44; PCnet&#47;FAST&#43;&#44; PCnet&#47;FAST III&#44; PCnet&#47;PRO ¤ª¤è¤Ó PCnet&#47;Home Fast Ethernet ¥Á¥Ã¥×¥Ù¡¼¥¹¤Î¥¢¥À¥×¥¿¤ª¤è¤ÓÁȤ߹þ¤ß¥³¥ó¥È¥í¡¼¥é¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.b89a4fb9f0c2a59c991af44d778596e1 '&man.pst.4; ¥É¥é¥¤¥Ð¤Ï Promise Supertrak SX6000 ATA ¥Ï¡¼¥É¥¦¥§¥¢ RAID ¥³¥ó¥È¥í¡¼¥é¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.c2875a10d870ef5948a306802a3eb27c '&man.rc.4; ¥É¥é¥¤¥Ð¤Ï SDL Communications RISCom&#47;8 ¥Ü¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.71d961a38d4813453d534cf60a7bf1c0 '&man.re.4; ¥É¥é¥¤¥Ð¤Ï RealTek RTL8139C&#43;&#44; RTL8169&#44; RTL8169S ¤ª¤è¤Ó RTL8110S ¥Ù¡¼¥¹¤Î Fast Ethernet ¤ª¤è¤Ó Gigabit Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.049ae823a29aef6d22653e8780a5d51b '&man.rl.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.0309eaa8ea5fc2b405d6359269568f86 '&man.rue.4; ¥É¥é¥¤¥Ð¤Ï RealTek RTL8150 ¥Ù¡¼¥¹¤Î USB Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
@@ -80,20 +89,29 @@
 <!ENTITY hwlist.97e48240aa7ee522f8168bb0ad1fe6d1 '&man.sis.4; ¥É¥é¥¤¥Ð¤Ï Silicon Integrated Systems SiS 900 ¤ª¤è¤Ó SiS 7016 ¥Ù¡¼¥¹¤Î Fast Ethernet ¥¢¥À¥×¥¿¤ª¤è¤ÓÁȤ߹þ¤ß¥³¥ó¥È¥í¡¼¥é¡¢National Semiconductor DP83815 &#40;MacPhyter&#41; ¥Á¥Ã¥×¥Ù¡¼¥¹¤Î Fast Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.e0988c23826ec248e8efc038dfbf111f '&man.sk.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.ee021ce8a0d8bd78a6e9e7200851181a '&man.sn.4; ¥É¥é¥¤¥Ð¤Ï SMC9xxx ¥Ù¡¼¥¹¤Î ISA ¤ª¤è¤Ó PCMCIA ¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
-<!ENTITY hwlist.23329d3c1cef6e53f40bcc656f94a6b9 '&man.snd.ad1816.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.fe73d6ddaab51bcc8cb7f9e829113a73 '&man.snd.als4000.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.ae0e3e32462badacd47736e322f92b48 '&man.snd.cmi.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.f694c5b8f37f6a18b7f8261ac68871da '&man.snd.cs4281.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.e690e006a7215ae8c14b686364272b6a '&man.snd.csa.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.ad34498f56b94bcff7dc9243db266e4c '&man.snd.ad1816.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.7b418bf21d9b6039934a1b926b093195 '&man.snd.als4000.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.5f7f9afb4483ff1bdff1219214a9073c '&man.snd.cmi.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.b4e3a832b1a55045a38edc20e6b4df3a '&man.snd.cs4281.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.9b49445e7dfa4e5f3e95a24a2a9bbf5c '&man.snd.csa.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.e2a200b134158f3d54346eddf3e05244 '¤¤¤¯¤Ä¤«¤Î¥ª¥ó¥Ü¡¼¥É¤Î CS4610 ¥Á¥Ã¥×¤Ï CS4297 AC97 ¤Ç¤Ï¤Ê¤¯ CS423x ISA ¥³¡¼¥Ç¥Ã¥¯¤È¤È¤â¤ËÅëºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£&man.snd.csa.4; ¥É¥é¥¤¥Ð¤Ï¤³¤Î¤è¤¦¤Ê¹½À®¤Ë¤Þ¤ÀÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£'>
-<!ENTITY hwlist.6acf6633674229b843e9f9f8adc0ed30 '&man.snd.ds1.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.047130f4ab914f933c5e55ff5247f697 '&man.snd.emu10k1.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.f1b7c2bba461df0c26bd84552c3741a8 '&man.snd.ds1.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.07cc6d1fc2e38416cea9200af6b1dba0 '&man.snd.emu10k1.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.4761928e208651a00bb75cb4e5b4ae5b '&man.snd.es137x.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.fff1deab29df8dc27eb9338f645fd40a 'ES1370&#47;1371 ¥Á¥Ã¥×¥»¥Ã¥È¤òÅëºÜ¤·¤¿¤¹¤Ù¤Æ¤Î¥«¡¼¥É &#40;SoundBlaster PCI128 ¤ò´Þ¤à&#41;'>
-<!ENTITY hwlist.394c7272b9c9770e7f705772b41ff3cb '&man.snd.ess.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.607f17c8d900df1b30109708e63ccb54 '&man.snd.gusc.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.3afa5dfff8edecfa593432eaa480848a '&man.snd.solo.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.056d674fe1950d6be72d83c3ebbefdf5 '&man.snd.ess.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.9f2626b70240b74e01ca238a12691123 '&man.snd.fm801.4; ¥É¥é¥¤¥Ð¤Ï°Ê²¼¤Î¥Á¥Ã¥×¥»¥Ã¥È¥Ù¡¼¥¹¤Î¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.ce48e0b855b3c5375c1edbe1ddb7051e '&man.snd.gusc.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.f6d273d0d630af06cc5ddfe89dfb7a7b '&man.snd.ich.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.5f5766c47253be04b5ab28afce3cd619 '&man.snd.maestro.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë PCI ¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.6954a1334ef0d843ba16839865201a5d '&man.snd.maestro3.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.859d83a93125cf7c4dd8b14c5a62eb69 '&man.snd.neomagic.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.b7b5ac30bf408e9efa9eae4c307a3564 '&man.snd.sbc.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.5c8a068e76981ba8293f414b9f43c29a '&man.snd.solo.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.8ac14722508211127d79a2e3b6d109ac 'ES18xx ¥Á¥Ã¥×¥»¥Ã¥È¤òÅëºÜ¤·¤¿¸Å¤¤ ESS ISA ¥«¡¼¥É¤Ë¤Ä¤¤¤Æ¤Ï snd&#95;ess&#40;4&#41; ¤â¤·¤¯¤Ï snd&#95;sbc&#40;4&#41; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£'>
+<!ENTITY hwlist.5a5c5b85e01adc2f0accbf531676d0b3 '&man.snd.via8233.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥ª¡¼¥Ç¥£¥ª¥Á¥Ã¥×¥»¥Ã¥È¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.38ac33fe29d9215e56f0c4e8f42b2d6d '&man.snd.via82c686.4; ¥É¥é¥¤¥Ð¤Ï°Ê²¼¤Î¥Á¥Ã¥×¥»¥Ã¥È¥Ù¡¼¥¹¤Î¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.e688a5843719661e200e677735d50993 '&man.snd.vibes.4; ¥É¥é¥¤¥Ð¤Ï°Ê²¼¤Î¥Á¥Ã¥×¥»¥Ã¥È¥Ù¡¼¥¹¤Î¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.ccdfcc794c876cba45c1a81a7ea2e3fe '&man.ste.4; ¥É¥é¥¤¥Ð¤Ï Sundance Technologies ST201 ¥Ù¡¼¥¹¤Î Fast Ethernet ¥¢¥À¥×¥¿¤ª¤è¤ÓÁȤ߹þ¤ß¥³¥ó¥È¥í¡¼¥é¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.14064ff2324d7e3f84a67f49890d600b '&man.stg.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.f56cd963cebedc043a8ee2997cb4538a 'Adaptec 2920C ¥¢¥À¥×¥¿¤Ë¤Ä¤¤¤Æ¤Ï ahc&#40;4&#41; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£'>
@@ -105,16 +123,19 @@
 <!ENTITY hwlist.2260f7d9d8b90d15338dec03416ac0bd '&man.tl.4; ¥É¥é¥¤¥Ð¤Ï¤µ¤Þ¤¶¤Þ¤Ê Compaq Prosignia ¥µ¡¼¥Ð¤ª¤è¤Ó Compaq Deskpro ¥Ç¥¹¥¯¥È¥Ã¥×Æâ¢¤Î Ethernet ¥¢¥À¥×¥¿¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.db02b4acabc70ffe1c5db08d13246cb9 '&man.trm.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë SCSI¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.19b907a8f7336a3cad51b24e4e133bc7 'Tekram DC&#45;310&#47;U ¤ª¤è¤Ó DC&#45;390F&#47;U&#47;UW&#47;U2B&#47;U2W&#47;U3W PCI SCSI ¥¢¥À¥×¥¿¤Ë¤Ä¤¤¤Æ¤Ï sym&#40;4&#41; ¥É¥é¥¤¥Ð¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£'>
-<!ENTITY hwlist.9b13d1b02cf71c6035b2627cc7ce04fe '&man.twa.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë PATA&#47;SATA RAID ¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
-<!ENTITY hwlist.e5a3133fafcab3494fae217bbc832144 '&man.twe.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë ATA RAID ¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.9c0c1f52f8a863323841d6a8c70872e6 '&man.twa.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë SATA RAID ¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.99a7a57e2171fa8207d196be774df62f '&man.twe.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë PATA&#47;SATA RAID ¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.29ad6a269efd93c15215ea90cba9caf1 '&man.txp.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.9c987130a2024c69ab8eb8350ccba6ef '&man.ubsa.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.44dad25a25e7b1f901f3fe8869a47050 '&man.ubsec.4; ¥É¥é¥¤¥Ð¤Ï°Ê²¼¤Î¥Á¥Ã¥×¤ò´Þ¤à¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
-<!ENTITY hwlist.0010ee7c6f62beb4e820264f81a44df2 '&man.ubser.4; ¥É¥é¥¤¥Ð¤Ï BWCT console management serial ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.18c44f082c51df601e259a42efc01341 '&man.ubser.4; ¥É¥é¥¤¥Ð¤Ï BWCT console management ¥·¥ê¥¢¥ë¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.78e840b0f4efd686fc412de05cc68c7b '&man.ucycom.4; ¤Ï Cypress USB-RS232 ¥Ö¥ê¥Ã¥¸¥Á¥Ã¥×¤òÆâ¢¤·¤¿°Ê²¼¤Î¥Ç¥Ð¥¤¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.24bbbc7cc5ddc693ba1c79ea3b440a1e '&man.udav.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.6029a8138b92c22c3474e7bc218532c2 '&man.uftdi.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.696437175c63c9697e1faed5641c7f52 '&man.uhci.4; ¥É¥é¥¤¥Ð¤Ï UHCI v1&#46;1 ½àµò¤Î¤¹¤Ù¤Æ¤Î¥³¥ó¥È¥í¡¼¥é¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.6677c43264a28d9aa5cc4ce12632e5d8 '&man.ulpt.4; ¥É¥é¥¤¥Ð¤Ï USB ¥×¥ê¥ó¥¿¤ª¤è¤Ó¥Ñ¥é¥ì¥ë¥×¥ê¥ó¥¿ÊÑ´¹¥±¡¼¥Ö¥ë¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.6b7220a228bd275c49a05788d90be42c '&man.umass.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë USB Mass Storage ¥Ç¥Ð¥¤¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.3d544ba6814ddadebdc11a86aec28d94 'Âбþ¤·¤Æ¤¤¤ë¥Ç¥¸¥¿¥ë¥«¥á¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.067f36083a7988c8ebded538a7c0c9fb '&man.umct.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.10217275dd6e2f383066f56392dbd316 '&man.umodem.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥Ç¥Ð¥¤¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.1f502af921a7a5cd4cfe8df4ff527e8a '&man.uplcom.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
@@ -123,6 +144,7 @@
 <!ENTITY hwlist.56c62cdda9540c16750e031908fccfaf '&man.uvisor.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥Ç¥Ð¥¤¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.bdefa22ed37ed9af72cd40040853ee67 '&man.uvscom.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.a9a9c48739e68ce01cf607e5f51291ce '&man.vge.4; ¥É¥é¥¤¥Ð¤Ï VIA Networking VT3119 ¤ª¤è¤Ó VT6122 ¥Ù¡¼¥¹¤Î Gigabit Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.bf24cc4c8ea740503c1ab83e3e05966b '&man.vpo.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë ¥Ñ¥é¥ì¥ë - SCSI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.843e71c7bfdfb8462b3be38b6007857e '&man.vr.4; ¥É¥é¥¤¥Ð¤Ï VIA Technologies Rhine I&#44; Rhine II ¤ª¤è¤Ó Rhine III ¥Ù¡¼¥¹¤Î Fast Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.0b207852263019bee046e75a21f299e4 '&man.wb.4; ¥É¥é¥¤¥Ð¤Ï Winbond W89C840F ¥Ù¡¼¥¹¤Î Fast Ethernet ¥¢¥À¥×¥¿¤ª¤è¤ÓÁȤ߹þ¤ß¥³¥ó¥È¥í¡¼¥é¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.ff13412c53303e70619678cebf8b381c '&man.xe.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
@@ -142,6 +164,12 @@
 <!ENTITY hwlist.01cbcfd29830b2225b0260112f0dd6b7 '&man.ie.4; ¥É¥é¥¤¥Ð¤Ï Intel i82586 ¥Á¥Ã¥×¥Ù¡¼¥¹¤Î 8 ¤ª¤è¤Ó 16bit ISA Ethernet ¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.0693981eaeaebc6d0d400470c81f29d3 '&man.lnc.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.7363ffd109d23743166008d9ae72ce82 '¤³¤ì¤é¤Î¥¢¥À¥×¥¿¤Ï pcn&#40;4&#41; ¥É¥é¥¤¥Ð¤Ç¤âưºî¤·¤Þ¤¹¡£&man.lnc.4; ¥É¥é¥¤¥Ð¤Ï¸ß´¹¥â¡¼¥É¤Ç¤³¤ì¤é¤Î¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤ë¤Î¤Ç pcn&#40;4&#41; ¥É¥é¥¤¥Ð¤ò»È¤¦¤³¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£'>
+<!ENTITY hwlist.bcec6450c71d0de3498c48126d9f96a9 '&man.oltr.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë ISA ¥Ù¡¼¥¹¤Î Olicom ¥È¡¼¥¯¥ó¥ê¥ó¥°¥¢¥À¥×¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.3ea841fb2e41e0408f8b465f273c60c1 '°Ê²¼¤Î PCI ¥Ù¡¼¥¹¤Î¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
 <!ENTITY hwlist.8b6ed4ad05ee2bbbdfb441278c1ebf8f '&man.snc.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.d5b1c477e51869e7cb454c70e5221249 '&man.snc.4; ¥É¥é¥¤¥Ð¤Ï National Semiconductor NS46C46 as 64 &#42; 16 bits Microwave Serial EEPROM ¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.73c7ba1735e16bfd370f670d6f7f7ec1 '&man.sr.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.d0b148add52fd3a2c1593d2fed75a920 '&man.vx.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥«¡¼¥É¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.c6b92ba2243d8c1704e2971bd80b301d '&man.machfb.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥Á¥Ã¥×¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£'>
+<!ENTITY hwlist.3b805ec9eee8b4752851992867518f42 '°Ê²¼¤ÎÁýÀߥ«¡¼¥É¤Ï¡¢&man.machfb.4; ¥É¥é¥¤¥Ð¤Çưºî¤¹¤ë¤³¤È¤¬¤ï¤«¤Ã¤Æ¤¤¤Þ¤¹¡£'>
+<!ENTITY hwlist.6099dff95afa452f801418cdf816cbd7 '&man.snd.audiocs.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>

==== //depot/projects/hammer/share/man/man4/if_bridge.4#3 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.4 2005/06/16 18:46:16 ru Exp $
+.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.5 2005/06/27 10:58:22 thompsa Exp $
 .\"
 .Dd June 10, 2005
 .Dt IF_BRIDGE 4
@@ -155,7 +155,7 @@
 The following will cause a bridge consisting of all 8 ports with Spanning Tree
 enabled to be created:
 .Bd -literal -offset indent
-iconfig bridge0 create
+ifconfig bridge0 create
 ifconfig bridge0 \e
     addm fxp0 stp fxp0 \e
     addm fxp1 stp fxp1 \e

==== //depot/projects/hammer/sys/conf/Makefile.arm#9 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.arm -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.9 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.10 2005/06/27 14:33:32 cognet Exp $
 #
 # Makefile for FreeBSD
 #
@@ -41,6 +41,9 @@
 SYSTEM_LD += -EB
 .endif
 
+.if !defined(DEBUG)
+CFLAGS += -mno-apcs-frame
+.endif
 %BEFORE_DEPEND
 
 %OBJS

==== //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#15 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.18 2005/06/12 16:46:20 mlaier Exp $	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.19 2005/06/26 21:00:52 mlaier Exp $	*/
 /*	$OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $	*/
 
 /*
@@ -224,6 +224,7 @@
 	callout_init(&sc->sc_bulk_tmo, NET_CALLOUT_MPSAFE);
 	callout_init(&sc->sc_bulkfail_tmo, NET_CALLOUT_MPSAFE);
 	callout_init(&sc->sc_send_tmo, NET_CALLOUT_MPSAFE);
+	sc->sc_ifq.ifq_maxlen = ifqmaxlen;
 	mtx_init(&sc->sc_ifq.ifq_mtx, ifp->if_xname, "pfsync send queue",
 	    MTX_DEF);
 	if_attach(ifp);
@@ -1797,7 +1798,7 @@
 
 		pfsyncstats.pfsyncs_opackets++;
 #ifdef __FreeBSD__
-		if (IF_HANDOFF(&sc->sc_ifq, m, NULL))
+		if (!IF_HANDOFF(&sc->sc_ifq, m, NULL))
 			pfsyncstats.pfsyncs_oerrors++;
 		callout_reset(&sc->sc_send_tmo, 1, pfsync_senddef, sc);
 #else

==== //depot/projects/hammer/sys/dev/ata/ata-disk.c#34 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.188 2005/05/16 13:07:26 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.189 2005/06/27 09:12:11 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -203,8 +203,7 @@
     struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct ata_device *atadev = device_get_softc(dev);
 
-    /* if detach pending flag set, return error */
-
+    /* if detach pending, return error */
     if (((atadev->unit == ATA_MASTER) && !(ch->devices & ATA_ATA_MASTER)) ||
 	((atadev->unit == ATA_SLAVE) && !(ch->devices & ATA_ATA_SLAVE))) {
 	return 1;
@@ -340,14 +339,17 @@
 
     ATA_SETMODE(device_get_parent(dev), dev);
 
-    /* enable read caching */
-    ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_ENAB_RCACHE, 0, 0);
+    /* enable readahead caching */
+    if (atadev->param.support.command1 & ATA_SUPPORT_LOOKAHEAD)
+	ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_ENAB_RCACHE, 0, 0);
 
-    /* enable write caching if enabled */
-    if (ata_wc)
-	ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_ENAB_WCACHE, 0, 0);
-    else
-	ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_DIS_WCACHE, 0, 0);
+    /* enable write caching if supported and configured */
+    if (atadev->param.support.command1 & ATA_SUPPORT_WRITECACHE) {
+	if (ata_wc)
+	    ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_ENAB_WCACHE, 0, 0);
+	else
+	    ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_DIS_WCACHE, 0, 0);
+    }
 
     /* use multiple sectors/interrupt if device supports it */
     if (ad_version(atadev->param.version_major)) {

==== //depot/projects/hammer/sys/dev/ata/ata-queue.c#26 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.49 2005/05/11 14:36:26 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.50 2005/06/28 09:06:52 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -355,6 +355,7 @@
 	    bcopy(ccb, request->u.atapi.ccb, 16);
 	    request->data = (caddr_t)&request->u.atapi.sense_data;
 	    request->bytecount = sizeof(struct atapi_sense);
+	    request->donecount = 0;
 	    request->transfersize = sizeof(struct atapi_sense);
 	    request->timeout = 5;
 	    request->flags &= (ATA_R_ATAPI | ATA_R_QUIET);

==== //depot/projects/hammer/sys/dev/sound/pci/csa.c#8 (text+ko) ====

@@ -48,7 +48,7 @@
 
 #include <gnu/dev/sound/pci/csaimg.h>
 
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.32 2005/03/01 08:58:05 imp Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.33 2005/06/27 07:43:57 glebius Exp $");
 
 /* This is the pci device id. */
 #define CS4610_PCI_ID 0x60011013
@@ -87,7 +87,6 @@
 			     struct resource *irq, void *cookie);
 static driver_intr_t csa_intr;
 static int csa_initialize(sc_p scp);
-static void csa_resetdsp(csa_res *resp);
 static int csa_downloadimage(csa_res *resp);
 
 static devclass_t csa_devclass;
@@ -366,15 +365,24 @@
 static int
 csa_resume(device_t dev)
 {
-#if 0
-	/*
-	 * XXX: this cannot possibly work
-	 * needs to be properly implemented
-	 */
-	csa_detach(dev);
-	csa_attach(dev);
-#endif
-	return 0;
+	csa_res *resp;
+	sc_p scp;
+
+	scp = device_get_softc(dev);
+	resp = &scp->res;
+
+	/* Initialize the chip. */
+	if (csa_initialize(scp))
+		return (ENXIO);
+
+	/* Reset the Processor. */
+	csa_resetdsp(resp);
+
+	/* Download the Processor Image to the processor. */
+	if (csa_downloadimage(resp))
+		return (ENXIO);
+
+	return (bus_generic_resume(dev));
 }
 
 static struct resource *
@@ -794,7 +802,7 @@
 		csa_writeio(resp, BA0_CLKCR1, clkcr1);
 }
 
-static void
+void
 csa_resetdsp(csa_res *resp)
 {
 	int i;

==== //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#11 (text+ko) ====

@@ -38,7 +38,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.33 2005/01/06 01:43:19 imp Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.34 2005/06/27 07:43:57 glebius Exp $");
 
 /* Buffer size on dma transfer. Fixed for CS416x. */
 #define CS461x_BUFFSIZE   (4 * 1024)
@@ -70,6 +70,9 @@
 	u_long		pctl;
 	u_long		cctl;
 	struct csa_chinfo pch, rch;
+	u_int32_t	ac97[CS461x_AC97_NUMBER_RESTORE_REGS];
+	u_int32_t	ac97_powerdown;
+	u_int32_t	ac97_general_purpose;
 };
 
 /* -------------------------------------------------------------------- */
@@ -84,8 +87,11 @@
 static void	csa_stopplaydma(struct csa_info *csa);
 static void	csa_stopcapturedma(struct csa_info *csa);
 static int	csa_startdsp(csa_res *resp);
+static int	csa_stopdsp(csa_res *resp);
 static int	csa_allocres(struct csa_info *scp, device_t dev);
 static void	csa_releaseres(struct csa_info *scp, device_t dev);
+static void	csa_ac97_suspend(struct csa_info *csa);
+static void	csa_ac97_resume(struct csa_info *csa);
 
 static u_int32_t csa_playfmt[] = {
 	AFMT_U8,
@@ -112,16 +118,16 @@
 static int
 csa_active(struct csa_info *csa, int run)
 {
-	int old, go;
+	int old;
 
 	old = csa->active;
 	csa->active += run;
 
-	if ((csa->active == 0 && old == 1) || (csa->active == 1 && old == 0)) {
-		go = csa->active;
-		if (csa->card->active)
-			return csa->card->active(go);
-	}
+	if ((csa->active > 1) || (csa->active < -1))
+		csa->active = 0;
+	if (csa->card->active)
+		return (csa->card->active(!(csa->active && old)));
+
 	return 0;
 }
 
@@ -455,6 +461,18 @@
 }
 
 static int
+csa_stopdsp(csa_res *resp)
+{
+	/*
+	 * Turn off the run, run at frame, and DMA enable bits in
+	 * the local copy of the SP control register.
+	 */
+	csa_writemem(resp, BA1_SPCR, 0);
+
+	return (0);
+}
+
+static int
 csa_setupchan(struct csa_chinfo *ch)
 {
 	struct csa_info *csa = ch->parent;
@@ -833,11 +851,169 @@
 	return 0;
 }
 
+static void
+csa_ac97_suspend(struct csa_info *csa)
+{
+	int count, i;
+	uint32_t tmp;
+
+	for (count = 0x2, i=0;
+	    (count <= CS461x_AC97_HIGHESTREGTORESTORE) &&
+	    (i < CS461x_AC97_NUMBER_RESTORE_REGS);
+	    count += 2, i++)
+		csa_readcodec(&csa->res, BA0_AC97_RESET + count, &csa->ac97[i]);
+
+	/* mute the outputs */
+	csa_writecodec(&csa->res, BA0_AC97_MASTER_VOLUME, 0x8000);
+	csa_writecodec(&csa->res, BA0_AC97_HEADPHONE_VOLUME, 0x8000);
+	csa_writecodec(&csa->res, BA0_AC97_MASTER_VOLUME_MONO, 0x8000);
+	csa_writecodec(&csa->res, BA0_AC97_PCM_OUT_VOLUME, 0x8000);
+	/* save the registers that cause pops */
+	csa_readcodec(&csa->res, BA0_AC97_POWERDOWN, &csa->ac97_powerdown);
+	csa_readcodec(&csa->res, BA0_AC97_GENERAL_PURPOSE,

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list