BSD 4_4 release

[unix-history] / usr / src / sys / vax / vax / dkbad.c

diff --git a/usr/src/sys/vax/vax/dkbad.c b/usr/src/sys/vax/vax/dkbad.c
index 5403ee7..6df9ddf 100644 (file)
--- a/usr/src/sys/vax/vax/dkbad.c
+++ b/usr/src/sys/vax/vax/dkbad.c
@@ -1,13 +1,46 @@
-/*     dkbad.c 4.1     81/05/08        */
+/*-
+ * Copyright (c) 1982, 1986 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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     7.3 (Berkeley) 5/9/91
+ */

 
 

-#ifdef DKBAD
-#include "../h/param.h"
-#include "../h/buf.h"
-#include "../h/dkbad.h"
+#ifndef NOBADSECT
+#include "sys/param.h"
+#include "sys/buf.h"
+#include "sys/dkbad.h"

 
 /*
 
 /*

- * Search the bad block table looking for
- * the specified block.  Return index if found.
+ * Search the bad sector table looking for
+ * the specified sector.  Return index if found.

  * Return -1 if not found.
  */
 
  * Return -1 if not found.
  */
 


@@ -17,16 +50,14 @@ isbad(bt, cyl, trk, sec)
        register int i;
        register long blk, bblk;
 
        register int i;
        register long blk, bblk;
 

-       if (bt->bt_magic != BADMAGIC)
-               return(-1);

        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)
        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);
+                       return (i);

                if (blk < bblk || bblk < 0)
                        break;
        }
                if (blk < bblk || bblk < 0)
                        break;
        }

-       return(-1);
+       return (-1);

 }
 #endif
 }
 #endif