new boot scheme

SCCS-vsn: sys/vax/stand/autoconf.c 4.5
SCCS-vsn: sys/vax/stand/boot.c 4.8
SCCS-vsn: sys/vax/stand/conf.c 4.12
SCCS-vsn: sys/vax/stand/idc.c 4.2
SCCS-vsn: sys/vax/stand/Makefile 4.14
SCCS-vsn: sys/vax/stand/mba.c 4.4
SCCS-vsn: sys/vax/stand/mt.c 4.2
SCCS-vsn: sys/vax/stand/rk.c 4.5
SCCS-vsn: sys/vax/stand/savax.h 4.3
SCCS-vsn: sys/vax/stand/srt0.c 4.9
SCCS-vsn: sys/stand.att/sys.c 4.6
SCCS-vsn: sys/vax/stand/tm.c 4.7
SCCS-vsn: sys/vax/stand/ts.c 4.5
SCCS-vsn: sys/vax/stand/uba.c 4.6
SCCS-vsn: sys/vax/stand/uda.c 4.2
SCCS-vsn: sys/vax/stand/ut.c 4.3

diff --git a/usr/src/sys/stand.att/sys.c b/usr/src/sys/stand.att/sys.c
index 104e625..112df36 100644 (file)
--- a/usr/src/sys/stand.att/sys.c
+++ b/usr/src/sys/stand.att/sys.c
@@ -1,9 +1,9 @@
-/*     sys.c   4.5     82/03/07        */
+/*     sys.c   4.6     82/07/15        */

 
 #include "../h/param.h"
 #include "../h/inode.h"
 #include "../h/fs.h"
 
 #include "../h/param.h"
 #include "../h/inode.h"
 #include "../h/fs.h"

-#include "../h/ndir.h"
+#include "../h/dir.h"

 #include "saio.h"
 
 ino_t  dlook();
 #include "saio.h"
 
 ino_t  dlook();


@@ -320,10 +320,13 @@ read(fdesc, buf, count)
        if ((file->i_flgs&F_READ) == 0)
                return(-1);
        if ((file->i_flgs & F_FILE) == 0) {
        if ((file->i_flgs&F_READ) == 0)
                return(-1);
        if ((file->i_flgs & F_FILE) == 0) {

+               if (count % DEV_BSIZE)
+                       printf("count=%d?\n", count);

                file->i_cc = count;
                file->i_ma = buf;
                file->i_cc = count;
                file->i_ma = buf;

+               file->i_bn = file->i_boff + (file->i_offset / DEV_BSIZE);

                i = devread(file);
                i = devread(file);

-               file->i_bn += (count / DEV_BSIZE);
+               file->i_offset += count;

                return(i);
        } else {
                if (file->i_offset+count > file->i_ino.i_size)
                return(i);
        } else {
                if (file->i_offset+count > file->i_ino.i_size)


@@ -357,10 +360,13 @@ write(fdesc, buf, count)
                return(-1);
        if ((file->i_flgs&F_WRITE) == 0)
                return(-1);
                return(-1);
        if ((file->i_flgs&F_WRITE) == 0)
                return(-1);

+       if (count % DEV_BSIZE)
+               printf("count=%d?\n", count);

        file->i_cc = count;
        file->i_ma = buf;
        file->i_cc = count;
        file->i_ma = buf;

+       file->i_bn = file->i_boff + (file->i_offset / DEV_BSIZE);

        i = devwrite(file);
        i = devwrite(file);

-       file->i_bn += (count / DEV_BSIZE);
+       file->i_offset += count;

        return(i);
 }
 
        return(i);
 }
 


@@ -439,7 +445,7 @@ badoff:
        }
        file->i_ma = (char *)(&file->i_fs);
        file->i_cc = SBSIZE;
        }
        file->i_ma = (char *)(&file->i_fs);
        file->i_cc = SBSIZE;

