Updated some IDE definition to match NetBSD counterparts. This will

help in porting over the PCI IDE stuff.

3 files changed, 18 insertions, 10 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 6c50f732f78..7c307bba7ab 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.161 1999/07/07 20:22:21 deraadt Exp $
+$OpenBSD: pcidevs,v 1.162 1999/07/18 21:07:52 csapuntz Exp $
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -924,7 +924,7 @@ product INTEL EEPRO100S		0x1228	EE Pro 100 Smart
 product INTEL 82557		0x1229	82557
 product INTEL 82437FX		0x122d	82437FX (Triton) PCI/Cache/DRAM
 product INTEL 82371		0x122e	82371FB (Triton) PCI-ISA
-product INTEL 82438		0x1230	82438 (Triton) IDE
+product INTEL 82371FB_IDE	0x1230	82371FB (Triton) IDE
 product INTEL 82371MX		0x1234	82371 (Triton MX) PCI-ISA and IDE
 product INTEL 82437MX		0x1235	82437 (Triton MX) PCI/CACHECOMP/DRAM
 product INTEL 82441FX		0x1237	82441FX PCI/Memory (PMC)
@@ -932,7 +932,7 @@ product INTEL 82380AB		0x123c	82380AB Mobile PCI-to-ISA (MISA)
 product INTEL 82380FB		0x124b	82380FB Mobile PCI-to-PCI (MPCI2)
 product INTEL 82439HX		0x1250	82439HX (Triton II) TXC Host
 product INTEL 82371SB		0x7000	82371SB (Triton II) PCI-ISA
-product INTEL 82371IDE		0x7010	82371SB (Triton II) IDE
+product INTEL 82371SB_IDE	0x7010	82371SB (Triton II) IDE
 product INTEL 82371USB		0x7020	82371SB (Triton II) USB
 product INTEL 82437VX		0x7030	82437VX System (TVX)
 product INTEL 82439TX		0x7100	82439TX System (MTXC)
@@ -1170,6 +1170,7 @@ product SIS 5581		0x5581	5581
 product SIS 5582		0x5582	5582
 product SIS 5591		0x5591	5591 Host-PCI
 product SIS 5596		0x5596	5596
+product SIS 5597_IDE		0x5597  5597/5598 IDE controller
 product SIS 5598		0x5598	5598
 product SIS 6204		0x6204	6204
 product SIS 6205		0x6205	6205
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index b840b172aad..81991047ee5 100644
--- 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.161 1999/07/07 20:22:21 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.162 1999/07/18 21:07:52 csapuntz Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -929,7 +929,7 @@
 #define	PCI_PRODUCT_INTEL_82557	0x1229		/* 82557 */
 #define	PCI_PRODUCT_INTEL_82437FX	0x122d		/* 82437FX (Triton) PCI/Cache/DRAM */
 #define	PCI_PRODUCT_INTEL_82371	0x122e		/* 82371FB (Triton) PCI-ISA */
-#define	PCI_PRODUCT_INTEL_82438	0x1230		/* 82438 (Triton) IDE */
+#define	PCI_PRODUCT_INTEL_82371FB_IDE	0x1230		/* 82371FB (Triton) IDE */
 #define	PCI_PRODUCT_INTEL_82371MX	0x1234		/* 82371 (Triton MX) PCI-ISA and IDE */
 #define	PCI_PRODUCT_INTEL_82437MX	0x1235		/* 82437 (Triton MX) PCI/CACHECOMP/DRAM */
 #define	PCI_PRODUCT_INTEL_82441FX	0x1237		/* 82441FX PCI/Memory (PMC) */
@@ -937,7 +937,7 @@
 #define	PCI_PRODUCT_INTEL_82380FB	0x124b		/* 82380FB Mobile PCI-to-PCI (MPCI2) */
 #define	PCI_PRODUCT_INTEL_82439HX	0x1250		/* 82439HX (Triton II) TXC Host */
 #define	PCI_PRODUCT_INTEL_82371SB	0x7000		/* 82371SB (Triton II) PCI-ISA */
-#define	PCI_PRODUCT_INTEL_82371IDE	0x7010		/* 82371SB (Triton II) IDE */
+#define	PCI_PRODUCT_INTEL_82371SB_IDE	0x7010		/* 82371SB (Triton II) IDE */
 #define	PCI_PRODUCT_INTEL_82371USB	0x7020		/* 82371SB (Triton II) USB */
 #define	PCI_PRODUCT_INTEL_82437VX	0x7030		/* 82437VX System (TVX) */
 #define	PCI_PRODUCT_INTEL_82439TX	0x7100		/* 82439TX System (MTXC) */
@@ -1175,6 +1175,7 @@
 #define	PCI_PRODUCT_SIS_5582	0x5582		/* 5582 */
 #define	PCI_PRODUCT_SIS_5591	0x5591		/* 5591 Host-PCI */
 #define	PCI_PRODUCT_SIS_5596	0x5596		/* 5596 */
+#define	PCI_PRODUCT_SIS_5597_IDE	0x5597		/* 5597/5598 IDE controller */
 #define	PCI_PRODUCT_SIS_5598	0x5598		/* 5598 */
 #define	PCI_PRODUCT_SIS_6204	0x6204		/* 6204 */
 #define	PCI_PRODUCT_SIS_6205	0x6205		/* 6205 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 0e63173e7f4..38a0b763070 100644
--- 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.161 1999/07/07 20:22:21 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.162 1999/07/18 21:07:52 csapuntz Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -1611,10 +1611,10 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82371FB (Triton) PCI-ISA",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82438,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371FB_IDE,
 	    0,
 	    "Intel",
-	    "82438 (Triton) IDE",
+	    "82371FB (Triton) IDE",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371MX,
@@ -1659,7 +1659,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82371SB (Triton II) PCI-ISA",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371IDE,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371SB_IDE,
 	    0,
 	    "Intel",
 	    "82371SB (Triton II) IDE",
@@ -2607,6 +2607,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "5596",
 	},
 	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5597_IDE,
+	    0,
+	    "Silicon Integrated System",
+	    "5597/5598 IDE controller",
+	},
+	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5598,
 	    0,
 	    "Silicon Integrated System",