>Number:         36234
>Category:       port-amd64
>Synopsis:       xi -> xirc,com,xi on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    port-amd64-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Apr 28 16:15:01 +0000 2007
>Originator:     Joerg Niendorf
>Release:        amd64 current
>Organization:
none
>Environment:
N/A
>Description:

amd64 GENERIC and INSTALL still contain the line:

xi*	at pcmcia? function ?

This is not correct anymore. It should be:

xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet
com*	at xirc?
xi*	at xirc?

Please refer to this mail:

http://mail-index.netbsd.org/source-changes/2004/08/08/0008.html

xirc made it into several other ports, but amd64 missed out:

cvs rdiff -r1.626 -r1.627 src/sys/arch/i386/conf/GENERIC
cvs rdiff -r1.248 -r1.249 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -r1.154 -r1.155 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -r1.95 -r1.96 src/sys/arch/sparc64/conf/GENERIC32


Could someone please apply the below patches? Thank you.

>How-To-Repeat:

Enable "xi* at pcmcia? function ?" in amd64/GENERIC and run
"config GENERIC".

>Fix:

Index: GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/conf/GENERIC,v
retrieving revision 1.138
diff -b -u -r1.138 GENERIC
--- GENERIC	23 Apr 2007 04:55:07 -0000	1.138
+++ GENERIC	28 Apr 2007 04:49:47 -0000
@@ -587,11 +587,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
+#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.67
diff -b -u -r1.67 INSTALL
--- INSTALL	14 Mar 2007 12:27:21 -0000	1.67
+++ INSTALL	28 Apr 2007 04:49:47 -0000
@@ -463,11 +463,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
+#com*	at xirc?
+#xi*	at xirc?
 
 # CardBus network cards
 #ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11