arch-msx/msxbuild
2
0
Fork 0
Code Issues Pull requests 3 Actions Activity

Moved hdd setup and scripts to .openMSX local writable folder.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 1s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-25 12:42:54 +02:00
parent a9da661dc0
commit 00d9c59bdb
2 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/make/mb_openmsx.mk
View file

@ -5,26 +5,31 @@ MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,3
MB_OPENMSX_EXTS ?= MB_OPENMSX_EXTS ?=
MB_OPENMSX_EXTRA_SLOT ?= -ext slotexpander MB_OPENMSX_EXTRA_SLOT ?= -ext slotexpander
MB_OPENMSX_EXTRA_MEM ?= -ext ram4mb MB_OPENMSX_EXTRA_MEM ?= -ext ram4mb
MB_OPENMSX_EXTRA_IDE ?= -ext ide-nextor MB_OPENMSX_EXTRA_HDD ?= -ext ide-nextor
MB_OPENMSX_JOYPORTA ?= MB_OPENMSX_JOYPORTA ?=
MB_OPENMSX_JOYPORTB ?= MB_OPENMSX_JOYPORTB ?=
MB_OPENMSX_SCALE_FACTOR ?= 3 MB_OPENMSX_SCALE_FACTOR ?= 3
MB_OPENMSX_THROTTLE ?= off MB_OPENMSX_THROTTLE ?= off
MB_OPENMSX_RENDERER ?= MB_OPENMSX_RENDERER ?=
MB_OPENMSX_SCRIPTS ?= ~/.openMSX/share/scripts
MB_OPENMSX_ARGS = \ MB_OPENMSX_ARGS = \
-machine $(MB_OPENMSX_MACHINE) \ -machine $(MB_OPENMSX_MACHINE) \
$(MB_OPENMSX_EXTRA_SLOT) \ $(MB_OPENMSX_EXTRA_SLOT) \
$(MB_OPENMSX_EXTRA_IDE) \ $(MB_OPENMSX_EXTRA_HDD) \
$(MB_OPENMSX_EXTRA_MEM) \ $(MB_OPENMSX_EXTRA_MEM) \
$(MB_OPENMSX_EXTS) \ $(MB_OPENMSX_EXTS)
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl \ define _mb_openmsx_setup
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \ $(call mb_msxhub_file,$(MB_OPENMSX_SCRIPTS),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/omsxctl.tcl $(call mb_msxhub_file,$(MB_OPENMSX_SCRIPTS),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)
$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/boot_env.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl,$(MB_OPENMSX_SCRIPTS)))
$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/boot_hdd.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl,$(MB_OPENMSX_SCRIPTS)))
$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/fail_after.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl,$(MB_OPENMSX_SCRIPTS)))
$(if $(wildcard ~/.openMSX/share/extensions/ide-nextor.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/ide-nextor.xml,~/.openMSX/share/extensions/))
endef
define _mb_openmsx_run define _mb_openmsx_run
@echo === Running openMSX @echo === Running openMSX
$(call mb_msxhub_file,$(PATH_MSXBUILD_REAL)/lib/openmsx,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \ FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \
FAIL_AFTER_PATH=bin \ FAIL_AFTER_PATH=bin \
BOOT_HDD_PATH="$(1)" \ BOOT_HDD_PATH="$(1)" \
@ -40,6 +45,7 @@ define _mb_openmsx_run
endef endef
define mb_openmsx_dosctl define mb_openmsx_dosctl
$(call mb_msxhub_file,$(1),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com) $(if $(wildcard $(MB_OPENMSX_SCRIPTS)/omsxctl.tcl),,$(call _mb_openmsx_setup))
$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_SCRIPTS)/omsxctl.com,$(1)))
$(call _mb_openmsx_run,$(1)) $(call _mb_openmsx_run,$(1))
endef endef

28
lib/openmsx/ide-nextor.xml Normal file
View file

@ -0,0 +1,28 @@
<?xml version="1.0" ?>
<!DOCTYPE msxconfig SYSTEM 'msxconfig2.dtd'>
<msxconfig>
<info>
<name>Sunrise ATA-IDE Nextor</name>
<manufacturer>Sunrise</manufacturer>
<code />
<release_year>2024</release_year>
<description>ATA-IDE interface with hard disk.</description>
<type>external hard disk</type>
</info>
<devices>
<primary slot="any">
<secondary slot="any">
<SunriseIDE id="Sunrise IDE">
<mem base="0x0000" size="0x10000" />
<rom>
<sha1>dca824d7b0ddf25c6e87a8098e97ab7489725f57</sha1> <!-- SHA1 of Nextor-2.1.1.SunriseIDE.ROM -->
</rom>
<master>
<type>IDEHD</type>
<filename>hd.dsk</filename>
</master>
</SunriseIDE>
</secondary>
</primary>
</devices>
</msxconfig>