From 6d89bb8e79ecbf10e2d53454cf52abda8337974a Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 2 Sep 2011 09:13:51 +0000
Subject: [PATCH] Merge the following from the English version:

	1.172 -> 1.182	doc/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml

Reference:    [doc-jp-work 2205]
---
 .../books/handbook/kernelconfig/chapter.sgml  | 172 +++++++++++++++---
 1 file changed, 149 insertions(+), 23 deletions(-)

diff --git a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml
index f159b08402..b9c11f9406 100644
--- a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.172
+     Original revision: 1.182
      $FreeBSD$
 -->
 
@@ -139,6 +139,89 @@
     </itemizedlist>
   </sect1>
 
+  <sect1 id="kernelconfig-devices">
+    <sect1info>
+      <authorgroup>
+	<author>
+	  <firstname>Tom</firstname>
+	  <surname>Rhodes</surname>
+	  <contrib>���: </contrib>
+	</author>
+      </authorgroup>
+    </sect1info>
+    <title>�����ƥ�Υϡ��ɥ������ˤĤ����Τ�</title>
+    
+    <para>�����ͥ륳��ե����졼������������Ϥ�����ˡ�
+      ����ԥ塼���Υϡ��ɥ��������������������ɤ��Ǥ��礦��
+      �⤷��&os; �ʳ��Υ��ڥ졼�ƥ��󥰥����ƥब���Ǥ˥��󥹥ȡ��뤵��Ƥ���ΤǤ���С�
+      ���ߥ��󥹥ȡ��뤵��Ƥ��륪�ڥ졼�ƥ��󥰥����ƥ�������Ĵ�٤뤳�Ȥǡ�
+      ��ñ�˰���������Ǥ��ޤ���
+      ���Ȥ��С�&microsoft; ��
+      <application>�ǥХ����ޥ͡�����</application>
+      �ϡ����󥹥ȡ��뤵��Ƥ���ǥХ����˴ؤ�����פʾ������äƤ��ޤ���
+      <application>�ǥХ����ޥ͡�����</application> �ϡ�
+      ����ȥ�����ѥͥ뤫�鳫�����Ȥ�����ޤ���</para>
+
+    <note>
+      <para>&microsoft.windows; �ΥС������ˤ�äƤϡ�
+	<application>�ǥХ����ޥ͡�����</application>
+	�˥���������ǽ�ʥ�����ɥ���ɽ������
+	<application>�����ƥ�</application> �������󤬤���ޤ���</para>
+    </note>
+
+    <para>�⤷¾�Υ��ڥ졼�ƥ��󥰥����ƥब����ԥ塼���˥��󥹥ȡ��뤵��Ƥ��ʤ��ΤǤ���С�
+      �����ԤϤ����ξ�����ư�Ǽ�������ɬ�פ�����ޤ���
+      �ҤȤĤ���ˡ����&man.dmesg.8; �桼�ƥ���ƥ������
+      &man.man.1; ���ޥ�ɤ��Ѥ�����ˡ�Ǥ���
+      &os; �ΤۤȤ�ɤΥǥХ����ɥ饤�Фˤϥޥ˥奢��ڡ������Ѱդ��졢
+      �б����Ƥ���ϡ��ɥ������ΰ������󶡤��Ƥ��ޤ���
+      �ޤ�����ư���ˤϸ��Ф��줿�ϡ��ɥ������ΰ�����ɽ������ޤ���
+      ���Ȥ��С��ʲ��ιԤϡ�<devicename>psm</devicename>
+      �ɥ饤�Ф��ޥ����򸡽Ф������Ȥ򼨤��Ƥ��ޤ���</para>
+
+    <programlisting>psm0: &lt;PS/2 Mouse&gt; irq 12 on atkbdc0
+psm0: [GIANT-LOCKED]
+psm0: [ITHREAD]
+psm0: model Generic PS/2 mouse, device ID 0</programlisting>
+
+    <para>���Υɥ饤�Ф��������५���ͥ륳��ե����졼�����ե�����˴ޤޤ�Ƥ��롢
+      �⤷���� &man.loader.conf.5; �ˤ�ä��ɤ߹��ޤ��ɬ�פ�����ޤ���</para>
+
+    <para>���ˤ�äƤϡ�<command>dmesg</command> ����ư���θ��з�̤ǤϤʤ���
+      �����ƥ��å�����������ɽ�����뤳�Ȥ�����ޤ���
+      ���Τ褦�ʾ��ˤϡ�<filename>/var/run/dmesg.boot</filename>
+      �ե�����򸫤뤳�Ȥǡ����Ϥ��ǧ�Ǥ��ޤ���</para>
+
+    <para>�ϡ��ɥ������򸫤Ĥ��뤿��Τ⤦�ҤȤĤ���ˡ�ϡ�
+      ����Ĺ�ʽ��Ϥ�Ԥ� &man.pciconf.8; �桼�ƥ���ƥ����Ѥ�����ˡ�Ǥ���
+      ���Ȥ��С��ʲ��Τ褦�ˤʤ�ޤ���</para>
+
+    <programlisting>ath0@pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
+    vendor     = 'Atheros Communications Inc.'
+    device     = 'AR5212 Atheros AR5212 802.11abg wireless'
+    class      = network
+    subclass   = ethernet</programlisting>
+
+    <para><command>pciconf <option>-lv</option></command> ���Ѥ��������뤳�ν��Ϥϡ�
+      <devicename>ath</devicename>
+      �ɥ饤�Ф��磻��쥹�������ͥåȥǥХ����ˤ��뤳�Ȥ򼨤��Ƥ��ޤ���
+      <command>man <replaceable>ath</replaceable></command> ��¹Ԥ����
+      &man.ath.4; �Υޥ˥奢��ڡ�����ɽ������ޤ���</para>
+
+    <para>&man.man.1; �� <option>-k</option> �ե饰�Ǽ¹Ԥ���ȡ�
+      ͭ�Ѥʾ�������뤳�Ȥ��Ǥ��ޤ�����Υ������Ǥϰʲ��Τ褦�ˤʤ�ޤ���</para>
+
+    <screen>&prompt.root; man -k <replaceable>Atheros</replaceable></screen>
+
+    <para>���������ñ���ޤ�ޥ˥奢��ڡ����ΰ�����ɽ������ޤ���</para>
+
+    <programlisting>ath(4)                   - Atheros IEEE 802.11 wireless network driver
+ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
+
+    <para>�ϡ��ɥ������ΰ������äƤ����ȡ�
+      �������५���ͥ���ۤ�������Ǥ����������ˤ���Ǥ��礦��</para>
+  </sect1>
+
   <sect1 id="kernelconfig-building">
     <title>�������५���ͥ�ι��ۤȥ��󥹥ȡ���</title>
     <indexterm>
