Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/luna68k Nuke isbad(), and fix typos.



details:   https://anonhg.NetBSD.org/src/rev/4d423f7cd5ef
branches:  trunk
changeset: 481395:4d423f7cd5ef
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Fri Jan 28 02:25:24 2000 +0000

description:
Nuke isbad(), and fix typos.

diffstat:

 sys/arch/luna68k/include/disklabel.h |   8 +-------
 sys/arch/luna68k/luna68k/disksubr.c  |  33 +++------------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

diffs (78 lines):

diff -r c5754cef6e25 -r 4d423f7cd5ef sys/arch/luna68k/include/disklabel.h
--- a/sys/arch/luna68k/include/disklabel.h      Fri Jan 28 01:55:27 2000 +0000
+++ b/sys/arch/luna68k/include/disklabel.h      Fri Jan 28 02:25:24 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.1 2000/01/05 08:48:57 nisimura Exp $   */
+/*     $NetBSD: disklabel.h,v 1.2 2000/01/28 02:25:24 nisimura Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -48,10 +48,4 @@
        char    cd_block[512];
 };
 
-#ifdef _KERNEL
-
-struct dkbad;
-int isbad __P((struct dkbad *bt, int, int, int));
-
-#endif /* _KERNEL */
 #endif /* _MACHINE_DISKLABEL_H_ */
diff -r c5754cef6e25 -r 4d423f7cd5ef sys/arch/luna68k/luna68k/disksubr.c
--- a/sys/arch/luna68k/luna68k/disksubr.c       Fri Jan 28 01:55:27 2000 +0000
+++ b/sys/arch/luna68k/luna68k/disksubr.c       Fri Jan 28 02:25:24 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.4 2000/01/25 00:19:30 nisimura Exp $ */
+/* $NetBSD: disksubr.c,v 1.5 2000/01/28 02:25:25 nisimura Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -73,7 +73,7 @@
  *     magic           2                       2
  *     cksum           2                       2
  *
- * Magic number value and checksum calculation are identical.  Subtil
+ * Magic number value and checksum calculation are identical.  Subtle
  * difference is partition start address; UniOS/ISI maintains sector
  * numbers while SunOS label has cylinder number.
  *
@@ -84,7 +84,7 @@
  * writedisklabel fails when no BSD label is found.
  *
  * NetBSD/luna68k (1) creates UniOS/ISI label with BSD label
- * embedded at offset 64, (2) reads BSD label if found, (2) falls
+ * embedded at offset 64, (2) reads BSD label if found, (3) falls
  * back to reading UniOS/ISI label when no BSD label is found.  Plus,
  * (4) reads SunOS label if found in place of UniOS/ISI label.
  */
@@ -502,30 +502,3 @@
 
        return (0);
 }
-
-#if 0
-/*
- * Search the bad sector table looking for the specified sector.
- * Return index if found.
- * Return -1 if not found.
- */
-int
-isbad(bt, cyl, trk, sec)
-       register struct dkbad *bt;
-       int cyl, trk, sec;
-{
-       register int i;
-       register long blk, bblk;
-
-       blk = ((long)cyl << 16) + (trk << 8) + sec;
-       for (i = 0; i < 126; 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



Home | Main Index | Thread Index | Old Index