From 55639950fde035b66b6e06410daa7fe86e9401a8 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Thu, 6 Jul 2017 11:10:25 +0100 Subject: tidy (nw) --- src/devices/cpu/upd7810/upd7811.cpp | 1 + src/devices/cpu/upd7810/upd7811.h | 6 +++--- src/mame/machine/cchip_dev.h | 15 +++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/devices/cpu/upd7810/upd7811.cpp b/src/devices/cpu/upd7810/upd7811.cpp index 13c10c68baf..97bfb5f25ef 100644 --- a/src/devices/cpu/upd7810/upd7811.cpp +++ b/src/devices/cpu/upd7810/upd7811.cpp @@ -7,6 +7,7 @@ */ +#include "emu.h" #include "upd7811.h" /* diff --git a/src/devices/cpu/upd7810/upd7811.h b/src/devices/cpu/upd7810/upd7811.h index 14847250952..89c107ab0f9 100644 --- a/src/devices/cpu/upd7810/upd7811.h +++ b/src/devices/cpu/upd7810/upd7811.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Juergen Buchmueller -#ifndef MAME_CPU_UPD7811 -#define MAME_CPU_UPD7811 +#ifndef MAME_CPU_UPD7811_H +#define MAME_CPU_UPD7811_H #pragma once @@ -17,4 +17,4 @@ public: upd7811_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; -#endif +#endif // MAME_CPU_UPD7811_H diff --git a/src/mame/machine/cchip_dev.h b/src/mame/machine/cchip_dev.h index dd1f9a8655d..f177cb542cb 100644 --- a/src/mame/machine/cchip_dev.h +++ b/src/mame/machine/cchip_dev.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Jonathan Gevaryahu -#ifndef MAME_MACHINE_CCHIP_DEV -#define MAME_MACHINE_CCHIP_DEV +#ifndef MAME_MACHINE_CCHIP_DEV_H +#define MAME_MACHINE_CCHIP_DEV_H #pragma once @@ -21,11 +21,7 @@ public: // construction/destruction taito_cchip_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - required_device m_upd7811; - required_device m_upd4464_bank; - required_shared_ptr m_upd4464; - - // can this be accessed externally? + // can be accessed externally DECLARE_READ8_MEMBER(asic_r); DECLARE_WRITE8_MEMBER(asic_w); DECLARE_READ8_MEMBER(mem_r); @@ -38,6 +34,9 @@ protected: virtual void device_reset() override; private: + required_device m_upd7811; + required_device m_upd4464_bank; + required_shared_ptr m_upd4464; }; -#endif // MAME_MACHINE_CCHIP_DEV +#endif // MAME_MACHINE_CCHIP_DEV_H -- cgit v1.2.3 From 7929187bda8e3d7a157bfaad1368725092c13531 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Thu, 6 Jul 2017 18:12:47 +0100 Subject: load some recent Caps0ff MCU dumps, not hooked up for now. --- src/mame/drivers/blitz.cpp | 13 +++++-------- src/mame/drivers/sderby.cpp | 6 ++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/mame/drivers/blitz.cpp b/src/mame/drivers/blitz.cpp index 71146c5b56a..58d4666b6b8 100644 --- a/src/mame/drivers/blitz.cpp +++ b/src/mame/drivers/blitz.cpp @@ -18,10 +18,7 @@ *************************************************************************************************** Mega Double Poker is distributed as standalone PCB, or as upgrade kit for - modified Golden Poker boards. The game has an undumped MC68705P5 MCU, so - the emulation should be impossible till this device can be decapped and - properly dumped. - + modified Golden Poker boards. *************************************************************************************************** @@ -763,8 +760,8 @@ ROM_START( megadpkr ) ROM_REGION( 0x10000, "cpubank", 0 ) ROM_LOAD( "mega-3.u3", 0x8000, 0x8000, CRC(ff0a46c6) SHA1(df053c323c0e2dd0e41e22286d38e889bfda3aa5) ) - ROM_REGION( 0x0800, "mcu", 0 ) /* 2k for the undumped 68705 microcontroller */ - ROM_LOAD( "mega-1.u1", 0x0000, 0x0800, NO_DUMP ) + ROM_REGION( 0x0800, "mcu", 0 ) /* 68705P5 microcontroller */ + ROM_LOAD( "mega-1.u11", 0x0000, 0x0800, CRC(621a7971) SHA1(49121f7b0d428a825ccd219622dcc4abe3572968) ) ROM_REGION( 0x3000, "gfx1", 0 ) ROM_FILL( 0x0000, 0x2000, 0x000000 ) /* filling the R-G bitplanes */ @@ -812,8 +809,8 @@ ROM_START( megadpkrb ) ROM_REGION( 0x10000, "cpubank", 0 ) ROM_LOAD( "u3.bin", 0x8000, 0x8000, CRC(c973e345) SHA1(aae9da8cbaf0cf07086e5acacf9052e49fbdd896) ) - ROM_REGION( 0x0800, "mcu", 0 ) /* 2k for the undumped 68705 microcontroller */ - ROM_LOAD( "u11.bin", 0x0000, 0x0800, NO_DUMP ) + ROM_REGION( 0x0800, "mcu", 0 ) /* 68705P5 microcontroller - might not be for this set */ + ROM_LOAD( "mega-1.u11", 0x0000, 0x0800, CRC(621a7971) SHA1(49121f7b0d428a825ccd219622dcc4abe3572968) ) ROM_REGION( 0x3000, "gfx1", 0 ) ROM_FILL( 0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */ diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index 9dfca7f7fe8..6118ab847d5 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -950,6 +950,9 @@ ROM_START( croupier ) ROM_LOAD16_BYTE( "2.bin", 0x00000, 0x20000, CRC(e7941975) SHA1(ea32cd51b8d87205a1d6c6a83ebf8b50e03c55fc)) ROM_LOAD16_BYTE( "3.bin", 0x00001, 0x20000, CRC(29d06a38) SHA1(c6fdca1a31fad9abf854e521e593f3ec8018ae6d)) + ROM_REGION( 0x4008, "pic16c74", 0 ) + ROM_LOAD( "pic16c74.u39", 0x00000, 0x4008, CRC(9cb88e5b) SHA1(3c6b371efeda757f2bcab6c860e7585b628c210a)) + ROM_REGION( 0x080000, "oki", 0 ) /* samples are ok */ ROM_LOAD( "1.bin", 0x00000, 0x40000, CRC(6673de85) SHA1(df390cd6268efc0e743a9020f19bc0cbeb757cfa)) @@ -966,6 +969,9 @@ ROM_START( croupiera ) ROM_LOAD16_BYTE( "2.bin", 0x00000, 0x20000, CRC(1677a2de) SHA1(4dcbb3c1ce9b65e06ba7e0cffa00c0c8016538f5)) // sldh ROM_LOAD16_BYTE( "3.bin", 0x00001, 0x20000, CRC(11acaac2) SHA1(19e7bbbf4356fc9a866f9f36d0568c42d6a36c07)) // sldh + ROM_REGION( 0x4008, "pic16c74", 0 ) + ROM_LOAD( "pic16c74.u39", 0x00000, 0x4008, CRC(9cb88e5b) SHA1(3c6b371efeda757f2bcab6c860e7585b628c210a)) + ROM_REGION( 0x080000, "oki", 0 ) /* samples are ok */ ROM_LOAD( "1.bin", 0x00000, 0x40000, CRC(6673de85) SHA1(df390cd6268efc0e743a9020f19bc0cbeb757cfa)) -- cgit v1.2.3 From 0019c8cbd019f706456f95b82fbcf7ffee641187 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Thu, 6 Jul 2017 19:34:49 +0100 Subject: load Caps0ff c-chip dumps, checksum on MASK rom part passes, but game specific EPROM is still bad for the time being --- src/mame/drivers/opwolf.cpp | 10 +++++----- src/mame/machine/cchip_dev.cpp | 16 ++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 88d236c925a..d16ee3b9ee1 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -929,7 +929,7 @@ ROM_START( opwolf ) ROM_LOAD( "b20-07.10", 0x00000, 0x10000, CRC(45c7ace3) SHA1(06f7393f6b973b7735c27e8380cb4148650cfc16) ) ROM_REGION( 0x2000, "cchip:cchip_eprom", 0 ) - ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, NO_DUMP ) + ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, BAD_DUMP CRC(57165ffb) SHA1(e47e1bf309eb4285fede3a35b98e2fdeab2d7345) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b20-13.13", 0x00000, 0x80000, CRC(f6acdab1) SHA1(716b94ab3fa330ecf22df576f6a9f47a49c7554a) ) /* SCR tiles (8 x 8) */ @@ -957,7 +957,7 @@ ROM_START( opwolfa ) ROM_LOAD( "b20-07.10", 0x00000, 0x10000, CRC(45c7ace3) SHA1(06f7393f6b973b7735c27e8380cb4148650cfc16) ) ROM_REGION( 0x2000, "cchip:cchip_eprom", 0 ) - ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, NO_DUMP ) + ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, BAD_DUMP CRC(57165ffb) SHA1(e47e1bf309eb4285fede3a35b98e2fdeab2d7345) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b20-13.13", 0x00000, 0x80000, CRC(f6acdab1) SHA1(716b94ab3fa330ecf22df576f6a9f47a49c7554a) ) /* SCR tiles (8 x 8) */ @@ -980,7 +980,7 @@ ROM_START( opwolfj ) ROM_LOAD( "b20-07.10", 0x00000, 0x10000, CRC(45c7ace3) SHA1(06f7393f6b973b7735c27e8380cb4148650cfc16) ) ROM_REGION( 0x2000, "cchip:cchip_eprom", 0 ) - ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, NO_DUMP ) + ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, BAD_DUMP CRC(57165ffb) SHA1(e47e1bf309eb4285fede3a35b98e2fdeab2d7345) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b20-13.13", 0x00000, 0x80000, CRC(f6acdab1) SHA1(716b94ab3fa330ecf22df576f6a9f47a49c7554a) ) /* SCR tiles (8 x 8) */ @@ -1003,7 +1003,7 @@ ROM_START( opwolfjsc ) ROM_LOAD( "b20-07.10", 0x00000, 0x10000, CRC(45c7ace3) SHA1(06f7393f6b973b7735c27e8380cb4148650cfc16) ) ROM_REGION( 0x2000, "cchip:cchip_eprom", 0 ) - ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, NO_DUMP ) + ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, BAD_DUMP CRC(57165ffb) SHA1(e47e1bf309eb4285fede3a35b98e2fdeab2d7345) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b20-13.13", 0x00000, 0x80000, CRC(f6acdab1) SHA1(716b94ab3fa330ecf22df576f6a9f47a49c7554a) ) /* SCR tiles (8 x 8) */ @@ -1026,7 +1026,7 @@ ROM_START( opwolfu ) /* Taito TC0030 C-Chip labeled B20-18 (yes, it has a specif ROM_LOAD( "b20-07.10", 0x00000, 0x10000, CRC(45c7ace3) SHA1(06f7393f6b973b7735c27e8380cb4148650cfc16) ) ROM_REGION( 0x2000, "cchip:cchip_eprom", 0 ) - ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, NO_DUMP ) + ROM_LOAD( "cchip_b20-18", 0x0000, 0x2000, BAD_DUMP CRC(57165ffb) SHA1(e47e1bf309eb4285fede3a35b98e2fdeab2d7345) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b20-13.13", 0x00000, 0x80000, CRC(f6acdab1) SHA1(716b94ab3fa330ecf22df576f6a9f47a49c7554a) ) /* SCR tiles (8 x 8) */ diff --git a/src/mame/machine/cchip_dev.cpp b/src/mame/machine/cchip_dev.cpp index 27737ca0f65..1d510cfb94d 100644 --- a/src/mame/machine/cchip_dev.cpp +++ b/src/mame/machine/cchip_dev.cpp @@ -98,9 +98,6 @@ This chip *ALWAYS* has a bypass capacitor (ceramic, 104, 0.10 uF) soldered on to #include "emu.h" #include "machine/cchip_dev.h" -// uncomment to run code from cchip mask rom -//#define CCHIP_TEST - DEFINE_DEVICE_TYPE(TAITO_CCHIP_DEV, taito_cchip_device, "cchip", "Taito TC0030CMD (C-Chip)") taito_cchip_device::taito_cchip_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -113,11 +110,8 @@ taito_cchip_device::taito_cchip_device(const machine_config &mconfig, const char ROM_START( taito_cchip ) ROM_REGION( 0x1000, "upd7811", 0 ) -#ifdef CCHIP_TEST - ROM_LOAD( "cchip_upd78c11.rom", 0x0000, 0x1000, CRC(11111111) SHA1(1111111111111111111111111111111111111111) ) -#else - ROM_LOAD( "cchip_upd78c11.rom", 0x0000, 0x1000, NO_DUMP ) -#endif + // optically extracted, the internal checksum passes, although that doesn't rule out the possibility of error + ROM_LOAD( "cchip_upd78c11.bin", 0x0000, 0x1000, CRC(43021521) SHA1(73bc4b46cd2d6805ec926f39f22af00e38a3f822) ) ROM_END @@ -127,7 +121,8 @@ ADDRESS_MAP_END READ8_MEMBER(taito_cchip_device::asic_r) { - logerror("%s: asic_r %04x\n", machine().describe_context(), offset); + if (offset != 0x001) // prevent logerror spam for now + logerror("%s: asic_r %04x\n", machine().describe_context(), offset); if (offset == 0x001) // megablst return 0x01; @@ -167,9 +162,6 @@ ADDRESS_MAP_END MACHINE_CONFIG_MEMBER( taito_cchip_device::device_add_mconfig ) MCFG_CPU_ADD("upd7811", UPD7811, DERIVED_CLOCK(1,1)) MCFG_CPU_PROGRAM_MAP(cchip_map) -#ifndef CCHIP_TEST - MCFG_DEVICE_DISABLE() -#endif MCFG_DEVICE_ADD("upd4464_bank", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(cchip_ram_bank) -- cgit v1.2.3