@@ -208,12 +291,13 @@
       ���ԡ����Ƥ������������Ȥ��м��Τ褦�ˤ��ޤ���</para>
 
     <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf</userinput>
-&prompt.root; <userinput>cp GENERIC MYKERNEL</userinput></screen>
+&prompt.root; <userinput>cp GENERIC <replaceable>MYKERNEL</replaceable></userinput></screen>
 
     <para>�����Ȥ��ơ�����̾���Ϥ��٤���ʸ���ǤĤŤ��ޤ����⤷��
       �����Ĥ��ΰۤʤ�ϡ��ɥ������� &os; �ޥ���򰷤��ʤ顢
       ����̾���˥ۥ���̾��ޤ��Ȥ褤�Ǥ��礦�������Ǥϡ���Ȥ���
-      <filename>MYKERNEL</filename> �ȸƤ֤��Ȥˤ��ޤ���</para>
+      <filename><replaceable>MYKERNEL</replaceable></filename>
+      �ȸƤ֤��Ȥˤ��ޤ���</para>
 
     <tip>
       <para>�����ͥ륳��ե����졼�����ե������ľ��
@@ -238,7 +322,7 @@
 &prompt.root; <userinput>ln -s /root/kernels/<replaceable>MYKERNEL</replaceable></userinput></screen>
     </tip>
 
-    <para>�Ǥϡ�<filename>MYKERNEL</filename>
+    <para>�Ǥϡ�<filename><replaceable>MYKERNEL</replaceable></filename>
       �򤢤ʤ��ι����ʥ��ǥ������Խ����Ƥ����������⤷��
       �����ƥ�򥤥󥹥ȡ��뤷���Ф���ʤ�С����ѤǤ��륨�ǥ�����
       <application>vi</application>
@@ -316,7 +400,11 @@
 
       <programlisting>MODULES_OVERRIDE = linux acpi sound/sound sound/driver/ds1 ntfs</programlisting>
 
