diff options
author | joerg <joerg@FreeBSD.org> | 1996-07-14 10:46:56 +0000 |
---|---|---|
committer | joerg <joerg@FreeBSD.org> | 1996-07-14 10:46:56 +0000 |
commit | 9a8388eab8ea7830b12182218b9a788ff8c4271b (patch) | |
tree | 76b24c3ebf4abeca7ef0ddb91486c72162fbf21e | |
parent | f8e0a40f1c864d1f5f3680164336b038f79272c8 (diff) | |
download | FreeBSD-src-9a8388eab8ea7830b12182218b9a788ff8c4271b.zip FreeBSD-src-9a8388eab8ea7830b12182218b9a788ff8c4271b.tar.gz |
Turn SCSIDEBUG into a new-style option.
-rw-r--r-- | sys/conf/options | 3 | ||||
-rw-r--r-- | sys/scsi/cd.c | 3 | ||||
-rw-r--r-- | sys/scsi/ch.c | 3 | ||||
-rw-r--r-- | sys/scsi/pt.c | 3 | ||||
-rw-r--r-- | sys/scsi/scsi_base.c | 3 | ||||
-rw-r--r-- | sys/scsi/scsi_debug.h | 10 | ||||
-rw-r--r-- | sys/scsi/scsi_driver.c | 5 | ||||
-rw-r--r-- | sys/scsi/scsi_ioctl.c | 3 | ||||
-rw-r--r-- | sys/scsi/sctarg.c | 3 | ||||
-rw-r--r-- | sys/scsi/st.c | 3 | ||||
-rw-r--r-- | sys/scsi/worm.c | 3 |
11 files changed, 30 insertions, 12 deletions
diff --git a/sys/conf/options b/sys/conf/options index e44514f..6b880fe 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,4 +1,4 @@ -# $Id: options,v 1.15 1996/06/16 19:57:59 joerg Exp $ +# $Id: options,v 1.16 1996/06/23 14:43:55 bde Exp $ # Option name filename @@ -58,6 +58,7 @@ NBUF opt_param.h # Generic SCSI options. SCSI_REPORT_GEOMETRY opt_scsi.h SCSI_DELAY opt_scsi.h +SCSIDEBUG opt_scsi.h # Options used only in scsi/od.c. OD_BOGUS_NOT_READY opt_od.h diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index e16b257..1e2c56f 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,10 +14,11 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: cd.c,v 1.69 1996/03/29 11:57:52 bde Exp $ + * $Id: cd.c,v 1.70 1996/06/12 05:10:51 gpalmer Exp $ */ #include "opt_bounce.h" +#include "opt_scsi.h" #define SPLCD splbio #define ESUCCESS 0 diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 06a33bd..2957ea6 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -2,11 +2,12 @@ * Written by grefen@convex.com (probably moved by now) * Based on scsi drivers by Julian Elischer (julian@tfs.com) * - * $Id: ch.c,v 1.31 1996/03/10 18:17:53 davidg Exp $ + * $Id: ch.c,v 1.32 1996/03/27 18:50:07 bde Exp $ */ #include <sys/types.h> #include <ch.h> +#include "opt_scsi.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c index de05408..1b715be 100644 --- a/sys/scsi/pt.c +++ b/sys/scsi/pt.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pt.c,v 1.15 1996/03/10 18:17:54 davidg Exp $ + * $Id: pt.c,v 1.16 1996/03/27 20:07:29 bde Exp $ */ /* @@ -47,6 +47,7 @@ */ #include "opt_bounce.h" +#include "opt_scsi.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index e0745b5..75281f9 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -8,10 +8,11 @@ * file. * * Written by Julian Elischer (julian@dialix.oz.au) - * $Id: scsi_base.c,v 1.37 1996/03/31 03:19:06 gibbs Exp $ + * $Id: scsi_base.c,v 1.38 1996/05/03 21:01:42 phk Exp $ */ #include "opt_bounce.h" +#include "opt_scsi.h" #define SPLSD splbio #define ESUCCESS 0 diff --git a/sys/scsi/scsi_debug.h b/sys/scsi/scsi_debug.h index 578cd43..dc249f7 100644 --- a/sys/scsi/scsi_debug.h +++ b/sys/scsi/scsi_debug.h @@ -1,8 +1,14 @@ -/*#define SCSIDEBUG 1*/ +/* + * Use + * options SCSIDEBUG + * + * in the kernel config file to get these macros into effect. + */ + /* * Written by Julian Elischer (julian@tfs.com) * - * $Id: scsi_debug.h,v 1.1 1993/11/18 05:02:54 rgrimes Exp $ + * $Id: scsi_debug.h,v 1.2 1995/05/30 08:13:32 rgrimes Exp $ */ #ifndef _SCSI_SCSI_DEBUG_H #define _SCSI_SCSI_DEBUG_H 1 diff --git a/sys/scsi/scsi_driver.c b/sys/scsi/scsi_driver.c index 3af475f..45ed3cb 100644 --- a/sys/scsi/scsi_driver.c +++ b/sys/scsi/scsi_driver.c @@ -35,9 +35,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_driver.c,v 1.15 1996/04/07 17:32:41 bde Exp $ + * $Id: scsi_driver.c,v 1.16 1996/06/16 19:54:02 joerg Exp $ * */ + +#include "opt_scsi.h" + #include <sys/types.h> #include <sys/errno.h> #include <sys/param.h> diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index 56431ce..361c236 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -36,12 +36,13 @@ * SUCH DAMAGE. *End copyright * - * $Id: scsi_ioctl.c,v 1.20 1996/03/02 01:49:47 dyson Exp $ + * $Id: scsi_ioctl.c,v 1.21 1996/03/10 07:13:09 gibbs Exp $ * * */ #include "opt_bounce.h" +#include "opt_scsi.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c index 869d270..1380075 100644 --- a/sys/scsi/sctarg.c +++ b/sys/scsi/sctarg.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sctarg.c,v 1.14 1996/03/10 07:13:11 gibbs Exp $ + * $Id: sctarg.c,v 1.15 1996/03/28 14:33:55 scrappy Exp $ */ /* @@ -47,6 +47,7 @@ */ #include "opt_bounce.h" +#include "opt_scsi.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 5c1a003..2bcc733 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: st.c,v 1.69 1996/06/22 14:57:55 joerg Exp $ + * $Id: st.c,v 1.70 1996/06/24 04:54:32 gibbs Exp $ */ /* @@ -28,6 +28,7 @@ */ #include "opt_bounce.h" +#include "opt_scsi.h" #include <sys/types.h> diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c index 6547005..dfe68fd 100644 --- a/sys/scsi/worm.c +++ b/sys/scsi/worm.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: worm.c,v 1.26 1996/03/10 12:52:47 jkh Exp $ + * $Id: worm.c,v 1.27 1996/03/28 14:33:59 scrappy Exp $ */ /* XXX This is PRELIMINARY. @@ -58,6 +58,7 @@ */ #include "opt_bounce.h" +#include "opt_scsi.h" #include <sys/param.h> #include <sys/systm.h> |