From 6e5cdd9a8f8b1de4b9791499d41dd0fbd97a1aad Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 16 Aug 2024 12:58:15 +0200 Subject: mario: remove old changelog from comments, add note about soundrom hack after USE_8039 was removed --- src/mame/fidelity/sc6.cpp | 2 -- src/mame/nintendo/mario.cpp | 42 +++++++++++++----------------------------- src/mame/nintendo/mario_a.cpp | 3 --- 3 files changed, 13 insertions(+), 34 deletions(-) diff --git a/src/mame/fidelity/sc6.cpp b/src/mame/fidelity/sc6.cpp index 0d60d33c29d..74f05aad47e 100644 --- a/src/mame/fidelity/sc6.cpp +++ b/src/mame/fidelity/sc6.cpp @@ -122,7 +122,6 @@ public: sc6_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_rom(*this, "maincpu"), m_board(*this, "board"), m_display(*this, "display"), m_dac(*this, "dac"), @@ -147,7 +146,6 @@ protected: private: // devices/pointers required_device m_maincpu; - required_region_ptr m_rom; required_device m_board; required_device m_display; optional_device m_dac; diff --git a/src/mame/nintendo/mario.cpp b/src/mame/nintendo/mario.cpp index 1be634efa15..e8795b6b299 100644 --- a/src/mame/nintendo/mario.cpp +++ b/src/mame/nintendo/mario.cpp @@ -2,32 +2,14 @@ // copyright-holders:Mirko Buffoni /*************************************************************************** -Done: -- discrete sound -- hooked up z80dma -- combined memory maps -- statics in mario_state struct -- fixed save state issues -- combine sh_* writes into one routine -- Hooked up flipscreen -- Changed monitor orientation to ROT0 -- fixed mario0110u1gre -- rewrote driver, separate MACHINE_DRIVER(mario_audio) -- palette from schematics -- video timing from schematics -- driver configuration switch Nintendo/Std Monitor -- got rid of COLORTABLE -- clocks as defines in .h -- use XTAL_* - -Mario Bros memory map (preliminary): - -driver by Mirko Buffoni +Mario Bros driver by Mirko Buffoni +Memory map (preliminary): + 0000-5fff ROM 6000-6fff RAM -7000-73ff ? +7000-73ff Sprite RAM 7400-77ff Video RAM f000-ffff ROM @@ -74,17 +56,19 @@ write: 7d00 vertical scroll (pow) 7d80 ? 7e00 sound -7e80-7e82 ? -7e83 sprite palette bank select -7e84 interrupt enable -7e85 ? +7e80-7e87 misc. triggers (see mcfg) 7f00-7f07 sound triggers - I/O ports write: -00 ? +00 Z80 DMA + + +The sound MCU can be easily replaced with a ROMless one such as I8039 +(or just force EA high), by doing a 1-byte patch to the external ROM: + +offset $01: change $00 to $01 (call $100 -> call $101) ***************************************************************************/ @@ -551,7 +535,7 @@ ROM_END * *************************************/ -GAME( 1983, mario, 0, mario, mario, mario_state, empty_init, ROT0, "Nintendo of America", "Mario Bros. (US, Revision G)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, mario, 0, mario, mario, mario_state, empty_init, ROT0, "Nintendo of America", "Mario Bros. (US, Revision G)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, mariof, mario, mario, mariof, mario_state, empty_init, ROT0, "Nintendo of America", "Mario Bros. (US, Revision F)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, marioe, mario, mario, marioe, mario_state, empty_init, ROT0, "Nintendo of America", "Mario Bros. (US, Revision E)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, marioj, mario, mario, marioj, mario_state, empty_init, ROT0, "Nintendo", "Mario Bros. (Japan, Revision C)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/nintendo/mario_a.cpp b/src/mame/nintendo/mario_a.cpp index b7e0ff774f3..a1a250ca120 100644 --- a/src/mame/nintendo/mario_a.cpp +++ b/src/mame/nintendo/mario_a.cpp @@ -18,7 +18,6 @@ * ****************************************************************/ -#define ACTIVELOW_PORT_BIT(P,A,D) ((P & (~(1 << A))) | ((D ^ 1) << A)) #define ACTIVEHIGH_PORT_BIT(P,A,D) ((P & (~(1 << A))) | (D << A)) #define MCU_T_R(N) ((m_soundlatch2->read() >> (N)) & 1) @@ -30,7 +29,6 @@ #define MCU_P2_W(D) do { set_ea(((D) & 0x20) ? 0 : 1); m_soundlatch4->write(D); } while (0) #define MCU_P1_W_AH(B,D) MCU_P1_W(ACTIVEHIGH_PORT_BIT(MCU_P1_R(),B,(D))) -#define MCU_P2_W_AH(B,D) MCU_P2_W(ACTIVEHIGH_PORT_BIT(MCU_P2_R(),B,(D))) #if OLD_SOUND @@ -422,7 +420,6 @@ void mario_state::sound_start() void mario_state::sound_reset() { - /* FIXME: convert to latch8 */ m_soundlatch->clear_w(); if (m_soundlatch2) m_soundlatch2->clear_w(); if (m_soundlatch3) m_soundlatch3->clear_w(); -- cgit v1.2.3