-       file->i_bn = SBLOCK;
+       file->i_bn = SBLOCK + file->i_boff;

        file->i_offset = 0;
        devread(file);
        if ((i = find(cp, file)) == 0) {
        file->i_offset = 0;
        devread(file);
        if ((i = find(cp, file)) == 0) {

diff --git a/usr/src/sys/vax/stand/Makefile b/usr/src/sys/vax/stand/Makefile
index 2e9ca38..74450a3 100644 (file)
--- a/usr/src/sys/vax/stand/Makefile
+++ b/usr/src/sys/vax/stand/Makefile
@@ -1,101 +1,84 @@
-#      Makefile        4.13    81/12/01
+#      Makefile        4.14    82/07/15

 
 

-DESTDIR=
+DESTDIR=/

 CFLAGS=        -O -DSTANDALONE ${COPTS} 
 CFLAGS=        -O -DSTANDALONE ${COPTS} 

-COPTS= -DVAX780 -DVAX750 -DVAX7ZZ
+COPTS= -DVAX780 -DVAX750 -DVAX730

 RELOC= 70000
 SRCS=  sys.c conf.c prf.c machdep.c \
 RELOC= 70000
 SRCS=  sys.c conf.c prf.c machdep.c \

-       autoconf.c hp.c ht.c mba.c mt.c rk.c tm.c ts.c up.c uba.c uda.c ut.c
-DRIVERS=autoconf.o hp.o ht.o mba.o mt.o rk.o tm.o ts.o up.o uba.o uda.o ut.o
+       autoconf.c hp.c ht.c idc.c mba.c mt.c rk.c tm.c ts.c \
+       up.c uba.c uda.c ut.c
+DRIVERS=autoconf.o hp.o ht.o idc.o mba.o mt.o rk.o tm.o ts.o \
+       up.o uba.o uda.o ut.o

 
 

-ALL=   /usr/lib/libsa.a srt0.o boot cat ls icheck mkfs restor \
-       tpicheck tpmkfs tprestor sboot
+ALL=   /usr/lib/libsa.a srt0.o boot tpboot copy tpcopy boothp boothk bootup

 
 all: ${ALL}
 
 /usr/lib/libsa.a: sys.o conf.o ${DRIVERS} prf.o machdep.o
 
 all: ${ALL}
 
 /usr/lib/libsa.a: sys.o conf.o ${DRIVERS} prf.o machdep.o

-       ar crv ${DESTDIR}/usr/lib/libsa.a $?
-       ranlib ${DESTDIR}/usr/lib/libsa.a
+       ar crv /usr/lib/libsa.a $?
+       ranlib /usr/lib/libsa.a

 
 

-${DRIVERS}:
+${DRIVERS}: savax.h

        cc -c -S ${COPTS} $*.c
        /lib/c2 -i $*.s | as -o $*.o
        rm $*.s
 
        cc -c -S ${COPTS} $*.c
        /lib/c2 -i $*.s | as -o $*.o
        rm $*.s
 

-boot:  boot.o relsrt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N -T ${RELOC} relsrt0.o boot.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=boot ibs=32 skip=1; rm b.out
+# startups

 
 

-sboot: boot.c relsrt0.o ${DESTDIR}/usr/lib/libsa.a
-       cp boot.c sboot.c; chmod +w sboot.c
-       cc -c -O -DJUSTASK sboot.c
-       rm sboot.c
-       ld -N -T ${RELOC} relsrt0.o sboot.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=sboot ibs=32 skip=1; rm b.out
-
-cat:   cat.o srt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N srt0.o cat.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=cat ibs=32 skip=1; rm b.out
-
-ls:    ls.o srt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N srt0.o ls.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=ls ibs=32 skip=1; rm b.out
-
-imptst: imptst.o srt0.o 
-       ld -N srt0.o imptst.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=imptst ibs=32 skip=1; rm b.out
+srt0.o: srt0.c ../h/mtpr.h ../h/cpu.h
+       cc -E -DRELOC=0x${RELOC} ${COPTS} srt0.c | as -o srt0.o

 
 

-mkfs.o:        /usr/src/cmd/mkfs.c
-       cc ${CFLAGS} -c /usr/src/cmd/mkfs.c
+tpsrt0.o: srt0.c ../h/mtpr.h ../h/cpu.h
+       cc -E -DRELOC=0x${RELOC} -DTP ${COPTS} srt0.c | as -o tpsrt0.o 

 
 

-mkfs:  mkfs.o srt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N srt0.o mkfs.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=mkfs ibs=32 skip=1; rm b.out
+relsrt0.o: srt0.c ../h/mtpr.h ../h/cpu.h
+       cc -E -DRELOC=0x${RELOC} -DREL ${COPTS} srt0.c | as -o relsrt0.o

 
 

-restor.o: /usr/src/cmd/restor.c
-       cc ${CFLAGS} -c /usr/src/cmd/restor.c
+# bootable from tape

 
 

-restor:        restor.o srt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N srt0.o restor.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=restor ibs=32 skip=1; rm b.out
+tpboot:        tpboot.o relsrt0.o /usr/lib/libsa.a
+       ld -N -T ${RELOC} relsrt0.o tpboot.o -lsa -lc
+       cp a.out b.out; strip b.out; dd if=b.out of=tpboot ibs=32 skip=1; rm b.out

 
 

-icheck.o: /usr/src/cmd/icheck.c
-       cc ${CFLAGS} -c /usr/src/cmd/icheck.c
+tpboot.o: boot.c ../h/param.h ../h/inode.h ../h/fs.h
+tpboot.o: saio.h ../h/reboot.h ../h/vm.h 
+       cp boot.c tpboot.c; chmod +w tpboot.c
+       cc -c -O -DJUSTASK tpboot.c
+       rm tpboot.c

 
 

-icheck: icheck.o srt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N srt0.o icheck.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=icheck ibs=32 skip=1; rm b.out
+tpcopy:        copy.c tpsrt0.o /usr/lib/libsa.a
+       cp copy.c tpcopy.c; chmod +w tpcopy.c
+       cc -c -O tpcopy.c
+       rm tpcopy.c
+       ld -N tpsrt0.o tpcopy.o -lsa -lc
+       cp a.out b.out; strip b.out; dd if=b.out of=tpcopy ibs=32 skip=1; rm b.out

 
 

-tpmkfs:        mkfs.o tpsrt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N tpsrt0.o mkfs.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=tpmkfs ibs=32 skip=1; rm b.out
+# bootable from floppy or real disks

 
 

-tprestor: restor.o tpsrt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N tpsrt0.o restor.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=tprestor ibs=32 skip=1; rm b.out
+boot:  boot.o relsrt0.o bootconf.o /usr/lib/libsa.a
+       ld -N -T ${RELOC} -o boot relsrt0.o boot.o bootconf.o -lsa -lc

 
 

-tpicheck: icheck.o tpsrt0.o ${DESTDIR}/usr/lib/libsa.a
-       ld -N tpsrt0.o icheck.o -lsa -lc
-       cp a.out b.out; strip b.out; dd if=b.out of=tpicheck ibs=32 skip=1; rm b.out
+bootconf.o: conf.c ../h/param.h ../h/inode.h ../h/pte.h
+bootconf.o: ../h/fs.h saio.h ../h/mbareg.h
+       cp conf.c bootconf.c
+       cc -c ${COPTS} -DBOOT bootconf.c
+       rm bootconf.c

 
 

-srt0.o: srt0.c
-       cc -E -DRELOC=0x${RELOC} ${COPTS} srt0.c | as -o srt0.o
+copy:  copy.o srt0.o conf.o /usr/lib/libsa.a
+       ld -N -o copy srt0.o copy.o conf.o -lsa -lc

 
 

-tpsrt0.o: srt0.c
-       cc -E -DRELOC=0x${RELOC} -DTP ${COPTS} srt0.c | as -o tpsrt0.o 
+# bootstrap from ether

 
 

-relsrt0.o: srt0.c
-       cc -E -DRELOC=0x${RELOC} -DREL ${COPTS} srt0.c | as -o relsrt0.o
+### not yet, rosin, not yet ###

 
 print:
 
 print:

-       @pr -f makefile
-       @/usr/ucb/ls -l | pr -f
-       @pr -f *.h *.c
+       @pr makefile
+       @ls -l | pr 
+       @pr *.h *.c

 
 clean:
        rm -f *.o *.exe *.i
 
 clean:
        rm -f *.o *.exe *.i

-       rm -f a.out b.out boot cat ls icheck mkfs restor rpboot \
-           tpicheck tpmkfs tprestor sboot
+       rm -f a.out b.out boot cat tpboot tpcopy

 
 lint:
        lint ${COPTS} -hxbn boot.c ${SRCS} | \
 
 lint:
        lint ${COPTS} -hxbn boot.c ${SRCS} | \


@@ -103,8 +86,57 @@ lint:
            grep -v 'struct/union .* never defined'
 
 install: ${ALL}
            grep -v 'struct/union .* never defined'
 
 install: ${ALL}

-       cp tprestor ${DESTDIR}/tp/restor
-       cp tpicheck ${DESTDIR}/tp/icheck
-       cp tpmkfs ${DESTDIR}/tp/mkfs
-       cp sboot ${DESTDIR}/tp/boot
-       cp boot icheck mkfs restor cat ls ../floppy
+       cp tpcopy ${DESTDIR}/tp/copy
+       cp tpboot ${DESTDIR}/tp/boot
+       cp boot copy ../floppy
+       cp bootup boothk boothp ${DESTDIR}/usr/mdec
+
+# beware...
+
+boothk.o: xxboot.c
+       cc -c -S ${COPTS} -DBOOTRK xxboot.c
+       /lib/c2 -i xxboot.s | as -o boothk.o
+       rm -f xxboot.s
+
+boothk: relsrt0.o boothk.o confrk.o
+       ld -N -T ${RELOC} relsrt0.o boothk.o confrk.o -lsa -lc
+       cp a.out b.out; strip b.out; dd if=b.out of=boothk ibs=32 skip=1; rm b.out
+
+boothp.o: xxboot.c
+       cc -c -S ${COPTS} -DBOOTHP xxboot.c
+       /lib/c2 -i xxboot.s | as -o boothp.o
+       rm -f xxboot.s
+
+boothp: relsrt0.o boothp.o confhp.o
+       ld -N -T ${RELOC} relsrt0.o boothp.o confhp.o -lsa -lc
+       cp a.out b.out; strip b.out; dd if=b.out of=boothp ibs=32 skip=1; rm b.out
+
+bootup.o: xxboot.c
+       cc -c -S ${COPTS} -DBOOTUP xxboot.c
+       /lib/c2 -i xxboot.s | as -o bootup.o
+       /lib/c2 -i xxboot.s | as -o upboot.o
+       rm -f xxboot.s
+
+bootup: relsrt0.o bootup.o confup.o
+       ld -N -T ${RELOC} relsrt0.o bootup.o confup.o -lsa -lc
+       cp a.out b.out; strip b.out; dd if=b.out of=bootup ibs=32 skip=1; rm b.out
+
+boothp.o: xxboot.c ../h/param.h ../h/inode.h ../h/pte.h ../h/reboot.h
+boothp.o: ../h/fs.h saio.h
+boothk.o: xxboot.c ../h/param.h ../h/inode.h ../h/pte.h ../h/reboot.h
+boothk.o: ../h/fs.h saio.h
+bootup.o: xxboot.c ../h/param.h ../h/inode.h ../h/pte.h ../h/reboot.h
+
+confrk.o: confrk.c ../h/param.h ../h/fs.h ../h/pte.h ../h/inode.h saio.h
+       $(CC) -c $(CFLAGS) confrk.c
+confhp.o: confhp.c ../h/param.h ../h/fs.h ../h/pte.h ../h/inode.h saio.h
+       $(CC) -c $(CFLAGS) confhp.c
+confup.o: confup.c ../h/param.h ../h/fs.h ../h/pte.h ../h/inode.h saio.h
+       $(CC) -c $(CFLAGS) confup.c
+
+confrk.c: confxx.c
+       sed -e 's/XX/hk/' -e 's/xx/rk/g' <confxx.c >confrk.c
+confhp.c: confxx.c
+       sed -e 's/XX/hp/' -e 's/xx/hp/g' <confxx.c >confhp.c
+confup.c: confxx.c
+       sed -e 's/XX/up/' -e 's/xx/up/g' <confxx.c >confup.c

diff --git a/usr/src/sys/vax/stand/autoconf.c b/usr/src/sys/vax/stand/autoconf.c
index 87d539d..6a2b91e 100644 (file)
--- a/usr/src/sys/vax/stand/autoconf.c
+++ b/usr/src/sys/vax/stand/autoconf.c
@@ -1,4 +1,4 @@
-/*     autoconf.c      4.4     81/04/03        */
+/*     autoconf.c      4.5     82/07/15        */

 
 #include "../h/param.h"
 #include "../h/cpu.h"
 
 #include "../h/param.h"
 #include "../h/cpu.h"


@@ -33,11 +33,11 @@ struct      mba_regs *mbaddr750[] = { MTR(4), MTR(5), MTR(6), MTR(7) };
 #undef UMA
 #undef MTR
 
 #undef UMA
 #undef MTR
 

-#define        UTR(i)  ((struct uba_regs *)(NEX7ZZ+(i)))
-#define        UMA     ((caddr_t)UMEM7ZZ)
+#define        UTR(i)  ((struct uba_regs *)(NEX730+(i)))
+#define        UMA     ((caddr_t)UMEM730)

 
 

-struct uba_regs *ubaddr7ZZ[] = { UTR(3) };
-caddr_t        umaddr7ZZ[] = { UMA };
+struct uba_regs *ubaddr730[] = { UTR(3) };
+caddr_t        umaddr730[] = { UMA };

 
 #undef UTR
 #undef UMA
 
 #undef UTR
 #undef UMA


@@ -67,21 +67,25 @@ configure()
                nuba = 0;
                break;
 
                nuba = 0;
                break;
 

-       case VAX_7ZZ:
-               ubaddr = ubaddr7ZZ;
-               umaddr = umaddr7ZZ;
+       case VAX_730:
+               ubaddr = ubaddr730;
+               umaddr = umaddr730;

                nmba = nuba = 0;
                break;
        }
        /*
         * Forward into the past...
         */
                nmba = nuba = 0;
                break;
        }
        /*
         * Forward into the past...
         */

