Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-31 18:11:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

deprecat.h

Browse Source
This commit is contained in:
Angelo Salese 2011-12-07 03:25:27 +00:00
parent f0306837fc
commit fcdd0a5c1d
10 changed files with 94 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/sound/s14001a.c
View File

@ -22,7 +22,7 @@
1.31 fix a minor bug with the dac range. wolfpack clips again, and I'm almost sure its an encoding error on the original speech - LN (0.125u9)
1.31a Add chip pinout and other notes - LN (0.128u4)
1.31b slight update to notes to clarify input bus stuff, mostly finish the state map in the comments - LN
1.31c remove usage of deprecat.h - AtariAce (0.128u5)
1.31c remove usage of deprecat lib - AtariAce (0.128u5)
1.32 fix the squealing noise using a define; it isn't accurate to the chip exactly, but there are other issues which need to be fixed too. see TODO. - LN (0.136u2)
TODO:

2
src/mame/drivers/bnstars.c
View File

@ -1331,7 +1331,7 @@ static void irq_raise(running_machine &machine, int level)
cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE);
}
/* TODO: fix this arrangement (derived from old deprecat.h) */
/* TODO: fix this arrangement (derived from old deprecat lib) */
static TIMER_DEVICE_CALLBACK(ms32_interrupt)
{
int scanline = param;

34
src/mame/drivers/jackie.c
View File

@ -44,7 +44,6 @@ Note
#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/2413intf.h"
@ -53,7 +52,9 @@ class jackie_state : public driver_device
{
public:
jackie_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) { }
: driver_device(mconfig, type, tag),
m_maincpu(*this,"maincpu")
{ }
int m_exp_bank;
UINT8 *m_fg_tile_ram;
@ -73,6 +74,8 @@ public:
int m_hopper;
UINT8 m_out[3];
UINT16 m_unk_reg[3][5];
required_device<cpu_device> m_maincpu;
};
@ -233,18 +236,6 @@ static MACHINE_RESET( jackie )
state->m_bg_enable = 1;
}
static INTERRUPT_GEN( jackie_interrupt )
{
jackie_state *state = device->machine().driver_data<jackie_state>();
if (cpu_getiloops(device) % 2) {
if (state->m_irq_enable)
device_set_input_line(device, 0, HOLD_LINE);
} else {
if (state->m_nmi_enable)
device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE);
}
}
static void show_out(jackie_state *state)
{
@ -555,6 +546,19 @@ static DRIVER_INIT( jackie )
rom[0x7e86] = 0xc3;
}
static TIMER_DEVICE_CALLBACK( jackie_irq )
{
jackie_state *state = timer.machine().driver_data<jackie_state>();
int scanline = param;
if((scanline % 32) != 0)
return;
if((scanline % 64) == 32 && state->m_irq_enable)
device_set_input_line(state->m_maincpu, 0, HOLD_LINE);
else if ((scanline % 64) == 0 && state->m_nmi_enable)
device_set_input_line(state->m_maincpu, INPUT_LINE_NMI, PULSE_LINE);
}
static MACHINE_CONFIG_START( jackie, jackie_state )
@ -562,7 +566,7 @@ static MACHINE_CONFIG_START( jackie, jackie_state )
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
MCFG_CPU_PROGRAM_MAP(jackie_prg_map)
MCFG_CPU_IO_MAP(jackie_io_map)
MCFG_CPU_VBLANK_INT_HACK(jackie_interrupt,8)
MCFG_TIMER_ADD_SCANLINE("scantimer", jackie_irq, "screen", 0, 1)
MCFG_MACHINE_RESET(jackie)

79
src/mame/drivers/konamigx.c
View File