-      <para>�����ѿ��ϡ����٤ƤΥ⥸�塼��Τ����˹��ۤ���⥸�塼��ΰ��������ꤷ�ޤ���
+      <para>�����ѿ��ϡ����٤ƤΥ⥸�塼��Τ����˹��ۤ���⥸�塼��ΰ��������ꤷ�ޤ���</para>
+
+      <programlisting>WITHOUT_MODULES = linux acpi sound/sound sound/driver/ds1 ntfs</programlisting>
+
+      <para>�����ѿ��ϡ����ۤ��ʤ��⥸�塼��ΰ��������ꤷ�ޤ���
 	�����ͥ�ι��ۤΥץ������˴ؤ��롢¾��ͭ�פ��ѿ��ˤĤ��Ƥϡ�
 	&man.make.conf.5; �򻲾Ȥ��Ƥ���������</para>
     </tip>
@@ -442,7 +530,7 @@ cpu          I686_CPU</programlisting>
 
     <para>�����ϥ����ͥ�μ���̾��񤭤ޤ���
       ���ʤ��������ͥ���դ�����̾���˽񤭴����Ʋ�����
-      (��������� <literal>MYKERNEL</literal> �Τ褦��)��
+      (��������� <literal><replaceable>MYKERNEL</replaceable></literal> �Τ褦��)��
       <literal>ident</literal> �˽񤤤�̾���ϥ����ͥ��ư�������
       ɽ�������Τǡ�
       ���ʻȤäƤ��륫���ͥ�ȶ��̤������Ȥ��ϡ�
@@ -615,6 +703,12 @@ options          NFS_ROOT          # NFS usable as /, requires NFSCLIENT</progra
       5.X �ǤΤߥ��ݡ��Ȥ���Ƥ��� ia64 �� &sparc64; �Ȥ��ä��ץ�åȥե�����Ǥϡ�
       ���Υ��ץ�����ɬ�פ���ޤ���</para>
 
+    <programlisting>options          COMPAT_FREEBSD5   # Compatible with &os;5</programlisting>
+
+    <para>���Υ��ץ����ϡ�&os;&nbsp;6.X �ʾ�Υ����ƥ�ˤ����ơ�
+      &os;&nbsp;5.X �ǥ���ѥ��뤵�줿 &os;&nbsp;5.X
+      �Υ����ƥॳ���륤�󥿥ե��������Ѥ��륢�ץꥱ�����������Ѥ������ɬ�פȤ���ޤ���</para>
+
     <programlisting>options          SCSI_DELAY=5000  # Delay (in ms) before probing SCSI</programlisting>
 
     <para>���ιԤϡ������ͥ뤬���줾��� SCSI ����򸡽Ф�������
@@ -663,15 +757,8 @@ options          NFS_ROOT          # NFS usable as /, requires NFSCLIENT</progra
 
     <programlisting>options          KBD_INSTALL_CDEV  # install a CDEV entry in /dev</programlisting>
 
-    <para>���Υ��ץ����ϥ����ܡ��ɤ˴�Ϣ���Ƥ��ޤ���
-      <filename>/dev</filename> �� CDEV ����ȥ�򥤥󥹥ȡ��뤷�ޤ���</para>
-
-    <programlisting>options          AHC_REG_PRETTY_PRINT     # Print register bitfields in debug
-                                          # output.  Adds ~128k to driver.
-options          AHD_REG_PRETTY_PRINT     # Print register bitfields in debug
-                                          # output.  Adds ~215k to driver.</programlisting>
-
-    <para>����ϥ쥸��������ν��Ϥ��ɤߤ䤹�������ǥХå����ưפˤ��ޤ���</para>
+    <para>�����ܡ��ɥǥХ����Ρ��ɤ� <filename>/dev</filename>
+      �˺�������ˤϤ��Υ��ץ����ɬ�פǤ���</para>
 
     <programlisting>options          ADAPTIVE_GIANT    # Giant mutex is adaptive.</programlisting>
 
@@ -687,6 +774,15 @@ options          AHD_REG_PRETTY_PRINT     # Print register bitfields in debug
       �̾����åɤϼ¹Ԥε���򥹥꡼�׾��֤��Ԥ��ޤ���
       �⤷���褯�狼��ʤ��ΤǤ���С����Τޤޤˤ��Ƥ����Ƥ���������</para>
 
