projects / unix-history / commitdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 565ce12)
NOBADBLOCK->NOBADSECT
authorBill Joy <root@ucbvax.Berkeley.EDU>
Mon, 11 May 1981 11:05:08 +0000 (03:05 -0800)
committerBill Joy <root@ucbvax.Berkeley.EDU>
Mon, 11 May 1981 11:05:08 +0000 (03:05 -0800)
SCCS-vsn: sys/vax/vax/dkbad.c 4.3
SCCS-vsn: sys/vax/mba/hp.c 4.38
SCCS-vsn: sys/vax/uba/rk.c 4.35

usr/src/sys/vax/mba/hp.c patch | blob | blame | history
usr/src/sys/vax/uba/rk.c patch | blob | blame | history
usr/src/sys/vax/vax/dkbad.c patch | blob | blame | history

diff --git a/usr/src/sys/vax/mba/hp.c b/usr/src/sys/vax/mba/hp.c
index 280424c..907d854 100644 (file)
--- a/usr/src/sys/vax/mba/hp.c
+++ b/usr/src/sys/vax/mba/hp.c
@@ -1,4 +1,4 @@
-/*     hp.c    4.37    81/05/09        */
+/*     hp.c    4.38    81/05/10        */
 
 #ifdef HPDEBUG
 int    hpdebug;
 
 #ifdef HPDEBUG
 int    hpdebug;
