kill trailing spaces, no functional changes

24 files changed, 192 insertions, 192 deletions

diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index c80cd281429..532c7246eab 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ata.c,v 1.19 2003/04/14 22:51:54 grange Exp $      */
+/*      $OpenBSD: ata.c,v 1.20 2003/09/28 21:01:42 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.
@@ -119,7 +119,7 @@ ata_get_params(drvp, flags, prms)
 
 		   The swaps below avoid touching the char strings.
 		*/
-		  
+
 		swap16_multi((u_int16_t *)tb, 10);
 		swap16_multi((u_int16_t *)tb + 20, 3);
 		swap16_multi((u_int16_t *)tb + 47, ATAPARAMS_SIZE / 2 - 47);
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 623676d97c4..34b6e4987a4 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ata_wdc.c,v 1.21 2003/07/23 22:07:15 grange Exp $	*/
+/*      $OpenBSD: ata_wdc.c,v 1.22 2003/09/28 21:01:42 grange Exp $	*/
 /*	$NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -117,7 +117,7 @@ void  wdc_ata_bio_start(struct channel_softc *,struct wdc_xfer *);
 void  _wdc_ata_bio_start(struct channel_softc *,struct wdc_xfer *);
 int   wdc_ata_bio_intr(struct channel_softc *, struct wdc_xfer *, int);
 void  wdc_ata_bio_kill_xfer(struct channel_softc *,struct wdc_xfer *);
-void  wdc_ata_bio_done(struct channel_softc *, struct wdc_xfer *); 
+void  wdc_ata_bio_done(struct channel_softc *, struct wdc_xfer *);
 int   wdc_ata_ctrl_intr(struct channel_softc *, struct wdc_xfer *, int);
 int   wdc_ata_err(struct ata_drive_datas *, struct ata_bio *);
 #define WDC_ATA_NOERR 0x00 /* Drive doesn't report an error */
@@ -238,7 +238,7 @@ again:
 	if (xfer->c_skip == 0 || (ata_bio->flags & ATA_SINGLE) != 0) {
 		if (ata_bio->flags & ATA_SINGLE)
 			nblks = 1;
-		else 
+		else
 			nblks = xfer->c_bcount / ata_bio->lp->d_secsize;
 		/* Check for bad sectors and adjust transfer, if necessary. */
 		if ((ata_bio->lp->d_flags & D_BADSECT) != 0) {
@@ -291,7 +291,7 @@ again:
 	    		/* Init the DMA channel. */
 			if ((*chp->wdc->dma_init)(chp->wdc->dma_arg,
 			    chp->channel, xfer->drive,
-			    (char *)xfer->databuf + xfer->c_skip, 
+			    (char *)xfer->databuf + xfer->c_skip,
 			    ata_bio->nbytes, dma_flags) != 0) {
 				ata_bio->error = ERR_DMA;
 				ata_bio->r_error = 0;
@@ -341,7 +341,7 @@ again:
 			    (u_int64_t)ata_bio->blkno, nblks);
 		} else {
 			wdccommand(chp, xfer->drive, cmd, cyl,
-			    head, sect, nblks, 
+			    head, sect, nblks,
 			    (ata_bio->lp->d_type == DTYPE_ST506) ?
 			    ata_bio->lp->d_precompcyl / 4 : 0);
 		}
@@ -440,7 +440,7 @@ wdc_ata_bio_intr(chp, xfer, irq)
 
 	if (xfer->c_flags & C_DMA) {
 		chp->wdc->dma_status =
-		    (*chp->wdc->dma_finish)(chp->wdc->dma_arg, 
+		    (*chp->wdc->dma_finish)(chp->wdc->dma_arg,
 			chp->channel, xfer->drive);
 
 		if (chp->wdc->dma_status != 0) {
@@ -508,8 +508,8 @@ end:
 timeout:
 	if (xfer->c_flags & C_DMA) {
 		chp->wdc->dma_status =
-		    (*chp->wdc->dma_finish)(chp->wdc->dma_arg, 
-			chp->channel, xfer->drive);	
+		    (*chp->wdc->dma_finish)(chp->wdc->dma_arg,
+			chp->channel, xfer->drive);
 		ata_dmaerr(drvp);
 	}
 
@@ -546,7 +546,7 @@ wdc_ata_bio_done(chp, xfer)
 	struct ata_bio *ata_bio = xfer->cmd;
 
 	WDCDEBUG_PRINT(("wdc_ata_bio_done %s:%d:%d: flags 0x%x\n",
-	    chp->wdc->sc_dev.dv_xname, chp->channel, xfer->drive, 
+	    chp->wdc->sc_dev.dv_xname, chp->channel, xfer->drive,
 	    (u_int)xfer->c_flags),
 	    DEBUG_XFERS);
 
@@ -635,7 +635,7 @@ again:
 			    0x20 | drvp->DMA_mode, WDSF_SET_MODE);
 		} else {
 			goto geometry;
-		}	
+		}
 		drvp->state = DMAMODE_WAIT;
 		break;
 	case DMAMODE_WAIT:
@@ -696,7 +696,7 @@ again:
 		 * The drive is usable now
 		 */
 		xfer->c_intr = wdc_ata_bio_intr;
-		_wdc_ata_bio_start(chp, xfer); 
+		_wdc_ata_bio_start(chp, xfer);
 		return 1;
 	}
 
diff --git a/sys/dev/ata/atareg.h b/sys/dev/ata/atareg.h
index 92f7e6271e0..cd90e41ce42 100644
--- a/sys/dev/ata/atareg.h
+++ b/sys/dev/ata/atareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atareg.h,v 1.7 2003/02/25 19:21:14 grange Exp $	*/
+/*	$OpenBSD: atareg.h,v 1.8 2003/09/28 21:01:42 grange Exp $	*/
 /*	$NetBSD: atareg.h,v 1.5 1999/01/18 20:06:24 bouyer Exp $	*/
 
 #ifndef __DEV_ATA_ATAREG_H__
