From bcd97cceedc7b34b398e9c62be3f82c18925f68d Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 15 Mar 2019 22:30:22 -0400 Subject: port loadmenu and loadmkau to ca65 and unify them --- src/Makefile | 8 +++---- src/fujichat.atr | Bin 92176 -> 92176 bytes src/fujitest.atr | Bin 92176 -> 92176 bytes src/loadmenu.dasm | 69 ------------------------------------------------------ src/loadmkau.dasm | 69 ------------------------------------------------------ src/loadxex.s | 45 +++++++++++++++++++++++++++++++++++ 6 files changed, 49 insertions(+), 142 deletions(-) delete mode 100644 src/loadmenu.dasm delete mode 100644 src/loadmkau.dasm create mode 100644 src/loadxex.s diff --git a/src/Makefile b/src/Makefile index 9d963d4..ba72f9f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -39,11 +39,11 @@ about.xex: about.c fujichat.h aexec.xex common.o makeauto.xex: makeauto.c $(CC) $(CFLAGS) -o makeauto.xex makeauto.c common.o -loadmenu.xex: loadmenu.dasm - dasm loadmenu.dasm -f3 -oloadmenu.xex +loadmenu.xex: loadxex.s + cl65 --asm-define MENU -t none -o loadmenu.xex loadxex.s -loadmkau.xex: loadmkau.dasm - dasm loadmkau.dasm -f3 -oloadmkau.xex +loadmkau.xex: loadxex.s + cl65 -t none -o loadmkau.xex loadxex.s aexec.xex: aexec.dasm dasm aexec.dasm -f3 -oaexec.xex diff --git a/src/fujichat.atr b/src/fujichat.atr index 1ce4862..df4ebd6 100644 Binary files a/src/fujichat.atr and b/src/fujichat.atr differ diff --git a/src/fujitest.atr b/src/fujitest.atr index 5a5b72f..cd85879 100644 Binary files a/src/fujitest.atr and b/src/fujitest.atr differ diff --git a/src/loadmenu.dasm b/src/loadmenu.dasm deleted file mode 100644 index 71cbdfc..0000000 --- a/src/loadmenu.dasm +++ /dev/null @@ -1,69 +0,0 @@ - -; Load MENU.COM - -; This will be part of AUTORUN.SYS on the disk. Without it, -; I'd have to make AUTORUN.SYS a copy of MENU.COM :( - - processor 6502 - include "equates.inc" - -atari_exec = $0600 -main = $2E00 ; same place as cc65 - -; segment header - org main-6 - word $FFFF - word main - word endmain-1 - - org main - -; do this so pressing Reset give us DOS -; ldx #1 -; stx BOOTQ -; dex -; stx COLDST - -; remove later: see if FujiChat can work with only 44K -;; lda #$B0 -;; sta RAMTOP -;; lda #12 ; CIO CLOSE -;; sta ICCOM -;; ldx #0 -;; jsr CIOV -;; -;; -;; lda #3 ; Command 3=OPEN -;; sta ICCOM -;; lda #12 ; 12=R/W access -;; sta ICAX1 -;; lda #0 -;; sta ICAX2 -;; lda #e_dev -;; sta ICBAH -;; lda #e_dev_len -;; sta ICBLL -;; lda #0 -;; tax -;; sta ICBLH -;; jsr CIOV ; call CIO - - -; our raison d'etre... - lda #menu_filename - jmp atari_exec - -menu_filename .byte "D:FUJIMENU.COM", 0 - -e_dev byte "E:",0 -e_dev_len equ *-e_dev+1 - -endmain - -; segment header - word RUNAD - word RUNAD+1 - word main diff --git a/src/loadmkau.dasm b/src/loadmkau.dasm deleted file mode 100644 index 613be44..0000000 --- a/src/loadmkau.dasm +++ /dev/null @@ -1,69 +0,0 @@ - -; Load MENU.COM - -; This will be part of AUTORUN.SYS on the disk. Without it, -; I'd have to make AUTORUN.SYS a copy of MENU.COM :( - - processor 6502 - include "equates.inc" - -atari_exec = $0600 -main = $2E00 ; same place as cc65 - -; segment header - org main-6 - word $FFFF - word main - word endmain-1 - - org main - -; do this so pressing Reset give us DOS -; ldx #1 -; stx BOOTQ -; dex -; stx COLDST - -; remove later: see if FujiChat can work with only 44K -;; lda #$B0 -;; sta RAMTOP -;; lda #12 ; CIO CLOSE -;; sta ICCOM -;; ldx #0 -;; jsr CIOV -;; -;; -;; lda #3 ; Command 3=OPEN -;; sta ICCOM -;; lda #12 ; 12=R/W access -;; sta ICAX1 -;; lda #0 -;; sta ICAX2 -;; lda #e_dev -;; sta ICBAH -;; lda #e_dev_len -;; sta ICBLL -;; lda #0 -;; tax -;; sta ICBLH -;; jsr CIOV ; call CIO - - -; our raison d'etre... - lda #menu_filename - jmp atari_exec - -menu_filename .byte "D:MAKEAUTO.COM", 0 - -e_dev byte "E:",0 -e_dev_len equ *-e_dev+1 - -endmain - -; segment header - word RUNAD - word RUNAD+1 - word main diff --git a/src/loadxex.s b/src/loadxex.s new file mode 100644 index 0000000..7008f75 --- /dev/null +++ b/src/loadxex.s @@ -0,0 +1,45 @@ + +; Load FUJIMENU.COM + +; This will be part of AUTORUN.SYS on the disk. Without it, +; I'd have to make AUTORUN.SYS a copy of FUJIMENU.COM with +; the serial driver prepended. + +RUNAD = $02e0 +atari_exec = $0600 +main = $2e00 ; same place as cc65 + +; segment header + .org main-6 + .word $FFFF + .word main + .word endmain-1 + + .org main + +; If we do this, pressing Reset give us DOS. I want a reboot, +; so leave it out. +;; ldx #1 +;; stx BOOTQ +;; dex +;; stx COLDST + +; Not much to this... + lda #menu_filename + jmp atari_exec + +menu_filename: + .ifdef MENU + .byte "D:FUJIMENU.COM", 0 + .else + .byte "D:MAKEAUTO.COM", 0 + .endif + +endmain: + +; segment header + .word RUNAD + .word RUNAD+1 + .word main + -- cgit v1.2.3