src - OpenBSD base system

diff options


context:
space:
mode:

author	Theo de Raadt <deraadt@cvs.openbsd.org>	1999-11-06 04:08:50 +0000
committer	Theo de Raadt <deraadt@cvs.openbsd.org>	1999-11-06 04:08:50 +0000
commit	edfe44f02dcb9ab25fc9331fce0cdcdb3ad20109 (patch)
tree	ca49e6db2fe0827e760746231d10bb5d34a9051f
parent	9d36640c6ac9c4e5984dfb98365da2a29fecd9cb (diff)

sync

Diffstat

-rw-r--r--

sys/dev/pcmcia/pcmciadevs.h

1 files changed, 34 insertions, 34 deletions

diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index 169bf6be1de..07a9160847f 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h

@@ -1,10 +1,10 @@

-/* $OpenBSD: pcmciadevs.h,v 1.31 1999/11/05 05:28:13 fgsch Exp $ */

+/* $OpenBSD: pcmciadevs.h,v 1.32 1999/11/06 04:08:49 deraadt Exp $ */

* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.

* generated from:

- * OpenBSD: pcmciadevs,v 1.26 1999/11/05 04:34:21 angelos Exp

+ * OpenBSD: pcmciadevs,v 1.27 1999/11/06 04:08:47 deraadt Exp

/* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */

@@ -64,14 +64,14 @@

#define PCMCIA_VENDOR_LINKSYS 0x0149 /* Linksys */

#define PCMCIA_VENDOR_SIMPLETECH 0x014d /* Simple Technology */

#define PCMCIA_VENDOR_SYMBOL 0x014d /* Symbol */

-#define PCMCIA_VENDOR_LUCENT 0x0156 /* Lucent Technologies */

+#define PCMCIA_VENDOR_LUCENT 0x0156 /* Lucent */

#define PCMCIA_VENDOR_COMPAQ2 0x0183 /* Compaq */

#define PCMCIA_VENDOR_KINGSTON 0x0186 /* Kingston */

#define PCMCIA_VENDOR_DAYNA 0x0194 /* Dayna */

#define PCMCIA_VENDOR_BAY 0x01eb /* Bay Networks */

#define PCMCIA_VENDOR_IODATA 0x01bf /* I-O DATA */

#define PCMCIA_VENDOR_BREEZECOM 0x0a02 /* BreezeCOM */

-#define PCMCIA_VENDOR_LASAT 0x3401 /* Lasat Communications A/S */

+#define PCMCIA_VENDOR_LASAT 0x3401 /* Lasat */

#define PCMCIA_VENDOR_COMPEX 0x8a01 /* Compex */

#define PCMCIA_VENDOR_CONTEC 0xc001 /* Contec */

#define PCMCIA_VENDOR_COREGA 0xc00f /* Corega K.K. */

@@ -84,10 +84,10 @@

/* Adaptec */

#define PCMCIA_CIS_ADAPTEC_APA1460_1 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_ADAPTEC_APA1460_1 0x0001

-#define PCMCIA_STR_ADAPTEC_APA1460_1 "Adaptec APA-1460/A SCSI Host Adapter"

+#define PCMCIA_STR_ADAPTEC_APA1460_1 "Adaptec APA-1460/A"

#define PCMCIA_CIS_ADAPTEC_APA1460_2 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_ADAPTEC_APA1460_2 0x0002

-#define PCMCIA_STR_ADAPTEC_APA1460_2 "Adaptec APA-1460/B SCSI Host Adapter"

+#define PCMCIA_STR_ADAPTEC_APA1460_2 "Adaptec APA-1460/B"

/* Allied Telesis K.K. */

#define PCMCIA_CIS_ALLIEDTELESIS_LA_PCM { NULL, NULL, NULL, NULL }

@@ -102,19 +102,19 @@

/* 3COM */

#define PCMCIA_CIS_3COM_3CXEM556B { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_3COM_3CXEM556B 0x003d

-#define PCMCIA_STR_3COM_3CXEM556B "3Com/Megahertz 3CXEM556B-INT Ethernet/Modem"

