*** /old/src/sys/conf/boot/rmboot.s	Thu Feb 19 22:24:03 1987
--- /usr/src/sys/conf/boot/rmboot.s	Fri Apr 19 21:03:43 1991
***************
*** 1,5 ****
  /*
!  *	SCCS id	@(#)rmboot.s	1.2 (Berkeley)	2/19/87
   */
  #include "localopts.h"
  
--- 1,5 ----
  /*
!  *	SCCS id	@(#)rmboot.s	2.0 (2.11BSD)	4/13/91
   */
  #include "localopts.h"
  
***************
*** 8,19 ****
  ENDCORE=	160000		/ end of core, mem. management off
  SZFLAGS=	6		/ size of boot flags
  BOOTOPTS=	2		/ location of options, bytes below ENDCORE
! BOOTDEV=	4
  CHECKWORD=	6
  
! reset= 	5
! 
! .globl	_doboot, hardboot
  .text
  _doboot:
  	mov	4(sp),r4	/ boot options
--- 8,17 ----
  ENDCORE=	160000		/ end of core, mem. management off
  SZFLAGS=	6		/ size of boot flags
  BOOTOPTS=	2		/ location of options, bytes below ENDCORE
! BOOTDEV=	4		/ boot unit
  CHECKWORD=	6
  
! .globl	_doboot, hardboot, _bootcsr
  .text
  _doboot:
  	mov	4(sp),r4	/ boot options
***************
*** 35,44 ****
  #endif
  
  /  On power fail, hardboot is the entry point (map is already off)
! /  and the args are in r4, r3.
  
  hardboot:
  	mov	r4, ENDCORE-BOOTOPTS
  	mov	r3, ENDCORE-BOOTDEV
  	com	r4		/ if CHECKWORD == ~bootopts, flags are believed
  	mov	r4, ENDCORE-CHECKWORD
--- 33,44 ----
  #endif
  
  /  On power fail, hardboot is the entry point (map is already off)
! /  and the args are in r4 (RB_POWRFAIL), r3 (rootdev)
  
  hardboot:
  	mov	r4, ENDCORE-BOOTOPTS
+ 	ash	$-3,r3		/ shift out the partition number
+ 	bic	$!7,r3		/ save only the drive number
  	mov	r3, ENDCORE-BOOTDEV
  	com	r4		/ if CHECKWORD == ~bootopts, flags are believed
  	mov	r4, ENDCORE-CHECKWORD
***************
*** 59,65 ****
  FMT22	= 10000
  DRIVE	= 0
  
! rmcs1	= 176700
  rmda	= rmcs1+6
  rmcs2	= rmcs1+10
  rmds	= rmcs1+12
--- 59,65 ----
  FMT22	= 10000
  DRIVE	= 0
  
! rmcs1	= 0
  rmda	= rmcs1+6
  rmcs2	= rmcs1+10
  rmds	= rmcs1+12
***************
*** 66,81 ****
  rmof	= rmcs1+32
  rmca	= rmcs1+34
  
! 	mov	$DRIVE,*$rmcs2
! 	mov	$PRESET+GO,*$rmcs1
! 	mov	$FMT22,*$rmof
! 	clr	*$rmca
! 	mov	$rmda,r0
! 	clr	(r0)
! 	clr	-(r0)
! 	mov	$WC,-(r0)
! 	mov	$READ+GO,-(r0)
  1:
! 	tstb	(r0)
  	bge	1b
! 	jmp	*$0
--- 66,84 ----
  rmof	= rmcs1+32
  rmca	= rmcs1+34
  
! 	mov	_bootcsr,r1
! 	mov	ENDCORE-BOOTDEV,rmcs2(r1)
! 	mov	$PRESET+GO,rmcs1(r1)
! 	mov	$FMT22,rmof(r1)
! 	clr	rmca(r1)
! 	add	$rmcs2,r1
! 	mov	ENDCORE-BOOTDEV,(r1)
! 	clr	-(r1)
! 	clr	-(r1)
! 	mov	$WC,-(r1)
! 	mov	$READ+GO,-(r1)
  1:
! 	tstb	(r1)
  	bge	1b
! 	mov	ENDCORE-BOOTDEV,r0
! 	clr	pc
*** /old/src/sys/conf/boot/sc11boot.s	Thu Feb 19 22:24:03 1987
--- /usr/src/sys/conf/boot/sc11boot.s	Fri Apr 19 21:03:49 1991
***************
*** 1,5 ****
  /*
!  *	SCCS id	@(#)sc11boot.s	1.2 (Berkeley)	2/19/87
   */
  #include "localopts.h"
  
--- 1,5 ----
  /*
!  *	SCCS id	@(#)sc11boot.s	2.0 (2.11BSD)	4/13/91
   */
  #include "localopts.h"
  
***************
*** 8,19 ****
  ENDCORE=	160000		/ end of core, mem. management off
  SZFLAGS=	6		/ size of boot flags
  BOOTOPTS=	2		/ location of options, bytes below ENDCORE
! BOOTDEV=	4
  CHECKWORD=	6
  
! reset= 	5
! 
! .globl	_doboot, hardboot
  .text
  _doboot:
  	mov	4(sp),r4	/ boot options
--- 8,17 ----
  ENDCORE=	160000		/ end of core, mem. management off
  SZFLAGS=	6		/ size of boot flags
  BOOTOPTS=	2		/ location of options, bytes below ENDCORE
! BOOTDEV=	4		/ boot unit
  CHECKWORD=	6
  
! .globl	_doboot, hardboot, _bootcsr
  .text
  _doboot:
  	mov	4(sp),r4	/ boot options
***************
*** 35,44 ****
  #endif
  
  /  On power fail, hardboot is the entry point (map is already off)
! /  and the args are in r4, r3.
  
  hardboot:
  	mov	r4, ENDCORE-BOOTOPTS
  	mov	r3, ENDCORE-BOOTDEV
  	com	r4		/ if CHECKWORD == ~bootopts, flags are believed
  	mov	r4, ENDCORE-CHECKWORD
--- 33,44 ----
  #endif
  
  /  On power fail, hardboot is the entry point (map is already off)
! /  and the args are in r4 (RB_POWRFAIL), r3 (rootdev)
  
  hardboot:
  	mov	r4, ENDCORE-BOOTOPTS
+ 	ash	$-3,r3		/ shift out the partition number
+ 	bic	$!7,r3		/ save only the drive number
  	mov	r3, ENDCORE-BOOTDEV
  	com	r4		/ if CHECKWORD == ~bootopts, flags are believed
  	mov	r4, ENDCORE-CHECKWORD
***************
*** 51,67 ****
  /  if necessary, read in block 0 to location 0 "by hand".
  
  /  Bootstrap for Emulex SC11/B with boot opcode
! unit =	0		/  unit to boot from
! RMCS1=	176700
! RMCS2=	176710
  BOOT=	75
! 	mov	$RMCS1,r0
! 	mov	$unit, RMCS2
! 	mov	$BOOT,(r0)
! 2:	tstb	(r0)
  	bpl	2b		/ wait for done (RDY)
! 	tst	(r0)
  	bmi	1b		/ try again on error (TRE)
! 
! 	jmp	*$0
! / no return
--- 51,65 ----
  /  if necessary, read in block 0 to location 0 "by hand".
  
  /  Bootstrap for Emulex SC11/B with boot opcode
! RMCS1=	0
! RMCS2=	10
  BOOT=	75
! 	mov	_bootcsr,r1
! 	mov	ENDCORE-BOOTDEV, RMCS2(r1)
! 	mov	$BOOT,(r1)
! 2:	tstb	(r1)
  	bpl	2b		/ wait for done (RDY)
! 	tst	(r1)
  	bmi	1b		/ try again on error (TRE)
! 	mov	ENDCORE-BOOTDEV,r0
! 	clr	pc
*** /old/src/sys/conf/boot/sc21boot.s	Thu Feb 19 22:24:03 1987
--- /usr/src/sys/conf/boot/sc21boot.s	Fri Apr 19 21:03:55 1991
***************
*** 1,5 ****
  /*
!  *	SCCS id	@(#)sc21boot.s	1.2 (Berkeley)	2/19/87
   */
  #include "localopts.h"
  
--- 1,5 ----
  /*
!  *	SCCS id	@(#)sc21boot.s	2.0 (2.11BSD)	4/13/91
   */
  #include "localopts.h"
  
***************
*** 8,19 ****
  ENDCORE=	160000		/ end of core, mem. management off
  SZFLAGS=	6		/ size of boot flags
  BOOTOPTS=	2		/ location of options, bytes below ENDCORE
! BOOTDEV=	4
  CHECKWORD=	6
  
! reset= 	5
! 
! .globl	_doboot, hardboot
  .text
  _doboot:
  	mov	4(sp),r4	/ boot options
--- 8,17 ----
  ENDCORE=	160000		/ end of core, mem. management off
  SZFLAGS=	6		/ size of boot flags
  BOOTOPTS=	2		/ location of options, bytes below ENDCORE
! BOOTDEV=	4		/ boot unit
  CHECKWORD=	6
  
! .globl	_doboot, hardboot, _bootcsr
  .text
  _doboot:
  	mov	4(sp),r4	/ boot options
***************
*** 35,44 ****
  #endif
  
  /  On power fail, hardboot is the entry point (map is already off)
! /  and the args are in r4, r3.
  
  hardboot:
  	mov	r4, ENDCORE-BOOTOPTS
  	mov	r3, ENDCORE-BOOTDEV
  	com	r4		/ if CHECKWORD == ~bootopts, flags are believed
  	mov	r4, ENDCORE-CHECKWORD
--- 33,44 ----
  #endif
  
  /  On power fail, hardboot is the entry point (map is already off)
