From: fgsch Date: Mon, 24 Apr 2000 15:21:46 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5c4505ce893b9f41f4bf95cb2f1a3ac831139ea2;p=openbsd sync --- diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h index d4f58457d85..cb4f0c33d64 100644 --- a/sys/dev/pcmcia/pcmciadevs.h +++ b/sys/dev/pcmcia/pcmciadevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: pcmciadevs.h,v 1.39 2000/04/19 09:18:55 fgsch Exp $ */ +/* $OpenBSD: pcmciadevs.h,v 1.40 2000/04/24 15:21:46 fgsch Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcmciadevs,v 1.34 2000/04/19 09:18:15 fgsch Exp + * OpenBSD: pcmciadevs,v 1.35 2000/04/24 15:20:26 fgsch Exp */ /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */ @@ -44,6 +44,7 @@ */ #define PCMCIA_VENDOR_FUJITSU 0x0004 /* Fujitsu */ +#define PCMCIA_VENDOR_PANASONIC 0x0032 /* Matsushita Electric Industrial Co. */ #define PCMCIA_VENDOR_SANDISK 0x0045 /* Sandisk */ #define PCMCIA_VENDOR_NEWMEDIA 0x0057 /* NewMedia */ #define PCMCIA_VENDOR_INTEL 0x0089 /* Intel */ @@ -102,6 +103,8 @@ #define PCMCIA_PRODUCT_3COM_3C589 0x0589 #define PCMCIA_CIS_3COM_3C574 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_3COM_3C574 0x0574 +#define PCMCIA_CIS_3COM_3C1 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_3COM_3C1 0x0cf1 /* Adaptec */ #define PCMCIA_CIS_ADAPTEC_APA1460_1 { NULL, NULL, NULL, NULL } @@ -164,8 +167,12 @@ #define PCMCIA_PRODUCT_FUJITSU_LA501 0x2000 /* IBM */ +#define PCMCIA_CIS_IBM_3270 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_IBM_3270 0x0001 #define PCMCIA_CIS_IBM_INFOMOVER { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_IBM_INFOMOVER 0x0002 +#define PCMCIA_CIS_IBM_5250 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_IBM_5250 0x000b #define PCMCIA_CIS_IBM_TROPIC { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_IBM_TROPIC 0x001e #define PCMCIA_CIS_IBM_PORTABLE_CDROM { NULL, NULL, NULL, NULL } @@ -181,10 +188,6 @@ #define PCMCIA_CIS_IODATA_PCLATE { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_IODATA_PCLATE 0x2216 -/* Nokia Products */ -#define PCMCIA_CIS_NOKIA_C020_WLAN { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NOKIA_C020_WLAN 0x20c0 - /* Intel */ #define PCMCIA_CIS_INTEL_EEPRO100 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_INTEL_EEPRO100 0x010a @@ -249,6 +252,16 @@ #define PCMCIA_CIS_NEWMEDIA_BUSTOASTER { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER 0xc102 +/* Nokia Products */ +#define PCMCIA_CIS_NOKIA_C020_WLAN { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_NOKIA_C020_WLAN 0x20c0 + +/* Panasonic */ +#define PCMCIA_CIS_PANASONIC_KXLC002 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_PANASONIC_KXLC002 0x0304 +#define PCMCIA_CIS_PANASONIC_KXLC003 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_PANASONIC_KXLC003 0x0504 + /* Proxim */ #define PCMCIA_CIS_PROXIM_ROAMABOUT_2400FH { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_PROXIM_ROAMABOUT_2400FH 0x1058 @@ -280,10 +293,10 @@ #define PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF 0x0075 /* Standard Microsystems Corporation */ -#define PCMCIA_CIS_SMC_8016 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SMC_8016 0x0105 #define PCMCIA_CIS_SMC_8020 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_SMC_8020 0x0001 +#define PCMCIA_CIS_SMC_8016 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_SMC_8016 0x0105 #define PCMCIA_CIS_SMC_EZCARD { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_SMC_EZCARD 0x8022