From 8b5afcb638c0b8f2f35765b5ef81834520daa05c Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Fri, 23 Oct 2009 12:38:29 +0000 Subject: [PATCH] Added helper macro for CDP1869. --- src/emu/sound/cdp1869.h | 14 ++++++++++++++ src/mame/video/cidelsa.c | 27 ++++++--------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h index 4025f285b3a..0bc485adef6 100644 --- a/src/emu/sound/cdp1869.h +++ b/src/emu/sound/cdp1869.h @@ -92,6 +92,20 @@ MDRV_DEVICE_CONFIG_DATAPTR(sound_config, type, SOUND_CDP1869) \ MDRV_DEVICE_CONFIG(_config) +#define MDRV_CDP1869_SCREEN_PAL_ADD(_tag, _clock) \ + MDRV_SCREEN_ADD(_tag, RASTER) \ + MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \ + MDRV_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_PAL, CDP1869_SCANLINE_VBLANK_END_PAL, CDP1869_SCANLINE_VBLANK_START_PAL) \ + MDRV_PALETTE_LENGTH(8+64) \ + MDRV_PALETTE_INIT(cdp1869) + +#define MDRV_CDP1869_SCREEN_NTSC_ADD(_tag, _clock) \ + MDRV_SCREEN_ADD(_tag, RASTER) \ + MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \ + MDRV_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_NTSC, CDP1869_SCANLINE_VBLANK_END_NTSC, CDP1869_SCANLINE_VBLANK_START_NTSC) \ + MDRV_PALETTE_LENGTH(8+64) \ + MDRV_PALETTE_INIT(cdp1869) + #define CDP1869_INTERFACE(_name) \ const cdp1869_interface (_name) = diff --git a/src/mame/video/cidelsa.c b/src/mame/video/cidelsa.c index 7136426a9ba..8bff95dfc0b 100644 --- a/src/mame/video/cidelsa.c +++ b/src/mame/video/cidelsa.c @@ -261,51 +261,36 @@ static const ay8910_interface ay8910_config = /* Machine Drivers */ MACHINE_DRIVER_START( destryer_video ) - MDRV_PALETTE_LENGTH(CDP1869_PALETTE_LENGTH) - MDRV_PALETTE_INIT(cdp1869) + MDRV_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, DESTRYER_CHR2) + MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) MDRV_VIDEO_START(cidelsa) MDRV_VIDEO_UPDATE(cidelsa) - MDRV_SCREEN_ADD(SCREEN_TAG, RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MDRV_SCREEN_RAW_PARAMS(DESTRYER_CHR2, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_PAL, CDP1869_SCANLINE_VBLANK_END_PAL, CDP1869_SCANLINE_VBLANK_START_PAL) - MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) - MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_CDP1869_ADD(CDP1869_TAG, DESTRYER_CHR2, destryer_cdp1869_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END MACHINE_DRIVER_START( altair_video ) - MDRV_PALETTE_LENGTH(CDP1869_PALETTE_LENGTH) - MDRV_PALETTE_INIT(cdp1869) + MDRV_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, ALTAIR_CHR2) + MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) MDRV_VIDEO_START(cidelsa) MDRV_VIDEO_UPDATE(cidelsa) - MDRV_SCREEN_ADD(SCREEN_TAG, RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MDRV_SCREEN_RAW_PARAMS(ALTAIR_CHR2, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_PAL, CDP1869_SCANLINE_VBLANK_END_PAL, CDP1869_SCANLINE_VBLANK_START_PAL) - MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) - MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_CDP1869_ADD(CDP1869_TAG, ALTAIR_CHR2, altair_cdp1869_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END MACHINE_DRIVER_START( draco_video ) - MDRV_PALETTE_LENGTH(CDP1869_PALETTE_LENGTH) - MDRV_PALETTE_INIT(cdp1869) + MDRV_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, DRACO_CHR2) + MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.360, 0.024) MDRV_VIDEO_START(draco) MDRV_VIDEO_UPDATE(cidelsa) - MDRV_SCREEN_ADD(SCREEN_TAG, RASTER) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MDRV_SCREEN_RAW_PARAMS(DRACO_CHR2, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_PAL, CDP1869_SCANLINE_VBLANK_END_PAL, CDP1869_SCANLINE_VBLANK_START_PAL) - MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.360, 0.024) - MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_CDP1869_ADD(CDP1869_TAG, DRACO_CHR2, draco_cdp1869_intf) MDRV_SOUND_ADD(AY8910_TAG, AY8910, DRACO_SND_CHR1)