Various cleanups, knf, better debug messages.

2 files changed, 30 insertions, 16 deletions

diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index 82a1afafa89..ad9fe8c9b28 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ata.c,v 1.22 2003/11/17 21:50:14 grange Exp $      */
+/*      $OpenBSD: ata.c,v 1.23 2003/11/17 22:44:55 grange Exp $      */
 /*      $NetBSD: ata.c,v 1.9 1999/04/15 09:41:09 bouyer Exp $      */
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -89,6 +89,8 @@ ata_get_params(drvp, flags, prms)
 		wdc_c.r_st_pmask = 0;
 		wdc_c.timeout = 10000; /* 10s */
 	} else {
+		WDCDEBUG_PRINT(("wdc_ata_get_parms: no disks\n"),
+		    DEBUG_FUNCS|DEBUG_PROBE);
 		return CMD_ERR;
 	}
 	wdc_c.flags = AT_READ | flags;
@@ -96,7 +98,8 @@ ata_get_params(drvp, flags, prms)
 	wdc_c.bcount = ATAPARAMS_SIZE;
 
 	if ((ret = wdc_exec_command(drvp, &wdc_c)) != WDC_COMPLETE) {
-		printf ("WDC_EXEC_COMMAND: %d\n", ret);
+		WDCDEBUG_PRINT(("%s: wdc_exec_command failed: %d\n",
+		    __func__, ret), DEBUG_PROBE);
 		return CMD_AGAIN;
 	}
 
@@ -160,7 +163,9 @@ ata_set_mode(drvp, mode, flags)
 {
 	struct wdc_command wdc_c;
 
-	WDCDEBUG_PRINT(("ata_set_mode=0x%x\n", mode), DEBUG_FUNCS);
+	WDCDEBUG_PRINT(("%s: mode=0x%x, flags=0x%x\n", __func__,
+	    mode, flags), DEBUG_PROBE);
+
 	bzero(&wdc_c, sizeof(struct wdc_command));
 
 	wdc_c.r_command = SET_FEATURES;
@@ -172,6 +177,10 @@ ata_set_mode(drvp, mode, flags)
 	wdc_c.timeout = 1000; /* 1s */
 	if (wdc_exec_command(drvp, &wdc_c) != WDC_COMPLETE)
 		return CMD_AGAIN;
+
+	WDCDEBUG_PRINT(("%s: after wdc_exec_command() wdc_c.flags=0x%x\n",
+	    __func__, wdc_c.flags), DEBUG_PROBE);
+
 	if (wdc_c.flags & (AT_ERROR | AT_TIMEOU | AT_DF)) {
 		return CMD_ERR;
 	}
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 876e876a746..ed2ba1f4d49 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdc.c,v 1.78 2003/11/17 21:50:13 grange Exp $     */
+/*      $OpenBSD: wdc.c,v 1.79 2003/11/17 22:44:55 grange Exp $     */
 /*	$NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
 
 
@@ -537,7 +537,7 @@ wdc_ata_present(chp, drive)
 	wdc_set_drive(chp, drive);
 	delay(10);
 
- retry:
+retry:
 	/*
 	   You're actually supposed to wait up to 10 seconds
 	   for DRDY. However, as a practical matter, most
@@ -882,7 +882,7 @@ wdcattach(chp)
 	wdc_delref(chp);
 #endif
 
- exit:
+exit:
 #ifdef WDCDEBUG
 	wdcdebug_mask = savedmask;
 #endif
@@ -1145,8 +1145,8 @@ wdc_wait_for_status(chp, mask, bits, timeout)
 		if ((status & WDCS_BSY) == 0 && (status & mask) == bits)
 			break;
 		if (++time > timeout) {
-			WDCDEBUG_PRINT(("wdcwait: timeout, status %x "
-			    "error %x\n", status,
+			WDCDEBUG_PRINT(("wdcwait: timeout, status 0x%x "
+			    "error 0x%x\n", status,
 			    CHP_READ_REG(chp, wdr_error)),
 			    DEBUG_STATUSX | DEBUG_STATUS);
 			return -1;
@@ -1344,6 +1344,12 @@ wdc_probe_caps(drvp, params)
 	if (valid_mode_found)
 		drvp->PIO_mode = drvp->PIO_cap;
 
+	WDCDEBUG_PRINT(("%s: atap_extensions=0x%x, atap_piomode_supp=0x%x, "
+	    "atap_dmamode_supp=0x%x, atap_udmamode_supp=0x%x\n",
+	    __func__, params->atap_extensions, params->atap_piomode_supp,
+	    params->atap_dmamode_supp, params->atap_udmamode_supp),
+	    DEBUG_PROBE);
+
 	/*
 	 * It's not in the specs, but it seems that some drive
 	 * returns 0xffff in atap_extensions when this field is invalid
@@ -1375,7 +1381,7 @@ wdc_probe_caps(drvp, params)
 			 * assume the BIOS set it up correctly
 			 */
 			if (ata_set_mode(drvp, 0x08 | (i + 3),
-				at_poll) != CMD_OK)
+			    at_poll) != CMD_OK)
 				continue;
 
 			/*
@@ -1759,7 +1765,8 @@ __wdccommand_start(chp, xfer)
 	    wdc_c->r_sector, wdc_c->r_count, wdc_c->r_precomp);
 
 	if ((wdc_c->flags & AT_WRITE) == AT_WRITE) {
-		delay(10);
+		/* wait at least 400ns before reading status register */
+		DELAY(10);
 		if (wait_for_unbusy(chp, wdc_c->timeout) != 0)
 			goto timeout;
 
@@ -1789,10 +1796,9 @@ __wdccommand_start(chp, xfer)
 	__wdccommand_intr(chp, xfer, 0);
 	return;
 
- timeout:
+timeout:	
 	wdc_c->flags |= AT_TIMEOU;
 	__wdccommand_done(chp, xfer);
-	return;
 }
 
 int
@@ -1848,8 +1854,8 @@ __wdccommand_done(chp, xfer)
 		wdc_c->r_error = chp->ch_error;
 	}
 	wdc_c->flags |= AT_DONE;
-	if (wdc_c->flags & AT_READREG && (wdc_c->flags & (AT_ERROR | AT_DF))
-								== 0) {
+	if ((wdc_c->flags & AT_READREG) != 0 &&
+	    (wdc_c->flags & (AT_ERROR | AT_DF)) == 0) {
 		wdc_c->r_head = CHP_READ_REG(chp, wdr_sdh);
 		wdc_c->r_cyl = CHP_READ_REG(chp, wdr_cyl_hi) << 8;
 		wdc_c->r_cyl |= CHP_READ_REG(chp, wdr_cyl_lo);
@@ -1875,7 +1881,6 @@ __wdccommand_done(chp, xfer)
 			wdc_c->callback(wdc_c->callback_arg);
 	wdcstart(chp);
 	WDCDEBUG_PRINT(("__wdccommand_done returned\n"), DEBUG_INTR);
-	return;
 }
 
 /*
@@ -2366,6 +2371,6 @@ wdc_ioctl(drvp, xfer, addr, flag, p)
 		goto exit;
 	}
 
- exit:
+exit:
 	return (error);
 }