>Number:         35659
>Category:       port-amd64
>Synopsis:       xirc @ pcmcia in AMD64 kernels + related man pages
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    port-amd64-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Feb 17 13:30:00 +0000 2007
>Originator:     Joerg Niendorf
>Release:        AMD64 current
>Organization:
none
>Environment:
N/A
>Description:
I tried to activate support for a Xircom PCMCIA card in an AMD64 kernel:

xi*	at pcmcia? function ?

This caused this error:

# config TEST
TEST:589: `xi' cannot attach to `pcmcia'
*** Stop.

I checked i386/GENERIC and noticed that "xi @ pcmcia" was replaced by
"xirc @ pcmcia" and "xi @ xirc" some time ago. So, amd64/GENERIC and
amd64/INSTALL should probably be updated accordingly.

Also, there doesn't seem to be a xirc.4 man page. I have put together
a (very rudimentary) xirc.4. There is not much in it, but it's probably
better than having no xirc.4 man page at all.

And the com.4, pcmcia.4 and xi.4 man pages need a few tiny updates also.
(See below.)

PS: Not sure if everybody likes my changes to pcmcia.4.

>How-To-Repeat:
N/A
>Fix:
Index: GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/conf/GENERIC,v
retrieving revision 1.126
diff -b -u -r1.126 GENERIC
--- GENERIC	9 Feb 2007 21:55:01 -0000	1.126
+++ GENERIC	17 Feb 2007 11:22:05 -0000
@@ -576,11 +576,13 @@
 # tr at pcmcia has problems with Cardbus bridges
 #tr*	at pcmcia? function ?		# TROPIC based Token-Ring
 #wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
-#xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
 
 #mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
 #com*	at mhzc?
 #sm*	at mhzc?
+#xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet/Modem cards
+#com*	at xirc?
+#xi*	at xirc?
 
 # CardBus network cards
 #ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
Index: INSTALL
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/conf/INSTALL,v
retrieving revision 1.65
diff -b -u -r1.65 INSTALL
--- INSTALL	1 Feb 2007 21:07:45 -0000	1.65
+++ INSTALL	17 Feb 2007 11:22:05 -0000
@@ -460,11 +460,13 @@
 # tr at pcmcia has problems with Cardbus bridges
 #tr*	at pcmcia? function ?		# TROPIC based Token-Ring
 #wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
-#xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
 
 #mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
 #com*	at mhzc?
 #sm*	at mhzc?
+#xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet/Modem cards
+#com*	at xirc?
+#xi*	at xirc?
 
 # CardBus network cards
 #ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
Index: com.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/com.4,v
retrieving revision 1.12
diff -b -u -r1.12 com.4
--- com.4	14 Dec 2003 22:30:12 -0000	1.12
+++ com.4	17 Feb 2007 11:25:30 -0000
@@ -51,6 +51,7 @@
 .Cd "com* at pcmcom?"
 .Cd "com* at pnpbios? index ?"
 .Cd "com* at puc? port ?"
+.Cd "com* at xirc?"
 .Cd options COM_HAYESP
 .Cd options RND_COM
 .Ss Arm32
@@ -134,7 +135,8 @@
 .Xr pnpbios 4 ,
 .Xr puc 4 ,
 .Xr rtfps 4 ,
-.Xr tty 4
+.Xr tty 4 ,
+.Xr xirc 4
 .Sh HISTORY
 The
 .Nm
Index: pcmcia.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/pcmcia.4,v
retrieving revision 1.32
diff -b -u -r1.32 pcmcia.4
--- pcmcia.4	1 Aug 2006 07:14:28 -0000	1.32
+++ pcmcia.4	17 Feb 2007 11:25:32 -0000
@@ -90,8 +90,6 @@
 3Com 3c589 EtherLink III Ethernet card.
 .It mbe
 Ethernet card based on the Fujitsu MB86960A/MB86965A chipset.
-.It mhzc
-Megahertz Ethernet/Modem combo cards
 .It ne
 NE2000 compatible cards.
 .It ray
@@ -101,7 +99,7 @@
 .It wi
 Lucent WaveLAN/IEEE and PRISM-II based 802.11 controller.
 .It xi
