Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Nuke dk_establish() from orbit except from those ports w...
details: https://anonhg.NetBSD.org/src/rev/8f8cf98e8180
branches: trunk
changeset: 486233:8f8cf98e8180
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue May 16 05:45:44 2000 +0000
description:
Nuke dk_establish() from orbit except from those ports which still use
it to determine the boot device: mvme68k, pc532, macppc, ofppc. Those
platforms should be changed to use device_register(). In the mean time,
those ports defined __BROKEN_DK_ESTABLISH.
diffstat:
sys/arch/alpha/alpha/disksubr.c | 12 ++----------
sys/arch/amiga/amiga/disksubr.c | 11 +----------
sys/arch/arc/arc/disksubr.c | 11 +----------
sys/arch/arc/dev/fd.c | 4 +---
sys/arch/arm26/arm26/disksubr.c | 11 +----------
sys/arch/arm32/arm32/disksubr.c | 11 +----------
sys/arch/arm32/mainbus/fd.c | 6 +-----
sys/arch/atari/atari/disksubr.c | 12 +-----------
sys/arch/atari/dev/hdfd.c | 5 +----
sys/arch/bebox/bebox/machdep.c | 7 +------
sys/arch/cobalt/cobalt/disksubr.c | 11 +----------
sys/arch/hpcmips/hpcmips/disksubr.c | 11 +----------
sys/arch/i386/i386/disksubr.c | 11 +----------
sys/arch/luna68k/luna68k/disksubr.c | 16 +---------------
sys/arch/mac68k/mac68k/disksubr.c | 10 +---------
sys/arch/macppc/include/types.h | 3 ++-
sys/arch/mvme68k/include/types.h | 3 ++-
sys/arch/news68k/news68k/disksubr.c | 13 +------------
sys/arch/newsmips/newsmips/disksubr.c | 13 +------------
sys/arch/next68k/next68k/disksubr.c | 11 +----------
sys/arch/ofppc/include/types.h | 4 +++-
sys/arch/pc532/include/types.h | 3 ++-
sys/arch/pmax/pmax/disksubr.c | 9 +--------
sys/arch/prep/prep/machdep.c | 7 +------
sys/arch/sparc/dev/fd.c | 5 +----
sys/arch/sparc/sparc/disksubr.c | 10 +---------
sys/arch/sparc64/dev/fd.c | 5 +----
sys/arch/sparc64/sparc64/disksubr.c | 10 +---------
sys/arch/sun3/dev/fd.c | 5 +----
sys/arch/sun3/dev/xd.c | 3 +--
sys/arch/sun3/dev/xy.c | 3 +--
sys/arch/sun3/sun3/disksubr.c | 16 +---------------
sys/arch/x68k/x68k/disksubr.c | 10 +---------
sys/dev/ic/ca.c | 8 ++------
sys/dev/ofw/ofdisk.c | 4 +++-
sys/dev/ofw/ofnet.c | 5 +++--
sys/dev/scsipi/cd.c | 4 ++--
sys/dev/scsipi/sd.c | 4 ++--
sys/dev/vme/xd.c | 4 +---
sys/dev/vme/xy.c | 4 +---
sys/sys/disk.h | 4 +++-
41 files changed, 56 insertions(+), 263 deletions(-)
diffs (truncated from 883 to 300 lines):
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/alpha/alpha/disksubr.c
--- a/sys/arch/alpha/alpha/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/alpha/alpha/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.18 2000/03/07 15:55:14 tsutsui Exp $ */
+/* $NetBSD: disksubr.c,v 1.19 2000/05/16 05:45:44 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.18 2000/03/07 15:55:14 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.19 2000/05/16 05:45:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -47,14 +47,6 @@
extern struct device *bootdv;
-/* was this the boot device ? */
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
-}
-
/*
* Attempt to read a disk label from a device
* using the indicated stategy routine.
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/amiga/amiga/disksubr.c
--- a/sys/arch/amiga/amiga/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/amiga/amiga/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.33 2000/03/30 11:37:23 tsutsui Exp $ */
+/* $NetBSD: disksubr.c,v 1.34 2000/05/16 05:45:44 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -86,15 +86,6 @@
struct rdbmap *getrdbmap __P((dev_t, void (*)(struct buf *), struct disklabel *,
struct cpu_disklabel *));
-/* XXX unknown function but needed for /sys/scsi to link */
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
- return;
-}
-
/*
* Attempt to read a disk label from a device
* using the indicated stategy routine.
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/arc/arc/disksubr.c
--- a/sys/arch/arc/arc/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/arc/arc/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.9 2000/03/27 11:29:32 soda Exp $ */
+/* $NetBSD: disksubr.c,v 1.10 2000/05/16 05:45:44 thorpej Exp $ */
/* $OpenBSD: disksubr.c,v 1.14 1997/05/08 00:14:29 deraadt Exp $ */
/* NetBSD: disksubr.c,v 1.40 1999/05/06 15:45:51 christos Exp */
@@ -559,12 +559,3 @@
done:
return (0);
}
-
-/* For bootstrapping / device */
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
- return;
-}
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/arc/dev/fd.c
--- a/sys/arch/arc/dev/fd.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/arc/dev/fd.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.20 2000/04/07 16:58:54 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.21 2000/05/16 05:45:45 thorpej Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -425,8 +425,6 @@
fdc->sc_fd[drive] = fd;
fd->sc_dk.dk_name = fd->sc_dev.dv_xname;
fd->sc_dk.dk_driver = &fddkdriver;
- /* XXX Need to do some more fiddling with sc_dk. */
- dk_establish(&fd->sc_dk, &fd->sc_dev);
/* Needed to power off if the motor is on when we halt. */
fd->sc_sdhook = shutdownhook_establish(fd_motor_off, fd);
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/arm26/arm26/disksubr.c
--- a/sys/arch/arm26/arm26/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/arm26/arm26/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.1 2000/05/09 21:55:56 bjh21 Exp $ */
+/* $NetBSD: disksubr.c,v 1.2 2000/05/16 05:45:45 thorpej Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -435,13 +435,4 @@
return (0);
}
-
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
- return;
-}
-
/* End of disksubr.c */
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/arm32/arm32/disksubr.c
--- a/sys/arch/arm32/arm32/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/arm32/arm32/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.12 2000/01/18 19:36:24 thorpej Exp $ */
+/* $NetBSD: disksubr.c,v 1.13 2000/05/16 05:45:45 thorpej Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -435,13 +435,4 @@
return (0);
}
-
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
- return;
-}
-
/* End of disksubr.c */
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/arm32/mainbus/fd.c
--- a/sys/arch/arm32/mainbus/fd.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/arm32/mainbus/fd.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.30 2000/04/09 00:18:12 mark Exp $ */
+/* $NetBSD: fd.c,v 1.31 2000/05/16 05:45:45 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -551,10 +551,6 @@
fd->sc_dk.dk_driver = &fddkdriver;
disk_attach(&fd->sc_dk);
-#ifdef NEWCONFIG
- /* XXX Need to do some more fiddling with sc_dk. */
- dk_establish(&fd->sc_dk, &fd->sc_dev);
-#endif
/* Needed to power off if the motor is on when we halt. */
}
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/atari/atari/disksubr.c
--- a/sys/arch/atari/atari/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/atari/atari/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.17 1999/09/22 07:20:44 leo Exp $ */
+/* $NetBSD: disksubr.c,v 1.18 2000/05/16 05:45:46 thorpej Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -63,16 +63,6 @@
u_int, u_int, struct ahdi_ptbl *));
/*
- * XXX unknown function but needed for /sys/scsi to link
- */
-void
-dk_establish(disk, device)
- struct disk *disk;
- struct device *device;
-{
-}
-
-/*
* Determine the size of the transfer, and make sure it is
* within the boundaries of the partition. Adjust transfer
* if needed, and signal errors or early completion.
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/atari/dev/hdfd.c
--- a/sys/arch/atari/dev/hdfd.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/atari/dev/hdfd.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.23 2000/05/09 10:29:01 leo Exp $ */
+/* $NetBSD: hdfd.c,v 1.24 2000/05/16 05:45:46 thorpej Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -509,9 +509,6 @@
fd->sc_dk.dk_driver = &fddkdriver;
disk_attach(&fd->sc_dk);
- /* XXX Need to do some more fiddling with sc_dk. */
- dk_establish(&fd->sc_dk, &fd->sc_dev);
-
/* Needed to power off if the motor is on when we halt. */
fd->sc_sdhook = shutdownhook_establish(fd_motor_off, fd);
}
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/bebox/bebox/machdep.c
--- a/sys/arch/bebox/bebox/machdep.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/bebox/bebox/machdep.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.50 2000/03/24 17:05:32 ws Exp $ */
+/* $NetBSD: machdep.c,v 1.51 2000/05/16 05:45:46 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -880,11 +880,6 @@
splx(ipl);
}
-/* not impliment */
-
-void
-dk_establish() {}
-
/*
* Allocate vm space and mapin the I/O address
*/
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/cobalt/cobalt/disksubr.c
--- a/sys/arch/cobalt/cobalt/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/cobalt/cobalt/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.4 2000/03/31 14:51:49 soren Exp $ */
+/* $NetBSD: disksubr.c,v 1.5 2000/05/16 05:45:46 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -45,15 +45,6 @@
static struct mbr_partition *
mbr_findslice(struct mbr_partition* dp, struct buf *bp);
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
-
- /* Nothing to do. */
-}
-
/*
* Scan MBR for NetBSD partittion. Return NO_MBR_SIGNATURE if no MBR found
* Otherwise, copy valid MBR partition-table into dp, and if a NetBSD
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/hpcmips/hpcmips/disksubr.c
--- a/sys/arch/hpcmips/hpcmips/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/hpcmips/hpcmips/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.4 2000/01/18 19:39:18 thorpej Exp $ */
+/* $NetBSD: disksubr.c,v 1.5 2000/05/16 05:45:47 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -512,12 +512,3 @@
done:
return (0);
}
-
-/* For bootstrapping / device */
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
- return;
-}
diff -r 770c608e8330 -r 8f8cf98e8180 sys/arch/i386/i386/disksubr.c
--- a/sys/arch/i386/i386/disksubr.c Tue May 16 05:45:27 2000 +0000
+++ b/sys/arch/i386/i386/disksubr.c Tue May 16 05:45:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.41 2000/01/18 19:40:53 thorpej Exp $ */
+/* $NetBSD: disksubr.c,v 1.42 2000/05/16 05:45:47 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -54,15 +54,6 @@
static struct mbr_partition *
mbr_findslice __P((struct mbr_partition* dp, struct buf *bp));
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
-
- /* Nothing to do. */
-}
-
/*
Home |
Main Index |
Thread Index |
Old Index