use shorts to move data

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

diff --git a/usr/src/sys/vax/mba/ht.c b/usr/src/sys/vax/mba/ht.c
index b23e795..7cd25ba 100644 (file)
--- a/usr/src/sys/vax/mba/ht.c
+++ b/usr/src/sys/vax/mba/ht.c
@@ -1,7 +1,15 @@
-#include "ht.h"
+/*     ht.c    4.22    82/05/12        */
+
+#include "tu.h"

 #if NHT > 0
 /*
  * TM03/TU?? tape driver
 #if NHT > 0
 /*
  * TM03/TU?? tape driver

+ *
+ * TODO:
+ *     cleanup messages on errors
+ *     test ioctl's
+ *     see how many rewind interrups we get if we kick when not at BOT
+ *     fixup rle error on block tape code

  */
 #include "../h/param.h"
 #include "../h/systm.h"
  */
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -12,10 +20,12 @@
 #include "../h/user.h"
 #include "../h/map.h"
 #include "../h/pte.h"
 #include "../h/user.h"
 #include "../h/map.h"
 #include "../h/pte.h"

-#include "../h/mba.h"
+#include "../h/mbareg.h"
+#include "../h/mbavar.h"

 #include "../h/mtio.h"
 #include "../h/ioctl.h"
 #include "../h/cmap.h"
 #include "../h/mtio.h"
 #include "../h/ioctl.h"
 #include "../h/cmap.h"

+#include "../h/cpu.h"

 
 #include "../h/htreg.h"
 
 
 #include "../h/htreg.h"
 


@@ -23,22 +33,25 @@ struct      buf     rhtbuf[NHT];
 struct buf     chtbuf[NHT];
 
 short  httypes[] =
 struct buf     chtbuf[NHT];
 
 short  httypes[] =

-       { MBDT_TE16, MBDT_TU45, MBDT_TU77, 0 };
-struct mba_info *htinfo[NHT];
-int    htdkinit(), htustart(), htndtint(), htdtint();
+       { MBDT_TM03, MBDT_TE16, MBDT_TU45, MBDT_TU77, 0 };
+struct mba_device *htinfo[NHT];
+int    htattach(), htslave(), htustart(), htndtint(), htdtint();

 struct mba_driver htdriver =
 struct mba_driver htdriver =

-       { htdkinit, htustart, 0, htdtint, htndtint, httypes, htinfo };
+    { htattach, htslave, htustart, 0, htdtint, htndtint,
+      httypes, "ht", "tu", htinfo };

 
 #define MASKREG(r)     ((r) & 0xffff)
 
 /* bits in minor device */
 
 #define MASKREG(r)     ((r) & 0xffff)
 
 /* bits in minor device */

-#define HTUNIT(dev)    (minor(dev)&03)
+#define        TUUNIT(dev)     (minor(dev)&03)

 #define        H_NOREWIND      04
 #define        H_1600BPI       08
 
 #define        H_NOREWIND      04
 #define        H_1600BPI       08
 

+#define HTUNIT(dev)    (tutoht[TUUNIT(dev)])
+

 #define        INF     (daddr_t)1000000L       /* a block number that wont exist */
 
 #define        INF     (daddr_t)1000000L       /* a block number that wont exist */
 

