From df667800df8919df11b64b60df9de0e5d40ba878 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Wed, 26 May 2021 14:17:56 -0700 Subject: Add internal layout for PSR-70 --- src/mame/drivers/ympsr60.cpp | 21 +- src/mame/layout/psr60.lay | 69 +-- src/mame/layout/psr70.lay | 979 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1038 insertions(+), 31 deletions(-) create mode 100644 src/mame/layout/psr70.lay diff --git a/src/mame/drivers/ympsr60.cpp b/src/mame/drivers/ympsr60.cpp index b862b6cee52..5fa605db0c7 100644 --- a/src/mame/drivers/ympsr60.cpp +++ b/src/mame/drivers/ympsr60.cpp @@ -54,6 +54,7 @@ #include "speaker.h" #include "psr60.lh" +#include "psr70.lh" class psr60_state : public driver_device { @@ -72,7 +73,9 @@ public: m_drvif_out(*this, "DRVIF_%u_DP%u", 0U, 1U) { } + void psr_common(machine_config &config); void psr60(machine_config &config); + void psr70(machine_config &config); protected: virtual void machine_start() override; @@ -450,7 +453,7 @@ static INPUT_PORTS_START(psr70) DRVIF_PORT(22, "Unused23.1", "Play Back Solo", "Play Back Orchestra", "Play Back Chord/Bass") INPUT_PORTS_END -void psr60_state::psr60(machine_config &config) +void psr60_state::psr_common(machine_config &config) { /* basic machine hardware */ Z80(config, m_maincpu, 6_MHz_XTAL); @@ -473,8 +476,6 @@ void psr60_state::psr60(machine_config &config) clock_device &acia_clock(CLOCK(config, "acia_clock", 500_kHz_XTAL)); // 31250 * 16 = 500,000 acia_clock.signal_handler().set(FUNC(psr60_state::write_acia_clock)); - config.set_default_layout(layout_psr60); - SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -484,6 +485,18 @@ void psr60_state::psr60(machine_config &config) m_ym3533->add_route(1, "rspeaker", 1.0); } +void psr60_state::psr60(machine_config &config) +{ + psr_common(config); + config.set_default_layout(layout_psr60); +} + +void psr60_state::psr70(machine_config &config) +{ + psr_common(config); + config.set_default_layout(layout_psr70); +} + ROM_START( psr60 ) ROM_REGION(0x8000, "rom1", 0) ROM_LOAD("yamaha_psr60_pgm_ic109.bin", 0x000000, 0x008000, CRC(95604916) SHA1(811fb88fc968c58234600eb9fbf1f64e411754cd)) @@ -501,4 +514,4 @@ ROM_START(psr70) ROM_END CONS(1985, psr60, 0, 0, psr60, psr60, psr60_state, empty_init, "Yamaha", "PSR-60 PortaSound", MACHINE_NOT_WORKING) -CONS(1985, psr70, psr60, 0, psr60, psr70, psr60_state, empty_init, "Yamaha", "PSR-70 PortaSound", MACHINE_NOT_WORKING) +CONS(1985, psr70, psr60, 0, psr70, psr70, psr60_state, empty_init, "Yamaha", "PSR-70 PortaSound", MACHINE_NOT_WORKING) diff --git a/src/mame/layout/psr60.lay b/src/mame/layout/psr60.lay index 63e1b17822e..e008753326a 100644 --- a/src/mame/layout/psr60.lay +++ b/src/mame/layout/psr60.lay @@ -3,6 +3,8 @@ license:CC0 --> + + @@ -10,6 +12,7 @@ license:CC0 + @@ -20,7 +23,6 @@ license:CC0 - @@ -31,7 +33,6 @@ license:CC0 - @@ -42,7 +43,6 @@ license:CC0 - @@ -53,7 +53,6 @@ license:CC0 - @@ -65,23 +64,27 @@ license:CC0 + + + + - - - + + + @@ -91,6 +94,7 @@ license:CC0 + @@ -121,6 +125,7 @@ license:CC0 + @@ -151,6 +156,7 @@ license:CC0 + @@ -170,16 +176,19 @@ license:CC0 + + + @@ -190,6 +199,7 @@ license:CC0 + @@ -201,7 +211,6 @@ license:CC0 - @@ -214,6 +223,7 @@ license:CC0 + @@ -243,15 +253,7 @@ license:CC0 - - - - - - - - - + @@ -260,7 +262,14 @@ license:CC0 - + + + + + + + + @@ -270,11 +279,13 @@ license:CC0 + + @@ -317,6 +328,7 @@ license:CC0 + @@ -350,6 +362,7 @@ license:CC0 + @@ -548,6 +561,7 @@ license:CC0 + @@ -666,13 +680,13 @@ license:CC0 - + - + @@ -732,7 +746,7 @@ license:CC0 - + @@ -749,7 +763,7 @@ license:CC0 - + @@ -761,7 +775,7 @@ license:CC0 - + @@ -782,7 +796,7 @@ license:CC0 - + @@ -795,18 +809,18 @@ license:CC0 + - - + - + @@ -853,6 +867,7 @@ license:CC0 + diff --git a/src/mame/layout/psr70.lay b/src/mame/layout/psr70.lay new file mode 100644 index 00000000000..102d7951f09 --- /dev/null +++ b/src/mame/layout/psr70.lay @@ -0,0 +1,979 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3