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 a4651e5..7cd25ba 100644 (file)
--- a/usr/src/sys/vax/mba/ht.c
+++ b/usr/src/sys/vax/mba/ht.c
@@ -1,4 +1,4 @@
-/*     ht.c    4.19    81/08/31        */
+/*     ht.c    4.22    82/05/12        */

 
 #include "tu.h"
 #if NHT > 0
 
 #include "tu.h"
 #if NHT > 0


@@ -87,10 +87,16 @@ htslave(mi, ms)
        struct mba_slave *ms;
 {
        register struct tu_softc *sc = &tu_softc[ms->ms_unit];
        struct mba_slave *ms;
 {
        register struct tu_softc *sc = &tu_softc[ms->ms_unit];

+       register struct htdevice *htaddr = (struct htdevice *)mi->mi_drv;

 
 

-       sc->sc_mi = mi;
-       sc->sc_slave = ms->ms_slave;
-       tutoht[ms->ms_unit] = mi->mi_unit;
+       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)
 }
 
 htopen(dev, flag)


@@ -158,9 +164,10 @@ htcommand(dev, com, count)
        int com, count;
 {
        register struct buf *bp;
        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) {
                if(bp->b_repcnt == 0 && (bp->b_flags&B_DONE))
                        break;
        while (bp->b_flags&B_BUSY) {
                if(bp->b_repcnt == 0 && (bp->b_flags&B_DONE))
                        break;


@@ -168,7 +175,7 @@ htcommand(dev, com, count)
                sleep((caddr_t)bp, PRIBIO);
        }
        bp->b_flags = B_BUSY|B_READ;
                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;


@@ -187,10 +194,11 @@ htstrategy(bp)
 {
        register struct mba_device *mi = htinfo[HTUNIT(bp->b_dev)];
        register struct buf *dp;
 {
        register struct mba_device *mi = htinfo[HTUNIT(bp->b_dev)];
        register struct buf *dp;

+       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


@@ -198,7 +206,7 @@ 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)


@@ -263,6 +271,7 @@ htustart(mi)
                        }
                        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);
                        }
                }