Stop bloating pciide_softc with chip-specific variables. Add one pointer

to chip private data and use it.

4 files changed, 55 insertions, 33 deletions

diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index ca35392978c..50526c694d6 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.173 2004/10/17 18:05:55 grange Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.174 2004/10/17 18:16:12 grange Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -3390,18 +3390,25 @@ cy693_chip_map(sc, pa)
 	struct pciide_channel *cp;
 	pcireg_t interface = PCI_INTERFACE(pa->pa_class);
 	bus_size_t cmdsize, ctlsize;
+	struct pciide_cy *cy;
 
 	if (pciide_chipen(sc, pa) == 0)
 		return;
+
+	/* Allocate memory for private data */
+	sc->sc_cookie = malloc(sizeof(struct pciide_cy), M_DEVBUF, M_NOWAIT);
+	cy = sc->sc_cookie;
+	bzero(cy, sizeof(*cy));
+
 	/*
 	 * this chip has 2 PCI IDE functions, one for primary and one for
 	 * secondary. So we need to call pciide_mapregs_compat() with
 	 * the real channel
 	 */
 	if (pa->pa_function == 1) {
-		sc->sc_cy_compatchan = 0;
+		cy->cy_compatchan = 0;
 	} else if (pa->pa_function == 2) {
-		sc->sc_cy_compatchan = 1;
+		cy->cy_compatchan = 1;
 	} else {
 		printf(": unexpected PCI function %d\n", pa->pa_function);
 		return;
@@ -3415,8 +3422,8 @@ cy693_chip_map(sc, pa)
 		sc->sc_dma_ok = 0;
 	}
 
-	sc->sc_cy_handle = cy82c693_init(pa->pa_iot);
-	if (sc->sc_cy_handle == NULL) {
+	cy->cy_handle = cy82c693_init(pa->pa_iot);
+	if (cy->cy_handle == NULL) {
 		printf(", (unable to map ctl registers)");
 		sc->sc_dma_ok = 0;
 	}
@@ -3455,13 +3462,13 @@ cy693_chip_map(sc, pa)
 		    pciide_pci_intr);
 	} else {
 		printf("compatibility\n");
-		cp->hw_ok = pciide_mapregs_compat(pa, cp, sc->sc_cy_compatchan,
+		cp->hw_ok = pciide_mapregs_compat(pa, cp, cy->cy_compatchan,
 		    &cmdsize, &ctlsize);
 	}
 
 	cp->wdc_channel.data32iot = cp->wdc_channel.cmd_iot;
 	cp->wdc_channel.data32ioh = cp->wdc_channel.cmd_ioh;
-	pciide_map_compat_intr(pa, cp, sc->sc_cy_compatchan, interface);
+	pciide_map_compat_intr(pa, cp, cy->cy_compatchan, interface);
 	if (cp->hw_ok == 0)
 		return;
 	wdcattach(&cp->wdc_channel);
@@ -3470,7 +3477,7 @@ cy693_chip_map(sc, pa)
 		    PCI_COMMAND_STATUS_REG, 0);
 	}
 	if (cp->hw_ok == 0) {
-		pciide_unmap_compat_intr(pa, cp, sc->sc_cy_compatchan,
+		pciide_unmap_compat_intr(pa, cp, cy->cy_compatchan,
 		    interface);
 		return;
 	}
@@ -3493,6 +3500,7 @@ cy693_setup_channel(chp)
 	struct pciide_channel *cp = (struct pciide_channel *)chp;
 	struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc;
 	int dma_mode = -1;
+	struct pciide_cy *cy = sc->sc_cookie;
 
 	cy_cmd_ctrl = idedma_ctl = 0;
 
@@ -3527,10 +3535,10 @@ cy693_setup_channel(chp)
 	if (dma_mode == -1)
 		dma_mode = 0;
 
-	if (sc->sc_cy_handle != NULL) {
+	if (cy->cy_handle != NULL) {
 		/* Note: `multiple' is implied. */
-		cy82c693_write(sc->sc_cy_handle,
-		    (sc->sc_cy_compatchan == 0) ?
+		cy82c693_write(cy->cy_handle,
+		    (cy->cy_compatchan == 0) ?
 		    CY_DMA_IDX_PRIMARY : CY_DMA_IDX_SECONDARY, dma_mode);
 	}
 
@@ -3643,10 +3651,16 @@ sis_chip_map(sc, pa)
 	bus_size_t cmdsize, ctlsize;
 	pcitag_t br_tag;
 	struct pci_attach_args br_pa;
+	struct pciide_sis *sis;
 
 	if (pciide_chipen(sc, pa) == 0)
 		return;
 
+	/* Allocate memory for private data */
+	sc->sc_cookie = malloc(sizeof(struct pciide_sis), M_DEVBUF, M_NOWAIT);
+	sis = sc->sc_cookie;
+	bzero(sis, sizeof(*sis));
+
 	/* Find PCI bridge (dev 0 func 0 on the same bus) */
 	br_tag = pci_make_tag(pa->pa_pc, pa->pa_bus, 0, 0);
 	br_pa.pa_id = pci_conf_read(sc->sc_pc, br_tag, PCI_ID_REG);
@@ -3660,7 +3674,7 @@ sis_chip_map(sc, pa)
 			    pciide_pci_read(sc->sc_pc, sc->sc_tag,
 			    SIS_REG_57) & 0x7f);
 			if (sc->sc_pp->ide_product == SIS_PRODUCT_5518) {
-				sc->sis_type = SIS_TYPE_133NEW;
+				sis->sis_type = SIS_TYPE_133NEW;
 				sc->sc_wdcdev.UDMA_cap =
 				    sis_hostbr_type_match->udma_mode;
 			} else {
@@ -3677,17 +3691,17 @@ sis_chip_map(sc, pa)
 				    DEBUG_PROBE);
 
 				if (sis_south_match(&br_pa)) {
-					sc->sis_type = SIS_TYPE_133OLD;
+					sis->sis_type = SIS_TYPE_133OLD;
 					sc->sc_wdcdev.UDMA_cap =
 					    sis_hostbr_type_match->udma_mode;
 				} else {
-					sc->sis_type = SIS_TYPE_100NEW;
+					sis->sis_type = SIS_TYPE_100NEW;
 					sc->sc_wdcdev.UDMA_cap =
 					    sis_hostbr_type_match->udma_mode;
 				}
 			}
 		} else {
-			sc->sis_type = sis_hostbr_type_match->type;
+			sis->sis_type = sis_hostbr_type_match->type;
 			sc->sc_wdcdev.UDMA_cap =
 			    sis_hostbr_type_match->udma_mode;
 		}
