From 143f40e77a4b1b4ea1a1c6cfca112b759cf1f5bf Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Fri, 24 Jan 2025 13:06:37 -0500 Subject: [PATCH 01/10] hooked up the sound cpu for captain lucky sigmab31.cpp same memory maps of b52. except the main. --- src/mame/sigma/sigmab31.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index 142bb6ce78858..69b13072aa80f 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -107,6 +107,8 @@ class sigmab31_state : public driver_device sigmab31_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") + m_audiocpu(*this, "audiocpu"), + { } void sigmab31(machine_config &config); @@ -117,9 +119,20 @@ class sigmab31_state : public driver_device private: void prg_map(address_map &map) ATTR_COLD; + void sound_prog_map(address_map &map) ATTR_COLD; required_device m_maincpu; }; +void sigmab52_state::sound_prog_map(address_map &map) +{ + map(0x0000, 0x1fff).ram(); + map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); +// map(0x6030, 0x6030).w(FUNC(sigmab31_state::audiocpu_irq_ack_w)); +// map(0x6050, 0x6050).r("soundlatch", FUNC(generic_latch_8_device::read)); + map(0x6060, 0x6061).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x8000, 0xffff).rom().region("audiocpu", 0); +} + void sigmab31_state::prg_map(address_map &map) @@ -174,7 +187,11 @@ void sigmab31_state::sigmab31(machine_config &config) { MC6809(config, m_maincpu, 8_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &sigmab31_state::prg_map); + + MC6809(config, m_audiocpu, XTAL(8'000'000)); + m_audiocpu->set_addrmap(AS_PROGRAM, &sigmab52_state::sound_prog_map); + PTM6840(config, "6840ptm_1", 8_MHz_XTAL / 8); PTM6840(config, "6840ptm_2", 8_MHz_XTAL / 8); @@ -193,7 +210,7 @@ ROM_START( cptlucky ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "b325107-084_captain_lucky_l93-0091.70", 0x00000, 0x10000, CRC(84c2ab4e) SHA1(3d388ba1c8e4718ca95df45f59d0315887385a27) ) - ROM_REGION( 0x8000, "opl", 0 ) + ROM_REGION( 0x8000, "audiocpu", 0 ) ROM_LOAD( "m-slot_03-00_l89-1625.57", 0x00000, 0x8000, CRC(268c8a7c) SHA1(90903428d6c0af3ebdcb462e80a7c28dc4ee7af2) ) ROM_END From 67e84b9a0594cf349f9b770946ed13e3b24b5b21 Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Fri, 24 Jan 2025 13:35:05 -0500 Subject: [PATCH 02/10] fix some mistake. sigmab31.cpp I did not realize --- src/mame/sigma/sigmab31.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index 69b13072aa80f..05927d5e8c023 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -189,7 +189,7 @@ void sigmab31_state::sigmab31(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &sigmab31_state::prg_map); MC6809(config, m_audiocpu, XTAL(8'000'000)); - m_audiocpu->set_addrmap(AS_PROGRAM, &sigmab52_state::sound_prog_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &sigmab31_state::sound_prog_map); PTM6840(config, "6840ptm_1", 8_MHz_XTAL / 8); From bb70ea30fdc5221b36fa1d570d17bc3e3cd5a7e9 Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:39:03 -0500 Subject: [PATCH 03/10] Update sigmab31.cpp --- src/mame/sigma/sigmab31.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index 05927d5e8c023..eddbce1b88b83 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -123,10 +123,17 @@ class sigmab31_state : public driver_device required_device m_maincpu; }; + +void sigmab31_state::prg_map(address_map &map) +{ + map(0x6000, 0xf6ff).rom(); + map(0xf800, 0xffff).rom(); +} + void sigmab52_state::sound_prog_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); +// map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); // map(0x6030, 0x6030).w(FUNC(sigmab31_state::audiocpu_irq_ack_w)); // map(0x6050, 0x6050).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x6060, 0x6061).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); @@ -134,14 +141,6 @@ void sigmab52_state::sound_prog_map(address_map &map) } - -void sigmab31_state::prg_map(address_map &map) -{ - map(0x6000, 0xf6ff).rom(); - map(0xf800, 0xffff).rom(); -} - - static INPUT_PORTS_START( cptlucky ) PORT_START("IN0") PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) From 218c5b67cc699cd5dd2109e50a1285c69c5a3e36 Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Fri, 24 Jan 2025 17:12:41 -0500 Subject: [PATCH 04/10] Update sigmab31.cpp --- src/mame/sigma/sigmab31.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index eddbce1b88b83..193b5f1bf28a9 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -122,6 +122,7 @@ class sigmab31_state : public driver_device void sound_prog_map(address_map &map) ATTR_COLD; required_device m_maincpu; + required_device m_audiocpu; }; void sigmab31_state::prg_map(address_map &map) From 17cc96392fb711bf64750959cfd5ed30f5fb51b6 Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:52:47 -0500 Subject: [PATCH 05/10] Update sigmab31.cpp --- src/mame/sigma/sigmab31.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index 193b5f1bf28a9..bebe09d0b94d9 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -131,7 +131,7 @@ void sigmab31_state::prg_map(address_map &map) map(0xf800, 0xffff).rom(); } -void sigmab52_state::sound_prog_map(address_map &map) +void sigmab31_state::sound_prog_map(address_map &map) { map(0x0000, 0x1fff).ram(); // map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); From b560a2ee87e160d44b10c37a3e557269da8d322c Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Fri, 24 Jan 2025 19:29:29 -0500 Subject: [PATCH 06/10] Update sigmab31.cpp --- src/mame/sigma/sigmab31.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index bebe09d0b94d9..947efc9974804 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -118,20 +118,20 @@ class sigmab31_state : public driver_device virtual void machine_reset() override ATTR_COLD; private: - void prg_map(address_map &map) ATTR_COLD; - void sound_prog_map(address_map &map) ATTR_COLD; + void main_map(address_map &map) ATTR_COLD; + void sound_map(address_map &map) ATTR_COLD; required_device m_maincpu; required_device m_audiocpu; }; -void sigmab31_state::prg_map(address_map &map) +void sigmab31_state::main_map(address_map &map) { map(0x6000, 0xf6ff).rom(); map(0xf800, 0xffff).rom(); } -void sigmab31_state::sound_prog_map(address_map &map) +void sigmab31_state::sound_map(address_map &map) { map(0x0000, 0x1fff).ram(); // map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); @@ -186,10 +186,10 @@ void sigmab31_state::machine_reset() void sigmab31_state::sigmab31(machine_config &config) { MC6809(config, m_maincpu, 8_MHz_XTAL); - m_maincpu->set_addrmap(AS_PROGRAM, &sigmab31_state::prg_map); + m_maincpu->set_addrmap(AS_PROGRAM, &sigmab31_state::main_map); MC6809(config, m_audiocpu, XTAL(8'000'000)); - m_audiocpu->set_addrmap(AS_PROGRAM, &sigmab31_state::sound_prog_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &sigmab31_state::sound_map); PTM6840(config, "6840ptm_1", 8_MHz_XTAL / 8); From b209066bf49483f9d9de449848f3e9c81b30f0bc Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Sat, 25 Jan 2025 15:44:44 -0500 Subject: [PATCH 07/10] Update sigmab31.cpp --- src/mame/sigma/sigmab31.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index 947efc9974804..089b176b4a49d 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -119,23 +119,25 @@ class sigmab31_state : public driver_device private: void main_map(address_map &map) ATTR_COLD; - void sound_map(address_map &map) ATTR_COLD; + void sound_map (address_map &map) ATTR_COLD; required_device m_maincpu; required_device m_audiocpu; + }; + void sigmab31_state::main_map(address_map &map) { map(0x6000, 0xf6ff).rom(); map(0xf800, 0xffff).rom(); } -void sigmab31_state::sound_map(address_map &map) +void sigmab31_state::sound_map (address_map &map) { map(0x0000, 0x1fff).ram(); // map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); -// map(0x6030, 0x6030).w(FUNC(sigmab31_state::audiocpu_irq_ack_w)); +// map(0x6030, 0x6030).w(FUNC(sigmab52_state::audiocpu_irq_ack_w)); // map(0x6050, 0x6050).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x6060, 0x6061).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x8000, 0xffff).rom().region("audiocpu", 0); @@ -187,11 +189,10 @@ void sigmab31_state::sigmab31(machine_config &config) { MC6809(config, m_maincpu, 8_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &sigmab31_state::main_map); - + MC6809(config, m_audiocpu, XTAL(8'000'000)); - m_audiocpu->set_addrmap(AS_PROGRAM, &sigmab31_state::sound_map); + m_audiocpu->set_addrmap(AS_PROGRAM, &sigmab31_state::sound_map ); - PTM6840(config, "6840ptm_1", 8_MHz_XTAL / 8); PTM6840(config, "6840ptm_2", 8_MHz_XTAL / 8); From c44fdc6d3eca24624af8d837ede3bda34f376fd6 Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Sat, 25 Jan 2025 15:49:01 -0500 Subject: [PATCH 08/10] Update sigmab31.cpp --- src/mame/sigma/sigmab31.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index 089b176b4a49d..e87d80f6b6d5e 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -137,7 +137,7 @@ void sigmab31_state::sound_map (address_map &map) { map(0x0000, 0x1fff).ram(); // map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); -// map(0x6030, 0x6030).w(FUNC(sigmab52_state::audiocpu_irq_ack_w)); +// map(0x6030, 0x6030).w(FUNC(sigmab31_state::audiocpu_irq_ack_w)); // map(0x6050, 0x6050).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x6060, 0x6061).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x8000, 0xffff).rom().region("audiocpu", 0); From 0285d652a96380bf69733b42544f2b8f2893d7d5 Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:39:48 -0500 Subject: [PATCH 09/10] Update sigmab31.cpp --- src/mame/sigma/sigmab31.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index e87d80f6b6d5e..5e8e269629c19 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -106,7 +106,7 @@ class sigmab31_state : public driver_device public: sigmab31_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), { } From 5e3b510c8591faf53b944df4da9775f9dee9903d Mon Sep 17 00:00:00 2001 From: flama12333 <143599905+flama12333@users.noreply.github.com> Date: Sat, 25 Jan 2025 19:48:12 -0500 Subject: [PATCH 10/10] Update sigmab31.cpp --- src/mame/sigma/sigmab31.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/sigma/sigmab31.cpp b/src/mame/sigma/sigmab31.cpp index 5e8e269629c19..41bc5dc7031d1 100644 --- a/src/mame/sigma/sigmab31.cpp +++ b/src/mame/sigma/sigmab31.cpp @@ -107,7 +107,7 @@ class sigmab31_state : public driver_device sigmab31_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), + m_audiocpu(*this, "audiocpu") { }