@ -95,9 +95,6 @@
*/
#include "emu.h"
#include "deprecat.h"
#include "video/konamiic.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "cpu/tms57002/tms57002.h"
@ -105,6 +102,7 @@
#include "sound/k054539.h"
#include "includes/konamigx.h"
#include "machine/adc083x.h"
#include "video/konamiic.h"
#include "rendlay.h"
#define GX_DEBUG 0
@ -659,41 +657,38 @@ static INTERRUPT_GEN(konamigx_vbinterrupt)
dmastart_callback(0);
}
static INTERRUPT_GEN(konamigx_vbinterrupt_type4)
static TIMER_DEVICE_CALLBACK(konamigx_hbinterrupt)
{
// lift idle suspension
if (resume_trigger && suspension_active) { suspension_active = 0; device->machine().scheduler().trigger(resume_trigger); }
konamigx_state *state = timer.machine().driver_data<konamigx_state>();
int scanline = param;
// IRQ 1 is the main 60hz vblank interrupt
// the gx_syncen & 0x20 test doesn't work on type 3 or 4 ROM boards, likely because the ROM board
// generates the timing in those cases. With this change, rushing heroes and rng2 boot :)
// maybe this interrupt should only be every 30fps, or maybe there are flags to prevent the game running too fast
// the real hardware should output the display for each screen on alternate frames
// if(device->machine().primary_screen->frame_number() & 1)
if (1) // gx_syncen & 0x20)
if (scanline == 240)
{
gx_syncen &= ~0x20;
// lift idle suspension
if (resume_trigger && suspension_active) { suspension_active = 0; timer.machine().scheduler().trigger(resume_trigger); }
if ((konamigx_wrport1_1 & 0x81) == 0x81 || (gx_syncen & 1))
// IRQ 1 is the main 60hz vblank interrupt
// the gx_syncen & 0x20 test doesn't work on type 3 or 4 ROM boards, likely because the ROM board
// generates the timing in those cases. With this change, rushing heroes and rng2 boot :)
// maybe this interrupt should only be every 30fps, or maybe there are flags to prevent the game running too fast
// the real hardware should output the display for each screen on alternate frames
// if(device->machine().primary_screen->frame_number() & 1)
if (1) // gx_syncen & 0x20)
{
gx_syncen &= ~1;
device_set_input_line(device, 1, HOLD_LINE);
gx_syncen &= ~0x20;
if ((konamigx_wrport1_1 & 0x81) == 0x81 || (gx_syncen & 1))
{
gx_syncen &= ~1;
device_set_input_line(state->m_maincpu, 1, HOLD_LINE);
}
}
dmastart_callback(0);
}
dmastart_callback(0);
}
static INTERRUPT_GEN(konamigx_hbinterrupt)
{
if (!cpu_getiloops(device))
{
konamigx_vbinterrupt_type4(device);
}
else // hblank
else if(scanline < 240) // hblank
{
// IRQ 2 is a programmable interrupt with scanline resolution
if (gx_syncen & 0x40)
@ -703,7 +698,7 @@ static INTERRUPT_GEN(konamigx_hbinterrupt)
if ((konamigx_wrport1_1 & 0x82) == 0x82 || (gx_syncen & 2))
{
gx_syncen &= ~2;
device_set_input_line(device, 2, HOLD_LINE);
device_set_input_line(state->m_maincpu, 2, HOLD_LINE);
}
}
}
@ -1785,7 +1780,7 @@ static GFXDECODE_START( type4 )
GFXDECODE_ENTRY( "gfx3", 0, bglayout_8bpp, 0x1800, 8 )
GFXDECODE_END
static MACHINE_CONFIG_START( konamigx, driver_device )
static MACHINE_CONFIG_START( konamigx, konamigx_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, 24000000)
MCFG_CPU_PROGRAM_MAP(gx_type2_map)
@ -1886,9 +1881,11 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gxtype3, konamigx )
MCFG_CPU_MODIFY("maincpu")
MCFG_DEVICE_REMOVE("maincpu")
MCFG_CPU_ADD("maincpu", M68EC020, 24000000)
MCFG_CPU_PROGRAM_MAP(gx_type3_map)
MCFG_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262)
MCFG_TIMER_ADD_SCANLINE("scantimer", konamigx_hbinterrupt, "screen", 0, 1)
MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE)
@ -1896,13 +1893,13 @@ static MACHINE_CONFIG_DERIVED( gxtype3, konamigx )
MCFG_VIDEO_START(konamigx_type3)
MCFG_PALETTE_LENGTH(16384)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(576, 32*8)
MCFG_SCREEN_SIZE(576, 264)
MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
MCFG_SCREEN_ADD("screen2", RASTER)
MCFG_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
MCFG_SCREEN_SIZE(576, 32*8)
MCFG_SCREEN_SIZE(576, 264)
MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
MCFG_SCREEN_UPDATE(konamigx)
@ -1911,21 +1908,23 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gxtype4, konamigx )
MCFG_CPU_MODIFY("maincpu")
MCFG_DEVICE_REMOVE("maincpu")
MCFG_CPU_ADD("maincpu", M68EC020, 24000000)
MCFG_CPU_PROGRAM_MAP(gx_type4_map)
MCFG_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262)
MCFG_TIMER_ADD_SCANLINE("scantimer", konamigx_hbinterrupt, "screen", 0, 1)
MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(128*8, 32*8)
MCFG_SCREEN_SIZE(128*8, 264)
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 32*8-1-16)
MCFG_SCREEN_ADD("screen2", RASTER)
MCFG_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
MCFG_SCREEN_SIZE(128*8, 32*8)
MCFG_SCREEN_SIZE(128*8, 264)
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 32*8-1-16)
MCFG_SCREEN_UPDATE(konamigx)

