diff options
| author | imp <imp@NetBSD.org> | 2008-06-19 18:21:32 +0000 |
|---|---|---|
| committer | imp <imp@NetBSD.org> | 2008-06-19 18:21:32 +0000 |
| commit | e8fe37647b6de24b7e057590f11c596fb2bc7d22 (patch) | |
| tree | a9b915f2f17e2083b30faecc2b856a3e675469de /sys/dev | |
| parent | 1bb3b88db9dfff6e927fcc4eb3e658e46f8addfe (diff) | |
Sync to pcmciadevs 1.226
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs.h | 14 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs_data.h | 39 |
2 files changed, 49 insertions, 4 deletions
diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h index 4be245427c4..dc8c1f4bef8 100644 --- a/sys/dev/pcmcia/pcmciadevs.h +++ b/sys/dev/pcmcia/pcmciadevs.h @@ -1,10 +1,10 @@ -/* $NetBSD: pcmciadevs.h,v 1.228 2008/05/16 20:21:59 jnemeth Exp $ */ +/* $NetBSD: pcmciadevs.h,v 1.229 2008/06/19 18:21:32 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcmciadevs,v 1.225 2008/05/16 20:21:12 jnemeth Exp + * NetBSD: pcmciadevs,v 1.226 2008/06/19 18:20:33 imp Exp */ /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/ @@ -461,8 +461,18 @@ #define PCMCIA_PRODUCT_NOKIA_C020_WLAN 0x20c0 /* Olicom Products */ +#define PCMCIA_CIS_OLICOM_OC2220 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_OLICOM_OC2220 0x0101 #define PCMCIA_CIS_OLICOM_TR { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_OLICOM_TR 0x2132 +#define PCMCIA_CIS_OLICOM_OC2231 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_OLICOM_OC2231 0x3122 +#define PCMCIA_CIS_OLICOM_OC3231 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_OLICOM_OC3231 0x3132 +#define PCMCIA_CIS_OLICOM_OC2232 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_OLICOM_OC2232 0x3222 +#define PCMCIA_CIS_OLICOM_OC3232 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_OLICOM_OC3232 0x3232 /* Ositech Products */ #define PCMCIA_CIS_OSITECH_TRUMPCARD_SOD { NULL, NULL, NULL, NULL } diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h index c640565b363..6f2499a8c81 100644 --- a/sys/dev/pcmcia/pcmciadevs_data.h +++ b/sys/dev/pcmcia/pcmciadevs_data.h @@ -1,10 +1,10 @@ -/* $NetBSD: pcmciadevs_data.h,v 1.228 2008/05/16 20:21:59 jnemeth Exp $ */ +/* $NetBSD: pcmciadevs_data.h,v 1.229 2008/06/19 18:21:32 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcmciadevs,v 1.225 2008/05/16 20:21:12 jnemeth Exp + * NetBSD: pcmciadevs,v 1.226 2008/06/19 18:20:33 imp Exp */ /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/ @@ -897,6 +897,13 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "Nokia C020 WLAN Card", } , { + PCMCIA_VENDOR_OLICOM, PCMCIA_PRODUCT_OLICOM_OC2220, + PCMCIA_CIS_OLICOM_OC2220, + 0, + "Olicom", + "GoCard Ethernet", } + , + { PCMCIA_VENDOR_OLICOM, PCMCIA_PRODUCT_OLICOM_TR, PCMCIA_CIS_OLICOM_TR, 0, @@ -904,6 +911,34 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "GoCard Token Ring 16/4", } , { + PCMCIA_VENDOR_OLICOM, PCMCIA_PRODUCT_OLICOM_OC2231, + PCMCIA_CIS_OLICOM_OC2231, + 0, + "Olicom", + "GoCard Combo Eth/Modem 288", } + , + { + PCMCIA_VENDOR_OLICOM, PCMCIA_PRODUCT_OLICOM_OC3231, + PCMCIA_CIS_OLICOM_OC3231, + 0, + "Olicom", + "GoCard Token Ring 16/4/Modem 288", } + , + { + PCMCIA_VENDOR_OLICOM, PCMCIA_PRODUCT_OLICOM_OC2232, + PCMCIA_CIS_OLICOM_OC2232, + 0, + "Olicom", + "GoCard Combo Eth/Modem 336", } + , + { + PCMCIA_VENDOR_OLICOM, PCMCIA_PRODUCT_OLICOM_OC3232, + PCMCIA_CIS_OLICOM_OC3232, + 0, + "Olicom", + "GoCard Token Ring 16/4/Modem 336", } + , + { PCMCIA_VENDOR_OSITECH, PCMCIA_PRODUCT_OSITECH_TRUMPCARD_SOD, PCMCIA_CIS_OSITECH_TRUMPCARD_SOD, 0, |
