o Review and update the support for devices on ia64.

o  Add uart(4).
o  Remove sab(4) and zs(4) (sparc64 only), as their functionality
   has been takien over by uart(4).

MFC after: 3 days

2 files changed, 28 insertions, 36 deletions

diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index 49a6ced..aee0968 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -472,13 +472,9 @@
   <sect2 id="serial">
     <title>Serial Interfaces</title>
 
-    <para arch="i386,alpha,ia64,amd64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para>
+    <para arch="i386,alpha,amd64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para>
 
-    <para arch="sparc64">Serial ports based on the SAB82532 serial
-      chip, console only (&man.sab.4; driver)</para>
-
-    <para arch="sparc64">Serial ports based on the Zilog 8530 dual uart,
-      console only (zs driver)</para>
+    &hwlist.uart;
 
     <para arch="i386,alpha,amd64">AST 4 port serial card using shared IRQ</para>
 
@@ -537,7 +533,7 @@
 	  <para>Decision Computers PCCOM 4-port serial and dual port RS232/422/485</para>
 	</listitem>
 	<listitem arch="ia64">
-	  <para>Diva Serial (GSP) Multiport UART (development branch only)</para>
+	  <para>Diva Serial (GSP) Multiport UART</para>
 	</listitem>
 	<listitem arch="i386,amd64">
 	  <para>Dolphin Peripherals 4025/4035/4036</para>
@@ -748,18 +744,18 @@
   <sect2 id="usb">
     <title>USB Devices</title>
 
-    <para arch="alpha,i386,pc98,amd64">A range of USB peripherals are supported; devices known to
+    <para arch="alpha,i386,ia64,pc98,amd64">A range of USB peripherals are supported; devices known to
     work are listed in this section.  Owing to the
     generic nature of most USB devices, with some exceptions any
     device of a given class will be supported, even if not explicitly
     listed here.</para>
 
-    <note arch="alpha,i386,pc98,amd64">
+    <note arch="alpha,i386,ia64,pc98,amd64">
       <para>USB Ethernet adapters can be found in the section listing <link
       linkend="ethernet">Ethernet interfaces</link>.</para>
     </note>
 
-    <note arch="alpha,i386,pc98,amd64">
+    <note arch="alpha,i386,ia64,pc98,amd64">
       <para>USB Bluetooth adapters can be found in <link
       linkend="bluetooth">Bluetooth</link> section.</para>
     </note>
@@ -771,9 +767,9 @@
     <para arch="i386,ia64,pc98,amd64">USB 2.0 controllers using the EHCI
       interface (&man.ehci.4; driver)</para>
 
-    <para arch="i386,pc98,alpha,amd64">Hubs
+    <para arch="i386,ia64,pc98,alpha,amd64">Hubs
     </para>
-    <para arch="i386,pc98,alpha,amd64">Keyboards (&man.ukbd.4; driver)
+    <para arch="i386,ia64,pc98,alpha,amd64">Keyboards (&man.ukbd.4; driver)
     </para>
     <para arch="i386,pc98,amd64">Miscellaneous
       <itemizedlist>
@@ -799,7 +795,7 @@
 
     &hwlist.umodem;
 
-    <para arch="i386,pc98,alpha,amd64">Mice (&man.ums.4; driver)
+    <para arch="i386,ia64,pc98,alpha,amd64">Mice (&man.ums.4; driver)
     </para>
 
     &hwlist.ulpt;
@@ -870,7 +866,7 @@
 
     <para arch="i386,pc98,alpha,amd64">Floppy drives (&man.fdc.4; driver)</para>
 
-    <para arch="i386,alpha,ia64,amd64">VGA-compatible video cards
+    <para arch="i386,alpha,amd64">VGA-compatible video cards
       (&man.vga.4; driver)
 
       <note>
@@ -887,13 +883,13 @@
         <listitem arch="i386,alpha">
 	  <para>AT-style keyboards (&man.atkbd.4; driver)</para>
 	</listitem>
-        <listitem arch="i386,alpha,ia64,amd64">
+        <listitem arch="i386,alpha,amd64">
 	  <para>PS/2 keyboards (&man.atkbd.4; driver)</para>
 	</listitem>
         <listitem arch="pc98">
 	  <para>Standard keyboards</para>
 	</listitem>
-        <listitem arch="i386,pc98,alpha,amd64">
+        <listitem arch="i386,pc98,alpha,ia64,amd64">
 	  <para>USB keyboards (&man.ukbd.4; driver)</para>
 	</listitem>
       </itemizedlist>
@@ -904,14 +900,14 @@
         <listitem arch="i386,pc98,amd64">
 	  <para>Bus mice and compatible devices (&man.mse.4; driver)</para>
 	</listitem>
-        <listitem arch="i386,alpha,ia64,amd64">
+        <listitem arch="i386,alpha,amd64">
 	  <para>PS/2 mice and compatible devices, including many laptop
 	    pointing devices (&man.psm.4; driver)</para>
 	</listitem>
         <listitem>
 	  <para>Serial mice and compatible devices</para>
 	</listitem>
