Update after realpha on the source.

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 6804590..058d1f5 100644 (file)
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *             OpenBSD: pcidevs,v 1.224 2000/03/20 07:33:07 rahnds Exp 
+ *             OpenBSD: pcidevs,v 1.225 2000/03/20 07:40:44 rahnds Exp 
  */
 
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
@@ -668,18 +668,6 @@
 /* Alteon products */
 #define        PCI_PRODUCT_ALTEON_ACENIC       0x0001          /* Acenic */
 
-/* Apple products */
-#define        PCI_PRODUCT_APPLE_BANDIT        0x0001          /* PCI */
-#define        PCI_PRODUCT_APPLE_GC    0x0002          /* PCI */
-#define        PCI_PRODUCT_APPLE_OHARE 0x0007          /* PCI */
-#define        PCI_PRODUCT_APPLE_HEATHROW      0x0010          /* MACIO */
-#define        PCI_PRODUCT_APPLE_PADDINGTON    0x0017          /* MACIO */
-#define        PCI_PRODUCT_APPLE_UNINORTHETH   0x001e          /* PCI */
-#define        PCI_PRODUCT_APPLE_UNINORTH      0x001f          /* PCI */
-#define        PCI_PRODUCT_APPLE_UNINORTHAGP   0x0020          /* AGP */
-#define        PCI_PRODUCT_APPLE_GMAC  0x0021          /* GMAC */
-#define        PCI_PRODUCT_APPLE_KEYLARGO      0x0022          /* MACIO */
-
 /* AMD products */
 #define        PCI_PRODUCT_AMD_PCNET_PCI       0x2000          /* 79c970 PCnet-PCI LANCE */
 #define        PCI_PRODUCT_AMD_PCHOME_PCI      0x2001          /* 79c978 PChome-PCI LANCE */
@@ -694,6 +682,18 @@
 #define        PCI_PRODUCT_AMD_PBC756_PMC      0x740B          /* 756 Power Management */
 #define        PCI_PRODUCT_AMD_PBC756_USB      0x740C          /* 756 USB Host */
 
+/* Apple products */
+#define        PCI_PRODUCT_APPLE_BANDIT        0x0001          /* PCI */
+#define        PCI_PRODUCT_APPLE_GC    0x0002          /* PCI */
+#define        PCI_PRODUCT_APPLE_OHARE 0x0007          /* PCI */
+#define        PCI_PRODUCT_APPLE_HEATHROW      0x0010          /* MACIO */
+#define        PCI_PRODUCT_APPLE_PADDINGTON    0x0017          /* MACIO */
+#define        PCI_PRODUCT_APPLE_UNINORTHETH   0x001e          /* PCI */
+#define        PCI_PRODUCT_APPLE_UNINORTH      0x001f          /* PCI */
+#define        PCI_PRODUCT_APPLE_UNINORTHAGP   0x0020          /* AGP */
+#define        PCI_PRODUCT_APPLE_GMAC  0x0021          /* GMAC */
+#define        PCI_PRODUCT_APPLE_KEYLARGO      0x0022          /* MACIO */
+
 /* ARC Logic products */
 #define        PCI_PRODUCT_ARC_1000PV  0xa091          /* 1000PV */
 #define        PCI_PRODUCT_ARC_2000PV  0xa099          /* 2000PV */

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index c1def46..46bb716 100644 (file)
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *             OpenBSD: pcidevs,v 1.224 2000/03/20 07:33:07 rahnds Exp 
+ *             OpenBSD: pcidevs,v 1.225 2000/03/20 07:40:44 rahnds Exp 
  */
 
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
@@ -554,66 +554,6 @@ struct pci_knowndev pci_knowndevs[] = {
            "Alteon",
            "Acenic",
        },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_BANDIT,
-           0,
-           "Apple Computer",
-           "PCI",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GC,
-           0,
-           "Apple Computer",
-           "PCI",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_OHARE,
-           0,
-           "Apple Computer",
-           "PCI",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_HEATHROW,
-           0,
-           "Apple Computer",
-           "MACIO",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PADDINGTON,
-           0,
-           "Apple Computer",
-           "MACIO",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHETH,
-           0,
-           "Apple Computer",
-           "PCI",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH,
-           0,
-           "Apple Computer",
-           "PCI",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHAGP,
-           0,
-           "Apple Computer",
-           "AGP",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GMAC,
-           0,
-           "Apple Computer",
-           "GMAC",
-       },
-       {
-           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_KEYLARGO,
-           0,
-           "Apple Computer",
-           "MACIO",
-       },
        {
            PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCNET_PCI,
            0,
@@ -674,6 +614,66 @@ struct pci_knowndev pci_knowndevs[] = {
            "AMD",
            "756 USB Host",
        },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_BANDIT,
+           0,
+           "Apple Computer",
+           "PCI",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GC,
+           0,
+           "Apple Computer",
+           "PCI",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_OHARE,
+           0,
+           "Apple Computer",
+           "PCI",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_HEATHROW,
+           0,
+           "Apple Computer",
+           "MACIO",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PADDINGTON,
+           0,
+           "Apple Computer",
+           "MACIO",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHETH,
+           0,
+           "Apple Computer",
+           "PCI",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH,
+           0,
+           "Apple Computer",
+           "PCI",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHAGP,
+           0,
+           "Apple Computer",
+           "AGP",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GMAC,
+           0,
+           "Apple Computer",
+           "GMAC",
+       },
+       {
+           PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_KEYLARGO,
+           0,
+           "Apple Computer",
+           "MACIO",
+       },
        {
            PCI_VENDOR_ARC, PCI_PRODUCT_ARC_1000PV,
            0,