+#define PCMCIA_STR_3COM_3CXEM556B "3Com 3CXEM556B-INT"

#define PCMCIA_CIS_3COM_3CXEM556 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_3COM_3CXEM556 0x0035

-#define PCMCIA_STR_3COM_3CXEM556 "3Com/Megahertz 3CXEM556 Ethernet/Modem"

+#define PCMCIA_STR_3COM_3CXEM556 "3Com 3CXEM556"

#define PCMCIA_CIS_3COM_3C562 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_3COM_3C562 0x0562

-#define PCMCIA_STR_3COM_3C562 "3Com 3c562 33.6 Modem/10Mbps Ethernet"

+#define PCMCIA_STR_3COM_3C562 "3Com 3c562"

#define PCMCIA_CIS_3COM_3C589 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_3COM_3C589 0x0589

-#define PCMCIA_STR_3COM_3C589 "3Com 3c589 10Mbps Ethernet"

+#define PCMCIA_STR_3COM_3C589 "3Com 3c589"

#define PCMCIA_CIS_3COM_3C574 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_3COM_3C574 0x0574

-#define PCMCIA_STR_3COM_3C574 "3Com 3c574-TX 10/100Mbps Ethernet"

+#define PCMCIA_STR_3COM_3C574 "3Com 3c574-TX"

/* Contec C-NET(PC) */

#define PCMCIA_CIS_CONTEC_CNETPC { NULL, NULL, NULL, NULL }

@@ -124,7 +124,7 @@

/* Compex */

#define PCMCIA_CIS_COMPEX_AMP_WIRELESS { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_COMPEX_AMP_WIRELESS 0x0066

-#define PCMCIA_STR_COMPEX_AMP_WIRELESS "AMP Wireless"

+#define PCMCIA_STR_COMPEX_AMP_WIRELESS "AMP"

#define PCMCIA_CIS_COMPEX_LINKPORT_ENET_B { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B 0x0100

#define PCMCIA_STR_COMPEX_LINKPORT_ENET_B "Compex Linkport ENET-B"

@@ -145,7 +145,7 @@

/* Fujitsu */

#define PCMCIA_CIS_FUJITSU_SCSI600 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_FUJITSU_SCSI600 0x0401

-#define PCMCIA_STR_FUJITSU_SCSI600 "Fujitsu SCSI 600"

+#define PCMCIA_STR_FUJITSU_SCSI600 "Fujitsu 600"

#define PCMCIA_CIS_FUJITSU_LA501 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_FUJITSU_LA501 0x2000

#define PCMCIA_STR_FUJITSU_LA501 "Fujitsu Towa LA501"

@@ -170,13 +170,13 @@

#define PCMCIA_STR_IBM_PORTABLE_CDROM_DRIVE "PCMCIA Portable CD-ROM Drive"

#define PCMCIA_CIS_IBM_HOME_AND_AWAY { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_IBM_HOME_AND_AWAY 0x002e

-#define PCMCIA_STR_IBM_HOME_AND_AWAY "IBM Home and Away Modem"

+#define PCMCIA_STR_IBM_HOME_AND_AWAY "IBM Home&Away"

#define PCMCIA_CIS_IBM_WIRELESS_LAN_ENTRY { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_IBM_WIRELESS_LAN_ENTRY 0x0032

#define PCMCIA_STR_IBM_WIRELESS_LAN_ENTRY "Wireless LAN Entry"

#define PCMCIA_CIS_IBM_ETHERJET_PCCARD { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_IBM_ETHERJET_PCCARD 0x003f

-#define PCMCIA_STR_IBM_ETHERJET_PCCARD "IBM EtherJet Ethernet PC Card"

+#define PCMCIA_STR_IBM_ETHERJET_PCCARD "IBM EtherJet"

/* I-O DATA */

#define PCMCIA_CIS_IODATA_PCLAT { NULL, NULL, NULL, NULL }

@@ -196,12 +196,12 @@

/* Lasat */

#define PCMCIA_CIS_LASAT_CREDIT_288 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_LASAT_CREDIT_288 0x2811