+/*

        for (i = 0; i < nmba; i++)
                if (!badloc(mbaddr[i]))
                        mbaddr[i]->mba_cr = MBCR_INIT;
        for (i = 0; i < nmba; i++)
                if (!badloc(mbaddr[i]))
                        mbaddr[i]->mba_cr = MBCR_INIT;

+*/

        for (i = 0; i < nuba; i++)
                if (!badloc(ubaddr[i]))
                        ubaddr[i]->uba_cr = UBACR_ADINIT;
        for (i = 0; i < nuba; i++)
                if (!badloc(ubaddr[i]))
                        ubaddr[i]->uba_cr = UBACR_ADINIT;

+       if (cpu != VAX_780)
+               mtpr(IUR, 0);

        /* give unibus devices a chance to recover... */
        if (nuba > 0)
                DELAY(2000000);
        /* give unibus devices a chance to recover... */
        if (nuba > 0)
                DELAY(2000000);

diff --git a/usr/src/sys/vax/stand/boot.c b/usr/src/sys/vax/stand/boot.c
index a287bf1..259062e 100644 (file)
--- a/usr/src/sys/vax/stand/boot.c
+++ b/usr/src/sys/vax/stand/boot.c
@@ -1,4 +1,4 @@
-/*     boot.c  4.7     82/03/07        */
+/*     boot.c  4.8     82/07/15        */

 
 #include "../h/param.h"
 #include "../h/inode.h"
 
 #include "../h/param.h"
 #include "../h/inode.h"