! /  and the args are in r4 (RB_POWRFAIL), r3 (rootdev)
  
  hardboot:
  	mov	r4, ENDCORE-BOOTOPTS
+ 	ash	$-3,r3		/ shift out the partition number
+ 	bic	$!7,r3		/ save only the drive number
  	mov	r3, ENDCORE-BOOTDEV
  	com	r4		/ if CHECKWORD == ~bootopts, flags are believed
  	mov	r4, ENDCORE-CHECKWORD
***************
*** 52,70 ****
  
  /  Bootstrap for Emulex SC21 with boot opcode
  
! unit =	0		/  unit to boot from
! RMCS1=	176700
! RMCS2=	176710
! RMHR=	176736
  BOOT=	75
! 	mov	$RMCS1,r0
! 	mov	$unit, RMCS2
! 	mov	$-1, RMHR	/ enable extended opcodes
! 	mov	$BOOT,(r0)
! 2:	tstb	(r0)
  	bpl	2b		/ wait for done (RDY)
! 	tst	(r0)
  	bmi	1b		/ try again on error (TRE)
! 
! 	jmp	*$0
! / no return
--- 52,68 ----
  
  /  Bootstrap for Emulex SC21 with boot opcode
  
! RMCS1=	0
! RMCS2=	10
! RMHR=	36
  BOOT=	75
! 	mov	_bootcsr,r1
! 	mov	ENDCORE-BOOTDEV, RMCS2(r1)
! 	mov	$-1, RMHR(r1)	/ enable extended opcodes
! 	mov	$BOOT,(r1)
! 2:	tstb	(r1)
  	bpl	2b		/ wait for done (RDY)
! 	tst	(r1)
  	bmi	1b		/ try again on error (TRE)
! 	mov	ENDCORE-BOOTDEV,r0
! 	clr	pc
*** /old/src/sys/conf/boot/siboot.s	Thu Feb 19 22:24:03 1987
--- /usr/src/sys/conf/boot/siboot.s	Fri Apr 19 21:04:01 1991
***************
*** 1,5 ****
  /*
!  *	SCCS id	@(#)siboot.s	1.2 (Berkeley)	2/19/87
   */
  #include "localopts.h"
  
--- 1,5 ----
  /*
!  *	SCCS id	@(#)siboot.s	2.0 (2.11BSD)	4/13/91
   */
  #include "localopts.h"
  
***************
*** 8,19 ****
  ENDCORE=	160000		/ end of core, mem. management off
  SZFLAGS=	6		/ size of boot flags
  BOOTOPTS=	2		/ location of options, bytes below ENDCORE
! BOOTDEV=	4
  CHECKWORD=	6
  
! reset= 	5
! 
! .globl	_doboot, hardboot
  .text
  _doboot:
  	mov	4(sp),r4	/ boot options
--- 8,17 ----
  ENDCORE=	160000		/ end of core, mem. management off
  SZFLAGS=	6		/ size of boot flags
  BOOTOPTS=	2		/ location of options, bytes below ENDCORE
! BOOTDEV=	4		/ boot unit
  CHECKWORD=	6
  
! .globl	_doboot, hardboot, _bootcsr
  .text
  _doboot:
  	mov	4(sp),r4	/ boot options
***************
*** 35,44 ****
  #endif
  
  /  On power fail, hardboot is the entry point (map is already off)
! /  and the args are in r4, r3.
  
  hardboot:
  	mov	r4, ENDCORE-BOOTOPTS
  	mov	r3, ENDCORE-BOOTDEV
  	com	r4		/ if CHECKWORD == ~bootopts, flags are believed
  	mov	r4, ENDCORE-CHECKWORD
--- 33,44 ----
  #endif
  
  /  On power fail, hardboot is the entry point (map is already off)
! /  and the args are in r4 (RB_POWRFAIL), r3 (rootdev)
  
  hardboot:
  	mov	r4, ENDCORE-BOOTOPTS
+ 	ash	$-3,r3		/ shift out the partition number
+ 	bic	$!7,r3		/ save only the drive number
  	mov	r3, ENDCORE-BOOTDEV
  	com	r4		/ if CHECKWORD == ~bootopts, flags are believed
  	mov	r4, ENDCORE-CHECKWORD
***************
*** 56,62 ****
  READ	= 4
  GO	= 1
  
! sicnr	= 176700
  siwcr	= sicnr+2
  sipcr	= sicnr+4
  sihsr	= sicnr+6
--- 56,62 ----
  READ	= 4
  GO	= 1
  
! sicnr	= 0
  siwcr	= sicnr+2
  sipcr	= sicnr+4
  sihsr	= sicnr+6
***************
*** 64,90 ****
  sierr	= sicnr+12
  siscr	= sicnr+24
  
! 	mov	*$siscr,r0	/ load dual port register
! 	bit	$200,r0		/ see if grant set
  	bne	1f		/ if set, is dual ported controller
! 	mov	*$sierr,r0	/ load error register
  	bic	$037777,r0	/ clear all but contention and error bits
  	cmp	$140000,r0	/ see if we have a contention error
  	bne	2f		/ if not, controller is not dual ported
  1:
! 	bit	$200,*$siscr	/ test for grant
  	bne	2f		/ if set, ok for read
! 	clr	*$sicnr		/ send logic master clear
! 	mov	$1,*$siscr	/ request grant
  	br	1b		/ loop until grant
  2:
! 	clr	r0		/ clear r0
! 	mov	r0,*$sipcr	/ port 0 cylinder 0
! 	mov	r0,*$sihsr	/ head 0 sector 0
! 	mov	r0,*$simar	/ address 0
! 	mov	$WC,*$siwcr	/ word count
! 	mov	$READ+GO,*$sicnr
  1:
! 	tstb	*$sicnr
  	bge	1b
! 	jmp	*$0
--- 64,92 ----
  sierr	= sicnr+12
  siscr	= sicnr+24
  
! 	mov	_bootcsr,r1
! 	bit	$200,siscr(r1)	/ see if grant set
  	bne	1f		/ if set, is dual ported controller
! 	mov	sierr(r1),r0	/ load error register
  	bic	$037777,r0	/ clear all but contention and error bits
  	cmp	$140000,r0	/ see if we have a contention error
  	bne	2f		/ if not, controller is not dual ported
  1:
! 	bit	$200,siscr(r1)	/ test for grant
  	bne	2f		/ if set, ok for read
! 	clr	sicnr(r1)	/ send logic master clear
! 	mov	$1,siscr(r1)	/ request grant
  	br	1b		/ loop until grant
  2:
! 	mov	ENDCORE-BOOTDEV,r0
! 	ash	$10.,r0
! 	mov	r0,sipcr(r1)	/ port 0 cylinder 0, unit
! 	clr	sihsr(r1)	/ head 0 sector 0
! 	clr	simar(r1)	/ address 0
! 	mov	$WC,siwcr(r1)	/ word count
! 	mov	$READ+GO,sicnr(r1)
  1:
! 	tstb	sicnr(r1)
  	bge	1b
! 	mov	ENDCORE-BOOTDEV,r0
! 	clr	pc
*** /old/src/sys/conf/checksys.c	Thu May 31 15:18:19 1990
--- /usr/src/sys/conf/checksys.c	Sat Mar 30 21:39:12 1991
***************
*** 37,42 ****
--- 37,43 ----
  #define	N_XITDESC	18
  #define	N_QUOTDESC	19
  #define	N_NAMECACHE	20
+ #define	N_IOSIZE	21
  
  struct nlist nl[] = {
  	{ "_end" },			/*  0 */
***************
*** 60,65 ****
--- 61,67 ----
  	{ "_xitdesc" },			/* 18 */
  	{ "_quotdes" },			/* 19 */
  	{ "_namecac" },			/* 20 */
+ 	{ "__iosize" },			/* 21 */
  	{ "" },
  };
  
***************
*** 223,229 ****
  			if (nl[N_END].n_value < 0120000)
  				printf("Data ends %u bytes below the remapping area (0120000-0140000, KDSD5)\nyou may define NOKA5.\n", 0120000 - nl[N_END].n_value);
  		}
! 	totsize += cround(getval(N_NBUF) * getval(N_BSIZE));
  	if (nl[N_CLIST].n_value)
  		totsize += cround(getval(N_CLIST) * (long)sizeof(struct cblock));
  	if (nl[N_RAM].n_type)
--- 225,231 ----
  			if (nl[N_END].n_value < 0120000)
  				printf("Data ends %u bytes below the remapping area (0120000-0140000, KDSD5)\nyou may define NOKA5.\n", 0120000 - nl[N_END].n_value);
  		}
! 	totsize += (getval(N_NBUF) * getval(N_BSIZE));
  	if (nl[N_CLIST].n_value)
  		totsize += cround(getval(N_CLIST) * (long)sizeof(struct cblock));
  	if (nl[N_RAM].n_type)
***************
*** 234,239 ****
--- 236,243 ----
  		totsize += (ninode * 3 * sizeof (long));
  	if (nl[N_NAMECACHE].n_type)
  		totsize += (ninode * sizeof(struct namecache));