@@ -48,7 +48,7 @@ struct        size {
        0,      0,
        0,      0,
        0,      0,
        0,      0,
        0,      0,
        0,      0,
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
        291302, 118,            /* G=cyl 118 thru 814 */
 #else
        291346, 118,
        291302, 118,            /* G=cyl 118 thru 814 */
 #else
        291346, 118,
@@ -61,7 +61,7 @@ struct        size {
        0,      0,
        0,      0,
        0,      0,
        0,      0,
        0,      0,
        0,      0,
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
        82016,  310,            /* G=cyl 310 thru 822 */
 #else
        82080,  310,
        82016,  310,            /* G=cyl 310 thru 822 */
 #else
        82080,  310,
@@ -73,7 +73,7 @@ struct        size {
        500384, 0,              /* C=cyl 0 thru 822 */
        15884,  562,            /* D=cyl 562 thru 588 */
        55936,  589,            /* E=cyl 589 thru 680 */
        500384, 0,              /* C=cyl 0 thru 822 */
        15884,  562,            /* D=cyl 562 thru 588 */
        55936,  589,            /* E=cyl 589 thru 680 */
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
        86572,  681,            /* F=cyl 681 thru 822 */
        158624, 562,            /* G=cyl 562 thru 822 */
 #else
        86572,  681,            /* F=cyl 681 thru 822 */
        158624, 562,            /* G=cyl 562 thru 822 */
 #else
@@ -139,7 +139,7 @@ u_char      hp_offset[16] = {
 };
 
 struct buf     rhpbuf[NHP];
 };
 
 struct buf     rhpbuf[NHP];
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
 struct buf     bhpbuf[NHP];
 struct dkbad   hpbad[NHP];
 #endif
 struct buf     bhpbuf[NHP];
 struct dkbad   hpbad[NHP];
 #endif
@@ -212,7 +212,7 @@ hpustart(mi)
        if ((hpaddr->hpcs1&HP_DVA) == 0)
                return (MBU_BUSY);
        if ((hpaddr->hpds & HPDS_VV) == 0 || hpinit[mi->mi_unit] == 0) {
        if ((hpaddr->hpcs1&HP_DVA) == 0)
                return (MBU_BUSY);
        if ((hpaddr->hpds & HPDS_VV) == 0 || hpinit[mi->mi_unit] == 0) {
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
                struct buf *bbp = &bhpbuf[mi->mi_unit];
 #endif
 
                struct buf *bbp = &bhpbuf[mi->mi_unit];
 #endif
 
@@ -223,7 +223,7 @@ hpustart(mi)
                hpaddr->hpcs1 = HP_PRESET|HP_GO;
                hpaddr->hpof = HPOF_FMT22;
                mbclrattn(mi);
                hpaddr->hpcs1 = HP_PRESET|HP_GO;
                hpaddr->hpof = HPOF_FMT22;
                mbclrattn(mi);
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
                bbp->b_flags = B_READ|B_BUSY;
                bbp->b_dev = bp->b_dev;
                bbp->b_bcount = 512;
                bbp->b_flags = B_READ|B_BUSY;
                bbp->b_dev = bp->b_dev;
                bbp->b_bcount = 512;
@@ -287,7 +287,7 @@ hpdtint(mi, mbsr)
        register struct buf *bp = mi->mi_tab.b_actf;
        int retry = 0;
 
        register struct buf *bp = mi->mi_tab.b_actf;
        int retry = 0;
 
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
        if (bp->b_flags&B_BAD) {
                if (hpecc(mi, CONT))
                        return(MBD_RESTARTED);
        if (bp->b_flags&B_BAD) {
                if (hpecc(mi, CONT))
                        return(MBD_RESTARTED);
@@ -332,7 +332,7 @@ hard:
                        bp->b_flags |= B_ERROR;
                        hprecal[mi->mi_unit] = 0;
                } else if (hpaddr->hper2 & HPER2_BSE) {
                        bp->b_flags |= B_ERROR;
                        hprecal[mi->mi_unit] = 0;
                } else if (hpaddr->hper2 & HPER2_BSE) {
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
                        if (hpecc(mi, BSE))
                                return(MBD_RESTARTED);
                        else
                        if (hpecc(mi, BSE))
                                return(MBD_RESTARTED);
                        else
@@ -441,7 +441,7 @@ hpecc(mi, flag)
        bcr = mbp->mba_bcr & 0xffff;
        if (bcr)
                bcr |= 0xffff0000;              /* sxt */
        bcr = mbp->mba_bcr & 0xffff;
        if (bcr)
                bcr |= 0xffff0000;              /* sxt */
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
        if (flag == CONT)
                npf = bp->b_error;
        else
        if (flag == CONT)
                npf = bp->b_error;
        else
@@ -489,7 +489,7 @@ hpecc(mi, flag)
                mbp->mba_bcr = -(bp->b_bcount - (int)ptob(npf));
                break;
 
                mbp->mba_bcr = -(bp->b_bcount - (int)ptob(npf));
                break;
 
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
        case BSE:
 #ifdef HPBDEBUG
                if (hpbdebug)
        case BSE:
 #ifdef HPBDEBUG
                if (hpbdebug)
diff --git a/usr/src/sys/vax/uba/rk.c b/usr/src/sys/vax/uba/rk.c
index ede5308..607226c 100644 (file)
--- a/usr/src/sys/vax/uba/rk.c
+++ b/usr/src/sys/vax/uba/rk.c
@@ -1,4 +1,4 @@
-/*     rk.c    4.34    81/05/09        */
+/*     rk.c    4.35    81/05/10        */
 
 #include "rk.h"
 #if NHK > 0
 
 #include "rk.h"
 #if NHK > 0
@@ -80,7 +80,7 @@ struct        uba_driver hkdriver =
  { rkprobe, rkslave, rkattach, rkdgo, rkstd, "rk", rkdinfo, "hk", rkminfo, 1 };
 struct buf rkutab[NRK];
 short  rkcyl[NRK];
  { rkprobe, rkslave, rkattach, rkdgo, rkstd, "rk", rkdinfo, "hk", rkminfo, 1 };
 struct buf rkutab[NRK];
 short  rkcyl[NRK];
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
 struct dkbad rkbad[NRK];
 struct buf brkbuf[NRK];
 #endif
 struct dkbad rkbad[NRK];
 struct buf brkbuf[NRK];
 #endif
@@ -233,14 +233,14 @@ rkustart(ui)
        }
        if ((rkaddr->rkds & RKDS_VV) == 0 || ui->ui_flags == 0) {
                /* SHOULD WARN SYSTEM THAT THIS HAPPENED */
        }
        if ((rkaddr->rkds & RKDS_VV) == 0 || ui->ui_flags == 0) {
                /* SHOULD WARN SYSTEM THAT THIS HAPPENED */
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
                struct rkst *st = &rkst[ui->ui_type];
                struct buf *bbp = &brkbuf[ui->ui_unit];
 #endif
 
                rkaddr->rkcs1 = rktypes[ui->ui_type]|RK_PACK|RK_GO;
                ui->ui_flags = 1;
                struct rkst *st = &rkst[ui->ui_type];
                struct buf *bbp = &brkbuf[ui->ui_unit];
 #endif
 
                rkaddr->rkcs1 = rktypes[ui->ui_type]|RK_PACK|RK_GO;
                ui->ui_flags = 1;
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
                bbp->b_flags = B_READ|B_BUSY;
                bbp->b_dev = bp->b_dev;
                bbp->b_bcount = 512;
                bbp->b_flags = B_READ|B_BUSY;
                bbp->b_dev = bp->b_dev;
                bbp->b_bcount = 512;
@@ -383,7 +383,7 @@ rkintr(rk11)
                bp = dp->b_actf;
                ui = rkdinfo[dkunit(bp)];
                dk_busy &= ~(1 << ui->ui_dk);
                bp = dp->b_actf;
                ui = rkdinfo[dkunit(bp)];
                dk_busy &= ~(1 << ui->ui_dk);
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
                if (bp->b_flags&B_BAD)
                        if (rkecc(ui, CONT))
                                return;
                if (bp->b_flags&B_BAD)
                        if (rkecc(ui, CONT))
                                return;
@@ -413,7 +413,7 @@ hard:
                                bp->b_flags |= B_ERROR;
                                sc->sc_recal = 0;
                        } else if (er & RKER_BSE) {
                                bp->b_flags |= B_ERROR;
                                sc->sc_recal = 0;
                        } else if (er & RKER_BSE) {
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
                                if (rkecc(ui, BSE))
                                        return;
                                else
                                if (rkecc(ui, BSE))
                                        return;
                                else
@@ -548,7 +548,7 @@ rkecc(ui, flag)
        int reg, npf, o, cmd, ubaddr;
        int bn, cn, tn, sn;
 
        int reg, npf, o, cmd, ubaddr;
        int bn, cn, tn, sn;
 
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
        if (flag == CONT)
                npf = bp->b_error;
        else
        if (flag == CONT)
                npf = bp->b_error;
        else
@@ -596,7 +596,7 @@ rkecc(ui, flag)
                break;
                }
 
                break;
                }
 
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
        case BSE:
 #ifdef RKBDEBUG
                if (rkbdebug)
        case BSE:
 #ifdef RKBDEBUG
                if (rkbdebug)
diff --git a/usr/src/sys/vax/vax/dkbad.c b/usr/src/sys/vax/vax/dkbad.c
index 8747a15..0c01bad 100644 (file)
--- a/usr/src/sys/vax/vax/dkbad.c
+++ b/usr/src/sys/vax/vax/dkbad.c
@@ -1,13 +1,13 @@
-/*     dkbad.c 4.2     81/05/09        */
+/*     dkbad.c 4.3     81/05/10        */
 
 
-#ifndef NOBADBLOCK
+#ifndef NOBADSECT
 #include "../h/param.h"
 #include "../h/buf.h"
 #include "../h/dkbad.h"
 
 /*
 #include "../h/param.h"
 #include "../h/buf.h"
 #include "../h/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,10 +17,6 @@ isbad(bt, cyl, trk, sec)
        register int i;
        register long blk, bblk;
 
        register int i;
        register long blk, bblk;
 
-#ifdef BADMAGIC
-       if (bt->bt_magic != BADMAGIC)
-               return (-1);
-#endif
        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;
        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;
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.