@@ -81,8 +81,7 @@ copyunix(howto, io)
            (x.a_magic != 0407 && x.a_magic != 0413 && x.a_magic != 0410))
                _stop("Bad format\n");
        printf("%d", x.a_text);
            (x.a_magic != 0407 && x.a_magic != 0413 && x.a_magic != 0410))
                _stop("Bad format\n");
        printf("%d", x.a_text);

-       if ((x.a_magic == 0413 || x.a_magic == 0410) &&
-           lseek(io, 0x400, 0) == -1)
+       if (x.a_magic == 0413 && lseek(io, 0x400, 0) == -1)

                goto shread;
        if (read(io, (char *)0, x.a_text) != x.a_text)
                goto shread;
                goto shread;
        if (read(io, (char *)0, x.a_text) != x.a_text)
                goto shread;

diff --git a/usr/src/sys/vax/stand/conf.c b/usr/src/sys/vax/stand/conf.c
index d6c5b87..f9ef050 100644 (file)
--- a/usr/src/sys/vax/stand/conf.c
+++ b/usr/src/sys/vax/stand/conf.c
@@ -1,9 +1,10 @@
-/*     conf.c  4.11    82/06/25        */
+/*     conf.c  4.12    82/07/15        */

 
 #include "../h/param.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/mbareg.h"
 
 #include "../h/param.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/mbareg.h"