+ 	if (nl[N_IOSIZE].n_type)
+ 		totsize += getval(N_IOSIZE);
  	totsize += ctob(USIZE);
  	printf("System will occupy %ld bytes of memory (including buffers and clists).\n", totsize);
  	for (i = 0;nl[i].n_name[0];++i) {
***************
*** 260,266 ****
  
  	if ((nl[indx].n_type&N_TYPE) == N_BSS)
  		return((long)0);
! 	offst = nl[indx].n_value + obj.a_text + sizeof(obj);
  	if (obj.a_magic == A_MAGIC2 || obj.a_magic == A_MAGIC5)
  		offst -= (off_t)round(obj.a_text);
  	if (obj.a_magic == A_MAGIC5 || obj.a_magic == A_MAGIC6) {
--- 264,272 ----
  
  	if ((nl[indx].n_type&N_TYPE) == N_BSS)
  		return((long)0);
! 	offst = nl[indx].n_value;
! 	offst += obj.a_text;
! 	offst += sizeof(obj);
  	if (obj.a_magic == A_MAGIC2 || obj.a_magic == A_MAGIC5)
  		offst -= (off_t)round(obj.a_text);
  	if (obj.a_magic == A_MAGIC5 || obj.a_magic == A_MAGIC6) {
*** /old/src/sys/conf/config	Wed Aug 22 18:26:07 1990
--- /usr/src/sys/conf/config	Sun Dec 22 16:14:29 1991
***************
*** 60,65 ****
--- 60,66 ----
  case $PDP11 in
  	23|24|34)
  		KERN_NONSEP=YES
+ 		NETFIX=:splfix.mtps
  		SPLFIX=:splfix.mtps;;
  	GENERIC)
  #		if [ $NONFP = NO ]; then
***************
*** 68,87 ****
  #		fi
  #		eventually: KERN_NONSEP=YES
  		KERN_NONSEP=NO
  		SPLFIX=:splfix.movb;;
  	35|40|60)
  		KERN_NONSEP=YES
  		SPLFIX=:splfix.movb;;
! 	53|73|83)
  		KERN_NONSEP=NO
! 		SPLFIX=:splfix.mtps;;
! 	44|45|50|55|70|84)
  		KERN_NONSEP=NO
  		SPLFIX=:splfix.spl;;
  	*)
  		echo "$0: unrecognized PDP11 type $PDP11."
  		echo 'use GENERIC, 23, 24, 34, 35, 40, 44, 45, 50, 53, 55,'
! 		echo '	60, 70, 73, 83, 84.'
  		exit 1;;
  esac
  
--- 69,92 ----
  #		fi
  #		eventually: KERN_NONSEP=YES
  		KERN_NONSEP=NO
+ 		NETFIX=:splfix.movb
  		SPLFIX=:splfix.movb;;
  	35|40|60)
  		KERN_NONSEP=YES
+ 		NETFIX=:splfix.movb
  		SPLFIX=:splfix.movb;;
! 	53|73|83|84|93|94)
  		KERN_NONSEP=NO
! 		NETFIX=:splfix.movb+mfps
! 		SPLFIX=:splfix.mfps;;
! 	44|45|50|55|70)
  		KERN_NONSEP=NO
+ 		NETFIX=:splfix.movb
  		SPLFIX=:splfix.spl;;
  	*)
  		echo "$0: unrecognized PDP11 type $PDP11."
  		echo 'use GENERIC, 23, 24, 34, 35, 40, 44, 45, 50, 53, 55,'
! 		echo '	60, 70, 73, 83, 84, 93, 94'
  		exit 1;;
  esac
  
***************
*** 100,111 ****
  	echo "Copying standard files to ../$MACHINE."
  	if [ $NEC = 0 ]; then
  		if [ $UCB_NET = YES ]; then
! 			cp spl/:splfix.movb ../$MACHINE/NETSPLFIX
  		fi
  		cp spl/$SPLFIX ../$MACHINE/SPLFIX
  	else
  		if [ $UCB_NET = YES ]; then
! 			cp spl_3com/:splfix.movb ../$MACHINE/NETSPLFIX
  		fi
  		cp spl_3com/$SPLFIX ../$MACHINE/SPLFIX
  	fi
--- 105,116 ----
  	echo "Copying standard files to ../$MACHINE."
  	if [ $NEC = 0 ]; then
  		if [ $UCB_NET = YES ]; then
! 			cp spl/$NETFIX ../$MACHINE/NETSPLFIX
  		fi
  		cp spl/$SPLFIX ../$MACHINE/SPLFIX
  	else
  		if [ $UCB_NET = YES ]; then
! 			cp spl_3com/$NETFIX ../$MACHINE/NETSPLFIX
  		fi
  		cp spl_3com/$SPLFIX ../$MACHINE/SPLFIX
  	fi
***************
*** 229,234 ****
--- 234,240 ----
  echo "#define NDM	$NDM"		>> ../$MACHINE/dh.h
  echo "#define NDN	$NDN"		> ../$MACHINE/dn.h
  echo "#define NDHU	$NDHU"		> ../$MACHINE/dhu.h
+ echo "#define NDHV	$NDHV"		> ../$MACHINE/dhv.h
  echo "#define NDMC	$NDMC"		> ../$MACHINE/dmc.h
  echo "#define NDR	$NDR"		> ../$MACHINE/dr.h
  echo "#define NDZ	$NDZ"		> ../$MACHINE/dz.h
*** /old/src/sys/conf/spl/:splfix.movb	Mon May  2 08:08:46 1988
--- /usr/src/sys/conf/spl/:splfix.movb	Tue Jan  7 21:06:38 1992
***************
*** 1,32 ****
  g/jsr	pc,__spl0/s//clrb 177776/
! g/jsr	pc,__spl1/s//movb $40, 177776/
  g/jsr	pc,__splsof/s//movb $40, 177776/
- g/jsr	pc,__spl2/s//movb $100, 177776/
  g/jsr	pc,__splnet/s//movb $100, 177776/
- g/jsr	pc,__spl3/s//movb $140, 177776/
- g/jsr	pc,__spl4/s//movb $200, 177776/
- g/jsr	pc,__spl5/s//movb $240, 177776/
  g/jsr	pc,__splimp/s//movb $240, 177776/
  g/jsr	pc,__splbio/s//movb $240, 177776/
  g/jsr	pc,__spltty/s//movb $240, 177776/
- g/jsr	pc,__spl6/s//movb $300, 177776/
  g/jsr	pc,__splclo/s//movb $300, 177776/
- g/jsr	pc,__spl7/s//movb $340, 177776/
  g/jsr	pc,__splhig/s//movb $340, 177776/
  g/jsr	pc,_spl0/s//movb 177776,r0;clrb 177776/
! g/jsr	pc,_spl1/s//movb 177776,r0;movb $40, 177776/
  g/jsr	pc,_splsoft/s//movb 177776,r0;movb $40, 177776/
- g/jsr	pc,_spl2/s//movb 177776,r0;movb $100, 177776/
  g/jsr	pc,_splnet/s//movb 177776,r0;movb $100, 177776/
- g/jsr	pc,_spl3/s//movb 177776,r0;movb $140, 177776/
- g/jsr	pc,_spl4/s//movb 177776,r0;movb $200, 177776/
- g/jsr	pc,_spl5/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_splbio/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_splimp/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_spltty/s//movb 177776,r0;movb $240, 177776/
- g/jsr	pc,_spl6/s//movb 177776,r0;movb $300, 177776/
  g/jsr	pc,_splcloc/s//movb 177776,r0;movb $300, 177776/
- g/jsr	pc,_spl7/s//movb 177776,r0;movb $340,177776/
  g/jsr	pc,_splhigh/s//movb 177776,r0;movb $340, 177776/
  w
  q
--- 1,20 ----
  g/jsr	pc,__spl0/s//clrb 177776/
! g/jsr	pc,__spl\([1-7]\)/s//movb $40*\1, 177776/
  g/jsr	pc,__splsof/s//movb $40, 177776/
  g/jsr	pc,__splnet/s//movb $100, 177776/
  g/jsr	pc,__splimp/s//movb $240, 177776/
  g/jsr	pc,__splbio/s//movb $240, 177776/
  g/jsr	pc,__spltty/s//movb $240, 177776/
  g/jsr	pc,__splclo/s//movb $300, 177776/
  g/jsr	pc,__splhig/s//movb $340, 177776/
  g/jsr	pc,_spl0/s//movb 177776,r0;clrb 177776/
! g/jsr	pc,_spl\([1-7]\)/s//movb 177776,r0;movb $40*\1, 177776/
  g/jsr	pc,_splsoft/s//movb 177776,r0;movb $40, 177776/
  g/jsr	pc,_splnet/s//movb 177776,r0;movb $100, 177776/
  g/jsr	pc,_splbio/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_splimp/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_spltty/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_splcloc/s//movb 177776,r0;movb $300, 177776/
  g/jsr	pc,_splhigh/s//movb 177776,r0;movb $340, 177776/
  w
  q
*** /old/src/sys/conf/spl/:splfix.mtps	Mon May  2 08:08:46 1988
--- /usr/src/sys/conf/spl/:splfix.mtps	Tue Jan  7 21:16:25 1992
***************
*** 1,36 ****
! 0a
! mfps	= 106700^tst
! mtps	= 106400^tst
! .
! g/jsr	pc,__spl0/s//mtps $0/
! g/jsr	pc,__spl1/s//mtps $40/
  g/jsr	pc,__splsof/s//mtps $40/
- g/jsr	pc,__spl2/s//mtps $100/
  g/jsr	pc,__splnet/s//mtps $100/
- g/jsr	pc,__spl3/s//mtps $140/
- g/jsr	pc,__spl4/s//mtps $200/
- g/jsr	pc,__spl5/s//mtps $240/
  g/jsr	pc,__splbio/s//mtps $240/
  g/jsr	pc,__splimp/s//mtps $240/
  g/jsr	pc,__spltty/s//mtps $240/
- g/jsr	pc,__spl6/s//mtps $300/
  g/jsr	pc,__splclo/s//mtps $300/
- g/jsr	pc,__spl7/s//mtps $340/
  g/jsr	pc,__splhig/s//mtps $340/
! g/jsr	pc,_spl0/s//mfps r0;mtps $0/
! g/jsr	pc,_spl1/s//mfps r0;mtps $40/
  g/jsr	pc,_splsoft/s//mfps r0;mtps $40/
- g/jsr	pc,_spl2/s//mfps r0;mtps $100/
  g/jsr	pc,_splnet/s//mfps r0;mtps $100/
