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

Reorder the ne2000devs entries. So all PCMCIA_VENDOR_INVALID and/or 

PCMCIA_PRODUCT_INVALID entries comes first.
This commit is contained in:
veego 1998-09-23 21:22:41 +00:00
parent 86f044d10e
commit c31e48b356
1 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: if_ne_pcmcia.c,v 1.18 1998/09/20 19:19:53 dbj Exp $ */
/* $NetBSD: if_ne_pcmcia.c,v 1.19 1998/09/23 21:22:41 veego Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -88,31 +88,11 @@ struct ne2000dev {
PCMCIA_CIS_PREMAX_PE200,
0, 0x07f0, { 0x00, 0x20, 0xe0 } },
{ PCMCIA_STR_IBM_INFOMOVER,
PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER,
PCMCIA_CIS_IBM_INFOMOVER,
0, 0x0ff0, { 0x08, 0x00, 0x5a } },
{ PCMCIA_STR_DIGITAL_DEPCMXX,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_DIGITAL_DEPCMXX,
0, 0x0ff0, { 0x00, 0x00, 0xe8 } },
{ PCMCIA_STR_LINKSYS_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD,
PCMCIA_CIS_LINKSYS_ECARD,
0, -1, { 0x00, 0x80, 0xc8 } },
{ PCMCIA_STR_LINKSYS_COMBO_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD,
PCMCIA_CIS_LINKSYS_COMBO_ECARD,
0, -1, { 0x00, 0x80, 0xc8 } },
{ PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD,
PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD,
0, 0x0120, { 0x20, 0x04, 0x49 } },
{ PCMCIA_STR_PLANET_SMARTCOM2000,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_PLANET_SMARTCOM2000,
@ -128,6 +108,47 @@ struct ne2000dev {
PCMCIA_CIS_DLINK_DE660,
0, -1, { 0x00, 0x80, 0xc8 } },
{ PCMCIA_STR_RPTI_EP401,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_RPTI_EP401,
0, -1, { 0x00, 0x40, 0x95 } },
{ PCMCIA_STR_ACCTON_EN2212,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_ACCTON_EN2212,
0, 0x0ff0, { 0x00, 0x00, 0xe8 } },
/*
* You have to add new entries which contains
* PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID
* in front of this comment.
*
* There are cards which use a generic vendor and product id but needs
* a different handling depending on the cis_info, so ne2000_match
* needs a table where the exceptions comes first and then the normal
* product and vendor entries.
*/
{ PCMCIA_STR_IBM_INFOMOVER,
PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER,
PCMCIA_CIS_IBM_INFOMOVER,
0, 0x0ff0, { 0x08, 0x00, 0x5a } },
{ PCMCIA_STR_LINKSYS_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD,
PCMCIA_CIS_LINKSYS_ECARD,
0, -1, { 0x00, 0x80, 0xc8 } },
{ PCMCIA_STR_LINKSYS_COMBO_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD,
PCMCIA_CIS_LINKSYS_COMBO_ECARD,
0, -1, { 0x00, 0x80, 0xc8 } },
{ PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD,
PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD,
0, 0x0120, { 0x20, 0x04, 0x49 } },
{ PCMCIA_STR_IODATA_PCLAT,
PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLAT,
PCMCIA_CIS_IODATA_PCLAT,
@ -143,16 +164,6 @@ struct ne2000dev {
PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2,
PCMCIA_CIS_DAYNA_COMMUNICARD_E_2,
0, -1, { 0x00, 0x80, 0x19 } },
{ PCMCIA_STR_RPTI_EP401,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_RPTI_EP401,
0, -1, { 0x00, 0x40, 0x95 } },
{ PCMCIA_STR_ACCTON_EN2212,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_ACCTON_EN2212,
0, 0x0ff0, { 0x00, 0x00, 0xe8 } },
#if 0
/* the rest of these are stolen from the linux pcnet pcmcia device
driver. Since I don't know the manfid or cis info strings for