diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | font_dl.asm | 8 | ||||
| -rw-r--r-- | loading.asm | 10 | ||||
| -rw-r--r-- | memsetup.asm | 2 |
4 files changed, 17 insertions, 13 deletions
@@ -4,8 +4,8 @@ TESTXEX=fnchat-$(shell date +%Y%m%d-%H%M).xex VERSION:=$(shell git describe --dirty --long 2>/dev/null || echo NOGIT )+$(shell date +%Y%m%d-%H%M )@$(shell hostname -s 2>/dev/null || echo UNKNOWN ) -# remove the -a if using older versions of atasm -ATASM=atasm -s -a +ATASM=atasm +ATASMFLAGS=-s all: clean fnchat.xex [ -d /var/tnfs ] && cp fnchat.xex /var/tnfs/ || true @@ -26,15 +26,15 @@ clean: $(MAKE) -f Makefile.client clean %.xex: %.asm - $(ATASM) -o$@ $< + $(ATASM) $(ATASMFLAGS) -o$@ $< memsetup.xex: memsetup.asm loading1.xex: loading.asm - $(ATASM) -o$@ $< + $(ATASM) $(ATASMFLAGS) -o$@ $< loading2.xex: loading.asm - $(ATASM) -o$@ -DCLIENT=1 $< + $(ATASM) $(ATASMFLAGS) -o$@ -DCLIENT=1 $< font_dl.xex: font_dl.asm font.dat diff --git a/font_dl.asm b/font_dl.asm index 31e80f8..f4895c6 100644 --- a/font_dl.asm +++ b/font_dl.asm @@ -1,7 +1,9 @@ + .bank *= $3400 .incbin "font.dat" + .bank *= $3360 dlist_vis .byte $70, $70, $30 ; 2 8-line blanks, 1 4-line blank @@ -42,12 +44,16 @@ status_box_end = status_box + 60 ; $3400 - $37ff is the font! ; shoehorn the transmit & receive buffers here + .bank *= $3800 rx_buf ; 512 bytes + .bank *= $3a00 tx_buf ; 512 bytes + .bank *= $3c00 scr_vis_buf ; not used yet + .bank *= $3fa0 end_marker ; a line_t (42 bytes) .byte <end_marker ; points to @@ -57,9 +63,11 @@ end_marker ; a line_t (42 bytes) .byte 0 ; rest of the line is nulls (look like spaces) .endr + .bank *= $4000 ; screen RAM starts at the XE bankswitching window! scr_main_mem + .bank *= $7fff scr_main_mem_end diff --git a/loading.asm b/loading.asm index d5df6e2..a06ed4c 100644 --- a/loading.asm +++ b/loading.asm @@ -1,3 +1,4 @@ + .bank *= $6000 ; aka screen_bot_addrs[0], gets cleared by main() in the client. save_dlist_loc = $fe @@ -46,13 +47,6 @@ init sta $0231 ; SDLSTH jmp wait1frame + .bank *= $02e2 ; INITAD .word init - - .if 0 ; change to 1 for standalone testing -run - jmp run - - *= $02e0 ; RUNAD - .word run - .endif diff --git a/memsetup.asm b/memsetup.asm index 5419aef..c250e27 100644 --- a/memsetup.asm +++ b/memsetup.asm @@ -2,6 +2,7 @@ ; RAMTOP to $C000, disables BASIC (on XL/XE), disables ANTIC DMA (not ; really), then returns so the rest of the .xex continues to load. + .bank *= $2000 memsetup ; close the E: device @@ -30,5 +31,6 @@ loop beq loop rts + .bank *= $02e2 ; INITAD .word memsetup |