diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-03-02 09:36:23 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-03-02 09:36:23 +0000 |
| commit | 5298b1856705603273d4860664ba9662a8cf39ec (patch) | |
| tree | f2ffef46203b87a2a49b95e4d4df2d033d669862 /sys | |
| parent | 25557b1b3f5966a97aba502846045a8ac1a348d6 (diff) | |
new lava
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/pcidevs | 12 | ||||
| -rw-r--r-- | sys/dev/pci/pucdata.c | 22 |
2 files changed, 24 insertions, 10 deletions
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 60b44955907..3f319713f40 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ - $OpenBSD: pcidevs,v 1.370 2001/02/22 03:04:08 chris Exp $ + $OpenBSD: pcidevs,v 1.371 2001/03/02 09:36:22 deraadt Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -1233,13 +1233,15 @@ product LMC SSI 0x0005 SSI product LMC DS1 0x0006 DS1 /* Lava */ -product LAVA PARALLEL 0x8000 Parallel +product LAVA TWOSP_1P 0x8000 Parallel product LAVA PARALLEL2 0x8001 Dual Parallel product LAVA PARALLEL2A 0x8002 Dual Parallel product LAVA PARALLELB 0x8003 Dual Parallel B -product LAVA SERIAL 0x0100 Dual Serial -product LAVA SERIAL1 0x0110 Serial -product LAVA SERIAL2 0x0111 Serial +product LAVA TWOSP_2S 0x0100 Dual Serial +product LAVA IOFLEX_2S_0 0x0110 Serial +product LAVA IOFLEX_2S_1 0x0111 Serial +product LAVA OCTOPUS950_0 0x0180 Quad Serial +product LAVA OCTOPUS950_1 0x0181 Quad Serial /* LeadTek Research */ product LEADTEK S3_805 0x0000 S3 805 diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c index f59a4d40006..c3633e272f7 100644 --- a/sys/dev/pci/pucdata.c +++ b/sys/dev/pci/pucdata.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pucdata.c,v 1.6 2000/09/14 18:50:20 deraadt Exp $ */ +/* $OpenBSD: pucdata.c,v 1.7 2001/03/02 09:36:22 deraadt Exp $ */ /* $NetBSD: pucdata.c,v 1.6 1999/07/03 05:55:23 cgd Exp $ */ /* @@ -537,7 +537,7 @@ const struct puc_device_description puc_devices[] = { /* Lava Computers 2SP-PCI (0x8000-0x8003) */ { /* "Lava Computers 2SP-PCI parallel port", */ - { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_PARALLEL, 0, 0 }, + { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_TWOSP_1P, 0, 0 }, { 0xffff, 0xfffc, 0, 0 }, { { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, @@ -546,7 +546,7 @@ const struct puc_device_description puc_devices[] = { /* Lava Computers 2SP-PCI and Quattro-PCI serial ports */ { /* "Lava Computers dual serial port", */ - { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_SERIAL, 0, 0 }, + { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_TWOSP_2S, 0, 0 }, { 0xffff, 0xfffc, 0, 0 }, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -556,16 +556,28 @@ const struct puc_device_description puc_devices[] = { /* Koutech IOFLEX-2S PCI Dual Port Serial, port 1 */ { /* "Koutech IOFLEX-2S PCI Dual Port Serial, port 1", */ - { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_SERIAL1, 0, 0 }, + { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_IOFLEX_2S_0, 0, 0 }, { 0xffff, 0xfffc, 0, 0 }, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, }, }, + /* Lava Computers Octopus-550 serial ports */ + { /* "Lava Computers Octopus-550 8-port serial", */ + { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_OCTOPUS950_0, 0, 0 }, + { 0xffff, 0xfffc, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + }, + }, + /* Koutech IOFLEX-2S PCI Dual Port Serial, port 2 */ { /* "Koutech IOFLEX-2S PCI Dual Port Serial, port 2", */ - { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_SERIAL2, 0, 0 }, + { PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_IOFLEX_2S_1, 0, 0 }, { 0xffff, 0xfffc, 0, 0 }, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, |