[src/trunk]: src/sys/dev/pcmcia - Clean up XIRCOM entries

[gmcgarry <gmcgarry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/651a0cfe74de
branches:  trunk
changeset: 487291:651a0cfe74de
user:      gmcgarry <gmcgarry%NetBSD.org@localhost>
date:      Mon Jun 05 23:04:04 2000 +0000

description:
- Clean up XIRCOM entries
- Add entry for Xircom CreditCard Ethernet + Modem 28
- Add entry for Intel EtherExpress PRO/100
- Add entry for Compaq Netelligent 10/100 Ethernet

diffstat:

 sys/dev/pcmcia/pcmciadevs |  26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r e273988dbb14 -r 651a0cfe74de sys/dev/pcmcia/pcmciadevs
--- a/sys/dev/pcmcia/pcmciadevs Mon Jun 05 23:02:04 2000 +0000
+++ b/sys/dev/pcmcia/pcmciadevs Mon Jun 05 23:04:04 2000 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.89 2000/05/11 19:24:35 is Exp $
+$NetBSD: pcmciadevs,v 1.90 2000/06/05 23:04:04 gmcgarry Exp $
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -95,6 +95,9 @@
 product 3COM 3CXEM556INT       0x003d 3Com/Megahertz 3CXEM556-INT Ethernet/Modem
 product 3COM 3CCFEM556BI       0x0556 3Com/Megahertz 3CCFEM556BI Ethernet/Modem
 
+/* Compaq Products */
+product COMPAQ2 CPQ_10_100     0x010a Compaq Netelligent 10/100 Ethernet
+
 /* Compex Products */
 product COMPEX LINKPORT_ENET_B 0x0100 Compex Linkport ENET-B Ethernet
 
@@ -129,6 +132,9 @@
 product IBM PORTABLE_CDROM     0x002d PCMCIA Portable CD-ROM Drive
 product IBM ETHERJET           0x003f IBM EtherJet Ethernet
 
+/* Intel Products */
+product INTEL EEPRO100         0x010a Intel EtherExpress PRO/100
+
 /* I-O DATA */
 product IODATA PCLATE          0x2216 I-O DATA PCLA/TE
 
@@ -179,16 +185,14 @@
 product TDK DFL9610            0x0d0a TDK DFL9610 Ethernet & Digital Cellular
 product TDK LAK_CF010          0x0900 TDK LAC-CF010
 
-/* TDK Vendor ID also used by Xircom! */
-product TDK XIR_CE_10          0x0108 Xircom CreditCard Ethernet
-product TDK XIR_CEM_10         0x110a Xircom CreditCard Ethernet + Modem
-product TDK XIR_PS_CE2_10      0x010b Xircom CreditCard CE2 Ethernet
-product TDK XIR_CE3_10_100     0x010a Xircom CreditCard CE3 10/100 Ethernet
-/* conflicts with above
- * product TDK XIR_CFE_10      0x010a Xircom CompactCard CFE-10
- */
-product TDK XIR_CNW_801                0x0801 Xircom CreditCard Netwave (Canada)
-product TDK XIR_CNW_802                0x0802 Xircom CreditCard Netwave (US)
+/* Xircom Products */
+product XIRCOM CE              0x0108 Xircom CreditCard Ethernet
+product XIRCOM CE2             0x010b Xircom CreditCard Ethernet II
+product XIRCOM CE3             0x010a Xircom CreditCard 10/100 Ethernet
+product XIRCOM CEM             0x110a Xircom CreditCard Ethernet + Modem
+product XIRCOM CEM28           0x110b Xircom CreditCard Ethernet + Modem 28
+product XIRCOM CNW_801         0x0801 Xircom CreditCard Netwave (Canada)
+product XIRCOM CNW_802         0x0802 Xircom CreditCard Netwave (US)
 
 /* New Media Products */
 product NEWMEDIA BASICS                0x0019 New Media BASICS Ethernet