+#include "../h/fs.h"

 #include "saio.h"
 
 devread(io)
 #include "saio.h"
 
 devread(io)

diff --git a/usr/src/sys/vax/stand/idc.c b/usr/src/sys/vax/stand/idc.c
index ad03b07..ebd5888 100644 (file)
--- a/usr/src/sys/vax/stand/idc.c
+++ b/usr/src/sys/vax/stand/idc.c
@@ -1,4 +1,4 @@
-/*     idc.c   4.1     82/05/27        */
+/*     idc.c   4.2     82/07/15        */

 
 /*
  * IDC (RB730)
 
 /*
  * IDC (RB730)


@@ -12,6 +12,7 @@
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"

+#include "../h/fs.h"

 #include "saio.h"
 #include "savax.h"
 
 #include "saio.h"
 #include "savax.h"
 

diff --git a/usr/src/sys/vax/stand/mba.c b/usr/src/sys/vax/stand/mba.c
index 9347f54..1320752 100644 (file)
--- a/usr/src/sys/vax/stand/mba.c
+++ b/usr/src/sys/vax/stand/mba.c
@@ -1,9 +1,10 @@
-/*     mba.c   4.3     81/03/15        */
+/*     mba.c   4.4     82/07/15        */

 
 #include "../h/param.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/mbareg.h"
 
 #include "../h/param.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/mbareg.h"

