summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-09-21 21:08:36 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-09-21 21:08:36 +0000
commitce8ddd13a6c22a6c119b6211e01e7e967600b9d8 (patch)
tree771fb4ccf1c4197f7cb79fd790279617111861da /sys/arch/mvme68k
parent11ab7938f44b7fe2122946c683cfb8845448d61a (diff)
isbad() is only used on SMD disks on sparc; remove it on other platforms.
Diffstat (limited to 'sys/arch/mvme68k')
-rw-r--r--sys/arch/mvme68k/conf/files.mvme68k3
-rw-r--r--sys/arch/mvme68k/mvme68k/dkbad.c64
2 files changed, 1 insertions, 66 deletions
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index b39a66c22fc..b9b3500e9c9 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-# $OpenBSD: files.mvme68k,v 1.26 2005/03/08 20:00:23 tdeval Exp $
+# $OpenBSD: files.mvme68k,v 1.27 2005/09/21 21:08:34 miod Exp $
# config file for mvme68k
@@ -114,7 +114,6 @@ major {rd = 9}
file arch/mvme68k/mvme68k/autoconf.c
file arch/mvme68k/mvme68k/conf.c
file arch/mvme68k/mvme68k/disksubr.c
-file arch/mvme68k/mvme68k/dkbad.c
file arch/mvme68k/mvme68k/machdep.c
file arch/mvme68k/mvme68k/mem.c
file arch/m68k/m68k/pmap_motorola.c
diff --git a/sys/arch/mvme68k/mvme68k/dkbad.c b/sys/arch/mvme68k/mvme68k/dkbad.c
deleted file mode 100644
index 70cdbccb636..00000000000
--- a/sys/arch/mvme68k/mvme68k/dkbad.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $OpenBSD: dkbad.c,v 1.7 2003/06/02 23:27:51 millert Exp $ */
-
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)dkbad.c 8.2 (Berkeley) 1/12/94
- */
-
-#ifndef NOBADSECT
-#include <sys/param.h>
-#include <sys/buf.h>
-#include <sys/dkbad.h>
-
-/*
- * Search the bad sector table looking for
- * the specified sector. Return index if found.
- * Return -1 if not found.
- */
-int isbad(struct dkbad *, int, int, int);
-
-int
-isbad(bt, cyl, trk, sec)
- struct dkbad *bt;
- int cyl, trk, sec;
-{
- int i;
- long blk, bblk;
-
- blk = ((long)cyl << 16) + (trk << 8) + sec;
- for (i = 0; i < NBT_BAD; i++) {
- bblk = ((long)bt->bt_bad[i].bt_cyl << 16) + bt->bt_bad[i].bt_trksec;
- if (blk == bblk)
- return (i);
- if (blk < bblk || bblk < 0)
- break;
- }
- return (-1);
-}
-#endif