Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-23 14:19:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Updated qdrmfgp.c to use Konami video devices

Browse Source 
This basically leaves only konamigx.c (and mystwarr.c, which includes konamigx.h) to use the old implementation from konamiic.c. Of course, this is also the hardest driver to convert, but I'll look into it only after 0.136...
This commit is contained in:
Fabio Priuli 2009-12-24 17:44:53 +00:00
parent f64aa7e017
commit 421e03f73a
2 changed files with 82 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/mame/drivers/qdrmfgp.c
View File

@ -24,12 +24,14 @@ GP1 HDD data contents:
#include "cpu/m68000/m68000.h" #include "cpu/m68000/m68000.h"
#include "machine/idectrl.h" #include "machine/idectrl.h"
#include "sound/k054539.h" #include "sound/k054539.h"
#include "video/konamiic.h" #include "video/konicdev.h"
VIDEO_START( qdrmfgp ); VIDEO_START( qdrmfgp );
VIDEO_START( qdrmfgp2 ); VIDEO_START( qdrmfgp2 );
VIDEO_UPDATE( qdrmfgp ); VIDEO_UPDATE( qdrmfgp );
extern void qdrmfgp_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags);
extern void qdrmfgp2_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags);
static UINT8 *sndram; static UINT8 *sndram;
@ -128,8 +130,9 @@ static WRITE16_HANDLER( gp2_control_w )
static READ16_HANDLER( v_rom_r ) static READ16_HANDLER( v_rom_r )
{ {
const device_config *k056832 = devtag_get_device(space->machine, "k056832");
UINT8 *mem8 = memory_region(space->machine, "gfx1"); UINT8 *mem8 = memory_region(space->machine, "gfx1");
int bank = K056832_word_r(space, 0x34/2, 0xffff); int bank = k056832_word_r(k056832, 0x34/2, 0xffff);
offset += bank * 0x800 * 4; offset += bank * 0x800 * 4;
@ -142,34 +145,42 @@ static READ16_HANDLER( v_rom_r )
static READ16_HANDLER( gp2_vram_r ) static READ16_HANDLER( gp2_vram_r )
{ {
const device_config *k056832 = devtag_get_device(space->machine, "k056832");
if (offset < 0x1000 / 2) if (offset < 0x1000 / 2)
return K056832_ram_word_r(space, offset*2+1, mem_mask); return k056832_ram_word_r(k056832, offset * 2 + 1, mem_mask);
else else
return K056832_ram_word_r(space, (offset-0x1000/2)*2, mem_mask); return k056832_ram_word_r(k056832, (offset - 0x1000 / 2) * 2, mem_mask);
} }
static READ16_HANDLER( gp2_vram_mirror_r ) static READ16_HANDLER( gp2_vram_mirror_r )
{ {
const device_config *k056832 = devtag_get_device(space->machine, "k056832");
if (offset < 0x1000 / 2) if (offset < 0x1000 / 2)
return K056832_ram_word_r(space, offset*2, mem_mask); return k056832_ram_word_r(k056832, offset * 2, mem_mask);
else else
return K056832_ram_word_r(space, (offset-0x1000/2)*2+1, mem_mask); return k056832_ram_word_r(k056832, (offset - 0x1000 / 2) * 2 + 1, mem_mask);
} }
static WRITE16_HANDLER( gp2_vram_w ) static WRITE16_HANDLER( gp2_vram_w )
{ {
const device_config *k056832 = devtag_get_device(space->machine, "k056832");
if (offset < 0x1000 / 2) if (offset < 0x1000 / 2)
K056832_ram_word_w(space, offset*2+1, data, mem_mask); k056832_ram_word_w(k056832, offset * 2 + 1, data, mem_mask);
else else
K056832_ram_word_w(space, (offset-0x1000/2)*2, data, mem_mask); k056832_ram_word_w(k056832, (offset - 0x1000 / 2) * 2, data, mem_mask);
} }
static WRITE16_HANDLER( gp2_vram_mirror_w ) static WRITE16_HANDLER( gp2_vram_mirror_w )
{ {
const device_config *k056832 = devtag_get_device(space->machine, "k056832");
if (offset < 0x1000 / 2) if (offset < 0x1000 / 2)
K056832_ram_word_w(space, offset*2, data, mem_mask); k056832_ram_word_w(k056832, offset * 2, data, mem_mask);
else else
K056832_ram_word_w(space, (offset-0x1000/2)*2+1, data, mem_mask); k056832_ram_word_w(k056832, (offset - 0x1000 / 2) * 2 + 1, data, mem_mask);
} }
@ -334,8 +345,8 @@ static ADDRESS_MAP_START( qdrmfgp_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(&workram) /* work ram */ AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(&workram) /* work ram */
AM_RANGE(0x180000, 0x183fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* backup ram */ AM_RANGE(0x180000, 0x183fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* backup ram */
AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x300000, 0x30003f) AM_WRITE(K056832_word_w) /* video reg */ AM_RANGE(0x300000, 0x30003f) AM_DEVWRITE("k056832", k056832_word_w) /* video reg */
AM_RANGE(0x320000, 0x32001f) AM_READWRITE(K053252_word_r,K053252_word_w) /* ccu */ AM_RANGE(0x320000, 0x32001f) AM_DEVREADWRITE("k053252", k053252_word_r, k053252_word_w) /* ccu */
AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service sw */ AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service sw */
AM_RANGE(0x340000, 0x340001) AM_READ_PORT("340000") /* inputport */ AM_RANGE(0x340000, 0x340001) AM_READ_PORT("340000") /* inputport */
AM_RANGE(0x350000, 0x350001) AM_WRITENOP /* unknown */ AM_RANGE(0x350000, 0x350001) AM_WRITENOP /* unknown */
@ -343,8 +354,8 @@ static ADDRESS_MAP_START( qdrmfgp_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x370000, 0x370001) AM_WRITE(gp_control_w) /* control reg */ AM_RANGE(0x370000, 0x370001) AM_WRITE(gp_control_w) /* control reg */
AM_RANGE(0x380000, 0x380001) AM_WRITENOP /* Watchdog */ AM_RANGE(0x380000, 0x380001) AM_WRITENOP /* Watchdog */
AM_RANGE(0x800000, 0x80045f) AM_DEVREADWRITE8("konami", k054539_r, k054539_w, 0x00ff) /* sound regs */ AM_RANGE(0x800000, 0x80045f) AM_DEVREADWRITE8("konami", k054539_r, k054539_w, 0x00ff) /* sound regs */
AM_RANGE(0x880000, 0x881fff) AM_READWRITE(K056832_ram_word_r,K056832_ram_word_w) /* vram */ AM_RANGE(0x880000, 0x881fff) AM_DEVREADWRITE("k056832", k056832_ram_word_r, k056832_ram_word_w) /* vram */
AM_RANGE(0x882000, 0x883fff) AM_READWRITE(K056832_ram_word_r,K056832_ram_word_w) /* vram (mirror) */ AM_RANGE(0x882000, 0x883fff) AM_DEVREADWRITE("k056832", k056832_ram_word_r, k056832_ram_word_w) /* vram (mirror) */
AM_RANGE(0x900000, 0x901fff) AM_READ(v_rom_r) /* gfxrom through */ AM_RANGE(0x900000, 0x901fff) AM_READ(v_rom_r) /* gfxrom through */
AM_RANGE(0xa00000, 0xa0000f) AM_DEVREADWRITE("ide", ide_std_r,ide_std_w) /* IDE control regs */ AM_RANGE(0xa00000, 0xa0000f) AM_DEVREADWRITE("ide", ide_std_r,ide_std_w) /* IDE control regs */
AM_RANGE(0xa4000c, 0xa4000f) AM_DEVREADWRITE("ide", ide_alt_r,ide_alt_w) /* IDE status control reg */ AM_RANGE(0xa4000c, 0xa4000f) AM_DEVREADWRITE("ide", ide_alt_r,ide_alt_w) /* IDE status control reg */
@ -357,8 +368,8 @@ static ADDRESS_MAP_START( qdrmfgp2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x110fff) AM_RAM AM_BASE(&workram) /* work ram */ AM_RANGE(0x100000, 0x110fff) AM_RAM AM_BASE(&workram) /* work ram */
AM_RANGE(0x180000, 0x183fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* backup ram */ AM_RANGE(0x180000, 0x183fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* backup ram */
AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x300000, 0x30003f) AM_WRITE(K056832_word_w) /* video reg */ AM_RANGE(0x300000, 0x30003f) AM_DEVWRITE("k053252", k056832_word_w) /* video reg */
AM_RANGE(0x320000, 0x32001f) AM_READWRITE(K053252_word_r,K053252_word_w) /* ccu */ AM_RANGE(0x320000, 0x32001f) AM_DEVREADWRITE("k053252", k053252_word_r, k053252_word_w) /* ccu */
AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service */ AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service */
AM_RANGE(0x340000, 0x340001) AM_READ_PORT("340000") /* inputport */ AM_RANGE(0x340000, 0x340001) AM_READ_PORT("340000") /* inputport */
AM_RANGE(0x350000, 0x350001) AM_WRITENOP /* unknown */ AM_RANGE(0x350000, 0x350001) AM_WRITENOP /* unknown */
@ -581,6 +592,24 @@ static const k054539_interface k054539_config =
* *
*************************************/ *************************************/
static const k056832_interface qdrmfgp_k056832_intf =
{
"gfx1", 0,
K056832_BPP_4dj,
1, 0,
KONAMI_ROM_DEINTERLEAVE_NONE,
qdrmfgp_tile_callback, "none"
};
static const k056832_interface qdrmfgp2_k056832_intf =
{
"gfx1", 0,
K056832_BPP_4dj,
1, 0,
KONAMI_ROM_DEINTERLEAVE_NONE,
qdrmfgp2_tile_callback, "none"
};
static MACHINE_START( qdrmfgp ) static MACHINE_START( qdrmfgp )
{ {
state_save_register_global(machine, control); state_save_register_global(machine, control);
@ -642,6 +671,9 @@ static MACHINE_DRIVER_START( qdrmfgp )
MDRV_VIDEO_START(qdrmfgp) MDRV_VIDEO_START(qdrmfgp)
MDRV_VIDEO_UPDATE(qdrmfgp) MDRV_VIDEO_UPDATE(qdrmfgp)
MDRV_K056832_ADD("k056832", qdrmfgp_k056832_intf)
MDRV_K053252_ADD("k053252")
/* sound hardware */ /* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@ -677,6 +709,9 @@ static MACHINE_DRIVER_START( qdrmfgp2 )
MDRV_VIDEO_START(qdrmfgp2) MDRV_VIDEO_START(qdrmfgp2)
MDRV_VIDEO_UPDATE(qdrmfgp) MDRV_VIDEO_UPDATE(qdrmfgp)
MDRV_K056832_ADD("k056832", qdrmfgp2_k056832_intf)
MDRV_K053252_ADD("k053252")
/* sound hardware */ /* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")

39
src/mame/video/qdrmfgp.c
View File

@ -5,18 +5,18 @@
***************************************************************************/ ***************************************************************************/
#include "driver.h" #include "driver.h"
#include "video/konamiic.h" #include "video/konicdev.h"
int qdrmfgp_get_palette(void); int qdrmfgp_get_palette(void);
static void tile_callback(int layer, int *code, int *color, int *flags) void qdrmfgp_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags)
{ {
*color = ((*color>>2) & 0x0f) | qdrmfgp_get_palette(); *color = ((*color>>2) & 0x0f) | qdrmfgp_get_palette();
} }
static void gp2_tile_callback(int layer, int *code, int *color, int *flags) void qdrmfgp2_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags)
{ {
*color = (*color>>1) & 0x7f; *color = (*color>>1) & 0x7f;
} }
@ -29,26 +29,26 @@ static void gp2_tile_callback(int layer, int *code, int *color, int *flags)
VIDEO_START( qdrmfgp ) VIDEO_START( qdrmfgp )
{ {
K056832_vh_start(machine, "gfx1", K056832_BPP_4dj, 1, NULL, tile_callback, 0); const device_config *k056832 = devtag_get_device(machine, "k056832");
K056832_set_LayerAssociation(0); k056832_set_layer_association(k056832, 0);
K056832_set_LayerOffset(0, 2, 0); k056832_set_layer_offs(k056832, 0, 2, 0);
K056832_set_LayerOffset(1, 4, 0); k056832_set_layer_offs(k056832, 1, 4, 0);
K056832_set_LayerOffset(2, 6, 0); k056832_set_layer_offs(k056832, 2, 6, 0);
K056832_set_LayerOffset(3, 8, 0); k056832_set_layer_offs(k056832, 3, 8, 0);
} }
VIDEO_START( qdrmfgp2 ) VIDEO_START( qdrmfgp2 )
{ {
K056832_vh_start(machine, "gfx1", K056832_BPP_4dj, 1, NULL, gp2_tile_callback, 0); const device_config *k056832 = devtag_get_device(machine, "k056832");
K056832_set_LayerAssociation(0); k056832_set_layer_association(k056832, 0);
K056832_set_LayerOffset(0, 3, 1); k056832_set_layer_offs(k056832, 0, 3, 1);
K056832_set_LayerOffset(1, 5, 1); k056832_set_layer_offs(k056832, 1, 5, 1);
K056832_set_LayerOffset(2, 7, 1); k056832_set_layer_offs(k056832, 2, 7, 1);
K056832_set_LayerOffset(3, 9, 1); k056832_set_layer_offs(k056832, 3, 9, 1);
} }
/*************************************************************************** /***************************************************************************
@ -59,11 +59,12 @@ VIDEO_START( qdrmfgp2 )
VIDEO_UPDATE( qdrmfgp ) VIDEO_UPDATE( qdrmfgp )
{ {
const device_config *k056832 = devtag_get_device(screen->machine, "k056832");
bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
K056832_tilemap_draw(screen->machine, bitmap,cliprect, 3, 0, 1); k056832_tilemap_draw(k056832, bitmap, cliprect, 3, 0, 1);
K056832_tilemap_draw(screen->machine, bitmap,cliprect, 2, 0, 2); k056832_tilemap_draw(k056832, bitmap, cliprect, 2, 0, 2);
K056832_tilemap_draw(screen->machine, bitmap,cliprect, 1, 0, 4); k056832_tilemap_draw(k056832, bitmap, cliprect, 1, 0, 4);
K056832_tilemap_draw(screen->machine, bitmap,cliprect, 0, 0, 8); k056832_tilemap_draw(k056832, bitmap, cliprect, 0, 0, 8);
return 0; return 0;
} }