+#include "../h/fs.h"

 #include "../h/mtpr.h"
 #include "../h/vm.h"
 #include "saio.h"
 #include "../h/mtpr.h"
 #include "../h/vm.h"
 #include "saio.h"

diff --git a/usr/src/sys/vax/stand/mt.c b/usr/src/sys/vax/stand/mt.c
index c33451c..2e0d4fc 100644 (file)
--- a/usr/src/sys/vax/stand/mt.c
+++ b/usr/src/sys/vax/stand/mt.c
@@ -1,4 +1,4 @@
-/*     mt.c    4.1     81/12/01        */
+/*     mt.c    4.2     82/07/15        */

 
 /*
  * TM78/TU78 tape driver
 
 /*
  * TM78/TU78 tape driver


@@ -9,6 +9,7 @@
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/mbareg.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/mbareg.h"

+#include "../h/fs.h"

 #include "saio.h"
 #include "savax.h"
 
 #include "saio.h"
 #include "savax.h"
 

diff --git a/usr/src/sys/vax/stand/rk.c b/usr/src/sys/vax/stand/rk.c
index 5447e15..30174eb 100644 (file)
--- a/usr/src/sys/vax/stand/rk.c
+++ b/usr/src/sys/vax/stand/rk.c
@@ -1,4 +1,4 @@
-/*     rk.c    4.4     81/07/25        */
+/*     rk.c    4.5     82/07/15        */

 
 /*
  * RK611/RK07
 
 /*
  * RK611/RK07


@@ -9,6 +9,7 @@
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"

+#include "../h/fs.h"

 #include "saio.h"
 #include "savax.h"
 
 #include "saio.h"
 #include "savax.h"
 

diff --git a/usr/src/sys/vax/stand/savax.h b/usr/src/sys/vax/stand/savax.h
index 4d627c5..8ee1200 100644 (file)
--- a/usr/src/sys/vax/stand/savax.h
+++ b/usr/src/sys/vax/stand/savax.h
@@ -1,4 +1,4 @@
-/*     savax.h 4.2     81/03/16        */
+/*     savax.h 4.3     82/07/15        */

 
 /*
  * Standalone definitions peculiar to vaxen
 
 /*
  * Standalone definitions peculiar to vaxen


@@ -32,4 +32,4 @@ struct        uba_regs **ubaddr;
 
 #define        UNITTOUBA(unit)         ((unit)>>3)
 #define        ubauba(unit)            (ubaddr[UNITTOUBA(unit)])
 
 #define        UNITTOUBA(unit)         ((unit)>>3)
 #define        ubauba(unit)            (ubaddr[UNITTOUBA(unit)])

-#define        ubamem(unit, off)       ((umaddr[UNITTOUBA(unit)]+(off&017777)))
+#define        ubamem(unit, off)       ((umaddr[UNITTOUBA(unit)]+ubdevreg(off)))

diff --git a/usr/src/sys/vax/stand/srt0.c b/usr/src/sys/vax/stand/srt0.c
index bcba3f7..c081066 100644 (file)
--- a/usr/src/sys/vax/stand/srt0.c
+++ b/usr/src/sys/vax/stand/srt0.c
@@ -1,4 +1,4 @@
-/*     srt0.c  4.8     81/04/03        */
+/*     srt0.c  4.9     82/07/15        */

 
 #include "../h/mtpr.h"
 #define        LOCORE
 
 #include "../h/mtpr.h"
 #define        LOCORE


