summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1993-12-17 07:56:32 +0000
committermycroft <mycroft@NetBSD.org>1993-12-17 07:56:32 +0000
commitb4d3382694d82ff4bf2dfc8afb373ed8103ebdda (patch)
tree704dba67d43d4899302b7ba7c369f07e55f6e6aa /sys/dev
parentbe71d627933a9031c206efb8c3f4951361279ade (diff)
Canonicalize all #includes.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/cd.c43
-rw-r--r--sys/dev/scsipi/ch.c7
-rw-r--r--sys/dev/scsipi/scsiconf.c27
-rw-r--r--sys/dev/scsipi/sd.c39
-rw-r--r--sys/dev/scsipi/st.c35
-rw-r--r--sys/dev/scsipi/uk.c4
6 files changed, 80 insertions, 75 deletions
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index f9e57f24395..ce5d67aa3f7 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -13,33 +13,34 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: cd.c,v 1.18 1993/08/04 19:33:44 brezak Exp $
+ * $Id: cd.c,v 1.19 1993/12/17 08:50:33 mycroft Exp $
*/
#define SPLCD splbio
#define ESUCCESS 0
#include "cd.h"
-#include "sys/types.h"
-#include "sys/param.h"
-#include "sys/dkbad.h"
-#include "sys/systm.h"
-#include "sys/conf.h"
-#include "sys/file.h"
-#include "sys/stat.h"
-#include "sys/ioctl.h"
-#include "sys/buf.h"
-#include "sys/uio.h"
-#include "sys/malloc.h"
-#include "sys/cdio.h"
-
-#include "sys/errno.h"
-#include "sys/disklabel.h"
-#include "scsi/scsi_all.h"
-#include "scsi/scsi_cd.h"
-#include "scsi/cddefs.h"
-#include "scsi/scsi_disk.h" /* rw_big and start_stop come from there */
-#include "scsi/scsiconf.h"
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/dkbad.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <sys/malloc.h>
+#include <sys/cdio.h>
+#include <sys/errno.h>
+#include <sys/disklabel.h>
+
+#include <scsi/scsi_all.h>
+#include <scsi/scsi_cd.h>
+#include <scsi/cddefs.h>
+#include <scsi/scsi_disk.h> /* rw_big and start_stop come from there */
+#include <scsi/scsiconf.h>
long int cdstrats,cdqueues;
diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c
index 090f1766ed8..96288023675 100644
--- a/sys/dev/scsipi/ch.c
+++ b/sys/dev/scsipi/ch.c
@@ -1,13 +1,12 @@
/*
- * $Id: ch.c,v 1.4 1993/08/01 19:26:19 mycroft Exp $
+ * $Id: ch.c,v 1.5 1993/12/17 08:50:45 mycroft Exp $
*/
-#include <sys/types.h>
-#include <ch.h>
+#include "ch.h"
+#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
-
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/buf.h>
diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c
index 8d338f4a30e..ac81fcc3a8b 100644
--- a/sys/dev/scsipi/scsiconf.c
+++ b/sys/dev/scsipi/scsiconf.c
@@ -13,21 +13,22 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: scsiconf.c,v 1.9 1993/05/27 10:14:02 deraadt Exp $
+ * $Id: scsiconf.c,v 1.10 1993/12/17 08:50:49 mycroft Exp $
*/
-#include "sys/types.h"
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/errno.h"
-#include "sys/ioctl.h"
-#include "sys/buf.h"
-#include "sys/proc.h"
-#include "sys/user.h"
-#include "sys/dkbad.h"
-#include "sys/disklabel.h"
-#include "scsi/scsi_all.h"
-#include "scsi/scsiconf.h"
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/dkbad.h>
+#include <sys/disklabel.h>
+
+#include <scsi/scsi_all.h>
+#include <scsi/scsiconf.h>
#include "st.h"
#include "sd.h"
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 614255b9b48..c8a6223f555 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -13,29 +13,30 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: sd.c,v 1.18 1993/08/01 19:26:21 mycroft Exp $
+ * $Id: sd.c,v 1.19 1993/12/17 08:50:56 mycroft Exp $
*/
#include "sd.h"
-#include "sys/types.h"
-#include "sys/param.h"
-#include "sys/dkbad.h"
-#include "sys/systm.h"
-#include "sys/conf.h"
-#include "sys/proc.h"
-#include "sys/file.h"
-#include "sys/stat.h"
-#include "sys/ioctl.h"
-#include "sys/buf.h"
-#include "sys/uio.h"
-#include "sys/malloc.h"
-#include "sys/errno.h"
-#include "sys/disklabel.h"
-#include "scsi/scsi_all.h"
-#include "scsi/scsi_disk.h"
-#include "scsi/scsiconf.h"
-#include "scsi/sddefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/dkbad.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <sys/malloc.h>
+#include <sys/errno.h>
+#include <sys/disklabel.h>
+
+#include <scsi/scsi_all.h>
+#include <scsi/scsi_disk.h>
+#include <scsi/scsiconf.h>
+#include <scsi/sddefs.h>
long int sdstrats, sdqueues;
diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c
index 111a0846942..4bf912fd84d 100644
--- a/sys/dev/scsipi/st.c
+++ b/sys/dev/scsipi/st.c
@@ -13,7 +13,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: st.c,v 1.16 1993/08/01 19:26:22 mycroft Exp $
+ * $Id: st.c,v 1.17 1993/12/17 08:51:06 mycroft Exp $
*/
/*
@@ -25,22 +25,23 @@
#include "st.h"
-#include "sys/types.h"
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/errno.h"
-#include "sys/malloc.h"
-#include "sys/ioctl.h"
-#include "sys/buf.h"
-#include "sys/proc.h"
-#include "sys/user.h"
-#include "sys/mtio.h"
-#include "sys/dkbad.h"
-#include "sys/disklabel.h"
-#include "scsi/scsi_all.h"
-#include "scsi/scsi_tape.h"
-#include "scsi/scsiconf.h"
-#include "scsi/stdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/malloc.h>
+#include <sys/ioctl.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/mtio.h>
+#include <sys/dkbad.h>
+#include <sys/disklabel.h>
+
+#include <scsi/scsi_all.h>
+#include <scsi/scsi_tape.h>
+#include <scsi/scsiconf.h>
+#include <scsi/stdefs.h>
long int ststrats, stqueues;
diff --git a/sys/dev/scsipi/uk.c b/sys/dev/scsipi/uk.c
index 982deb13f9b..de6e4fed417 100644
--- a/sys/dev/scsipi/uk.c
+++ b/sys/dev/scsipi/uk.c
@@ -3,7 +3,7 @@
* Dummy driver for a device we can't identify.
* by Julian Elischer (julian@tfs.com)
*
- * $Id: uk.c,v 1.1 1993/11/24 04:52:53 mycroft Exp $
+ * $Id: uk.c,v 1.2 1993/12/17 08:51:13 mycroft Exp $
*/
@@ -11,8 +11,10 @@
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
+
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
+
#define NUK 16
/*