Bulk replaces for k53252, nw

This commit is contained in:
Angelo Salese 2011-05-12 23:47:44 +00:00
parent 4613f2ff42
commit d715b4237b
10 changed files with 26 additions and 25 deletions

View File

@ -137,7 +137,7 @@ static ADDRESS_MAP_START( dbz_map, AS_PROGRAM, 16 )
AM_RANGE(0x4ec000, 0x4ec001) AM_WRITE(dbzcontrol_w)
AM_RANGE(0x4f0000, 0x4f0001) AM_WRITE(dbz_sound_command_w)
AM_RANGE(0x4f4000, 0x4f4001) AM_WRITE(dbz_sound_cause_nmi)
AM_RANGE(0x4f8000, 0x4f801f) AM_WRITENOP // 251 #1
AM_RANGE(0x4f8000, 0x4f801f) AM_DEVREADWRITE8("k053252",k053252_r,k053252_w,0x00ff) // 251 #1
AM_RANGE(0x4fc000, 0x4fc01f) AM_DEVWRITE("k053251", k053251_lsb_w) // 251 #2
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(dbz_bg2_videoram_w) AM_BASE_MEMBER(dbz_state, m_bg2_videoram)
@ -395,6 +395,7 @@ static MACHINE_CONFIG_START( dbz, dbz_state )
MCFG_K053251_ADD("k053251")
MCFG_K053936_ADD("k053936_1", dbz_k053936_intf)
MCFG_K053936_ADD("k053936_2", dbz_k053936_intf)
MCFG_K053252_ADD("k053252")
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")

View File

@ -84,6 +84,7 @@ Notes:
#include "sound/k051649.h"
#include "includes/konamipt.h"
#include "includes/hexion.h"
#include "video/konicdev.h"
static WRITE8_HANDLER( coincntr_w )
@ -122,9 +123,9 @@ static ADDRESS_MAP_START( hexion_map, AS_PROGRAM, 8 )
AM_RANGE(0xe880, 0xe889) AM_DEVWRITE("konami", k051649_frequency_w)
AM_RANGE(0xe88a, 0xe88e) AM_DEVWRITE("konami", k051649_volume_w)
AM_RANGE(0xe88f, 0xe88f) AM_DEVWRITE("konami", k051649_keyonoff_w)
AM_RANGE(0xf000, 0xf00d) AM_RAM /* 053252? f00e = IRQ ack, f00f = NMI ack */
AM_RANGE(0xf00e, 0xf00e) AM_WRITE(hexion_irq_ack_w)
AM_RANGE(0xf00f, 0xf00f) AM_WRITE(hexion_nmi_ack_w)
AM_RANGE(0xf000, 0xf00d) AM_DEVREADWRITE("k053252",k053252_r,k053252_w) /* 053252? f00e = IRQ ack, f00f = NMI ack */
AM_RANGE(0xf00e, 0xf00e) AM_WRITE(hexion_irq_ack_w) // - TODO: move these two into the above hook-up
AM_RANGE(0xf00f, 0xf00f) AM_WRITE(hexion_nmi_ack_w) // /
AM_RANGE(0xf200, 0xf200) AM_DEVWRITE_MODERN("oki", okim6295_device, write)
AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW1")
AM_RANGE(0xf401, 0xf401) AM_READ_PORT("DSW2")
@ -224,7 +225,7 @@ static TIMER_DEVICE_CALLBACK( hexion_scanline )
if(scanline == 256)
cputag_set_input_line(timer.machine(), "maincpu", 0, ASSERT_LINE);
else if ((scanline == 85) || (scanline == 170))
else if ((scanline == 85) || (scanline == 170)) //TODO
cputag_set_input_line(timer.machine(), "maincpu", INPUT_LINE_NMI, ASSERT_LINE);
}
@ -235,6 +236,8 @@ static MACHINE_CONFIG_START( hexion, hexion_state )
MCFG_CPU_PROGRAM_MAP(hexion_map)
MCFG_TIMER_ADD_SCANLINE("scantimer", hexion_scanline, "screen", 0, 1)
MCFG_K053252_ADD("k053252")
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)

View File

