From 1c1d46aa4c95d3c1b4d884774c3b3cdf0ec731b0 Mon Sep 17 00:00:00 2001 From: wilbertpol Date: Sun, 14 May 2023 21:54:13 +0100 Subject: msx: Refactored to standard layout and output usage. (#11216) Made separate layout files per 'region' and drive count, and simplified the code for LED outputs. --- src/devices/bus/msx/slot/disk.cpp | 5 +- src/devices/bus/msx/slot/disk.h | 1 - src/mame/layout/msx.lay | 90 --------- src/mame/layout/msx_ar.lay | 59 ++++++ src/mame/layout/msx_ar_1fdd.lay | 72 ++++++++ src/mame/layout/msx_ar_2fdd.lay | 76 ++++++++ src/mame/layout/msx_en.lay | 56 ++++++ src/mame/layout/msx_jp.lay | 56 ++++++ src/mame/layout/msx_jp_1fdd.lay | 69 +++++++ src/mame/layout/msx_jp_2fdd.lay | 73 ++++++++ src/mame/layout/msx_kr.lay | 56 ++++++ src/mame/layout/msx_kr_1fdd.lay | 69 +++++++ src/mame/layout/msx_nocode.lay | 51 ++++++ src/mame/layout/msx_nocode_1fdd.lay | 64 +++++++ src/mame/layout/msx_nocode_2fdd.lay | 69 +++++++ src/mame/layout/msx_nocode_nocaps.lay | 38 ++++ src/mame/layout/msx_ru.lay | 56 ++++++ src/mame/layout/msx_ru_1fdd.lay | 69 +++++++ src/mame/layout/msx_ru_2fdd.lay | 73 ++++++++ src/mame/msx/msx.cpp | 61 +++---- src/mame/msx/msx.h | 37 +--- src/mame/msx/msx1.cpp | 334 +++++++++++++++------------------- src/mame/msx/msx1_bruc100.cpp | 8 +- src/mame/msx/msx1_v9938.cpp | 50 ++--- src/mame/msx/msx2.cpp | 287 ++++++++++++++--------------- 25 files changed, 1345 insertions(+), 534 deletions(-) delete mode 100644 src/mame/layout/msx.lay create mode 100644 src/mame/layout/msx_ar.lay create mode 100644 src/mame/layout/msx_ar_1fdd.lay create mode 100644 src/mame/layout/msx_ar_2fdd.lay create mode 100644 src/mame/layout/msx_en.lay create mode 100644 src/mame/layout/msx_jp.lay create mode 100644 src/mame/layout/msx_jp_1fdd.lay create mode 100644 src/mame/layout/msx_jp_2fdd.lay create mode 100644 src/mame/layout/msx_kr.lay create mode 100644 src/mame/layout/msx_kr_1fdd.lay create mode 100644 src/mame/layout/msx_nocode.lay create mode 100644 src/mame/layout/msx_nocode_1fdd.lay create mode 100644 src/mame/layout/msx_nocode_2fdd.lay create mode 100644 src/mame/layout/msx_nocode_nocaps.lay create mode 100644 src/mame/layout/msx_ru.lay create mode 100644 src/mame/layout/msx_ru_1fdd.lay create mode 100644 src/mame/layout/msx_ru_2fdd.lay diff --git a/src/devices/bus/msx/slot/disk.cpp b/src/devices/bus/msx/slot/disk.cpp index 631742d6c3b..cb3a74d85a0 100644 --- a/src/devices/bus/msx/slot/disk.cpp +++ b/src/devices/bus/msx/slot/disk.cpp @@ -84,7 +84,6 @@ msx_slot_disk_device::msx_slot_disk_device(const machine_config &mconfig, device , m_floppy(*this, "fdc:%u", 0U) , m_current_floppy(nullptr) , m_internal_drive_led(*this, "internal_drive%u_led", 0U) - , m_internal_drive_name(*this, "internal_drive%u_name", 0U) , m_nr_drives(nr_drives) { } @@ -100,7 +99,6 @@ void msx_slot_disk_device::device_start() msx_slot_rom_device::device_start(); m_internal_drive_led.resolve(); - m_internal_drive_name.resolve(); } void msx_slot_disk_device::device_reset() @@ -108,14 +106,13 @@ void msx_slot_disk_device::device_reset() msx_slot_rom_device::device_reset(); for (int i = 0; i < m_internal_drive_led.size(); i++) { - m_internal_drive_name[i] = m_floppy[i] ? 1 : 0; set_drive_access_led_state(i, 0); } } void msx_slot_disk_device::set_drive_access_led_state(int drive, int led_state) { - m_internal_drive_led[drive] = m_floppy[drive] ? 1 + led_state : 0; + m_internal_drive_led[drive] = led_state; } diff --git a/src/devices/bus/msx/slot/disk.h b/src/devices/bus/msx/slot/disk.h index 52d8ddf03dd..a64fdad4347 100644 --- a/src/devices/bus/msx/slot/disk.h +++ b/src/devices/bus/msx/slot/disk.h @@ -78,7 +78,6 @@ protected: private: output_finder<4> m_internal_drive_led; - output_finder<4> m_internal_drive_name; int m_nr_drives; }; diff --git a/src/mame/layout/msx.lay b/src/mame/layout/msx.lay deleted file mode 100644 index c4fda2d7e14..00000000000 --- a/src/mame/layout/msx.lay +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/mame/layout/msx_ar.lay b/src/mame/layout/msx_ar.lay new file mode 100644 index 00000000000..641cbbf5b63 --- /dev/null +++ b/src/mame/layout/msx_ar.lay @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_ar_1fdd.lay b/src/mame/layout/msx_ar_1fdd.lay new file mode 100644 index 00000000000..bb79c57c519 --- /dev/null +++ b/src/mame/layout/msx_ar_1fdd.lay @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_ar_2fdd.lay b/src/mame/layout/msx_ar_2fdd.lay new file mode 100644 index 00000000000..31493637e87 --- /dev/null +++ b/src/mame/layout/msx_ar_2fdd.lay @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_en.lay b/src/mame/layout/msx_en.lay new file mode 100644 index 00000000000..326a5fda772 --- /dev/null +++ b/src/mame/layout/msx_en.lay @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_jp.lay b/src/mame/layout/msx_jp.lay new file mode 100644 index 00000000000..87990ea3696 --- /dev/null +++ b/src/mame/layout/msx_jp.lay @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_jp_1fdd.lay b/src/mame/layout/msx_jp_1fdd.lay new file mode 100644 index 00000000000..c0c61f75d73 --- /dev/null +++ b/src/mame/layout/msx_jp_1fdd.lay @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_jp_2fdd.lay b/src/mame/layout/msx_jp_2fdd.lay new file mode 100644 index 00000000000..21b72a0cec1 --- /dev/null +++ b/src/mame/layout/msx_jp_2fdd.lay @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_kr.lay b/src/mame/layout/msx_kr.lay new file mode 100644 index 00000000000..588a9a8e15b --- /dev/null +++ b/src/mame/layout/msx_kr.lay @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_kr_1fdd.lay b/src/mame/layout/msx_kr_1fdd.lay new file mode 100644 index 00000000000..510de2c338c --- /dev/null +++ b/src/mame/layout/msx_kr_1fdd.lay @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_nocode.lay b/src/mame/layout/msx_nocode.lay new file mode 100644 index 00000000000..e9590f54162 --- /dev/null +++ b/src/mame/layout/msx_nocode.lay @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_nocode_1fdd.lay b/src/mame/layout/msx_nocode_1fdd.lay new file mode 100644 index 00000000000..13e542d88a5 --- /dev/null +++ b/src/mame/layout/msx_nocode_1fdd.lay @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_nocode_2fdd.lay b/src/mame/layout/msx_nocode_2fdd.lay new file mode 100644 index 00000000000..b57716997dd --- /dev/null +++ b/src/mame/layout/msx_nocode_2fdd.lay @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_nocode_nocaps.lay b/src/mame/layout/msx_nocode_nocaps.lay new file mode 100644 index 00000000000..c715a071086 --- /dev/null +++ b/src/mame/layout/msx_nocode_nocaps.lay @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_ru.lay b/src/mame/layout/msx_ru.lay new file mode 100644 index 00000000000..0cc1cf6e40b --- /dev/null +++ b/src/mame/layout/msx_ru.lay @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_ru_1fdd.lay b/src/mame/layout/msx_ru_1fdd.lay new file mode 100644 index 00000000000..9857ca2f777 --- /dev/null +++ b/src/mame/layout/msx_ru_1fdd.lay @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/msx_ru_2fdd.lay b/src/mame/layout/msx_ru_2fdd.lay new file mode 100644 index 00000000000..286ec1bf901 --- /dev/null +++ b/src/mame/layout/msx_ru_2fdd.lay @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/msx/msx.cpp b/src/mame/msx/msx.cpp index 4d6ca7bdb40..5fc5ef5bae1 100644 --- a/src/mame/msx/msx.cpp +++ b/src/mame/msx/msx.cpp @@ -107,9 +107,6 @@ #include "screen.h" #include "softlist_dev.h" -#include "msx.lh" - - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" @@ -161,10 +158,7 @@ msx_state::msx_state(const machine_config &mconfig, device_type type, const char , m_port_c_old(0) , m_keylatch(0) , m_caps_led(*this, "caps_led") - , m_caps_led_name(*this, "caps_led_name") , m_code_led(*this, "code_led") - , m_code_led_name(*this, "code_led_name") - , m_region(REGION_UNKNOWN) , m_main_xtal(main_xtal) , m_cpu_xtal_divider(cpu_xtal_divider) { @@ -309,24 +303,18 @@ void msx_state::machine_reset() m_view_slot0_page2.select(0); m_view_slot0_page3.select(0); } - m_caps_led_name = m_hw_def.has_caps_led() ? 1 : 0; - m_caps_led = m_hw_def.has_caps_led() ? 1 : 0; - m_code_led_name = m_hw_def.has_code_led() ? m_region : 0; - m_code_led = m_hw_def.has_code_led() ? 1 : 0; + m_caps_led = 0; + m_code_led = 0; } void msx_state::machine_start() { m_caps_led.resolve(); - m_caps_led_name.resolve(); m_code_led.resolve(); - m_code_led_name.resolve(); m_port_c_old = 0xff; } -/* A hack to add 1 wait cycle in each opcode fetch. - Possibly worth not to use custom table at all but adjust desired icount - directly in m_opcodes.read_byte handler. */ +// Update instruction timings to add 1 wait cycle for each M1 opcode fetch. static const u8 cc_op[0x100] = { 4+1,10+1, 7+1, 6+1, 4+1, 4+1, 7+1, 4+1, 4+1,11+1, 7+1, 6+1, 4+1, 4+1, 7+1, 4+1, 8+1,10+1, 7+1, 6+1, 4+1, 4+1, 7+1, 4+1,12+1,11+1, 7+1, 6+1, 4+1, 4+1, 7+1, 4+1, @@ -465,8 +453,7 @@ void msx_state::psg_port_a_w(u8 data) void msx_state::psg_port_b_w(u8 data) { // Code(/Kana/Arabic/Hangul) led - if (m_hw_def.has_code_led()) - m_code_led = 1 + BIT(~data, 7); + m_code_led = BIT(~data, 7); m_gen_port1->pin_6_w(BIT(data, 0)); m_gen_port1->pin_7_w(BIT(data, 1)); @@ -494,8 +481,7 @@ void msx_state::ppi_port_c_w(u8 data) m_keylatch = data & 0x0f; // caps lock - if (m_hw_def.has_caps_led()) - m_caps_led = 1 + BIT(~data, 6); + m_caps_led = BIT(~data, 6); // key click if (BIT(m_port_c_old ^ data, 7)) @@ -565,9 +551,8 @@ void msx_state::kanji_w(offs_t offset, u8 data) m_kanji_latch = (m_kanji_latch & 0x1f800) | ((data & 0x3f) << 5); } -void msx_state::msx_base(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx_state::msx_base(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - m_region = region; // basic machine hardware Z80(config, m_maincpu, m_main_xtal / m_cpu_xtal_divider); // 3.579545 MHz m_maincpu->set_addrmap(AS_PROGRAM, &msx_state::memory_map); @@ -626,7 +611,7 @@ void msx_state::msx_base(ay8910_type ay8910_type, machine_config &config, region m_cassette->set_interface("msx_cass"); } - config.set_default_layout(layout_msx); + config.set_default_layout(layout); } void msx_state::msx1_add_softlists(machine_config &config) @@ -641,9 +626,9 @@ void msx_state::msx1_add_softlists(machine_config &config) SOFTWARE_LIST(config, "flop_list").set_original("msx1_flop"); } -void msx_state::msx1(vdp_type vdp_type, ay8910_type ay8910_type, machine_config &config, region_type region) +void msx_state::msx1(vdp_type vdp_type, ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx_base(ay8910_type, config, region); + msx_base(ay8910_type, config, layout); m_maincpu->set_addrmap(AS_IO, &msx_state::msx1_io_map); @@ -824,17 +809,17 @@ void msx2_base_state::turbor_add_softlists(machine_config &config) } } -void msx2_base_state::msx2_base(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx2_base_state::msx2_base(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx_base(ay8910_type, config, region); + msx_base(ay8910_type, config, layout); // real time clock RP5C01(config, m_rtc, 32.768_kHz_XTAL); } -void msx2_base_state::msx2(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx2_base_state::msx2(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx2_base(ay8910_type, config, region); + msx2_base(ay8910_type, config, layout); m_maincpu->set_addrmap(AS_IO, &msx2_base_state::msx2_io_map); @@ -848,15 +833,15 @@ void msx2_base_state::msx2(ay8910_type ay8910_type, machine_config &config, regi msx2_add_softlists(config); } -void msx2_base_state::msx2_pal(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx2_base_state::msx2_pal(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx2(ay8910_type, config, region); + msx2(ay8910_type, config, layout); m_v9938->set_screen_pal(m_screen); } -void msx2_base_state::msx2plus_base(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx2_base_state::msx2plus_base(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx2_base(ay8910_type, config, region); + msx2_base(ay8910_type, config, layout); m_maincpu->set_addrmap(AS_IO, &msx2_base_state::msx2plus_io_map); @@ -867,23 +852,23 @@ void msx2_base_state::msx2plus_base(ay8910_type ay8910_type, machine_config &con m_v9958->int_cb().set(m_mainirq, FUNC(input_merger_device::in_w<0>)); } -void msx2_base_state::msx2plus(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx2_base_state::msx2plus(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx2plus_base(ay8910_type, config, region); + msx2plus_base(ay8910_type, config, layout); // Software lists msx2plus_add_softlists(config); } -void msx2_base_state::msx2plus_pal(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx2_base_state::msx2plus_pal(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx2plus(ay8910_type, config, region); + msx2plus(ay8910_type, config, layout); m_v9958->set_screen_pal(m_screen); } -void msx2_base_state::turbor(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx2_base_state::turbor(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx2plus_base(ay8910_type, config, region); + msx2plus_base(ay8910_type, config, layout); R800(config.replace(), m_maincpu, 28.636363_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &msx2_base_state::memory_map); diff --git a/src/mame/msx/msx.h b/src/mame/msx/msx.h index 016d877b5b8..a7975adafae 100644 --- a/src/mame/msx/msx.h +++ b/src/mame/msx/msx.h @@ -34,22 +34,16 @@ public: bool has_printer_port() const { return m_has_printer_port; } bool has_cartslot() const { return m_has_cartslot; } bool has_fdc() const { return m_has_fdc; } - bool has_caps_led() const { return m_has_caps_led; } - bool has_code_led() const { return m_has_code_led; } msx_hw_def &has_cassette(bool has_cassette) { m_has_cassette = has_cassette; return *this;} msx_hw_def &has_printer_port(bool has_printer_port) { m_has_printer_port = has_printer_port; return *this; } msx_hw_def &has_cartslot(bool has_cartslot) { m_has_cartslot = has_cartslot; return *this; } msx_hw_def &has_fdc(bool has_fdc) { m_has_fdc = has_fdc; return *this; } - msx_hw_def &no_caps_led() { m_has_caps_led = false; return *this; } - msx_hw_def &no_code_led() { m_has_code_led = false; return *this; } private: bool m_has_cassette = true; bool m_has_printer_port = true; bool m_has_cartslot = false; bool m_has_fdc = false; - bool m_has_caps_led = true; - bool m_has_code_led = true; }; class msx_state : public driver_device @@ -74,18 +68,8 @@ protected: VDP_TMS9929A }; - enum region_type - { - REGION_UNKNOWN = 0, - REGION_INTERNATIONAL = 1, - REGION_JAPAN = 2, - REGION_KOREA = 3, - REGION_ARAB = 4, - REGION_RUSSIA = 5 - }; - - void msx_base(ay8910_type ay8910_type, machine_config &config, region_type region); - void msx1(vdp_type vdp_type, ay8910_type ay8910_type, machine_config &config, region_type region); + void msx_base(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void msx1(vdp_type vdp_type, ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); void msx1_add_softlists(machine_config &config); // configuration helpers @@ -258,10 +242,7 @@ protected: u8 m_port_c_old; u8 m_keylatch; output_finder<> m_caps_led; - output_finder<> m_caps_led_name; output_finder<> m_code_led; - output_finder<> m_code_led_name; - region_type m_region; const XTAL m_main_xtal; const int m_cpu_xtal_divider; @@ -358,13 +339,13 @@ protected: virtual void machine_start() override; - void msx2_base(ay8910_type ay8910_type, machine_config &config, region_type region); - void msx2(ay8910_type ay8910_type, machine_config &config, region_type region); - void msx2_pal(ay8910_type ay8910_type, machine_config &config, region_type region); - void msx2plus_base(ay8910_type ay8910_type, machine_config &config, region_type region); - void msx2plus(ay8910_type ay8910_type, machine_config &config, region_type region); - void msx2plus_pal(ay8910_type ay8910_type, machine_config &config, region_type region); - void turbor(ay8910_type ay8910_type, machine_config &config, region_type region); + void msx2_base(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void msx2(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void msx2_pal(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void msx2plus_base(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void msx2plus(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void msx2plus_pal(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void turbor(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); void msx2_add_softlists(machine_config &config); void msx2plus_add_softlists(machine_config &config); void turbor_add_softlists(machine_config &config); diff --git a/src/mame/msx/msx1.cpp b/src/mame/msx/msx1.cpp index ec2bdf6b003..26e809f7ebd 100644 --- a/src/mame/msx/msx1.cpp +++ b/src/mame/msx/msx1.cpp @@ -11,6 +11,15 @@ #include "bus/msx/slot/ram_mm.h" #include "bus/msx/slot/rom.h" +#include "msx_ar.lh" +#include "msx_en.lh" +#include "msx_jp.lh" +#include "msx_jp_1fdd.lh" +#include "msx_kr.lh" +#include "msx_nocode.lh" +#include "msx_nocode_1fdd.lh" +#include "msx_nocode_nocaps.lh" + using namespace msx_keyboard; @@ -267,8 +276,7 @@ void msx1_state::perfect1(machine_config &config) // expansion slot in slot #2 // The bios code sets the bit for the language mode LED but there is no LED present on the keyboard. - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_ARAB); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Canon V-8 */ @@ -292,7 +300,7 @@ void msx1_state::canonv8(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 3, 1); m_hw_def.has_printer_port(false); - msx1(VDP_TMS9118, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9118, SND_YM2149, config, layout_msx_jp); } /* MSX - Canon V-10 */ @@ -314,7 +322,7 @@ void msx1_state::canonv10(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx1(VDP_TMS9918A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_YM2149, config, layout_msx_jp); } /* MSX - Canon V-20 */ @@ -338,7 +346,7 @@ void msx1_state::canonv20(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - msx1(VDP_TMS9918A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_YM2149, config, layout_msx_jp); } /* MSX - Canon V-20E */ @@ -362,8 +370,7 @@ void msx1_state::canonv20e(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Canon V-20F */ @@ -406,8 +413,8 @@ void msx1_state::mx10(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 0, 3, 1); // 16KB RAM add_cartridge_slot<1>(config, 1); - m_hw_def.has_cassette(false).has_printer_port(false).no_caps_led().no_code_led(); - msx1(VDP_TMS9118, SND_AY8910, config, REGION_JAPAN); + m_hw_def.has_cassette(false).has_printer_port(false); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Casio MX-15 */ @@ -429,8 +436,8 @@ void msx1_state::mx15(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 0, 3, 1); // 16KB RAM add_cartridge_slot<1>(config, 1); - m_hw_def.has_printer_port(false).no_caps_led(); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_INTERNATIONAL); + m_hw_def.has_printer_port(false); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Casio MX-101 */ @@ -452,8 +459,8 @@ void msx1_state::mx101(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 0, 3, 1); // 16KB RAM add_cartridge_slot<1>(config, 1); - m_hw_def.has_cassette(false).has_printer_port(false).no_caps_led().no_code_led(); - msx1(VDP_TMS9118, SND_AY8910, config, REGION_JAPAN); + m_hw_def.has_cassette(false).has_printer_port(false); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Casio PV-7 */ @@ -477,8 +484,8 @@ void msx1_state::pv7(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 0, 3, 1).force_start_address(0xe000); // 8KB RAM add_cartridge_slot<1>(config, 1); - m_hw_def.has_printer_port(false).no_caps_led().no_code_led(); - msx1(VDP_TMS9118, SND_AY8910, config, REGION_JAPAN); + m_hw_def.has_printer_port(false); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Casio PV-16 */ @@ -501,8 +508,8 @@ void msx1_state::pv16(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 0, 3, 1); // 16KB RAM add_cartridge_slot<1>(config, 1); - m_hw_def.has_printer_port(false).no_caps_led().no_code_led(); - msx1(VDP_TMS9118, SND_AY8910, config, REGION_JAPAN); + m_hw_def.has_printer_port(false); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - CE-TEC MPC-80, German version of Daewoo DPC-200, dump needed to verify */ @@ -533,7 +540,7 @@ void msx1_state::cpc88(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM m_hw_def.has_printer_port(false); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_KOREA); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_kr); } /* MSX - Daewoo DPC-100 */ @@ -561,7 +568,7 @@ void msx1_state::dpc100(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 3, 1); // 16KB RAM // expansion slot is in slot #3 - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_KOREA); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_kr); } /* MSX - Daewoo DPC-180 */ @@ -588,7 +595,7 @@ void msx1_state::dpc180(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot is in slot #3 - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_KOREA); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_kr); } /* MSX - Daewoo DPC-200 */ @@ -616,7 +623,7 @@ void msx1_state::dpc200(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot is in slot #3 - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_KOREA); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_kr); } /* MSX - Daewoo DPC-200E (France) */ @@ -638,8 +645,7 @@ void msx1_state::dpc200e(machine_config &config) add_cartridge_slot<1>(config, 2); // Expansion slot is in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Daewoo Zemmix CPC-50 */ @@ -668,9 +674,9 @@ void msx1_state::cpc50a(machine_config &config) add_cartridge_slot<1>(config, 1); add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 3, 1).force_start_address(0xe000); // 8KB RAM - m_hw_def.has_cassette(false).has_printer_port(false).no_caps_led().no_code_led(); + m_hw_def.has_cassette(false).has_printer_port(false); // It was released in Korea but there are no Korean specific things about the hardware - msx1(VDP_TMS9118, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Daewoo Zemmix CPC-50B */ @@ -694,9 +700,9 @@ void msx1_state::cpc50b(machine_config &config) add_cartridge_slot<1>(config, 1); add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 3, 1); // 16KB RAM - m_hw_def.has_cassette(false).has_printer_port(false).no_caps_led().no_code_led(); + m_hw_def.has_cassette(false).has_printer_port(false); // It was released in Korea but there are no Korean specific things about the hardware - msx1(VDP_TMS9118, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Daewoo Zemmix CPC-51 */ @@ -722,9 +728,9 @@ void msx1_state::cpc51(machine_config &config) add_cartridge_slot<1>(config, 1); add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM - m_hw_def.has_cassette(false).has_printer_port(false).no_caps_led().no_code_led(); + m_hw_def.has_cassette(false).has_printer_port(false); // It was released in Korea but there are no Korean specific things about the hardware - msx1(VDP_TMS9118, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Daewoo Zemmix DTX-1493FW */ @@ -749,8 +755,7 @@ void msx1_state::dgnmsx(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Dynadata DPC-200 */ @@ -779,8 +784,7 @@ void msx1_state::fdpc200(machine_config &config) add_cartridge_slot<1>(config, 2); // Expansion slot - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Fenner FPC-500 */ @@ -803,8 +807,7 @@ void msx1_state::fpc500(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Fenner SPC-800 */ @@ -826,8 +829,7 @@ void msx1_state::fspc800(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Fujitsu FM-X */ @@ -852,7 +854,7 @@ void msx1_state::fmx(machine_config &config) add_cartridge_slot<1>(config, 2); m_hw_def.has_printer_port(false); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp); } /* MSX - General PCT-50 */ @@ -886,7 +888,7 @@ void msx1_state::gsfc80u(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_KOREA); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_kr); } /* MSX - Goldstar FC-200 */ @@ -909,8 +911,7 @@ void msx1_state::gsfc200(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Goldstar GFC-1080 */ @@ -940,7 +941,7 @@ void msx1_state::gfc1080(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_KOREA); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_kr); } /* MSX - Goldstar GFC-1080A */ @@ -967,7 +968,7 @@ void msx1_state::gfc1080a(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_KOREA); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_kr); } /* MSX - Gradiente Expert 1.3 - source? */ @@ -988,8 +989,7 @@ void msx1_state::expert13(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 2, 0, 4).set_total_size(0x10000); // 64KB Mapper RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Gradiente Expert DDPlus */ @@ -1017,8 +1017,7 @@ void msx1_state::expertdp(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 0, 4); // 64KB RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK2_MB8877, "diskrom", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_nocode_1fdd); } /* MSX - Gradiente Expert Plus */ @@ -1044,8 +1043,7 @@ void msx1_state::expertpl(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 0, 4); // 64KB RAM add_internal_slot(config, MSX_SLOT_ROM, "demo", 3, 3, 2, 1, "demo"); - m_hw_def.no_code_led(); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Gradiente Expert XP-800 (1.0) */ @@ -1069,8 +1067,7 @@ void msx1_state::expert10(machine_config &config) // when no cartridge is inserted the expansion slot can be used in this slot add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9128, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9128, SND_AY8910, config, layout_msx_nocode); } /* MSX - Gradiente Expert XP-800 (1.1) / GPC-1 */ @@ -1091,8 +1088,7 @@ void msx1_state::expert11(machine_config &config) // when no cartridge is inserted the expansion slot can be used in this slot add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9128, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9128, SND_AY8910, config, layout_msx_nocode); } /* MSX - Hitachi MB-H1 */ @@ -1119,7 +1115,7 @@ void msx1_state::mbh1(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 1, 1, "firmware"); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Hitachi MB-H1E */ @@ -1141,7 +1137,7 @@ void msx1_state::mbh1e(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Hitachi MB-H2 */ @@ -1168,7 +1164,7 @@ void msx1_state::mbh2(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp); } /* MSX - Hitachi MB-H21 */ @@ -1192,7 +1188,7 @@ void msx1_state::mbh25(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx1(VDP_TMS9118, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_jp); } /* MSX - Hitachi MB-H50 */ @@ -1215,7 +1211,7 @@ void msx1_state::mbh50(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM - msx1(VDP_TMS9928A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_YM2149, config, layout_msx_jp); } /* MSX - Hitachi MB-H80 (unreleased) */ @@ -1240,8 +1236,7 @@ void msx1_state::jvchc7gb(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Jotan Holland Bingo */ @@ -1271,7 +1266,7 @@ void msx1_state::ml8000(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 0, 2, 2); // 32KB RAM add_cartridge_slot<1>(config, 1); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Mitsubishi ML-F48 */ @@ -1294,8 +1289,7 @@ void msx1_state::mlf48(machine_config &config) add_cartridge_slot<1>(config, 2); add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); // videochip needs verification + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); // videochip needs verification } /* MSX - Mitsubishi ML-F80 */ @@ -1318,8 +1312,7 @@ void msx1_state::mlf80(machine_config &config) add_cartridge_slot<1>(config, 2); add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); // videochip needs verification + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); // videochip needs verification } /* MSX - Mitsubishi ML-F110 */ @@ -1342,7 +1335,7 @@ void msx1_state::mlf110(machine_config &config) add_cartridge_slot<1>(config, 2); add_cartridge_slot<2>(config, 3); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Mitsubishi ML-F120 / ML-F120D */ @@ -1370,7 +1363,7 @@ void msx1_state::mlf120(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 1, 1, "firmware"); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Mitsubishi ML-F120D (functionality wise same as ML-F120 but with RGB out instead of composite) @@ -1402,8 +1395,7 @@ void msx1_state::mlfx1(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Mitsubishi ML-FX2 */ @@ -1428,7 +1420,7 @@ void msx1_state::cf1200(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); // soundchip needs verification + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); // soundchip needs verification } /* MSX - National CF-2000 */ @@ -1449,7 +1441,7 @@ void msx1_state::cf2000(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); // soundchip needs verification + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp); // soundchip needs verification } /* MSX - National CF-2700 */ @@ -1471,7 +1463,7 @@ void msx1_state::cf2700(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - National CF-3000 */ @@ -1492,7 +1484,7 @@ void msx1_state::cf3000(machine_config &config) add_cartridge_slot<1>(config, 2); add_cartridge_slot<2>(config, 3); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp); } /* MSX - National CF-3300 */ @@ -1517,7 +1509,7 @@ void msx1_state::cf3300(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 0, 4); // 64KB RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK2_MB8877_SS, "diskrom", 3, 1, 1, 2, "diskrom"); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp_1fdd); } /* MSX - National FS-1300 */ @@ -1539,7 +1531,7 @@ void msx1_state::fs1300(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM // Unclear from images whether caps and code leds are present; assuming they are present. - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - National FS-4000 */ @@ -1572,7 +1564,7 @@ void msx1_state::fs4000(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "kdr", 3, 1, 1, 2, "kdr"); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM - msx1(VDP_TMS9128, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9128, SND_YM2149, config, layout_msx_jp); } /* MSX - National FS-4000 (Alt) */ @@ -1605,7 +1597,7 @@ void msx1_state::fs4000a(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "kdr", 3, 1, 1, 2, "kdr"); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM - msx1(VDP_TMS9128, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9128, SND_YM2149, config, layout_msx_jp); } /* MSX - Network DPC-200 */ @@ -1634,8 +1626,7 @@ void msx1_state::phc2(machine_config &config) add_cartridge_slot<1>(config, 2); // Expansion slot in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Olympia PHC-28 */ @@ -1658,8 +1649,7 @@ void msx1_state::phc28(machine_config &config) add_cartridge_slot<2>(config, 2); // Expansion slot in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); // soundchip and videochip need verification + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); // soundchip and videochip need verification } /* MSX - Panasonic CF-2700 (Germany) */ @@ -1682,8 +1672,7 @@ void msx1_state::cf2700g(machine_config &config) add_cartridge_slot<1>(config, 2); add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Panasonic CF-2700 (UK) */ @@ -1706,8 +1695,7 @@ void msx1_state::cf2700uk(machine_config &config) add_cartridge_slot<1>(config, 2); add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Panasonic FS-3900 */ @@ -1738,8 +1726,8 @@ void msx1_state::nms801(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "mainrom", 0, 0, 2, "mainrom"); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.has_printer_port(false).no_caps_led().no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + m_hw_def.has_printer_port(false); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Philips VG-8000 */ @@ -1763,7 +1751,7 @@ void msx1_state::vg8000(machine_config &config) add_cartridge_slot<2>(config, 2); m_hw_def.has_printer_port(false); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_en); } /* MSX - Philips VG-8010 / VG-8010/00 */ @@ -1787,7 +1775,7 @@ void msx1_state::vg8010(machine_config &config) add_cartridge_slot<2>(config, 2); m_hw_def.has_printer_port(false); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_en); } /* MSX - Philips VG-8010F / VG-8010/19 */ @@ -1811,7 +1799,7 @@ void msx1_state::vg8010f(machine_config &config) add_cartridge_slot<2>(config, 2); m_hw_def.has_printer_port(false); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_en); } /* MSX - Philips VG-8020-00 */ @@ -1832,8 +1820,7 @@ void msx1_state::vg802000(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Philips VG-8020/19 / VG-8020F */ @@ -1855,8 +1842,7 @@ void msx1_state::vg8020f(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Philips VG-8020/20 */ @@ -1880,8 +1866,7 @@ void msx1_state::vg802020(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_YM2149, config, layout_msx_nocode); } /* MSX - Phonola VG-8000 (Italian market, mostly likely same as Philips VG-8000) */ @@ -1995,7 +1980,7 @@ void msx1_state::piopx7(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "pbasic", 2, 1, 1, "pbasic"); add_cartridge_slot<2>(config, 3); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp); } /* MSX - Pioneer PX-7UK */ @@ -2025,8 +2010,7 @@ void msx1_state::piopx7uk(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "pbasic", 2, 1, 1, "pbasic"); add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_YM2149, config, layout_msx_nocode); } /* MSX - Pioneer PX-V60 */ @@ -2054,7 +2038,7 @@ void msx1_state::piopxv60(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "pbasic", 2, 1, 1, "pbasic"); add_cartridge_slot<2>(config, 3); - msx1(VDP_TMS9128, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9128, SND_YM2149, config, layout_msx_jp); } /* MSX - Pioneer PX-V7 */ @@ -2090,7 +2074,7 @@ void msx1_state::ax150(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx1(VDP_TMS9918, SND_YM2149, config, REGION_ARAB); + msx1(VDP_TMS9918, SND_YM2149, config, layout_msx_ar); } /* MSX - Sakhr AX-170 */ @@ -2117,7 +2101,7 @@ void msx1_state::ax170(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 0, 4); // 64KB RAM add_cartridge_slot<2>(config, 3, 3); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_ARAB); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_ar); } /* MSX - Sakhr AX-170F */ @@ -2148,7 +2132,7 @@ void msx1_state::ax230(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 0, 4); // 64KB RAM add_internal_slot(config, MSX_SLOT_AX230, "games", 3, 3, 1, 2, "games"); - msx1(VDP_TMS9918, SND_AY8910, config, REGION_ARAB); + msx1(VDP_TMS9918, SND_AY8910, config, layout_msx_ar); } /* MSX - Sakhr AX-330 */ @@ -2181,7 +2165,7 @@ void msx1_state::spc800(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB?? RAM // Expansion slot in slot #3 - msx1(VDP_TMS9118, SND_AY8910, config, REGION_KOREA); + msx1(VDP_TMS9118, SND_AY8910, config, layout_msx_kr); } /* MSX - Sanno PHC-SPC */ @@ -2213,8 +2197,7 @@ void msx1_state::mpc64(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sanyo MPC-100 */ @@ -2236,8 +2219,7 @@ void msx1_state::mpc100(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_caps_led().no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX - Sanyo MPC-200 */ @@ -2260,8 +2242,7 @@ void msx1_state::mpc200(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sanyo MPC-200SP (same as Sanyo MPC-200 ?) */ @@ -2282,8 +2263,7 @@ void msx1_state::mpc200sp(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sanyo PHC-28L */ @@ -2305,8 +2285,7 @@ void msx1_state::phc28l(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Sanyo PHC-28S */ @@ -2329,8 +2308,7 @@ void msx1_state::phc28s(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 2); // 32KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sanyo Wavy MPC-10 */ @@ -2355,7 +2333,7 @@ void msx1_state::mpc10(machine_config &config) // Expansion slot in slot #2 add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 2); // 32KB RAM - msx1(VDP_TMS9918, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918, SND_AY8910, config, layout_msx_jp); } /* MSX - Schneider MC 810 */ @@ -2382,8 +2360,7 @@ void msx1_state::hb8000(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9128, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9128, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sharp Epcom HB-8000 (HotBit 1.3b) */ @@ -2404,8 +2381,7 @@ void msx1_state::hotbi13b(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 0, 4).set_total_size(0x10000); // 64KB Mapper RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sharp Epcom HB-8000 (HotBit 1.3p) */ @@ -2426,8 +2402,7 @@ void msx1_state::hotbi13p(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 0, 4).set_total_size(0x10000); // 64KB Mapper RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sincorp SBX (Argentina, homebrew) */ @@ -2453,7 +2428,7 @@ void msx1_state::hb10(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx1(VDP_TMS9118, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9118, SND_YM2149, config, layout_msx_jp); } /* MSX - Sony HB-10B */ @@ -2482,8 +2457,7 @@ void msx1_state::hb10p(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Sony HB-20P */ @@ -2507,8 +2481,7 @@ void msx1_state::hb20p(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Sony HB-201 */ @@ -2533,7 +2506,7 @@ void msx1_state::hb201(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - msx1(VDP_TMS9118, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9118, SND_YM2149, config, layout_msx_jp); } /* MSX - Sony HB-201P */ @@ -2558,8 +2531,7 @@ void msx1_state::hb201p(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_YM2149, config, layout_msx_nocode); } /* MSX - Sony HB-501F */ @@ -2588,8 +2560,7 @@ void msx1_state::hb501p(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Sony HB-55 (Version 1) */ @@ -2614,7 +2585,7 @@ void msx1_state::hb55(machine_config &config) add_cartridge_slot<1>(config, 1); // Expansion slot in slot #3 - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Sony HB-55D, is this HB-55 2nd version? */ @@ -2639,8 +2610,7 @@ void msx1_state::hb55d(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 3, 1); // 16KB RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sony HB-55P */ @@ -2669,8 +2639,7 @@ void msx1_state::hb55p(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sony HB-75 */ @@ -2695,7 +2664,7 @@ void msx1_state::hb75(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Sony HB-75AS */ @@ -2724,8 +2693,7 @@ void msx1_state::hb75d(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sony HB-75F */ @@ -2756,8 +2724,7 @@ void msx1_state::hb75p(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Sony HB-101 */ @@ -2784,7 +2751,7 @@ void msx1_state::hb101(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 1, 1, "firmware"); - msx1(VDP_TMS9118, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9118, SND_YM2149, config, layout_msx_jp); } /* MSX - Sony HB-101P */ @@ -2811,8 +2778,7 @@ void msx1_state::hb101p(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 1, 1, "firmware"); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Sony HB-701 */ @@ -2840,7 +2806,7 @@ void msx1_state::hb701fd(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 0, 4); // 64KB RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_SS, "disk", 3, 1, 1, 2, "diskrom"); - msx1(VDP_TMS9928A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX - Spectravideo SVI-728 */ @@ -2862,8 +2828,7 @@ void msx1_state::svi728(machine_config &config) add_cartridge_slot<1>(config, 2); // Expansion slot (for eg SVI-707) in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Spectravideo SVI-728 (Arabic) */ @@ -2905,8 +2870,7 @@ void msx1_state::tadpc200(machine_config &config) add_cartridge_slot<1>(config, 2); // Expansion slot in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); } /* MSX - Talent DPS-201 */ @@ -2996,8 +2960,7 @@ void msx1_state::hx10(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Toshiba HX-10AA */ @@ -3021,7 +2984,7 @@ void msx1_state::hx10d(machine_config &config) // Expansion slot in slot #3 m_hw_def.has_printer_port(false); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Toshiba HX-10DP */ @@ -3042,7 +3005,7 @@ void msx1_state::hx10dp(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Toshiba HX-10DPN */ @@ -3065,8 +3028,7 @@ void msx1_state::hx10e(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Toshiba HX-10F */ @@ -3087,8 +3049,7 @@ void msx1_state::hx10f(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM // Expansion slot in slot #3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Toshiba HX-10I */ @@ -3113,7 +3074,7 @@ void msx1_state::hx10s(machine_config &config) // Expansion slot in slot #3 m_hw_def.has_printer_port(false); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Toshiba HX-10SA */ @@ -3135,7 +3096,7 @@ void msx1_state::hx10sa(machine_config &config) // Expansion slot in slot #3 m_hw_def.has_printer_port(false); - msx1(VDP_TMS9918A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_AY8910, config, layout_msx_jp); } /* MSX - Toshiba HX-10SF */ @@ -3167,7 +3128,7 @@ void msx1_state::hx20(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram2", 3, 0, 0, 2); // 32KB RAM add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 3, 1, 2, "firmware"); - msx1(VDP_TMS9129, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9129, SND_YM2149, config, layout_msx_jp); } /* MSX - Toshiba HX-20AR */ @@ -3197,8 +3158,7 @@ void msx1_state::hx20e(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram2", 3, 0, 0, 2); // 32KB RAM add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 3, 1, 2, "firmware"); - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_YM2149, config, layout_msx_nocode); } /* MSX - Toshiba HX-20I */ @@ -3225,8 +3185,7 @@ void msx1_state::hx20i(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram2", 3, 0, 0, 2); // 32KB RAM add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 3, 1, 2, "firmware"); - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_YM2149, config, layout_msx_nocode); } /* MSX - Toshiba HX-21 */ @@ -3254,7 +3213,7 @@ void msx1_state::hx21(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "firmware_mirror1", 3, 3, 0, 1, "firmware"); add_internal_slot(config, MSX_SLOT_ROM, "firmware_mirror2", 3, 3, 3, 1, "firmware", 0x4000); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp); } /* MSX - Toshiba HX-21F */ @@ -3280,8 +3239,7 @@ void msx1_state::hx21f(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram2", 3, 0, 2, 2); // 32KB RAM add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 3, 1, 2, "firmware"); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Toshiba HX-22 */ @@ -3309,7 +3267,7 @@ void msx1_state::hx22(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "firmware_mirror1", 3, 3, 0, 1, "firmware"); add_internal_slot(config, MSX_SLOT_ROM, "firmware_mirror2", 3, 3, 3, 1, "firmware", 0x4000); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp); } /* MSX - Toshiba HX-22CH */ @@ -3341,8 +3299,7 @@ void msx1_state::hx22i(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram2", 3, 0, 2, 2); // 32KB RAM add_internal_slot_irq<3>(config, MSX_SLOT_RS232_TOSHIBA, "firmware", 3, 3, 1, 2, "firmware"); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_AY8910, config, layout_msx_nocode); } /* MSX - Toshiba HX-30 */ @@ -3377,7 +3334,7 @@ void msx1_state::hx32(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram2", 3, 0, 0, 4); // 64KB RAM add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 3, 1, 2, "firmware"); - msx1(VDP_TMS9928A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_YM2149, config, layout_msx_jp); } /* MSX - Toshiba HX-51I */ @@ -3401,8 +3358,7 @@ void msx1_state::hx51i(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram2", 3, 0, 2); // 32KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9918, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9918, SND_AY8910, config, layout_msx_nocode); } /* MSX - Toshiba HX-52 */ @@ -3430,7 +3386,7 @@ void msx1_state::hc5(machine_config &config) // Expansion slot in slot #2 // Module slot in slot #3 - msx1(VDP_TMS9928A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_YM2149, config, layout_msx_jp); } /* MSX - Victor HC-6 */ @@ -3452,7 +3408,7 @@ void msx1_state::hc6(machine_config &config) // Expansion slot in slot #2 // Module slot in slot #3 - msx1(VDP_TMS9928A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_YM2149, config, layout_msx_jp); } /* MSX - Victor HC-7 */ @@ -3477,7 +3433,7 @@ void msx1_state::hc7(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM add_cartridge_slot<2>(config, 3); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_jp); } /* MSX - Victor HC-30 */ @@ -3511,7 +3467,7 @@ void msx1_state::cx5f1(machine_config &config) // Expansion bus in slot #2 add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, msx_yamaha_60pin, "sfg01"); - msx1(VDP_TMS9928A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_YM2149, config, layout_msx_jp); } /* MSX - Yamaha CX5F (with SFG05) */ @@ -3537,7 +3493,7 @@ void msx1_state::cx5f(machine_config &config) // Expansion bus in slot #2 add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, msx_yamaha_60pin, "sfg05"); - msx1(VDP_TMS9928A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_YM2149, config, layout_msx_jp); } /* MSX - Yamaha CX5MA (Australia / New Zealand */ @@ -3573,8 +3529,7 @@ void msx1_state::cx5mu(machine_config &config) // Expansion slot in slot #2 add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, msx_yamaha_60pin, "sfg01"); - m_hw_def.no_code_led(); - msx1(VDP_TMS9918A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9918A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Yamaha SX-100 */ @@ -3596,7 +3551,7 @@ void msx1_state::sx100(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 0, 2, 2); // 32KB RAM add_cartridge_slot<1>(config, 1); - msx1(VDP_TMS9918, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9918, SND_YM2149, config, layout_msx_jp); } /* MSX - Yamaha YIS-303 */ @@ -3623,7 +3578,7 @@ void msx1_state::yis303(machine_config &config) add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 0, msx_yamaha_60pin, nullptr); m_hw_def.has_printer_port(false); - msx1(VDP_TMS9918A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9918A, SND_YM2149, config, layout_msx_jp); } /* MSX - Yamaha YIS-503 */ @@ -3647,7 +3602,7 @@ void msx1_state::yis503(machine_config &config) // Expansion slot in slot #2 add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, msx_yamaha_60pin, nullptr); - msx1(VDP_TMS9928A, SND_YM2149, config, REGION_JAPAN); + msx1(VDP_TMS9928A, SND_YM2149, config, layout_msx_jp); } /* MSX - Yamaha YIS-503F */ @@ -3671,8 +3626,7 @@ void msx1_state::yis503f(machine_config &config) // Expansion slot in slot #2 add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, msx_yamaha_60pin, nullptr); - m_hw_def.no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode); } /* MSX - Yamaha YIS-603 */ @@ -3694,8 +3648,7 @@ void msx1_state::yc64(machine_config &config) add_cartridge_slot<1>(config, 1); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_caps_led().no_code_led(); - msx1(VDP_TMS9929A, SND_YM2149, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9929A, SND_YM2149, config, layout_msx_nocode_nocaps); } /* MSX - Yeno DPC-64 */ @@ -3719,8 +3672,7 @@ void msx1_state::mx64(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 2, 0, 4); // 64KB RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx1(VDP_TMS9928A, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9928A, SND_AY8910, config, layout_msx_nocode); } } // anonymous namespace diff --git a/src/mame/msx/msx1_bruc100.cpp b/src/mame/msx/msx1_bruc100.cpp index 2c8790678dc..111efb0970e 100644 --- a/src/mame/msx/msx1_bruc100.cpp +++ b/src/mame/msx/msx1_bruc100.cpp @@ -13,6 +13,8 @@ #include "bus/msx/slot/ram.h" #include "bus/msx/slot/ram_mm.h" +#include "msx_nocode.lh" + using namespace msx_keyboard; @@ -73,8 +75,7 @@ void bruc100_state::bruc100(machine_config &config) // Expansion slot in slot 1 add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 0, 4).set_total_size(0x10000); // 64KB RAM - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); m_maincpu->set_addrmap(AS_IO, &bruc100_state::io_map); } @@ -109,8 +110,7 @@ void bruc100_state::bruc100a(machine_config &config) add_cartridge_slot<1>(config, 2); // Expansion slot in slot 3 - m_hw_def.no_code_led(); - msx1(VDP_TMS9129, SND_AY8910, config, REGION_INTERNATIONAL); + msx1(VDP_TMS9129, SND_AY8910, config, layout_msx_nocode); m_maincpu->set_addrmap(AS_IO, &bruc100_state::io_map); } diff --git a/src/mame/msx/msx1_v9938.cpp b/src/mame/msx/msx1_v9938.cpp index c65b819f6a7..5d2cd901f4b 100644 --- a/src/mame/msx/msx1_v9938.cpp +++ b/src/mame/msx/msx1_v9938.cpp @@ -11,6 +11,13 @@ #include "bus/msx/slot/rom.h" #include "softlist_dev.h" +#include "msx_ar.lh" +#include "msx_ar_1fdd.lh" +#include "msx_en.lh" +#include "msx_ru.lh" +#include "msx_nocode.lh" +#include "msx_nocode_1fdd.lh" + using namespace msx_keyboard; /*************************************************************************** @@ -57,9 +64,9 @@ public: void yis503ii(machine_config &config); protected: - void msx1_v9938(ay8910_type ay8910_type, machine_config &config, region_type region); - void msx1_v9938_pal(ay8910_type ay8910_type, machine_config &config, region_type region); - void svi738_base(machine_config &config, region_type region); + void msx1_v9938(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void msx1_v9938_pal(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout); + void svi738_base(machine_config &config, const internal_layout &layout); void io_map(address_map &map); @@ -78,9 +85,9 @@ void msx1_v9938_state::io_map(address_map &map) map(0x98, 0x9b).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); } -void msx1_v9938_state::msx1_v9938(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx1_v9938_state::msx1_v9938(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx_base(ay8910_type, config, region); + msx_base(ay8910_type, config, layout); m_maincpu->set_addrmap(AS_IO, &msx1_v9938_state::io_map); @@ -94,9 +101,9 @@ void msx1_v9938_state::msx1_v9938(ay8910_type ay8910_type, machine_config &confi msx1_add_softlists(config); } -void msx1_v9938_state::msx1_v9938_pal(ay8910_type ay8910_type, machine_config &config, region_type region) +void msx1_v9938_state::msx1_v9938_pal(ay8910_type ay8910_type, machine_config &config, const internal_layout &layout) { - msx1_v9938(ay8910_type, config, region); + msx1_v9938(ay8910_type, config, layout); m_v9938->set_screen_pal(m_screen); } @@ -126,7 +133,7 @@ void msx1_v9938_state::ax200(machine_config &config) add_cartridge_slot<2>(config, 2); add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, msx_yamaha_60pin, nullptr); - msx1_v9938_pal(SND_YM2149, config, REGION_ARAB); + msx1_v9938_pal(SND_YM2149, config, layout_msx_ar); } /* MSX - Sakhr AX-200 (Arabic/French) */ @@ -158,7 +165,7 @@ void msx1_v9938_state::ax200m(machine_config &config) // Dumped unit had a SFG05 with version M5.00.011 rom add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, msx_yamaha_60pin, "sfg05"); - msx1_v9938_pal(SND_YM2149, config, REGION_ARAB); + msx1_v9938_pal(SND_YM2149, config, layout_msx_ar); } /* MSX - Spectravideo SVI-738 */ @@ -174,7 +181,7 @@ ROM_START(svi738) ROM_LOAD("738232c.rom", 0x0000, 0x2000, CRC(3353dcc6) SHA1(4e9384c9d137f0ab65ffc5a78f04cd8c9df6c8b7)) ROM_END -void msx1_v9938_state::svi738_base(machine_config &config, region_type region) +void msx1_v9938_state::svi738_base(machine_config &config, const internal_layout &layout) { add_internal_slot(config, MSX_SLOT_ROM, "mainrom", 0, 0, 2, "mainrom"); add_internal_slot(config, MSX_SLOT_RAM, "ram", 1, 0, 4); // 64KB RAM @@ -182,7 +189,7 @@ void msx1_v9938_state::svi738_base(machine_config &config, region_type region) add_internal_slot_irq<2>(config, MSX_SLOT_RS232_SVI738, "rs232", 3, 0, 1, 1, "rs232rom"); add_internal_disk_mirrored(config, MSX_SLOT_DISK2_FD1793_SS, "disk", 3, 1, 1, 2, "diskrom").use_motor_for_led(); - msx1_v9938_pal(SND_AY8910, config, region); + msx1_v9938_pal(SND_AY8910, config, layout); } void msx1_v9938_state::svi738(machine_config &config) @@ -193,8 +200,7 @@ void msx1_v9938_state::svi738(machine_config &config) // builtin 80 columns card (V9938) // RS-232C interface - m_hw_def.no_code_led(); - svi738_base(config, REGION_INTERNATIONAL); + svi738_base(config, layout_msx_nocode_1fdd); } /* MSX - Spectravideo SVI-738 Arabic */ @@ -215,7 +221,7 @@ ROM_END void msx1_v9938_state::svi738ar(machine_config &config) { - svi738_base(config, REGION_ARAB); + svi738_base(config, layout_msx_ar_1fdd); add_internal_slot(config, MSX_SLOT_ROM, "arab", 3, 3, 1, 2, "arab"); } @@ -292,8 +298,7 @@ void msx1_v9938_state::tadpc200a(machine_config &config) add_cartridge_slot<1>(config, 2); // Expansion slot - m_hw_def.no_code_led(); - msx1_v9938_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx1_v9938_pal(SND_YM2149, config, layout_msx_nocode); } /* MSX - Yamaha CX5MII-128A (Australia, New Zealand) */ @@ -326,8 +331,7 @@ void msx1_v9938_state::cx5m128(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000); // 128KB Mapper RAM add_cartridge_slot<4>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, "sfg05"); - m_hw_def.no_code_led(); - msx1_v9938_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx1_v9938_pal(SND_YM2149, config, layout_msx_nocode); SOFTWARE_LIST(config, "minicart_list").set_original("msx_yamaha_minicart"); } @@ -375,8 +379,7 @@ void msx1_v9938_state::cx5miib(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x10000); // 64KB Mapper RAM add_cartridge_slot<4>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, "sfg05"); - m_hw_def.no_code_led(); - msx1_v9938_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx1_v9938_pal(SND_YM2149, config, layout_msx_nocode); SOFTWARE_LIST(config, "minicart_list").set_original("msx_yamaha_minicart"); } @@ -415,8 +418,7 @@ void msx1_v9938_state::yis503ii(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, nullptr); - m_hw_def.no_code_led(); - msx1_v9938(SND_YM2149, config, REGION_INTERNATIONAL); + msx1_v9938(SND_YM2149, config, layout_msx_nocode); } /* MSX - Yamaha YIS503-IIR Russian */ @@ -446,7 +448,7 @@ void msx1_v9938_state::y503iir(machine_config &config) // This should have a serial network interface by default add_cartridge_slot<4>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, nullptr); - msx1_v9938_pal(SND_YM2149, config, REGION_RUSSIA); + msx1_v9938_pal(SND_YM2149, config, layout_msx_ru); SOFTWARE_LIST(config, "minicart_list").set_original("msx_yamaha_minicart"); } @@ -477,7 +479,7 @@ void msx1_v9938_state::y503iir2(machine_config &config) // This should have a serial network interface by default add_cartridge_slot<4>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, nullptr); - msx1_v9938_pal(SND_YM2149, config, REGION_RUSSIA); + msx1_v9938_pal(SND_YM2149, config, layout_msx_ru); SOFTWARE_LIST(config, "minicart_list").set_original("msx_yamaha_minicart"); } diff --git a/src/mame/msx/msx2.cpp b/src/mame/msx/msx2.cpp index 6298d1214d9..da3a01a3e45 100644 --- a/src/mame/msx/msx2.cpp +++ b/src/mame/msx/msx2.cpp @@ -22,6 +22,23 @@ #include "bus/msx/slot/sony08.h" #include "softlist_dev.h" +#include "msx_ar.lh" +#include "msx_ar_1fdd.lh" +#include "msx_ar_2fdd.lh" +#include "msx_en.lh" +#include "msx_jp.lh" +#include "msx_jp_1fdd.lh" +#include "msx_jp_2fdd.lh" +#include "msx_kr.lh" +#include "msx_kr_1fdd.lh" +#include "msx_ru.lh" +#include "msx_ru_1fdd.lh" +#include "msx_ru_2fdd.lh" +#include "msx_nocode.lh" +#include "msx_nocode_1fdd.lh" +#include "msx_nocode_2fdd.lh" +#include "msx_nocode_nocaps.lh" + using namespace msx_keyboard; @@ -213,7 +230,7 @@ void msx2_state::canonv25(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "subrom", 3, 0, 0, 1, "subrom"); add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x10000); // 64KB Mapper RAM - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); msx2_64kb_vram(config); } @@ -244,7 +261,7 @@ void msx2_state::canonv30f(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK7_MB8877, "disk", 3, 1, 1, 2, "diskrom"); add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000); // 128KB Mapper RAM - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Daewoo CPC-300 */ @@ -276,7 +293,7 @@ void msx2_state::cpc300(machine_config &config) // Expansion slot in slot #3 MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_KOREA); + msx2(SND_YM2149, config, layout_msx_kr); } /* MSX2 - Daewoo CPC-300E */ @@ -310,7 +327,7 @@ void msx2_state::cpc300e(machine_config &config) // Expansion slot in slot #3 MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_KOREA); + msx2(SND_YM2149, config, layout_msx_kr); } /* MSX2 - Daewoo CPC-330K */ @@ -341,7 +358,7 @@ void msx2_state::cpc330k(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "subrom", 0, 3, 0, 2, "subrom"); add_cartridge_slot<1>(config, 1); - msx2(SND_AY8910, config, REGION_KOREA); + msx2(SND_AY8910, config, layout_msx_kr); } /* MSX2 - Daewoo CPC-400 */ @@ -378,7 +395,7 @@ void msx2_state::cpc400(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK2_MB8877, "disk", 2, 1, 2, "diskrom"); // Expansion slot in slot #3 - msx2(SND_AY8910, config, REGION_KOREA); + msx2(SND_AY8910, config, layout_msx_kr_1fdd); } /* MSX2 - Daewoo CPC-400S */ @@ -413,7 +430,7 @@ void msx2_state::cpc400s(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK2_MB8877, "disk", 2, 1, 2, "mainrom", 0x8000); // Expansion slot in slot #3 - msx2(SND_AY8910, config, REGION_KOREA); + msx2(SND_AY8910, config, layout_msx_kr_1fdd); } /* MSX2 - Daewoo Zemmix CPC-61 */ @@ -439,8 +456,8 @@ void msx2_state::cpc61(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "subrom", 0, 3, 0, 1, "mainrom", 0x8000); add_cartridge_slot<1>(config, 1); - m_hw_def.has_cassette(false).has_printer_port(false).no_caps_led().no_code_led(); - msx2(SND_AY8910, config, REGION_KOREA); + m_hw_def.has_cassette(false).has_printer_port(false); + msx2(SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX2 - Daewoo Zemmix CPG-120 Normal */ @@ -479,8 +496,8 @@ void msx2_state::cpg120(machine_config &config) MSX_S1985(config, "s1985", 0); msx_ym2413(config); - m_hw_def.has_printer_port(false).no_caps_led().no_code_led(); - msx2plus(SND_AY8910, config, REGION_KOREA); + m_hw_def.has_printer_port(false); + msx2plus(SND_AY8910, config, layout_msx_nocode_nocaps); } /* MSX2 - Daisen Sangyo MX-2021 */ @@ -512,8 +529,7 @@ void msx2_state::fpc900(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x40000); // 256KB? Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - GR8Bit (should probably be a separate driver) */ @@ -548,8 +564,7 @@ void msx2_state::expert20(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 2, 0, 0, 4).set_total_size(0x20000).set_unused_bits(0x80); // 128KB Mapper RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx2_pal(SND_AY8910, config, REGION_INTERNATIONAL); + msx2_pal(SND_AY8910, config, layout_msx_nocode_1fdd); } /* MSX2 - Hitachi MB-H3 */ @@ -581,7 +596,7 @@ void msx2_state::mbh3(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 0, 1, 2, "firmware"); add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000); // 128KB Mapper RAM - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); msx2_64kb_vram(config); } @@ -621,7 +636,7 @@ void msx2_state::mbh70(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - Kawai KMC-5000 */ @@ -661,7 +676,7 @@ void msx2_state::kmc5000(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Laser MSX2 (unreleased) */ @@ -696,8 +711,7 @@ void msx2_state::mlg1(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x10000); // 64KB Mapper RAM add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 3, 0, 2, "firmware"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode); } /* MSX2 - Mitsubishi ML-G3 */ @@ -736,8 +750,7 @@ void msx2_state::mlg3(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x10000); // 64KB Mapper RAM add_internal_slot_irq<4>(config, MSX_SLOT_RS232_MITSUBISHI, "rs232", 3, 3, 1, 1, "rs232"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Mitsubishi ML-G10 */ @@ -773,7 +786,7 @@ void msx2_state::mlg10(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x10000); // 64KB Mapper RAM add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 3, 0, 2, "firmware"); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); } /* MSX2 - Mitsubishi ML-G30 Model 1 */ @@ -808,7 +821,7 @@ void msx2_state::mlg30(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000); // 128KB Mapper RAM add_cartridge_slot<4>(config, 3, 3); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Mitsubishi ML-G30 Model 2 */ @@ -848,7 +861,7 @@ void msx2_state::mlg30_2(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000); // 128KB Mapper RAM add_internal_slot_irq<4>(config, MSX_SLOT_RS232_MITSUBISHI, "rs232", 3, 3, 1, 1, "rs232"); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - ML-TS100 (should be a separate driver) */ @@ -923,7 +936,7 @@ void msx2_state::fs4500(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM MSX_MATSUSHITA(config, "matsushita", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); } /* MSX2 - National FS-4600F */ @@ -986,7 +999,7 @@ void msx2_state::fs4600f(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - National FS-4700 */ @@ -1061,7 +1074,7 @@ void msx2_state::fs4700f(machine_config &config) MSX_MATSUSHITA(config, "matsushita", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - National FS-5000F2 */ @@ -1108,7 +1121,7 @@ void msx2_state::fs5000f2(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - National FS-5500F1 */ @@ -1191,7 +1204,7 @@ void msx2_state::fs5500f1(machine_config &config) MSX_MATSUSHITA(config, "matsushita", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - National FS-5500F2 */ @@ -1242,7 +1255,7 @@ void msx2_state::fs5500f2(machine_config &config) MSX_MATSUSHITA(config, "matsushita", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - Panasonic FS-A1 */ @@ -1269,8 +1282,7 @@ void msx2_state::fsa1(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_caps_led().no_code_led(); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_nocode_nocaps); } /* MSX2 - Panasonic FS-A1 (a) */ @@ -1300,8 +1312,7 @@ void msx2_state::fsa1a(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_caps_led().no_code_led(); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_nocode_nocaps); } /* MSX2 - Panasonic FS-A1F */ @@ -1332,7 +1343,7 @@ void msx2_state::fsa1f(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Panasonic FS-A1FM */ @@ -1381,7 +1392,7 @@ void msx2_state::fsa1fm(machine_config &config) msx_kanji12_device &kanji12(MSX_KANJI12(config, "kanji12", 0)); kanji12.set_rom_start("kanji12"); - msx2(SND_AY8910, config, REGION_JAPAN); + msx2(SND_AY8910, config, layout_msx_jp_1fdd); } /* MSX2 - Panasonic FS-A1MK2 */ @@ -1422,7 +1433,7 @@ void msx2_state::fsa1mk2(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); } /* MSX2 - Philips HCS 280 */ @@ -1456,8 +1467,7 @@ void msx2_state::nms8220(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "designer", 3, 3, 1, 1, "designer"); add_internal_slot(config, MSX_SLOT_ROM, "designer_mirror", 3, 3, 2, 1, "designer"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode); } /* MSX2 - Philips NMS 8245 - 2 possible sets (/00 /16) */ @@ -1490,8 +1500,7 @@ void msx2_state::nms8245(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 3, 1, 2, "mainrom", 0xc000); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Philips NMS 8245/19 */ @@ -1515,8 +1524,7 @@ void msx2_state::nms8245f(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 3, 1, 2, "maincpu", 0x1c000); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Philips NMS 8245 Home Banking (Italy) */ @@ -1556,8 +1564,7 @@ void msx2_state::nms8250(machine_config &config) // ROM is not mirrored but the FDC registers are in all pages add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Philips NMS 8250/16 */ @@ -1618,8 +1625,7 @@ void msx2_state::nms8255(machine_config &config) // ROM is not mirrored but the FDC registers are in all pages add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_2_DRIVES, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_2fdd); } /* MSX2 - Philips NMS 8255/19 */ @@ -1649,8 +1655,7 @@ void msx2_state::nms8255f(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_2_DRIVES, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_2fdd); } /* MSX2 - Philips NMS 8260 */ @@ -1690,8 +1695,8 @@ void msx2_state::nms8260(machine_config &config) // There is actually only an FDC inside with a floppy controller to attach an external floppy drive add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_0, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); // Not confirmed as there are no pictures of the keyboard - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + // Not confirmed as there are no pictures of the keyboard + msx2_pal(SND_YM2149, config, layout_msx_nocode); } /* MSX2 - Philips NMS 8280 - 5 possible sets (/00 /02 /09 /16 /19) */ @@ -1721,8 +1726,7 @@ void msx2_state::nms8280(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_2_DRIVES, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_2fdd); } /* MSX2 - Philips NMS 8280F */ @@ -1752,8 +1756,7 @@ void msx2_state::nms8280f(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_2_DRIVES, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_2fdd); } /* MSX2 - Philips NMS 8280G */ @@ -1784,8 +1787,7 @@ void msx2_state::nms8280g(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_2_DRIVES, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_2fdd); } /* MSX2 - Philips VG-8230 (u11 - exp, u12 - basic, u13 - disk */ @@ -1815,8 +1817,7 @@ void msx2_state::vg8230(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM add_internal_disk(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 3, 1, 1, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Philips VG-8235 (/00 and /20) */ @@ -1864,8 +1865,7 @@ void msx2_state::vg8235(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Philips VG-8235F (/19 and /39) */ @@ -1901,8 +1901,7 @@ void msx2_state::vg8235f(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_SS, "disk", 3, 3, 1, 2, "diskrom"); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Philips VG-8240 (unreleased) */ @@ -1932,7 +1931,7 @@ void msx2_state::vg8240(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 3, 1, 2, "diskrom"); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Phonola NMS 8245 */ @@ -1982,7 +1981,7 @@ void msx2_state::ucv102(machine_config &config) MSX_S1985(config, "s1985", 0); m_hw_def.has_cassette(false); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Sakhr AX-350 */ @@ -2026,7 +2025,7 @@ void msx2_state::ax350(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2_pal(SND_YM2149, config, REGION_ARAB); + msx2_pal(SND_YM2149, config, layout_msx_ar_1fdd); } /* MSX2 - Sakhr AX-350 II */ @@ -2071,7 +2070,7 @@ void msx2_state::ax350ii(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2_pal(SND_YM2149, config, REGION_ARAB); + msx2_pal(SND_YM2149, config, layout_msx_ar_1fdd); } /* MSX2 - Sakhr AX-350 II F */ @@ -2116,7 +2115,7 @@ void msx2_state::ax350iif(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2_pal(SND_YM2149, config, REGION_ARAB); + msx2_pal(SND_YM2149, config, layout_msx_ar_1fdd); } /* MSX2 - Sakhr AX-370 */ @@ -2163,7 +2162,7 @@ void msx2_state::ax370(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "painter", 3, 1, 0, 4, "painter"); add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 3, 0, 4).set_total_size(0x20000).set_unused_bits(0xf8); // 128KB Mapper RAM - msx2plus_pal(SND_AY8910, config, REGION_ARAB); + msx2plus_pal(SND_AY8910, config, layout_msx_ar_1fdd); } /* MSX2 - Sakhr AX-500 */ @@ -2212,7 +2211,7 @@ void msx2_state::ax500(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2_pal(SND_YM2149, config, REGION_ARAB); + msx2_pal(SND_YM2149, config, layout_msx_ar_2fdd); } /* MSX2 - Sanyo MPC-2300 */ @@ -2240,7 +2239,7 @@ void msx2_state::mpc2300(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_RUSSIA); + msx2(SND_YM2149, config, layout_msx_ru); } /* MSX2 - Sanyo MPC-2500FD */ @@ -2270,7 +2269,7 @@ void msx2_state::mpc2500f(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 1, 1, 2, "diskrom"); add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x10000); // 64KB?? Mapper RAM - msx2(SND_YM2149, config, REGION_RUSSIA); + msx2(SND_YM2149, config, layout_msx_ru_1fdd); } /* MSX2 - Sanyo MPC-25F */ @@ -2305,7 +2304,7 @@ void msx2_state::mpc25fd(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 1, 1, 2, "diskrom"); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Sanyo MPC-25FK */ @@ -2340,7 +2339,7 @@ void msx2_state::mpc25fs(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_SS, "disk", 3, 1, 1, 2, "diskrom"); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Sanyo Wavy MPC-27 */ @@ -2376,7 +2375,7 @@ void msx2_state::mpc27(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793_SS, "disk", 3, 2, 1, 2, "diskrom"); add_internal_slot(config, MSX_SLOT_ROM, "lpen", 3, 3, 1, 1, "lpen"); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Sanyo PCT-100 */ @@ -2404,7 +2403,7 @@ void msx2_state::phc23(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "subrom", 3, 0, 0, 1, "subrom"); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); } /* MSX2 - Sanyo PHC-23J(B) / PHC-23J(GR) - "Wavy23" */ @@ -2431,7 +2430,7 @@ void msx2_state::phc23jb(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); } /* MSX2 - Sanyo Wavy PHC-55FD2 */ @@ -2465,7 +2464,7 @@ void msx2_state::phc55fd2(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - Sanyo Wavy PHC-77 */ @@ -2507,7 +2506,7 @@ void msx2_state::phc77(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Sharp Epcom HotBit 2.0 - is this an officially released machine? */ @@ -2540,8 +2539,7 @@ void msx2_state::hotbit20(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 2, 0, 4).set_total_size(0x20000).set_unused_bits(0x80); // 128KB Mapper RAM add_cartridge_slot<2>(config, 3); - m_hw_def.no_code_led(); - msx2_pal(SND_AY8910, config, REGION_INTERNATIONAL); + msx2_pal(SND_AY8910, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-F1 */ @@ -2582,8 +2580,7 @@ void msx2_state::hbf1(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_caps_led().no_code_led(); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_nocode_nocaps); } /* MSX2 - Sony HB-F1II */ @@ -2624,7 +2621,7 @@ void msx2_state::hbf1ii(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); } /* MSX2 - Sony HB-F1XD / HB-F1XDmk2 */ @@ -2660,7 +2657,7 @@ void msx2_state::hbf1xd(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Sony HB-F5 */ @@ -2689,7 +2686,7 @@ void msx2_state::hbf5(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx2_pal(SND_YM2149, config, REGION_JAPAN); + msx2_pal(SND_YM2149, config, layout_msx_jp); } /* MSX2 - Sony HB-F500 */ @@ -2723,7 +2720,7 @@ void msx2_state::hbf500(machine_config &config) add_cartridge_slot<1>(config, 1); add_cartridge_slot<2>(config, 2); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Sony HB-F500 2nd version (slot layout is different) */ @@ -2756,7 +2753,7 @@ void msx2_state::hbf500_2(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 1, 1, 2, "diskrom"); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 2, 0, 4); // 64KB RAM - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Sony HB-F500F */ @@ -2789,8 +2786,7 @@ void msx2_state::hbf500f(machine_config &config) add_cartridge_slot<2>(config, 2); add_cartridge_slot<3>(config, 3); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-F500P */ @@ -2818,8 +2814,7 @@ void msx2_state::hbf500p(machine_config &config) add_cartridge_slot<2>(config, 2); add_cartridge_slot<3>(config, 3); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-F700D */ @@ -2854,8 +2849,7 @@ void msx2_state::hbf700d(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-F700F */ @@ -2890,8 +2884,7 @@ void msx2_state::hbf700f(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-F700P */ @@ -2928,8 +2921,7 @@ void msx2_state::hbf700p(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-F700S */ @@ -2964,8 +2956,7 @@ void msx2_state::hbf700s(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-F750 (prototype) */ @@ -3006,7 +2997,7 @@ void msx2_state::hbf900(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - Sony HB-F900 (a) */ @@ -3045,7 +3036,7 @@ void msx2_state::hbf900a(machine_config &config) MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - Sony HB-F9P */ @@ -3081,8 +3072,7 @@ void msx2_state::hbf9p(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0x80); // 128KB Mapper RAM MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode); } /* MSX2 - Sony HB-F9P Russian */ @@ -3110,7 +3100,7 @@ void msx2_state::hbf9pr(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000); // 128KB Mapper RAM MSX_S1985(config, "s1985", 0); - msx2_pal(SND_YM2149, config, REGION_RUSSIA); + msx2_pal(SND_YM2149, config, layout_msx_ru); } /* MSX2 - Sony HB-F9S */ @@ -3142,8 +3132,7 @@ void msx2_state::hbf9s(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0x80); // 128KB Mapper RAM MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode); } /* MSX2 - Sony HB-G900AP */ @@ -3192,8 +3181,7 @@ void msx2_state::hbg900ap(machine_config &config) // slot #3 is expanded add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 0, 0, 4).set_total_size(0x80000).set_unused_bits(0x80); // 512KB Mapper RAM - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-G900D */ @@ -3234,8 +3222,7 @@ void msx2_state::hbg900p(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_RAM, "ram", 3, 0, 4); // 64KB RAM - m_hw_def.no_code_led(); - msx2_pal(SND_AY8910, config, REGION_INTERNATIONAL); + msx2_pal(SND_AY8910, config, layout_msx_nocode_1fdd); } /* MSX2 - Sony HB-T600 */ @@ -3277,8 +3264,7 @@ void msx2_state::tpc310(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode); } /* MSX2 - Talent TPP-311 */ @@ -3309,8 +3295,7 @@ void msx2_state::tpp311(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode); msx2_64kb_vram(config); } @@ -3349,8 +3334,7 @@ void msx2_state::tps312(machine_config &config) MSX_S1985(config, "s1985", 0); - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode); msx2_64kb_vram(config); } @@ -3387,8 +3371,7 @@ void msx2_state::fstm1(machine_config &config) MSX_S1985(config, "s1985", 0); // Hard to see on pictures whether the machine has a CAPS led - m_hw_def.no_code_led(); - msx2_pal(SND_YM2149, config, REGION_INTERNATIONAL); + msx2_pal(SND_YM2149, config, layout_msx_nocode); } /* MSX2 - Toshiba HX-23 */ @@ -3423,7 +3406,7 @@ void msx2_state::hx23(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "jwp", 3, 1, 2, 1, "subjwp", 0x4000); add_internal_slot(config, MSX_SLOT_ROM, "rs232jwp", 3, 3, 1, 2, "rs232jwp"); - msx2(SND_AY8910, config, REGION_JAPAN); + msx2(SND_AY8910, config, layout_msx_jp); msx2_64kb_vram(config); } @@ -3457,7 +3440,7 @@ void msx2_state::hx23f(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "jwp", 3, 1, 2, 1, "subjwp", 0x4000); add_internal_slot(config, MSX_SLOT_ROM, "rs232jwp", 3, 3, 1, 2, "rs232jwp"); - msx2(SND_AY8910, config, REGION_JAPAN); + msx2(SND_AY8910, config, layout_msx_jp); } /* MSX2 - Toshiba HX-33 */ @@ -3487,7 +3470,7 @@ void msx2_state::hx33(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "subrom", 3, 1, 0, 1, "mainrom", 0x8000); add_internal_slot(config, MSX_SLOT_RS232_TOSHIBA_HX3X, "firmware", 3, 3, 1, 2, "mainrom", 0xc000); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); msx2_64kb_vram(config); } @@ -3523,7 +3506,7 @@ void msx2_state::hx34(machine_config &config) add_internal_disk(config, MSX_SLOT_DISK6_WD2793_N, "disk", 3, 2, 1, 1, "diskrom"); add_internal_slot(config, MSX_SLOT_RS232_TOSHIBA_HX3X, "firmware", 3, 3, 1, 2, "mainrom", 0xc000); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Victor HC-80 */ @@ -3554,7 +3537,7 @@ void msx2_state::victhc80(machine_config &config) add_cartridge_slot<2>(config, 2); add_internal_slot(config, MSX_SLOT_ROM, "firmware", 3, 2, 1, "firmware"); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); } /* MSX2 - Victor HC-90 */ @@ -3592,7 +3575,7 @@ void msx2_state::victhc90(machine_config &config) add_cartridge_slot<1>(config, 1); add_internal_disk(config, MSX_SLOT_DISK10_MB8877, "disk", 3, 1, 1, "diskrom"); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Victor HC-90(A) */ @@ -3632,7 +3615,7 @@ void msx2_state::victhc90a(machine_config &config) add_cartridge_slot<1>(config, 1); add_internal_disk(config, MSX_SLOT_DISK10_MB8877, "disk", 3, 1, 1, "rs232fdd", 0x4000); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Victor HC-90(B) */ @@ -3678,7 +3661,7 @@ void msx2_state::victhc95(machine_config &config) // 96 pin expansion bus in slot #2 add_internal_disk(config, MSX_SLOT_DISK10_MB8877_2_DRIVES, "disk", 3, 1, 1, "diskrom"); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - Victor HC-95A */ @@ -3718,7 +3701,7 @@ void msx2_state::victhc95a(machine_config &config) // 96 pin expansion bus in slot #2 add_internal_disk(config, MSX_SLOT_DISK10_MB8877_2_DRIVES, "disk", 3, 1, 1, "diskrom"); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - Wandy CPC-300 */ @@ -3748,7 +3731,7 @@ void msx2_state::cx7128(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0x80); // 64KB Mapper RAM add_cartridge_slot<4>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, nullptr); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); SOFTWARE_LIST(config, "minicart_list").set_original("msx_yamaha_minicart"); } @@ -3777,7 +3760,7 @@ void msx2_state::cx7m128(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000).set_unused_bits(0x80); // 64KB Mapper RAM add_cartridge_slot<4>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, "sfg05"); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); SOFTWARE_LIST(config, "minicart_list").set_original("msx_yamaha_minicart"); } @@ -3815,7 +3798,7 @@ void msx2_state::y503iiir(machine_config &config) // Yamaha expansion slot in slot #3-3 add_internal_slot(config, MSX_SLOT_ROM, "network", 3, 3, 1, 2, "network"); - msx2_pal(SND_YM2149, config, REGION_RUSSIA); + msx2_pal(SND_YM2149, config, layout_msx_ru); } /* MSX2 - Yamaha YIS-503 III R Estonian */ @@ -3860,7 +3843,7 @@ void msx2_state::yis604(machine_config &config) add_internal_slot(config, MSX_SLOT_RAM_MM, "ram_mm", 3, 2, 0, 4).set_total_size(0x20000); // 128KB Mapper RAM add_cartridge_slot<4>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, nullptr); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp); SOFTWARE_LIST(config, "minicart_list").set_original("msx_yamaha_minicart"); } @@ -3899,7 +3882,7 @@ void msx2_state::y805128(machine_config &config) add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, nullptr); MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2 - Yamaha YIS-805/256 */ @@ -3938,7 +3921,7 @@ void msx2_state::y805256(machine_config &config) add_cartridge_slot<3>(config, MSX_SLOT_YAMAHA_EXPANSION, "module", 3, 3, msx_yamaha_60pin, nullptr); MSX_S1985(config, "s1985", 0); - msx2(SND_YM2149, config, REGION_JAPAN); + msx2(SND_YM2149, config, layout_msx_jp_2fdd); } /* MSX2 - Yamaha YIS-805/128R2 (teacher) */ @@ -3980,7 +3963,7 @@ void msx2_state::y805128r2(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "network", 3, 3, 0, 2, "network", 0x00000); MSX_S1985(config, "s1985", 0); - msx2_pal(SND_YM2149, config, REGION_RUSSIA); + msx2_pal(SND_YM2149, config, layout_msx_ru_2fdd); } /* MSX2 - Yamaha YIS-805/128R2 Estonian */ @@ -4040,8 +4023,7 @@ void msx2_state::expert3i(machine_config &config) msx_ym2413(config); - m_hw_def.no_code_led(); - msx2plus(SND_AY8910, config, REGION_INTERNATIONAL); + msx2plus(SND_AY8910, config, layout_msx_nocode_1fdd); } /* MSX2+ - Ciel Expert 3 Turbo @@ -4096,8 +4078,7 @@ void msx2_state::expert3t(machine_config &config) msx_ym2413(config); - m_hw_def.no_code_led(); - msx2plus(SND_AY8910, config, REGION_INTERNATIONAL); + msx2plus(SND_AY8910, config, layout_msx_nocode_1fdd); } /* MSX2+ - Gradiente Expert AC88+ */ @@ -4134,8 +4115,7 @@ void msx2_state::expertac(machine_config &config) add_internal_disk_mirrored(config, MSX_SLOT_DISK1_WD2793, "disk", 3, 2, 1, 2, "diskrom"); add_internal_slot(config, MSX_SLOT_ROM, "xbasic", 3, 3, 1, 1, "xbasic"); - m_hw_def.no_code_led(); - msx2plus(SND_AY8910, config, REGION_INTERNATIONAL); + msx2plus(SND_AY8910, config, layout_msx_nocode_1fdd); } /* MSX2+ - Gradiente Expert DDX+ */ @@ -4172,8 +4152,7 @@ void msx2_state::expertdx(machine_config &config) add_cartridge_slot<2>(config, 3); /* Kanji? */ - m_hw_def.no_code_led(); - msx2plus(SND_AY8910, config, REGION_INTERNATIONAL); + msx2plus(SND_AY8910, config, layout_msx_nocode_1fdd); } /* MSX2+ - Panasonic FS-A1FX */ @@ -4213,7 +4192,7 @@ void msx2_state::fsa1fx(machine_config &config) MSX_SYSTEMFLAGS(config, "sysflags", m_maincpu, 0xff); m_kanji_fsa1fx = true; - msx2plus(SND_AY8910, config, REGION_JAPAN); + msx2plus(SND_AY8910, config, layout_msx_jp_1fdd); } /* MSX2+ - Panasonic FS-A1WSX */ @@ -4269,7 +4248,7 @@ void msx2_state::fsa1wsx(machine_config &config) msx_ym2413(config); - msx2plus(SND_AY8910, config, REGION_JAPAN); + msx2plus(SND_AY8910, config, layout_msx_jp_1fdd); } /* MSX2+ - Panasonic FS-A1WX */ @@ -4325,7 +4304,7 @@ void msx2_state::fsa1wx(machine_config &config) msx_ym2413(config); - msx2plus(SND_AY8910, config, REGION_JAPAN); + msx2plus(SND_AY8910, config, layout_msx_jp_1fdd); } /* MSX2+ - Panasonic FS-A1WX (a) */ @@ -4386,7 +4365,7 @@ void msx2_state::phc35j(machine_config &config) add_internal_slot(config, MSX_SLOT_ROM, "kdr", 3, 1, 1, 2, "kdr"); MSX_SYSTEMFLAGS(config, "sysflags", m_maincpu, 0xff); - msx2plus(SND_AY8910, config, REGION_JAPAN); + msx2plus(SND_AY8910, config, layout_msx_jp); } /* MSX2+ - Sanyo Wavy PHC-70FD */ @@ -4429,7 +4408,7 @@ void msx2_state::phc70fd(machine_config &config) msx_ym2413(config); - msx2plus(SND_AY8910, config, REGION_JAPAN); + msx2plus(SND_AY8910, config, layout_msx_jp_1fdd); } /* MSX2+ - Sanyo Wavy PHC-70FD2 */ @@ -4479,7 +4458,7 @@ void msx2_state::phc70fd2(machine_config &config) msx_ym2413(config); - msx2plus(SND_AY8910, config, REGION_JAPAN); + msx2plus(SND_AY8910, config, layout_msx_jp_2fdd); } /* MSX2+ - Sony HB-F1XDJ */ @@ -4522,7 +4501,7 @@ void msx2_state::hbf1xdj(machine_config &config) msx_ym2413(config); - msx2plus(SND_YM2149, config, REGION_JAPAN); + msx2plus(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX2+ - Sony HB-F1XV */ @@ -4565,7 +4544,7 @@ void msx2_state::hbf1xv(machine_config &config) msx_ym2413(config); - msx2plus(SND_YM2149, config, REGION_JAPAN); + msx2plus(SND_YM2149, config, layout_msx_jp_1fdd); } /* MSX Turbo-R - Panasonic FS-A1GT */ @@ -4611,7 +4590,7 @@ void msx2_state::fsa1gt(machine_config &config) msx_ym2413(config); - turbor(SND_AY8910, config, REGION_JAPAN); + turbor(SND_AY8910, config, layout_msx_jp_1fdd); } /* MSX Turbo-R - Panasonic FS-A1ST */ @@ -4655,7 +4634,7 @@ void msx2_state::fsa1st(machine_config &config) msx_ym2413(config); - turbor(SND_AY8910, config, REGION_JAPAN); + turbor(SND_AY8910, config, layout_msx_jp_1fdd); } } // anonymous namespace -- cgit v1.2.3