From d8dda016310954a5533a82291fc456c19a50ab11 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 25 Mar 2014 12:27:36 +0000 Subject: [PATCH] megavdp cleanup (nw) --- src/mame/drivers/puckpkmn.c | 9 +++++---- src/mame/drivers/segac2.c | 3 ++- src/mame/machine/megadriv.c | 7 ++++--- src/mame/machine/megavdp.c | 21 --------------------- src/mess/drivers/segapico.c | 7 +++++-- 5 files changed, 16 insertions(+), 31 deletions(-) diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 6926acf3aa3..10814e0bed8 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -221,8 +221,9 @@ static ADDRESS_MAP_START( puckpkmn_map, AS_PROGRAM, 16, md_boot_state ) AM_RANGE(0x700018, 0x700019) AM_READ_PORT("DSW2") AM_RANGE(0x700022, 0x700023) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) AM_RANGE(0xa04000, 0xa04003) AM_READWRITE8(megadriv_68k_YM2612_read, megadriv_68k_YM2612_write, 0xffff) - AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) - + AM_RANGE(0xc00000, 0xc0000f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00010, 0xc0001f) AM_DEVWRITE8("snsnd", sn76496_base_device, write, 0x00ff) + AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) /* Unknown reads/writes: */ @@ -245,8 +246,8 @@ static ADDRESS_MAP_START( jzth_map, AS_PROGRAM, 16, md_boot_state ) AM_RANGE(0x700018, 0x700019) AM_READ_PORT("DSW2") AM_RANGE(0x700022, 0x700023) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) AM_RANGE(0xa04000, 0xa04003) AM_READWRITE8( megadriv_68k_YM2612_read, megadriv_68k_YM2612_write, 0xffff) - AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) - + AM_RANGE(0xc00000, 0xc0000f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00010, 0xc0001f) AM_DEVWRITE8("snsnd", sn76496_base_device, write, 0x00ff) AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 0f054fdf3e9..4155bcdde9b 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -602,7 +602,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, segac2_state ) AM_RANGE(0x840100, 0x840107) AM_MIRROR(0x13fef8) AM_DEVREADWRITE8("ymsnd", ym3438_device, read, write, 0x00ff) AM_RANGE(0x880100, 0x880101) AM_MIRROR(0x13fefe) AM_WRITE(counter_timer_w) AM_RANGE(0x8c0000, 0x8c0fff) AM_MIRROR(0x13f000) AM_READWRITE(palette_r, palette_w) AM_SHARE("paletteram") - AM_RANGE(0xc00000, 0xc0001f) AM_MIRROR(0x18ff00) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00000, 0xc0000f) AM_MIRROR(0x18ff00) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00010, 0xc0001f) AM_MIRROR(0x18ff00) AM_DEVWRITE8("snsnd", sn76496_base_device, write, 0x00ff) AM_RANGE(0xe00000, 0xe0ffff) AM_MIRROR(0x1f0000) AM_RAM AM_SHARE("nvram") ADDRESS_MAP_END diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c index a17e9c74e70..0e6aefc7411 100644 --- a/src/mame/machine/megadriv.c +++ b/src/mame/machine/megadriv.c @@ -513,9 +513,10 @@ static ADDRESS_MAP_START( megadriv_map, AS_PROGRAM, 16, md_base_state ) // AM_RANGE(0xb10000, 0xb1007f) AM_RAM AM_SHARE("megadrive_vdp_vsram") // AM_RANGE(0xb10100, 0xb1017f) AM_RAM AM_SHARE("megadrive_vdp_cram") - AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) - AM_RANGE(0xd00000, 0xd0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) // the earth defend - + AM_RANGE(0xc00000, 0xc0000f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00010, 0xc0001f) AM_DEVWRITE8("snsnd", sn76496_base_device, write, 0x00ff) + AM_RANGE(0xd00000, 0xd0000f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) // the earth defend + AM_RANGE(0xd00010, 0xd0001f) AM_DEVWRITE8("snsnd", sn76496_base_device, write, 0x00ff) AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_SHARE("megadrive_ram") // AM_RANGE(0xff0000, 0xffffff) AM_READONLY /* 0xe00000 - 0xffffff) == MAIN RAM (64kb, Mirrored, most games use ff0000 - ffffff) */ diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c index 164981d5d4b..3d07be5bb7d 100644 --- a/src/mame/machine/megavdp.c +++ b/src/mame/machine/megavdp.c @@ -817,19 +817,6 @@ WRITE16_MEMBER( sega_genesis_vdp_device::megadriv_vdp_w ) case 0x0e: logerror("Attempt to Write to HV counters!!\n"); break; - - case 0x10: - case 0x12: - case 0x14: - case 0x16: - { - // accessed by either segapsg_device or sn76496_device - sn76496_base_device *sn = machine().device(":snsnd"); - if (ACCESSING_BITS_0_7) sn->write(space, 0, data & 0xff); - //if (ACCESSING_BITS_8_15) sn->write(space, 0, (data>>8) & 0xff); - break; - } - default: mame_printf_debug("write to unmapped vdp port\n"); } @@ -1236,14 +1223,6 @@ READ16_MEMBER( sega_genesis_vdp_device::megadriv_vdp_r ) // retvalue = machine().rand(); // mame_printf_debug("%06x: Read HV counters at scanline %d hpos %d (return %04x)\n",space.device().safe_pc(),genesis_get_scanline_counter(), get_hposition(),retvalue); break; - - case 0x10: - case 0x12: - case 0x14: - case 0x16: - logerror("Attempting to read PSG!\n"); - retvalue = 0; - break; } return retvalue; } diff --git a/src/mess/drivers/segapico.c b/src/mess/drivers/segapico.c index c6767cd3d8c..0229c241d49 100644 --- a/src/mess/drivers/segapico.c +++ b/src/mess/drivers/segapico.c @@ -299,7 +299,8 @@ static ADDRESS_MAP_START( pico_mem, AS_PROGRAM, 16, pico_base_state ) AM_RANGE(0x800000, 0x80001f) AM_READWRITE(pico_68k_io_read, pico_68k_io_write) - AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00000, 0xc0000f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00010, 0xc0001f) AM_DEVWRITE8("snsnd", sn76496_base_device, write, 0x00ff) AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) ADDRESS_MAP_END @@ -505,7 +506,9 @@ static ADDRESS_MAP_START( copera_mem, AS_PROGRAM, 16, copera_state ) AM_RANGE(0x800000, 0x80001f) AM_READWRITE(pico_68k_io_read, pico_68k_io_write) - AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00000, 0xc0000f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) + AM_RANGE(0xc00010, 0xc0001f) AM_DEVWRITE8("snsnd", sn76496_base_device, write, 0x00ff) + AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) ADDRESS_MAP_END