summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1999-11-14 01:27:58 +0000
committerJason Downs <downsj@cvs.openbsd.org>1999-11-14 01:27:58 +0000
commit794933def5f51ae538a23396737c881f32dc8087 (patch)
treef61cd229745e62a2282e5d15ba74d22c6054639f /sys
parent960d6e4a9fbab968cdfecf623d9f8336f2521fe1 (diff)
Kill the overly verbose description strings, add another device.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/puc.c12
-rw-r--r--sys/dev/pci/pucdata.c100
-rw-r--r--sys/dev/pci/pucvar.h3
3 files changed, 67 insertions, 48 deletions
diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c
index 670b20e8220..bf8ef8a1604 100644
--- a/sys/dev/pci/puc.c
+++ b/sys/dev/pci/puc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: puc.c,v 1.1 1999/10/26 13:06:14 downsj Exp $ */
+/* $OpenBSD: puc.c,v 1.2 1999/11/14 01:27:57 downsj Exp $ */
/* $NetBSD: puc.c,v 1.3 1999/02/06 06:29:54 cgd Exp $ */
/*
@@ -171,11 +171,11 @@ puc_attach(parent, self, aux)
return;
}
- printf(": %s (", sc->sc_desc->name);
+ printf(": ");
for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++)
printf("%s%s", i ? ", " : "",
puc_port_type_name(sc->sc_desc->ports[i].type));
- printf(")\n");
+ printf("\n");
/*
* XXX This driver assumes that 'com' ports attached to it
@@ -318,8 +318,11 @@ puc_find_description(vend, prod, svend, sprod)
#define checkreg(val, index) \
(((val) & puc_devices[i].rmask[(index)]) == puc_devices[i].rval[(index)])
+#define pucdevdone(idx) \
+ (puc_devices[idx].rval[0] == 0 && puc_devices[idx].rval[1] == 0 \
+ && puc_devices[idx].rval[2] == 0 && puc_devices[idx].rval[3] == 0)
- for (i = 0; puc_devices[i].name != NULL; i++) {
+ for (i = 0; !pucdevdone(i); i++) {
if (checkreg(vend, PUC_REG_VEND) &&
checkreg(prod, PUC_REG_PROD) &&
checkreg(svend, PUC_REG_SVEND) &&
@@ -327,6 +330,7 @@ puc_find_description(vend, prod, svend, sprod)
return (&puc_devices[i]);
}
+#undef devdone
#undef checkreg
return (NULL);
diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c
index 4f7fd43137b..afac1755cbb 100644
--- a/sys/dev/pci/pucdata.c
+++ b/sys/dev/pci/pucdata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pucdata.c,v 1.1 1999/10/26 13:06:14 downsj Exp $ */
+/* $OpenBSD: pucdata.c,v 1.2 1999/11/14 01:27:57 downsj Exp $ */
/* $NetBSD: pucdata.c,v 1.6 1999/07/03 05:55:23 cgd Exp $ */
/*
@@ -56,7 +56,7 @@ const struct puc_device_description puc_devices[] = {
* into the subsystem fields, and claims that it's a
* network/misc (0x02/0x80) device.
*/
- { "Dolphin Peripherals 4014",
+ { /* "Dolphin Peripherals 4014", */
{ 0x10b5, 0x9050, 0xd84d, 0x6810 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@@ -76,7 +76,7 @@ const struct puc_device_description puc_devices[] = {
* into the subsystem fields, and claims that it's a
* network/misc (0x02/0x80) device.
*/
- { "Dolphin Peripherals 4035",
+ { /* "Dolphin Peripherals 4035", */
{ 0x10b5, 0x9050, 0xd84d, 0x6808 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@@ -106,7 +106,7 @@ const struct puc_device_description puc_devices[] = {
*/
/* SIIG Cyber Serial PCI 16C550 (10x family): 1S */
- { "SIIG Cyber Serial PCI 16C550 (10x family)",
+ { /* "SIIG Cyber Serial PCI 16C550 (10x family)", */
{ 0x131f, 0x1000, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -115,7 +115,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial PCI 16C650 (10x family): 1S */
- { "SIIG Cyber Serial PCI 16C650 (10x family)",
+ { /* "SIIG Cyber Serial PCI 16C650 (10x family)", */
{ 0x131f, 0x1001, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -124,7 +124,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial PCI 16C850 (10x family): 1S */
- { "SIIG Cyber Serial PCI 16C850 (10x family)",
+ { /* "SIIG Cyber Serial PCI 16C850 (10x family)", */
{ 0x131f, 0x1002, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -133,7 +133,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber I/O PCI 16C550 (10x family): 1S, 1P */
- { "SIIG Cyber I/O PCI 16C550 (10x family)",
+ { /* "SIIG Cyber I/O PCI 16C550 (10x family)", */
{ 0x131f, 0x1010, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -143,7 +143,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber I/O PCI 16C650 (10x family): 1S, 1P */
- { "SIIG Cyber I/O PCI 16C650 (10x family)",
+ { /* "SIIG Cyber I/O PCI 16C650 (10x family)", */
{ 0x131f, 0x1011, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -153,7 +153,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber I/O PCI 16C850 (10x family): 1S, 1P */
- { "SIIG Cyber I/O PCI 16C850 (10x family)",
+ { /* "SIIG Cyber I/O PCI 16C850 (10x family)", */
{ 0x131f, 0x1012, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -163,7 +163,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Parallel PCI (10x family): 1P */
- { "SIIG Cyber Parallel PCI (10x family)",
+ { /* "SIIG Cyber Parallel PCI (10x family)", */
{ 0x131f, 0x1020, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -172,7 +172,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Parallel Dual PCI (10x family): 2P */
- { "SIIG Cyber Parallel Dual PCI (10x family)",
+ { /* "SIIG Cyber Parallel Dual PCI (10x family)", */
{ 0x131f, 0x1021, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -182,7 +182,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial Dual PCI 16C550 (10x family): 2S */
- { "SIIG Cyber Serial Dual PCI 16C550 (10x family)",
+ { /* "SIIG Cyber Serial Dual PCI 16C550 (10x family)", */
{ 0x131f, 0x1030, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -192,7 +192,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial Dual PCI 16C650 (10x family): 2S */
- { "SIIG Cyber Serial Dual PCI 16C650 (10x family)",
+ { /* "SIIG Cyber Serial Dual PCI 16C650 (10x family)", */
{ 0x131f, 0x1031, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -202,7 +202,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial Dual PCI 16C850 (10x family): 2S */
- { "SIIG Cyber Serial Dual PCI 16C850 (10x family)",
+ { /* "SIIG Cyber Serial Dual PCI 16C850 (10x family)", */
{ 0x131f, 0x1032, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -212,7 +212,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2S1P PCI 16C550 (10x family): 2S, 1P */
- { "SIIG Cyber 2S1P PCI 16C550 (10x family)",
+ { /* "SIIG Cyber 2S1P PCI 16C550 (10x family)", */
{ 0x131f, 0x1034, 0, 0 }, /* XXX really? */
{ 0xffff, 0xffff, 0, 0 },
{
@@ -223,7 +223,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2S1P PCI 16C650 (10x family): 2S, 1P */
- { "SIIG Cyber 2S1P PCI 16C650 (10x family)",
+ { /* "SIIG Cyber 2S1P PCI 16C650 (10x family)", */
{ 0x131f, 0x1035, 0, 0 }, /* XXX really? */
{ 0xffff, 0xffff, 0, 0 },
{
@@ -234,7 +234,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2S1P PCI 16C850 (10x family): 2S, 1P */
- { "SIIG Cyber 2S1P PCI 16C850 (10x family)",
+ { /* "SIIG Cyber 2S1P PCI 16C850 (10x family)", */
{ 0x131f, 0x1036, 0, 0 }, /* XXX really? */
{ 0xffff, 0xffff, 0, 0 },
{
@@ -245,7 +245,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 4S PCI 16C550 (10x family): 4S */
- { "SIIG Cyber 4S PCI 16C550 (10x family)",
+ { /* "SIIG Cyber 4S PCI 16C550 (10x family)", */
{ 0x131f, 0x1050, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -257,7 +257,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 4S PCI 16C650 (10x family): 4S */
- { "SIIG Cyber 4S PCI 16C650 (10x family)",
+ { /* "SIIG Cyber 4S PCI 16C650 (10x family)", */
{ 0x131f, 0x1051, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -269,7 +269,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 4S PCI 16C850 (10x family): 4S */
- { "SIIG Cyber 4S PCI 16C850 (10x family)",
+ { /* "SIIG Cyber 4S PCI 16C850 (10x family)", */
{ 0x131f, 0x1052, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -285,7 +285,7 @@ const struct puc_device_description puc_devices[] = {
*/
/* SIIG Cyber Parallel PCI (20x family): 1P */
- { "SIIG Cyber Parallel PCI (20x family)",
+ { /* "SIIG Cyber Parallel PCI (20x family)", */
{ 0x131f, 0x2020, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -294,7 +294,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Parallel Dual PCI (20x family): 2P */
- { "SIIG Cyber Parallel Dual PCI (20x family)",
+ { /* "SIIG Cyber Parallel Dual PCI (20x family)", */
{ 0x131f, 0x2021, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -304,7 +304,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2P1S PCI 16C550 (20x family): 1S, 2P */
- { "SIIG Cyber 2P1S PCI 16C550 (20x family)",
+ { /* "SIIG Cyber 2P1S PCI 16C550 (20x family)", */
{ 0x131f, 0x2040, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -315,7 +315,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2P1S PCI 16C650 (20x family): 1S, 2P */
- { "SIIG Cyber 2P1S PCI 16C650 (20x family)",
+ { /* "SIIG Cyber 2P1S PCI 16C650 (20x family)", */
{ 0x131f, 0x2041, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -326,7 +326,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2P1S PCI 16C850 (20x family): 1S, 2P */
- { "SIIG Cyber 2P1S PCI 16C850 (20x family)",
+ { /* "SIIG Cyber 2P1S PCI 16C850 (20x family)", */
{ 0x131f, 0x2042, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -337,7 +337,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial PCI 16C550 (20x family): 1S */
- { "SIIG Cyber Serial PCI 16C550 (20x family)",
+ { /* "SIIG Cyber Serial PCI 16C550 (20x family)", */
{ 0x131f, 0x2000, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -346,7 +346,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial PCI 16C650 (20x family): 1S */
- { "SIIG Cyber Serial PCI 16C650 (20x family)",
+ { /* "SIIG Cyber Serial PCI 16C650 (20x family)", */
{ 0x131f, 0x2001, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -355,7 +355,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial PCI 16C850 (20x family): 1S */
- { "SIIG Cyber Serial PCI 16C850 (20x family)",
+ { /* "SIIG Cyber Serial PCI 16C850 (20x family)", */
{ 0x131f, 0x2002, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -364,7 +364,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber I/O PCI 16C550 (20x family): 1S, 1P */
- { "SIIG Cyber I/O PCI 16C550 (20x family)",
+ { /* "SIIG Cyber I/O PCI 16C550 (20x family)", */
{ 0x131f, 0x2010, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -374,7 +374,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber I/O PCI 16C650 (20x family): 1S, 1P */
- { "SIIG Cyber I/O PCI 16C650 (20x family)",
+ { /* "SIIG Cyber I/O PCI 16C650 (20x family)", */
{ 0x131f, 0x2011, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -384,7 +384,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber I/O PCI 16C850 (20x family): 1S, 1P */
- { "SIIG Cyber I/O PCI 16C850 (20x family)",
+ { /* "SIIG Cyber I/O PCI 16C850 (20x family)", */
{ 0x131f, 0x2012, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -394,7 +394,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial Dual PCI 16C550 (20x family): 2S */
- { "SIIG Cyber Serial Dual PCI 16C550 (20x family)",
+ { /* "SIIG Cyber Serial Dual PCI 16C550 (20x family)", */
{ 0x131f, 0x2030, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -404,7 +404,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial Dual PCI 16C650 (20x family): 2S */
- { "SIIG Cyber Serial Dual PCI 16C650 (20x family)",
+ { /* "SIIG Cyber Serial Dual PCI 16C650 (20x family)", */
{ 0x131f, 0x2031, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -414,7 +414,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber Serial Dual PCI 16C850 (20x family): 2S */
- { "SIIG Cyber Serial Dual PCI 16C850 (20x family)",
+ { /* "SIIG Cyber Serial Dual PCI 16C850 (20x family)", */
{ 0x131f, 0x2032, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -424,7 +424,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2S1P PCI 16C550 (20x family): 2S, 1P */
- { "SIIG Cyber 2S1P PCI 16C550 (20x family)",
+ { /* "SIIG Cyber 2S1P PCI 16C550 (20x family)", */
{ 0x131f, 0x2060, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -435,7 +435,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2S1P PCI 16C650 (20x family): 2S, 1P */
- { "SIIG Cyber 2S1P PCI 16C650 (20x family)",
+ { /* "SIIG Cyber 2S1P PCI 16C650 (20x family)", */
{ 0x131f, 0x2061, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -446,7 +446,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 2S1P PCI 16C850 (20x family): 2S, 1P */
- { "SIIG Cyber 2S1P PCI 16C850 (20x family)",
+ { /* "SIIG Cyber 2S1P PCI 16C850 (20x family)", */
{ 0x131f, 0x2062, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -457,7 +457,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 4S PCI 16C550 (20x family): 4S */
- { "SIIG Cyber 4S PCI 16C550 (20x family)",
+ { /* "SIIG Cyber 4S PCI 16C550 (20x family)", */
{ 0x131f, 0x2050, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -469,7 +469,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 4S PCI 16C650 (20x family): 4S */
- { "SIIG Cyber 4S PCI 16C650 (20x family)",
+ { /* "SIIG Cyber 4S PCI 16C650 (20x family)", */
{ 0x131f, 0x2051, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -481,7 +481,7 @@ const struct puc_device_description puc_devices[] = {
},
/* SIIG Cyber 4S PCI 16C850 (20x family): 4S */
- { "SIIG Cyber 4S PCI 16C850 (20x family)",
+ { /* "SIIG Cyber 4S PCI 16C850 (20x family)", */
{ 0x131f, 0x2052, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@@ -500,7 +500,7 @@ const struct puc_device_description puc_devices[] = {
* have to use an appropriately scaled baud rate when talking to
* the card.
*/
- { "VScom PCI-800",
+ { /* "VScom PCI-800", */
{ 0x10b5, 0x1076, 0x10b5, 0x1076 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@@ -515,5 +515,21 @@ const struct puc_device_description puc_devices[] = {
},
},
- { 0 }
+ /* NEC PK-UG-X001 K56flex PCI Modem card.
+ NEC MARTH bridge chip and Rockwell RCVDL56ACF/SP using. */
+ { /* "NEC PK-UG-X001 K56flex PCI Modem", */
+ { 0x1033, 0x0074, 0x1033, 0x8014 },
+ { 0xffff, 0xffff, 0xffff, 0xffff },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00 },
+ },
+ },
+
+ { /* NULL, */
+ { 0, 0, 0, 0 },
+ { 0, 0, 0, 0 },
+ {
+ { 0, 0, 0 },
+ },
+ }
};
diff --git a/sys/dev/pci/pucvar.h b/sys/dev/pci/pucvar.h
index 06fb028a9de..c3dccf3b135 100644
--- a/sys/dev/pci/pucvar.h
+++ b/sys/dev/pci/pucvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pucvar.h,v 1.1 1999/10/26 13:06:14 downsj Exp $ */
+/* $OpenBSD: pucvar.h,v 1.2 1999/11/14 01:27:57 downsj Exp $ */
/* $NetBSD: pucvar.h,v 1.2 1999/02/06 06:29:54 cgd Exp $ */
/*
@@ -41,7 +41,6 @@
#define PUC_MAX_PORTS 8
struct puc_device_description {
- const char *name;
pcireg_t rval[4];
pcireg_t rmask[4];
struct {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-07 08:23:16 +0000