-#define PCMCIA_STR_LASAT_CREDIT_288 "Lasat Credit 288 Modem"

+#define PCMCIA_STR_LASAT_CREDIT_288 "Lasat Credit 288"

/* Linksys corporation */

#define PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD 0x021b

-#define PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD "Trust (Linksys) Combo EthernetCard"

+#define PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD "Trust (Linksys)"

#define PCMCIA_CIS_LINKSYS_FAST_ECARD { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_LINKSYS_FAST_ECARD 0x0230

#define PCMCIA_STR_LINKSYS_FAST_ECARD "D-Link DFE-650 or Netgear FA410TX"

@@ -220,24 +220,24 @@

/* BayStack 650 FH 802.11 */

#define PCMCIA_CIS_BAY_STACK_650 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_BAY_STACK_650 0x0804

-#define PCMCIA_STR_BAY_STACK_650 "BayStack 650 Wireless LAN"

+#define PCMCIA_STR_BAY_STACK_650 "BayStack 650"

/* Megahertz */

#define PCMCIA_CIS_MEGAHERTZ_XJ4288 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_MEGAHERTZ_XJ4288 0x0023

-#define PCMCIA_STR_MEGAHERTZ_XJ4288 "Megahertz XJ4288 Modem"

+#define PCMCIA_STR_MEGAHERTZ_XJ4288 "Megahertz XJ4288"

#define PCMCIA_CIS_MEGAHERTZ_XJ5560 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_MEGAHERTZ_XJ5560 0x0034

-#define PCMCIA_STR_MEGAHERTZ_XJ5560 "Megahertz X-JACK 56kbps Modem"

+#define PCMCIA_STR_MEGAHERTZ_XJ5560 "Megahertz X-JACK 56kbps"

#define PCMCIA_CIS_MEGAHERTZ2_XJEM1144 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_MEGAHERTZ2_XJEM1144 0x0101

-#define PCMCIA_STR_MEGAHERTZ2_XJEM1144 "Megahertz X-JACK Ethernet Modem"

+#define PCMCIA_STR_MEGAHERTZ2_XJEM1144 "Megahertz X-JACK"

#define PCMCIA_CIS_MEGAHERTZ2_XJACK { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_MEGAHERTZ2_XJACK 0x0103

-#define PCMCIA_STR_MEGAHERTZ2_XJACK "Megahertz X-JACK Ethernet"

+#define PCMCIA_STR_MEGAHERTZ2_XJACK "Megahertz X-JACK"

#define PCMCIA_CIS_MEGAHERTZ_XJEM3336 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_MEGAHERTZ_XJEM3336 0x0006

-#define PCMCIA_STR_MEGAHERTZ_XJEM3336 "Megahertz X-JACK Ethernet Modem"

+#define PCMCIA_STR_MEGAHERTZ_XJEM3336 "Megahertz X-JACK"

/* Proxim */

#define PCMCIA_CIS_PROXIM_ROAMABOUT_2400FH { NULL, NULL, NULL, NULL }

@@ -255,7 +255,7 @@

/* US Robotics */

#define PCMCIA_CIS_USROBOTICS_WORLDPORT144 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_USROBOTICS_WORLDPORT144 0x3330

-#define PCMCIA_STR_USROBOTICS_WORLDPORT144 "US Robotics WorldPort 14.4 Modem"

+#define PCMCIA_STR_USROBOTICS_WORLDPORT144 "US Robotics WorldPort 14.4"

/* Sandisk */

#define PCMCIA_CIS_SANDISK_SDCFB { NULL, NULL, NULL, NULL }

@@ -276,7 +276,7 @@

#define PCMCIA_STR_SOCKET_DUAL_RS232 "Socket Communications Dual RS232"

#define PCMCIA_CIS_SOCKET_LP_ETHER_CF { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF 0x0075

-#define PCMCIA_STR_SOCKET_LP_ETHER_CF "Socket Communications Low Power Ethernet CF"

+#define PCMCIA_STR_SOCKET_LP_ETHER_CF "Socket Communications LP CF"

