diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ata/wd.c | 18 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 16 | ||||
| -rw-r--r-- | sys/sys/conf.h | 10 |
3 files changed, 3 insertions, 41 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index df9415fd387..68455c9aced 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.18 2001/07/31 07:07:00 csapuntz Exp $ */ +/* $OpenBSD: wd.c,v 1.19 2001/08/06 20:50:28 miod Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -1100,7 +1100,6 @@ wdsize(dev) return (size); } -#ifndef __BDEVSW_DUMP_OLD_TYPE /* #define WD_DUMP_NOT_TRUSTED if you just want to watch */ static int wddoingadump = 0; static int wddumprecalibrated = 0; @@ -1233,21 +1232,6 @@ again: wddoingadump = 0; return 0; } -#else /* __BDEVSW_DUMP_NEW_TYPE */ - - -int -wddump(dev, blkno, va, size) - dev_t dev; - daddr_t blkno; - caddr_t va; - size_t size; -{ - - /* Not implemented. */ - return ENXIO; -} -#endif /* __BDEVSW_DUMP_NEW_TYPE */ #ifdef DKBAD /* diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 756ea472e6a..fedfc8f0907 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.48 2001/06/22 14:35:43 deraadt Exp $ */ +/* $OpenBSD: sd.c,v 1.49 2001/08/06 20:50:25 miod Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -1165,7 +1165,6 @@ sdsize(dev) return size; } -#ifndef __BDEVSW_DUMP_OLD_TYPE /* #define SD_DUMP_NOT_TRUSTED if you just want to watch */ static struct scsi_xfer sx; static int sddoingadump; @@ -1287,19 +1286,6 @@ sddump(dev, blkno, va, size) sddoingadump = 0; return 0; } -#else /* __BDEVSW_DUMP_OLD_TYPE */ -int -sddump(dev, blkno, va, size) - dev_t dev; - daddr_t blkno; - caddr_t va; - size_t size; -{ - - /* Not implemented. */ - return ENXIO; -} -#endif /* __BDEVSW_DUMP_OLD_TYPE */ /* * Copy up to len chars from src to dst, ignoring non-printables. diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 6f8b62f1488..07b51991026 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.45 2001/08/01 21:18:41 mickey Exp $ */ +/* $OpenBSD: conf.h,v 1.46 2001/08/06 20:50:22 miod Exp $ */ /* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */ /*- @@ -89,12 +89,8 @@ struct bdevsw { void (*d_strategy) __P((struct buf *bp)); int (*d_ioctl) __P((dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *p)); -#ifndef __BDEVSW_DUMP_OLD_TYPE int (*d_dump) __P((dev_t dev, daddr_t blkno, caddr_t va, size_t size)); -#else /* not __BDEVSW_DUMP_OLD_TYPE */ - int (*d_dump) (); /* parameters vary by architecture */ -#endif /* __BDEVSW_DUMP_OLD_TYPE */ int (*d_psize) __P((dev_t dev)); int d_type; }; @@ -104,11 +100,7 @@ struct bdevsw { extern struct bdevsw bdevsw[]; /* bdevsw-specific types */ -#ifndef __BDEVSW_DUMP_OLD_TYPE #define dev_type_dump(n) int n __P((dev_t, daddr_t, caddr_t, size_t)) -#else /* not __BDEVSW_DUMP_OLD_TYPE */ -#define dev_type_dump(n) int n() /* parameters vary by architecture */ -#endif /* __BDEVSW_DUMP_OLD_TYPE */ #define dev_type_size(n) int n __P((dev_t)) /* bdevsw-specific initializations */ |