Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few things: 

* The DEPCM-XX cards don't need to be recognized by OUI or string -- they
  work just fine with the IO-DATA PC-LAT/E attachment, and are probable OEM.
  So, remove the DEPCM case.
* PCMCIA_STR_* elimination.
* The Megahertz EM3336 is not always an X-Jack device, so take the "XJ" out
  of the product number.
This commit is contained in:
mycroft 2004-08-06 19:07:12 +00:00
parent 32b3027515
commit 5bce4931d3
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/pcmcia/if_ne_pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ne_pcmcia.c,v 1.123 2004/07/17 19:55:03 mycroft Exp $ */
/* $NetBSD: if_ne_pcmcia.c,v 1.124 2004/08/06 19:07:12 mycroft Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.123 2004/07/17 19:55:03 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.124 2004/08/06 19:07:12 mycroft Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -128,10 +128,6 @@ static const struct ne2000dev {
PCMCIA_CIS_PREMAX_PE200,
0, -1, { 0x00, 0x20, 0xe0 } },
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_DIGITAL_DEPCMXX,
0, 0x0ff0, { 0x00, 0x00, 0xe8 } },
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_PLANET_SMARTCOM2000,
0, 0xff0, { 0x00, 0x00, 0xe8 } },
@ -280,7 +276,7 @@ static const struct ne2000dev {
*/
{ PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLATE,
PCMCIA_CIS_INVALID,
0, -1, { 0x00, 0xa0, 0xb0 } },
0, -1, { 0xff, 0xff, 0xff } },
/*
* This entry should be placed after above PCLA-TE entry.

16
sys/dev/pcmcia/mhzc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mhzc.c,v 1.14 2003/01/01 00:10:23 thorpej Exp $ */
/* $NetBSD: mhzc.c,v 1.15 2004/08/06 19:07:13 mycroft Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.14 2003/01/01 00:10:23 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.15 2004/08/06 19:07:13 mycroft Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@ -156,8 +156,8 @@ const struct mhzc_product {
/* Perform any special `enable' magic. */
int (*mp_enable) __P((struct mhzc_softc *));
} mhzc_products[] = {
{ { PCMCIA_STR_MEGAHERTZ_XJEM3336, PCMCIA_VENDOR_MEGAHERTZ,
PCMCIA_PRODUCT_MEGAHERTZ_XJEM3336, 0 },
{ { "", PCMCIA_VENDOR_MEGAHERTZ,
PCMCIA_PRODUCT_MEGAHERTZ_EM3336, 0 },
mhzc_em3336_enaddr, mhzc_em3336_enable },
/*
@ -204,17 +204,15 @@ mhzc_attach(parent, self, aux)
struct pcmcia_attach_args *pa = aux;
struct pcmcia_config_entry *cfe;
printf("\n");
sc->sc_pf = pa->pf;
sc->sc_product = (const struct mhzc_product *)pcmcia_product_lookup(pa,
(const struct pcmcia_product *)mhzc_products,
sizeof mhzc_products[0], NULL);
if (sc->sc_product == NULL) {
printf("\n");
if (sc->sc_product == NULL)
panic("mhzc_attach: impossible");
}
printf(": %s\n", sc->sc_product->mp_product.pp_name);
/*
* The address decoders on these cards are wacky. The configuration

6
sys/dev/pcmcia/pcmciadevs
View File

@ -1,4 +1,4 @@
$NetBSD: pcmciadevs,v 1.202 2004/08/05 21:53:04 mycroft Exp $
$NetBSD: pcmciadevs,v 1.203 2004/08/06 19:07:13 mycroft Exp $
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
/*-
@ -270,11 +270,11 @@ product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE
product MACNICA ME1_JEIDA 0x3300 MACNICA ME1 for JEIDA
/* Megahertz Products */
product MEGAHERTZ XJEM3336 0x0006 Megahertz X-JACK Ethernet Modem
product MEGAHERTZ EM3336 0x0006 Megahertz Ethernet+Modem 33.6k
product MEGAHERTZ XJ4288 0x0023 Megahertz XJ4288 Modem
product MEGAHERTZ XJ4336 0x0027 Megahertz XJ4336 Modem
product MEGAHERTZ XJ5560 0x0034 Megahertz X-JACK 56kbps Modem
product MEGAHERTZ2 XJEM1144 0x0101 Megahertz X-JACK
product MEGAHERTZ2 EM1144 0x0101 Megahertz Ethernet+Modem 14.4k
product MEGAHERTZ2 XJACK 0x0103 Megahertz X-JACK Ethernet
/* Melco Products */