diff options
| author | dg <dg@FreeBSD.org> | 1994-08-27 16:14:39 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1994-08-27 16:14:39 +0000 |
| commit | 4d4250da00e8f202ebcf4523fa25568d04b116ad (patch) | |
| tree | b3ca65b5c2af24b8ce278da15822a7fd638bbeb5 /sys/scsi | |
| parent | c900d4c13e16169b2482efbfb34820b08862bc16 (diff) | |
| download | FreeBSD-src-4d4250da00e8f202ebcf4523fa25568d04b116ad.zip FreeBSD-src-4d4250da00e8f202ebcf4523fa25568d04b116ad.tar.gz | |
1) Changed ddb into a option rather than a pseudo-device (use options DDB
in your kernel config now).
2) Added ps ddb function from 1.1.5. Cleaned it up a bit and moved into its
own file.
3) Added \r handing in db_printf.
4) Added missing memory usage stats to statclock().
5) Added dummy function to pseudo_set so it will be emitted if there
are no other pseudo declarations.
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/cd.c | 9 | ||||
| -rw-r--r-- | sys/scsi/scsi_base.c | 10 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 10 |
3 files changed, 6 insertions, 23 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 899db93..d0bff56 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: cd.c,v 1.18 1994/04/20 07:06:51 davidg Exp $ + * $Id: cd.c,v 1.19 1994/05/25 09:13:15 rgrimes Exp $ */ #define SPLCD splbio @@ -50,11 +50,10 @@ static errval cd_read_toc(u_int32, u_int32, u_int32, struct cd_toc_entry *, int32 cdstrats, cdqueues; -#include <ddb.h> -#if NDDB > 0 -#else /* NDDB > 0 */ +#ifdef DDB +#else /* DDB */ #define Debugger() -#endif /* NDDB > 0 */ +#endif /* DDB */ #define PAGESIZ 4096 #define SECSIZE 2048 /* XXX */ /* default only */ diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 8ca4900..8cf9584 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -8,7 +8,7 @@ * file. * * Written by Julian Elischer (julian@dialix.oz.au) - * $Id: scsi_base.c,v 1.9 1994/05/25 09:13:20 rgrimes Exp $ + * $Id: scsi_base.c,v 1.10 1994/08/20 03:48:58 davidg Exp $ */ #define SPLSD splbio @@ -28,19 +28,11 @@ static errval sc_err1(struct scsi_xfer *); static errval scsi_interpret_sense(struct scsi_xfer *); -#ifdef NetBSD #ifdef DDB int Debugger(); #else /* DDB */ #define Debugger() #endif /* DDB */ -#else /* NetBSD */ -#include "ddb.h" -#if NDDB > 0 -#else /* NDDB > 0 */ -#define Debugger() -#endif /* NDDB > 0 */ -#endif struct scsi_xfer *next_free_xs; diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 691430e..65b20df 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * - * $Id: sd.c,v 1.23 1994/04/20 07:06:57 davidg Exp $ + * $Id: sd.c,v 1.24 1994/05/25 09:13:32 rgrimes Exp $ */ #define SPLSD splbio @@ -42,19 +42,11 @@ u_int32 sdstrats, sdqueues; -#ifdef NetBSD #ifdef DDB int Debugger(); #else /* DDB */ #define Debugger() #endif /* DDB */ -#else /* NetBSD */ -#include <ddb.h> -#if NDDB > 0 -#else /* NDDB > 0 */ -#define Debugger(s) -#endif /* NDDB > 0 */ -#endif #define PAGESIZ 4096 #define SECSIZE 512 |