@@ -102,10 +102,10 @@ struct ataparams {
 /* words 71-72 are ATAPI only */
     u_int16_t	atap_pkt_br;		/* 71: time (ns) to bus release */
     u_int16_t	atap_pkt_bsyclr;	/* 72: tme to clear BSY after service */
-    u_int16_t	__reserved4[2];	
+    u_int16_t	__reserved4[2];
     u_int16_t	atap_queuedepth;   	/* 75: */
 #define WDC_QUEUE_DEPTH_MASK 0x1f
-    u_int16_t	__reserved5[4];   	
+    u_int16_t	__reserved5[4];
     u_int16_t	atap_ata_major;  	/* 80: Major version number */
 #define	WDC_VER_ATA1	0x0002
 #define	WDC_VER_ATA2	0x0004
diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index e5d36ee0309..e63c344f69a 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atavar.h,v 1.13 2003/04/09 00:38:08 ho Exp $	*/
+/*	$OpenBSD: atavar.h,v 1.14 2003/09/28 21:01:42 grange Exp $	*/
 /*	$NetBSD: atavar.h,v 1.13 1999/03/10 13:11:43 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -42,10 +42,10 @@ struct ata_drive_datas {
 	u_int16_t drive_flags; /* bitmask for drives present/absent and cap */
 #define DRIVE_ATA	0x0001
 #define DRIVE_ATAPI	0x0002
-#define DRIVE_OLD	0x0004 
+#define DRIVE_OLD	0x0004
 #define DRIVE (DRIVE_ATA|DRIVE_ATAPI|DRIVE_OLD)
 #define DRIVE_CAP32	0x0008
-#define DRIVE_DMA	0x0010 
+#define DRIVE_DMA	0x0010
 #define DRIVE_UDMA	0x0020
 #define DRIVE_MODE	0x0040 /* the drive reported its mode */
 #define DRIVE_RESET	0x0080 /* reset the drive state at next xfer */
@@ -87,7 +87,7 @@ struct ata_drive_datas {
 	char drive_name[31];
 	int  cf_flags;
 	void *chnl_softc; /* channel softc */
-    
+
 	struct ataparams id;
 };
 
@@ -116,7 +116,7 @@ struct ata_atapi_attach {
 #define ATA_CONFIG_UDMA_OFF	8
 
 /*
- * ATA/ATAPI commands description 
+ * ATA/ATAPI commands description
  *
  * This structure defines the interface between the ATA/ATAPI device driver
  * and the controller for short commands. It contains the command's parameter,
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index ea4ab4b1123..93be3fbcee6 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.32 2003/07/20 19:57:04 grange Exp $ */
+/*	$OpenBSD: wd.c,v 1.33 2003/09/28 21:01:42 grange Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -141,7 +141,7 @@ struct wd_softc {
 	struct ata_drive_datas *drvp; /* Our controller's infos */
 	int openings;
 	struct ataparams sc_params;/* drive characteistics found */
-	int sc_flags;	  
+	int sc_flags;
 #define WDF_LOCKED	  0x01
 #define WDF_WANTED	  0x02
 #define WDF_WLABEL	  0x04 /* label is writable */
@@ -197,7 +197,7 @@ extern struct cfdriver wd_cd;
 #endif
 
 void  wdgetdefaultlabel(struct wd_softc *, struct disklabel *);
-void  wdgetdisklabel(dev_t dev, struct wd_softc *, 
+void  wdgetdisklabel(dev_t dev, struct wd_softc *,
 				 struct disklabel *,
 				 struct cpu_disklabel *, int);
 void  wdstrategy(struct buf *);
@@ -279,7 +279,7 @@ wdattach(parent, self, aux)
 	wd->openings = aa_link->aa_openings;
 	wd->drvp = aa_link->aa_drv_data;
 
-	strncpy(wd->drvp->drive_name, wd->sc_dev.dv_xname, 
+	strncpy(wd->drvp->drive_name, wd->sc_dev.dv_xname,
 		sizeof(wd->drvp->drive_name) - 1);
 	wd->drvp->cf_flags = wd->sc_dev.dv_cfdata->cf_flags;
 
@@ -386,7 +386,7 @@ wdattach(parent, self, aux)
 	wd->sc_sdhook = shutdownhook_establish(wd_shutdown, wd);
 	if (wd->sc_sdhook == NULL)
 		printf("%s: WARNING: unable to establish shutdown hook\n",
-		    wd->sc_dev.dv_xname); 
+		    wd->sc_dev.dv_xname);
 #if NRND > 0
 	rnd_attach_source(&wd->rnd_source, wd->sc_dev.dv_xname,
 			  RND_TYPE_DISK, 0);
@@ -484,7 +484,7 @@ wdstrategy(bp)
 
 	WDCDEBUG_PRINT(("wdstrategy (%s)\n", wd->sc_dev.dv_xname),
 	    DEBUG_XFERS);
-	
+
 	/* Valid request?  */
 	if (bp->b_blkno < 0 ||
 	    (bp->b_bcount % wd->sc_dk.dk_label->d_secsize) != 0 ||
@@ -492,7 +492,7 @@ wdstrategy(bp)
 		bp->b_error = EINVAL;
 		goto bad;
 	}
-	
+
 	/* If device invalidated (e.g. media change, door open), error. */
 	if ((wd->sc_flags & WDF_LOADED) == 0) {
 		bp->b_error = EIO;
@@ -548,7 +548,7 @@ wdstart(arg)
 		if ((bp = BUFQ_GET(&wd->sc_q)) == NULL)
 			return;
 
-		/* 
+		/*
 		 * Make the command. First lock the device
 		 */
 		wd->openings--;
@@ -605,7 +605,7 @@ __wdstart(wd, bp)
 	case WDC_QUEUED:
 		break;
 	case WDC_COMPLETE:
-		/* 
+		/*
 		 * This code is never executed because we never set
 		 * the ATA_POLL flag above
 		 */
@@ -778,7 +778,7 @@ wdopen(dev, flag, fmt, p)
 		error = ENXIO;
 		goto bad;
 	}
-	
+
 	/* Insure only one open at a time. */
 	switch (fmt) {
 	case S_IFCHR:
@@ -823,7 +823,7 @@ wdclose(dev, flag, fmt, p)
 	wd = wdlookup(WDUNIT(dev));
 	if (wd == NULL)
 		return ENXIO;
-	
+
 	WDCDEBUG_PRINT(("wdclose\n"), DEBUG_FUNCS);
 	if ((error = wdlock(wd)) != 0)
 		goto exit;
@@ -958,7 +958,7 @@ wdioctl(dev, xfer, addr, flag, p)
 	wd = wdlookup(WDUNIT(dev));
 	if (wd == NULL)
 		return ENXIO;
-	
+
 	if ((wd->sc_flags & WDF_LOADED) == 0) {
 		error = EIO;
 		goto exit;
@@ -990,13 +990,13 @@ wdioctl(dev, xfer, addr, flag, p)
 	case DIOCGDINFO:
 		*(struct disklabel *)addr = *(wd->sc_dk.dk_label);
 		goto exit;
-	
+
 	case DIOCGPART:
 		((struct partinfo *)addr)->disklab = wd->sc_dk.dk_label;
 		((struct partinfo *)addr)->part =
 		    &wd->sc_dk.dk_label->d_partitions[WDPART(dev)];
 		goto exit;
-	
+
 	case DIOCWDINFO:
 	case DIOCSDINFO:
 		if ((flag & FWRITE) == 0) {
@@ -1023,7 +1023,7 @@ wdioctl(dev, xfer, addr, flag, p)
 		wd->sc_flags &= ~WDF_LABELLING;
 		wdunlock(wd);
 		goto exit;
-	
+
 	case DIOCWLABEL:
 		if ((flag & FWRITE) == 0) {
 			error = EBADF;
@@ -1050,7 +1050,7 @@ wdioctl(dev, xfer, addr, flag, p)
 		register struct format_op *fop;
 		struct iovec aiov;
 		struct uio auio;
-	
+
 		fop = (struct format_op *)addr;
 		aiov.iov_base = fop->df_buf;
 		aiov.iov_len = fop->df_count;
@@ -1069,7 +1069,7 @@ wdioctl(dev, xfer, addr, flag, p)
 		goto exit;
 		}
 #endif
-		
+
 	default:
 		error = wdc_ioctl(wd->drvp, xfer, addr, flag, p);
 		goto exit;
@@ -1173,7 +1173,7 @@ wddump(dev, blkno, va, size)
 
 	/* Check transfer bounds against partition size. */
 	if ((blkno < 0) || ((blkno + nblks) > lp->d_partitions[part].p_size))
-		return EINVAL;  
+		return EINVAL;
 
 	/* Offset block number to start of partition. */
 	blkno += lp->d_partitions[part].p_offset;
@@ -1184,7 +1184,7 @@ wddump(dev, blkno, va, size)
 		wddumprecalibrated = 1;
 		wd->drvp->state = RECAL;
 	}
-  
+
 	while (nblks > 0) {
 again:
 		wd->sc_wdc_bio.blkno = blkno;
@@ -1230,7 +1230,7 @@ again:
 			printf("wddump: %s", errbuf);
 			err = EIO;
 			break;
-		case NOERROR: 
+		case NOERROR:
 			err = 0;
 			break;
 		default:
diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h
index 9bf19fb61f7..41ea3770d1a 100644
--- a/sys/dev/ata/wdvar.h
+++ b/sys/dev/ata/wdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdvar.h,v 1.7 2003/02/21 20:10:33 grange Exp $	*/
+/*	$OpenBSD: wdvar.h,v 1.8 2003/09/28 21:01:42 grange Exp $	*/
 /*	$NetBSD: wdvar.h,v 1.3 1998/11/11 19:38:27 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -35,7 +35,7 @@
 /* Params needed by the controller to perform an ATA bio */
 struct ata_bio {
     volatile u_int16_t flags; /* cmd flags */
-#define ATA_NOSLEEP 0x0001 /* Can't sleep */   
+#define ATA_NOSLEEP 0x0001 /* Can't sleep */
 #define ATA_POLL    0x0002 /* poll for completion */
 #define ATA_ITSDONE 0x0004 /* the transfer is as done as it gets */
 #define ATA_SINGLE  0x0008 /* transfer has to be done in single-sector mode */
@@ -76,6 +76,6 @@ struct ata_bio {
 #define MULTIMODE_WAIT 9
 #define READY          10
 
-int wdc_ata_bio(struct ata_drive_datas*, struct ata_bio*); 
+int wdc_ata_bio(struct ata_drive_datas*, struct ata_bio*);
 
 void wddone(void *);
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index 192a470c5f9..7542a5626f2 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atapiscsi.c,v 1.63 2003/02/13 20:54:59 grange Exp $     */
+/*      $OpenBSD: atapiscsi.c,v 1.64 2003/09/28 21:01:43 grange Exp $     */
 
 /*
  * This code is derived from code with the copyright below.
@@ -127,7 +127,7 @@ void  wdc_atapi_pio_intr(struct channel_softc *, struct wdc_xfer *,
     int, struct atapi_return_args *);
 void  wdc_atapi_send_packet(struct channel_softc *, struct wdc_xfer *,
     int, struct atapi_return_args *);
-void  wdc_atapi_ctrl(struct channel_softc *, struct wdc_xfer *, 
+void  wdc_atapi_ctrl(struct channel_softc *, struct wdc_xfer *,
     int, struct atapi_return_args *);
 
 char  *wdc_atapi_in_data_phase(struct wdc_xfer *, int, int);
@@ -167,7 +167,7 @@ int   wdc_atapi_ioctl(struct scsi_link *,
 	u_long, caddr_t, int, struct proc *);
 int   wdc_atapi_send_cmd(struct scsi_xfer *sc_xfer);
 
-static struct scsi_adapter atapiscsi_switch = 
+static struct scsi_adapter atapiscsi_switch =
 {
 	wdc_atapi_send_cmd,
 	wdc_atapi_minphys,
@@ -176,7 +176,7 @@ static struct scsi_adapter atapiscsi_switch =
 	wdc_atapi_ioctl
 };
 
-static struct scsi_device atapiscsi_dev = 
+static struct scsi_device atapiscsi_dev =
 {
 	NULL,
 	NULL,
@@ -255,8 +255,8 @@ atapiscsi_attach(parent, self, aux)
 	    sizeof(drvp->drive_name) - 1);
 	drvp->cf_flags = as->sc_dev.dv_cfdata->cf_flags;
 
-	wdc_probe_caps(drvp, id); 
-	
+	wdc_probe_caps(drvp, id);
+
 	WDCDEBUG_PRINT(
 		("general config %04x capabilities %04x ",
 		    id->atap_config, id->atap_capabilities1),
@@ -267,26 +267,26 @@ atapiscsi_attach(parent, self, aux)
 	else
 		drvp->n_dmaerrs = 0;
 	drvp->drive_flags |= DRIVE_DEVICE_RESET;
-	
+
 	/* Tape drives do funny DSC stuff */
-	if (ATAPI_CFG_TYPE(id->atap_config) == 
+	if (ATAPI_CFG_TYPE(id->atap_config) ==
 	    ATAPI_CFG_TYPE_SEQUENTIAL)
 		drvp->atapi_cap |= ACAP_DSC;
-	
+
 	if ((id->atap_config & ATAPI_CFG_CMD_MASK) ==
 	    ATAPI_CFG_CMD_16)
 		drvp->atapi_cap |= ACAP_LEN;
-	
+
 	drvp->atapi_cap |=
 	    (id->atap_config & ATAPI_CFG_DRQ_MASK);
-	
+
 	WDCDEBUG_PRINT(("driver caps %04x\n", drvp->atapi_cap),
 	    DEBUG_PROBE);
 
-	
+
 	as->sc_adapterlink.scsibus = (u_int8_t)-1;
 
-	config_found((struct device *)as, 
+	config_found((struct device *)as,
 		     &as->sc_adapterlink, scsiprint);
 
 	if (as->sc_adapterlink.scsibus != (u_int8_t)-1) {
@@ -294,16 +294,16 @@ atapiscsi_attach(parent, self, aux)
 		extern struct cfdriver scsibus_cd;
 		struct scsibus_softc *scsi = scsibus_cd.cd_devs[bus];
 		struct scsi_link *link = scsi->sc_link[0][0];
-		
+
 		if (link) {
-			strncpy(drvp->drive_name, 
-			    ((struct device *)(link->device_softc))->dv_xname, 
+			strncpy(drvp->drive_name,
+			    ((struct device *)(link->device_softc))->dv_xname,
 			    sizeof(drvp->drive_name) - 1);
-			
+
 			wdc_print_caps(drvp);
 		}
 	}
-	
+
 #ifdef WDCDEBUG
 	if (chp->wdc->sc_dev.dv_cfdata->cf_flags & WDC_OPTION_PROBE_VERBOSE)
 		wdcdebug_atapi_mask &= ~DEBUG_PROBE;
@@ -330,7 +330,7 @@ wdc_atapi_send_cmd(sc_xfer)
 		return (COMPLETE);
 	}
 
-	xfer = wdc_get_xfer(sc_xfer->flags & SCSI_NOSLEEP 
+	xfer = wdc_get_xfer(sc_xfer->flags & SCSI_NOSLEEP
 	    ? WDC_NOSLEEP : WDC_CANSLEEP);
 	if (xfer == NULL) {
 		return (TRY_AGAIN_LATER);
@@ -348,11 +348,11 @@ wdc_atapi_send_cmd(sc_xfer)
 	timeout_set(&xfer->atapi_poll_to, wdc_atapi_timer_handler, chp);
 
 	WDCDEBUG_PRINT(("wdc_atapi_send_cmd %s:%d:%d ",
-	    chp->wdc->sc_dev.dv_xname, chp->channel, as->drive), 
+	    chp->wdc->sc_dev.dv_xname, chp->channel, as->drive),
 	    DEBUG_XFERS | DEBUG_ERRORS);
 
 	for (idx = 0; idx < sc_xfer->cmdlen; idx++) {
-		WDCDEBUG_PRINT((" %02x", 
+		WDCDEBUG_PRINT((" %02x",
 				   ((unsigned char *)sc_xfer->cmd)[idx]),
 		    DEBUG_XFERS | DEBUG_ERRORS);
 	}
@@ -374,7 +374,7 @@ wdc_atapi_send_cmd(sc_xfer)
 			   holding the bus.  */
 			if (!(drvp->drive_flags & DRIVE_DSCBA)) {
 				xfer->c_bcount = 0;
-				xfer->transfer_len = 
+				xfer->transfer_len =
 				  _3btol(((struct scsi_rw_tape *)
 					  sc_xfer->cmd)->len);
 				_lto3b(0,
@@ -386,8 +386,8 @@ wdc_atapi_send_cmd(sc_xfer)
 				    DEBUG_DSC);
 			} else
 				WDCDEBUG_PRINT(("R/W %d blocks %d bytes\n",
-				    _3btol(((struct scsi_rw_tape *)	
-					sc_xfer->cmd)->len), 
+				    _3btol(((struct scsi_rw_tape *)
+					sc_xfer->cmd)->len),
 				    sc_xfer->datalen),
 				    DEBUG_DSC);
 
@@ -545,7 +545,7 @@ wdc_atapi_timer_handler(arg)
 
 	s = splbio();
 	xfer = TAILQ_FIRST(&chp->ch_queue->sc_xfer);
-	if (xfer == NULL || 
+	if (xfer == NULL ||
 	    !timeout_triggered(&xfer->atapi_poll_to)) {
 		splx(s);
 		return;
@@ -580,7 +580,7 @@ wdc_atapi_intr(chp, xfer, irq)
 
 struct atapi_return_args {
 	int timeout;
-	int delay; 
+	int delay;
 	int expect_irq;
 };
 
@@ -589,7 +589,7 @@ struct atapi_return_args {
 void
 wdc_atapi_the_poll_machine(chp, xfer)
 	struct channel_softc *chp;
-	struct wdc_xfer *xfer;	
+	struct wdc_xfer *xfer;
 {
 	int  idx = 0;
 	int  current_timeout = 10;
@@ -626,13 +626,13 @@ wdc_atapi_the_poll_machine(chp, xfer)
 void
 wdc_atapi_the_machine(chp, xfer, ctxt)
 	struct channel_softc *chp;
-	struct wdc_xfer *xfer;	
+	struct wdc_xfer *xfer;
 	enum atapi_context ctxt;
 {
 	int idx = 0;
 	extern int ticks;
 	int timeout_delay = hz / 10;
-	
+
 	if (xfer->c_flags & C_POLL) {
 		if (ctxt != ctxt_process) {
 			if (ctxt == ctxt_interrupt)
@@ -651,13 +651,13 @@ wdc_atapi_the_machine(chp, xfer, ctxt)
 	for (idx = 0; idx < 50; idx++) {
 		struct atapi_return_args retargs = ARGS_INIT;
 
-		(xfer->next)(chp, xfer, 
+		(xfer->next)(chp, xfer,
 		    xfer->endticks && (ticks - xfer->endticks >= 0),
 		    &retargs);
-		
-		if (retargs.timeout != -1) 
+
+		if (retargs.timeout != -1)
 			/*
-			 * Add 1 tick to compensate for the fact that we 
+			 * Add 1 tick to compensate for the fact that we
 			 * can be just microseconds before the tick changes.
 			 */
 			xfer->endticks =
@@ -669,7 +669,7 @@ wdc_atapi_the_machine(chp, xfer, ctxt)
 
 			wdc_free_xfer(chp, xfer);
 			wdcstart(chp);
-			
+
 			return;
 		}
 
@@ -678,7 +678,7 @@ wdc_atapi_the_machine(chp, xfer, ctxt)
 			timeout_add(&chp->ch_timo, xfer->endticks - ticks);
 			return;
 		}
-		
+
 		if (retargs.delay != 0) {
 			timeout_delay = max(retargs.delay * hz / 1000, 1);
 			break;
@@ -729,14 +729,14 @@ wdc_atapi_real_start(chp, xfer, timeout, ret)
 #endif
 	struct ata_drive_datas *drvp = &chp->ch_drive[xfer->drive];
 
-	/* 
+	/*
 	 * Only set the DMA flag if the transfer is reasonably large.
 	 * At least one older drive failed to complete a 4 byte DMA transfer.
 	 */
 
 	/* Turn off DMA flag on REQUEST SENSE */
 
-	if (!(xfer->c_flags & (C_POLL | C_SENSE | C_MEDIA_ACCESS)) && 
+	if (!(xfer->c_flags & (C_POLL | C_SENSE | C_MEDIA_ACCESS)) &&
 	    (drvp->drive_flags & (DRIVE_DMA | DRIVE_UDMA)) &&
 	    (xfer->c_bcount > 100))
 		xfer->c_flags |= C_DMA;
@@ -779,11 +779,11 @@ wdc_atapi_real_start_2(chp, xfer, timeout, ret)
 		return;
 	} else {
 		wdc_atapi_update_status(chp);
-		
+
 		if (chp->ch_status & (WDCS_BSY | WDCS_DRQ))
 			return;
 	}
-    
+
 	/* Do control operations specially. */
 	if (drvp->state < ATAPI_READY_STATE) {
 		xfer->next = wdc_atapi_ctrl;
@@ -814,9 +814,9 @@ wdc_atapi_send_packet(chp, xfer, timeout, ret)
 	 * data is necessary, multiple data transfer phases will be done.
 	 */
 
-	wdccommand(chp, xfer->drive, ATAPI_PKT_CMD, 
+	wdccommand(chp, xfer->drive, ATAPI_PKT_CMD,
 	    xfer->c_bcount <= 0xfffe ? xfer->c_bcount : 0xfffe,
-	    0, 0, 0, 
+	    0, 0, 0,
 	    (xfer->c_flags & C_DMA) ? ATAPI_PKT_CMD_FTRE_DMA : 0);
 
 	if (xfer->c_flags & C_DMA)
@@ -854,7 +854,7 @@ wdc_atapi_intr_command(chp, xfer, timeout, ret)
 	int cmdlen = (drvp->atapi_cap & ACAP_LEN) ? 16 : 12;
 	int dma_flags = ((sc_xfer->flags & SCSI_DATA_IN) ||
 	    (xfer->c_flags & C_SENSE)) ?  WDC_DMA_READ : 0;
-	
+
 	wdc_atapi_update_status(chp);
 
 	if ((chp->ch_status & WDCS_BSY) || !(chp->ch_status & WDCS_DRQ)) {
@@ -873,12 +873,12 @@ wdc_atapi_intr_command(chp, xfer, timeout, ret)
 		cmd_reqsense = (struct scsi_sense *)&cmd[0];
 		cmd_reqsense->opcode = REQUEST_SENSE;
 		cmd_reqsense->length = xfer->c_bcount;
-	} else 
+	} else
 		bcopy(sc_xfer->cmd, cmd, sc_xfer->cmdlen);
 
 	WDC_LOG_ATAPI_CMD(chp, xfer->drive, xfer->c_flags,
 	    cmdlen, cmd);
-	
+
 	for (i = 0; i < 12; i++)
 		WDCDEBUG_PRINT(("%02x ", cmd[i]), DEBUG_INTR);
 	WDCDEBUG_PRINT((": PHASE_CMDOUT\n"), DEBUG_INTR);
@@ -886,7 +886,7 @@ wdc_atapi_intr_command(chp, xfer, timeout, ret)
 	/* Init the DMA channel if necessary */
 	if (xfer->c_flags & C_DMA) {
 		if ((*chp->wdc->dma_init)(chp->wdc->dma_arg,
-		    chp->channel, xfer->drive, xfer->databuf, 
+		    chp->channel, xfer->drive, xfer->databuf,
 		    xfer->c_bcount, dma_flags) != 0) {
 			sc_xfer->error = XS_DRIVER_STUFFUP;
 
@@ -968,7 +968,7 @@ wdc_atapi_in_data_phase(xfer, len, ire)
 			message = "data phase where none expected";
 			goto unexpected_state;
 		}
-		
+
 		/* Make sure polarities match */
 		if (((ire & WDCI_IN) == WDCI_IN) ==
 		    ((sc_xfer->flags & SCSI_DATA_OUT) == SCSI_DATA_OUT)) {
@@ -981,7 +981,7 @@ wdc_atapi_in_data_phase(xfer, len, ire)
 			goto unexpected_state;
 		}
 	}
-	
+
 	if (len == 0) {
 		message = "zero length transfer requested in data phase";
 		goto unexpected_state;
@@ -1026,17 +1026,17 @@ wdc_atapi_intr_data(chp, xfer, timeout, ret)
 
 		if (!timeout) {
 			ret->delay = 100;
-			return;	
+			return;
 		}
 	}
 
-	
+
 	if (xfer->c_bcount >= len) {
 		WDCDEBUG_PRINT(("wdc_atapi_intr: c_bcount %d len %d "
 		    "st 0x%x err 0x%x "
 		    "ire 0x%x\n", xfer->c_bcount,
 		    len, chp->ch_status, chp->ch_error, ire), DEBUG_INTR);
-		
+
 		/* Common case */
 		if (sc_xfer->flags & SCSI_DATA_OUT)
 			wdc_output_bytes(drvp, (u_int8_t *)xfer->databuf +
@@ -1058,13 +1058,13 @@ wdc_atapi_intr_data(chp, xfer, timeout, ret)
 
 			wdc_output_bytes(drvp, (u_int8_t *)xfer->databuf +
 			    xfer->c_skip, xfer->c_bcount);
-			 
-			CHP_WRITE_RAW_MULTI_2(chp, NULL, 
+
+			CHP_WRITE_RAW_MULTI_2(chp, NULL,
 			    len - xfer->c_bcount);
 		} else {
 			printf("wdc_atapi_intr: warning: reading only "
 			    "%d of %d bytes\n", xfer->c_bcount, len);
-			 
+
 			wdc_input_bytes(drvp,
 			    (char *)xfer->databuf + xfer->c_skip,
 			    xfer->c_bcount);
@@ -1120,16 +1120,16 @@ wdc_atapi_intr_complete(chp, xfer, timeout, ret)
 			ret->expect_irq = 1;
 			return;
 		}
-		
+
 		chp->wdc->dma_status =
 		    (*chp->wdc->dma_finish)
 		    (chp->wdc->dma_arg, chp->channel,
 			xfer->drive);
 
-		if (chp->wdc->dma_status & WDC_DMAST_UNDER) 
+		if (chp->wdc->dma_status & WDC_DMAST_UNDER)
 			xfer->c_bcount = 1;
 		else
-			xfer->c_bcount = 0;		
+			xfer->c_bcount = 0;
 	}
 
 	as->protocol_phase = as_none;
@@ -1177,7 +1177,7 @@ wdc_atapi_intr_complete(chp, xfer, timeout, ret)
 				xfer->next = wdc_atapi_real_start;
 				return;
 			}
-		}		
+		}
 	}
 
         if ((xfer->c_flags & C_DMA) &&
@@ -1188,7 +1188,7 @@ wdc_atapi_intr_complete(chp, xfer, timeout, ret)
 		xfer->next = wdc_atapi_reset;
 		return;
 	}
-			
+
 
 	if (xfer->c_bcount != 0) {
 		WDCDEBUG_PRINT(("wdc_atapi_intr: bcount value is "
@@ -1208,7 +1208,7 @@ wdc_atapi_intr_complete(chp, xfer, timeout, ret)
 
 	if (xfer->c_done)
 		xfer->next = xfer->c_done;
-	else 
+	else
 		xfer->next = wdc_atapi_done;
 
 	return;
@@ -1300,7 +1300,7 @@ timeout:
 	    "status=%02x, ireason=%02x\n",
 	    chp->wdc->sc_dev.dv_xname, chp->channel, xfer->drive,
 	    xfer->c_bcount, xfer->c_skip, chp->ch_status, ireason);
-	
+
 	sc_xfer->error = XS_TIMEOUT;
 	xfer->next = wdc_atapi_reset;
 	return;
@@ -1374,7 +1374,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
 			errstring = "dmamode";
 			if (chp->ch_status & (WDCS_BSY | WDCS_DRQ))
 				drvp->drive_flags &= ~(DRIVE_DMA | DRIVE_UDMA);
-			else 
+			else
 				trigger_timeout = 0;
 			break;
 
@@ -1392,7 +1392,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
 	    DEBUG_INTR | DEBUG_FUNCS);
 
 	switch (drvp->state) {
-		/* My ATAPI slave device likes to assert DASP-/PDIAG- until 
+		/* My ATAPI slave device likes to assert DASP-/PDIAG- until
 		   it is DEVICE RESET. This causes the LED to stay on.
 
 		   There is a trade-off here. This drive will cause any
@@ -1439,7 +1439,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
 		}
 
 		drvp->state = ATAPI_PIOMODE_STATE;
-		/* 
+		/*
 		 * Note, we can't go directly to set PIO mode
 		 * because the drive is free to assert BSY
 		 * after the transfer
@@ -1539,7 +1539,7 @@ wdc_atapi_tape_done(chp, xfer, timeout, ret)
 	return;
 }
 
-	
+
 void
 wdc_atapi_done(chp, xfer, timeout, ret)
 	struct channel_softc *chp;
@@ -1574,7 +1574,7 @@ wdc_atapi_reset(chp, xfer, timeout, ret)
 	struct atapi_return_args *ret;
 {
 	struct ata_drive_datas *drvp = &chp->ch_drive[xfer->drive];
-	
+
 	if (drvp->state == 0) {
 		xfer->next = wdc_atapi_done;
 		return;
@@ -1603,14 +1603,14 @@ wdc_atapi_reset_2(chp, xfer, timeout, ret)
 {
 	struct ata_drive_datas *drvp = &chp->ch_drive[xfer->drive];
 	struct scsi_xfer *sc_xfer = xfer->cmd;
-	
+
 	if (timeout) {
 		printf("%s:%d:%d: soft reset failed\n",
 		    chp->wdc->sc_dev.dv_xname, chp->channel,
 		    xfer->drive);
 		sc_xfer->error = XS_SELTIMEOUT;
 		wdc_reset_channel(drvp);
-		
+
 		xfer->next = wdc_atapi_done;
 		return;
 	}
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index ef6e6a03384..03bdc873694 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdc.c,v 1.62 2003/07/06 08:25:16 grange Exp $     */
+/*      $OpenBSD: wdc.c,v 1.63 2003/09/28 21:01:43 grange Exp $     */
 /*	$NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
 
 
@@ -102,7 +102,7 @@ struct pool wdc_xfer_pool;
 static void  __wdcerror(struct channel_softc*, char *);
 static int   __wdcwait_reset(struct channel_softc *, int);
 void  __wdccommand_done(struct channel_softc *, struct wdc_xfer *);
-void  __wdccommand_start(struct channel_softc *, struct wdc_xfer *);	
+void  __wdccommand_start(struct channel_softc *, struct wdc_xfer *);
 int   __wdccommand_intr(struct channel_softc *, struct wdc_xfer *, int);
 int   wdprint(void *, const char *);
 void  wdc_kill_pending(struct channel_softc *);
@@ -203,7 +203,7 @@ wdc_log(struct channel_softc *chp, enum wdcevent_type type,
 	}
 
 	ptr = &wdc_log_buf[wdc_head];
-	*ptr++ = type & 0xff;		
+	*ptr++ = type & 0xff;
 	*ptr++ = ((chp->ch_log_idx & 0x7) << 5) | (size & 0x1f);
 
 	idx = 0;
@@ -280,7 +280,7 @@ wdc_default_read_reg(chp, reg)
 	struct channel_softc *chp;
 	enum wdc_regs reg;
 {
-#ifdef DIAGNOSTIC	
+#ifdef DIAGNOSTIC
 	if (reg & _WDC_WRONLY) {
 		printf ("wdc_default_read_reg: reading from a write-only register %d\n", reg);
 	}
@@ -300,7 +300,7 @@ wdc_default_write_reg(chp, reg, val)
 	enum wdc_regs reg;
 	u_int8_t val;
 {
-#ifdef DIAGNOSTIC	
+#ifdef DIAGNOSTIC
 	if (reg & _WDC_RDONLY) {
 		printf ("wdc_default_write_reg: writing to a read-only register %d\n", reg);
 	}
@@ -453,7 +453,7 @@ int
 wdc_floating_bus(chp, drive)
 	struct channel_softc *chp;
 	int drive;
-	
+
 {
 	u_int8_t cumulative_status, status;
 	int      iter;
@@ -506,7 +506,7 @@ wdc_preata_drive(chp, drive)
 		    chp->channel, drive), DEBUG_PROBE);
 		return 0;
 	}
-	
+
 	CHP_WRITE_REG(chp, wdr_command, WDCC_RECAL);
 	WDC_LOG_ATA_CMDSHORT(chp, WDCC_RECAL);
 	if (wdcwait(chp, WDCS_DRDY | WDCS_DRQ, WDCS_DRDY, 10000) != 0) {
@@ -619,7 +619,7 @@ wdcprobe(chp)
 	if ((chp->ch_flags & WDCF_VERBOSE_PROBE) ||
 	    (chp->wdc &&
 	    (chp->wdc->sc_dev.dv_cfdata->cf_flags & WDC_OPTION_PROBE_VERBOSE)))
-		wdcdebug_mask |= DEBUG_PROBE;	
+		wdcdebug_mask |= DEBUG_PROBE;
 #endif /* WDCDEBUG */
 
 	if (chp->wdc == NULL ||
@@ -718,7 +718,7 @@ wdcprobe(chp)
 #ifdef WDCDEBUG
 	wdcdebug_mask = savedmask;
 #endif
-	return (ret_value);	
+	return (ret_value);
 }
 
 /*
@@ -800,7 +800,7 @@ wdcattach(chp)
 		inited++;
 	}
 	TAILQ_INIT(&chp->ch_queue->sc_xfer);
-	
+
 	for (i = 0; i < 2; i++) {
 		struct ata_drive_datas *drvp = &chp->ch_drive[i];
 
@@ -954,7 +954,7 @@ wdcrestart(v)
 	wdcstart(chp);
 	splx(s);
 }
-	
+
 
 /*
  * Interrupt routine for the controller.  Acknowledge the interrupt, check for
@@ -969,7 +969,7 @@ wdcintr(arg)
 	struct channel_softc *chp = arg;
 	struct wdc_xfer *xfer;
 	int ret;
-	
+
 	if ((chp->ch_flags & WDCF_IRQ_WAIT) == 0) {
 		/* Acknowledge interrupt by reading status */
 		if (chp->_vtbl == 0) {
@@ -1172,7 +1172,7 @@ wdctimeout(arg)
 	    !timeout_triggered(&chp->ch_timo)) {
 		splx(s);
 		return;
-	}	
+	}
 	if ((chp->ch_flags & WDCF_IRQ_WAIT) != 0) {
 		__wdcerror(chp, "timeout");
 		printf("\ttype: %s\n", (xfer->c_flags & C_ATAPI) ?
@@ -1432,7 +1432,7 @@ wdc_output_bytes(drvp, bytes, buflen)
 {
 	struct channel_softc *chp = drvp->chnl_softc;
 	unsigned int off = 0;
-	unsigned int len = buflen, roundlen;	
+	unsigned int len = buflen, roundlen;
 
 	if (drvp->drive_flags & DRIVE_CAP32) {
 		roundlen = len & ~3;
@@ -1507,7 +1507,7 @@ wdc_print_caps(drvp)
 	if (drvp->drive_flags & DRIVE_UDMA) {
 		printf(", Ultra-DMA mode %d", drvp->UDMA_cap);
 	}
-			
+
 	printf("\n");
 #endif /* 0 */
 }
@@ -1697,7 +1697,7 @@ __wdccommand_start(chp, xfer)
 		delay(10);
 		if (wait_for_unbusy(chp, wdc_c->timeout) != 0)
 			goto timeout;
-		
+
 		if ((chp->ch_status & (WDCS_DRQ | WDCS_ERR)) == WDCS_ERR) {
 			__wdccommand_done(chp, xfer);
 			return;
@@ -2228,7 +2228,7 @@ wdc_ioctl(drvp, xfer, addr, flag, p)
 		atagettrace_t *agt = (atagettrace_t *)addr;
 		unsigned int size = 0;
 		char *log_to_copy;
-		
+
 		size = agt->buf_size;
 		if (size > 65536) {
 			size = 65536;
diff --git a/sys/dev/ic/wdcevent.h b/sys/dev/ic/wdcevent.h
index 5871afa1771..73edec34cb1 100644
--- a/sys/dev/ic/wdcevent.h
+++ b/sys/dev/ic/wdcevent.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdcevent.h,v 1.3 2002/12/22 18:24:45 grange Exp $ */
+/* $OpenBSD: wdcevent.h,v 1.4 2003/09/28 21:01:43 grange Exp $ */
 
 /*
  * Copyright (c) 2001 Constantine Sapuntzakis
@@ -51,7 +51,7 @@ static __inline void WDC_LOG_STATUS(struct channel_softc *chp,
     u_int8_t status) {
 	if (chp->ch_prev_log_status == status)
 		return;
-	
+
 	chp->ch_prev_log_status = status;
 	wdc_log(chp, WDCEVENT_STATUS, 1, &status);
 }
@@ -82,7 +82,7 @@ static __inline void WDC_LOG_ATA_CMDSHORT(struct channel_softc *chp, u_int8_t cm
 	wdc_log(chp, WDCEVENT_ATA_SHORT, 1, &cmd);
 }
 
-static __inline void WDC_LOG_ATA_CMDLONG(struct channel_softc *chp, 
+static __inline void WDC_LOG_ATA_CMDLONG(struct channel_softc *chp,
     u_int8_t head, u_int8_t precomp, u_int8_t cylinhi, u_int8_t cylinlo,
     u_int8_t sector, u_int8_t count, u_int8_t command) {
 	char record[8] = { head, precomp, cylinhi, cylinlo,
diff --git a/sys/dev/ic/wdcreg.h b/sys/dev/ic/wdcreg.h
index d7e52d8a03a..a4a46a05a61 100644
--- a/sys/dev/ic/wdcreg.h
+++ b/sys/dev/ic/wdcreg.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdcreg.h,v 1.8 2003/06/02 23:28:02 millert Exp $     */
+/*      $OpenBSD: wdcreg.h,v 1.9 2003/09/28 21:01:43 grange Exp $     */
 /*	$NetBSD: wdcreg.h,v 1.22 1999/03/07 14:02:54 bouyer Exp $	*/
 
 /*-
@@ -35,9 +35,9 @@
  *	@(#)wdreg.h	7.1 (Berkeley) 5/9/91
  */
 
-/* 
+/*
  * Controller register (wdr_ctlr)
- */ 
+ */
 #define  WDCTL_4BIT	 0x08	/* use four head bits (wd1003) */
 #define  WDCTL_RST	 0x04	/* reset the controller */
 #define  WDCTL_IDS	 0x02	/* disable controller interrupts */
@@ -158,12 +158,12 @@
 #define	WDSD_LBA	0x40	/* logical block addressing */
 
 /* Commands for ATAPI devices */
-#define ATAPI_CHECK_POWER_MODE	0xe5 
+#define ATAPI_CHECK_POWER_MODE	0xe5
 #define ATAPI_EXEC_DRIVE_DIAGS	0x90
 #define ATAPI_IDLE_IMMEDIATE	0xe1
 #define ATAPI_NOP		0x00
-#define ATAPI_PKT_CMD		0xa0 
-#define ATAPI_IDENTIFY_DEVICE	0xa1 
+#define ATAPI_PKT_CMD		0xa0
+#define ATAPI_IDENTIFY_DEVICE	0xa1
 #define ATAPI_SOFT_RESET	0x08
 #define ATAPI_DEVICE_RESET      0x08 /* ATA/ATAPI-5 name for soft reset */
 #define ATAPI_SLEEP		0xe6
@@ -183,7 +183,7 @@
 #define WDCI_IN          0x02    /* transfer to(1) or from(0) the host */
 #define WDCI_RELEASE     0x04    /* bus released until completion */
 
-#define PHASE_CMDOUT    (WDCS_DRQ | WDCI_CMD)  
+#define PHASE_CMDOUT    (WDCS_DRQ | WDCI_CMD)
 #define PHASE_DATAIN    (WDCS_DRQ | WDCI_IN)
 #define PHASE_DATAOUT   WDCS_DRQ
 #define PHASE_COMPLETED (WDCI_IN | WDCI_CMD)
diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h
index 1aa9561063c..ae01770b1bf 100644
--- a/sys/dev/ic/wdcvar.h
+++ b/sys/dev/ic/wdcvar.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdcvar.h,v 1.27 2003/07/23 22:07:15 grange Exp $     */
+/*      $OpenBSD: wdcvar.h,v 1.28 2003/09/28 21:01:43 grange Exp $     */
 /*	$NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $	*/
 
 /*-
@@ -91,7 +91,7 @@ struct channel_softc { /* Per channel data */
 #define _WDC_AUX 8
 #define _WDC_RDONLY  16
 #define _WDC_WRONLY  32
-enum wdc_regs { 		
+enum wdc_regs {
 	wdr_error = _WDC_RDONLY | 1,
 	wdr_precomp = _WDC_WRONLY | 1,
 	wdr_features = _WDC_WRONLY | 1,
@@ -112,10 +112,10 @@ enum wdc_regs {
 
 struct channel_softc_vtbl {
 	u_int8_t (*read_reg)(struct channel_softc *, enum wdc_regs reg);
-	void (*write_reg)(struct channel_softc *, enum wdc_regs reg, 
+	void (*write_reg)(struct channel_softc *, enum wdc_regs reg,
 	    u_int8_t var);
-	
-	void (*read_raw_multi_2)(struct channel_softc *, 
+
+	void (*read_raw_multi_2)(struct channel_softc *,
 	    void *data, unsigned int nbytes);
 	void (*write_raw_multi_2)(struct channel_softc *,
 	    void *data, unsigned int nbytes);
@@ -202,7 +202,7 @@ struct wdc_softc { /* Per controller state */
 struct atapi_return_args;
 
 struct wdc_xfer {
-	volatile u_int c_flags;    
+	volatile u_int c_flags;
 #define C_ATAPI  	0x0002 /* xfer is ATAPI request */
 #define C_TIMEOU  	0x0004 /* xfer processing timed out */
 #define C_NEEDDONE  	0x0010 /* need to call upper-level done */
@@ -234,7 +234,7 @@ struct wdc_xfer {
 			 struct atapi_return_args *);
 	void (*c_done)(struct channel_softc *, struct wdc_xfer *, int,
 			 struct atapi_return_args *);
-	
+
 	/* Used for tape devices */
 	int  transfer_len;
 };
@@ -257,7 +257,7 @@ void   wdc_free_xfer(struct channel_softc *, struct wdc_xfer *);
 void  wdcstart(struct channel_softc *);
 void  wdcrestart(void *);
 int   wdcreset(struct channel_softc *, int);
-#define VERBOSE 1 
+#define VERBOSE 1
 #define SILENT 0 /* wdcreset will not print errors */
 int   wdc_wait_for_status(struct channel_softc *, int, int, int);
 int   wdc_dmawait(struct channel_softc *, struct wdc_xfer *, int);
@@ -273,7 +273,7 @@ void  wdctimeout(void *arg);
 int	wdc_addref(struct channel_softc *);
 void	wdc_delref(struct channel_softc *);
 
-/*	
+/*
  * ST506 spec says that if READY or SEEKCMPLT go off, then the read or write
  * command is aborted.
  */
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 9ead2c8544f..3159209bfc0 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.138 2003/08/01 11:05:09 grange Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.139 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -870,7 +870,7 @@ pciide_mapregs_native(pa, cp, cmdsizep, ctlsizep, pci_intr)
 			printf("%s: couldn't map native-PCI interrupt\n",
 			    sc->sc_wdcdev.sc_dev.dv_xname);
 			return 0;
-		}	
+		}
 		intrstr = pci_intr_string(pa->pa_pc, intrhandle);
 #ifdef __OpenBSD__
 		sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
@@ -1022,7 +1022,7 @@ pciide_intr_flag(struct pciide_channel *cp)
 			}
 			DELAY(5);
 		}
-		
+
 		/* Not for us.  */
 		if (retry == 0)
 			return (0);
@@ -1214,7 +1214,7 @@ pciide_dma_init(v, channel, drive, databuf, datalen, flags)
 	}
 
 	bus_dmamap_sync(sc->sc_dmat, dma_maps->dmamap_xfer, 0,
-	    dma_maps->dmamap_xfer->dm_mapsize,		
+	    dma_maps->dmamap_xfer->dm_mapsize,
 	    (flags & WDC_DMA_READ) ?
 	    BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE);
 
@@ -2085,7 +2085,7 @@ piix3_4_setup_channel(chp)
 			}
 		}
 		idedma_ctl |= IDEDMA_CTL_DRV_DMA(drive);
-	
+
 pio:		/* use PIO mode */
 		idetim |= piix_setup_idetim_drvs(drvp);
 		if (drive == 0) {
@@ -2119,7 +2119,7 @@ piix_setup_idetim_timings(mode, dma, channel)
 	u_int8_t dma;
 	u_int8_t channel;
 {
-	
+
 	if (dma)
 		return PIIX_IDETIM_SET(0,
 		    PIIX_IDETIM_ISP_SET(piix_isp_dma[mode]) |
@@ -2224,7 +2224,7 @@ amd756_chip_map(sc, pa)
 	if (sc->sc_dma_ok) {
 		sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_UDMA;
 		sc->sc_wdcdev.cap |= WDC_CAPABILITY_IRQACK;
-		sc->sc_wdcdev.irqack = pciide_irqack;		
+		sc->sc_wdcdev.irqack = pciide_irqack;
 	}
 	sc->sc_wdcdev.PIO_cap = 4;
 	sc->sc_wdcdev.DMA_cap = 2;
@@ -2410,8 +2410,8 @@ apollo_chip_map(sc, pa)
 	pcib_tag = pci_make_tag(pa->pa_pc, pa->pa_bus, pa->pa_device, 0);
 
 	pcib_id = pci_conf_read(sc->sc_pc, pcib_tag, PCI_ID_REG);
-	pcib_class = pci_conf_read(sc->sc_pc, pcib_tag, PCI_CLASS_REG);	
-	
+	pcib_class = pci_conf_read(sc->sc_pc, pcib_tag, PCI_CLASS_REG);
+
 	switch (PCI_PRODUCT(pcib_id)) {
 	case PCI_PRODUCT_VIATECH_VT82C586_ISA:
 		if (PCI_REVISION(pcib_class) >= 0x02) {
@@ -2479,7 +2479,7 @@ apollo_chip_map(sc, pa)
 	sc->sc_wdcdev.nchannels = PCIIDE_NUM_CHANNELS;
 
 	pciide_print_channels(sc->sc_wdcdev.nchannels, interface);
-	
+
 	WDCDEBUG_PRINT(("apollo_chip_map: old APO_IDECONF=0x%x, "
 	    "APO_CTLMISC=0x%x, APO_DATATIM=0x%x, APO_UDMA=0x%x\n",
 	    pci_conf_read(sc->sc_pc, sc->sc_tag, APO_IDECONF),
@@ -2592,7 +2592,7 @@ apollo_setup_channel(chp)
 				/* 596b or 686a */
 				udmatim_reg |= APO_UDMA_CLK66(chp->channel);
 				udmatim_reg |= APO_UDMA_TIME(chp->channel,
-				    drive, apollo_udma66_tim[drvp->UDMA_mode]);				
+				    drive, apollo_udma66_tim[drvp->UDMA_mode]);
 			} else {
 				/* 596a or 586b */
 				udmatim_reg |= APO_UDMA_TIME(chp->channel,
@@ -4142,7 +4142,7 @@ acer_chip_map(sc, pa)
 			printf("%s: %s ignored (disabled)\n",
 			    sc->sc_wdcdev.sc_dev.dv_xname, cp->name);
 			continue;
-		}		
+		}
 		pciide_map_compat_intr(pa, cp, channel, interface);
 		if (cp->hw_ok == 0)
 			continue;
@@ -4949,7 +4949,7 @@ pdc20268_setup_channel(chp)
 	pciide_channel_dma_setup(cp);
 
 	idedma_ctl = 0;
-	
+
 	for (drive = 0; drive < 2; drive++) {
 		drvp = &chp->ch_drive[drive];
 		/* If no drive, skip */
diff --git a/sys/dev/pci/pciide_acard_reg.h b/sys/dev/pci/pciide_acard_reg.h
index 601da4579c4..c97f199eff3 100644
--- a/sys/dev/pci/pciide_acard_reg.h
+++ b/sys/dev/pci/pciide_acard_reg.h
@@ -17,7 +17,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
diff --git a/sys/dev/pci/pciide_acer_reg.h b/sys/dev/pci/pciide_acer_reg.h
index bd9913ae90f..3793ad82931 100644
--- a/sys/dev/pci/pciide_acer_reg.h
+++ b/sys/dev/pci/pciide_acer_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_acer_reg.h,v 1.5 2003/02/21 20:10:33 grange Exp $	*/
+/*	$OpenBSD: pciide_acer_reg.h,v 1.6 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciide_acer_reg.h,v 1.4 2001/07/26 20:02:22 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -96,7 +96,7 @@
  * IDE bus frequency (1 byte)
  * This should be setup by the BIOS - can we rely on this ?
  */
-#define ACER_IDE_CLK	0x78 
+#define ACER_IDE_CLK	0x78
 
 /* acer UDMA3/4/5 from FreeBSD */
 static int8_t acer_udma[] = {0x4, 0x3, 0x2, 0x1, 0x0, 0x7};
diff --git a/sys/dev/pci/pciide_amd_reg.h b/sys/dev/pci/pciide_amd_reg.h
index 94f9bbdad8b..775955db478 100644
--- a/sys/dev/pci/pciide_amd_reg.h
+++ b/sys/dev/pci/pciide_amd_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_amd_reg.h,v 1.5 2003/02/13 15:30:21 grange Exp $ 	*/
+/*	$OpenBSD: pciide_amd_reg.h,v 1.6 2003/09/28 21:01:43 grange Exp $ 	*/
 /*	$NetBSD: pciide_amd_reg.h,v 1.2 2000/07/06 15:08:11 bouyer Exp $	*/
 
 /*
@@ -46,9 +46,9 @@
 
 /*
  * The AMD756 chip revision D2 has a bug affecting DMA (but not UDMA)
- * modes.  The workaround documented by AMD is to not use DMA on any 
+ * modes.  The workaround documented by AMD is to not use DMA on any
  * drive which does not support UDMA modes.
- * 
+ *
  * See: http://www.amd.com/products/cpg/athlon/techdocs/pdf/22591.pdf
  */
 #define	AMD756_CHIPREV_DISABLEDMA(product, rev)	\
diff --git a/sys/dev/pci/pciide_apollo_reg.h b/sys/dev/pci/pciide_apollo_reg.h
index e84bc20224f..3784bcb5d3a 100644
--- a/sys/dev/pci/pciide_apollo_reg.h
+++ b/sys/dev/pci/pciide_apollo_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_apollo_reg.h,v 1.7 2003/02/21 20:10:33 grange Exp $	*/
+/*	$OpenBSD: pciide_apollo_reg.h,v 1.8 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciide_apollo_reg.h,v 1.8 2001/01/05 18:04:43 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
diff --git a/sys/dev/pci/pciide_cmd_reg.h b/sys/dev/pci/pciide_cmd_reg.h
index a5cb3ef8043..a6911c6e375 100644
--- a/sys/dev/pci/pciide_cmd_reg.h
+++ b/sys/dev/pci/pciide_cmd_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_cmd_reg.h,v 1.7 2003/07/05 08:42:45 grange Exp $	*/
+/*	$OpenBSD: pciide_cmd_reg.h,v 1.8 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciide_cmd_reg.h,v 1.9 2000/08/02 20:23:46 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
diff --git a/sys/dev/pci/pciide_cy693_reg.h b/sys/dev/pci/pciide_cy693_reg.h
index 02367e17e9c..4185de6c3f8 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.4 2003/02/21 20:10:33 grange Exp $	*/
+/*	$OpenBSD: pciide_cy693_reg.h,v 1.5 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciide_cy693_reg.h,v 1.4 2000/05/15 08:46:01 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -72,7 +72,7 @@ static int8_t cy_dma_rec[] =   {7, 1, 0};
 
 /*
  * The cypress is quite weird: it uses 8-bit ISA registers to control
- * DMA modes. 
+ * DMA modes.
  */
 
 #define CY_DMA_ADDR 0x22
diff --git a/sys/dev/pci/pciide_hpt_reg.h b/sys/dev/pci/pciide_hpt_reg.h
index c1d62e5c4f4..fb41c93d22d 100644
--- a/sys/dev/pci/pciide_hpt_reg.h
+++ b/sys/dev/pci/pciide_hpt_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_hpt_reg.h,v 1.8 2003/07/29 18:16:27 grange Exp $	*/
+/*	$OpenBSD: pciide_hpt_reg.h,v 1.9 2003/09/28 21:01:43 grange Exp $	*/
 /*      $NetBSD: pciide_hpt_reg.h,v 1.4 2001/07/23 14:55:27 bouyer Exp $       */
 
 /*
@@ -21,7 +21,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -135,7 +135,7 @@ static u_int32_t hpt370_pio[] =
 	{0x06914e8a, 0x06914e65, 0x06514e33, 0x06514e22, 0x06514e21};
 static u_int32_t hpt370_dma[] =
 	{0x26514e97, 0x26514e33, 0x26514e21};
-static u_int32_t hpt370_udma[] = 
+static u_int32_t hpt370_udma[] =
 	{0x16514e31, 0x164d4e31, 0x16494e31, 0x166d4e31, 0x16454e31,
 	 0x16454e31};
 
diff --git a/sys/dev/pci/pciide_natsemi_reg.h b/sys/dev/pci/pciide_natsemi_reg.h
index f9023eff709..f9f4cc2d95b 100644
--- a/sys/dev/pci/pciide_natsemi_reg.h
+++ b/sys/dev/pci/pciide_natsemi_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_natsemi_reg.h,v 1.3 2003/06/02 19:08:58 jason Exp $	*/
+/*	$OpenBSD: pciide_natsemi_reg.h,v 1.4 2003/09/28 21:01:43 grange Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -35,7 +35,7 @@
 #define	NATSEMI_CTRL1	0x40	/* Control register1 */
 #define	NATSEMI_CTRL1_SWRST	0x04		/* sw rst to ch1/ch2 on */
 #define	NATSEMI_CTRL1_IDEPWR	0x08
-#define	NATSEMI_CTRL1_CH1INTMAP	0x10	
+#define	NATSEMI_CTRL1_CH1INTMAP	0x10
 #define	NATSEMI_CTRL1_CH2INTMAP	0x20
 #define	NATSEMI_CTRL1_INTAMASK	0x40
 #define	NATSEMI_CTRL1_IDWR	0x80		/* write to did/vid enable */
diff --git a/sys/dev/pci/pciide_pdc202xx_reg.h b/sys/dev/pci/pciide_pdc202xx_reg.h
index 075416159fb..d5b933e0076 100644
--- a/sys/dev/pci/pciide_pdc202xx_reg.h
+++ b/sys/dev/pci/pciide_pdc202xx_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_pdc202xx_reg.h,v 1.9 2003/07/23 22:07:15 grange Exp $	*/
+/*	$OpenBSD: pciide_pdc202xx_reg.h,v 1.10 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciide_pdc202xx_reg.h,v 1.5 2001/07/05 08:38:27 toshii Exp $ */
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -87,7 +87,7 @@
 #define PDC2xx_SCR_SET_POLL(r,x) (((r) & 0xff0fffff) | (((x) & 0xf) << 20))
 #define PDC2xx_SCR_DMA		0x01000000
 #define PDC2xx_SCR_IORDY	0x02000000
-#define PDC2xx_SCR_G2FD		0x04000000		
+#define PDC2xx_SCR_G2FD		0x04000000
 #define PDC2xx_SCR_FLOAT	0x08000000
 #define PDC2xx_SCR_RSET		0x10000000
 #define PDC2xx_SCR_TST		0x20000000
diff --git a/sys/dev/pci/pciide_piix_reg.h b/sys/dev/pci/pciide_piix_reg.h
index 514837bda3f..f25bdb0f23c 100644
--- a/sys/dev/pci/pciide_piix_reg.h
+++ b/sys/dev/pci/pciide_piix_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_piix_reg.h,v 1.5 2003/02/21 20:10:34 grange Exp $	*/
+/*	$OpenBSD: pciide_piix_reg.h,v 1.6 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciide_piix_reg.h,v 1.5 2001/01/05 15:29:40 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -50,7 +50,7 @@
 #define PIIX_BMIBA_RTE_IO 0x000000001 /* base addr maps to I/O space */
 
 /*
- * IDE timing register 
+ * IDE timing register
  * 0x40/0x41 is for primary, 0x42/0x43 for secondary channel
  */
 #define PIIX_IDETIM 0x40
diff --git a/sys/dev/pci/pciide_sis_reg.h b/sys/dev/pci/pciide_sis_reg.h
index 07ec1479d4f..534774bdc78 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.4 2003/05/02 09:33:33 grange Exp $	*/
+/*	$OpenBSD: pciide_sis_reg.h,v 1.5 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciide_sis_reg.h,v 1.6 2000/05/15 08:46:01 bouyer Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
diff --git a/sys/dev/pci/pciidereg.h b/sys/dev/pci/pciidereg.h
index dd7f0f40d8c..4244ca789c6 100644
--- a/sys/dev/pci/pciidereg.h
+++ b/sys/dev/pci/pciidereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciidereg.h,v 1.4 2002/11/20 21:33:37 grange Exp $	*/
+/*	$OpenBSD: pciidereg.h,v 1.5 2003/09/28 21:01:43 grange Exp $	*/
 /*	$NetBSD: pciidereg.h,v 1.6 2000/11/14 18:42:58 thorpej Exp $	*/
 
 /*
@@ -78,7 +78,7 @@
 #define	PCIIDE_CHANNEL_NAME(chan)	((chan) == 0 ? "channel 0" : "channel 1")
 
 /*
- * definitions for IDE DMA 
+ * definitions for IDE DMA
  * XXX maybe this should go elsewhere
  */