From 8c1fd46d9926afc151aa46bf40027a944f622d6c Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 30 Jun 1994 01:12:44 +0000 Subject: [PATCH] => "../../scsi/xxx.h" for use with old conf and "pc532 special scsi." As soon as config.new is working on the pc532, pc532/scsi should disappear. --- sys/arch/pc532/scsi/cd.c | 12 ++++++------ sys/arch/pc532/scsi/ch.c | 8 ++++---- sys/arch/pc532/scsi/scsiconf.c | 6 +++--- sys/arch/pc532/scsi/sd.c | 10 +++++----- sys/arch/pc532/scsi/st.c | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/arch/pc532/scsi/cd.c b/sys/arch/pc532/scsi/cd.c index 207fcdd37839..bea11034cf37 100644 --- a/sys/arch/pc532/scsi/cd.c +++ b/sys/arch/pc532/scsi/cd.c @@ -13,7 +13,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: cd.c,v 1.1 1994/04/01 23:18:05 phil Exp $ + * $Id: cd.c,v 1.2 1994/06/30 01:12:44 phil Exp $ */ #define SPLCD splbio @@ -36,11 +36,11 @@ #include #include -#include -#include -#include -#include /* rw_big and start_stop come from there */ -#include +#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/arch/pc532/scsi/ch.c b/sys/arch/pc532/scsi/ch.c index a1d1266aa227..0c8196226364 100644 --- a/sys/arch/pc532/scsi/ch.c +++ b/sys/arch/pc532/scsi/ch.c @@ -1,5 +1,5 @@ /* - * $Id: ch.c,v 1.1 1994/04/01 23:18:08 phil Exp $ + * $Id: ch.c,v 1.2 1994/06/30 01:12:47 phil Exp $ */ #include "ch.h" @@ -18,9 +18,9 @@ #define SECSIZE 512 #endif /* defined(OSF) */ -#include -#include -#include +#include "../../scsi/scsi_all.h" +#include "../../scsi/scsi_changer.h" +#include "../../scsi/scsiconf.h" struct scsi_xfer ch_scsi_xfer[NCH]; diff --git a/sys/arch/pc532/scsi/scsiconf.c b/sys/arch/pc532/scsi/scsiconf.c index dbbf7ffb2b66..a32166336a5c 100644 --- a/sys/arch/pc532/scsi/scsiconf.c +++ b/sys/arch/pc532/scsi/scsiconf.c @@ -13,7 +13,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: scsiconf.c,v 1.1 1994/04/01 23:18:15 phil Exp $ + * $Id: scsiconf.c,v 1.2 1994/06/30 01:12:49 phil Exp $ */ #include @@ -27,8 +27,8 @@ #include #include -#include -#include +#include "../../scsi/scsi_all.h" +#include "../../scsi/scsiconf.h" #include "st.h" #include "sd.h" diff --git a/sys/arch/pc532/scsi/sd.c b/sys/arch/pc532/scsi/sd.c index 311168168c1f..94b78f03cc8f 100644 --- a/sys/arch/pc532/scsi/sd.c +++ b/sys/arch/pc532/scsi/sd.c @@ -13,7 +13,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: sd.c,v 1.2 1994/04/17 07:53:54 phil Exp $ + * $Id: sd.c,v 1.3 1994/06/30 01:12:50 phil Exp $ */ #include "sd.h" @@ -33,10 +33,10 @@ #include #include -#include -#include -#include -#include +#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/arch/pc532/scsi/st.c b/sys/arch/pc532/scsi/st.c index e83a523073bd..23ce911028e0 100644 --- a/sys/arch/pc532/scsi/st.c +++ b/sys/arch/pc532/scsi/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.1 1994/04/01 23:18:21 phil Exp $ + * $Id: st.c,v 1.2 1994/06/30 01:12:52 phil Exp $ */ /* @@ -38,10 +38,10 @@ #include #include -#include -#include -#include -#include +#include "../../scsi/scsi_all.h" +#include "../../scsi/scsi_tape.h" +#include "../../scsi/scsiconf.h" +#include "../../scsi/stdefs.h" long int ststrats, stqueues;