diff options
author | Angelo Salese <angelosa@users.noreply.github.com> | 2011-12-05 19:44:22 +0000 |
---|---|---|
committer | Angelo Salese <angelosa@users.noreply.github.com> | 2011-12-05 19:44:22 +0000 |
commit | 2f8a67e8eacd3731e8e19551dfbd40380fa32768 (patch) | |
tree | f7cc9b2961c96ab6f67b534b4f1f680597496df7 /src | |
parent | 7e0d022dcdeb76a5597dd2cda5191a2a8c14d1c1 (diff) |
deprecat.h
Diffstat (limited to 'src')
-rw-r--r-- | src/mame/drivers/eolith.c | 9 | ||||
-rw-r--r-- | src/mame/drivers/eolith16.c | 7 | ||||
-rw-r--r-- | src/mame/drivers/eolithsp.c | 47 | ||||
-rw-r--r-- | src/mame/drivers/vegaeo.c | 5 | ||||
-rw-r--r-- | src/mame/includes/eolithsp.h | 4 |
5 files changed, 33 insertions, 39 deletions
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 062e00b45c8..0fafe339f6f 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -82,11 +82,8 @@ #include "emu.h" #include "cpu/e132xs/e132xs.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "includes/eolith.h" - - #include "includes/eolithsp.h" // It's configured for 512 bytes @@ -397,7 +394,7 @@ INPUT_PORTS_END static MACHINE_CONFIG_START( eolith45, eolith_state ) MCFG_CPU_ADD("maincpu", E132N, 45000000) /* 45 MHz */ MCFG_CPU_PROGRAM_MAP(eolith_map) - MCFG_CPU_VBLANK_INT_HACK(eolith_speedup,262) + MCFG_TIMER_ADD_SCANLINE("scantimer", eolith_speedup, "screen", 0, 1) /* sound cpu */ @@ -406,9 +403,9 @@ static MACHINE_CONFIG_START( eolith45, eolith_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MCFG_SCREEN_SIZE(512, 512) + MCFG_SCREEN_SIZE(512, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE(eolith) diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c index 37d3b8a3e36..075173bcbb4 100644 --- a/src/mame/drivers/eolith16.c +++ b/src/mame/drivers/eolith16.c @@ -11,7 +11,6 @@ #include "emu.h" #include "cpu/e132xs/e132xs.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "sound/okim6295.h" #include "includes/eolithsp.h" @@ -175,16 +174,16 @@ static PALETTE_INIT( eolith16 ) static MACHINE_CONFIG_START( eolith16, eolith16_state ) MCFG_CPU_ADD("maincpu", E116T, 60000000) /* no internal multiplier */ MCFG_CPU_PROGRAM_MAP(eolith16_map) - MCFG_CPU_VBLANK_INT_HACK(eolith_speedup,262) + MCFG_TIMER_ADD_SCANLINE("scantimer", eolith_speedup, "screen", 0, 1) MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C66) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MCFG_SCREEN_SIZE(512, 512) + MCFG_SCREEN_SIZE(512, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 199) MCFG_SCREEN_UPDATE(eolith16) diff --git a/src/mame/drivers/eolithsp.c b/src/mame/drivers/eolithsp.c index 360d5661fea..18df114bcfc 100644 --- a/src/mame/drivers/eolithsp.c +++ b/src/mame/drivers/eolithsp.c @@ -9,7 +9,6 @@ */ #include "emu.h" -#include "deprecat.h" #include "includes/eolithsp.h" static int eolith_speedup_address; @@ -39,24 +38,24 @@ static const struct } eolith_speedup_table[] = { /* eolith.c */ - { "ironfort", 0x40020854, 239 }, - { "hidnctch", 0x4000bba0, 239 }, - { "raccoon", 0x40008204, 239 }, - { "puzzlekg", 0x40029458, 239 }, - { "hidctch2", 0x40009524, 239 }, - { "hidctch2a",0x40029B58, 239 }, - { "landbrk", 0x40023574, 239 }, - { "landbrka", 0x4002446c, 239 }, - { "nhidctch", 0x40012778, 239 }, - { "hidctch3", 0x4001f6a0, 239 }, - { "fort2b", 0x000081e0, 239 }, - { "fort2ba", 0x000081e0, 239 }, - { "penfan", 0x4001FA66, 239 }, - { "candy", 0x4001990C, 239 }, + { "ironfort", 0x40020854, 240 }, + { "hidnctch", 0x4000bba0, 240 }, + { "raccoon", 0x40008204, 240 }, + { "puzzlekg", 0x40029458, 240 }, + { "hidctch2", 0x40009524, 240 }, + { "hidctch2a",0x40029B58, 240 }, + { "landbrk", 0x40023574, 240 }, + { "landbrka", 0x4002446c, 240 }, + { "nhidctch", 0x40012778, 240 }, + { "hidctch3", 0x4001f6a0, 240 }, + { "fort2b", 0x000081e0, 240 }, + { "fort2ba", 0x000081e0, 240 }, + { "penfan", 0x4001FA66, 240 }, + { "candy", 0x4001990C, 240 }, /* eolith16.c */ - { "klondkp", 0x0001a046, 239 }, + { "klondkp", 0x0001a046, 240 }, /* vegaeo.c */ - { "crazywar", 0x00008cf8, 239 }, + { "crazywar", 0x00008cf8, 240 }, { NULL, 0, 0 } }; @@ -80,21 +79,19 @@ void init_eolith_speedup(running_machine &machine) } /* todo, use timers instead! */ -INTERRUPT_GEN( eolith_speedup ) +TIMER_DEVICE_CALLBACK( eolith_speedup ) { - eolith_scanline = 261 - cpu_getiloops(device); - - if (eolith_scanline==0) + if (param==0) { eolith_vblank = 0; } - if (eolith_scanline==eolith_speedup_resume_scanline) + if (param==eolith_speedup_resume_scanline) { - device->machine().scheduler().trigger(1000); + timer.machine().scheduler().trigger(1000); } - if (eolith_scanline==240) + if (param==240) { eolith_vblank = 1; } @@ -102,5 +99,5 @@ INTERRUPT_GEN( eolith_speedup ) CUSTOM_INPUT( eolith_speedup_getvblank ) { - return eolith_vblank&1; + return (field.machine().primary_screen->vpos() >= 240); } diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c index e881606ae5b..d1b09892ac7 100644 --- a/src/mame/drivers/vegaeo.c +++ b/src/mame/drivers/vegaeo.c @@ -14,7 +14,6 @@ #include "emu.h" #include "cpu/e132xs/e132xs.h" -#include "deprecat.h" #include "machine/at28c16.h" #include "includes/eolithsp.h" @@ -180,7 +179,7 @@ static SCREEN_UPDATE( vega ) static MACHINE_CONFIG_START( vega, vegaeo_state ) MCFG_CPU_ADD("maincpu", GMS30C2132, 55000000) /* 55 MHz */ MCFG_CPU_PROGRAM_MAP(vega_map) - MCFG_CPU_VBLANK_INT_HACK(eolith_speedup,262) + MCFG_TIMER_ADD_SCANLINE("scantimer", eolith_speedup, "screen", 0, 1) /* sound cpu */ @@ -189,7 +188,7 @@ static MACHINE_CONFIG_START( vega, vegaeo_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MCFG_SCREEN_SIZE(512, 512) + MCFG_SCREEN_SIZE(512, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE(vega) diff --git a/src/mame/includes/eolithsp.h b/src/mame/includes/eolithsp.h index 34e6ad40bb1..23b1a4786d0 100644 --- a/src/mame/includes/eolithsp.h +++ b/src/mame/includes/eolithsp.h @@ -2,5 +2,7 @@ void eolith_speedup_read(address_space *space); void init_eolith_speedup(running_machine &machine); -INTERRUPT_GEN( eolith_speedup ); +TIMER_DEVICE_CALLBACK( eolith_speedup ); CUSTOM_INPUT( eolith_speedup_getvblank ); + + |