wdc layer work:

Separate wdc_probe_caps into wdc_probe_caps and wdc_print_caps for more
flexibility in printing capability information.

Get rid of wdc_final_attach.

Include name of device (e.g. cd0), if possible, on errors.

atapiscsi layer work:
Put a pointer to the SCSI device into ata_drive_datas' drv_softc field

Simplify, simplify, simplify. Got rid of a bunch of fields in atapiscsi_softc

Delay printing capabilities until we know the real device name (e.g. st0)

1 files changed, 1 insertions, 11 deletions

diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index db517e42da0..490aed573ff 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pciide.c,v 1.10 1999/10/04 22:54:18 deraadt Exp $     */
+/*      $OpenBSD: pciide.c,v 1.11 1999/10/09 03:42:04 csapuntz Exp $     */
 /*	$NetBSD: pciide.c,v 1.40 1999/07/12 13:49:38 bouyer Exp $	*/
 
 /*
@@ -436,10 +436,8 @@ pciide_attach(parent, self, aux)
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcitag_t tag = pa->pa_tag;
 	struct pciide_softc *sc = (struct pciide_softc *)self;
-	struct pciide_channel *cp;
 	pcireg_t csr;
 	char devinfo[256];
-	int i;
 
 	sc->sc_pp = pciide_lookup_product(pa->pa_id);
 	if (sc->sc_pp == NULL) {
@@ -464,14 +462,6 @@ pciide_attach(parent, self, aux)
 		pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG, csr);
 	}
 
-	/* This is a hook so that the ATAPI-SCSI stuff can
-	   attach the SCSI BUS now and do the probes */
-	for (i = 0; i < sc->sc_wdcdev.nchannels; i++) {
-		cp = &sc->pciide_channels[i];
-
-		wdc_final_attach(&cp->wdc_channel);
-	}
-
 	WDCDEBUG_PRINT(("pciide: command/status register=%x\n",
 	    pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG)), DEBUG_PROBE);
 }