Migrate disk image mappings for drives 9-11 from run-in-vice.sh to build-xyz.sh scripts where they are used.

Also add an empty disk image as default.
This commit is contained in:
Philip Zembrod 2020-06-28 22:33:27 +02:00
parent 15b55d5e7e
commit 48d26551b0
5 changed files with 15 additions and 10 deletions

BIN
6502/C64/disks/empty.d64 Normal file

Binary file not shown.

View File

@ -13,4 +13,5 @@ rm -f "${basedir}/cbmfiles/devenv"
keybuf="2 drive 19 load\n47 load\n1 drive 26 load\n3 drive 10 load\n\ keybuf="2 drive 19 load\n47 load\n1 drive 26 load\n3 drive 10 load\n\
savesystem devenv\ndos s0:notdone\n" savesystem devenv\ndos s0:notdone\n"
"${emulatordir}/run-in-vice.sh" "c64-volksforth83" "${keybuf}" DISK9=vforth4_1 DISK10=vforth4_3 DISK11=file-words \
"${emulatordir}/run-in-vice.sh" "c64-volksforth83" "${keybuf}"

View File

@ -6,10 +6,11 @@ basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")"
rm -f "${basedir}/cbmfiles/testbase" rm -f "${basedir}/cbmfiles/testbase"
# load savesystem w/o editor from file-words.d64 block 20 in drive 11. # load savesystem w/o editor from file-words.d64 block 20.
# load include and dos from file-words.d64 block 10 in drive 11. # load include and dos from file-words.d64 block 10.
# savesystem and then scratch file notdone to exit emulator. # savesystem and then scratch file notdone to exit emulator.
keybuf="3 drive 20 load\n3 drive 10 load\n\ keybuf="3 drive 20 load\n3 drive 10 load\n\
savesystem testbase\ndos s0:notdone\n" savesystem testbase\ndos s0:notdone\n"
"${emulatordir}/run-in-vice.sh" "c64-volksforth83" "${keybuf}" DISK11=file-words "${emulatordir}/run-in-vice.sh" \
"c64-volksforth83" "${keybuf}"

View File

@ -6,11 +6,11 @@ basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")"
rm -f "${basedir}/cbmfiles/testbase" rm -f "${basedir}/cbmfiles/testbase"
# load savesystem w/o editor from file-words.d64 block 20 in drive 11. # load savesystem w/o editor from file-words.d64 block 20.
# load include and dos from file-words.d64 block 10 in drive 11. # load include and dos from file-words.d64 block 10.
# savesystem and then scratch file notdone to exit emulator. # savesystem and then scratch file notdone to exit emulator.
keybuf="3 drive 20 load\n3 drive 10 load\n\ keybuf="3 drive 20 load\n3 drive 10 load\n\
savesystem testbase16\ndos s0:notdone\n" savesystem testbase16\ndos s0:notdone\n"
VICE=xplus4 "${emulatordir}/run-in-vice.sh" \ VICE=xplus4 DISK11=file-words "${emulatordir}/run-in-vice.sh" \
"c16-volksforth83" "${keybuf}" "c16-volksforth83" "${keybuf}"

View File

@ -2,6 +2,9 @@
set -e set -e
test -n "$VICE" || VICE=x64 test -n "$VICE" || VICE=x64
test -n "$DISK9" || DISK9=empty
test -n "$DISK10" || DISK10=empty
test -n "$DISK11" || DISK11=empty
emulatordir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")" emulatordir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")"
basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")" basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")"
@ -29,9 +32,9 @@ fi
-drive10type 1541 \ -drive10type 1541 \
-drive11type 1541 \ -drive11type 1541 \
-fs8 "${basedir}/cbmfiles" \ -fs8 "${basedir}/cbmfiles" \
-9 "${basedir}/disks/vforth4_1.d64" \ -9 "${basedir}/disks/${DISK9}.d64" \
-10 "${basedir}/disks/vforth4_3.d64" \ -10 "${basedir}/disks/${DISK10}.d64" \
-11 "${basedir}/disks/file-words.d64" \ -11 "${basedir}/disks/${DISK11}.d64" \
-symkeymap "${emulatordir}/x11_sym_vf_de.vkm" \ -symkeymap "${emulatordir}/x11_sym_vf_de.vkm" \
-keymap 2 \ -keymap 2 \
$autostart \ $autostart \