@ -165,7 +165,7 @@ static ADDRESS_MAP_START( overdriv_master_map, AS_PROGRAM, 16 )
AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("INPUTS")
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0e0000, 0x0e0001) AM_WRITENOP /* unknown (always 0x30) */
AM_RANGE(0x100000, 0x10001f) AM_WRITENOP /* 053252? (LSB) */
AM_RANGE(0x100000, 0x10001f) AM_DEVREADWRITE8("k053252",k053252_r,k053252_w,0x00ff) /* 053252? (LSB) */
AM_RANGE(0x140000, 0x140001) AM_WRITENOP //watchdog reset?
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("PADDLE")
AM_RANGE(0x1c0000, 0x1c001f) AM_DEVWRITE8("k051316_1", k051316_ctrl_w, 0xff00)
@ -390,6 +390,7 @@ static MACHINE_CONFIG_START( overdriv, overdriv_state )
MCFG_K053251_ADD("k053251")
MCFG_K053250_ADD("k053250_1", overdriv_k053250_intf_1)
MCFG_K053250_ADD("k053250_2", overdriv_k053250_intf_2)
MCFG_K053252_ADD("k053252")
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")

View File

@ -346,7 +346,7 @@ static ADDRESS_MAP_START( qdrmfgp_map, AS_PROGRAM, 16 )
AM_RANGE(0x180000, 0x183fff) AM_RAM AM_SHARE("nvram") /* backup ram */
AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x300000, 0x30003f) AM_DEVWRITE("k056832", k056832_word_w) /* video reg */
AM_RANGE(0x320000, 0x32001f) AM_DEVREADWRITE("k053252", k053252_word_r, k053252_word_w) /* ccu */
AM_RANGE(0x320000, 0x32001f) AM_DEVREADWRITE8("k053252", k053252_r, k053252_w,0x00ff) /* ccu */
AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service sw */
AM_RANGE(0x340000, 0x340001) AM_READ_PORT("340000") /* inputport */
AM_RANGE(0x350000, 0x350001) AM_WRITENOP /* unknown */
@ -369,7 +369,7 @@ static ADDRESS_MAP_START( qdrmfgp2_map, AS_PROGRAM, 16 )
AM_RANGE(0x180000, 0x183fff) AM_RAM AM_SHARE("nvram") /* backup ram */
AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x300000, 0x30003f) AM_DEVWRITE("k056832", k056832_word_w) /* video reg */
AM_RANGE(0x320000, 0x32001f) AM_DEVREADWRITE("k053252", k053252_word_r, k053252_word_w) /* ccu */
AM_RANGE(0x320000, 0x32001f) AM_DEVREADWRITE8("k053252", k053252_r, k053252_w,0x00ff) /* ccu */
AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service */
AM_RANGE(0x340000, 0x340001) AM_READ_PORT("340000") /* inputport */
AM_RANGE(0x350000, 0x350001) AM_WRITENOP /* unknown */

View File

@ -91,7 +91,7 @@ static ADDRESS_MAP_START( rollerg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0053, 0x0053) AM_READ_PORT("DSW1")
AM_RANGE(0x0060, 0x0060) AM_READ_PORT("DSW2")
AM_RANGE(0x0061, 0x0061) AM_READ(pip_r) /* ????? */
AM_RANGE(0x0100, 0x010f) AM_WRITENOP /* 053252? */
AM_RANGE(0x0100, 0x010f) AM_DEVREADWRITE("k053252",k053252_r,k053252_w) /* 053252? */
AM_RANGE(0x0200, 0x020f) AM_DEVWRITE("k051316", k051316_ctrl_w)
AM_RANGE(0x0300, 0x030f) AM_DEVREADWRITE("k053244", k053244_r, k053244_w)
AM_RANGE(0x0800, 0x0fff) AM_READ(rollerg_k051316_r) AM_DEVWRITE("k051316", k051316_w)
@ -291,6 +291,7 @@ static MACHINE_CONFIG_START( rollerg, rollerg_state )
MCFG_K053244_ADD("k053244", rollerg_k05324x_intf)
MCFG_K051316_ADD("k051316", rollerg_k051316_intf)
MCFG_K053252_ADD("k053252")
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")

View File

@ -188,7 +188,7 @@ static ADDRESS_MAP_START( rungun_map, AS_PROGRAM, 16 )
AM_RANGE(0x380000, 0x39ffff) AM_RAM // work RAM
AM_RANGE(0x400000, 0x43ffff) AM_READNOP // AM_READ( K053936_0_rom_r ) // '936 ROM readback window
AM_RANGE(0x480000, 0x48001f) AM_READWRITE(rng_sysregs_r, rng_sysregs_w) AM_BASE_MEMBER(rungun_state, m_sysreg)
AM_RANGE(0x4c0000, 0x4c001f) AM_DEVREAD("k053252", k053252_word_r) // CCU (for scanline and vblank polling)
AM_RANGE(0x4c0000, 0x4c001f) AM_DEVREADWRITE8("k053252", k053252_r, k053252_w,0x00ff) // CCU (for scanline and vblank polling)
AM_RANGE(0x540000, 0x540001) AM_WRITE(sound_irq_w)
AM_RANGE(0x58000c, 0x58000d) AM_WRITE(sound_cmd1_w)
AM_RANGE(0x58000e, 0x58000f) AM_WRITE(sound_cmd2_w)

