uda50 and rl11 boot blocks; 730 crud

SCCS-vsn: sys/vax/stand/Makefile 4.26
SCCS-vsn: sys/vax/stand/bootxx.c 4.2
SCCS-vsn: sys/vax/stand/conf.c 4.17
SCCS-vsn: sys/vax/stand/confxx.c 4.4
SCCS-vsn: sys/vax/stand/rl.c 4.2
SCCS-vsn: sys/vax/stand/uda.c 4.7

diff --git a/usr/src/sys/vax/stand/Makefile b/usr/src/sys/vax/stand/Makefile
index 403da1b..cba34cd 100644 (file)
--- a/usr/src/sys/vax/stand/Makefile
+++ b/usr/src/sys/vax/stand/Makefile
@@ -1,19 +1,21 @@
-#      Makefile        4.25    83/02/12
+#      Makefile        4.26    83/02/16

 
 DESTDIR=/
 CFLAGS=        -O -DSTANDALONE ${COPTS} 
 COPTS= -DVAX780 -DVAX750 -DVAX730
 
 DESTDIR=/
 CFLAGS=        -O -DSTANDALONE ${COPTS} 
 COPTS= -DVAX780 -DVAX750 -DVAX730

+730OPTS=-O -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 idc.c mba.c mt.c rk.c tm.c ts.c \
+       autoconf.c hp.c ht.c idc.c mba.c mt.c rk.c rl.c tm.c ts.c \

        up.c uba.c uda.c ut.c \
        drtest.c format.c up.new.c
        up.c uba.c uda.c ut.c \
        drtest.c format.c up.new.c

-DRIVERS=autoconf.o hp.o ht.o idc.o mba.o mt.o rk.o tm.o ts.o \
+DRIVERS=autoconf.o hp.o ht.o idc.o mba.o mt.o rk.o rl.o tm.o ts.o \

        up.o uba.o uda.o ut.o
 NEWDRIVERS=hp.new.o up.new.o
 
 ALL=   /usr/lib/libsa.a srt0.o boot tpboot copy tpcopy \
        up.o uba.o uda.o ut.o
 NEWDRIVERS=hp.new.o up.new.o
 
 ALL=   /usr/lib/libsa.a srt0.o boot tpboot copy tpcopy \

-       format tpformat drtest boothp boothk bootup
+       format tpformat drtest boothp boothk bootup bootra bootrl \
+       730boot 730copy

 
 all: ${ALL}
 
 
 all: ${ALL}
 


@@ -90,6 +92,26 @@ drtest:      confhpup.o hp.new.o up.new.o /usr/lib/libsa.a
 dkbad.o: ../vax/dkbad.c
        ${CC} -c ${CFLAGS} ../vax/dkbad.c
 
 dkbad.o: ../vax/dkbad.c
        ${CC} -c ${CFLAGS} ../vax/dkbad.c
 

+# for 730s minimize size so it fits on the cassette
+
+730boot: boot.o relsrt0.o 730bootconf.o /usr/lib/libsa.a
+       ld -N -T ${RELOC} -o 730boot relsrt0.o boot.o 730bootconf.o -lsa -lc
+
+730bootconf.o: conf.c ../h/param.h ../h/inode.h ../machine/pte.h
+730bootconf.o: ../h/fs.h saio.h
+       cp conf.c 730bootconf.c
+       cc -c ${730OPTS} -DBOOT 730bootconf.c
+       rm 730bootconf.c
+
+730copy: copy.o srt0.o 730conf.o /usr/lib/libsa.a
+       ld -N -o 730copy srt0.o copy.o 730conf.o -lsa -lc
+
+730conf.o: conf.c ../h/param.h ../h/inode.h ../machine/pte.h
+730conf.o: ../h/fs.h saio.h
+       cp conf.c 730conf.c
+       cc -c ${730OPTS} -DBOOT 730conf.c
+       rm 730conf.c
+

 # bootstrap from ether
 
 ### not yet, rosin, not yet ###
 # bootstrap from ether
 
 ### not yet, rosin, not yet ###


@@ -123,11 +145,34 @@ bootup.o: bootxx.c
        /lib/c2 -i bootxx.s | as -o bootup.o
        rm -f bootxx.s
 
        /lib/c2 -i bootxx.s | as -o bootup.o
        rm -f bootxx.s
 