- g/jsr	pc,_spl3/s//mfps r0;mtps $140/
- g/jsr	pc,_spl4/s//mfps r0;mtps $200/
- g/jsr	pc,_spl5/s//mfps r0;mtps $240/
  g/jsr	pc,_splbio/s//mfps r0;mtps $240/
  g/jsr	pc,_splimp/s//mfps r0;mtps $240/
  g/jsr	pc,_spltty/s//mfps r0;mtps $240/
- g/jsr	pc,_spl6/s//mfps r0;mtps $300/
  g/jsr	pc,_splcloc/s//mfps r0;mtps $300/
- g/jsr	pc,_spl7/s//mfps r0;mtps $340/
  g/jsr	pc,_splhigh/s//mfps r0;mtps $340/
  w
  q
--- 1,19 ----
! g/jsr	pc,__spl\([0-7]\)/s//mtps $40*\1/
  g/jsr	pc,__splsof/s//mtps $40/
  g/jsr	pc,__splnet/s//mtps $100/
  g/jsr	pc,__splbio/s//mtps $240/
  g/jsr	pc,__splimp/s//mtps $240/
  g/jsr	pc,__spltty/s//mtps $240/
  g/jsr	pc,__splclo/s//mtps $300/
  g/jsr	pc,__splhig/s//mtps $340/
! g/jsr	pc,_spl\([0-7]\)/s//mfps r0;mtps $40*\1/
  g/jsr	pc,_splsoft/s//mfps r0;mtps $40/
  g/jsr	pc,_splnet/s//mfps r0;mtps $100/
  g/jsr	pc,_splbio/s//mfps r0;mtps $240/
  g/jsr	pc,_splimp/s//mfps r0;mtps $240/
  g/jsr	pc,_spltty/s//mfps r0;mtps $240/
  g/jsr	pc,_splcloc/s//mfps r0;mtps $300/
  g/jsr	pc,_splhigh/s//mfps r0;mtps $340/
+ g/movb	\(.*[^,]\),\*$-2/s//mtps \1/
  w
  q
*** /old/src/sys/conf/spl/:splfix.profil	Mon May  2 08:08:46 1988
--- /usr/src/sys/conf/spl/:splfix.profil	Tue Jan  7 21:06:39 1992
***************
*** 1,33 ****
! 0a
! spl = 230
! .
! g/jsr	pc,__spl0/s//spl 0/
! g/jsr	pc,__spl1/s//spl 1/
  g/jsr	pc,__splsof/s//spl 1/
- g/jsr	pc,__spl2/s//spl 2/
  g/jsr	pc,__splnet/s//spl 2/
- g/jsr	pc,__spl3/s//spl 3/
- g/jsr	pc,__spl4/s//spl 4/
- g/jsr	pc,__spl5/s//spl 5/
  g/jsr	pc,__splbio/s//spl 5/
  g/jsr	pc,__splimp/s//spl 5/
  g/jsr	pc,__spltty/s//spl 5/
- g/jsr	pc,__spl6/s//spl 6/
  g/jsr	pc,__splclo/s//spl 6/
  g/jsr	pc,__spl7/s//spl 6/
  g/jsr	pc,__splhig/s//spl 6/
! g/jsr	pc,_spl0/s//movb 177776,r0;spl 0/
! g/jsr	pc,_spl1/s//movb 177776,r0;spl 1/
  g/jsr	pc,_splsoft/s//movb 177776,r0;spl 1/
- g/jsr	pc,_spl2/s//movb 177776,r0;spl 2/
  g/jsr	pc,_splnet/s//movb 177776,r0;spl 2/
- g/jsr	pc,_spl3/s//movb 177776,r0;spl 3/
- g/jsr	pc,_spl4/s//movb 177776,r0;spl 4/
- g/jsr	pc,_spl5/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splbio/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splimp/s//movb 177776,r0;spl 5/
  g/jsr	pc,_spltty/s//movb 177776,r0;spl 5/
- g/jsr	pc,_spl6/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splcloc/s//movb 177776,r0;spl 6/
  g/jsr	pc,_spl7/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splhigh/s//movb 177776,r0;spl 6/
--- 1,18 ----
! g/jsr	pc,__spl\([0-6]\)/s//spl \1/
  g/jsr	pc,__splsof/s//spl 1/
  g/jsr	pc,__splnet/s//spl 2/
  g/jsr	pc,__splbio/s//spl 5/
  g/jsr	pc,__splimp/s//spl 5/
  g/jsr	pc,__spltty/s//spl 5/
  g/jsr	pc,__splclo/s//spl 6/
  g/jsr	pc,__spl7/s//spl 6/
  g/jsr	pc,__splhig/s//spl 6/
! g/jsr	pc,_spl\([0-6]\)/s//movb 177776,r0;spl \1/
  g/jsr	pc,_splsoft/s//movb 177776,r0;spl 1/
  g/jsr	pc,_splnet/s//movb 177776,r0;spl 2/
  g/jsr	pc,_splbio/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splimp/s//movb 177776,r0;spl 5/
  g/jsr	pc,_spltty/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splcloc/s//movb 177776,r0;spl 6/
  g/jsr	pc,_spl7/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splhigh/s//movb 177776,r0;spl 6/
*** /old/src/sys/conf/spl/:splfix.spl	Mon May  2 08:08:47 1988
--- /usr/src/sys/conf/spl/:splfix.spl	Tue Jan  7 21:06:39 1992
***************
*** 1,35 ****
! 0a
! spl = 230
! .
! g/jsr	pc,__spl0/s//spl 0/
! g/jsr	pc,__spl1/s//spl 1/
  g/jsr	pc,__splsof/s//spl 1/
- g/jsr	pc,__spl2/s//spl 2/
  g/jsr	pc,__splnet/s//spl 2/
- g/jsr	pc,__spl3/s//spl 3/
- g/jsr	pc,__spl4/s//spl 4/
- g/jsr	pc,__spl5/s//spl 5/
  g/jsr	pc,__splbio/s//spl 5/
  g/jsr	pc,__splimp/s//spl 5/
  g/jsr	pc,__spltty/s//spl 5/
- g/jsr	pc,__spl6/s//spl 6/
  g/jsr	pc,__splclo/s//spl 6/
- g/jsr	pc,__spl7/s//spl 7/
  g/jsr	pc,__splhig/s//spl 7/
! g/jsr	pc,_spl0/s//movb 177776,r0;spl 0/
! g/jsr	pc,_spl1/s//movb 177776,r0;spl 1/
  g/jsr	pc,_splsoft/s//movb 177776,r0;spl 1/
- g/jsr	pc,_spl2/s//movb 177776,r0;spl 2/
  g/jsr	pc,_splnet/s//movb 177776,r0;spl 2/
- g/jsr	pc,_spl3/s//movb 177776,r0;spl 3/
- g/jsr	pc,_spl4/s//movb 177776,r0;spl 4/
- g/jsr	pc,_spl5/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splbio/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splimp/s//movb 177776,r0;spl 5/
  g/jsr	pc,_spltty/s//movb 177776,r0;spl 5/
- g/jsr	pc,_spl6/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splcloc/s//movb 177776,r0;spl 6/
- g/jsr	pc,_spl7/s//movb 177776,r0;spl 7/
  g/jsr	pc,_splhigh/s//movb 177776,r0;spl 7/
  w
  q
--- 1,18 ----
! g/jsr	pc,__spl\([0-7]\)/s//spl \1/
  g/jsr	pc,__splsof/s//spl 1/
  g/jsr	pc,__splnet/s//spl 2/
  g/jsr	pc,__splbio/s//spl 5/
  g/jsr	pc,__splimp/s//spl 5/
  g/jsr	pc,__spltty/s//spl 5/
  g/jsr	pc,__splclo/s//spl 6/
  g/jsr	pc,__splhig/s//spl 7/
! g/jsr	pc,_spl\([0-7]\)/s//movb 177776,r0;spl \1/
  g/jsr	pc,_splsoft/s//movb 177776,r0;spl 1/
  g/jsr	pc,_splnet/s//movb 177776,r0;spl 2/
  g/jsr	pc,_splbio/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splimp/s//movb 177776,r0;spl 5/
  g/jsr	pc,_spltty/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splcloc/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splhigh/s//movb 177776,r0;spl 7/
  w
  q
*** /old/src/sys/conf/spl_3com/:splfix.movb	Mon May  2 08:09:07 1988
--- /usr/src/sys/conf/spl_3com/:splfix.movb	Tue Jan  7 16:48:00 1992
***************
*** 1,32 ****
  g/jsr	pc,__spl0/s//clrb 177776/
! g/jsr	pc,__spl1/s//movb $40, 177776/
  g/jsr	pc,__splsof/s//movb $40, 177776/
- g/jsr	pc,__spl2/s//movb $100, 177776/
  g/jsr	pc,__splnet/s//movb $100, 177776/
- g/jsr	pc,__spl3/s//movb $140, 177776/
- g/jsr	pc,__spl4/s//movb $200, 177776/
- g/jsr	pc,__spl5/s//movb $240, 177776/
  g/jsr	pc,__splimp/s//movb $300, 177776/
  g/jsr	pc,__splbio/s//movb $240, 177776/
  g/jsr	pc,__spltty/s//movb $240, 177776/
- g/jsr	pc,__spl6/s//movb $300, 177776/
  g/jsr	pc,__splclo/s//movb $300, 177776/
- g/jsr	pc,__spl7/s//movb $340, 177776/
  g/jsr	pc,__splhig/s//movb $340, 177776/
  g/jsr	pc,_spl0/s//movb 177776,r0;clrb 177776/
! g/jsr	pc,_spl1/s//movb 177776,r0;movb $40, 177776/
  g/jsr	pc,_splsoft/s//movb 177776,r0;movb $40, 177776/
