diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-01-24 23:13:56 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-01-24 23:13:56 +0000 |
| commit | ec539e7c0c9ed0375eeebf611295e99aae9c490a (patch) | |
| tree | 441ceaad898458cd41461be8cc480999fd3b65de /sys/dev | |
| parent | ac26d6a8cccc3c89782867c3d391e8be4562ad82 (diff) | |
Sierra A555 1x card support
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pcmcia/com_pcmcia.c | 3 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmcia_cis_quirks.c | 25 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs | 6 |
3 files changed, 31 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 6cda040483a..1803a21d582 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.34 2003/06/02 23:28:03 millert Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.35 2004/01/24 23:13:55 deraadt Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /* @@ -141,6 +141,7 @@ struct com_pcmcia_product { char *cis1_info[4]; } com_pcmcia_prod[] = { { PCMCIA_CIS_MEGAHERTZ_XJ2288 }, + { PCMCIA_CIS_SIERRA_A555 }, }; int com_pcmcia_match(struct device *, void *, void *); diff --git a/sys/dev/pcmcia/pcmcia_cis_quirks.c b/sys/dev/pcmcia/pcmcia_cis_quirks.c index f6194d248c2..7ece10d3b80 100644 --- a/sys/dev/pcmcia/pcmcia_cis_quirks.c +++ b/sys/dev/pcmcia/pcmcia_cis_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmcia_cis_quirks.c,v 1.5 2001/05/24 04:09:47 angelos Exp $ */ +/* $OpenBSD: pcmcia_cis_quirks.c,v 1.6 2004/01/24 23:13:55 deraadt Exp $ */ /* $NetBSD: pcmcia_cis_quirks.c,v 1.3 1998/12/29 09:00:28 marc Exp $ */ /* @@ -130,6 +130,26 @@ static struct pcmcia_config_entry pcmcia_megahertz_xjem1144_func1_cfe0 = { 0, /* maxtwins */ }; +static struct pcmcia_function pcmcia_sierra_a555_func1 = { + 1, /* function number */ + PCMCIA_FUNCTION_SERIAL, + 0x24, /* last cfe number */ + 0x700, /* ccr_base */ + 0x73, /* ccr_mask */ +}; + +static struct pcmcia_config_entry pcmcia_sierra_a555_func1_cfe0 = { + 0x20, /* cfe number */ + PCMCIA_CFE_IO8 | PCMCIA_CFE_IRQLEVEL, PCMCIA_IFTYPE_IO, + 1, /* num_iospace */ + 0, /* iomask */ + { { 0x0008, 0x3f8 } }, /* iospace */ + 0x3fbc, /* irqmask */ + 0, /* num_memspace */ + { }, /* memspace */ + 0, /* maxtwins */ +}; + static struct pcmcia_function pcmcia_sveclancard_func0 = { 0, /* function number */ PCMCIA_FUNCTION_NETWORK, @@ -171,6 +191,9 @@ static struct pcmcia_cis_quirk pcmcia_cis_quirks[] = { PCMCIA_CIS_INVALID, &pcmcia_megahertz_xjem1144_func1, &pcmcia_megahertz_xjem1144_func1_cfe0 }, + { PCMCIA_VENDOR_SIERRA, PCMCIA_PRODUCT_SIERRA_A555, + PCMCIA_CIS_INVALID, + &pcmcia_sierra_a555_func1, &pcmcia_sierra_a555_func1_cfe0 }, { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD, &pcmcia_sveclancard_func0, &pcmcia_sveclancard_func0_cfe0 }, diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs index 8e51ef75d22..9d53445c98f 100644 --- a/sys/dev/pcmcia/pcmciadevs +++ b/sys/dev/pcmcia/pcmciadevs @@ -1,4 +1,4 @@ - $OpenBSD: pcmciadevs,v 1.107 2003/11/17 19:47:43 fgsch Exp $ + $OpenBSD: pcmciadevs,v 1.108 2004/01/24 23:13:55 deraadt Exp $ /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */ /* @@ -62,6 +62,7 @@ vendor GREYCELL 0x0143 Grey Cell vendor LINKSYS 0x0149 Linksys vendor NETGEAR 0x0149 Netgear vendor SIEMENS 0x02ac Siemens +vendor SIERRA 0x0192 Sierra vendor SIMPLETECH 0x014d Simple Technology vendor SYMBOL2 0x014d Symbol vendor LUCENT 0x0156 Lucent @@ -319,6 +320,9 @@ product SIMPLETECH COMMUNICATOR288 0x0100 Simple Technology 28.8 Communicator /* Siemens */ product SIEMENS SS1021 0x0002 Siemens SpeedStream 1021 +/* Sierra */ +product SIERRA A555 0xa555 A555 + /* Socket Communications */ product SOCKET EA_ETHER 0x0000 Socket Communications EA product SOCKET LP_WLAN_CF 0x0001 Socket Communications Low Power WLAN |