From a73bd6ce9c564b59ed86f83b31ac3f5c03f0988b Mon Sep 17 00:00:00 2001 From: David Haywood Date: Sun, 16 Dec 2012 17:14:40 +0000 Subject: [PATCH] FM splitting / note improvements (small) (nw) --- src/mame/drivers/ecoinf3.c | 156 +++++++++++++++++++++---------------- src/mame/mame.lst | 2 + 2 files changed, 93 insertions(+), 65 deletions(-) diff --git a/src/mame/drivers/ecoinf3.c b/src/mame/drivers/ecoinf3.c index 4cd18c69d5a..65b38718a67 100644 --- a/src/mame/drivers/ecoinf3.c +++ b/src/mame/drivers/ecoinf3.c @@ -1,11 +1,15 @@ /* Electrocoin Pyramid HW type */ -// this seems to not like our Z180 timers much? +// this seems to not like our Z180 timers much? (or wants a 10ms interrupt externally?) // also quite a few of the reads / writes are fall-through from Z180 internal reads/writes // assuming this is like the other hardware EC produced the IO devices should probably // be several 8255s on 4-byte boundaries +// what is the sound hardware on this one? + +// 2 of the sets contain program scrambled roms (where the last 0x2000 bytes match between games) why, badly dumped? + #include "emu.h" #include "cpu/z180/z180.h" #include "machine/i8255.h" @@ -22,6 +26,7 @@ public: DECLARE_WRITE8_MEMBER(ppi8255_intf_e_write_b); DECLARE_WRITE8_MEMBER(ppi8255_intf_e_write_c); DECLARE_DRIVER_INIT(ecoinf3); + DECLARE_DRIVER_INIT(ecoinf3_swap); }; @@ -67,6 +72,8 @@ static I8255_INTERFACE (ppi8255_intf_d) WRITE8_MEMBER(ecoinf3_state::ppi8255_intf_e_write_a) { + static UINT8 send_buffer = 0; + static int count = 0; // writes the 'PYRAMID' string from RAM (copied from ROM) here... // along with port 40/41/42 accesses // also error messages? (well it looks like it should, but code is strange and skips them) I guess it's a debug port or the vfd? @@ -78,26 +85,46 @@ WRITE8_MEMBER(ecoinf3_state::ppi8255_intf_e_write_a) // Sphinx - Writes "No % Key" -- depends on port 0x51, writes "SPHINX V- 1" if it's happy with that .. after that you get COIN TAMPER, a count down with COINS TRIM and a reboot // Pennies from Heaven - same behavior as Sphinx - static int count = 0; + + // typically writes a letter (sometimes twice) then 0x00, usually twice - if ((data>=0x20) && (data<0x5b)) + if (data==0x00) { - if (count%80 == 0) printf("\n"); + if (send_buffer!=0x00) + { + if ((send_buffer>=0x20) && (send_buffer<0x5b)) + { + printf("%c", send_buffer); + } + else + { + printf(" (%02x) ", send_buffer); + count = -1; + } - printf("%c", data); - count++; + count++; + if (count%14 == 0) printf("\n"); + + + send_buffer = 0x00; + } } + else + { + send_buffer = data; + } + + + } WRITE8_MEMBER(ecoinf3_state::ppi8255_intf_e_write_b) { -// printf("\nwrite b %02x\n", data); } WRITE8_MEMBER(ecoinf3_state::ppi8255_intf_e_write_c) { -// printf("\nwrite c %02x\n", data); - + // not written at an appropriate time for it to be a 'send' address for the text } static I8255_INTERFACE (ppi8255_intf_e) @@ -394,12 +421,6 @@ static MACHINE_CONFIG_START( ecoinf3_pyramid, ecoinf3_state ) MCFG_I8255_ADD( "ppi8255_f", ppi8255_intf_f ) MCFG_I8255_ADD( "ppi8255_g", ppi8255_intf_g ) MCFG_I8255_ADD( "ppi8255_h", ppi8255_intf_h ) - - - // sphinx and pyramid on this hw contain a weird rom, looks almost like half a pair for a 16-bit cpu, but contains - // what looks like vectors at the end, no idea what it is. - //MCFG_CPU_ADD("subcpu", HD6301, 4000000) // ?? - //MCFG_CPU_PROGRAM_MAP(pyramid_submap) MACHINE_CONFIG_END @@ -409,69 +430,52 @@ MACHINE_CONFIG_END ROMs for PYRAMID Hw Type ********************************************************************************************************************/ -ROM_START( ec_pyram ) - ROM_REGION( 0x200000, "maincpu", 0 ) - // Z80 Program - ROM_LOAD( "pyramid 5p 3.bin", 0x0000, 0x010000, CRC(06a047d8) SHA1(4a1a15f1ab9defd3a0c5f2d333beae0daa16c6a4) ) - ROM_REGION( 0x010000, "subcpu", 0 ) - // this seems to be half of a 16-bit pair, possibly for a 68k. It might come from a different game, it's definitely missing the other part of the pair - // actually the end of the code (last 0x2000) bytes look like some 6xxx ROM, is the rest just unused space? the end part is same on Pyramid and Sphinx + +ROM_START( ec_pyram ) + ROM_REGION( 0x200000, "maincpu", 0 ) /* the last 0x2000 bytes (unmapped?) are the same as on the ec_sphin set */ ROM_LOAD( "pyramid.bin", 0x0000, 0x010000, CRC(370a6d2c) SHA1(ea4f899adeca734529b19ba8de0e371841982c20) ) ROM_END - -ROM_START( ec_sphin ) +ROM_START( ec_pyrama ) ROM_REGION( 0x200000, "maincpu", 0 ) - // z80 ROMS but truncated, seem to just contain garbage at the end tho, so probably OK - ROM_LOAD( "sphinx8c.bin", 0x0000, 0x00e000, CRC(f8e110fc) SHA1(4f55b5de87151f9127b84ffcf7f6f2e3ce34469f) ) + ROM_LOAD( "pyramid 5p 3.bin", 0x0000, 0x010000, CRC(06a047d8) SHA1(4a1a15f1ab9defd3a0c5f2d333beae0daa16c6a4) ) +ROM_END - ROM_REGION( 0x010000, "subcpu", 0 ) - // like Pyramid this looks more like half a 16-bit pair (68k?) ROM... - // actually the end of the code (last 0x2000) bytes look like some 6xxx ROM, is the rest just unused space? the end part is same on Pyramid and Sphinx +ROM_START( ec_sphin ) /* the last 0x2000 bytes (unmapped?) are the same as on the ec_pyram set */ + ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD( "spnx5p", 0x0000, 0x010000, CRC(b4b49259) SHA1(a26172b659b739564b25dcc0f3f31f131a144d52) ) ROM_END ROM_START( ec_sphina ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD( "spx10cv2.bin", 0x0000, 0x00e000, CRC(e2bf11a0) SHA1(f267385dbb06b2be8bcad7ae5e5804f5bb467f6d) ) +ROM_END - ROM_REGION( 0x010000, "subcpu", ROMREGION_ERASE00 ) - /* missing? */ +ROM_START( ec_sphinb ) + ROM_REGION( 0x200000, "maincpu", 0 ) // z80 ROMS but truncated, other sets just seem to contain garbage at the end tho, so probably OK + ROM_LOAD( "sphinx8c.bin", 0x0000, 0x00e000, CRC(f8e110fc) SHA1(4f55b5de87151f9127b84ffcf7f6f2e3ce34469f) ) ROM_END ROM_START( ec_penni ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD( "pfh_8c.bin", 0x0000, 0x010000, CRC(282a42d8) SHA1(f985d238c72577e755090ce0f04dcc7850af6f3b) ) - - ROM_REGION( 0x010000, "subcpu", ROMREGION_ERASE00 ) - /* missing? */ ROM_END ROM_START( ec_pennia ) - ROM_REGION( 0x200000, "maincpu", 0 ) - ROM_LOAD( "pfh_v6.bin", 0x0000, 0x00e000, CRC(febb3fce) SHA1(f8df085a563405ea5adcd15a4162a7ba56bcfad7) ) // this set is truncated, but that area just seems to be garbage anyway, so should be fine - - ROM_REGION( 0x010000, "subcpu", ROMREGION_ERASE00 ) - /* missing? */ + ROM_REGION( 0x200000, "maincpu", 0 ) // z80 ROMS but truncated, other sets just seem to contain garbage at the end tho, so probably OK + ROM_LOAD( "pfh_v6.bin", 0x0000, 0x00e000, CRC(febb3fce) SHA1(f8df085a563405ea5adcd15a4162a7ba56bcfad7) ) ROM_END - ROM_START( ec_stair ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD("sth5.4", 0x0000, 0x010000, CRC(879c8dcb) SHA1(358d9bb567da4b7913434d29dcd8a81c51c5fe2e) ) - - ROM_REGION( 0x010000, "subcpu", ROMREGION_ERASE00 ) - /* missing? */ ROM_END ROM_START( ec_staira ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD("sth5.8c", 0x0000, 0x010000, CRC(7ce6b760) SHA1(c828689481d7e187c504dd072bd6714222888d33) ) - - ROM_REGION( 0x010000, "subcpu", ROMREGION_ERASE00 ) - /* missing? */ ROM_END @@ -480,25 +484,16 @@ ROM_START( ec_laby ) // no header info with these ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD( "lab1v8.bin", 0x0000, 0x008000, CRC(16f0eeac) SHA1(9e28a6ae9176f730234dd8a7a8e50bad2904b611) ) ROM_LOAD( "lab2v8.bin", 0x8000, 0x008000, CRC(14d7c58b) SHA1(e6b19523d96c9c1f39b743f8c52791465ab79637) ) - - ROM_REGION( 0x010000, "subcpu", ROMREGION_ERASE00 ) - /* missing? */ ROM_END ROM_START( ec_labya ) // no header info with these ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD( "laby10", 0x0000, 0x010000, CRC(a8b58fc3) SHA1(16e940b04fa85ff85a29197b4e45c8a39f5cad19) ) - - ROM_REGION( 0x010000, "subcpu", ROMREGION_ERASE00 ) - /* missing? */ ROM_END ROM_START( ec_secrt ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD( "scastle1.bin", 0x0000, 0x010000, CRC(e6abb596) SHA1(35518c46f1ddf1d3a85af13e4ba8bee07e804f64) ) - - ROM_REGION( 0x010000, "subcpu", ROMREGION_ERASE00 ) - // no strange rom in this set ROM_END DRIVER_INIT_MEMBER(ecoinf3_state,ecoinf3) @@ -506,16 +501,47 @@ DRIVER_INIT_MEMBER(ecoinf3_state,ecoinf3) } +DRIVER_INIT_MEMBER(ecoinf3_state,ecoinf3_swap) +{ + // not all sets have this, are they just badly dumped? + UINT8 table[] = + { + 0x48, 0x4c, 0x49, 0x4d, 0x40, 0x44, 0x41, 0x45, 0x68, 0x78, 0x60, 0x70, 0x6a, 0x7a, 0x62, 0x72, + 0x08, 0x0c, 0x09, 0x0d, 0x00, 0x04, 0x01, 0x05, 0x6c, 0x7c, 0x64, 0x74, 0x6e, 0x7e, 0x66, 0x76, + 0x58, 0x5c, 0x59, 0x5d, 0x50, 0x54, 0x51, 0x55, 0x28, 0x38, 0x20, 0x30, 0x2a, 0x3a, 0x22, 0x32, + 0x18, 0x1c, 0x19, 0x1d, 0x10, 0x14, 0x11, 0x15, 0x2c, 0x3c, 0x24, 0x34, 0x2e, 0x3e, 0x26, 0x36, + 0x56, 0x52, 0x57, 0x53, 0x5e, 0x5a, 0x5f, 0x5b, 0x75, 0x65, 0x7d, 0x6d, 0x77, 0x67, 0x7f ,0x6f, + 0x16, 0x12, 0x17, 0x13, 0x1e, 0x1a, 0x1f, 0x1b, 0x71, 0x61, 0x79, 0x69, 0x73, 0x63, 0x7b, 0x6b, + 0x46, 0x42, 0x47, 0x43, 0x4e, 0x4a, 0x4f, 0x4b, 0x35, 0x25, 0x3d, 0x2d, 0x37, 0x27, 0x3f ,0x2f, + 0x06, 0x02, 0x07, 0x03, 0x0e, 0x0a, 0x0f, 0x0b, 0x31, 0x21, 0x39, 0x29, 0x33, 0x23, 0x3b, 0x2b, + }; + + UINT8* buffer = auto_alloc_array(machine(), UINT8, 0x10000); + UINT8 *rom = memregion( "maincpu" )->base(); + + + for (int i=0;i<0x10000;i++) + { + buffer[i] = rom[(i&0xff80)|table[i&0x7f]]; + } + + memcpy(rom,buffer,0x10000); + +} + + // another hw type (similar to stuff in ecoinf2.c) (watchdog on port 58?) -GAME( 19??, ec_pyram, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pyramid (v6) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_sphin, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Sphinx (v1) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_sphina, ec_sphin , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Sphinx (v?) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_penni, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pennies From Heaven (v1) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_pennia, ec_penni , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pennies From Heaven (v?) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_stair, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Stairway To Heaven (Electrocoin) (set 1)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_staira, ec_stair , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Stairway To Heaven (Electrocoin) (set 2)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_laby, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Labyrinth (v8) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_labya, ec_laby , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Labyrinth (v10) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) -GAME( 19??, ec_secrt, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Secret Castle (v1) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_pyram, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3_swap, ROT0, "Electrocoin", "Pyramid (v1) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_pyrama, ec_pyram , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pyramid (v6) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_sphin, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3_swap, ROT0, "Electrocoin", "Sphinx (v2) (Electrocoin) (set 1)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_sphina, ec_sphin , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Sphinx (v2) (Electrocoin) (set 2)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_sphinb, ec_sphin , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Sphinx (v1) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_penni, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pennies From Heaven (v1) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_pennia, ec_penni , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pennies From Heaven (v6) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_stair, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Stairway To Heaven (v11) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_staira, ec_stair , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Stairway To Heaven (v1) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_laby, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Labyrinth (v8) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_labya, ec_laby , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Labyrinth (v10) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) +GAME( 19??, ec_secrt, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Secret Castle (v1) (Electrocoin)" , GAME_NO_SOUND|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index b2ab207b4e1..01a1c9b99ef 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -28614,8 +28614,10 @@ ec_sumnc // Casino Super Multi Nudger (Concept/Electrocoin) // Pyramid PCB ec_pyram // Pyramid (Electrocoin) +ec_pyrama // ec_sphin // Sphinx (Electrocoin) ec_sphina // +ec_sphinb // ec_penni // Pennies From Heaven (Electrocoin) ec_pennia // ec_stair // Stairway to Heaven