- g/jsr	pc,_spl2/s//movb 177776,r0;movb $100, 177776/
  g/jsr	pc,_splnet/s//movb 177776,r0;movb $100, 177776/
- g/jsr	pc,_spl3/s//movb 177776,r0;movb $140, 177776/
- g/jsr	pc,_spl4/s//movb 177776,r0;movb $200, 177776/
- g/jsr	pc,_spl5/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_splbio/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_splimp/s//movb 177776,r0;movb $300, 177776/
  g/jsr	pc,_spltty/s//movb 177776,r0;movb $240, 177776/
- g/jsr	pc,_spl6/s//movb 177776,r0;movb $300, 177776/
  g/jsr	pc,_splcloc/s//movb 177776,r0;movb $300, 177776/
- g/jsr	pc,_spl7/s//movb 177776,r0;movb $340,177776/
  g/jsr	pc,_splhigh/s//movb 177776,r0;movb $340, 177776/
  w
  q
--- 1,20 ----
  g/jsr	pc,__spl0/s//clrb 177776/
! g/jsr	pc,__spl\([1-7]\)/s//movb $40*\1, 177776/
  g/jsr	pc,__splsof/s//movb $40, 177776/
  g/jsr	pc,__splnet/s//movb $100, 177776/
  g/jsr	pc,__splimp/s//movb $300, 177776/
  g/jsr	pc,__splbio/s//movb $240, 177776/
  g/jsr	pc,__spltty/s//movb $240, 177776/
  g/jsr	pc,__splclo/s//movb $300, 177776/
  g/jsr	pc,__splhig/s//movb $340, 177776/
  g/jsr	pc,_spl0/s//movb 177776,r0;clrb 177776/
! g/jsr	pc,_spl\([1-7]\)/s//movb 177776,r0;movb $40*\1, 177776/
  g/jsr	pc,_splsoft/s//movb 177776,r0;movb $40, 177776/
  g/jsr	pc,_splnet/s//movb 177776,r0;movb $100, 177776/
  g/jsr	pc,_splbio/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_splimp/s//movb 177776,r0;movb $300, 177776/
  g/jsr	pc,_spltty/s//movb 177776,r0;movb $240, 177776/
  g/jsr	pc,_splcloc/s//movb 177776,r0;movb $300, 177776/
  g/jsr	pc,_splhigh/s//movb 177776,r0;movb $340, 177776/
  w
  q
*** /old/src/sys/conf/spl_3com/:splfix.mtps	Mon May  2 08:09:07 1988
--- /usr/src/sys/conf/spl_3com/:splfix.mtps	Tue Jan  7 21:17:39 1992
***************
*** 1,36 ****
! 0a
! mfps	= 106700^tst
! mtps	= 106400^tst
! .
! g/jsr	pc,__spl0/s//mtps $0/
! g/jsr	pc,__spl1/s//mtps $40/
  g/jsr	pc,__splsof/s//mtps $40/
- g/jsr	pc,__spl2/s//mtps $100/
  g/jsr	pc,__splnet/s//mtps $100/
- g/jsr	pc,__spl3/s//mtps $140/
- g/jsr	pc,__spl4/s//mtps $200/
- g/jsr	pc,__spl5/s//mtps $240/
  g/jsr	pc,__splbio/s//mtps $240/
  g/jsr	pc,__splimp/s//mtps $300/
  g/jsr	pc,__spltty/s//mtps $240/
- g/jsr	pc,__spl6/s//mtps $300/
  g/jsr	pc,__splclo/s//mtps $300/
- g/jsr	pc,__spl7/s//mtps $340/
  g/jsr	pc,__splhig/s//mtps $340/
! g/jsr	pc,_spl0/s//mfps r0;mtps $0/
! g/jsr	pc,_spl1/s//mfps r0;mtps $40/
  g/jsr	pc,_splsoft/s//mfps r0;mtps $40/
- g/jsr	pc,_spl2/s//mfps r0;mtps $100/
  g/jsr	pc,_splnet/s//mfps r0;mtps $100/
- g/jsr	pc,_spl3/s//mfps r0;mtps $140/
- g/jsr	pc,_spl4/s//mfps r0;mtps $200/
- g/jsr	pc,_spl5/s//mfps r0;mtps $240/
  g/jsr	pc,_splbio/s//mfps r0;mtps $240/
  g/jsr	pc,_splimp/s//mfps r0;mtps $300/
  g/jsr	pc,_spltty/s//mfps r0;mtps $240/
- g/jsr	pc,_spl6/s//mfps r0;mtps $300/
  g/jsr	pc,_splcloc/s//mfps r0;mtps $300/
- g/jsr	pc,_spl7/s//mfps r0;mtps $340/
  g/jsr	pc,_splhigh/s//mfps r0;mtps $340/
  w
  q
--- 1,19 ----
! g/jsr	pc,__spl\([0-7]\)/s//mtps $40*\1/
  g/jsr	pc,__splsof/s//mtps $40/
  g/jsr	pc,__splnet/s//mtps $100/
  g/jsr	pc,__splbio/s//mtps $240/
  g/jsr	pc,__splimp/s//mtps $300/
  g/jsr	pc,__spltty/s//mtps $240/
  g/jsr	pc,__splclo/s//mtps $300/
  g/jsr	pc,__splhig/s//mtps $340/
! g/jsr	pc,_spl\([0-7]\)/s//mfps r0;mtps $40*\1/
  g/jsr	pc,_splsoft/s//mfps r0;mtps $40/
  g/jsr	pc,_splnet/s//mfps r0;mtps $100/
  g/jsr	pc,_splbio/s//mfps r0;mtps $240/
  g/jsr	pc,_splimp/s//mfps r0;mtps $300/
  g/jsr	pc,_spltty/s//mfps r0;mtps $240/
  g/jsr	pc,_splcloc/s//mfps r0;mtps $300/
  g/jsr	pc,_splhigh/s//mfps r0;mtps $340/
+ g/movb	\(.*[^,]\),\*$-2/s//mtps \1/
  w
  q
*** /old/src/sys/conf/spl_3com/:splfix.profil	Mon May  2 08:09:08 1988
--- /usr/src/sys/conf/spl_3com/:splfix.profil	Tue Jan  7 16:50:00 1992
***************
*** 1,33 ****
! 0a
! spl = 230
! .
! g/jsr	pc,__spl0/s//spl 0/
! g/jsr	pc,__spl1/s//spl 1/
  g/jsr	pc,__splsof/s//spl 1/
- g/jsr	pc,__spl2/s//spl 2/
  g/jsr	pc,__splnet/s//spl 2/
- g/jsr	pc,__spl3/s//spl 3/
- g/jsr	pc,__spl4/s//spl 4/
- g/jsr	pc,__spl5/s//spl 5/
  g/jsr	pc,__splbio/s//spl 5/
  g/jsr	pc,__splimp/s//spl 6/
  g/jsr	pc,__spltty/s//spl 5/
- g/jsr	pc,__spl6/s//spl 6/
  g/jsr	pc,__splclo/s//spl 6/
  g/jsr	pc,__spl7/s//spl 6/
  g/jsr	pc,__splhig/s//spl 6/
! g/jsr	pc,_spl0/s//movb 177776,r0;spl 0/
! g/jsr	pc,_spl1/s//movb 177776,r0;spl 1/
  g/jsr	pc,_splsoft/s//movb 177776,r0;spl 1/
- g/jsr	pc,_spl2/s//movb 177776,r0;spl 2/
  g/jsr	pc,_splnet/s//movb 177776,r0;spl 2/
- g/jsr	pc,_spl3/s//movb 177776,r0;spl 3/
- g/jsr	pc,_spl4/s//movb 177776,r0;spl 4/
- g/jsr	pc,_spl5/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splbio/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splimp/s//movb 177776,r0;spl 6/
  g/jsr	pc,_spltty/s//movb 177776,r0;spl 5/
- g/jsr	pc,_spl6/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splcloc/s//movb 177776,r0;spl 6/
  g/jsr	pc,_spl7/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splhigh/s//movb 177776,r0;spl 6/
--- 1,18 ----
! g/jsr	pc,__spl\([0-6]\)/s//spl \1/
  g/jsr	pc,__splsof/s//spl 1/
  g/jsr	pc,__splnet/s//spl 2/
  g/jsr	pc,__splbio/s//spl 5/
  g/jsr	pc,__splimp/s//spl 6/
  g/jsr	pc,__spltty/s//spl 5/
  g/jsr	pc,__splclo/s//spl 6/
  g/jsr	pc,__spl7/s//spl 6/
  g/jsr	pc,__splhig/s//spl 6/
! g/jsr	pc,_spl\([0-6]\)/s//movb 177776,r0;spl \1/
  g/jsr	pc,_splsoft/s//movb 177776,r0;spl 1/
  g/jsr	pc,_splnet/s//movb 177776,r0;spl 2/
  g/jsr	pc,_splbio/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splimp/s//movb 177776,r0;spl 6/
  g/jsr	pc,_spltty/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splcloc/s//movb 177776,r0;spl 6/
  g/jsr	pc,_spl7/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splhigh/s//movb 177776,r0;spl 6/
*** /old/src/sys/conf/spl_3com/:splfix.spl	Mon May  2 08:09:08 1988
--- /usr/src/sys/conf/spl_3com/:splfix.spl	Tue Jan  7 16:51:00 1992
***************
*** 1,35 ****
! 0a
! spl = 230
! .
! g/jsr	pc,__spl0/s//spl 0/
! g/jsr	pc,__spl1/s//spl 1/
  g/jsr	pc,__splsof/s//spl 1/
- g/jsr	pc,__spl2/s//spl 2/
  g/jsr	pc,__splnet/s//spl 2/