@@ -79,7 +79,7 @@ _badloc:
 0:
        .word   8f-0b           # 1 is 780
        .word   5f-0b           # 2 is 750
 0:
        .word   8f-0b           # 1 is 780
        .word   5f-0b           # 2 is 750

-       .word   5f-0b           # 3 is 7ZZ
+       .word   5f-0b           # 3 is 730

 5:
        mtpr    $0xf,$MCESR
        brb     1f
 5:
        mtpr    $0xf,$MCESR
        brb     1f

diff --git a/usr/src/sys/vax/stand/tm.c b/usr/src/sys/vax/stand/tm.c
index 8dd2ef0..fd1062a 100644 (file)
--- a/usr/src/sys/vax/stand/tm.c
+++ b/usr/src/sys/vax/stand/tm.c
@@ -1,4 +1,4 @@
-/*     tm.c    4.6     81/12/01        */
+/*     tm.c    4.7     82/07/15        */

 
 /*
  * TM11/TE??
 
 /*
  * TM11/TE??


@@ -8,6 +8,7 @@
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"

+#include "../h/fs.h"

 #include "saio.h"
 #include "savax.h"
 
 #include "saio.h"
 #include "savax.h"
 

diff --git a/usr/src/sys/vax/stand/ts.c b/usr/src/sys/vax/stand/ts.c
index e79d214..2cb6878 100644 (file)
--- a/usr/src/sys/vax/stand/ts.c
+++ b/usr/src/sys/vax/stand/ts.c
@@ -1,4 +1,4 @@
-/*     ts.c    4.4     81/12/01        */
+/*     ts.c    4.5     82/07/15        */

 
 /*
  * TS11 tape driver
 
 /*
  * TS11 tape driver


@@ -9,6 +9,7 @@
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"

+#include "../h/fs.h"

 #include "saio.h"
 #include "savax.h"
 
 #include "saio.h"
 #include "savax.h"
 


@@ -34,9 +35,10 @@ tsopen(io)
        long i = 0;
 
        if (tsaddr == 0)
        long i = 0;
 
        if (tsaddr == 0)

-               tsaddr = ubamem(io->i_unit, tsstd[0]);
+               tsaddr = (struct tsdevice *)ubamem(io->i_unit, tsstd[0]);

        tsaddr->tssr = 0;
        while ((tsaddr->tssr & TS_SSR)==0) {
        tsaddr->tssr = 0;
        while ((tsaddr->tssr & TS_SSR)==0) {

+               DELAY(10);

                if (++i > 1000000) {
                        printf("ts: not ready\n");
                        return;
                if (++i > 1000000) {
                        printf("ts: not ready\n");
                        return;


@@ -107,7 +109,7 @@ retry:
        if (ts.ts_sts.s_xs0 & TS_TMK)
                return (0);
        if (tsaddr->tssr & TS_SC) {
        if (ts.ts_sts.s_xs0 & TS_TMK)
                return (0);
        if (tsaddr->tssr & TS_SC) {

-               printf("ts tape error: er=%b, xs0=%b",
+               printf("ts tape error: er=%b, xs0=%b\n",

                    tsaddr->tssr, TSSR_BITS,
                    ts.ts_sts.s_xs0, TSXS0_BITS);
                if (errcnt==10) {
                    tsaddr->tssr, TSSR_BITS,
                    ts.ts_sts.s_xs0, TSXS0_BITS);
                if (errcnt==10) {

diff --git a/usr/src/sys/vax/stand/uba.c b/usr/src/sys/vax/stand/uba.c
index 296f6b5..8e9d121 100644 (file)
--- a/usr/src/sys/vax/stand/uba.c
+++ b/usr/src/sys/vax/stand/uba.c
@@ -1,4 +1,4 @@
-/*     uba.c   4.5     81/11/12        */
+/*     uba.c   4.6     82/07/15        */

 
 #include "../h/param.h"
 #include "../h/inode.h"
 
 #include "../h/param.h"
 #include "../h/inode.h"


