From dab0378933558c97f8a0b984709b717ea5a0a265 Mon Sep 17 00:00:00 2001 From: angelosa Date: Wed, 12 Apr 2017 04:55:51 +0200 Subject: crospuzl belongs to crystal.cpp (nw) --- scripts/target/mame/arcade.lua | 1 - src/mame/arcade.flt | 1 - src/mame/drivers/amazonlf.cpp | 92 -------------------------- src/mame/drivers/crystal.cpp | 142 ++++++++++++++++++++++++++++++++++++++++- src/mame/mame.lst | 4 +- 5 files changed, 141 insertions(+), 99 deletions(-) delete mode 100644 src/mame/drivers/amazonlf.cpp diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 62356532b41..bfe0a0044cd 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -4437,7 +4437,6 @@ files { MAME_DIR .. "src/mame/machine/inder_vid.cpp", MAME_DIR .. "src/mame/machine/inder_vid.h", MAME_DIR .. "src/mame/drivers/corona.cpp", - MAME_DIR .. "src/mame/drivers/amazonlf.cpp", MAME_DIR .. "src/mame/drivers/crystal.cpp", MAME_DIR .. "src/mame/video/vrender0.cpp", MAME_DIR .. "src/mame/video/vrender0.h", diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt index 7561933b9d0..fa41cd3bd53 100644 --- a/src/mame/arcade.flt +++ b/src/mame/arcade.flt @@ -41,7 +41,6 @@ allied.cpp alpha68k.cpp alvg.cpp amaticmg.cpp -amazonlf.cpp ambush.cpp amerihok.cpp ampoker2.cpp diff --git a/src/mame/drivers/amazonlf.cpp b/src/mame/drivers/amazonlf.cpp deleted file mode 100644 index 4c112c0efb7..00000000000 --- a/src/mame/drivers/amazonlf.cpp +++ /dev/null @@ -1,92 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood -/* - - uses ADC 'Amazon-LF' SoC, EISC CPU core - similar to crystal system? - -*/ - -#include "emu.h" -#include "cpu/se3208/se3208.h" -#include "screen.h" - - -class amazonlf_state : public driver_device -{ -public: - amazonlf_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_screen(*this, "screen") - { } - - /* devices */ - required_device m_maincpu; - required_device m_screen; - - - virtual void machine_start() override; - virtual void machine_reset() override; - uint32_t screen_update_amazonlf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_amazonlf); -}; - -static ADDRESS_MAP_START( amazonlf_mem, AS_PROGRAM, 32, amazonlf_state ) - AM_RANGE(0x00000000, 0x0007ffff) AM_ROM -ADDRESS_MAP_END - -void amazonlf_state::machine_start() -{ -} - -void amazonlf_state::machine_reset() -{ -} - -uint32_t amazonlf_state::screen_update_amazonlf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - return 0; -} - -WRITE_LINE_MEMBER(amazonlf_state::screen_vblank_amazonlf) -{ -} - - -static INPUT_PORTS_START(amazonlf) - -INPUT_PORTS_END - - - - - -static MACHINE_CONFIG_START( amazonlf, amazonlf_state ) - - MCFG_CPU_ADD("maincpu", SE3208, 25175000) // ? - MCFG_CPU_PROGRAM_MAP(amazonlf_mem) - - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(640, 480) - MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) - MCFG_SCREEN_UPDATE_DRIVER(amazonlf_state, screen_update_amazonlf) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amazonlf_state, screen_vblank_amazonlf)) - MCFG_SCREEN_PALETTE("palette") - - MCFG_PALETTE_ADD_RRRRRGGGGGGBBBBB("palette") -MACHINE_CONFIG_END - - -ROM_START( crospuzl ) - ROM_REGION( 0x80010, "maincpu", 0 ) - ROM_LOAD("en29lv040a.u5", 0x000000, 0x80010, CRC(d50e8500) SHA1(d681cd18cd0e48854c24291d417d2d6d28fe35c1) ) - - ROM_REGION32_LE( 0x8400010, "user1", ROMREGION_ERASEFF ) // Flash - // mostly empty, but still looks good - ROM_LOAD("k9f1g08u0a.riser", 0x000000, 0x8400010, CRC(7f3c88c3) SHA1(db3169a7b4caab754e9d911998a2ece13c65ce5b) ) -ROM_END - - -GAME( 200?, crospuzl, 0, amazonlf, amazonlf, driver_device, 0, ROT0, "", "Cross Puzzle", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index 10d1501336f..489686f0492 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -695,6 +695,17 @@ static ADDRESS_MAP_START( trivrus_mem, AS_PROGRAM, 32, crystal_state ) // AM_RANGE(0x44414F4C, 0x44414F7F) AM_RAM AM_SHARE("reset_patch") ADDRESS_MAP_END +static ADDRESS_MAP_START( crospuzl_mem, AS_PROGRAM, 32, crystal_state ) + AM_RANGE(0x01500000, 0x01500003) AM_READ(FlashCmd_r) + AM_RANGE(0x01500100, 0x01500103) AM_WRITE(FlashCmd_w) + AM_RANGE(0x01510000, 0x01510003) AM_READ_PORT("IN0") + AM_RANGE(0x01511000, 0x01511003) AM_READ_PORT("IN1") + AM_RANGE(0x01512000, 0x01512003) AM_READ_PORT("IN2") + AM_RANGE(0x01513000, 0x01513003) AM_READ_PORT("IN3") + AM_IMPORT_FROM( trivrus_mem ) + +ADDRESS_MAP_END + // Crazy Dou Di Zhu II // To do: HY04 (pic?) protection @@ -1242,6 +1253,113 @@ static INPUT_PORTS_START(trivrus) PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END +static INPUT_PORTS_START(crospuzl) + PORT_START("IN0") + PORT_DIPNAME( 0x01, 0x01, "DSW1" ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("IN1") + PORT_DIPNAME( 0x01, 0x01, "IN1" ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("IN2") + PORT_DIPNAME( 0x01, 0x01, "IN2" ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("IN3") + PORT_DIPNAME( 0x01, 0x01, "IN3" ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("PCB-SW1") + PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END static INPUT_PORTS_START(crzyddz2) PORT_START("P1_P2") // 1500002 & 1500000 @@ -1347,6 +1465,10 @@ static MACHINE_CONFIG_DERIVED( trivrus, crystal ) MCFG_CPU_PROGRAM_MAP(trivrus_mem) MACHINE_CONFIG_END +static MACHINE_CONFIG_DERIVED( crospuzl, crystal ) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(crospuzl_mem) +MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( crzyddz2, crystal ) MCFG_CPU_MODIFY("maincpu") @@ -1440,6 +1562,21 @@ ROM_START( trivrus ) ROM_REGION( 0x1000000, "user2", ROMREGION_ERASEFF ) // Unmapped flash ROM_END +/* + uses ADC 'Amazon-LF' SoC, EISC CPU core - similar to crystal system? +*/ + +ROM_START( crospuzl ) + ROM_REGION( 0x80010, "maincpu", 0 ) + ROM_LOAD("en29lv040a.u5", 0x000000, 0x80010, CRC(d50e8500) SHA1(d681cd18cd0e48854c24291d417d2d6d28fe35c1) ) + + ROM_REGION32_LE( 0x8400010, "user1", ROMREGION_ERASEFF ) // Flash + // mostly empty, but still looks good + ROM_LOAD("k9f1g08u0a.riser", 0x000000, 0x8400010, CRC(7f3c88c3) SHA1(db3169a7b4caab754e9d911998a2ece13c65ce5b) ) + + ROM_REGION( 0x1000000, "user2", ROMREGION_ERASEFF ) // Unmapped flash +ROM_END + ROM_START( psattack ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD("5.sys", 0x000000, 0x200000, CRC(f09878e4) SHA1(25b8dbac47d3911615c8874746e420ece13e7181) ) @@ -1681,8 +1818,9 @@ GAME( 2001, officeye, 0, crystal, officeye, crystal_state, officeye, ROT GAME( 2001, donghaer, 0, crystal, crystal, crystal_state, donghaer, ROT0, "Danbi", "Donggul Donggul Haerong", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION ) GAME( 2004?,menghong, 0, crzyddz2, crzyddz2, driver_device, 0, ROT0, "Sealy", "Meng Hong Lou", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION ) GAME( 2006, crzyddz2, 0, crzyddz2, crzyddz2, driver_device, 0, ROT0, "Sealy", "Crazy Dou Di Zhu II", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION ) -GAME( 2009, trivrus, 0, trivrus, trivrus, driver_device, 0, ROT0, "AGT", "Trivia R Us (v1.07)", 0 ) -// has a CF card instead of flash roms +GAME( 2009, trivrus, 0, trivrus, trivrus, driver_device, 0, ROT0, "AGT", "Trivia R Us (v1.07)", 0 ) // has a CF card instead of flash roms +GAME( 2009, crospuzl, 0, crospuzl, crospuzl, driver_device, 0, ROT0, "", "Cross Puzzle", MACHINE_NOT_WORKING ) + GAME( 2004, psattack, 0, crystal, crystal, crystal_state, psattack, ROT0, "Uniana", "P's Attack", MACHINE_IS_SKELETON ) // looks like the same kind of hw from strings in the ROM, but scrambled / encrypted? GAME( 200?, ddz, 0, crystal, crystal, driver_device, 0, ROT0, "IGS?", "Dou Di Zhu", MACHINE_IS_SKELETON ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index e20b2d82c2a..d8a09914949 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -1093,9 +1093,6 @@ am_mg35i // (c) Amatic am_mg3a // (c) 2000 Amatic suprstar // (c) 1996 Amatic -@source:amazonlf.cpp -crospuzl // - @source:ambush.cpp ambush // (c) 1983 ambushh // (c) 1983 @@ -10441,6 +10438,7 @@ menghong // 2004? Sealy psattack // 2004 Uniana topbladv // 2002 Sonokong. Top Blade V trivrus // 2009 AGT. Trivia R Us +crospuzl // @source:airraid.cpp airraid // (c) 1987 Seibu Kaihatsu -- cgit v1.2.3