- g/jsr	pc,__spl3/s//spl 3/
- g/jsr	pc,__spl4/s//spl 4/
- g/jsr	pc,__spl5/s//spl 5/
  g/jsr	pc,__splbio/s//spl 5/
  g/jsr	pc,__splimp/s//spl 6/
  g/jsr	pc,__spltty/s//spl 5/
- g/jsr	pc,__spl6/s//spl 6/
  g/jsr	pc,__splclo/s//spl 6/
- g/jsr	pc,__spl7/s//spl 7/
  g/jsr	pc,__splhig/s//spl 7/
! g/jsr	pc,_spl0/s//movb 177776,r0;spl 0/
! g/jsr	pc,_spl1/s//movb 177776,r0;spl 1/
  g/jsr	pc,_splsoft/s//movb 177776,r0;spl 1/
- g/jsr	pc,_spl2/s//movb 177776,r0;spl 2/
  g/jsr	pc,_splnet/s//movb 177776,r0;spl 2/
- g/jsr	pc,_spl3/s//movb 177776,r0;spl 3/
- g/jsr	pc,_spl4/s//movb 177776,r0;spl 4/
- g/jsr	pc,_spl5/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splbio/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splimp/s//movb 177776,r0;spl 6/
  g/jsr	pc,_spltty/s//movb 177776,r0;spl 5/
- g/jsr	pc,_spl6/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splcloc/s//movb 177776,r0;spl 6/
- g/jsr	pc,_spl7/s//movb 177776,r0;spl 7/
  g/jsr	pc,_splhigh/s//movb 177776,r0;spl 7/
  w
  q
--- 1,18 ----
! g/jsr	pc,__spl\([0-7]\)/s//spl \1/
  g/jsr	pc,__splsof/s//spl 1/
  g/jsr	pc,__splnet/s//spl 2/
  g/jsr	pc,__splbio/s//spl 5/
  g/jsr	pc,__splimp/s//spl 6/
  g/jsr	pc,__spltty/s//spl 5/
  g/jsr	pc,__splclo/s//spl 6/
  g/jsr	pc,__splhig/s//spl 7/
! g/jsr	pc,_spl\([0-7]\)/s//movb 177776,r0;spl \1/
  g/jsr	pc,_splsoft/s//movb 177776,r0;spl 1/
  g/jsr	pc,_splnet/s//movb 177776,r0;spl 2/
  g/jsr	pc,_splbio/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splimp/s//movb 177776,r0;spl 6/
  g/jsr	pc,_spltty/s//movb 177776,r0;spl 5/
  g/jsr	pc,_splcloc/s//movb 177776,r0;spl 6/
  g/jsr	pc,_splhigh/s//movb 177776,r0;spl 7/
  w
  q
*** /old/src/sys/h/acct.h	Fri Apr 29 21:34:05 1988
--- /usr/src/sys/h/acct.h	Sat Feb 22 14:03:47 1992
***************
*** 3,9 ****
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)acct.h	7.1 (Berkeley) 6/4/86
   */
  
  /*
--- 3,9 ----
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)acct.h	(2.11BSD) 2/21/92
   */
  
  /*
***************
*** 40,47 ****
   * comp_t fields.  This is not necessarily equal to hz.
   */
  #define AHZ LINEHZ
- 
- #if defined(KERNEL) && !defined(SUPERVISOR)
- struct	acct	acctbuf;
- struct	inode	*acctp;
- #endif
--- 40,42 ----
*** /old/src/sys/h/buf.h	Fri Jun 22 15:24:49 1990
--- /usr/src/sys/h/buf.h	Sun May 26 23:02:08 1991
***************
*** 73,79 ****
  #define	bftopaddr(bp)	((u_int)(bp)->b_un.b_addr >> 6 | (bp)->b_xmem << 10)
  #define	dkblock(bp)	((bp)->b_blkno)
  #define	dkunit(bp)	(minor((bp)->b_dev) >> 3)
- #define	geterror(bp)	((bp)->b_flags&B_ERROR ? (bp)->b_error ? (bp)->b_error : EIO : 0)
  
  #if defined(KERNEL) && !defined(SUPERVISOR)
  #define	BUFHSZ	16	/* must be power of 2 */
--- 73,78 ----
***************
*** 108,114 ****
  #define	B_TAPE 		0x00400		/* this is a magtape (no bdwrite) */
  #define	B_INVAL		0x00800		/* does not contain valid info */
  #define	B_BAD		0x01000		/* bad block revectoring in progress */
! #define	B_RH70		0x02000		/* device is talking to an RH70 */
  #define	B_UBAREMAP	0x04000		/* addr UNIBUS virtual, not physical */
  #define	B_RAMREMAP	0x08000		/* remapped into ramdisk */
  
--- 107,113 ----
  #define	B_TAPE 		0x00400		/* this is a magtape (no bdwrite) */
  #define	B_INVAL		0x00800		/* does not contain valid info */
  #define	B_BAD		0x01000		/* bad block revectoring in progress */
! #define	B_LOCKED	0x02000		/* locked in core (not reusable) */
  #define	B_UBAREMAP	0x04000		/* addr UNIBUS virtual, not physical */
  #define	B_RAMREMAP	0x08000		/* remapped into ramdisk */
  
*** /old/src/sys/h/conf.h	Fri Apr 29 21:34:00 1988
--- /usr/src/sys/h/conf.h	Sun Sep 22 07:48:39 1991
***************
*** 3,9 ****
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)conf.h	1.1 (2.10BSD Berkeley) 12/1/86
   */
  
  /*
--- 3,9 ----
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)conf.h	1.2 (2.11BSD Berkeley) 9/22/91
   */
  
  /*
***************
*** 41,46 ****
--- 41,47 ----
  	int	(*d_stop)();
  	struct tty *d_ttys;
  	int	(*d_select)();
+ 	int	(*d_strategy)();
  };
  #if defined(KERNEL) && !defined(SUPERVISOR)
  extern struct	cdevsw cdevsw[];
*** /old/src/sys/h/file.h	Thu Apr  5 21:45:43 1990
--- /usr/src/sys/h/file.h	Sat Oct 26 13:33:49 1991
***************
*** 14,20 ****
  struct	file {
  	int	f_flag;		/* see below */
  	char	f_type;		/* descriptor type */
! 	char	f_count;	/* reference count */
  	short	f_msgcount;	/* references from message queue */
  	union {
  		caddr_t	f_Data;
--- 14,20 ----
  struct	file {
  	int	f_flag;		/* see below */
  	char	f_type;		/* descriptor type */
! 	u_char	f_count;	/* reference count */
  	short	f_msgcount;	/* references from message queue */
  	union {
  		caddr_t	f_Data;
*** /old/src/sys/h/mtio.h	Fri Apr 15 09:20:12 1988
--- /usr/src/sys/h/mtio.h	Fri May 10 21:09:37 1991
***************
*** 64,67 ****
--- 64,68 ----
  
  #ifndef KERNEL
  #define	DEFTAPE	"/dev/rmt8"
+ #define	MT_DEF	"/dev/nrmt8"
  #endif
*** /old/src/sys/h/param.h	Fri Sep  2 20:28:12 1988
--- /usr/src/sys/h/param.h	Thu Dec 26 23:31:54 1991
***************
*** 28,34 ****
  /*
   * Machine-independent constants
   */
! #define	NMOUNT	5		/* number of mountable file systems */
  #define	MAXUPRC	20		/* max processes per user */
  #define	NOFILE	30		/* max open files per process */
  #define	CANBSIZ	256		/* max size of typewriter line */
--- 28,34 ----
  /*
   * Machine-independent constants
   */
! #define	NMOUNT	6		/* number of mountable file systems */
  #define	MAXUPRC	20		/* max processes per user */
  #define	NOFILE	30		/* max open files per process */
  #define	CANBSIZ	256		/* max size of typewriter line */
*** /old/src/sys/h/types.h	Fri Apr 29 21:33:52 1988
--- /usr/src/sys/h/types.h	Mon Sep 23 12:40:18 1991
***************
*** 3,9 ****
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)types.h	1.1 (2.10BSD Berkeley) 12/1/86
   */
  
  #ifndef _TYPES_
--- 3,9 ----
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)types.h	1.2 (2.11BSD Berkeley) 9/23/91
   */
  
  #ifndef _TYPES_
***************
*** 14,20 ****
   */
  
  /* major part of a device */
! #define	major(x)	((int)(((unsigned)(x)>>8)&0377))
  
  /* minor part of a device */
  #define	minor(x)	((int)((x)&0377))
--- 14,20 ----
   */
  
  /* major part of a device */
! #define	major(x)	((int)(((int)(x)>>8)&0377))
  
  /* minor part of a device */
  #define	minor(x)	((int)((x)&0377))
*** /old/src/sys/h/uba.h	Fri Apr 29 21:33:44 1988
--- /usr/src/sys/h/uba.h	Sat Apr  6 00:06:21 1991
***************
*** 70,76 ****
  				}
  
  #ifdef KERNEL
! extern	bool_t	ubmap;			/* Do we have UNIBUS registers? */
  extern	memaddr	bpaddr;			/* physical click-address of buffers */
  #ifdef UNIBUS_MAP
  extern	struct map	ub_map[];
--- 70,76 ----
  				}
  
  #ifdef KERNEL
! extern	short	ubmap;			/* Do we have UNIBUS registers? */
  extern	memaddr	bpaddr;			/* physical click-address of buffers */
  #ifdef UNIBUS_MAP
  extern	struct map	ub_map[];
*** /old/src/sys/mdec/boilerplate	Wed May 23 12:50:27 1990
--- /usr/src/sys/mdec/boilerplate	Tue Mar 10 15:13:48 1992
***************
*** 1,13 ****
  	mov	$bootnm, r1
  	mov	$2,r0			/ ROOTINO
  	jsr	pc,iget
