From 86f0a26bce8634adfed0a80c8e1a306bf50953b5 Mon Sep 17 00:00:00 2001 From: sekiya Date: Sun, 25 Jan 2004 02:42:49 +0000 Subject: [PATCH] Add definition for IO-DATA WCF12 wireless CF card and allow the wi driver to match it. Definition originally from FreeBSD by way of Steve Rumble. --- sys/dev/pcmcia/if_wi_pcmcia.c | 9 +++++++-- sys/dev/pcmcia/pcmciadevs | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 8b13d73454d8..dd8d88319c6b 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wi_pcmcia.c,v 1.40 2003/12/27 23:57:24 christos Exp $ */ +/* $NetBSD: if_wi_pcmcia.c,v 1.41 2004/01/25 02:42:49 sekiya Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.40 2003/12/27 23:57:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.41 2004/01/25 02:42:49 sekiya Exp $"); #include #include @@ -224,6 +224,11 @@ static const struct wi_pcmcia_product { PCMCIA_CIS_IODATA2_WNB11PCM, PCMCIA_STR_IODATA2_WNB11PCM }, + { PCMCIA_VENDOR_IODATA2, + PCMCIA_PRODUCT_IODATA2_WCF12, + PCMCIA_CIS_IODATA2_WCF12, + PCMCIA_STR_IODATA2_WCF12 }, + { PCMCIA_VENDOR_BUFFALO, PCMCIA_PRODUCT_BUFFALO_WLI_PCM_S11, PCMCIA_CIS_BUFFALO_WLI_PCM_S11, diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs index 5671b8750375..3cb88d4bba41 100644 --- a/sys/dev/pcmcia/pcmciadevs +++ b/sys/dev/pcmcia/pcmciadevs @@ -1,4 +1,4 @@ -$NetBSD: pcmciadevs,v 1.191 2003/12/28 06:46:23 itohy Exp $ +$NetBSD: pcmciadevs,v 1.192 2004/01/25 02:42:49 sekiya Exp $ /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/ /*- @@ -234,6 +234,7 @@ product INTEL EEPRO100 0x010a Intel EtherExpress PRO/100 /* I-O DATA */ product IODATA PCLATE 0x2216 I-O DATA PCLA/TE product IODATA2 WNB11PCM 0x0002 I-O DATA WN-B11/PCM +product IODATA2 WCF12 0x0673 Wireless CF Card /* Kingston Products */ product KINGSTON KNE2 0x0100 Kingston KNE-PC2 Ethernet