diff --git a/023.slideshow/Makefile b/023.slideshow/Makefile index d6dd452..f6fab87 100644 --- a/023.slideshow/Makefile +++ b/023.slideshow/Makefile @@ -5,7 +5,8 @@ INTERLACE=1 HAM_MODE=1 USERSTACK_ADDRESS=7fffc # userstack used by bootblock -BASE_ADDRESS=800 # if you change this you must also change link.script.x +BASE_ADDRESS=4000 # if you change this you must also change link.script.x + # note: this must be high enough not to conflict with MFMbufE BOOTBLOCK_ASM=alpine_bootblock.s OBJS=out/init.o out/utils.o out/trackloader.o out/image.o out/module.o out/disk.o out/data.o @@ -41,7 +42,7 @@ else FLAGS=--height=256 endif -#SYMBOL_INFO=-M +SYMBOL_INFO=-M #LINK_COMMANDLINE=vlink -T link.script.x -brawbin1 $< $(OBJS) $(SYMBOL_INFO) -osec=out/main && cat out/main.load out/main.photo > out/main.bin LINK_COMMANDLINE=vlink -T link.script.x -brawbin1 $< $(OBJS) $(SYMBOL_INFO) -o out/main.bin diff --git a/023.slideshow/alpine_bootblock.s b/023.slideshow/alpine_bootblock.s index 21802c3..1953463 100644 --- a/023.slideshow/alpine_bootblock.s +++ b/023.slideshow/alpine_bootblock.s @@ -33,15 +33,20 @@ BootCode: ;gathers some data, turns off OS, copies itself to $100 ;from floppy. No GetVBR needed. *--- Fastmem available? ---* + if 1 move.l #$20004,d1 ;fast+largest + else + move.l #$20002,d1 ;chip+largest + endif jsr -216(a6) ;AvailMem() move.l d0,d5 + sub.l #2048,d5 ;leave room for stacks to grow moveq #4,d1 jsr -198(a6) ;AllocMem() and.l #-8,d0 move.l d0,a5 ;Start Address - + *--- OS off ---* ;you're nice'n all, but now you die. lea $dff002,a6 ;Loader uses this custom base addr @@ -336,8 +341,7 @@ BootE: cnop 0,1024 ;MFMbuf is placed here after bootblock end, $3c0.w or so when copied. -MFMbuf equ $E0000 -;; MFMbuf equ LoaderVars+(BootE-CopyStart) +MFMbuf equ LoaderVars+(BootE-CopyStart) MFMbufE equ MFMbuf+MFMlen ;lowest free address. $372e for a full bootblock. mainStart: diff --git a/023.slideshow/link.script.x b/023.slideshow/link.script.x index f01860d..4933239 100644 --- a/023.slideshow/link.script.x +++ b/023.slideshow/link.script.x @@ -1,6 +1,6 @@ MEMORY { - disk: org = 0x800, len = 0xDB800 + disk: org = 0x4000, len = 901120-0x4000 ram: org = 0x00000, len = 0x80000 }