- 	mov	$bootlen,r5		/ len = strlen(pathnamecomponent)
  	clr	r2			/ offset
  again:
  	jsr	pc,readdir
  	beq	restart			/ error - restart
  	mov	4(r0),r4		/ dp->d_namlen
! 	cmp	r4,r5			/ if (len == dp->d_namlen)
  	bne	again			/    nope, go try next entry
  	mov	r0,r3
  	add	$6,r3			/ r3 = dp->d_name
--- 1,12 ----
  	mov	$bootnm, r1
  	mov	$2,r0			/ ROOTINO
  	jsr	pc,iget
  	clr	r2			/ offset
  again:
  	jsr	pc,readdir
  	beq	restart			/ error - restart
  	mov	4(r0),r4		/ dp->d_namlen
! 	cmp	r4,$bootlen		/ if (len == dp->d_namlen)
  	bne	again			/    nope, go try next entry
  	mov	r0,r3
  	add	$6,r3			/ r3 = dp->d_name
*** /old/src/sys/mdec/bruboot.s	Tue Jun  5 10:21:38 1990
--- /usr/src/sys/mdec/bruboot.s	Tue Mar 10 15:09:33 1992
***************
*** 1,9 ****
  / BR bootstrap. supports the 32 sec/trk, 19 trk/cyl EATON 1537/1711 
! /	Controller and 1538D drive. 
! /	NOTE: there isn't enough room at present to autoadapt
! / 	      to the 22 sectored & 5 cylinder 1538A,B,C drive types. The
! /	      appropriate "div" instructions have to be modified to support
! /	      these drive types.
  /
  / disk boot program to load and transfer
  / to a unix entry.
--- 1,7 ----
+ MAJOR = 11.			/ major # from bdevsw[]
+ 
  / BR bootstrap. supports the 32 sec/trk, 19 trk/cyl EATON 1537/1711 
! /	Controller and 1538A/B/C/D drive. 
  /
  / disk boot program to load and transfer
  / to a unix entry.
***************
*** 12,19 ****
  / assembled size must be <= 512; if > 494, the 16-byte a.out header
  / must be removed
  
- cyl	= 0.		/ cylinder offset of filesys to read from
- 
  / options: none.  all options of reading an alternate name or echoing to
  /		  the keyboard had to be removed to make room for the 
  /		  code which understands the new directory structure on disc
--- 10,15 ----
***************
*** 45,51 ****
--- 41,54 ----
  
  / establish sp, copy
  / program up to end of core.
+ 
+ 	nop			/ These two lines must be present or DEC
+ 	br	start		/ boot ROMs will refuse to run boot block!
  start:
+ 	clr	r0		/ XXX - for Rome 11/70, boot card doesn't work
+ 	mov	$176714,r1	/ XXX - for Rome 11/70, boot card doesn't work
+ 	movb	r0,unit+1	/ save the unit in high byte (for brcs)
+ 	mov	r1,csr		/  and csr from the ROMs (not base addr!)
  	mov	$..,sp
  	mov	sp,r1
  	clr	r0
***************
*** 57,65 ****
  
  / On error, restart from here.
  restart:
- 
- / clear core to make things clean
  	clr	r0
  2:
  	clr	(r0)+
  	cmp	r0,sp
--- 60,67 ----
  
  / On error, restart from here.
  restart:
  	clr	r0
+ / clear core to make things clean
  2:
  	clr	(r0)+
  	cmp	r0,sp
***************
*** 66,83 ****
  	blo	2b
  
  / initialize controller
! 	clr	*$brcs			/ clr addr extension bits, sel drive 0
  
  	mov	$bootnm, r1
  	mov	$2,r0			/ ROOTINO
  	jsr	pc,iget
- 	mov	$bootlen,r5		/ len = strlen(pathnamecomponent)
  	clr	r2			/ offset
  again:
  	jsr	pc,readdir
  	beq	restart			/ error - restart
  	mov	4(r0),r4		/ dp->d_namlen
! 	cmp	r4,r5			/ if (len == dp->d_namlen)
  	bne	again			/    nope, go try next entry
  	mov	r0,r3
  	add	$6,r3			/ r3 = dp->d_name
--- 68,98 ----
  	blo	2b
  
  / initialize controller
! 	mov	csr,r1
! 	mov	unit,brcs(r1)		/ clr addr extension bits, select unit
! 	mov	$32.,r0			/ default # of sec/track
! 	bit	$2400,brae(r1)		/ is this a 22 sec/track drive
! 	beq	9f
! 	mov	$22.,r0
! 9:
! 	mov	$19.,r5			/ default # of tracks/cyl
! 	bit	$1400,brae(r1)		/ is this a 5 tr/cy drive?
! 	beq	9f			/ no - br
! 	mov	$5,r5
! 9:
! 	mov	r0,sectors
! 	mul	r0,r5			/ sectors/cyl
! 	mov	r5,seccyl
  
  	mov	$bootnm, r1
  	mov	$2,r0			/ ROOTINO
  	jsr	pc,iget
  	clr	r2			/ offset
  again:
  	jsr	pc,readdir
  	beq	restart			/ error - restart
  	mov	4(r0),r4		/ dp->d_namlen
! 	cmp	r4,$bootlen		/ if (bootlen == dp->d_namlen)
  	bne	again			/    nope, go try next entry
  	mov	r0,r3
  	add	$6,r3			/ r3 = dp->d_name
***************
*** 154,163 ****
  / restart if return
  2:
  	mov	ENDCORE-BOOTOPTS, r4
! 	mov	ENDCORE-BOOTDEV, r3
  	mov	ENDCORE-CHECKWORD, r2
  	jsr	pc,*$0
! 	br	restart
  
  / read a mapped block
  / offset in file is in bno.
--- 169,180 ----
  / restart if return
  2:
  	mov	ENDCORE-BOOTOPTS, r4
! 	movb	unit+1,r3
! 	bis	$MAJOR\<8.,r3
  	mov	ENDCORE-CHECKWORD, r2
+ 	mov	csr,r1
  	jsr	pc,*$0
! 	jmp	restart
  
  / read a mapped block
  / offset in file is in bno.
***************
*** 199,208 ****
  read	= 4
  go	= 1
  
! brcs	= 176714
! brda	= 176724
! brca	= 176722
! brba	= 176720
  / br disk driver.
  / low order address in dno,
  / high order in r0.
--- 216,229 ----
  read	= 4
  go	= 1
  
! brds	= -4
! brer	= -2
! brcs	= 0		/ offset from base csr passed by ROMs
! brwc	= 2
! brba	= 4
! brca	= 6
! brda	= 10
! brae	= 12
  / br disk driver.
  / low order address in dno,
  / high order in r0.
***************
*** 212,233 ****
  .if	CLSIZE-1
  	ashc	$CLSHFT,r0		/ multiply by CLSIZE
  .endif
! 	div	$32.*19.,r0		/ was 20.*10.
! .if	cyl
! 	add	$cyl,r0
! .endif
! 	mov	r0,*$brca
  	clr	r0
! 	div	$32.,r0			/ was 10.
  	swab	r0
  	bis	r1,r0
! 	mov	r0,*$brda
! 	mov	$brba,r1
! 	mov	$buf,(r1)
! 	mov	$WC,-(r1)
! 	mov	$read+go,-(r1)
  1:
! 	tstb	(r1)
  	bge	1b
  	mov	(sp)+,r1
  	rts	pc
--- 233,253 ----
  .if	CLSIZE-1
  	ashc	$CLSHFT,r0		/ multiply by CLSIZE
  .endif
! 	div	seccyl,r0
! 	mov	csr,r3
! 	mov	r0,brca(r3)
  	clr	r0
! 	div	sectors,r0
  	swab	r0
  	bis	r1,r0
! 	mov	r0,brda(r3)
! 	mov	$buf,brba(r3)
! 	mov	$WC,brwc(r3)
! 	mov	unit,r0
! 	bis	$read+go,r0
! 	mov	r0,(r3)		/ brcs
  1:
! 	tstb	(r3)		/ brcs
  	bge	1b
  	mov	(sp)+,r1
  	rts	pc
***************
*** 234,239 ****
--- 254,263 ----
  
  bootnm:	<boot\0\0>
  bootlen = 4		/ strlen(bootnm)
+ unit: 0
+ csr: 0
+ seccyl: 0
+ sectors: 0
  end:
  
  inod = ..-512.-BSIZE		/ room for inod, buf, stack
*** /old/src/sys/mdec/dvhpuboot.s	Wed May 23 13:00:05 1990
--- /usr/src/sys/mdec/dvhpuboot.s	Tue Mar 10 15:09:13 1992
***************
*** 1,3 ****
--- 1,5 ----
+ MAJOR = 10.			/ major # from bdevsw[]
+ 
  / Bootstrap for Diva Comp. IV controller (33 sectors)
  /
  / disk boot program to load and transfer
***************
*** 7,15 ****
  / assembled size must be <= 512; if > 494, the 16-byte a.out header
  / must be removed
  
- drive	= 0		/ unit to boot from
- cyl	= 0.		/ cylinder offset of filesys to read from
- 
  / options: none.  all options of reading an alternate name or echoing to
  /		  the keyboard had to be removed to make room for the 
  /		  code which understands the new directory structure on disc
--- 9,14 ----
***************
*** 41,47 ****
--- 40,51 ----
  
  / establish sp, copy
  / program up to end of core.
+ 
+ 	nop			/ These two lines must be present or DEC
+ 	br	start		/ boot ROMs will refuse to run boot block!
  start:
+ 	mov	r0,unit
+ 	mov	r1,csr
  	mov	$..,sp
  	mov	sp,r1
  	clr	r0
***************
*** 62,81 ****
  	blo	2b
  
  / initialize disk