6
src/mame/drivers/ms32.c
View File

@ -1324,12 +1324,12 @@ static void irq_raise(running_machine &machine, int level)
cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE);
}
/* TODO: fix this arrangement (derived from old deprecat.h) */
/* TODO: fix this arrangement (derived from old deprecat lib) */
static TIMER_DEVICE_CALLBACK(ms32_interrupt)
{
int scanline = param;
if( scanline == 0 ) irq_raise(timer.machine(), 10);
if( scanline == 8) irq_raise(timer.machine(), 9);
if( scanline == 0) irq_raise(timer.machine(), 10);
if( scanline == 8) irq_raise(timer.machine(), 9);
/* hayaosi1 needs at least 12 IRQ 0 per frame to work (see code at FFE02289)
kirarast needs it too, at least 8 per frame, but waits for a variable amount
47pi2 needs ?? per frame (otherwise it hangs when you lose)

2
src/mame/drivers/overdriv.c
View File

@ -79,7 +79,7 @@ static TIMER_DEVICE_CALLBACK( overdriv_cpuA_scanline )
int scanline = param;
/* TODO: irqs routines are TOO slow right now, it ends up firing spurious irqs for whatever reason (shared ram fighting?) */
/* this is a temporary solution to get rid of deprecat.h and the crashes, but also makes the game timer to be too slow */
/* this is a temporary solution to get rid of deprecat lib and the crashes, but also makes the game timer to be too slow */
if(scanline == 256 && timer.machine().primary_screen->frame_number() & 1) // vblank-out irq
cputag_set_input_line(timer.machine(), "maincpu", 4, HOLD_LINE);
else if((scanline % 128) == 0) // timer irq

19
src/mame/drivers/thedeep.c
View File

@ -155,18 +155,18 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // ROM (banked)
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xdfff) AM_RAM // RAM (MCU data copied here)
AM_RANGE(0xe000, 0xe000) AM_READWRITE(thedeep_protection_r, thedeep_protection_w ) // To MCU
AM_RANGE(0xe004, 0xe004) AM_READWRITE(thedeep_e004_r, thedeep_nmi_w ) //
AM_RANGE(0xe000, 0xe000) AM_READWRITE(thedeep_protection_r, thedeep_protection_w) // To MCU
AM_RANGE(0xe004, 0xe004) AM_READWRITE(thedeep_e004_r, thedeep_nmi_w) //
AM_RANGE(0xe008, 0xe008) AM_READ_PORT("e008") // P1 (Inputs)
AM_RANGE(0xe009, 0xe009) AM_READ_PORT("e009") // P2
AM_RANGE(0xe00a, 0xe00a) AM_READ_PORT("e00a") // DSW1
AM_RANGE(0xe00b, 0xe00b) AM_READ_PORT("e00b") // DSW2
AM_RANGE(0xe00c, 0xe00c) AM_WRITE(thedeep_sound_w ) // To Sound CPU
AM_RANGE(0xe100, 0xe100) AM_WRITE(thedeep_e100_w ) // ?
AM_RANGE(0xe210, 0xe213) AM_WRITEONLY AM_BASE_MEMBER(thedeep_state, m_scroll ) // Scroll
AM_RANGE(0xe00c, 0xe00c) AM_WRITE(thedeep_sound_w) // To Sound CPU
AM_RANGE(0xe100, 0xe100) AM_WRITE(thedeep_e100_w) // ?
AM_RANGE(0xe210, 0xe213) AM_WRITEONLY AM_BASE_MEMBER(thedeep_state, m_scroll) // Scroll
AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_BASE_SIZE_MEMBER(thedeep_state, m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(thedeep_vram_1_w) AM_BASE_MEMBER(thedeep_state, m_vram_1 ) // Text Layer
AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(thedeep_vram_0_w) AM_BASE_MEMBER(thedeep_state, m_vram_0 ) // Background Layer
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(thedeep_vram_1_w) AM_BASE_MEMBER(thedeep_state, m_vram_1) // Text Layer
AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(thedeep_vram_0_w) AM_BASE_MEMBER(thedeep_state, m_vram_0) // Background Layer
AM_RANGE(0xf800, 0xf83f) AM_RAM AM_BASE_MEMBER(thedeep_state, m_scroll2 ) // Column Scroll
AM_RANGE(0xf840, 0xffff) AM_RAM
ADDRESS_MAP_END
@ -180,8 +180,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ymsnd", ym2203_w ) //
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r ) // From Main CPU
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ymsnd", ym2203_w) //
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) // From Main CPU
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@ -192,6 +192,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( thedeep )
PORT_START("e008")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) // Up / down shown in service mode

