[src/trunk]: src/sys Garbage-collect __BDEVSW_DUMP_OLD_TYPE.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f17569fcccb2
branches:  trunk
changeset: 494361:f17569fcccb2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jul 05 23:31:12 2000 +0000

description:
Garbage-collect __BDEVSW_DUMP_OLD_TYPE.

diffstat:

 sys/dev/ata/wd.c    |  18 +-----------------
 sys/dev/scsipi/sd.c |  16 +---------------
 sys/sys/conf.h      |  10 +---------
 3 files changed, 3 insertions(+), 41 deletions(-)

diffs (107 lines):

diff -r 9a3feda863b7 -r f17569fcccb2 sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Wed Jul 05 22:50:59 2000 +0000
+++ b/sys/dev/ata/wd.c  Wed Jul 05 23:31:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.206 2000/06/28 16:39:25 mrg Exp $ */
+/*     $NetBSD: wd.c,v 1.207 2000/07/05 23:31:13 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.  All rights reserved.
@@ -1125,7 +1125,6 @@
        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;
@@ -1259,21 +1258,6 @@
        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 HAS_BAD144_HANDLING
 /*
diff -r 9a3feda863b7 -r f17569fcccb2 sys/dev/scsipi/sd.c
--- a/sys/dev/scsipi/sd.c       Wed Jul 05 22:50:59 2000 +0000
+++ b/sys/dev/scsipi/sd.c       Wed Jul 05 23:31:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sd.c,v 1.163 2000/06/09 08:54:26 enami Exp $   */
+/*     $NetBSD: sd.c,v 1.164 2000/07/05 23:31:13 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1211,7 +1211,6 @@
        return (size);
 }
 
-#ifndef __BDEVSW_DUMP_OLD_TYPE
 /* #define SD_DUMP_NOT_TRUSTED if you just want to watch */
 static struct scsipi_xfer sx;
 static int sddoingadump;
@@ -1331,16 +1330,3 @@
        sddoingadump = 0;
        return (0);
 }
-#else  /* __BDEVSW_DUMP_NEW_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_NEW_TYPE */
diff -r 9a3feda863b7 -r f17569fcccb2 sys/sys/conf.h
--- a/sys/sys/conf.h    Wed Jul 05 22:50:59 2000 +0000
+++ b/sys/sys/conf.h    Wed Jul 05 23:31:12 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.h,v 1.77 2000/06/26 04:56:32 simonb Exp $ */
+/*     $NetBSD: conf.h,v 1.78 2000/07/05 23:31:12 thorpej Exp $        */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -85,12 +85,8 @@
        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;
 };
@@ -100,11 +96,7 @@
 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 */