+bootra: relsrt0.o bootra.o confra.o /usr/lib/libsa.a
+       ld -N -T ${RELOC} relsrt0.o bootra.o confra.o -lsa -lc
+       cp a.out b.out;strip b.out;dd if=b.out of=bootra ibs=32 skip=1;rm b.out
+
+bootra.o: bootxx.c
+       cc -c -S ${COPTS} -DBOOTRA bootxx.c
+       /lib/c2 -i bootxx.s | as -o bootra.o
+       rm -f bootxx.s
+
+bootrl: relsrt0.o bootrl.o confrl.o /usr/lib/libsa.a
+       ld -N -T ${RELOC} relsrt0.o bootrl.o confra.o -lsa -lc
+       cp a.out b.out;strip b.out;dd if=b.out of=bootrl ibs=32 skip=1;rm b.out
+
+bootrl.o: bootxx.c
+       cc -c -S ${COPTS} -DBOOTRL bootxx.c
+       /lib/c2 -i bootxx.s | as -o bootrl.o
+       rm -f bootxx.s
+

 boothp.o: bootxx.c ../h/param.h ../h/inode.h ../machine/pte.h ../h/reboot.h
 boothp.o: ../h/fs.h saio.h
 boothk.o: bootxx.c ../h/param.h ../h/inode.h ../machine/pte.h ../h/reboot.h
 boothk.o: ../h/fs.h saio.h
 bootup.o: bootxx.c ../h/param.h ../h/inode.h ../machine/pte.h ../h/reboot.h
 boothp.o: bootxx.c ../h/param.h ../h/inode.h ../machine/pte.h ../h/reboot.h
 boothp.o: ../h/fs.h saio.h
 boothk.o: bootxx.c ../h/param.h ../h/inode.h ../machine/pte.h ../h/reboot.h
 boothk.o: ../h/fs.h saio.h
 bootup.o: bootxx.c ../h/param.h ../h/inode.h ../machine/pte.h ../h/reboot.h

+bootup.o: ../h/fs.h saio.h
+bootra.o: bootxx.c ../h/param.h ../h/inode.h ../machine/pte.h ../h/reboot.h
+bootra.o: ../h/fs.h saio.h
+bootrl.o: bootxx.c ../h/param.h ../h/inode.h ../machine/pte.h ../h/reboot.h
+bootrl.o: ../h/fs.h saio.h

 
 confrk.o: confrk.c ../h/param.h ../h/fs.h ../machine/pte.h ../h/inode.h saio.h
        ${CC} -c ${CFLAGS} confrk.c
 
 confrk.o: confrk.c ../h/param.h ../h/fs.h ../machine/pte.h ../h/inode.h saio.h
        ${CC} -c ${CFLAGS} confrk.c


@@ -135,6 +180,10 @@ confhp.o: confhp.c ../h/param.h ../h/fs.h ../machine/pte.h ../h/inode.h saio.h
        ${CC} -c ${CFLAGS} confhp.c
 confup.o: confup.c ../h/param.h ../h/fs.h ../machine/pte.h ../h/inode.h saio.h
        ${CC} -c ${CFLAGS} confup.c
        ${CC} -c ${CFLAGS} confhp.c
 confup.o: confup.c ../h/param.h ../h/fs.h ../machine/pte.h ../h/inode.h saio.h
        ${CC} -c ${CFLAGS} confup.c

+confra.o: confra.c ../h/param.h ../h/fs.h ../machine/pte.h ../h/inode.h saio.h
+       ${CC} -c ${CFLAGS} confra.c
+confrl.o: confrl.c ../h/param.h ../h/fs.h ../machine/pte.h ../h/inode.h saio.h
+       ${CC} -c ${CFLAGS} confrl.c

 
 confrk.c: confxx.c
        sed -e 's/XX/hk/' -e 's/xx/rk/g' <confxx.c >confrk.c
 
 confrk.c: confxx.c
        sed -e 's/XX/hk/' -e 's/xx/rk/g' <confxx.c >confrk.c


@@ -142,6 +191,10 @@ 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
        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

+confra.c: confxx.c
+       sed -e 's/XX/ra/' -e 's/xx/ra/g' <confxx.c >confra.c
+confrl.c: confxx.c
+       sed -e 's/XX/rl/' -e 's/xx/rl/g' <confxx.c >confrl.c

 
 # utilities
 
 
 # utilities
 


@@ -155,6 +208,7 @@ clean:
        rm -f a.out b.out boot cat tpboot tpcopy copy tpformat
        rm -f boot[a-z]? conf[a-wyz][a-z].c
        rm -f format drtest core sboot bootconf.c
        rm -f a.out b.out boot cat tpboot tpcopy copy tpformat
        rm -f boot[a-z]? conf[a-wyz][a-z].c
        rm -f format drtest core sboot bootconf.c

+       rm -f 730boot 730copy

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


