everybody has space reserved for bad sectors

SCCS-vsn: sys/vax/uba/up.c 4.66

diff --git a/usr/src/sys/vax/uba/up.c b/usr/src/sys/vax/uba/up.c
index 08a7413..e534cd7 100644 (file)
--- a/usr/src/sys/vax/uba/up.c
+++ b/usr/src/sys/vax/uba/up.c
@@ -1,4 +1,4 @@
-/*     up.c    4.65    82/12/17        */
+/*     up.c    4.66    83/02/10        */

 
 #include "up.h"
 #if NSC > 0
 
 #include "up.h"
 #if NSC > 0


@@ -40,31 +40,21 @@ struct      up_softc {
 } up_softc[NSC];
 
 /* THIS SHOULD BE READ OFF THE PACK, PER DRIVE */
 } up_softc[NSC];
 
 /* THIS SHOULD BE READ OFF THE PACK, PER DRIVE */

-struct size
-{
+struct size {

        daddr_t nblocks;
        int     cyloff;
 } up_sizes[8] = {
        daddr_t nblocks;
        int     cyloff;
 } up_sizes[8] = {

-#ifdef ERNIE
-       49324,  0,              /* A=cyl 0 thru 26 */
-#else

 #ifdef ERNIE
        49324,  0,              /* A=cyl 0 thru 26 */
 #else
        15884,  0,              /* A=cyl 0 thru 26 */
 #ifdef ERNIE
        49324,  0,              /* A=cyl 0 thru 26 */
 #else
        15884,  0,              /* A=cyl 0 thru 26 */

-#endif

 #endif
        33440,  27,             /* B=cyl 27 thru 81 */
        495520, 0,              /* C=cyl 0 thru 814 */
        15884,  562,            /* D=cyl 562 thru 588 */
        55936,  589,            /* E=cyl 589 thru 680 */
 #endif
        33440,  27,             /* B=cyl 27 thru 81 */
        495520, 0,              /* C=cyl 0 thru 814 */
        15884,  562,            /* D=cyl 562 thru 588 */
        55936,  589,            /* E=cyl 589 thru 680 */

-#ifndef NOBADSECT

        81376,  681,            /* F=cyl 681 thru 814 */
        153728, 562,            /* G=cyl 562 thru 814 */
        81376,  681,            /* F=cyl 681 thru 814 */
        153728, 562,            /* G=cyl 562 thru 814 */

-#else
-       81472,  681,
-       153824, 562,
-#endif

        291346, 82,             /* H=cyl 82 thru 561 */
 }, fj_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 49 */
        291346, 82,             /* H=cyl 82 thru 561 */
 }, fj_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 49 */


@@ -74,11 +64,7 @@ struct       size
        0,      0,
        0,      0,
        0,      0,
        0,      0,
        0,      0,
        0,      0,

-#ifndef NOBADSECT

        213664, 155,            /* H=cyl 155 thru 822 */
        213664, 155,            /* H=cyl 155 thru 822 */

-#else
-       213760, 155,
-#endif

 }, upam_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 31 */
        33440,  32,             /* B=cyl 32 thru 97 */
 }, upam_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 31 */
        33440,  32,             /* B=cyl 32 thru 97 */


@@ -135,10 +121,8 @@ u_char     up_offset[16] = {
 };
 
 struct buf     rupbuf[NUP];
 };
 
 struct buf     rupbuf[NUP];

-#ifndef NOBADSECT

 struct         buf     bupbuf[NUP];
 struct dkbad   upbad[NUP];
 struct         buf     bupbuf[NUP];
 struct dkbad   upbad[NUP];

-#endif

 #ifndef NOBADSECT
 struct         buf     bupbuf[NUP];
 struct dkbad   upbad[NUP];
 #ifndef NOBADSECT
 struct         buf     bupbuf[NUP];
 struct dkbad   upbad[NUP];


@@ -330,7 +314,6 @@ upustart(ui)
                upaddr->upcs1 = UP_IE|UP_PRESET|UP_GO;
                upaddr->upof = UPOF_FMT22;
                didie = 1;
                upaddr->upcs1 = UP_IE|UP_PRESET|UP_GO;
                upaddr->upof = UPOF_FMT22;
                didie = 1;

-#ifndef NOBADSECT

                st = &upst[ui->ui_type];
                bbp->b_flags = B_READ|B_BUSY;
                bbp->b_dev = bp->b_dev;
                st = &upst[ui->ui_type];
                bbp->b_flags = B_READ|B_BUSY;
                bbp->b_dev = bp->b_dev;


@@ -341,7 +324,6 @@ upustart(ui)
                dp->b_actf = bbp;
                bbp->av_forw = bp;
                bp = bbp;
                dp->b_actf = bbp;
                bbp->av_forw = bp;
                bp = bbp;

-#endif

 #ifndef NOBADSECT
                st = &upst[ui->ui_type];
                bbp->b_flags = B_READ|B_BUSY;
 #ifndef NOBADSECT
                st = &upst[ui->ui_type];
                bbp->b_flags = B_READ|B_BUSY;


@@ -561,12 +543,10 @@ upintr(sc21)
        dk_busy &= ~(1 << ui->ui_dk);
        if ((upaddr->upcs2&07) != ui->ui_slave)
                upaddr->upcs2 = ui->ui_slave;
        dk_busy &= ~(1 << ui->ui_dk);
        if ((upaddr->upcs2&07) != ui->ui_slave)
                upaddr->upcs2 = ui->ui_slave;

-#ifndef NOBADSECT

        if (bp->b_flags&B_BAD) {
                if (upecc(ui, CONT))
                        return;
        }
        if (bp->b_flags&B_BAD) {
                if (upecc(ui, CONT))
                        return;
        }

-#endif

 #ifndef NOBADSECT
        if (bp->b_flags&B_BAD) {
                if (upecc(ui, CONT))
 #ifndef NOBADSECT
        if (bp->b_flags&B_BAD) {
                if (upecc(ui, CONT))


@@ -607,11 +587,9 @@ upintr(sc21)
                                upaddr->uper2, UPER2_BITS);
                        bp->b_flags |= B_ERROR;
                } else if (upaddr->uper2 & UPER2_BSE) {
                                upaddr->uper2, UPER2_BITS);
                        bp->b_flags |= B_ERROR;
                } else if (upaddr->uper2 & UPER2_BSE) {

-#ifndef NOBADSECT

                        if (upecc(ui, BSE))
                                return;
                        else
                        if (upecc(ui, BSE))
                                return;
                        else

-#endif

                                goto hard;
                } else if (upaddr->uper2 & UPER2_BSE) {
 #ifndef NOBADSECT
                                goto hard;
                } else if (upaddr->uper2 & UPER2_BSE) {
 #ifndef NOBADSECT