From 83f29be5833a732607e12ca126f35a6fdb682ae7 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 23 Jun 2024 19:41:47 +0200 Subject: [PATCH 01/11] Mmoved duplicate mouse interface to TCL. --- lib/emuctl/mouse.bat | 3 --- lib/make/mb_packages.mk | 1 - 2 files changed, 4 deletions(-) delete mode 100644 lib/emuctl/mouse.bat diff --git a/lib/emuctl/mouse.bat b/lib/emuctl/mouse.bat deleted file mode 100644 index 189bcd1..0000000 --- a/lib/emuctl/mouse.bat +++ /dev/null @@ -1,3 +0,0 @@ -rem Add mouse to openMSX -omsxctl plug joyporta mouse -omsxctl plug \ No newline at end of file diff --git a/lib/make/mb_packages.mk b/lib/make/mb_packages.mk index 69bc8c0..8518285 100644 --- a/lib/make/mb_packages.mk +++ b/lib/make/mb_packages.mk @@ -1,6 +1,5 @@ # MSXHUB fetch package files functions define mb_package_emuctl - $(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/mouse.bat,$(1)) $(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/shutdown.bat,$(1)) $(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/z80.bat,$(1)) endef From fb6153b42e3ea821476ce2ccc486fb18c3724b31 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 23 Jun 2024 20:17:01 +0200 Subject: [PATCH 02/11] Support multiple z80 speeds. --- lib/emuctl/z80.bat | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/emuctl/z80.bat b/lib/emuctl/z80.bat index 3edc069..0bb400f 100644 --- a/lib/emuctl/z80.bat +++ b/lib/emuctl/z80.bat @@ -1,2 +1,18 @@ -rem Goto normal z80 speed -omsxctl set speed 100 \ No newline at end of file +rem Select z80 speed +IFF 3 == %1 + echo 'Select 3.51 Mhz' + omsxctl set speed 100 + exit 0 +ENDIFF +IFF 7 == %1 + echo 'Select 7 Mhz' + omsxctl set speed 200 + exit 0 +ENDIFF +IFF 11 == %1 + echo 'Select 11 Mhz' + omsxctl set speed 333 + exit 0 +ENDIFF +echo 'Select openMSX Z80 emulation speed' +echo 'Usage: z80 <3/7/11>' From 1179a655e8387208efab78a54a9631be1a108cf1 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 23 Jun 2024 20:38:49 +0200 Subject: [PATCH 03/11] Moved stdio to TCL managed commands --- lib/make/mb_openmsx.mk | 2 ++ lib/openmsx/boot_env.tcl | 2 +- lib/openmsx/boot_stdio.xml | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index 0812739..52d13b5 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -18,6 +18,8 @@ MB_OPENMSX_ARGS = \ define _mb_openmsx_run @echo === Running openMSX $(call mb_msxhub_file,$(PATH_MSXBUILD_REAL)/lib/openmsx,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl) + SAVE_SETTINGS_ON_EXIT=off \ + THROTTLE=off \ FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \ FAIL_AFTER_PATH=bin \ BOOT_HDD_PATH="$(1)" \ diff --git a/lib/openmsx/boot_env.tcl b/lib/openmsx/boot_env.tcl index e44a32d..70edb9b 100644 --- a/lib/openmsx/boot_env.tcl +++ b/lib/openmsx/boot_env.tcl @@ -3,7 +3,7 @@ # Typically used in automation tools which run openMSX without human interaction. # Supported environment variables by this script; # -# SAVE_SETTINGS_ON_EXIT=false +# SAVE_SETTINGS_ON_EXIT=off # Disables automatic settings saving. # # RENDERER=SDL diff --git a/lib/openmsx/boot_stdio.xml b/lib/openmsx/boot_stdio.xml index 04e88f5..6cfb7ca 100644 --- a/lib/openmsx/boot_stdio.xml +++ b/lib/openmsx/boot_stdio.xml @@ -4,6 +4,4 @@ When booting 'openmsx -control stdio < boot_stdio.xml' It starts then in power off mode and without renderer for fast booting. --> set power on - set throttle off - set save_settings_on_exit off From 7d5452ae77282a599c421eaa81a765fe0db9003d Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 23 Jun 2024 20:40:27 +0200 Subject: [PATCH 04/11] Fixed no arguments exit code for scripting. --- lib/emuctl/z80.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/emuctl/z80.bat b/lib/emuctl/z80.bat index 0bb400f..b195239 100644 --- a/lib/emuctl/z80.bat +++ b/lib/emuctl/z80.bat @@ -16,3 +16,4 @@ IFF 11 == %1 ENDIFF echo 'Select openMSX Z80 emulation speed' echo 'Usage: z80 <3/7/11>' +exit 1 From 3075627a770c789f3c50ce4b5d9169a5e2e2eb54 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 23 Jun 2024 20:41:51 +0200 Subject: [PATCH 05/11] Moved some env's lower in prefix list. --- lib/make/mb_openmsx.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index 52d13b5..c214f95 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -18,8 +18,6 @@ MB_OPENMSX_ARGS = \ define _mb_openmsx_run @echo === Running openMSX $(call mb_msxhub_file,$(PATH_MSXBUILD_REAL)/lib/openmsx,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl) - SAVE_SETTINGS_ON_EXIT=off \ - THROTTLE=off \ FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \ FAIL_AFTER_PATH=bin \ BOOT_HDD_PATH="$(1)" \ @@ -28,6 +26,8 @@ define _mb_openmsx_run JOYPORTB=$(MB_OPENMSX_JOYPORTB) \ SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \ SPEED=$(MB_OPENMSX_SPEED) \ + SAVE_SETTINGS_ON_EXIT=off \ + THROTTLE=off \ $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml endef From 216c3aba266e137777d3f5e0b70debe94525d890 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 23 Jun 2024 22:52:31 +0200 Subject: [PATCH 06/11] Added link to hex2bin --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 002f442..5605ac1 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,14 @@ The files in this repro try to handle these steps for you. * make * openmsx * sdcc -* hex2bin +* hex2bin-2.5 (see [https://hex2bin.sourceforge.net/](https://hex2bin.sourceforge.net/)) * wget * unix2dos +For debian use; + + apt-get install make openmsx wget dos2unix sdcc + ## Usage Include the `lib/make/msxbuild.mk` file from your Makefile. From 390d6cdc3e7ddecf13d76a8654d4723171281f12 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 00:08:27 +0200 Subject: [PATCH 07/11] Make z80 speed selection silent. --- lib/emuctl/z80.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/emuctl/z80.bat b/lib/emuctl/z80.bat index b195239..273d2a8 100644 --- a/lib/emuctl/z80.bat +++ b/lib/emuctl/z80.bat @@ -1,17 +1,17 @@ rem Select z80 speed IFF 3 == %1 echo 'Select 3.51 Mhz' - omsxctl set speed 100 + omsxctl set speed 100 > NUL exit 0 ENDIFF IFF 7 == %1 echo 'Select 7 Mhz' - omsxctl set speed 200 + omsxctl set speed 200 > NUL exit 0 ENDIFF IFF 11 == %1 echo 'Select 11 Mhz' - omsxctl set speed 333 + omsxctl set speed 333 > NUL exit 0 ENDIFF echo 'Select openMSX Z80 emulation speed' From a1bd09d59b1c1aa678145bace0d95826becf37bd Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 00:25:24 +0200 Subject: [PATCH 08/11] test sounddriver null --- lib/make/mb_openmsx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index c214f95..756f1c6 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -28,7 +28,7 @@ define _mb_openmsx_run SPEED=$(MB_OPENMSX_SPEED) \ SAVE_SETTINGS_ON_EXIT=off \ THROTTLE=off \ - $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml + $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -command "set sounddriver null" -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml endef define mb_openmsx_dosctl From d8c54a8842a1f8f76b7fdbd4cdb535d87a81981e Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 00:26:23 +0200 Subject: [PATCH 09/11] test sounddriver off --- lib/make/mb_openmsx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index 756f1c6..a933382 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -28,7 +28,7 @@ define _mb_openmsx_run SPEED=$(MB_OPENMSX_SPEED) \ SAVE_SETTINGS_ON_EXIT=off \ THROTTLE=off \ - $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -command "set sounddriver null" -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml + $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -command "set sounddriver off" -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml endef define mb_openmsx_dosctl From 59970f1af940f8d7a56dfc68da978688db4d63ed Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 00:28:54 +0200 Subject: [PATCH 10/11] Reverted test sounddriver --- lib/make/mb_openmsx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index a933382..c214f95 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -28,7 +28,7 @@ define _mb_openmsx_run SPEED=$(MB_OPENMSX_SPEED) \ SAVE_SETTINGS_ON_EXIT=off \ THROTTLE=off \ - $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -command "set sounddriver off" -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml + $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml endef define mb_openmsx_dosctl From 2a56775651dd75117f5aed13bbbac7f143dfa412 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 01:24:41 +0200 Subject: [PATCH 11/11] Renamed failure label ids. --- lib/make/mb_autoexec.mk | 6 +++--- lib/openmsx/fail_after.tcl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk index 52494ba..29bf0c2 100644 --- a/lib/make/mb_autoexec.mk +++ b/lib/make/mb_autoexec.mk @@ -36,7 +36,7 @@ endef define mb_autoexec_write_default echo -n "" > $(1)/autoexec.bat $(if $(filter true,$(MB_AUTOEXEC_BYSELF)),$(call mb_autoexec_append_rem,$(1),$(MB_AUTOEXEC_BYSELF_MSG))) - $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds fail_after_init $(MB_AUTOEXEC_STARTUP_EXITCODE)) + $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds failed_autoexec $(MB_AUTOEXEC_STARTUP_EXITCODE)) $(if $(filter 40,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_cmd,$(1),mode 40)) $(if $(filter 40,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_echo,$(1),Enabled mode 40.)) $(if $(filter 80,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_cmd,$(1),mode 80)) @@ -60,7 +60,7 @@ endef define mb_autoexec_cmd @echo === Generating autoexec.bat for command $(call mb_autoexec_write_default,$(1)) - $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_CMD_TIMEOUT) seconds fail_after_cmd $(MB_AUTOEXEC_CMD_EXITCODE)) + $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_CMD_TIMEOUT) seconds failed_cmd $(MB_AUTOEXEC_CMD_EXITCODE)) $(call mb_autoexec_append_echo,$(1),Running command '$(2)') $(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_exit,$(1)) @@ -68,7 +68,7 @@ endef define mb_autoexec_cmd_test @echo === Generating autoexec.bat for command test $(call mb_autoexec_write_default,$(1)) - $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_TEST_TIMEOUT) seconds fail_after_test $(MB_AUTOEXEC_TEST_EXITCODE)) + $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_TEST_TIMEOUT) seconds failed_test $(MB_AUTOEXEC_TEST_EXITCODE)) $(call mb_autoexec_append_echo,$(1),Running test '$(2)') $(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_exit,$(1)) diff --git a/lib/openmsx/fail_after.tcl b/lib/openmsx/fail_after.tcl index e2e1563..8e590d9 100644 --- a/lib/openmsx/fail_after.tcl +++ b/lib/openmsx/fail_after.tcl @@ -73,5 +73,5 @@ if {[info exists ::env(FAIL_AFTER_PATH)] && ([string trim $::env(FAIL_AFTER_PATH # Enables boot watch dog timer when FAIL_AFTER_BOOT env has a value. (124 see `man timeout`) if {[info exists ::env(FAIL_AFTER_BOOT)] && ([string trim $::env(FAIL_AFTER_BOOT)] != "")} { - fail_after [string trim $::env(FAIL_AFTER_BOOT)] realtime fail_after_boot 124 + fail_after [string trim $::env(FAIL_AFTER_BOOT)] realtime failed_boot 124 }