@@ -3696,10 +3710,10 @@ sis_chip_map(sc, pa)
 		printf(": 5597/5598");
 		if (rev >= 0xd0) {
 			sc->sc_wdcdev.UDMA_cap = 2;
-			sc->sis_type = SIS_TYPE_66;
+			sis->sis_type = SIS_TYPE_66;
 		} else {
 			sc->sc_wdcdev.UDMA_cap = 0;
-			sc->sis_type = SIS_TYPE_NOUDMA;
+			sis->sis_type = SIS_TYPE_NOUDMA;
 		}
 	}
 
@@ -3711,7 +3725,7 @@ sis_chip_map(sc, pa)
 	if (sc->sc_dma_ok) {
 		sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_IRQACK;
 		sc->sc_wdcdev.irqack = pciide_irqack;
-		if (sc->sis_type >= SIS_TYPE_66)
+		if (sis->sis_type >= SIS_TYPE_66)
 			sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
 	}
 
@@ -3720,7 +3734,7 @@ sis_chip_map(sc, pa)
 
 	sc->sc_wdcdev.channels = sc->wdc_chanarray;
 	sc->sc_wdcdev.nchannels = PCIIDE_NUM_CHANNELS;
-	switch (sc->sis_type) {
+	switch (sis->sis_type) {
 	case SIS_TYPE_NOUDMA:
 	case SIS_TYPE_66:
 	case SIS_TYPE_100OLD:
@@ -3856,6 +3870,7 @@ sis_setup_channel(chp)
 	u_int32_t idedma_ctl;
 	struct pciide_channel *cp = (struct pciide_channel *)chp;
 	struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc;
+	struct pciide_sis *sis = sc->sc_cookie;
 
 	WDCDEBUG_PRINT(("sis_setup_channel: old timings reg for "
 	    "channel %d 0x%x\n", chp->channel,
@@ -3884,7 +3899,7 @@ sis_setup_channel(chp)
 				if (drvp->UDMA_mode > 2)
 					drvp->UDMA_mode = 2;
 			}
-			switch (sc->sis_type) {
+			switch (sis->sis_type) {
 			case SIS_TYPE_66:
 			case SIS_TYPE_100OLD:
 				sis_tim |= sis_udma66_tim[drvp->UDMA_mode] <<
@@ -3901,7 +3916,7 @@ sis_setup_channel(chp)
 				break;
 			default:
 				printf("unknown SiS IDE type %d\n",
-				    sc->sis_type);
+				    sis->sis_type);
 			}
 		} else {
 			/*
@@ -3918,7 +3933,7 @@ sis_setup_channel(chp)
 				drvp->PIO_mode = 0;
 		}
 		idedma_ctl |= IDEDMA_CTL_DRV_DMA(drive);
-pio:		switch (sc->sis_type) {
+pio:		switch (sis->sis_type) {
 		case SIS_TYPE_NOUDMA:
 		case SIS_TYPE_66:
 		case SIS_TYPE_100OLD:
@@ -3936,7 +3951,7 @@ pio:		switch (sc->sis_type) {
 			break;
 		default:
 			printf("unknown SiS IDE type %d\n",
-			    sc->sis_type);
+			    sis->sis_type);
 		}
 	}
 	WDCDEBUG_PRINT(("sis_setup_channel: new timings reg for "
diff --git a/sys/dev/pci/pciide_cy693_reg.h b/sys/dev/pci/pciide_cy693_reg.h
index 6eeb27df203..1ea7156dc9a 100644
--- a/sys/dev/pci/pciide_cy693_reg.h
+++ b/sys/dev/pci/pciide_cy693_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_cy693_reg.h,v 1.6 2004/09/24 07:38:38 grange Exp $	*/
+/*	$OpenBSD: pciide_cy693_reg.h,v 1.7 2004/10/17 18:16:12 grange Exp $	*/
 /*	$NetBSD: pciide_cy693_reg.h,v 1.4 2000/05/15 08:46:01 bouyer Exp $	*/
 
 /*
@@ -91,4 +91,10 @@ static int8_t cy_dma_rec[] =   {7, 1, 0};
 #define CY_DMA_DATA_MODE_MASK  0x03
 #define CY_DMA_DATA_SINGLE     0x04
 
+/* Private data */
+struct pciide_cy {
+	const struct cy82c693_handle *cy_handle;
+	int cy_compatchan;
+};
+
 #endif	/* !_DEV_PCI_PCIIDE_CY693_REG_H_ */
diff --git a/sys/dev/pci/pciide_sis_reg.h b/sys/dev/pci/pciide_sis_reg.h
index 9eebf5b5390..47ed4f05258 100644
--- a/sys/dev/pci/pciide_sis_reg.h
+++ b/sys/dev/pci/pciide_sis_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_sis_reg.h,v 1.6 2004/09/24 07:38:38 grange Exp $	*/
+/*	$OpenBSD: pciide_sis_reg.h,v 1.7 2004/10/17 18:16:12 grange Exp $	*/
 /*	$NetBSD: pciide_sis_reg.h,v 1.6 2000/05/15 08:46:01 bouyer Exp $	*/
 
 /*
@@ -93,6 +93,11 @@
 
 #define SIS_PRODUCT_5518 0x5518
 
+/* Private data */
+struct pciide_sis {
+	u_int8_t sis_type;
+};
+
 /* timings values, mostly from FreeBSD */
 /* PIO timings, for all up to 133NEW */
 static const u_int8_t sis_pio_act[] =
diff --git a/sys/dev/pci/pciidevar.h b/sys/dev/pci/pciidevar.h
index df093532a8c..de1d5c98047 100644
--- a/sys/dev/pci/pciidevar.h
+++ b/sys/dev/pci/pciidevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciidevar.h,v 1.10 2004/10/17 18:05:55 grange Exp $	*/
+/*	$OpenBSD: pciidevar.h,v 1.11 2004/10/17 18:16:12 grange Exp $	*/
 /*	$NetBSD: pciidevar.h,v 1.6 2001/01/12 16:04:00 bouyer Exp $	*/
 
 /*
@@ -69,13 +69,6 @@ struct pciide_softc {
 	bus_size_t		sc_dma_maxsegsz;
 	bus_size_t		sc_dma_boundary;
 
-	/* For Cypress */
-	const struct cy82c693_handle *sc_cy_handle;
-	int sc_cy_compatchan;
-
-	/* For SiS */
-	u_int8_t sis_type;
-
 	/* Chip description */
 	const struct pciide_product_desc *sc_pp;
 	/* Chip revision */
@@ -99,6 +92,9 @@ struct pciide_softc {
 			int dma_flags;
 		} dma_maps[2];
 	} pciide_channels[PCIIDE_NUM_CHANNELS];
+
+	/* Chip-specific private data */
+	void *sc_cookie;
 };
 
 /*