-Xircom CreditCard Ethernet
+Xircom CreditCard Ethernet.
 .El
 .Ss SCSI controllers
 .Bl -tag -width speaker -offset indent
@@ -121,13 +119,22 @@
 .Ss IDE controllers
 .Bl -tag -width speaker -offset indent
 .It wdc
-Digital Hinote Ultra Mobile Media Adapter
+Digital Hinote Ultra Mobile Media Adapter.
 .El
 .Ss Audio devices
 .Bl -tag -width speaker -offset indent
 .It esl
 Eiger Labs ESS1688 AudioDrive.
 .El
+.Ss Multifunction interfaces
+.Bl -tag -width speaker -offset indent
+.It mhzc
+Megahertz Ethernet/Modem combo cards.
+.It pcmcom
+Multi-port serial card driver.
+.It xirc
+Xircom Ethernet and combined Ethernet/Modem cards.
+.El
 .Sh SEE ALSO
 .Xr aic 4 ,
 .Xr an 4 ,
@@ -151,7 +158,8 @@
 .Xr spc 4 ,
 .Xr tcic 4 ,
 .Xr wi 4 ,
-.Xr xi 4
+.Xr xi 4 ,
+.Xr xirc 4
 .Pp
 .Pa http://www.pcmcia.org/
 .Sh HISTORY
Index: xi.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/xi.4,v
retrieving revision 1.10
diff -b -u -r1.10 xi.4
--- xi.4	7 Feb 2002 03:15:09 -0000	1.10
+++ xi.4	17 Feb 2007 11:25:33 -0000
@@ -41,7 +41,7 @@
 .Nm xi
 .Nd Xircom CreditCard Ethernet device driver
 .Sh SYNOPSIS
-.Cd "xi*  at pcmcia? function ?
+.Cd "xi* at xirc?"
 .Pp
 Configuration of PHYs may also be necessary.  See
 .Xr mii 4 .
@@ -90,6 +90,7 @@
 .Xr netintro 4 ,
 .Xr pcmcia 4 ,
 .Xr tlp 4 ,
+.Xr xirc 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The
@@ -100,7 +101,3 @@
 The driver suffers from poor performance.  Even with the 10/100 cards,
 do not expect more than ~450KB/s.  Some 10/100 cards may not autonegotiate
 reliably and require manual media selection.
-.Pp
-The Xircom multifunction cards which contain both Ethernet and modem
-interfaces are known to have problems.  This is due to the card not
-reporting itself correctly as a multifunction card.
##########  New xirc.4 below  ##########
.\" $NetBSD$
.\"
.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
.\" by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
.\" NASA Ames Research Center and by Charles M. Hannum.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\"    notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\"    notice, this list of conditions and the following disclaimer in the
.\"    documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
.\"    must display the following acknowledgement:
.\"        This product includes software developed by the NetBSD
.\"        Foundation, Inc. and its contributors.
.\" 4. Neither the name of The NetBSD Foundation nor the names of its
.\"    contributors may be used to endorse or promote products derived
.\"    from this software without specific prior written permission.
.\" 
.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd February 16, 2007
.Dt XIRC 4
.Os
.Sh NAME
.Nm xirc
.Nd Xircom PCMCIA card device driver
.Sh SYNOPSIS
.Cd "xirc* at pcmcia? function ?"
.Cd "com*  at xirc?"
.Cd "xi*   at xirc?"
.Sh DESCRIPTION
The
.Nm
driver provides support for 16-bit single- and multifunction Xircom PCMCIA
cards.  It attaches the
.Xr com 4
and/or
.Xr xi 4
driver(s) as child device(s).
.Sh SEE ALSO
.Xr com 4 ,
.Xr pcmcia 4 ,
.Xr xi 4
.Sh HISTORY
The
.Nm
device driver appeared in
.Nx 3.0 .
.Pp
.Sh BUGS
The Xircom multifunction cards which contain both Ethernet and modem
interfaces are known to have problems.  This is due to the card not
reporting itself correctly as a multifunction card.