-struct ht_softc {
+struct tu_softc {

        char    sc_openf;
        char    sc_flags;
        daddr_t sc_blkno;
        char    sc_openf;
        char    sc_flags;
        daddr_t sc_blkno;


@@ -47,7 +60,10 @@ struct       ht_softc {
        u_short sc_dsreg;
        short   sc_resid;
        short   sc_dens;
        u_short sc_dsreg;
        short   sc_resid;
        short   sc_dens;

-} ht_softc[NHT];
+       struct  mba_device *sc_mi;
+       int     sc_slave;
+} tu_softc[NTU];
+short  tutoht[NTU];

 
 /*
  * Bits for sc_flags.
 
 /*
  * Bits for sc_flags.


@@ -56,52 +72,82 @@ struct      ht_softc {
 #define H_ERASED  2    /* last write retry was an erase gap */
 #define H_REWIND  4    /* last unit start was a rewind */
 
 #define H_ERASED  2    /* last write retry was an erase gap */
 #define H_REWIND  4    /* last unit start was a rewind */
 

+char   hter_bits[] = HTER_BITS;
+char   htds_bits[] = HTDS_BITS;
+

 /*ARGSUSED*/
 /*ARGSUSED*/

-htdkinit(mi)
-       struct mba_info *mi;
+htattach(mi)
+       struct mba_device *mi;

 {
 
 }
 
 {
 
 }
 

+htslave(mi, ms)
+       struct mba_device *mi;
+       struct mba_slave *ms;
+{
+       register struct tu_softc *sc = &tu_softc[ms->ms_unit];
+       register struct htdevice *htaddr = (struct htdevice *)mi->mi_drv;
+
+       htaddr->httc = ms->ms_slave;
+       if (htaddr->htdt & HTDT_SPR) {
+               sc->sc_mi = mi;
+               sc->sc_slave = ms->ms_slave;
+               tutoht[ms->ms_unit] = mi->mi_unit;
+               return (1);
+       } else
+               return (0);
+}
+

 htopen(dev, flag)
        dev_t dev;
        int flag;
 {
 htopen(dev, flag)
        dev_t dev;
        int flag;
 {

-       register int unit;
-       register struct mba_info *mi;
-       register struct ht_softc *sc;
-
-       unit = HTUNIT(dev);
-       if (unit >= NHT || (sc = &ht_softc[unit])->sc_openf ||
-           (mi = htinfo[unit]) == 0 || mi->mi_alive == 0) {
+       register int tuunit;
+       register struct mba_device *mi;
+       register struct tu_softc *sc;
+       int olddens, dens;
+
+       tuunit = TUUNIT(dev);
+       if (tuunit >= NTU || (sc = &tu_softc[tuunit])->sc_openf ||
+           (mi = htinfo[HTUNIT(dev)]) == 0 || mi->mi_alive == 0) {

                u.u_error = ENXIO;
                return;
        }
                u.u_error = ENXIO;
                return;
        }

-       /*
-        * The NOP below serves two purposes:
-        * 1. To get a recent copy of the status registers.
-        * 2. To ensure that any outstanding rewinds are truly finished
-        */
+       olddens = sc->sc_dens;
+       dens = sc->sc_dens =
+           ((minor(dev)&H_1600BPI)?HTTC_1600BPI:HTTC_800BPI)|
+               HTTC_PDP11|sc->sc_slave;

        htcommand(dev, HT_SENSE, 1);
        htcommand(dev, HT_SENSE, 1);

-       if ((sc->sc_dsreg & HTDS_MOL) == 0 || 
-          (flag & (FREAD|FWRITE)) == FWRITE && sc->sc_dsreg&HTDS_WRL) {
+       sc->sc_dens = olddens;
+       if ((sc->sc_dsreg & HTDS_MOL) == 0) {
+               uprintf("tu%d: not online\n", tuunit);
+               u.u_error = EIO;
+               return;
+       }
+       if ((flag&FWRITE) && (sc->sc_dsreg&HTDS_WRL)) {
+               uprintf("tu%d: no write ring\n", tuunit);
+               u.u_error = EIO;
+               return;
+       }
+       if ((sc->sc_dsreg & HTDS_BOT) == 0 && (flag&FWRITE) &&
+           dens != sc->sc_dens) {
+               uprintf("tu%d: can't change density in mid-tape\n", tuunit);

                u.u_error = EIO;
                return;
        }
                u.u_error = EIO;
                return;
        }

-       sc->sc_dens =
-           ((minor(dev)&H_1600BPI)?HTTC_1600BPI:HTTC_800BPI)|HTTC_PDP11|mi->mi_slave;
-       printf("dens %o\n", sc->sc_dens);

        sc->sc_openf = 1;
        sc->sc_blkno = (daddr_t)0;
        sc->sc_nxrec = INF;
        sc->sc_flags = 0;
        sc->sc_openf = 1;
        sc->sc_blkno = (daddr_t)0;
        sc->sc_nxrec = INF;
        sc->sc_flags = 0;

+       sc->sc_dens = dens;

 }
 
 htclose(dev, flag)
        register dev_t dev;
        register flag;
 {
 }
 
 htclose(dev, flag)
        register dev_t dev;
        register flag;
 {

-       register struct ht_softc *sc = &ht_softc[HTUNIT(dev)];
+       register struct tu_softc *sc = &tu_softc[TUUNIT(dev)];

 
        if (flag == FWRITE || ((flag&FWRITE) && (sc->sc_flags&H_WRITTEN))) {
                htcommand(dev, HT_WEOF, 1);
 
        if (flag == FWRITE || ((flag&FWRITE) && (sc->sc_flags&H_WRITTEN))) {
                htcommand(dev, HT_WEOF, 1);


@@ -109,30 +155,27 @@ htclose(dev, flag)
                htcommand(dev, HT_SREV, 1);
        }
        if ((minor(dev)&H_NOREWIND) == 0)
                htcommand(dev, HT_SREV, 1);
        }
        if ((minor(dev)&H_NOREWIND) == 0)

-               /* 0 as third arg means don't wait */

                htcommand(dev, HT_REW, 0);
        sc->sc_openf = 0;
 }
 
                htcommand(dev, HT_REW, 0);
        sc->sc_openf = 0;
 }
 

-/*
- * Do a non-data-transfer command.
- *
- * N.B.: Count should be zero ONLY for rewind during close.
- */

 htcommand(dev, com, count)
        dev_t dev;
        int com, count;
 {
        register struct buf *bp;
 htcommand(dev, com, count)
        dev_t dev;
        int com, count;
 {
        register struct buf *bp;

+       register int s;

 
        bp = &chtbuf[HTUNIT(dev)];
 
        bp = &chtbuf[HTUNIT(dev)];

-       (void) spl5();
+       s = spl5();

        while (bp->b_flags&B_BUSY) {
        while (bp->b_flags&B_BUSY) {

+               if(bp->b_repcnt == 0 && (bp->b_flags&B_DONE))
+                       break;

                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO);
        }
        bp->b_flags = B_BUSY|B_READ;
                bp->b_flags |= B_WANTED;
                sleep((caddr_t)bp, PRIBIO);
        }
        bp->b_flags = B_BUSY|B_READ;

-       (void) spl0();
+       splx(s);

        bp->b_dev = dev;
        bp->b_command = com;
        bp->b_repcnt = count;
        bp->b_dev = dev;
        bp->b_command = com;
        bp->b_repcnt = count;


@@ -149,14 +192,13 @@ htcommand(dev, com, count)
 htstrategy(bp)
        register struct buf *bp;
 {
 htstrategy(bp)
        register struct buf *bp;
 {

-       register int unit = HTUNIT(bp->b_dev);
-       register struct mba_info *mi = htinfo[unit];
+       register struct mba_device *mi = htinfo[HTUNIT(bp->b_dev)];

        register struct buf *dp;
        register struct buf *dp;

-       register struct ht_softc *sc = &ht_softc[unit];
+       register int s;

 
        bp->av_forw = NULL;
        dp = &mi->mi_tab;
 
        bp->av_forw = NULL;
        dp = &mi->mi_tab;

-       (void) spl5();
+       s = spl5();

        if (dp->b_actf == NULL)
                dp->b_actf = bp;
        else
        if (dp->b_actf == NULL)
                dp->b_actf = bp;
        else


@@ -164,20 +206,23 @@ htstrategy(bp)
        dp->b_actl = bp;
        if (dp->b_active == 0)
                mbustart(mi);
        dp->b_actl = bp;
        if (dp->b_active == 0)
                mbustart(mi);

-       (void) spl0();
+       splx(s);

 }
 
 htustart(mi)
 }
 
 htustart(mi)

-       register struct mba_info *mi;
+       register struct mba_device *mi;

 {
        register struct htdevice *htaddr =
            (struct htdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
 {
        register struct htdevice *htaddr =
            (struct htdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;

-       int unit = HTUNIT(bp->b_dev);
-       register struct ht_softc *sc = &ht_softc[unit];
+       register struct tu_softc *sc = &tu_softc[TUUNIT(bp->b_dev)];

        daddr_t blkno;
 
        htaddr->httc = sc->sc_dens;
        daddr_t blkno;
 
        htaddr->httc = sc->sc_dens;

+       if (bp == &chtbuf[HTUNIT(bp->b_dev)] && bp->b_command == HT_SENSE) {
+               htaddr->htcs1 = HT_SENSE|HT_GO;
+               mbclrattn(mi);
+       }

        sc->sc_dsreg = htaddr->htds;
        sc->sc_erreg = htaddr->hter;
        sc->sc_resid = htaddr->htfc;
        sc->sc_dsreg = htaddr->htds;
        sc->sc_erreg = htaddr->hter;
        sc->sc_resid = htaddr->htfc;


@@ -189,44 +234,44 @@ htustart(mi)
                bp->b_flags |= B_ERROR;
                return (MBU_NEXT);
        }
                bp->b_flags |= B_ERROR;
                return (MBU_NEXT);
        }

-       if (bp != &chtbuf[unit]) {
+       if (bp != &chtbuf[HTUNIT(bp->b_dev)]) {

                if (dbtofsb(bp->b_blkno) > sc->sc_nxrec) {
                        bp->b_flags |= B_ERROR;
                        bp->b_error = ENXIO;
                if (dbtofsb(bp->b_blkno) > sc->sc_nxrec) {
                        bp->b_flags |= B_ERROR;
                        bp->b_error = ENXIO;

-                       goto next;
-               } else if (dbtofsb(bp->b_blkno) == sc->sc_nxrec &&
+                       return (MBU_NEXT);
+               }
+               if (dbtofsb(bp->b_blkno) == sc->sc_nxrec &&

                    bp->b_flags&B_READ) {
                        bp->b_resid = bp->b_bcount;
                        clrbuf(bp);
                    bp->b_flags&B_READ) {
                        bp->b_resid = bp->b_bcount;
                        clrbuf(bp);

-                       goto next;
-               } else if ((bp->b_flags&B_READ)==0)
+                       return (MBU_NEXT);
+               }
+               if ((bp->b_flags&B_READ)==0)

                        sc->sc_nxrec = dbtofsb(bp->b_blkno) + 1;
        } else {
                        sc->sc_nxrec = dbtofsb(bp->b_blkno) + 1;
        } else {

-               if (bp->b_command == HT_SENSE) {
-                       T(10)("sense complete\n");
+               if (bp->b_command == HT_SENSE)

                        return (MBU_NEXT);
                        return (MBU_NEXT);

-               }

                if (bp->b_command == HT_REW)
                        sc->sc_flags |= H_REWIND;
                else
                        htaddr->htfc = -bp->b_bcount;
                htaddr->htcs1 = bp->b_command|HT_GO;
                if (bp->b_command == HT_REW)
                        sc->sc_flags |= H_REWIND;
                else
                        htaddr->htfc = -bp->b_bcount;
                htaddr->htcs1 = bp->b_command|HT_GO;

-               T(10)("started cmd %d\n", bp->b_command);

                return (MBU_STARTED);
        }
        if ((blkno = sc->sc_blkno) == dbtofsb(bp->b_blkno)) {
                htaddr->htfc = -bp->b_bcount;
                if ((bp->b_flags&B_READ) == 0) {
                return (MBU_STARTED);
        }
        if ((blkno = sc->sc_blkno) == dbtofsb(bp->b_blkno)) {
                htaddr->htfc = -bp->b_bcount;
                if ((bp->b_flags&B_READ) == 0) {

-                       if (mi->mi_tab.b_errcnt)
-                               if (sc->sc_flags & H_ERASED)
-                                       sc->sc_flags &= ~H_ERASED;
-                               else {
+                       if (mi->mi_tab.b_errcnt) {
+                               if ((sc->sc_flags & H_ERASED) == 0) {

                                        sc->sc_flags |= H_ERASED;
                                        htaddr->htcs1 = HT_ERASE | HT_GO;
                                        return (MBU_STARTED);
                                }
                                        sc->sc_flags |= H_ERASED;
                                        htaddr->htcs1 = HT_ERASE | HT_GO;
                                        return (MBU_STARTED);
                                }

+                               sc->sc_flags &= ~H_ERASED;
+                       }

                        if (htaddr->htds & HTDS_EOT) {
                                bp->b_resid = bp->b_bcount;
                        if (htaddr->htds & HTDS_EOT) {
                                bp->b_resid = bp->b_bcount;

+                               bp->b_flags |= B_ERROR;

                                return (MBU_NEXT);
                        }
                }
                                return (MBU_NEXT);
                        }
                }


@@ -234,55 +279,54 @@ htustart(mi)
        }
        if (blkno < dbtofsb(bp->b_blkno)) {
                htaddr->htfc = blkno - dbtofsb(bp->b_blkno);
        }
        if (blkno < dbtofsb(bp->b_blkno)) {
                htaddr->htfc = blkno - dbtofsb(bp->b_blkno);

-               T(10)("spacing fwd %d\n", MASKREG(htaddr)->htfc);

                htaddr->htcs1 = HT_SFORW|HT_GO;
        } else {
                htaddr->htfc = dbtofsb(bp->b_blkno) - blkno;
                htaddr->htcs1 = HT_SFORW|HT_GO;
        } else {
                htaddr->htfc = dbtofsb(bp->b_blkno) - blkno;

-               T(10)("spacing back %d\n", MASKREG(htaddr)->htfc);

                htaddr->htcs1 = HT_SREV|HT_GO;
        }
        return (MBU_STARTED);
                htaddr->htcs1 = HT_SREV|HT_GO;
        }
        return (MBU_STARTED);

-next:
-       iodone(bp);
-       return (MBU_NEXT);

 }
 
 }
 

-/*
- * data transfer interrupt - must be read or write
- */
-/*ARGSUSED*/
-htdtint(mi, mbasr)
-       register struct mba_info *mi;
-       int mbasr;
+htdtint(mi, mbsr)
+       register struct mba_device *mi;
+       int mbsr;

 {
        register struct htdevice *htaddr = (struct htdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
 {
        register struct htdevice *htaddr = (struct htdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;

-       register struct ht_softc *sc;
-       int ds, er;
+       register struct tu_softc *sc;
+       int ds, er, mbs;

 
 

-       sc = &ht_softc[HTUNIT(bp->b_dev)];
+       sc = &tu_softc[TUUNIT(bp->b_dev)];

        ds = sc->sc_dsreg = MASKREG(htaddr->htds);
        er = sc->sc_erreg = MASKREG(htaddr->hter);
        sc->sc_resid = MASKREG(htaddr->htfc);
        ds = sc->sc_dsreg = MASKREG(htaddr->htds);
        er = sc->sc_erreg = MASKREG(htaddr->hter);
        sc->sc_resid = MASKREG(htaddr->htfc);

+       mbs = mbsr;

        sc->sc_blkno++;
        if((bp->b_flags & B_READ) == 0)
                sc->sc_flags |= H_WRITTEN;
        sc->sc_blkno++;
        if((bp->b_flags & B_READ) == 0)
                sc->sc_flags |= H_WRITTEN;

-       if ((ds&(HTDS_ERR|HTDS_MOL)) != HTDS_MOL ||
-           mbasr & MBAEBITS) {
+       if ((ds&(HTDS_ERR|HTDS_MOL)) != HTDS_MOL || mbs & MBSR_EBITS) {

                htaddr->htcs1 = HT_DCLR|HT_GO;
                htaddr->htcs1 = HT_DCLR|HT_GO;

-               if (bp == &rhtbuf[HTUNIT(bp->b_dev)])
+               mbclrattn(mi);
+               if (bp == &rhtbuf[HTUNIT(bp->b_dev)]) {

                        er &= ~HTER_FCE;
                        er &= ~HTER_FCE;

+                       mbs &= ~(MBSR_DTABT|MBSR_MBEXC);
+               }

                if (bp->b_flags & B_READ && ds & HTDS_PES)
                        er &= ~(HTER_CSITM|HTER_CORCRC);
                if (bp->b_flags & B_READ && ds & HTDS_PES)
                        er &= ~(HTER_CSITM|HTER_CORCRC);

-               if (er&HTER_HARD ||
-                   mbasr&MBAEBITS || (ds&HTDS_MOL) == 0 ||
-                   sc->sc_erreg && ++mi->mi_tab.b_errcnt >= 7) {
+               if (er&HTER_HARD || mbs&MBSR_EBITS || (ds&HTDS_MOL) == 0 ||
+                   er && ++mi->mi_tab.b_errcnt >= 7) {

                        if ((ds & HTDS_MOL) == 0 && sc->sc_openf > 0)
                                sc->sc_openf = -1;
                        if ((ds & HTDS_MOL) == 0 && sc->sc_openf > 0)
                                sc->sc_openf = -1;

-                       printf("ht%d: hard error bn%d mbasr=%b er=%b\n",
-                           HTUNIT(bp->b_dev), bp->b_blkno,
-                           mbasr, mbasr_bits,
-                           MASKREG(htaddr->hter), HTER_BITS);
+                       if ((er&HTER_HARD) == HTER_FCE &&
+                           (mbs&MBSR_EBITS) == (MBSR_DTABT|MBSR_MBEXC) &&
+                           (ds&HTDS_MOL))
+                               goto noprint;
+                       printf("tu%d: hard error bn%d mbsr=%b er=%b ds=%b\n",
+                           TUUNIT(bp->b_dev), bp->b_blkno,
+                           mbsr, mbsr_bits,
+                           sc->sc_erreg, hter_bits,
+                           sc->sc_dsreg, htds_bits);
+noprint:

                        bp->b_flags |= B_ERROR;
                        return (MBD_DONE);
                }
                        bp->b_flags |= B_ERROR;
                        return (MBD_DONE);
                }


@@ -299,31 +343,40 @@ htdtint(mi, mbasr)
        return (MBD_DONE);
 }
 
        return (MBD_DONE);
 }
 

-/*
- * non-data-transfer interrupt
- */

 htndtint(mi)
 htndtint(mi)

-       register struct mba_info *mi;
+       register struct mba_device *mi;

 {
        register struct htdevice *htaddr = (struct htdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
 {
        register struct htdevice *htaddr = (struct htdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;

-       register struct ht_softc *sc;
+       register struct tu_softc *sc;

        int er, ds, fc;
 
        int er, ds, fc;
 

-       sc = &ht_softc[HTUNIT(bp->b_dev)];
-       ds = sc->sc_dsreg = MASKREG(htaddr->htds);
-       er = sc->sc_erreg = MASKREG(htaddr->hter);
-       sc->sc_resid = MASKREG(htaddr->htfc);
-       if (sc->sc_erreg)
+       ds = MASKREG(htaddr->htds);
+       er = MASKREG(htaddr->hter);
+       fc = MASKREG(htaddr->htfc);
+       if (er) {

                htaddr->htcs1 = HT_DCLR|HT_GO;
                htaddr->htcs1 = HT_DCLR|HT_GO;

+               mbclrattn(mi);
+       }
+       if (bp == 0)
+               return (MBN_SKIP);
+       sc = &tu_softc[TUUNIT(bp->b_dev)];
+       sc->sc_dsreg = ds;
+       sc->sc_erreg = er;
+       sc->sc_resid = fc;

        if (bp == &chtbuf[HTUNIT(bp->b_dev)]) {
        if (bp == &chtbuf[HTUNIT(bp->b_dev)]) {

-               if (bp->b_command == HT_REWOFFL)
+               switch (bp->b_command) {
+               case HT_REWOFFL:

                        /* offline is on purpose; don't do anything special */
                        ds |= HTDS_MOL; 
                        /* offline is on purpose; don't do anything special */
                        ds |= HTDS_MOL; 

-               else if (bp->b_resid == HT_SREV &&
-                   er == (HTER_NEF|HTER_FCE) &&
-                   ds&HTDS_BOT && bp->b_bcount == INF)
-                       er &= ~HTER_NEF;
+                       break;
+               case HT_SREV:
+                       /* if backspace file hit bot, its not an error */
+                       if (er == (HTER_NEF|HTER_FCE) && ds&HTDS_BOT &&
+                           bp->b_repcnt == INF)
+                               er &= ~HTER_NEF;
+                       break;
+               }

                er &= ~HTER_FCE;
                if (er == 0)
                        ds &= ~HTDS_ERR;
                er &= ~HTER_FCE;
                if (er == 0)
                        ds &= ~HTDS_ERR;


@@ -331,9 +384,9 @@ htndtint(mi)
        if ((ds & (HTDS_ERR|HTDS_MOL)) != HTDS_MOL) {
                if ((ds & HTDS_MOL) == 0 && sc->sc_openf > 0)
                        sc->sc_openf = -1;
        if ((ds & (HTDS_ERR|HTDS_MOL)) != HTDS_MOL) {
                if ((ds & HTDS_MOL) == 0 && sc->sc_openf > 0)
                        sc->sc_openf = -1;

-               printf("ht%d: hard error bn%d er=%b ds=%b\n",
-                   HTUNIT(bp->b_dev), bp->b_blkno,
-                   sc->sc_erreg, HTER_BITS, sc->sc_dsreg, HTDS_BITS);
+               printf("tu%d: hard error bn%d er=%b ds=%b\n",
+                   TUUNIT(bp->b_dev), bp->b_blkno,
+                   sc->sc_erreg, hter_bits, sc->sc_dsreg, htds_bits);

                bp->b_flags |= B_ERROR;
                return (MBN_DONE);
        }
                bp->b_flags |= B_ERROR;
                return (MBN_DONE);
        }


@@ -344,10 +397,10 @@ htndtint(mi)
                return (MBN_DONE);
        }
        if (ds & HTDS_TM)
                return (MBN_DONE);
        }
        if (ds & HTDS_TM)

-               if (sc->sc_blkno > dbtofsb(bp->b_blkno)) {/* reversing */
+               if (sc->sc_blkno > dbtofsb(bp->b_blkno)) {

                        sc->sc_nxrec = dbtofsb(bp->b_blkno) - fc;
                        sc->sc_blkno = sc->sc_nxrec;
                        sc->sc_nxrec = dbtofsb(bp->b_blkno) - fc;
                        sc->sc_blkno = sc->sc_nxrec;

-               } else {                        /* spacing forward */
+               } else {

                        sc->sc_blkno = dbtofsb(bp->b_blkno) + fc;
                        sc->sc_nxrec = sc->sc_blkno - 1;
                }
                        sc->sc_blkno = dbtofsb(bp->b_blkno) + fc;
                        sc->sc_nxrec = sc->sc_blkno - 1;
                }


@@ -378,17 +431,18 @@ htwrite(dev)
 htphys(dev)
        dev_t dev;
 {
 htphys(dev)
        dev_t dev;
 {

-       register int unit;
-       register struct ht_softc *sc;
+       register int htunit;
+       register struct tu_softc *sc;
+       register struct mba_device *mi;

        daddr_t a;
 
        daddr_t a;
 

-       unit = HTUNIT(dev);
-       if (unit >= NHT) {
+       htunit = HTUNIT(dev);
+       if (htunit >= NHT || (mi = htinfo[htunit]) == 0 || mi->mi_alive == 0) {

                u.u_error = ENXIO;
                return;
        }
        a = u.u_offset >> 9;
                u.u_error = ENXIO;
                return;
        }
        a = u.u_offset >> 9;

-       sc = &ht_softc[unit];
+       sc = &tu_softc[TUUNIT(dev)];

        sc->sc_blkno = dbtofsb(a);
        sc->sc_nxrec = dbtofsb(a)+1;
 }
        sc->sc_blkno = dbtofsb(a);
        sc->sc_nxrec = dbtofsb(a)+1;
 }


@@ -400,9 +454,8 @@ htioctl(dev, cmd, addr, flag)
        caddr_t addr;
        int flag;
 {
        caddr_t addr;
        int flag;
 {

-       register unit = HTUNIT(dev);
-       register struct ht_softc *sc = &ht_softc[unit];
-       register struct buf *bp = &chtbuf[unit];
+       register struct tu_softc *sc = &tu_softc[TUUNIT(dev)];
+       register struct buf *bp = &chtbuf[HTUNIT(dev)];

        register callcount;
        int fcount;
        struct mtop mtop;
        register callcount;
        int fcount;
        struct mtop mtop;


@@ -449,8 +502,7 @@ htioctl(dev, cmd, addr, flag)
                                u.u_error = EIO;
                                break;
                        }
                                u.u_error = EIO;
                                break;
                        }

-                       if ((chtbuf[HTUNIT(bp->b_dev)].b_flags&B_ERROR) ||
-                           sc->sc_dsreg&HTDS_BOT)
+                       if ((bp->b_flags&B_ERROR) || sc->sc_dsreg&HTDS_BOT)

                                break;
                }
                geterror(bp);
                                break;
                }
                geterror(bp);


@@ -459,6 +511,7 @@ htioctl(dev, cmd, addr, flag)
                mtget.mt_dsreg = sc->sc_dsreg;
                mtget.mt_erreg = sc->sc_erreg;
                mtget.mt_resid = sc->sc_resid;
                mtget.mt_dsreg = sc->sc_dsreg;
                mtget.mt_erreg = sc->sc_erreg;
                mtget.mt_resid = sc->sc_resid;

+               mtget.mt_type = MT_ISHT;

                if (copyout((caddr_t)&mtget, addr, sizeof(mtget)))
                        u.u_error = EFAULT;
                return;
                if (copyout((caddr_t)&mtget, addr, sizeof(mtget)))
                        u.u_error = EFAULT;
                return;


@@ -471,7 +524,7 @@ htioctl(dev, cmd, addr, flag)
 
 htdump()
 {
 
 htdump()
 {

-       register struct mba_info *mi;
+       register struct mba_device *mi;

        register struct mba_regs *mp;
        register struct htdevice *htaddr;
        int blk, num;
        register struct mba_regs *mp;
        register struct htdevice *htaddr;
        int blk, num;


@@ -482,10 +535,9 @@ htdump()
 #define        phys(a,b)               ((b)((int)(a)&0x7fffffff))
        if (htinfo[0] == 0)
                return (ENXIO);
 #define        phys(a,b)               ((b)((int)(a)&0x7fffffff))
        if (htinfo[0] == 0)
                return (ENXIO);

-       mi = phys(htinfo[0], struct mba_info *);
+       mi = phys(htinfo[0], struct mba_device *);

        mp = phys(mi->mi_hd, struct mba_hd *)->mh_physmba;
        mp = phys(mi->mi_hd, struct mba_hd *)->mh_physmba;

-#if VAX780
-       mbainit(mp);
+       mp->mba_cr = MBCR_IE;

        htaddr = (struct htdevice *)&mp->mba_drv[mi->mi_drive];
        htaddr->httc = HTTC_PDP11|HTTC_1600BPI;
        htaddr->htcs1 = HT_DCLR|HT_GO;
        htaddr = (struct htdevice *)&mp->mba_drv[mi->mi_drive];
        htaddr->httc = HTTC_PDP11|HTTC_1600BPI;
        htaddr->htcs1 = HT_DCLR|HT_GO;


@@ -495,10 +547,13 @@ htdump()
                start += blk;
                num -= blk;
        }
                start += blk;
                num -= blk;
        }

-       htwait(htaddr);
-       htaddr->htcs1 = HT_REW|HT_GO;

        hteof(htaddr);
        hteof(htaddr);
        hteof(htaddr);
        hteof(htaddr);

+       htwait(htaddr);
+       if (htaddr->htds&HTDS_ERR)
+               return (EIO);
+       htaddr->htcs1 = HT_REW|HT_GO;
+       return (0);

 }
 
 htdwrite(dbuf, num, htaddr, mp)
 }
 
 htdwrite(dbuf, num, htaddr, mp)