@@ -167,10 +221,16 @@ install: ${ALL}
        cp tpformat ${DESTDIR}/tp/format
        cp copy a.out; strip a.out; dd if=a.out of=../floppy/copy bs=32 skip=1
        cp boot a.out; strip a.out; dd if=a.out of=../floppy/boot bs=32 skip=1
        cp tpformat ${DESTDIR}/tp/format
        cp copy a.out; strip a.out; dd if=a.out of=../floppy/copy bs=32 skip=1
        cp boot a.out; strip a.out; dd if=a.out of=../floppy/boot bs=32 skip=1

+       cp 730boot a.out; strip a.out; \
+               dd if=a.out of=../cassette/boot bs=32 skip=1
+       cp 730copy a.out; strip a.out; \
+               dd if=a.out of=../cassette/copy bs=32 skip=1

        cp format a.out; strip a.out; \
                dd if=a.out of=../floppy/format bs=32 skip=1
        cp format a.out; strip a.out; \
                dd if=a.out of=../floppy/format bs=32 skip=1

+       cp ../floppy/format ../cassette/format

        cp drtest a.out; strip a.out; \
                dd if=a.out of=../floppy/drtest bs=32 skip=1
        cp drtest a.out; strip a.out; \
                dd if=a.out of=../floppy/drtest bs=32 skip=1

-       cp bootup boothk boothp ${DESTDIR}/usr/mdec
+       cp ../floppy/drtest ../cassette/drtest
+       cp bootup boothk boothp bootra bootrl ${DESTDIR}/usr/mdec

 
 # beware...
 
 # beware...

diff --git a/usr/src/sys/vax/stand/bootxx.c b/usr/src/sys/vax/stand/bootxx.c
index e0f64f2..c93d2eb 100644 (file)
--- a/usr/src/sys/vax/stand/bootxx.c
+++ b/usr/src/sys/vax/stand/bootxx.c
@@ -1,4 +1,4 @@
-/*     bootxx.c        4.1     82/07/19        */
+/*     bootxx.c        4.2     83/02/16        */

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


@@ -17,6 +17,12 @@ char bootprog[] = "hp(0,0)boot";
 #ifdef BOOTUP
 char bootprog[] = "up(0,0)boot";
 #endif
 #ifdef BOOTUP
 char bootprog[] = "up(0,0)boot";
 #endif

+#ifdef BOOTRA
+char bootprog[] = "ra(0,0)boot";
+#endif
+#ifdef BOOTRL
+char bootprog[] = "rl(0,0)boot";
+#endif

 
 /*
  * Boot program... arguments passed in r10 and r11
 
 /*
  * Boot program... arguments passed in r10 and r11

diff --git a/usr/src/sys/vax/stand/conf.c b/usr/src/sys/vax/stand/conf.c
index 57350a5..92ebfd1 100644 (file)
--- a/usr/src/sys/vax/stand/conf.c
+++ b/usr/src/sys/vax/stand/conf.c
@@ -1,4 +1,4 @@
-/*     conf.c  4.16    83/02/16        */
+/*     conf.c  4.17    83/02/16        */

 
 #include "../machine/pte.h"
 
 
 #include "../machine/pte.h"
 


@@ -81,8 +81,9 @@ int   hpstrategy(), hpopen(), hpioctl();
 #endif
 int    upstrategy(), upopen(), upioctl();
 int    rkstrategy(), rkopen(), rkioctl();
 #endif
 int    upstrategy(), upopen(), upioctl();
 int    rkstrategy(), rkopen(), rkioctl();

-int    udstrategy(), udopen(), udioctl();
+int    rastrategy(), raopen(), raioctl();

 int    idcstrategy(), idcopen(), idcioctl();
 int    idcstrategy(), idcopen(), idcioctl();

+int    rlstrategy(), rlopen(), rlioctl();

 #ifndef BOOT
 int    tmstrategy(), tmopen(), tmclose();
 int    tsstrategy(), tsopen(), tsclose();
 #ifndef BOOT
 int    tmstrategy(), tmopen(), tmclose();
 int    tsstrategy(), tsopen(), tsclose();


