diff --git a/src/mame/seta/macs.cpp b/src/mame/seta/macs.cpp index 1d4cafac735..990bd5ea9c4 100644 --- a/src/mame/seta/macs.cpp +++ b/src/mame/seta/macs.cpp @@ -58,10 +58,12 @@ KISEKAE -- info */ #include "emu.h" + #include "st0016.h" -#include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/generic/slot.h" + #include "speaker.h" @@ -104,8 +106,6 @@ private: void macs_output_w(offs_t offset, uint8_t data); uint8_t dma_offset(); - uint32_t screen_update_macs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - optional_device m_maincpu; optional_device m_cart1; optional_device m_cart2; @@ -490,12 +490,6 @@ static INPUT_PORTS_START( macs_h ) INPUT_PORTS_END -uint32_t macs_state::screen_update_macs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - return m_maincpu->update(screen,bitmap,cliprect); -} - - uint8_t macs_state::dma_offset() { return m_cart_bank; @@ -517,7 +511,7 @@ void macs_state::macs(machine_config &config) screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); screen.set_size(128*8, 128*8); screen.set_visarea(0*8, 128*8-1, 0*8, 128*8-1); - screen.set_screen_update(FUNC(macs_state::screen_update_macs)); + screen.set_screen_update(m_maincpu, FUNC(st0016_cpu_device::update)); screen.set_palette("maincpu:palette"); screen.screen_vblank().set_inputline(m_maincpu, INPUT_LINE_IRQ0, HOLD_LINE); // FIXME: HOLD_LINE is bad juju @@ -575,6 +569,10 @@ ROM_START( kisekaem ) ROM_LOAD16_BYTE( "am-mj.u7", 0x000001, 0x100000, CRC(4b645354) SHA1(1dbf9141c3724e5dff2cd8066117fb1b94671a80) ) ROM_LOAD16_BYTE( "am-mj.u6", 0x200000, 0x100000, CRC(23b3aa24) SHA1(bfabdb16f9b1b60230bb636a944ab46fdfda49d7) ) ROM_LOAD16_BYTE( "am-mj.u5", 0x200001, 0x100000, CRC(b4d53e29) SHA1(d7683fdd5531bf1aa0ef1e4e6f517b31e2d5829e) ) + + ROM_REGION( 0x117, "slot_a:pld", 0 ) + ROM_LOAD( "sx011-02.bin", 0x000, 0x117, CRC(ac8040b4) SHA1(1dc1cd93eaed13fb5b8cba024d93fdb9193a47c0) ) // GAL16V8B + ROM_REGION( 0x400000, "slot_b:rom", ROMREGION_ERASEFF ) ROM_REGION( 0x1000000, "maincpu", 0 ) diff --git a/src/mame/skeleton/cle68k.cpp b/src/mame/skeleton/cle68k.cpp index f4f9546604b..ec87e0c8ec7 100644 --- a/src/mame/skeleton/cle68k.cpp +++ b/src/mame/skeleton/cle68k.cpp @@ -234,6 +234,9 @@ ROM_START( dmndhrt ) ROM_LOAD16_BYTE( "diamond_heart_u.s.a_u8.u8", 0x00000, 0x20000, CRC(d1f340ce) SHA1(7567448c8694bb24f7957bb461d3be51d138634a) ) ROM_LOAD16_BYTE( "diamond_heart_u.s.a_u3.u3", 0x00001, 0x20000, CRC(78885bb8) SHA1(51e360036d32b609b4036be086549c011ab41fe3) ) + ROM_REGION( 0x1000, "mcu", 0 ) + ROM_LOAD( "at90s4414.u51", 0x0000, 0x1000, NO_DUMP ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD( "diamond_heart_u.s.a_u10.u10", 0x00000, 0x80000, CRC(00b691a7) SHA1(8cc530ad204cf9168d59419a01abf338c46a49e1) ) ROM_LOAD( "diamond_heart_u.s.a_u11.u11", 0x80000, 0x80000, CRC(2c666c44) SHA1(15c8e97900444046adb9455bfa827735c226a727) ) @@ -254,6 +257,9 @@ ROM_START( dmndhrtn ) // u51 was scratched for this set but believed to be AT90S ROM_LOAD16_BYTE( "w27e010.u8", 0x00000, 0x20000, CRC(2a1ba91e) SHA1(af340d9e0aa7874669557067a9e043eecdf5301b) ) // no sticker ROM_LOAD16_BYTE( "w27e010.u3", 0x00001, 0x20000, CRC(cdb26ff2) SHA1(33ddda977a5f6436a690fa53763f36c7e6acfb94) ) // no sticker + ROM_REGION( 0x1000, "mcu", 0 ) + ROM_LOAD( "at90s4414.u51", 0x0000, 0x1000, NO_DUMP ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD( "diamond_heart_new_mon_v20.0_u10.u10", 0x00000, 0x80000, CRC(7525bd95) SHA1(b34ab59bde9ecdfe03489a6eceda2c95afdee6c8) ) ROM_LOAD( "diamond_heart_new_mon_v20.0_u11.u11", 0x80000, 0x80000, CRC(1ffc66a6) SHA1(fd5bfa9ec01ad7aa3060929dbce417babe241700) ) @@ -274,6 +280,9 @@ ROM_START( honeybee ) // u51 was scratched for this set but believed to be AT90S ROM_LOAD16_BYTE( "honey_bee_hb_tw_u8.u8", 0x00000, 0x40000, CRC(1e7e53a3) SHA1(30d426cca499adf82338ba6cc1391f754e908a5b) ) ROM_LOAD16_BYTE( "honey_bee_hb_tw_u3.u3", 0x00001, 0x40000, CRC(0ed5f0cc) SHA1(f64c27f04f74162027070f889daaec6f1847f19e) ) + ROM_REGION( 0x1000, "mcu", 0 ) + ROM_LOAD( "at90s4414.u51", 0x0000, 0x1000, NO_DUMP ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD( "honey_bee_hb_tw_u10.u10", 0x00000, 0x80000, CRC(40526fe1) SHA1(58a3a16c4dc0fa6527571b924f43377657f0cc76) ) ROM_LOAD( "honey_bee_hb_tw_u11.u11", 0x80000, 0x80000, CRC(3036a082) SHA1(16393fac3ccd5c2fc6ab9fd11f8530aace94e4fc) )