+    <note>
+      <para>&os; 8.0-CURRENT �ʹߤǤϡ�
+	(<literal>NO_ADAPTIVE_MUTEXES</literal>
+	���ץ����ǥ���ѥ����Ԥä���Ŭ�緿�ˤ���ΤǤʤ����)
+	���٤Ƥ� mutex �ϥǥե���Ȥ�Ŭ�緿�ˤʤ�ޤ�����
+	���ߤ� Giant ��Ŭ�緿�ʤΤǡ�<literal>ADAPTIVE_GIANT</literal>
+	���ץ����ϥ����ͥ륳��ե����졼����󤫤鳰����ޤ�����</para>
+    </note>
+
     <indexterm>
       <primary>�����ͥ륪�ץ����</primary>
       <secondary>SMP</secondary>
@@ -699,6 +795,11 @@ options          AHD_REG_PRETTY_PRINT     # Print register bitfields in debug
       �ޥ���ץ����å����б�����ˤ�
       <literal>options SMP</literal> ���ɲä��Ƥ���������</para>
 
+    <note>
+      <para>apic �ǥХ����� i386 �������ƥ�����ˤΤ�¸�ߤ��ޤ���
+	¾�Υ������ƥ�����Ǥϡ����ιԤ�ޤޤʤ��Ǥ���������</para>
+    </note>
+
     <programlisting>device          eisa</programlisting>
 
     <para>���ʤ��� EISA �ޥ����ܡ��ɤ���äƤ����硢
@@ -756,13 +857,17 @@ device          ata</programlisting>
     <programlisting># SCSI Controllers
 device          ahb        # EISA AHA1742 family
 device          ahc        # AHA2940 and onboard AIC7xxx devices
+options         AHC_REG_PRETTY_PRINT    # Print register bitfields in debug
+                                        # output.  Adds ~128k to driver.
 device          ahd        # AHA39320/29320 and onboard AIC79xx devices
+options         AHD_REG_PRETTY_PRINT    # Print register bitfields in debug
+                                        # output.  Adds ~215k to driver.
 device          amd        # AMD 53C974 (Teckram DC-390(T))
 device          isp        # Qlogic family
 #device         ispfw      # Firmware for QLogic HBAs- normally a module
 device          mpt        # LSI-Logic MPT-Fusion
 #device         ncr        # NCR/Symbios Logic
-device          sym        # NCR/Symbios Logic (newer chipsets)
+device          sym        # NCR/Symbios Logic (newer chipsets + those of `ncr')
 device          trm        # Tekram DC395U/UW/F DC315U adapters
 
 device          adv        # Advansys SCSI adapters
@@ -777,7 +882,9 @@ device          stg        # TMC 18C30/18C50</programlisting>
 
     <para>SCSI ����ȥ�����Ǥ���
       ���ʤ��Υ����ƥ�ˤʤ��ǥХ����ϥ����ȥ����Ȥ��Ʋ�������
-      �⤷ IDE �����ʤ������ƥ�ʤ餳��餹�٤Ƥ����Ǥ��ޤ���</para>
+      �⤷ IDE �����ʤ������ƥ�ʤ餳��餹�٤Ƥ����Ǥ��ޤ���
+      <literal>*_REG_PRETTY_PRINT</literal> �Ԥϡ�
+      �б�����ɥ饤�Ф��Ф���ǥХå����ץ����Ǥ���</para>
 
     <programlisting># SCSI peripherals
 device          scbus      # SCSI bus (required for SCSI)
@@ -850,7 +957,9 @@ device          atkbdc     # AT keyboard controller</programlisting>
 
     <programlisting>device          kbdmux        # keyboard multiplexer</programlisting>
 
-    <para>ɸ��Υ����ܡ��ɥޥ���ץ쥯���Υ��ݡ��ȡ�</para>
+    <para>ɸ��Υ����ܡ��ɥޥ���ץ쥯���Υ��ݡ��ȡ�
+      2 �İʾ�Υ����ܡ��ɤ��Ѥ���ͽ�꤬�ʤ��ΤǤ���С�
+      ���ιԤ������Ƥ⤫�ޤ��ޤ���</para>
 
     <programlisting>device          vga        # VGA video card driver</programlisting>
 
@@ -1021,6 +1130,7 @@ device          bge        # Broadcom BCM570xx Gigabit Ethernet
 device          dc         # DEC/Intel 21143 and various workalikes
 device          fxp        # Intel EtherExpress PRO/100B (82557, 82558)
 device          lge        # Level 1 LXT1001 gigabit ethernet
+device          msk        # Marvell/SysKonnect Yukon II Gigabit Ethernet
 device          nge        # NatSemi DP83820 gigabit ethernet
 device          nve        # nVidia nForce MCP on-board Ethernet Networking
 device          pcn        # AMD Am79C97x PCI 10/100 (precedence over 'lnc')