@@ -99,10 +100,11 @@ struct devsw devsw[] = {
 #endif
        { "up", upstrategy,     upopen,         nullsys,        upioctl },
        { "hk", rkstrategy,     rkopen,         nullsys,        rkioctl },
 #endif
        { "up", upstrategy,     upopen,         nullsys,        upioctl },
        { "hk", rkstrategy,     rkopen,         nullsys,        rkioctl },

-       { "ra", udstrategy,     udopen,         nullsys,        udioctl },
+       { "ra", rastrategy,     raopen,         nullsys,        raioctl },

 #if defined(VAX730)
        { "rb", idcstrategy,    idcopen,        nullsys,        idcioctl },
 #endif
 #if defined(VAX730)
        { "rb", idcstrategy,    idcopen,        nullsys,        idcioctl },
 #endif

+       { "rl", rlstrategy,     rlopen,         nullsys,        rlioctl },

 #ifndef BOOT
        { "ts", tsstrategy,     tsopen,         tsclose,        nullioctl },
 #if defined(VAX780) || defined(VAX750)
 #ifndef BOOT
        { "ts", tsstrategy,     tsopen,         tsclose,        nullioctl },
 #if defined(VAX780) || defined(VAX750)

diff --git a/usr/src/sys/vax/stand/confxx.c b/usr/src/sys/vax/stand/confxx.c
index c1f9a5c..c0551e3 100644 (file)
--- a/usr/src/sys/vax/stand/confxx.c
+++ b/usr/src/sys/vax/stand/confxx.c
@@ -1,4 +1,4 @@
-/*     confxx.c        4.3     82/12/30        */
+/*     confxx.c        4.4     83/02/16        */

 
 #include "../machine/pte.h"
 
 
 #include "../machine/pte.h"
 


@@ -10,23 +10,25 @@
 devread(io)
        register struct iob *io;
 {
 devread(io)
        register struct iob *io;
 {

-       int error;
+       int cc;

 
        io->i_flgs |= F_RDDATA;
 
        io->i_flgs |= F_RDDATA;

-       error = (*devsw[io->i_ino.i_dev].dv_strategy)(io, READ);
+       io->i_error = 0;
+       cc = (*devsw[io->i_ino.i_dev].dv_strategy)(io, READ);

        io->i_flgs &= ~F_TYPEMASK;
        io->i_flgs &= ~F_TYPEMASK;

-       return (error);
+       return (cc);

 }
 
 devwrite(io)
        register struct iob *io;
 {
 }
 
 devwrite(io)
        register struct iob *io;
 {

-       int error;
+       int cc;

 
        io->i_flgs |= F_WRDATA;
 
        io->i_flgs |= F_WRDATA;

-       error = (*devsw[io->i_ino.i_dev].dv_strategy)(io, WRITE);
+       io->i_error = 0;
+       cc = (*devsw[io->i_ino.i_dev].dv_strategy)(io, WRITE);

        io->i_flgs &= ~F_TYPEMASK;
        io->i_flgs &= ~F_TYPEMASK;

-       return (error);
+       return (cc);

 }
 
 devopen(io)
 }
 
 devopen(io)

diff --git a/usr/src/sys/vax/stand/rl.c b/usr/src/sys/vax/stand/rl.c
index 2d42128..dd5780d 100644 (file)
--- a/usr/src/sys/vax/stand/rl.c
+++ b/usr/src/sys/vax/stand/rl.c
@@ -1,4 +1,4 @@
-/*     rl.c    4.1     83/02/08        */
+/*     rl.c    4.2     83/02/16        */

 
 /*
  * Standalone RL02 disk driver
 
 /*
  * Standalone RL02 disk driver


@@ -205,3 +205,12 @@ rlwait(rladdr)
        while ((rladdr->rlcs & RL_CRDY) == 0)
                continue;
 }
        while ((rladdr->rlcs & RL_CRDY) == 0)
                continue;
 }

+
+rlioctl(io, cmd, arg)
+       struct iob *io;
+       int cmd;
+       caddr_t arg;
+{
+
+       return (ECMD);
+}

diff --git a/usr/src/sys/vax/stand/uda.c b/usr/src/sys/vax/stand/uda.c
index 36ecd12..733da1c 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.6     83/02/16        */
+/*     uda.c   4.7     83/02/16        */

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


@@ -42,7 +42,7 @@ int uda_off[] = { 0, 15884, 0, -1, -1, -1, 49324, 131404 };
 
 struct mscp *udcmd();
 
 
 struct mscp *udcmd();
 

-udopen(io)
+raopen(io)

        register struct iob *io;
 {
        register struct mscp *mp;
        register struct iob *io;
 {
        register struct mscp *mp;


@@ -112,7 +112,7 @@ udcmd(op)
        return(mp);
 }
 
        return(mp);
 }
 

-udstrategy(io, func)
+rastrategy(io, func)

        register struct iob *io;
 {
        register struct mscp *mp;
        register struct iob *io;
 {
        register struct mscp *mp;


@@ -134,7 +134,7 @@ udstrategy(io, func)
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

-udioctl(io, cmd, arg)
+raioctl(io, cmd, arg)

        struct iob *io;
        int cmd;
        caddr_t arg;
        struct iob *io;
        int cmd;
        caddr_t arg;