Fri Nov 11 10:00:26 PST 1994
< NEW bootimage SOURCE
> OLD bootimage SOURCE
======================== ./cmd/disktest/disktest.h =======================
45c45
< #define MAXSECHEAD  (42+7)                 /* maximum number of sectors/track */
---
> #define MAXSECHEAD  42                  /* maximum number of sectors/track */
======================== ./cmd/disktest/disktest.mk =======================
22,23d21
< LDFILE = ../../lib/ld.util
< # LDFILE = ./ld.file
52c50
< 	$(LD) -o $(NAME) -m -N $(LDFILE) $(CRT0) $(HDR) $(OBJS) $(LIB) > $(NAME).map
---
> 	$(LD) -o $(NAME) -m -N ld.file $(CRT0) $(HDR) $(OBJS) $(LIB) > $(NAME).map
======================== ./cmd/sapatch/sapatch.mk =======================
10c10
< CFLAGS=-M0 -SYSV -I$(LOCALINCS)
---
> CFLAGS=-I$(LOCALINCS)
======================== ./lib/standhead.s =======================
21,30c21
< 	mov.l	&0x170000,%sp
< 	mov.l	&0x10000/4,%d1
< 	mov.l	&0x160000,%a1
< clrstack%:
< 	clr.l	(%a1)+		# clear next long word
< 	sub.l	&1,%d1
< 	bne.b	clrstack%
< 
< #	mov.l	&end+0x10000,%sp	# setup stack pointer
< 	mov.l	&end,%d1
---
> 	mov.l	&end+0x10000,%sp	# setup stack pointer
33c24
< #	mov.l	%sp,%d1
---
> 	mov.l	%sp,%d1
63c54
< #	mov.l	&end+0x1800,%sp	# reset stack
---
> 	mov.l	&end+0x1800,%sp	# reset stack
======================== ./stand.mk =======================
8c8
< ARGS=	"SGS_ROOT=$(SGS_68000)" 
---
> ARGS=	"SGS_ROOT=$(SGSROOT)" 
======================== ./cmd/disktest/scsiinit.c =======================
193,215d192
< 	        xprintf("Writing rigid disk parameters page\n");
< 	        mgeo.datalen = 0;               /* blame micropolis drives */
< 	        mgeo.medtype = 0;
< 	        mgeo.wp = 0;
< 	        mgeo.bdlen = 8;
< 	        mgeo.density = 0;
< 	        memset(mgeo.numlb, 0, 3);
< 	        itoa3(mgeo.lblen, BLKSIZE);
< 	        retcode = sc_modeselect(SCSI_V_MS_GEO, &mgeo);
< 	        if (retcode) {
< 	            DBG(printf(">After MOD SEL:  $%x", retcode);            )
< 	            printf("\n%s\n", sc_derrmsg(errno));
< 	            printf("Unable to write rigid disk parameters page.");
< 	            goto format_aborted;
< 	        }
< 	}
< 
<         if (scsi_drv[scsi_drvtype].fmtfunc) {
<             xprintf("Calling additional drive specific function.\n");
<             if (!(*scsi_drv[scsi_drvtype].fmtfunc)())
<                 goto format_aborted;
<         }
< 
237a215,237
> 	            goto format_aborted;
> 	        }
> 
> 	        xprintf("Writing rigid disk parameters page\n");
> 	        mgeo.datalen = 0;               /* blame micropolis drives */
> 	        mgeo.medtype = 0;
> 	        mgeo.wp = 0;
> 	        mgeo.bdlen = 8;
> 	        mgeo.density = 0;
> 	        memset(mgeo.numlb, 0, 3);
> 	        itoa3(mgeo.lblen, BLKSIZE);
> 	        retcode = sc_modeselect(SCSI_V_MS_GEO, &mgeo);
> 	        if (retcode) {
> 	            DBG(printf(">After MOD SEL:  $%x", retcode);            )
> 	            printf("\n%s\n", sc_derrmsg(errno));
> 	            printf("Unable to write rigid disk parameters page.");
> 	            goto format_aborted;
> 	        }
> 	}
> 
>         if (scsi_drv[scsi_drvtype].fmtfunc) {
>             xprintf("Calling additional drive specific function.\n");
>             if (!(*scsi_drv[scsi_drvtype].fmtfunc)())
======================== ./cmd/disktest/scsimain.c =======================
250,252d249
<     /	NOTE: Tue Nov  8 10:56:16 PST 1994 (hanna)
<     /		according to REE, this last test is invalid for very large
<     /		drives that have greater than 2047 cyls/disk. 
260c257
<             || MthrBlk.pd_ldmaxnum > LOGDR /* || MthrBlk.cyldisk > 0x7ff */) {
---
>             || MthrBlk.pd_ldmaxnum > LOGDR || MthrBlk.cyldisk > 0x7ff) {
======================== ./cmd/sapatch/main.c =======================
16,17c16,17
< 	void *sa_remove();
< 	signal(SIGINT, sa_remove);
---
> 	void *remove();
> 	signal(SIGINT, remove);
======================== ./cmd/sapatch/remove.c =======================
5c5
< sa_remove()
---
> remove()
======================== ./lib/scrt0.s =======================
47c47
< #	mov.l	&end+0x1800,%sp	# boot stack
---
> 	mov.l	&end+0x1800,%sp	# boot stack
======================== ./macdefs =======================
2c2
< #INCRT	=	$(SGSx)/usr/include
---
> INCRT	=	$(SGSx)/usr/include
9,10c9,10
< CC		=	$(SGS_ROOT)/bin/cc -Dm68k -w3 -W0,-sp
< CPP		=	$(SGS_ROOT)/lib/cpp -Dm68k
---
> CC		=	$(SGS_ROOT)/bin/cc
> CPP		=	$(SGS_ROOT)/lib/cpp