@@ -1030,6 +1140,7 @@ device          sf         # Adaptec AIC-6915 (<quote>Starfire</quote>)
 device          sis        # Silicon Integrated Systems SiS 900/SiS 7016
 device          sk         # SysKonnect SK-984x &amp; SK-982x gigabit Ethernet
 device          ste        # Sundance ST201 (D-Link DFE-550TX)
+device          stge       # Sundance/Tamarack TC9021 gigabit Ethernet
 device          ti         # Alteon Networks Tigon I/II gigabit Ethernet
 device          tl         # Texas Instruments ThunderLAN
 device          tx         # SMC EtherPower II (83c170 <quote>EPIC</quote>)
@@ -1060,8 +1171,22 @@ device          xe         # Xircom pccard Ethernet
       <filename>/usr/src/sys/<replaceable>i386</replaceable>/conf/NOTES</filename> �򻲾Ȥ��Ʋ�������</para>
 
     <programlisting># Wireless NIC cards
-device          wlan       # 802.11 support
-device          an         # Aironet 4500/4800 802.11 wireless NICs.
+device          wlan            # 802.11 support</programlisting>
+
+    <para>ɸ��� 802.11 ���ݡ��ȡ��磻��쥹�ͥåȥ���ǤϤ��ιԤ�ɬ�פǤ���</para>
+
+    <programlisting>device          wlan_wep        # 802.11 WEP support
+device          wlan_ccmp       # 802.11 CCMP support
+device          wlan_tkip       # 802.11 TKIP support</programlisting>
+
+    <para>802.11 �ǥХ����ΰŹ沽���ݡ��ȡ�
+      �Ź沽����� 802.11i �������ƥ��ץ��ȥ����Ȥ����Ȥ�ͤ��Ƥ���ΤǤ���С�
+      �����ιԤ�ɬ�פǤ���</para>
+
+    <programlisting>device          an         # Aironet 4500/4800 802.11 wireless NICs.
+device          ath             # Atheros pci/cardbus NIC's
+device          ath_hal         # Atheros HAL (Hardware Access Layer)
+device          ath_rate_sample # SampleRate tx rate control for ath
 device          awi        # BayStack 660 and others
 device          ral        # Ralink Technology RT2500 wireless NICs.
 device          wi         # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
@@ -1156,7 +1281,7 @@ device   bpf           # Berkeley packet filter</programlisting>
     <programlisting># USB support
 device          uhci          # UHCI PCI-&gt;USB interface
 device          ohci          # OHCI PCI-&gt;USB interface
-#device         ehci          # EHCI PCI-&gt;USB interface (USB 2.0)
+device          ehci          # EHCI PCI-&gt;USB interface (USB 2.0)
 device          usb           # USB Bus (required)
 #device         udbp          # USB Double Bulk Pipe devices
 device          ugen          # Generic
@@ -1165,6 +1290,7 @@ device          ukbd          # Keyboard
 device          ulpt          # Printer
 device          umass         # Disks/Mass storage - Requires scbus and da
 device          ums           # Mouse
+device          ural          # Ralink Technology RT2500USB wireless NICs
 device          urio          # Diamond Rio 500 MP3 player
 device          uscanner      # Scanners
 # USB Ethernet, requires mii
@@ -1282,7 +1408,7 @@ device          fwe           # Ethernet over FireWire (non-standard!)</programl
     <title>���꤬���������ˤ�</title>
 
     <para>�������५���ͥ������˵�����ȥ�֥�ϡ�
-        ���� 5 �����ʬ�����ޤ���</para>
+        ���� 4 �����ʬ�����ޤ���</para>
 
     <variablelist>
       <varlistentry>
@@ -1361,7 +1487,7 @@ device          fwe           # Ethernet over FireWire (non-standard!)</programl
 	      &man.ps.1; �Τ褦�ʥ��ޥ�ɤ�������ư���ޤ��󡣤����Ԥ��ˤϡ�
 	      �ʲ��Τ褦����������ư���륫���ͥ��ޤ�ǥ��쥯�ȥ�̾���ѹ���������Ǥ���</para>
 
-	    <screen>&prompt.root; <userinput>mv /boot/kernel /boot/kernel.bad</userinput>
+	    <screen>&prompt.root; <userinput>mv /boot/kernel <replaceable>/boot/kernel.bad</replaceable></userinput>
 &prompt.root; <userinput>mv /boot/<replaceable>kernel.good</replaceable> /boot/kernel</userinput></screen>
 
 	  </note>