View File

@ -270,7 +270,7 @@ static ADDRESS_MAP_START( esckids_map, AS_PROGRAM, 8 )
AM_RANGE(0x3f93, 0x3f93) AM_READ_PORT("SERVICE")
AM_RANGE(0x3fa0, 0x3fa7) AM_DEVWRITE("k053246", k053246_w) // 053246 (Sprite)
AM_RANGE(0x3fb0, 0x3fbf) AM_DEVWRITE("k053251", k053251_w) // 053251 (Priority Encoder)
AM_RANGE(0x3fc0, 0x3fcf) AM_WRITENOP // Not Emulated (053252 ???)
AM_RANGE(0x3fc0, 0x3fcf) AM_DEVREADWRITE("k053252",k053252_r,k053252_w) // Not Emulated (053252 ???)
AM_RANGE(0x3fd0, 0x3fd0) AM_WRITE(vendetta_5fe0_w) // Coin Counter, 052109 RMRD, 053246 OBJCHA
AM_RANGE(0x3fd2, 0x3fd2) AM_WRITE(vendetta_eeprom_w) // EEPROM, Video banking
AM_RANGE(0x3fd4, 0x3fd4) AM_READWRITE(vendetta_sound_interrupt_r, z80_irq_w) // Sound
@ -560,6 +560,7 @@ static MACHINE_CONFIG_DERIVED( esckids, vendetta )
MCFG_K052109_ADD("k052109", esckids_k052109_intf)
MCFG_DEVICE_REMOVE("k053246")
MCFG_K053246_ADD("k053246", esckids_k053246_intf)
MCFG_K053252_ADD("k053252")
MACHINE_CONFIG_END

View File

@ -338,7 +338,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x0c8000, 0x0c800f) AM_DEVREADWRITE("k053250", k053250_r, k053250_w)
AM_RANGE(0x0ca000, 0x0ca01f) AM_DEVWRITE("k054338", k054338_word_w) // CLTC
AM_RANGE(0x0cc000, 0x0cc01f) AM_DEVWRITE("k053251", k053251_lsb_w) // priority encoder
AM_RANGE(0x0d0000, 0x0d001f) AM_DEVWRITE("k053252", k053252_word_w) // CCU
AM_RANGE(0x0d0000, 0x0d001f) AM_DEVREADWRITE8("k053252", k053252_r,k053252_w,0x00ff) // CCU
AM_RANGE(0x0d4000, 0x0d4001) AM_WRITE(sound_irq_w)
AM_RANGE(0x0d600c, 0x0d600d) AM_WRITE(sound_cmd1_w)
AM_RANGE(0x0d600e, 0x0d600f) AM_WRITE(sound_cmd2_w)

View File

@ -9029,7 +9029,7 @@ xexex: 01 FF 00 21 00 37 01 00 01 20 0C 0E 54 00 00 00 384x256 ~ 384x256 (*)
typedef struct _k053252_state k053252_state;
struct _k053252_state
{
UINT16 regs[16];
UINT8 regs[16];
};
/*****************************************************************************
@ -9048,24 +9048,19 @@ INLINE k053252_state *k053252_get_safe_token( device_t *device )
DEVICE HANDLERS
*****************************************************************************/
READ16_DEVICE_HANDLER( k053252_word_r )
READ8_DEVICE_HANDLER( k053252_r )
{
k053252_state *k053252 = k053252_get_safe_token(device);
return k053252->regs[offset];
}
WRITE16_DEVICE_HANDLER( k053252_word_w )
WRITE8_DEVICE_HANDLER( k053252_w )
{
k053252_state *k053252 = k053252_get_safe_token(device);
COMBINE_DATA(k053252->regs + offset);
k053252->regs[offset] = data;
}
WRITE32_DEVICE_HANDLER( k053252_long_w )
{
offset <<= 1;
k053252_word_w(device, offset, data >> 16, mem_mask >> 16);
k053252_word_w(device, offset + 1, data, mem_mask);
}
/*****************************************************************************
DEVICE INTERFACE

View File

@ -749,9 +749,8 @@ void k053250_dma(device_t *device, int limiter);
/** Konami 053252 **/
/* CRT and interrupt control unit */
READ16_DEVICE_HANDLER( k053252_word_r ); // CCU registers
WRITE16_DEVICE_HANDLER( k053252_word_w );
WRITE32_DEVICE_HANDLER( k053252_long_w );
READ8_DEVICE_HANDLER( k053252_r ); // CCU registers
WRITE8_DEVICE_HANDLER( k053252_w );
/** Konami 001006 **/