-        <listitem arch="i386,pc98,alpha,amd64">
+        <listitem arch="i386,pc98,alpha,ia64,amd64">
 	  <para>USB mice (&man.ums.4; driver)</para>
 	</listitem>
       </itemizedlist>
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
index 49a6ced..aee0968 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -472,13 +472,9 @@
   <sect2 id="serial">
     <title>Serial Interfaces</title>
 
-    <para arch="i386,alpha,ia64,amd64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para>
+    <para arch="i386,alpha,amd64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para>
 
-    <para arch="sparc64">Serial ports based on the SAB82532 serial
-      chip, console only (&man.sab.4; driver)</para>
-
-    <para arch="sparc64">Serial ports based on the Zilog 8530 dual uart,
-      console only (zs driver)</para>
+    &hwlist.uart;
 
     <para arch="i386,alpha,amd64">AST 4 port serial card using shared IRQ</para>
 
@@ -537,7 +533,7 @@
 	  <para>Decision Computers PCCOM 4-port serial and dual port RS232/422/485</para>
 	</listitem>
 	<listitem arch="ia64">
-	  <para>Diva Serial (GSP) Multiport UART (development branch only)</para>
+	  <para>Diva Serial (GSP) Multiport UART</para>
 	</listitem>
 	<listitem arch="i386,amd64">
 	  <para>Dolphin Peripherals 4025/4035/4036</para>
@@ -748,18 +744,18 @@
   <sect2 id="usb">
     <title>USB Devices</title>
 
-    <para arch="alpha,i386,pc98,amd64">A range of USB peripherals are supported; devices known to
+    <para arch="alpha,i386,ia64,pc98,amd64">A range of USB peripherals are supported; devices known to
     work are listed in this section.  Owing to the
     generic nature of most USB devices, with some exceptions any
     device of a given class will be supported, even if not explicitly
     listed here.</para>
 
-    <note arch="alpha,i386,pc98,amd64">
+    <note arch="alpha,i386,ia64,pc98,amd64">
       <para>USB Ethernet adapters can be found in the section listing <link
       linkend="ethernet">Ethernet interfaces</link>.</para>
     </note>
 
-    <note arch="alpha,i386,pc98,amd64">
+    <note arch="alpha,i386,ia64,pc98,amd64">
       <para>USB Bluetooth adapters can be found in <link
       linkend="bluetooth">Bluetooth</link> section.</para>
     </note>
@@ -771,9 +767,9 @@
     <para arch="i386,ia64,pc98,amd64">USB 2.0 controllers using the EHCI
       interface (&man.ehci.4; driver)</para>
 
-    <para arch="i386,pc98,alpha,amd64">Hubs
+    <para arch="i386,ia64,pc98,alpha,amd64">Hubs
     </para>
-    <para arch="i386,pc98,alpha,amd64">Keyboards (&man.ukbd.4; driver)
+    <para arch="i386,ia64,pc98,alpha,amd64">Keyboards (&man.ukbd.4; driver)
     </para>
     <para arch="i386,pc98,amd64">Miscellaneous
       <itemizedlist>
@@ -799,7 +795,7 @@
 
     &hwlist.umodem;
 
-    <para arch="i386,pc98,alpha,amd64">Mice (&man.ums.4; driver)
+    <para arch="i386,ia64,pc98,alpha,amd64">Mice (&man.ums.4; driver)
     </para>
 
     &hwlist.ulpt;
@@ -870,7 +866,7 @@
 
     <para arch="i386,pc98,alpha,amd64">Floppy drives (&man.fdc.4; driver)</para>
 
-    <para arch="i386,alpha,ia64,amd64">VGA-compatible video cards
+    <para arch="i386,alpha,amd64">VGA-compatible video cards
       (&man.vga.4; driver)
 
       <note>
@@ -887,13 +883,13 @@
         <listitem arch="i386,alpha">
 	  <para>AT-style keyboards (&man.atkbd.4; driver)</para>
 	</listitem>
-        <listitem arch="i386,alpha,ia64,amd64">
+        <listitem arch="i386,alpha,amd64">
 	  <para>PS/2 keyboards (&man.atkbd.4; driver)</para>
 	</listitem>
         <listitem arch="pc98">
 	  <para>Standard keyboards</para>
 	</listitem>
-        <listitem arch="i386,pc98,alpha,amd64">
+        <listitem arch="i386,pc98,alpha,ia64,amd64">
 	  <para>USB keyboards (&man.ukbd.4; driver)</para>
 	</listitem>
       </itemizedlist>
@@ -904,14 +900,14 @@
         <listitem arch="i386,pc98,amd64">
 	  <para>Bus mice and compatible devices (&man.mse.4; driver)</para>
 	</listitem>
-        <listitem arch="i386,alpha,ia64,amd64">
+        <listitem arch="i386,alpha,amd64">
 	  <para>PS/2 mice and compatible devices, including many laptop
 	    pointing devices (&man.psm.4; driver)</para>
 	</listitem>
         <listitem>
 	  <para>Serial mice and compatible devices</para>
 	</listitem>
-        <listitem arch="i386,pc98,alpha,amd64">
+        <listitem arch="i386,pc98,alpha,ia64,amd64">
 	  <para>USB mice (&man.ums.4; driver)</para>
 	</listitem>
       </itemizedlist>