/* Symbol */

#define PCMCIA_CIS_SYMBOL_SPECTRUM24 { NULL, NULL, NULL, NULL }

@@ -286,10 +286,10 @@

/* TDK */

#define PCMCIA_CIS_TDK_LAK_CD021BX { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_TDK_LAK_CD021BX 0x0200

-#define PCMCIA_STR_TDK_LAK_CD021BX "TDK LAK-CD021BX Ethernet"

+#define PCMCIA_STR_TDK_LAK_CD021BX "TDK LAK-CD021BX"

#define PCMCIA_CIS_TDK_DFL9610 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_TDK_DFL9610 0x0d0a

-#define PCMCIA_STR_TDK_DFL9610 "TDK DFL9610 Ethernet & Digital Cellular"

+#define PCMCIA_STR_TDK_DFL9610 "TDK DFL9610"

/* Xircom */

#define PCMCIA_CIS_XIRCOM_XIR_CE_10 { NULL, NULL, NULL, NULL }

@@ -314,34 +314,34 @@

#define PCMCIA_STR_NEWMEDIA_BASICS "NewMedia BASICS"

#define PCMCIA_CIS_NEWMEDIA_MULTIMEDIA { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_NEWMEDIA_MULTIMEDIA 0x100b

-#define PCMCIA_STR_NEWMEDIA_MULTIMEDIA "NewMedia Multimedia Sound/SCSI"

+#define PCMCIA_STR_NEWMEDIA_MULTIMEDIA "NewMedia Multimedia"

#define PCMCIA_CIS_NEWMEDIA_BUSTOASTER { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER 0xc102

-#define PCMCIA_STR_NEWMEDIA_BUSTOASTER "NewMedia BusToaster SCSI"

+#define PCMCIA_STR_NEWMEDIA_BUSTOASTER "NewMedia BusToaster"

/* Standard Microsystems Corporation */

#define PCMCIA_CIS_SMC_8016 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_SMC_8016 0x0105

-#define PCMCIA_STR_SMC_8016 "SMC 8016 EtherCard"

+#define PCMCIA_STR_SMC_8016 "SMC 8016"

#define PCMCIA_CIS_SMC_8020 { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_SMC_8020 0x0001

#define PCMCIA_STR_SMC_8020 "SMC EtherEZ 8020"

#define PCMCIA_CIS_SMC_EZCARD { NULL, NULL, NULL, NULL }

#define PCMCIA_PRODUCT_SMC_EZCARD 0x8022

-#define PCMCIA_STR_SMC_EZCARD "SMC EXCard 10 PCMCIA"

+#define PCMCIA_STR_SMC_EZCARD "SMC EXCard"

/* Cards we know only by their cis */

#define PCMCIA_VENDOR_PREMAX -1 /* Premax */

#define PCMCIA_VENDOR_PLANET -1 /* Planet */

-#define PCMCIA_VENDOR_PLANEX -1 /* Planex Communications Inc */

+#define PCMCIA_VENDOR_PLANEX -1 /* Planex */

#define PCMCIA_VENDOR_DLINK -1 /* D-Link */

#define PCMCIA_VENDOR_RPTI -1 /* RPTI */

#define PCMCIA_VENDOR_ACCTON -1 /* ACCTON */

#define PCMCIA_VENDOR_YEDATA -1 /* Y-E DATA */

#define PCMCIA_VENDOR_DIGITAL -1 /* Digital */

#define PCMCIA_VENDOR_TEAC -1 /* TEAC */

-#define PCMCIA_VENDOR_SVEC -1 /* SVEC/Hawking Technology */

-#define PCMCIA_VENDOR_AMBICOM -1 /* AmbiCom Inc */

+#define PCMCIA_VENDOR_SVEC -1 /* SVEC/Hawking */

+#define PCMCIA_VENDOR_AMBICOM -1 /* AmbiCom */

#define PCMCIA_CIS_MEGAHERTZ_XJ2288 { "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }

#define PCMCIA_PRODUCT_MEGAHERTZ_XJ2288 PCMCIA_PRODUCT_INVALID