! 	mov	$drive,*$hpcs2
! 	mov	$preset+go,*$hpcs1
! 	mov	$fmt22,*$hpof
  
  	mov	$bootnm, r1
  	mov	$2,r0			/ ROOTINO
  	jsr	pc,iget
- 	mov	$bootlen,r5		/ len = strlen(pathnamecomponent)
  	clr	r2			/ offset
  again:
  	jsr	pc,readdir
  	beq	restart			/ error - restart
  	mov	4(r0),r4		/ dp->d_namlen
! 	cmp	r4,r5			/ if (len == dp->d_namlen)
  	bne	again			/    nope, go try next entry
  	mov	r0,r3
  	add	$6,r3			/ r3 = dp->d_name
--- 66,85 ----
  	blo	2b
  
  / initialize disk
! 	mov	csr,r1
! 	mov	unit,hpcs2(r1)
! 	mov	$preset+go,hpcs1(r1)
! 	mov	$fmt22,hpof(r1)
  
  	mov	$bootnm, r1
  	mov	$2,r0			/ ROOTINO
  	jsr	pc,iget
  	clr	r2			/ offset
  again:
  	jsr	pc,readdir
  	beq	restart			/ error - restart
  	mov	4(r0),r4		/ dp->d_namlen
! 	cmp	r4,$bootlen		/ if (bootlen == dp->d_namlen)
  	bne	again			/    nope, go try next entry
  	mov	r0,r3
  	add	$6,r3			/ r3 = dp->d_name
***************
*** 152,159 ****
  / restart if return
  2:
  	mov	ENDCORE-BOOTOPTS, r4
! 	mov	ENDCORE-BOOTDEV, r3
  	mov	ENDCORE-CHECKWORD, r2
  	jsr	pc,*$0
  	br	restart
  
--- 156,165 ----
  / restart if return
  2:
  	mov	ENDCORE-BOOTOPTS, r4
! 	mov	unit,r3
! 	bis	$MAJOR\<8.,r3
  	mov	ENDCORE-CHECKWORD, r2
+ 	mov	csr,r1
  	jsr	pc,*$0
  	br	restart
  
***************
*** 199,205 ****
  go	= 1
  fmt22	= 10000
  
! hpcs1	= 176700
  hpda	= hpcs1+6
  hpcs2	= hpcs1+10
  hpds	= hpcs1+12
--- 205,211 ----
  go	= 1
  fmt22	= 10000
  
! hpcs1	= 0		/ offset from base csr
  hpda	= hpcs1+6
  hpcs2	= hpcs1+10
  hpds	= hpcs1+12
***************
*** 216,236 ****
  	ashc	$CLSHFT,r0		/ multiply by CLSIZE
  .endif
  	div	$33.*19.,r0
! .if	cyl
! 	add	$cyl,r0
! .endif
! 	mov	r0,*$hpca
  	clr	r0
  	div	$33.,r0
  	swab	r0
  	bis	r1,r0
! 	mov	$hpda,r1
! 	mov	r0,(r1)
! 	mov	$buf,-(r1)
! 	mov	$WC,-(r1)
! 	mov	$read+go,-(r1)
  1:
! 	tstb	(r1)
  	bge	1b
  	mov	(sp)+,r1
  	rts	pc
--- 222,241 ----
  	ashc	$CLSHFT,r0		/ multiply by CLSIZE
  .endif
  	div	$33.*19.,r0
! 	mov	csr,r3
! 	mov	r0,hpca(r3)
  	clr	r0
  	div	$33.,r0
  	swab	r0
  	bis	r1,r0
! 	add	$hpcs2,r3
! 	mov	unit,(r3)
! 	mov	r0,-(r3)
! 	mov	$buf,-(r3)
! 	mov	$WC,-(r3)
! 	mov	$read+go,-(r3)
  1:
! 	tstb	(r3)
  	bge	1b
  	mov	(sp)+,r1
  	rts	pc
***************
*** 237,242 ****
--- 242,249 ----
  
  bootnm:	<boot\0\0>
  bootlen = 4			/ strlen(bootnm)
+ unit: 0
+ csr: 0
  end:
  
  inod = ..-512.-BSIZE		/ room for inod, buf, stack
*** /old/src/sys/mdec/hkuboot.s	Wed May 23 13:00:13 1990
--- /usr/src/sys/mdec/hkuboot.s	Tue Mar 10 15:10:09 1992
***************
*** 1,3 ****
--- 1,5 ----
+ MAJOR = 4			/ major # from bdevsw[]
+ 
  / RK06/RK07 bootstrap
  /
  / disk boot program to load and transfer
***************
*** 40,46 ****
--- 42,53 ----
  
  / establish sp, copy
  / program up to end of core.
+ 
+ 	nop			/ These two lines must be present or DEC
+ 	br	start		/ boot ROMs will refuse to run boot block!
  start:
+ 	mov	r0,unit
+ 	mov	r1,csr
  	mov	$..,sp
  	mov	sp,r1
  	clr	r0
***************
*** 52,60 ****
  
  / On error, restart from here.
  restart:
- 
- / clear core to make things clean
  	clr	r0
  2:
  	clr	(r0)+
  	cmp	r0,sp
--- 59,66 ----
  
  / On error, restart from here.
  restart:
  	clr	r0
+ / clear core to make things clean
  2:
  	clr	(r0)+
  	cmp	r0,sp
***************
*** 61,82 ****
  	blo	2b
  
  / initialize hk
! 	mov	$clear,*$hkcs2
! 	mov	$ack,*$hkcs1
  0:
! 	tstb	*$hkcs1
  	bpl	0b		/ wait for acknowledge to complete
  
  	mov	$bootnm, r1
  	mov	$2,r0			/ ROOTINO
  	jsr	pc,iget
- 	mov	$bootlen,r5		/ len = strlen(pathnamecomponent)
  	clr	r2			/ offset
  again:
  	jsr	pc,readdir
  	beq	restart			/ error - restart
  	mov	4(r0),r4		/ dp->d_namlen
! 	cmp	r4,r5			/ if (len == dp->d_namlen)
  	bne	again			/    nope, go try next entry
  	mov	r0,r3
  	add	$6,r3			/ r3 = dp->d_name
--- 67,90 ----
  	blo	2b
  
  / initialize hk
! 	mov	csr,r1
! 	mov	unit,r0
! 	bis	$clear,r0
! 	mov	r0,hkcs2(r1)
! 	mov	$ack,hkcs1(r1)
  0:
! 	tstb	hkcs1(r1)
  	bpl	0b		/ wait for acknowledge to complete
  
  	mov	$bootnm, r1
  	mov	$2,r0			/ ROOTINO
  	jsr	pc,iget
  	clr	r2			/ offset
  again:
  	jsr	pc,readdir
  	beq	restart			/ error - restart
  	mov	4(r0),r4		/ dp->d_namlen
! 	cmp	r4,$bootlen		/ if (bootlen == dp->d_namlen)
  	bne	again			/    nope, go try next entry
  	mov	r0,r3
  	add	$6,r3			/ r3 = dp->d_name
***************
*** 153,160 ****
  / restart if return
  2:
  	mov	ENDCORE-BOOTOPTS, r4
! 	mov	ENDCORE-BOOTDEV, r3
  	mov	ENDCORE-CHECKWORD, r2
  	jsr	pc,*$0
  	br	restart
  
--- 161,170 ----
  / restart if return
  2:
  	mov	ENDCORE-BOOTOPTS, r4
! 	mov	unit,r3
! 	bis	$MAJOR\<8.,r3
  	mov	ENDCORE-CHECKWORD, r2
+ 	mov	csr,r1
  	jsr	pc,*$0
  	br	restart
  
***************
*** 195,204 ****
  1:
  	rts	pc
  
! hkcs1 = 177440	/ control & status 1
! hkda  = 177446	/ desired track/sector address
! hkcs2 = 177450	/ control & status 2
! hkca  = 177460	/ desired cylinder
  
  .if	RK07
  / RK07 constants
--- 205,214 ----
  1:
  	rts	pc
  
! hkcs1 = 0	/ control & status 1
! hkda  = 6	/ desired track/sector address
! hkcs2 = 10	/ control & status 2
! hkca  = 20	/ desired cylinder
  
  .if	RK07
  / RK07 constants
***************
*** 229,242 ****
  	clr	r0
  	div	$3.,r0		/ r0 = cylinder r1 = track
  	bisb	r1,1(sp)
! 	mov	r0,*$hkca	/ cylinder wanted
! 	mov	$hkda,r1
! 	mov	(sp)+,(r1)	/ track & sector wanted
! 	mov	$buf,-(r1)	/ bus address
! 	mov	$WC,-(r1)	/ word count
! 	mov	$iocom,-(r1)
  1:
! 	tstb	(r1)
  	bge	1b		/ wait for iocom to complete
  	mov	(sp)+,r1
  	rts	pc
--- 239,254 ----
  	clr	r0
  	div	$3.,r0		/ r0 = cylinder r1 = track
  	bisb	r1,1(sp)
! 	mov	csr,r3
! 	mov	r0,hkca(r3)	/ cylinder wanted
! 	mov	unit,hkcs2(r3)
! 	add	$hkda,r3
! 	mov	(sp)+,(r3)	/ track & sector wanted
! 	mov	$buf,-(r3)	/ bus address
! 	mov	$WC,-(r3)	/ word count
! 	mov	$iocom,-(r3)
  1:
! 	tstb	(r3)
  	bge	1b		/ wait for iocom to complete
  	mov	(sp)+,r1
  	rts	pc
***************
*** 243,248 ****
--- 255,262 ----
  
  bootnm:	<boot\0\0>
  bootlen = 4			/ strlen(bootnm)
+ unit: 0
+ csr: 0
  end:
  
  inod = ..-512.-BSIZE		/ room for inod, buf, stack
