From caa1e969e423ac56ebd1f2678638fa280a3e12f8 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 30 Sep 2020 17:37:01 +0200 Subject: Fix zexall target compile --- scripts/target/zexall/zexall.lua | 2 ++ src/zexall/main.cpp | 2 ++ src/zexall/zexall.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/target/zexall/zexall.lua b/scripts/target/zexall/zexall.lua index 008ea252d0c..4b07b2ca061 100644 --- a/scripts/target/zexall/zexall.lua +++ b/scripts/target/zexall/zexall.lua @@ -2,6 +2,8 @@ STANDALONE = true CPUS["Z80"] = true +MACHINES["Z80DAISY"] = true + function standalone() files{ MAME_DIR .. "src/zexall/main.cpp", diff --git a/src/zexall/main.cpp b/src/zexall/main.cpp index 5996f3b582b..eb6f24edf6d 100644 --- a/src/zexall/main.cpp +++ b/src/zexall/main.cpp @@ -106,6 +106,8 @@ void emulator_info::periodic_check() { } bool emulator_info::frame_hook() { return false; } +void emulator_info::sound_hook() { } + void emulator_info::layout_file_cb(util::xml::data_node const &layout) { } const char * emulator_info::get_appname() { return nullptr; } diff --git a/src/zexall/zexall.cpp b/src/zexall/zexall.cpp index 8de1121304d..6bc3544a4d0 100644 --- a/src/zexall/zexall.cpp +++ b/src/zexall/zexall.cpp @@ -31,6 +31,7 @@ public: void output_data_w(uint8_t data); void z80_mem(address_map &map); + void zexall(machine_config &config); private: required_device m_maincpu; required_shared_ptr m_main_ram; @@ -41,7 +42,6 @@ private: std::string terminate_string; virtual void machine_reset() override; - void zexall(machine_config &config); }; @@ -123,9 +123,9 @@ void zexall_state::output_data_w(uint8_t data) void zexall_state::z80_mem(address_map &map) { map(0x0000, 0xffff).ram().share("main_ram"); - map(0xfffd, 0xfffd).rw(this, FUNC(zexall_state::output_ack_r), FUNC(zexall_state::output_ack_w)); - map(0xfffe, 0xfffe).rw(this, FUNC(zexall_state::output_req_r), FUNC(zexall_state::output_req_w)); - map(0xffff, 0xffff).rw(this, FUNC(zexall_state::output_data_r), FUNC(zexall_state::output_data_w)); + map(0xfffd, 0xfffd).rw(FUNC(zexall_state::output_ack_r), FUNC(zexall_state::output_ack_w)); + map(0xfffe, 0xfffe).rw(FUNC(zexall_state::output_req_r), FUNC(zexall_state::output_req_w)); + map(0xffff, 0xffff).rw(FUNC(zexall_state::output_data_r), FUNC(zexall_state::output_data_w)); } @@ -162,5 +162,5 @@ ROM_END Drivers ******************************************************************************/ -/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ -COMP( 2009, zexall, 0, 0, zexall, zexall, zexall_state, 0, "Frank Cringle / Kevin Horton", "Zexall (FPGA Z80 test interface)", MACHINE_NO_SOUND_HW ) +/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ +COMP( 2009, zexall, 0, 0, zexall, zexall, zexall_state, empty_init, "Frank Cringle / Kevin Horton", "Zexall (FPGA Z80 test interface)", MACHINE_NO_SOUND_HW ) -- cgit v1.2.3-70-g09d2