@@ -6,6 +6,7 @@
 #include "../h/pte.h"
 #include "../h/ubareg.h"
 #include "../h/vm.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"
 #include "../h/vm.h"

+#include "../h/fs.h"

 #include "saio.h"
 #include "savax.h"
 
 #include "saio.h"
 #include "savax.h"
 


@@ -64,7 +65,7 @@ ubafree(io, mr)
                ubauba(io->i_unit)->uba_dpr[bdp] |=
                     UBADPR_PURGE|UBADPR_NXM|UBADPR_UCE;
                break;
                ubauba(io->i_unit)->uba_dpr[bdp] |=
                     UBADPR_PURGE|UBADPR_NXM|UBADPR_UCE;
                break;

-       case VAX_7ZZ:
+       case VAX_730:

                break;
        }
 }
                break;
        }
 }

diff --git a/usr/src/sys/vax/stand/uda.c b/usr/src/sys/vax/stand/uda.c
index 1180df9..e60f294 100644 (file)
--- a/usr/src/sys/vax/stand/uda.c
+++ b/usr/src/sys/vax/stand/uda.c
@@ -1,4 +1,4 @@
-/*     uda.c   4.1     81/12/01        */
+/*     uda.c   4.2     82/07/15        */

 
 /*
  * UDA50/RAxx disk device driver
 
 /*
  * UDA50/RAxx disk device driver


@@ -8,6 +8,7 @@
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"

+#include "../h/fs.h"

 #include "saio.h"
 #include "savax.h"
 
 #include "saio.h"
 #include "savax.h"
 

diff --git a/usr/src/sys/vax/stand/ut.c b/usr/src/sys/vax/stand/ut.c
index d587396..0dbd481 100644 (file)
--- a/usr/src/sys/vax/stand/ut.c
+++ b/usr/src/sys/vax/stand/ut.c
@@ -1,4 +1,4 @@
-/*     ut.c    4.2     81/12/15        */
+/*     ut.c    4.3     82/07/15        */

 
 /*
  * SI Model 9700 -- emulates TU45 on the UNIBUS
 
 /*
  * SI Model 9700 -- emulates TU45 on the UNIBUS


@@ -8,6 +8,7 @@
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"
 #include "../h/inode.h"
 #include "../h/pte.h"
 #include "../h/ubareg.h"

+#include "../h/fs.h"

 #include "saio.h"
 #include "savax.h"
 
 #include "saio.h"
 #include "savax.h"
 


@@ -96,7 +97,7 @@ retry:
        if (errcnt)
                printf(" recovered by retry\n");
        return (func == READ ?
        if (errcnt)
                printf(" recovered by retry\n");
        return (func == READ ?

-               io->io_cc - ((-addr->utfc) & 0xffff) : -addr->utwc << 1);
+               io->i_cc - ((-addr->utfc) & 0xffff) : -addr->utwc << 1);

 }
 
 utquiet(addr)
 }
 
 utquiet(addr)