12
src/mame/includes/konamigx.h
View File

@ -1,3 +1,15 @@
class konamigx_state : public driver_device
{
public:
konamigx_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this,"maincpu")
{ }
required_device<cpu_device> m_maincpu;
};
/*----------- defined in drivers/konamigx.c -----------*/
extern UINT32 *gx_psacram, *gx_subpaletteram32;

6
src/mame/includes/thedeep.h
View File

@ -2,7 +2,9 @@ class thedeep_state : public driver_device
{
public:
thedeep_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) { }
: driver_device(mconfig, type, tag),
m_maincpu(*this,"maincpu")
{ }
UINT8 *m_spriteram;
size_t m_spriteram_size;
@ -18,6 +20,8 @@ public:
UINT8 *m_scroll2;
tilemap_t *m_tilemap_0;
tilemap_t *m_tilemap_1;
required_device<cpu_device> m_maincpu;
};

10
src/mame/machine/atarifb.c
View File

@ -5,7 +5,6 @@
*************************************************************************/
#include "emu.h"
#include "deprecat.h"
#include "includes/atarifb.h"
#include "sound/discrete.h"
@ -121,10 +120,11 @@ WRITE8_HANDLER( soccer_out2_w )
*
*************************************/
/* FIXME: almost surely not tied with screen vertical position */
WRITE8_HANDLER( atarifb_out3_w )
{
atarifb_state *state = space->machine().driver_data<atarifb_state>();
int loop = cpu_getiloops(state->m_maincpu);
//atarifb_state *state = space->machine().driver_data<atarifb_state>();
int loop = space->machine().primary_screen->vpos() >= 123;
switch (loop)
{
@ -137,8 +137,6 @@ WRITE8_HANDLER( atarifb_out3_w )
output_set_value("ledleft4", (data >> 4) & 1);
break;
case 0x01:
break;
case 0x02:
/* Player 2 play select lamp */
output_set_value("ledright0", (data >> 0) & 1);
output_set_value("ledright1", (data >> 1) & 1);
@ -146,8 +144,6 @@ WRITE8_HANDLER( atarifb_out3_w )
output_set_value("ledright3", (data >> 3) & 1);
output_set_value("ledright4", (data >> 4) & 1);
break;
case 0x03:
break;
}
// logerror("out3_w, %02x:%02x\n", loop, data);
}