src - OpenBSD base system

diff options


context:
space:
mode:

author	Thorsten Lockert <tholo@cvs.openbsd.org>	1996-04-28 04:30:55 +0000
committer	Thorsten Lockert <tholo@cvs.openbsd.org>	1996-04-28 04:30:55 +0000
commit	9b2a42d19d2d7b21308d5f6d6cc8c3155dbb8edd (patch)
tree	e342e728f3527fa501309a1d09f86cc22190d93a /sys/dev
parent	30da58af6e48926e94817ebbd57089fb473a1b72 (diff)

Integrate new version of devlist2h.awk from NetBSD 1/22/96; regenerate

PCI device lists to compiles with PCI_VERBOSE works again

Diffstat (limited to 'sys/dev')

-rw-r--r--

sys/dev/pci/devlist2h.awk

-rw-r--r--

sys/dev/pci/pcidevs.h

-rw-r--r--

sys/dev/pci/pcidevs_data.h

762

3 files changed, 377 insertions, 415 deletions

diff --git a/sys/dev/pci/devlist2h.awk b/sys/dev/pci/devlist2h.awk
index c814f5e2ff0..7618cc4f60b 100644
--- a/sys/dev/pci/devlist2h.awk
+++ b/sys/dev/pci/devlist2h.awk

@@ -1,7 +1,7 @@

#! /usr/bin/awk -f

-# $NetBSD: devlist2h.awk,v 1.1 1995/06/18 01:07:06 cgd Exp $

+# $NetBSD: devlist2h.awk,v 1.2 1996/01/22 21:08:09 cgd Exp $

# Redistribution and use in source and binary forms, with or without

@@ -54,7 +54,7 @@ NR == 1 {

printf(" *\t%s\n", VERSION) > hfile

printf(" */\n") > hfile

- continue

+ next

}

$1 == "vendor" {

nvendors++

@@ -99,7 +99,7 @@ $1 == "vendor" {

printf(" */") > hfile

printf("\n") > hfile

- continue

+ next

}

$1 == "product" {

nproducts++

@@ -112,12 +112,6 @@ $1 == "product" {

i=4; f = 5;

- # remember if the device is unsupported

- if ($f == "UNSUPP") {

- products[nproducts, 1, unsupported] = 1;

- f++

- }

# comments

ocomment = oparen = 0

if (f <= NF) {

@@ -150,7 +144,7 @@ $1 == "product" {

printf(" */") > hfile

printf("\n") > hfile

- continue

+ next

}

{

if ($0 == "")

@@ -171,10 +165,7 @@ END {

products[i, 1], products[i, 1], products[i, 2]) \

> dfile

printf("\t ") > dfile

- if (products[i, 1, unsupp])

- printf("PCI_KNOWNDEV_UNSUPP") > dfile

- else

- printf("0") > dfile

+ printf("0") > dfile

printf(",\n") > dfile

vendi = vendorindex[products[i, 1]];

@@ -207,7 +198,7 @@ END {

printf("\t{\n") > dfile

printf("\t PCI_VENDOR_%s, 0,\n", vendors[i, 1]) \

> dfile

- printf("\t PCI_KNOWNDEV_UNSUPP | PCI_KNOWNDEV_NOPROD,\n") \

+ printf("\t PCI_KNOWNDEV_NOPROD,\n") \

> dfile

printf("\t \"") > dfile

j = 3;

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 0e86ed3cd96..13d728d8f4c 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h

@@ -2,9 +2,10 @@

* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.

* generated from:

- * OpenBSD

+ * OpenBSD: pcidevs,v 1.6 1996/04/18 23:48:04 niklas Exp

-/* $NetBSD: pcidevs,v 1.6 1996/02/19 20:08:25 christos Exp $ */

+/* $NetBSD: pcidevs,v 1.7 1996/04/04 21:46:33 mycroft Exp $ */

@@ -453,7 +454,7 @@

#define PCI_PRODUCT_DIAMOND_vIPER 0x9001 /* Viper/PCI */

/* CMD Technologies Products */

-#define PCI_PRODUCT_CMDTECH_PCI0640 0x0640 /* PCI to IDE Controller */

+#define PCI_PRODUCT_CMDTECH_PCI0640 0x0640 /* UNSUPP PCI to IDE Controller */

/* FORE products */

#define PCI_PRODUCT_FORE_PCA200 0x0210 /* ATM PCA-200 */

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index c9858b6d554..95b71bcb041 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h

@@ -2,40 +2,10 @@

* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.

* generated from:

- * OpenBSD

+ * OpenBSD: pcidevs,v 1.6 1996/04/18 23:48:04 niklas Exp

-/* $NetBSD: pcidevs,v 1.6 1996/02/19 20:08:25 christos Exp $ */

+/* $NetBSD: pcidevs,v 1.7 1996/04/04 21:46:33 mycroft Exp $ */

-/*

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software

- * must display the following acknowledgement:

- * This product includes software developed by Christopher G. Demetriou

- * for the NetBSD Project.

- * 4. The name of the author may not be used to endorse or promote products

- * derived from this software without specific prior written permission

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

struct pci_knowndev pci_knowndevs[] = {

{

@@ -196,9 +166,9 @@ struct pci_knowndev pci_knowndevs[] = {

{

PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_PCI0640,

- PCI_KNOWNDEV_UNSUPP,

+ 0,

"CMD Technology",

- "PCI to IDE Controller",

+ "UNSUPP PCI to IDE Controller",

{

PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200,

@@ -376,2173 +346,2173 @@ struct pci_knowndev pci_knowndevs[] = {

{

PCI_VENDOR_OLDCOMPAQ, 0,