Tweak names and add entries to the RCC (ServerWorks/Broadcom) PCI ids.

Based on Linux's pci.ids and sata_svw.c

3 files changed, 35 insertions, 27 deletions

diff --git a/sys/arch/i386/pci/pci_intr_fixup.c b/sys/arch/i386/pci/pci_intr_fixup.c
index 9c945e33e0d..fa429d84150 100644
--- a/sys/arch/i386/pci/pci_intr_fixup.c
+++ b/sys/arch/i386/pci/pci_intr_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_intr_fixup.c,v 1.39 2005/09/27 23:02:09 beck Exp $	*/
+/*	$OpenBSD: pci_intr_fixup.c,v 1.40 2005/10/15 11:42:56 brad Exp $	*/
 /*	$NetBSD: pci_intr_fixup.c,v 1.10 2000/08/10 21:18:27 soda Exp $	*/
 
 /*
@@ -166,7 +166,7 @@ const struct pciintr_icu_table {
 	{ PCI_VENDOR_OPTI,	PCI_PRODUCT_OPTI_82C700,
 	  opti82c700_init },
 
-	{ PCI_VENDOR_RCC,	PCI_PRODUCT_RCC_ROSB4,
+	{ PCI_VENDOR_RCC,	PCI_PRODUCT_RCC_OSB4,
 	  osb4_init },
 	{ PCI_VENDOR_RCC,	PCI_PRODUCT_RCC_CSB5,
 	  osb4_init },
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index ef85b0d98c2..2e70b491473 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.941 2005/10/12 19:34:16 brad Exp $
+$OpenBSD: pcidevs,v 1.942 2005/10/15 11:42:52 brad Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -2348,31 +2348,39 @@ product PCTECH RZ1000		0x1000	RZ1000
 product PCTEL MICROMODEM56	0x7879	HSP MicroModem 56
 
 /* Ross -> Pequr -> ServerWorks -> Broadcom products */
-product RCC XX5			0x0005	PCIHB5
-product RCC CIOB20		0x0006	I/O Bridge
-product RCC XX7			0x0007	PCIHB7
-product RCC CNB20HE		0x0008	CNB20HE Host
+product RCC CMIC_LE		0x0000	CMIC-LE
+product RCC CNB20_LE		0x0005	CNB20-LE Host
+product RCC CNB20HE_1		0x0006	CNB20HE Host
+product RCC CNB20_LE_2		0x0007	CNB20-LE Host
+product RCC CNB20HE_2		0x0008	CNB20HE Host
 product RCC CNB20LE		0x0009	CNB20LE Host
 product RCC CIOB30		0x0010	CIOB30
-product RCC CMIC_HE		0x0011	CMIC_HE Host
-product RCC CMIC_LE		0x0012	CMIC_LE Host
-product RCC CNB20_HE		0x0014	CNB20-HE
-product RCC CMIC_SL		0x0017	CMIC_SL Host
-product RCC CIOBX2		0x0101	CIOBX2
+product RCC CMIC_HE		0x0011	CMIC-HE
+product RCC CMIC_WS_GC_LE	0x0012	CMIC-WS Host (GC-LE)
+product RCC CNB20_HE		0x0013	CNB20-HE Host
+product RCC CMIC_LE_GC_LE	0x0014	CNB20-HE Host (GC-LE)
+product RCC CMIC_GC_1		0x0015	CMIC-GC Host
+product RCC CMIC_GC_2		0x0016	CMIC-GC Host
+product RCC GCNB_LE		0x0017	GCNB-LE Host
+product RCC CIOB_X2		0x0101	CIOB-X2 PCIX
 product RCC CIOB_E		0x0110	CIOB-E
-product RCC ROSB4		0x0200	ROSB4 SouthBridge
-product RCC CSB5		0x0201	CSB5 SouthBridge
-product RCC CSB6_PCI		0x0203	CSB6 PCI
+product RCC OSB4		0x0200	OSB4
+product RCC CSB5		0x0201	CSB5
+product RCC CSB6		0x0203	CSB6
 product RCC OSB4_IDE		0x0211	OSB4 IDE
 product RCC CSB5_IDE		0x0212	CSB5 IDE
-product RCC CSB6_IDE		0x0213	CSB6 IDE
-product RCC CSB6_IDE2		0x0217	CSB6 IDE
+product RCC CSB6_RAID_IDE	0x0213	CSB6 RAID/IDE
+product RCC HT_1000_IDE		0x0214	HT-1000 IDE
+product RCC CSB6_IDE		0x0217	CSB6 IDE
 product RCC USB			0x0220	OSB4/CSB5 USB
 product RCC CSB6_USB		0x0221	CSB6 USB
-product RCC CSB5BRIDGE		0x0225	CSB5 PCI
-product RCC CSB6_LPC		0x0227	CSB6 LPC
-product RCC ISA			0x0230	PCI/ISA
-product RCC SATA		0x0240	SATA
+product RCC CSB5_LPC_1		0x0225	CSB5 LPC
+product RCC GCLE_2		0x0227	GCLE-2 Host
+product RCC CSB5_LPC_2		0x0230	CSB5 LPC
+product RCC K2_SATA		0x0240	K2 SATA
+product RCC FRODO4_SATA		0x0241	Frodo4 SATA
+product RCC FRODO8_SATA		0x0242	Frodo8 SATA
+product RCC HT_1000_SATA	0x024a	HT-1000 SATA
 
 /* Philips products */
 product PHILIPS SAA7130		0x7130	SAA7130
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index a4bca6c5545..f8411f67cc7 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.204 2005/09/15 06:43:02 jsg Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.205 2005/10/15 11:42:52 brad Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -684,7 +684,7 @@ const struct pciide_product_desc pciide_serverworks_products[] =  {
 	  0,
 	  serverworks_chip_map,
 	},
-	{ PCI_PRODUCT_RCC_CSB6_IDE2,
+	{ PCI_PRODUCT_RCC_CSB6_RAID_IDE,
 	  0,
 	  serverworks_chip_map,
 	}
@@ -6572,17 +6572,17 @@ serverworks_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
 			sc->sc_wdcdev.UDMA_cap = 5;
 		break;
 	case PCI_PRODUCT_RCC_CSB6_IDE:
-		sc->sc_wdcdev.UDMA_cap = 5;
-		break;
-	case PCI_PRODUCT_RCC_CSB6_IDE2:
 		sc->sc_wdcdev.UDMA_cap = 4;
 		break;
+	case PCI_PRODUCT_RCC_CSB6_RAID_IDE:
+		sc->sc_wdcdev.UDMA_cap = 5;
+		break;
 	}
 
 	sc->sc_wdcdev.set_modes = serverworks_setup_channel;
 	sc->sc_wdcdev.channels = sc->wdc_chanarray;
 	sc->sc_wdcdev.nchannels =
-	    (sc->sc_pp->ide_product == PCI_PRODUCT_RCC_CSB6_IDE2 ? 1 : 2);
+	    (sc->sc_pp->ide_product == PCI_PRODUCT_RCC_CSB6_IDE ? 1 : 2);
 
 	for (channel = 0; channel < sc->sc_wdcdev.nchannels; channel++) {
 		cp = &sc->pciide_channels[channel];