diff options
Diffstat (limited to 'src')
2338 files changed, 5225 insertions, 5026 deletions
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index db25ed5855b..5dad8552db7 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -1078,7 +1078,7 @@ void tms34010_get_display_params(device_t *cpu, tms34010_display_params *params) } -VIDEO_UPDATE( tms340x0 ) +SCREEN_UPDATE( tms340x0 ) { pen_t blackpen = get_black_pen(screen->machine); tms34010_display_params params; diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/emu/cpu/tms34010/tms34010.h index f53323f34a6..44c6d512d4e 100644 --- a/src/emu/cpu/tms34010/tms34010.h +++ b/src/emu/cpu/tms34010/tms34010.h @@ -204,7 +204,7 @@ struct _tms34010_config /* PUBLIC FUNCTIONS - 34010 */ -VIDEO_UPDATE( tms340x0 ); +SCREEN_UPDATE( tms340x0 ); void tms34010_get_display_params(device_t *cpu, tms34010_display_params *params); DECLARE_LEGACY_CPU_DEVICE(TMS34010, tms34010); diff --git a/src/emu/machine.c b/src/emu/machine.c index b437c762ee6..ec7e0b145d3 100644 --- a/src/emu/machine.c +++ b/src/emu/machine.c @@ -942,8 +942,7 @@ running_machine::logerror_callback_item::logerror_callback_item(logerror_callbac driver_device_config_base::driver_device_config_base(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner) : device_config(mconfig, type, "Driver Device", tag, owner, 0), m_game(NULL), - m_palette_init(NULL), - m_video_update(NULL) + m_palette_init(NULL) { memset(m_callbacks, 0, sizeof(m_callbacks)); } @@ -986,18 +985,6 @@ void driver_device_config_base::static_set_palette_init(device_config *device, p //------------------------------------------------- -// static_set_video_update - set the legacy -// video update callback in the device -// configuration -//------------------------------------------------- - -void driver_device_config_base::static_set_video_update(device_config *device, video_update_func callback) -{ - downcast<driver_device_config_base *>(device)->m_video_update = callback; -} - - -//------------------------------------------------- // rom_region - return a pointer to the ROM // regions specified for the current game //------------------------------------------------- @@ -1130,10 +1117,8 @@ void driver_device::video_reset() // calls to the legacy video_update function //------------------------------------------------- -bool driver_device::video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) +bool driver_device::screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) { - if (m_config.m_video_update != NULL) - return (*m_config.m_video_update)(&screen, &bitmap, &cliprect); return 0; } @@ -1143,10 +1128,8 @@ bool driver_device::video_update(screen_device &screen, bitmap_t &bitmap, const // calls to the legacy video_eof function //------------------------------------------------- -void driver_device::video_eof() +void driver_device::screen_eof() { - if (m_config.m_callbacks[driver_device_config_base::CB_VIDEO_EOF] != NULL) - (*m_config.m_callbacks[driver_device_config_base::CB_VIDEO_EOF])(&m_machine); } diff --git a/src/emu/machine.h b/src/emu/machine.h index 3bd28db7084..c67dcfed88f 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -139,13 +139,6 @@ const int DEBUG_FLAG_OSD_ENABLED = 0x00001000; // The OSD debugger is enabled #define PALETTE_INIT(name) void PALETTE_INIT_NAME(name)(running_machine *machine, const UINT8 *color_prom) #define PALETTE_INIT_CALL(name) PALETTE_INIT_NAME(name)(machine, color_prom) -#define VIDEO_EOF_NAME(name) video_eof_##name -#define VIDEO_EOF(name) void VIDEO_EOF_NAME(name)(running_machine *machine) -#define VIDEO_EOF_CALL(name) VIDEO_EOF_NAME(name)(machine) - -#define VIDEO_UPDATE_NAME(name) video_update_##name -#define VIDEO_UPDATE(name) UINT32 VIDEO_UPDATE_NAME(name)(screen_device *screen, bitmap_t *bitmap, const rectangle *cliprect) -#define VIDEO_UPDATE_CALL(name) VIDEO_UPDATE_NAME(name)(screen, bitmap, cliprect) // NULL versions @@ -156,8 +149,6 @@ const int DEBUG_FLAG_OSD_ENABLED = 0x00001000; // The OSD debugger is enabled #define video_start_0 NULL #define video_reset_0 NULL #define palette_init_0 NULL -#define video_eof_0 NULL -#define video_update_0 NULL @@ -208,7 +199,6 @@ typedef tagged_list<memory_region> region_list; // legacy callback functions typedef void (*legacy_callback_func)(running_machine *machine); typedef void (*palette_init_func)(running_machine *machine, const UINT8 *color_prom); -typedef UINT32 (*video_update_func)(screen_device *screen, bitmap_t *bitmap, const rectangle *cliprect); @@ -551,7 +541,6 @@ public: CB_SOUND_RESET, CB_VIDEO_START, CB_VIDEO_RESET, - CB_VIDEO_EOF, CB_COUNT }; @@ -559,7 +548,6 @@ public: static void static_set_game(device_config *device, const game_driver *game); static void static_set_callback(device_config *device, callback_type type, legacy_callback_func callback); static void static_set_palette_init(device_config *device, palette_init_func callback); - static void static_set_video_update(device_config *device, video_update_func callback); protected: // optional information overrides @@ -570,7 +558,6 @@ protected: legacy_callback_func m_callbacks[CB_COUNT]; // generic legacy callbacks palette_init_func m_palette_init; // one-time palette init callback - video_update_func m_video_update; // video update callback }; @@ -614,8 +601,8 @@ public: virtual ~driver_device(); // additional video helpers - virtual bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); - virtual void video_eof(); + virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); + virtual void screen_eof(); protected: // helpers called at startup diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h index b96cdb91933..17b9a9d0ae1 100644 --- a/src/emu/machine/laserdsc.h +++ b/src/emu/machine/laserdsc.h @@ -77,7 +77,7 @@ struct _laserdisc_config const char * screen; /* overlay information */ - video_update_func overupdate; + screen_update_func overupdate; UINT32 overwidth, overheight, overformat; rectangle overclip; float overposx, overposy; @@ -103,7 +103,7 @@ struct _laserdisc_config MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, audio, _func) #define MCFG_LASERDISC_OVERLAY(_update, _width, _height, _format) \ - MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, overupdate, VIDEO_UPDATE_NAME(_update)) \ + MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, overupdate, SCREEN_UPDATE_NAME(_update)) \ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overwidth, _width) \ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overheight, _height) \ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overformat, _format) @@ -126,20 +126,20 @@ struct _laserdisc_config /* use these to add laserdisc screens with proper video update parameters */ #define MCFG_LASERDISC_SCREEN_ADD_NTSC(_tag, _overlayformat) \ MCFG_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \ - MCFG_VIDEO_UPDATE(laserdisc) \ \ MCFG_SCREEN_ADD(_tag, RASTER) \ MCFG_SCREEN_FORMAT(_overlayformat) \ MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz*2, 910, 0, 704, 525, 44, 524) \ + MCFG_SCREEN_UPDATE(laserdisc) \ /* not correct yet; fix me... */ #define MCFG_LASERDISC_SCREEN_ADD_PAL(_tag, _format) \ MCFG_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \ - MCFG_VIDEO_UPDATE(laserdisc) \ \ MCFG_SCREEN_ADD(_tag, RASTER) \ MCFG_SCREEN_FORMAT(_format) \ MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 910, 0, 704, 525.0/2, 0, 480/2) \ + MCFG_SCREEN_UPDATE(laserdisc) \ @@ -196,7 +196,7 @@ void laserdisc_video_enable(device_t *device, int enable); void laserdisc_overlay_enable(device_t *device, int enable); /* video update callback */ -VIDEO_UPDATE( laserdisc ); +SCREEN_UPDATE( laserdisc ); diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c index 25d12396b19..b7e540ca0ab 100644 --- a/src/emu/machine/ldcore.c +++ b/src/emu/machine/ldcore.c @@ -1212,7 +1212,7 @@ void laserdisc_overlay_enable(device_t *device, int enable) video update callback -------------------------------------------------*/ -VIDEO_UPDATE( laserdisc ) +SCREEN_UPDATE( laserdisc ) { device_t *laserdisc = screen->machine->m_devicelist.first(LASERDISC); if (laserdisc != NULL) diff --git a/src/emu/machine/s3c2400.c b/src/emu/machine/s3c2400.c index 56567d2b49e..ee5de6ac610 100644 --- a/src/emu/machine/s3c2400.c +++ b/src/emu/machine/s3c2400.c @@ -37,7 +37,7 @@ VIDEO_START( s3c2400 ) s3c24xx_video_start( device, machine); } -VIDEO_UPDATE( s3c2400 ) +SCREEN_UPDATE( s3c2400 ) { device_t *device = screen->machine->device( S3C2400_TAG); return s3c24xx_video_update( device, screen, bitmap, cliprect); diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h index 0362e51c70b..e3f930dcf82 100644 --- a/src/emu/machine/s3c2400.h +++ b/src/emu/machine/s3c2400.h @@ -92,7 +92,7 @@ struct _s3c2400_interface DEVICE_GET_INFO( s3c2400 ); VIDEO_START( s3c2400 ); -VIDEO_UPDATE( s3c2400 ); +SCREEN_UPDATE( s3c2400 ); void s3c2400_uart_fifo_w( device_t *device, int uart, UINT8 data); diff --git a/src/emu/machine/s3c2410.c b/src/emu/machine/s3c2410.c index d3e407563c0..a401f6b37ec 100644 --- a/src/emu/machine/s3c2410.c +++ b/src/emu/machine/s3c2410.c @@ -37,7 +37,7 @@ VIDEO_START( s3c2410 ) s3c24xx_video_start( device, machine); } -VIDEO_UPDATE( s3c2410 ) +SCREEN_UPDATE( s3c2410 ) { device_t *device = screen->machine->device( S3C2410_TAG); return s3c24xx_video_update( device, screen, bitmap, cliprect); diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h index de09cbd89a4..65e07951941 100644 --- a/src/emu/machine/s3c2410.h +++ b/src/emu/machine/s3c2410.h @@ -105,7 +105,7 @@ struct _s3c2410_interface DEVICE_GET_INFO( s3c2410 ); VIDEO_START( s3c2410 ); -VIDEO_UPDATE( s3c2410 ); +SCREEN_UPDATE( s3c2410 ); void s3c2410_uart_fifo_w( device_t *device, int uart, UINT8 data); void s3c2410_touch_screen( device_t *device, int state); diff --git a/src/emu/machine/s3c2440.c b/src/emu/machine/s3c2440.c index 046ce4eafec..2729adf82f1 100644 --- a/src/emu/machine/s3c2440.c +++ b/src/emu/machine/s3c2440.c @@ -37,7 +37,7 @@ VIDEO_START( s3c2440 ) s3c24xx_video_start( device, machine); } -VIDEO_UPDATE( s3c2440 ) +SCREEN_UPDATE( s3c2440 ) { device_t *device = screen->machine->device( S3C2440_TAG); return s3c24xx_video_update( device, screen, bitmap, cliprect); diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h index 468336e8470..0e3b81f9203 100644 --- a/src/emu/machine/s3c2440.h +++ b/src/emu/machine/s3c2440.h @@ -102,7 +102,7 @@ struct _s3c2440_interface DEVICE_GET_INFO( s3c2440 ); VIDEO_START( s3c2440 ); -VIDEO_UPDATE( s3c2440 ); +SCREEN_UPDATE( s3c2440 ); void s3c2440_uart_fifo_w( device_t *device, int uart, UINT8 data); void s3c2440_touch_screen( device_t *device, int state); diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index fa5f019d773..4744ba73599 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -277,12 +277,6 @@ device_config *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_config #define MCFG_VIDEO_RESET(_func) \ driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_VIDEO_RESET, VIDEO_RESET_NAME(_func)); \ -#define MCFG_VIDEO_EOF(_func) \ - driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_VIDEO_EOF, VIDEO_EOF_NAME(_func)); \ - -#define MCFG_VIDEO_UPDATE(_func) \ - driver_device_config_base::static_set_video_update(owner, VIDEO_UPDATE_NAME(_func)); \ - // add/remove devices #define MCFG_DEVICE_ADD(_tag, _type, _clock) \ diff --git a/src/emu/screen.c b/src/emu/screen.c index 37005cb91ca..8432c6856a4 100644 --- a/src/emu/screen.c +++ b/src/emu/screen.c @@ -83,7 +83,9 @@ screen_device_config::screen_device_config(const machine_config &mconfig, const m_xoffset(0.0f), m_yoffset(0.0f), m_xscale(1.0f), - m_yscale(1.0f) + m_yscale(1.0f), + m_screen_update(NULL), + m_screen_eof(NULL) { } @@ -270,6 +272,34 @@ bool screen_device_config::device_validity_check(core_options &options, const ga + +//------------------------------------------------- +// static_set_screen_update - set the legacy +// screen update callback in the device +// configuration +//------------------------------------------------- + +void screen_device_config::static_set_screen_update(device_config *device, screen_update_func callback) +{ + assert(device != NULL); + downcast<screen_device_config *>(device)->m_screen_update = callback; +} + + +//------------------------------------------------- +// static_set_screen_eof - set the legacy +// screen eof callback in the device +// configuration +//------------------------------------------------- + +void screen_device_config::static_set_screen_eof(device_config *device, screen_eof_func callback) +{ + assert(device != NULL); + downcast<screen_device_config *>(device)->m_screen_eof = callback; +} + + + //************************************************************************** // SCREEN DEVICE //************************************************************************** @@ -619,7 +649,7 @@ bool screen_device::update_partial(int scanline) g_profiler.start(PROFILER_VIDEO); LOG_PARTIAL_UPDATES(("updating %d-%d\n", clip.min_y, clip.max_y)); - flags = machine->driver_data<driver_device>()->video_update(*this, *m_bitmap[m_curbitmap], clip); + flags = screen_update(*m_bitmap[m_curbitmap], clip); m_partial_updates_this_frame++; g_profiler.stop(); @@ -1071,3 +1101,33 @@ void screen_device::load_effect_overlay(const char *filename) else mame_printf_warning("Unable to load effect PNG file '%s'\n", fullname.cstr()); } + +//------------------------------------------------- +// screen_update - default implementation which +// calls to the legacy screen_update function +//------------------------------------------------- + +bool screen_device::screen_update(bitmap_t &bitmap, const rectangle &cliprect) +{ + if (m_config.m_screen_update != NULL) { + return (*m_config.m_screen_update)(this, &bitmap, &cliprect); + } else { + m_machine.driver_data<driver_device>()->screen_update(*this, bitmap, cliprect); + } + return 0; +} + +//------------------------------------------------- +// screen_eof - default implementation which +// calls to the legacy screen_update function +//------------------------------------------------- + +void screen_device::screen_eof() +{ + if (m_config.m_screen_eof != NULL) { + return (*m_config.m_screen_eof)(this, machine); + } else { + m_machine.driver_data<driver_device>()->screen_eof(); + } +} + diff --git a/src/emu/screen.h b/src/emu/screen.h index 2177b6dd732..ecd98b1904d 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -77,6 +77,8 @@ extern const device_type SCREEN; // callback that is called to notify of a change in the VBLANK state typedef void (*vblank_state_changed_func)(screen_device &device, void *param, bool vblank_state); +typedef UINT32 (*screen_update_func)(screen_device *screen, bitmap_t *bitmap, const rectangle *cliprect); +typedef void (*screen_eof_func)(screen_device *screen, running_machine *machine); // ======================> screen_device_config @@ -107,6 +109,7 @@ public: float yoffset() const { return m_yoffset; } float xscale() const { return m_xscale; } float yscale() const { return m_yscale; } + bool have_screen_update() const { return m_screen_update != NULL; } // inline configuration helpers static void static_set_format(device_config *device, bitmap_format format); @@ -117,6 +120,8 @@ public: static void static_set_size(device_config *device, UINT16 width, UINT16 height); static void static_set_visarea(device_config *device, INT16 minx, INT16 maxx, INT16 miny, INT16 maxy); static void static_set_default_position(device_config *device, double xscale, double xoffs, double yscale, double yoffs); + static void static_set_screen_update(device_config *device, screen_update_func callback); + static void static_set_screen_eof(device_config *device, screen_eof_func callback); private: // device_config overrides @@ -132,6 +137,8 @@ private: bitmap_format m_format; // bitmap format float m_xoffset, m_yoffset; // default X/Y offsets float m_xscale, m_yscale; // default X/Y scale factor + screen_update_func m_screen_update; // screen update callback + screen_eof_func m_screen_eof; // screen eof callback }; @@ -157,6 +164,8 @@ public: const rectangle &visible_area() const { return m_visarea; } bitmap_format format() const { return m_config.m_format; } render_container &container() const { assert(m_container != NULL); return *m_container; } + bool screen_update(bitmap_t &bitmap, const rectangle &cliprect); + void screen_eof(); // dynamic configuration void configure(int width, int height, const rectangle &visarea, attoseconds_t frame_period); @@ -269,6 +278,13 @@ private: //************************************************************************** // SCREEN DEVICE CONFIGURATION MACROS //************************************************************************** +#define SCREEN_UPDATE_NAME(name) screen_update_##name +#define SCREEN_UPDATE(name) UINT32 SCREEN_UPDATE_NAME(name)(screen_device *screen, bitmap_t *bitmap, const rectangle *cliprect) +#define SCREEN_UPDATE_CALL(name) SCREEN_UPDATE_NAME(name)(screen, bitmap, cliprect) + +#define SCREEN_EOF_NAME(name) screen_eof_##name +#define SCREEN_EOF(name) void SCREEN_EOF_NAME(name)(screen_device *screen, running_machine *machine) +#define SCREEN_EOF_CALL(name) SCREEN_EOF_NAME(name)(screen, machine) #define MCFG_SCREEN_ADD(_tag, _type) \ MCFG_DEVICE_ADD(_tag, SCREEN, 0) \ @@ -301,5 +317,10 @@ private: #define MCFG_SCREEN_DEFAULT_POSITION(_xscale, _xoffs, _yscale, _yoffs) \ screen_device_config::static_set_default_position(device, _xscale, _xoffs, _yscale, _yoffs); \ +#define MCFG_SCREEN_UPDATE(_func) \ + screen_device_config::static_set_screen_update(device, SCREEN_UPDATE_NAME(_func)); \ + +#define MCFG_SCREEN_EOF(_func) \ + screen_device_config::static_set_screen_eof(device, SCREEN_EOF_NAME(_func)); \ #endif /* __SCREEN_H__ */ diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index b73435ad6c3..9c83c91ff47 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -199,7 +199,7 @@ tilemap_set_transparent_pen(tmap, 0); } - VIDEO_UPDATE( mydriver ) + SCREEN_UPDATE( mydriver ) { // draw the tilemap first, fully opaque since it needs to // erase all previous pixels diff --git a/src/emu/video.c b/src/emu/video.c index ae5a4e08a60..425c86020eb 100644 --- a/src/emu/video.c +++ b/src/emu/video.c @@ -272,7 +272,8 @@ void video_manager::frame_update(bool debug) else { g_profiler.start(PROFILER_VIDEO); - m_machine.driver_data<driver_device>()->video_eof(); + for (screen_device *screen = m_machine.first_screen(); screen != NULL; screen = screen->next_screen()) + screen->screen_eof(); g_profiler.stop(); } } diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c index 86fd1eb179d..a654f957f59 100644 --- a/src/emu/video/generic.c +++ b/src/emu/video/generic.c @@ -281,11 +281,11 @@ VIDEO_START( generic_bitmapped ) /*------------------------------------------------- - VIDEO_UPDATE( generic_bitmapped ) - blast the + SCREEN_UPDATE( generic_bitmapped ) - blast the generic bitmap to the screen -------------------------------------------------*/ -VIDEO_UPDATE( generic_bitmapped ) +SCREEN_UPDATE( generic_bitmapped ) { copybitmap(bitmap, screen->machine->generic.tmpbitmap, 0, 0, 0, 0, cliprect); return 0; diff --git a/src/emu/video/generic.h b/src/emu/video/generic.h index 5eeb4facfc4..90796c75591 100644 --- a/src/emu/video/generic.h +++ b/src/emu/video/generic.h @@ -44,7 +44,7 @@ void generic_video_init(running_machine *machine); VIDEO_START( generic_bitmapped ); /* generic video update to blit a temporary bitmap */ -VIDEO_UPDATE( generic_bitmapped ); +SCREEN_UPDATE( generic_bitmapped ); diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index 40f5f5e7789..111fc843e96 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -189,7 +189,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_vga ) MCFG_VIDEO_START(vga) MCFG_VIDEO_RESET(vga) - MCFG_VIDEO_UPDATE(pc_video) + MCFG_SCREEN_UPDATE(pc_video) MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( pcvideo_pc1640 ) @@ -202,7 +202,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_pc1640 ) MCFG_VIDEO_START(ega) MCFG_VIDEO_RESET(ega) - MCFG_VIDEO_UPDATE(pc_video) + MCFG_SCREEN_UPDATE(pc_video) MACHINE_CONFIG_END /***************************************************************************/ diff --git a/src/emu/video/pc_video.c b/src/emu/video/pc_video.c index 9891af9b8d6..5293ffbf69e 100644 --- a/src/emu/video/pc_video.c +++ b/src/emu/video/pc_video.c @@ -58,7 +58,7 @@ void pc_video_start(running_machine *machine, -VIDEO_UPDATE( pc_video ) +SCREEN_UPDATE( pc_video ) { UINT32 rc = 0; int w = 0, h = 0; diff --git a/src/emu/video/pc_video.h b/src/emu/video/pc_video.h index 25611035797..2256ce59cbf 100644 --- a/src/emu/video/pc_video.h +++ b/src/emu/video/pc_video.h @@ -15,6 +15,6 @@ void pc_video_start(running_machine *machine, pc_video_update_proc (*choosevideomode)(running_machine *machine, int *width, int *height), size_t vramsize); -VIDEO_UPDATE( pc_video ); +SCREEN_UPDATE( pc_video ); #endif /* PC_VIDEO_H */ diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c index 5ee197dae0f..ce9e803b821 100644 --- a/src/emu/video/tms9928a.c +++ b/src/emu/video/tms9928a.c @@ -390,7 +390,7 @@ void TMS9928A_set_spriteslimit (int limit) { /* ** Updates the screen (the dMem memory area). */ -VIDEO_UPDATE( tms9928a ) +SCREEN_UPDATE( tms9928a ) { INT32 BackColour = tms.Regs[7] & 15; rgb_t oldcolor = palette_get_color(screen->machine, 0); @@ -825,11 +825,11 @@ MACHINE_CONFIG_FRAGMENT( tms9928a ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(LEFT_BORDER+32*8+RIGHT_BORDER, TOP_BORDER_60HZ+24*8+BOTTOM_BORDER_60HZ) MCFG_SCREEN_VISIBLE_AREA(LEFT_BORDER-12, LEFT_BORDER+32*8+12-1, TOP_BORDER_60HZ-9, TOP_BORDER_60HZ+24*8+9-1) + MCFG_SCREEN_UPDATE(tms9928a) MCFG_PALETTE_LENGTH(TMS9928A_PALETTE_SIZE) MCFG_PALETTE_INIT(tms9928a) MCFG_VIDEO_START(tms9928a) - MCFG_VIDEO_UPDATE(tms9928a) MACHINE_CONFIG_END diff --git a/src/emu/video/tms9928a.h b/src/emu/video/tms9928a.h index 1d8c72458f9..d5bd15af7bc 100644 --- a/src/emu/video/tms9928a.h +++ b/src/emu/video/tms9928a.h @@ -76,7 +76,7 @@ extern WRITE8_HANDLER (TMS9928A_register_w); ** Call this function to render the screen. */ extern VIDEO_START( tms9928a ); -extern VIDEO_UPDATE( tms9928a ); +extern SCREEN_UPDATE( tms9928a ); /* ** This next function must be called 50 (tms9929a) or 60 (tms99x8a) times per second, diff --git a/src/emu/video/vector.c b/src/emu/video/vector.c index 3f49048344a..4d8711bf3da 100644 --- a/src/emu/video/vector.c +++ b/src/emu/video/vector.c @@ -254,7 +254,7 @@ void vector_clear_list (void) } -VIDEO_UPDATE( vector ) +SCREEN_UPDATE( vector ) { UINT32 flags = PRIMFLAG_ANTIALIAS(options_get_bool(&screen->machine->options(), OPTION_ANTIALIAS) ? 1 : 0) | PRIMFLAG_BLENDMODE(BLENDMODE_ADD); const rectangle &visarea = screen->visible_area(); diff --git a/src/emu/video/vector.h b/src/emu/video/vector.h index 82940fad270..8d4fc7d8353 100644 --- a/src/emu/video/vector.h +++ b/src/emu/video/vector.h @@ -11,7 +11,7 @@ MAKE_RGB(pal4bit((c) >> 8), pal4bit((c) >> 4), pal4bit((c) >> 0)) VIDEO_START( vector ); -VIDEO_UPDATE( vector ); +SCREEN_UPDATE( vector ); void vector_clear_list(void); void vector_add_point(running_machine *machine, int x, int y, rgb_t color, int intensity); diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 1a985e1e06c..7424c8ebcc9 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -279,10 +279,10 @@ static MACHINE_CONFIG_START( 1942, _1942_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(1942) MCFG_PALETTE_INIT(1942) MCFG_VIDEO_START(1942) - MCFG_VIDEO_UPDATE(1942) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index 971eb6bc546..84788269afc 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -276,12 +276,13 @@ static MACHINE_CONFIG_START( 1943, _1943_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(1943) + MCFG_GFXDECODE(1943) MCFG_PALETTE_LENGTH(32*4+16*16+16*16+16*16) MCFG_PALETTE_INIT(1943) MCFG_VIDEO_START(1943) - MCFG_VIDEO_UPDATE(1943) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index b50fe5ff369..3eb783ccd2f 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -116,7 +116,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE(k3) +static SCREEN_UPDATE(k3) { k3_state *state = screen->machine->driver_data<k3_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -265,10 +265,11 @@ static MACHINE_CONFIG_START( k3, k3_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(k3) + MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(k3) - MCFG_VIDEO_UPDATE(k3) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index 7bb4224c33e..2c6c9c15955 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -91,7 +91,7 @@ public: } \ } -static VIDEO_UPDATE( drill ) +static SCREEN_UPDATE( drill ) { _2mindril_state *state = screen->machine->driver_data<_2mindril_state>(); bitmap_fill(bitmap, NULL, 0); @@ -458,10 +458,11 @@ static MACHINE_CONFIG_START( drill, _2mindril_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(128*16, 64*8) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239-16) + MCFG_SCREEN_UPDATE(drill) + MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(drill) - MCFG_VIDEO_UPDATE(drill) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index d60d9f401dd..efac5cc905c 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -1512,7 +1512,7 @@ static INPUT_PORTS_START( 39in1 ) PORT_SERVICE_NO_TOGGLE( 0x80000000, IP_ACTIVE_LOW ) INPUT_PORTS_END -static VIDEO_UPDATE( 39in1 ) +static SCREEN_UPDATE( 39in1 ) { _39in1_state *state = screen->machine->driver_data<_39in1_state>(); int x = 0; @@ -1596,13 +1596,13 @@ static MACHINE_CONFIG_START( 39in1, _39in1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(1024, 1024) MCFG_SCREEN_VISIBLE_AREA(0, 295, 0, 479) + MCFG_SCREEN_UPDATE(39in1) + MCFG_PALETTE_LENGTH(256) MCFG_MACHINE_START(39in1) MCFG_EEPROM_93C66B_ADD("eeprom") - MCFG_VIDEO_UPDATE(39in1) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("dac1", DMADAC, 0) diff --git a/src/mame/drivers/3super8.c b/src/mame/drivers/3super8.c index 4b8a394dca0..c3615979217 100644 --- a/src/mame/drivers/3super8.c +++ b/src/mame/drivers/3super8.c @@ -33,7 +33,7 @@ static VIDEO_START(3super8) } -static VIDEO_UPDATE(3super8) +static SCREEN_UPDATE(3super8) { return 0; } @@ -77,12 +77,12 @@ static MACHINE_CONFIG_START( 3super8, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-0-1) + MCFG_SCREEN_UPDATE(3super8) MCFG_GFXDECODE(3super8) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(3super8) - MCFG_VIDEO_UPDATE(3super8) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 4def0496215..c6e129c36ea 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -1094,12 +1094,13 @@ static MACHINE_CONFIG_START( 40love, fortyl_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(fortyl) + MCFG_GFXDECODE(40love) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(fortyl) MCFG_VIDEO_START(fortyl) - MCFG_VIDEO_UPDATE(fortyl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1151,12 +1152,13 @@ static MACHINE_CONFIG_START( undoukai, fortyl_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(fortyl) + MCFG_GFXDECODE(40love) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(fortyl) MCFG_VIDEO_START(fortyl) - MCFG_VIDEO_UPDATE(fortyl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c index 3322074741d..3afb73f2319 100644 --- a/src/mame/drivers/4enraya.c +++ b/src/mame/drivers/4enraya.c @@ -191,13 +191,14 @@ static MACHINE_CONFIG_START( 4enraya, _4enraya_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(4enraya) + MCFG_GFXDECODE(4enraya) MCFG_PALETTE_INIT(4enraya) MCFG_PALETTE_LENGTH(8) MCFG_VIDEO_START(4enraya) - MCFG_VIDEO_UPDATE(4enraya) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c index 0ddc36f686a..7d4c22e4cad 100644 --- a/src/mame/drivers/4roses.c +++ b/src/mame/drivers/4roses.c @@ -386,13 +386,13 @@ static MACHINE_CONFIG_START( 4roses, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((124+1)*4, (30+1)*8) /* guess. taken from funworld games */ MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* guess. taken from funworld games */ + MCFG_SCREEN_UPDATE(funworld) MCFG_GFXDECODE(4roses) MCFG_PALETTE_LENGTH(0x1000) MCFG_PALETTE_INIT(funworld) MCFG_VIDEO_START(funworld) - MCFG_VIDEO_UPDATE(funworld) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/8, mc6845_intf) /* 2MHz, guess */ diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c index d605887fa01..87b0db2f6db 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -506,7 +506,7 @@ static VIDEO_START(fclown) } -static VIDEO_UPDATE( fclown ) +static SCREEN_UPDATE( fclown ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -1050,13 +1050,13 @@ static MACHINE_CONFIG_START( fclown, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((39+1)*8, (31+1)*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(fclown) MCFG_GFXDECODE(fclown) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(fclown) MCFG_VIDEO_START(fclown) - MCFG_VIDEO_UPDATE(fclown) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */ diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 95c85d06ac7..00238b02058 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -394,7 +394,8 @@ static MACHINE_CONFIG_DERIVED( invadpt2, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(invadpt2) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(invadpt2) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -569,7 +570,8 @@ static MACHINE_CONFIG_DERIVED( cosmo, mw8080bw_root ) MCFG_MACHINE_START(extra_8080bw) /* video hardware */ - MCFG_VIDEO_UPDATE(cosmo) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(cosmo) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -798,7 +800,8 @@ static MACHINE_CONFIG_DERIVED( lrescue, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(invadpt2) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(invadpt2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -946,7 +949,8 @@ static MACHINE_CONFIG_DERIVED( rollingc, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(rollingc) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(rollingc) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -1063,7 +1067,8 @@ static MACHINE_CONFIG_DERIVED( schaser, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(schaser) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(schaser) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1131,7 +1136,8 @@ static MACHINE_CONFIG_DERIVED( schasercv, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(schasercv) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(schasercv) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -1211,7 +1217,8 @@ static MACHINE_CONFIG_DERIVED( sflush, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(sflush) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(sflush) MACHINE_CONFIG_END @@ -1317,7 +1324,8 @@ static MACHINE_CONFIG_DERIVED( lupin3, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(indianbt) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(indianbt) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -1336,7 +1344,8 @@ static MACHINE_CONFIG_DERIVED( lupin3a, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(lupin3) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(lupin3) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -1456,7 +1465,8 @@ static MACHINE_CONFIG_DERIVED( polaris, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(polaris) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(polaris) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1578,7 +1588,8 @@ static MACHINE_CONFIG_DERIVED( ballbomb, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(ballbomb) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(ballbomb) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -1751,7 +1762,8 @@ static MACHINE_CONFIG_DERIVED( indianbt, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(indianbt) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(indianbt) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -1824,7 +1836,8 @@ static MACHINE_CONFIG_DERIVED( steelwkr, mw8080bw_root ) MCFG_MB14241_ADD("mb14241") /* video hardware */ - MCFG_VIDEO_UPDATE(invadpt2) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(invadpt2) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -1959,7 +1972,7 @@ static MACHINE_CONFIG_DERIVED( shuttlei, mw8080bw_root ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1) - MCFG_VIDEO_UPDATE(shuttlei) + MCFG_SCREEN_UPDATE(shuttlei) /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) @@ -2139,7 +2152,8 @@ MACHINE_CONFIG_DERIVED( vortex, mw8080bw_root ) /* video hardware */ // TODO: replace with modified invaders color renderer code allowing midscanline color writes - MCFG_VIDEO_UPDATE(invaders) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(invaders) /* add shifter */ MCFG_MB14241_ADD("mb14241") diff --git a/src/mame/drivers/86lions.c b/src/mame/drivers/86lions.c index 0a8bf8e1e02..a350862e510 100644 --- a/src/mame/drivers/86lions.c +++ b/src/mame/drivers/86lions.c @@ -49,7 +49,7 @@ static VIDEO_START(lions) { } -static VIDEO_UPDATE(lions) +static SCREEN_UPDATE(lions) { _86lions_state *state = screen->machine->driver_data<_86lions_state>(); const gfx_element *gfx = screen->machine->gfx[0]; @@ -364,13 +364,13 @@ static MACHINE_CONFIG_START( lions, _86lions_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(304, 256) MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */ + MCFG_SCREEN_UPDATE(lions) MCFG_GFXDECODE(lions) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(lions) MCFG_VIDEO_START(lions) - MCFG_VIDEO_UPDATE(lions) MCFG_VIA6522_ADD("via6522_0", MAIN_CLOCK/12, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */ diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 4919bbb4da9..4ad574704dc 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -399,14 +399,14 @@ static MACHINE_CONFIG_START( 88games, _88games_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(88games) + MCFG_PALETTE_LENGTH(2048) MCFG_K052109_ADD("k052109", _88games_k052109_intf) MCFG_K051960_ADD("k051960", _88games_k051960_intf) MCFG_K051316_ADD("k051316", _88games_k051316_intf) - MCFG_VIDEO_UPDATE(88games) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index bf593809f20..492a587fa48 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -82,7 +82,7 @@ static VIDEO_START( ace ) gfx_element_set_source(machine->gfx[4], state->scoreram); } -static VIDEO_UPDATE( ace ) +static SCREEN_UPDATE( ace ) { ace_state *state = screen->machine->driver_data<ace_state>(); int offs; @@ -357,12 +357,13 @@ static MACHINE_CONFIG_START( ace, ace_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(4*8, 32*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(ace) + MCFG_GFXDECODE(ace) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(ace) MCFG_VIDEO_START(ace) - MCFG_VIDEO_UPDATE(ace) /* sound hardware */ /* ???? */ diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 354dd6e0d9d..81e014332e9 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -61,7 +61,7 @@ static INTERRUPT_GEN( acefruit_vblank ) acefruit_refresh_timer->adjust( attotime::zero ); } -static VIDEO_UPDATE( acefruit ) +static SCREEN_UPDATE( acefruit ) { int startrow = cliprect->min_y / 8; int endrow = cliprect->max_y / 8; @@ -564,13 +564,14 @@ static MACHINE_CONFIG_START( acefruit, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255) + MCFG_SCREEN_UPDATE(acefruit) + MCFG_PALETTE_LENGTH(16) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_PALETTE_INIT(acefruit) MCFG_VIDEO_START(acefruit) - MCFG_VIDEO_UPDATE(acefruit) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index d4ee3e5a671..956db29350a 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -216,7 +216,7 @@ static void draw_led(bitmap_t *bitmap, int x, int y,UINT8 value) static UINT16 led0,led1; -static VIDEO_UPDATE( acommand ) +static SCREEN_UPDATE( acommand ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); draw_sprites(screen->machine,bitmap,cliprect,0,0); @@ -579,11 +579,12 @@ static MACHINE_CONFIG_START( acommand, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(acommand) + MCFG_GFXDECODE(acommand) MCFG_PALETTE_LENGTH(0x4000) MCFG_VIDEO_START(acommand) - MCFG_VIDEO_UPDATE(acommand) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index 911895335a1..513182d9326 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -338,11 +338,12 @@ static MACHINE_CONFIG_START( actfancr, actfancr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(actfancr) + MCFG_GFXDECODE(actfan) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(actfancr) - MCFG_VIDEO_UPDATE(actfancr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -383,11 +384,12 @@ static MACHINE_CONFIG_START( triothep, actfancr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(triothep) + MCFG_GFXDECODE(triothep) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(triothep) - MCFG_VIDEO_UPDATE(triothep) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index e9002e61c46..9ef28c0e1c5 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -288,7 +288,7 @@ static VIDEO_START(adp) } -static VIDEO_UPDATE( adp ) +static SCREEN_UPDATE( adp ) { adp_state *state = screen->machine->driver_data<adp_state>(); int x, y, b, src; @@ -647,11 +647,12 @@ static MACHINE_CONFIG_START( quickjac, adp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 280) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1) + MCFG_SCREEN_UPDATE(adp) + MCFG_PALETTE_LENGTH(0x10) MCFG_PALETTE_INIT(adp) MCFG_VIDEO_START(adp) - MCFG_VIDEO_UPDATE(adp) MCFG_HD63484_ADD("hd63484", adp_hd63484_intf) @@ -679,11 +680,12 @@ static MACHINE_CONFIG_START( skattv, adp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 280) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1) + MCFG_SCREEN_UPDATE(adp) + MCFG_PALETTE_LENGTH(0x10) MCFG_PALETTE_INIT(adp) MCFG_VIDEO_START(adp) - MCFG_VIDEO_UPDATE(adp) MCFG_HD63484_ADD("hd63484", adp_hd63484_intf) @@ -716,11 +718,12 @@ static MACHINE_CONFIG_START( backgamn, adp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) + MCFG_SCREEN_UPDATE(adp) + MCFG_PALETTE_LENGTH(0x10) // MCFG_PALETTE_INIT(adp) MCFG_VIDEO_START(adp) - MCFG_VIDEO_UPDATE(adp) MCFG_HD63484_ADD("hd63484", adp_hd63484_intf) diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index b4f8e294a56..4d0dccd2a12 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -273,6 +273,7 @@ static MACHINE_CONFIG_START( formatz, aeroboto_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(aeroboto) MCFG_GFXDECODE(aeroboto) @@ -280,7 +281,6 @@ static MACHINE_CONFIG_START( formatz, aeroboto_state ) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(aeroboto) - MCFG_VIDEO_UPDATE(aeroboto) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 85913838875..1823c9136d9 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1349,12 +1349,12 @@ static MACHINE_CONFIG_START( pspikes, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(pspikes) MCFG_GFXDECODE(pspikes) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pspikes) - MCFG_VIDEO_UPDATE(pspikes) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1386,11 +1386,12 @@ static MACHINE_CONFIG_START( spikes91, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8+4, 224+4-1) + MCFG_SCREEN_UPDATE(spikes91) + MCFG_GFXDECODE(spikes91) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pspikes) - MCFG_VIDEO_UPDATE(spikes91) /* sound hardware */ /* the sound hardware is completely different on this: @@ -1418,11 +1419,12 @@ static MACHINE_CONFIG_START( pspikesb, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(pspikesb) + MCFG_GFXDECODE(pspikesb) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pspikes) - MCFG_VIDEO_UPDATE(pspikesb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1448,11 +1450,12 @@ static MACHINE_CONFIG_START( pspikesc, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(pspikes) + MCFG_GFXDECODE(pspikes) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pspikes) - MCFG_VIDEO_UPDATE(pspikes) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1483,11 +1486,12 @@ static MACHINE_CONFIG_START( karatblz, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 45*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(karatblz) + MCFG_GFXDECODE(turbofrc) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(karatblz) - MCFG_VIDEO_UPDATE(karatblz) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1522,11 +1526,12 @@ static MACHINE_CONFIG_START( spinlbrk, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 45*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(spinlbrk) + MCFG_GFXDECODE(turbofrc) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(spinlbrk) - MCFG_VIDEO_UPDATE(spinlbrk) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1561,11 +1566,12 @@ static MACHINE_CONFIG_START( turbofrc, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(turbofrc) + MCFG_GFXDECODE(turbofrc) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(turbofrc) - MCFG_VIDEO_UPDATE(turbofrc) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1601,11 +1607,12 @@ static MACHINE_CONFIG_START( aerofgtb, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(turbofrc) + MCFG_GFXDECODE(aerofgtb) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(turbofrc) - MCFG_VIDEO_UPDATE(turbofrc) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1641,11 +1648,12 @@ static MACHINE_CONFIG_START( aerofgt, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(aerofgt) + MCFG_GFXDECODE(aerofgt) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(turbofrc) - MCFG_VIDEO_UPDATE(aerofgt) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1679,11 +1687,12 @@ static MACHINE_CONFIG_START( aerfboot, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(aerfboot) + MCFG_GFXDECODE(aerfboot) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(turbofrc) - MCFG_VIDEO_UPDATE(aerfboot) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1710,11 +1719,12 @@ static MACHINE_CONFIG_START( aerfboo2, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(aerfboo2) + MCFG_GFXDECODE(aerfboo2) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(turbofrc) - MCFG_VIDEO_UPDATE(aerfboo2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1743,12 +1753,12 @@ static MACHINE_CONFIG_START( wbbc97, aerofgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8+14, 44*8-1+4, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(wbbc97) MCFG_GFXDECODE(wbbc97) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(wbbc97) - MCFG_VIDEO_UPDATE(wbbc97) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index 02bcd9861b1..93f4b5cfb46 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -661,14 +661,15 @@ static MACHINE_CONFIG_START( airbustr, airbustr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(airbustr) + MCFG_SCREEN_EOF(airbustr) + MCFG_GFXDECODE(airbustr) MCFG_PALETTE_LENGTH(768) MCFG_KANEKO_PANDORA_ADD("pandora", airbustr_pandora_config) MCFG_VIDEO_START(airbustr) - MCFG_VIDEO_UPDATE(airbustr) - MCFG_VIDEO_EOF(airbustr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index 0f773db97c9..abd75302bfc 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -232,10 +232,11 @@ static MACHINE_CONFIG_START( ajax, ajax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(ajax) + MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(ajax) - MCFG_VIDEO_UPDATE(ajax) MCFG_K052109_ADD("k052109", ajax_k052109_intf) MCFG_K051960_ADD("k051960", ajax_k051960_intf) diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index ca58252f769..163ec90a41a 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -77,7 +77,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE(hanaroku) +static SCREEN_UPDATE(hanaroku) { bitmap_fill(bitmap, cliprect, 0x1f0); // ??? draw_sprites(screen->machine, bitmap, cliprect); @@ -270,13 +270,13 @@ static MACHINE_CONFIG_START( hanaroku, albazc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(hanaroku) MCFG_GFXDECODE(hanaroku) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(hanaroku) MCFG_VIDEO_START(hanaroku) - MCFG_VIDEO_UPDATE(hanaroku) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 5ed8a889b17..651822dd84d 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -106,7 +106,7 @@ static VIDEO_START( yumefuda ) state->bg_tilemap = tilemap_create(machine, y_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -static VIDEO_UPDATE( yumefuda ) +static SCREEN_UPDATE( yumefuda ) { albazg_state *state = screen->machine->driver_data<albazg_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -417,6 +417,7 @@ static MACHINE_CONFIG_START( yumefuda, albazg_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE( yumefuda ) MCFG_MC6845_ADD("crtc", H46505, MASTER_CLOCK/16, mc6845_intf) /* hand tuned to get ~60 fps */ @@ -424,7 +425,6 @@ static MACHINE_CONFIG_START( yumefuda, albazg_state ) MCFG_PALETTE_LENGTH(0x80) MCFG_VIDEO_START( yumefuda ) - MCFG_VIDEO_UPDATE( yumefuda ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index dc69c36279c..98c0f51f141 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -587,10 +587,11 @@ static MACHINE_CONFIG_START( aleck64, _n64_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 525) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) + MCFG_SCREEN_UPDATE(n64) + MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(n64) - MCFG_VIDEO_UPDATE(n64) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index f3e6ae8804c..4921cafc7a3 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -286,11 +286,11 @@ static MACHINE_CONFIG_START( aliens, aliens_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(aliens) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(aliens) - MCFG_VIDEO_UPDATE(aliens) MCFG_K052109_ADD("k052109", aliens_k052109_intf) MCFG_K051960_ADD("k051960", aliens_k051960_intf) diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 466f9125a6d..8d7ba0183b3 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -1970,12 +1970,13 @@ static MACHINE_CONFIG_START( sstingry, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(sstingry) + MCFG_GFXDECODE(sstingry) MCFG_PALETTE_LENGTH(256 + 1) //AT MCFG_PALETTE_INIT(kyros) //ZT - MCFG_VIDEO_UPDATE(sstingry) /* sound hardware */ //AT @@ -2020,11 +2021,12 @@ static MACHINE_CONFIG_START( kyros, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(kyros) + MCFG_GFXDECODE(kyros) MCFG_PALETTE_LENGTH(256 + 1) MCFG_PALETTE_INIT(kyros) - MCFG_VIDEO_UPDATE(kyros) /* sound hardware */ //AT @@ -2066,11 +2068,12 @@ static MACHINE_CONFIG_START( jongbou, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(kyros) + MCFG_GFXDECODE(jongbou) MCFG_PALETTE_LENGTH(256 + 1) MCFG_PALETTE_INIT(kyros) - MCFG_VIDEO_UPDATE(kyros) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2100,12 +2103,14 @@ static MACHINE_CONFIG_START( alpha68k_I, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(alpha68k_I) + MCFG_GFXDECODE(paddle) + //AT MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(paddlem) //ZT - MCFG_VIDEO_UPDATE(alpha68k_I) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2137,11 +2142,12 @@ static MACHINE_CONFIG_START( alpha68k_II, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(alpha68k_II) + MCFG_GFXDECODE(alpha68k_II) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(alpha68k) - MCFG_VIDEO_UPDATE(alpha68k_II) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2185,11 +2191,12 @@ static MACHINE_CONFIG_START( alpha68k_II_gm, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(alpha68k_II) + MCFG_GFXDECODE(alpha68k_II) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(alpha68k) - MCFG_VIDEO_UPDATE(alpha68k_II) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2228,11 +2235,12 @@ static MACHINE_CONFIG_START( alpha68k_V, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(alpha68k_V) + MCFG_GFXDECODE(alpha68k_V) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(alpha68k) - MCFG_VIDEO_UPDATE(alpha68k_V) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2270,11 +2278,12 @@ static MACHINE_CONFIG_START( alpha68k_V_sb, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(alpha68k_V_sb) + MCFG_GFXDECODE(alpha68k_V) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(alpha68k) - MCFG_VIDEO_UPDATE(alpha68k_V_sb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2311,11 +2320,12 @@ static MACHINE_CONFIG_START( tnextspc, alpha68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(alpha68k_I) + MCFG_GFXDECODE(tnextspc) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(paddlem) - MCFG_VIDEO_UPDATE(alpha68k_I) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index 9076ddea4ce..dbb21cc0c1c 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -397,7 +397,7 @@ static VIDEO_START( amaticmg ) { } -static VIDEO_UPDATE( amaticmg ) +static SCREEN_UPDATE( amaticmg ) { return 0; } @@ -631,6 +631,7 @@ static MACHINE_CONFIG_START( amaticmg, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(amaticmg) // MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) @@ -639,7 +640,6 @@ static MACHINE_CONFIG_START( amaticmg, driver_device ) MCFG_PALETTE_INIT(amaticmg) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(amaticmg) - MCFG_VIDEO_UPDATE(amaticmg) /* sound hardware */ // MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c index 0f4dd94576b..58808dd8d9d 100644 --- a/src/mame/drivers/ambush.c +++ b/src/mame/drivers/ambush.c @@ -241,11 +241,12 @@ static MACHINE_CONFIG_START( ambush, ambush_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-3) /* The -3 makes the cocktail mode perfect */ + MCFG_SCREEN_UPDATE(ambush) + MCFG_GFXDECODE(ambush) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(ambush) - MCFG_VIDEO_UPDATE(ambush) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index 6248167ab1c..d1aae06818f 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -1183,13 +1183,13 @@ static MACHINE_CONFIG_START( ampoker2, ampoker2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(20*8, 56*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(ampoker2) MCFG_GFXDECODE(ampoker2) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(ampoker2) MCFG_VIDEO_START(ampoker2) - MCFG_VIDEO_UPDATE(ampoker2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index bbe5c5666d8..a7a0cee990d 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -292,11 +292,12 @@ static MACHINE_CONFIG_START( amspdwy, amspdwy_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(amspdwy) + MCFG_GFXDECODE(amspdwy) MCFG_PALETTE_LENGTH(32) MCFG_VIDEO_START(amspdwy) - MCFG_VIDEO_UPDATE(amspdwy) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index abc4ba6c980..6636a6fcefe 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -627,11 +627,12 @@ static MACHINE_CONFIG_START( angelkds, angelkds_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(angelkds) + MCFG_GFXDECODE(angelkds) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(angelkds) - MCFG_VIDEO_UPDATE(angelkds) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index f44339288c3..c55e7beda08 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -459,12 +459,13 @@ static MACHINE_CONFIG_DERIVED( appoooh, appoooh_common ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(appoooh) + MCFG_GFXDECODE(appoooh) MCFG_PALETTE_LENGTH(32*8+32*8) MCFG_PALETTE_INIT(appoooh) MCFG_VIDEO_START(appoooh) - MCFG_VIDEO_UPDATE(appoooh) MACHINE_CONFIG_END @@ -477,12 +478,13 @@ static MACHINE_CONFIG_DERIVED( robowres, appoooh_common ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(robowres) + MCFG_GFXDECODE(robowres) MCFG_PALETTE_LENGTH(32*8+32*8) MCFG_PALETTE_INIT(robowres) MCFG_VIDEO_START(appoooh) - MCFG_VIDEO_UPDATE(robowres) MACHINE_CONFIG_END /************************************* diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 573e9c77572..bd7fe315749 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -380,11 +380,12 @@ static MACHINE_CONFIG_START( aquarium, aquarium_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 42*8-1, 2*8, 34*8-1) + MCFG_SCREEN_UPDATE(aquarium) + MCFG_GFXDECODE(aquarium) MCFG_PALETTE_LENGTH(0x1000/2) MCFG_VIDEO_START(aquarium) - MCFG_VIDEO_UPDATE(aquarium) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index d01cba046d7..db50dfa86ad 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -385,11 +385,12 @@ static MACHINE_CONFIG_START( arabian, arabian_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 11, 244) + MCFG_SCREEN_UPDATE(arabian) + MCFG_PALETTE_LENGTH(256*32) MCFG_PALETTE_INIT(arabian) MCFG_VIDEO_START(arabian) - MCFG_VIDEO_UPDATE(arabian) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c index 8034ab4553b..e29eb57f926 100644 --- a/src/mame/drivers/arcadecl.c +++ b/src/mame/drivers/arcadecl.c @@ -345,9 +345,9 @@ static MACHINE_CONFIG_START( arcadecl, rampart_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240) + MCFG_SCREEN_UPDATE(arcadecl) MCFG_VIDEO_START(arcadecl) - MCFG_VIDEO_UPDATE(arcadecl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index 1978baf841d..59940d0c1ac 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -314,11 +314,12 @@ static MACHINE_CONFIG_START( arcadia, arcadia_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512*2, 262) MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1) + MCFG_SCREEN_UPDATE(amiga) + MCFG_PALETTE_LENGTH(4096) MCFG_PALETTE_INIT(amiga) MCFG_VIDEO_START(amiga) - MCFG_VIDEO_UPDATE(amiga) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index 501ae4708a5..86b9cce6cd9 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -553,13 +553,13 @@ static MACHINE_CONFIG_START( argus, argus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(argus) MCFG_GFXDECODE(argus) MCFG_PALETTE_LENGTH(896) MCFG_VIDEO_START(argus) MCFG_VIDEO_RESET(argus) - MCFG_VIDEO_UPDATE(argus) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -607,13 +607,13 @@ static MACHINE_CONFIG_START( valtric, argus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(valtric) MCFG_GFXDECODE(valtric) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(valtric) MCFG_VIDEO_RESET(valtric) - MCFG_VIDEO_UPDATE(valtric) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -652,13 +652,13 @@ static MACHINE_CONFIG_START( butasan, argus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(butasan) MCFG_GFXDECODE(butasan) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(butasan) MCFG_VIDEO_RESET(butasan) - MCFG_VIDEO_UPDATE(butasan) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index e7c304a3b80..e7f396fdb7a 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -182,7 +182,7 @@ INLINE void uBackgroundColour(running_machine *machine) } } -static VIDEO_UPDATE(aristmk4) +static SCREEN_UPDATE(aristmk4) { aristmk4_state *state = screen->machine->driver_data<aristmk4_state>(); const gfx_element *gfx = screen->machine->gfx[0]; @@ -1245,13 +1245,13 @@ static MACHINE_CONFIG_START( aristmk4, aristmk4_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */ + MCFG_SCREEN_UPDATE(aristmk4) MCFG_GFXDECODE(aristmk4) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(aristmk4) MCFG_VIDEO_START(aristmk4) - MCFG_VIDEO_UPDATE(aristmk4) MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf1 ) MCFG_VIA6522_ADD("via6522_0", 0, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */ diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c index 173aec332b4..6556271b094 100644 --- a/src/mame/drivers/aristmk5.c +++ b/src/mame/drivers/aristmk5.c @@ -305,11 +305,11 @@ static MACHINE_CONFIG_START( aristmk5, aristmk5_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(1280, 1024) //TODO: proper max size? MCFG_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 1024-1) + MCFG_SCREEN_UPDATE(archimds_vidc) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(archimds_vidc) - MCFG_VIDEO_UPDATE(archimds_vidc) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac0", DAC, 0) diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index f0b8e4bcb49..aa243d1d08f 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -979,12 +979,13 @@ static MACHINE_CONFIG_START( arkanoid, arkanoid_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(arkanoid) + MCFG_GFXDECODE(arkanoid) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(arkanoid) - MCFG_VIDEO_UPDATE(arkanoid) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1012,13 +1013,13 @@ static MACHINE_CONFIG_START( hexa, arkanoid_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(hexa) MCFG_GFXDECODE(hexa) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(arkanoid) - MCFG_VIDEO_UPDATE(hexa) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index e4464cf4e24..c2f84aceef2 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -814,12 +814,14 @@ static MACHINE_CONFIG_START( terraf, armedf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(armedf) + MCFG_SCREEN_EOF(armedf) + MCFG_GFXDECODE(armedf) + MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_EOF(armedf) MCFG_VIDEO_START(armedf) - MCFG_VIDEO_UPDATE(armedf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -863,12 +865,13 @@ static MACHINE_CONFIG_START( terrafb, armedf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(armedf) + MCFG_SCREEN_EOF(armedf) + MCFG_GFXDECODE(armedf) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_EOF(armedf) MCFG_VIDEO_START(armedf) - MCFG_VIDEO_UPDATE(armedf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -907,12 +910,13 @@ static MACHINE_CONFIG_START( kodure, armedf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(armedf) + MCFG_SCREEN_EOF(armedf) + MCFG_GFXDECODE(armedf) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_EOF(armedf) MCFG_VIDEO_START(armedf) - MCFG_VIDEO_UPDATE(armedf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -951,12 +955,13 @@ static MACHINE_CONFIG_START( armedf, armedf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(armedf) + MCFG_SCREEN_EOF(armedf) + MCFG_GFXDECODE(armedf) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_EOF(armedf) MCFG_VIDEO_START(armedf) - MCFG_VIDEO_UPDATE(armedf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -995,12 +1000,13 @@ static MACHINE_CONFIG_START( cclimbr2, armedf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(armedf) + MCFG_SCREEN_EOF(armedf) + MCFG_GFXDECODE(armedf) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_EOF(armedf) MCFG_VIDEO_START(armedf) - MCFG_VIDEO_UPDATE(armedf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1039,12 +1045,13 @@ static MACHINE_CONFIG_START( legion, armedf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(armedf) + MCFG_SCREEN_EOF(armedf) + MCFG_GFXDECODE(armedf) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_EOF(armedf) MCFG_VIDEO_START(armedf) - MCFG_VIDEO_UPDATE(armedf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1083,12 +1090,13 @@ static MACHINE_CONFIG_START( legiono, armedf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(armedf) + MCFG_SCREEN_EOF(armedf) + MCFG_GFXDECODE(armedf) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_EOF(armedf) MCFG_VIDEO_START(armedf) - MCFG_VIDEO_UPDATE(armedf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c index 4eeb9db5a6b..9f0d7d1bf6b 100644 --- a/src/mame/drivers/artmagic.c +++ b/src/mame/drivers/artmagic.c @@ -859,11 +859,11 @@ static MACHINE_CONFIG_START( artmagic, driver_device ) MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) MCFG_VIDEO_START(artmagic) - MCFG_VIDEO_UPDATE(tms340x0) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_40MHz/6, 428, 0, 320, 313, 0, 256) + MCFG_SCREEN_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index f3e2a143b9a..4cbfdf24039 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -372,12 +372,12 @@ static MACHINE_CONFIG_START( ashnojoe, ashnojoe_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(14*8, 50*8-1, 3*8, 29*8-1) + MCFG_SCREEN_UPDATE(ashnojoe) MCFG_GFXDECODE(ashnojoe) MCFG_PALETTE_LENGTH(0x1000/2) MCFG_VIDEO_START(ashnojoe) - MCFG_VIDEO_UPDATE(ashnojoe) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index 504b54265cb..f6f9abb1b63 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -317,9 +317,9 @@ static MACHINE_CONFIG_START( asterix, asterix_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) - MCFG_PALETTE_LENGTH(2048) + MCFG_SCREEN_UPDATE(asterix) - MCFG_VIDEO_UPDATE(asterix) + MCFG_PALETTE_LENGTH(2048) MCFG_K056832_ADD("k056832", asterix_k056832_intf) MCFG_K053244_ADD("k053244", asterix_k05324x_intf) diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c index 42369ba1d9e..af620f445d2 100644 --- a/src/mame/drivers/asteroid.c +++ b/src/mame/drivers/asteroid.c @@ -623,9 +623,9 @@ static MACHINE_CONFIG_START( asteroid, driver_device ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(400,300) MCFG_SCREEN_VISIBLE_AREA(522, 1566, 394, 1182) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(dvg) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -674,8 +674,9 @@ static MACHINE_CONFIG_DERIVED( llander, asteroid ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_VISIBLE_AREA(522, 1566, 270, 1070) + MCFG_SCREEN_UPDATE(vector) + MCFG_VIDEO_START(dvg) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index efc5ab229fa..11ee165b996 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -151,7 +151,7 @@ static void plot_byte( running_machine *machine, bitmap_t *bitmap, UINT8 y, UINT } -static VIDEO_UPDATE( astinvad ) +static SCREEN_UPDATE( astinvad ) { astinvad_state *state = screen->machine->driver_data<astinvad_state>(); const UINT8 *color_prom = screen->machine->region("proms")->base(); @@ -171,7 +171,7 @@ static VIDEO_UPDATE( astinvad ) } -static VIDEO_UPDATE( spaceint ) +static SCREEN_UPDATE( spaceint ) { astinvad_state *state = screen->machine->driver_data<astinvad_state>(); const UINT8 *color_prom = screen->machine->region("proms")->base(); @@ -598,11 +598,10 @@ static MACHINE_CONFIG_START( kamikaze, astinvad_state ) MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] ) /* video hardware */ - MCFG_VIDEO_UPDATE(astinvad) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 32, 256) + MCFG_SCREEN_UPDATE(astinvad) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -634,13 +633,13 @@ static MACHINE_CONFIG_START( spaceint, astinvad_state ) /* video hardware */ MCFG_VIDEO_START(spaceint) - MCFG_VIDEO_UPDATE(spaceint) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(spaceint) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index 13683210c54..06c24ad82ab 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -1286,10 +1286,10 @@ static MACHINE_CONFIG_START( astrocade_base, astrocde_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(ASTROCADE_CLOCK, 455, 0, 352, 262, 0, 240) MCFG_SCREEN_DEFAULT_POSITION(1.1, 0.0, 1.18, -0.018) /* clip out borders */ + MCFG_SCREEN_UPDATE(astrocde) MCFG_PALETTE_INIT(astrocde) MCFG_VIDEO_START(astrocde) - MCFG_VIDEO_UPDATE(astrocde) MACHINE_CONFIG_END @@ -1303,7 +1303,9 @@ static MACHINE_CONFIG_DERIVED( astrocade_16color_base, astrocade_base ) MCFG_PALETTE_INIT(profpac) MCFG_VIDEO_START(profpac) - MCFG_VIDEO_UPDATE(profpac) + + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(profpac) MACHINE_CONFIG_END diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index cb2b458be84..4312031e21a 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -139,7 +139,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE(astrocorp) +static SCREEN_UPDATE(astrocorp) { astrocorp_state *state = screen->machine->driver_data<astrocorp_state>(); @@ -478,12 +478,12 @@ static MACHINE_CONFIG_START( showhand, astrocorp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(astrocorp) MCFG_GFXDECODE(astrocorp) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(astrocorp) - MCFG_VIDEO_UPDATE(astrocorp) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -528,12 +528,12 @@ static MACHINE_CONFIG_START( skilldrp, astrocorp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x200-1, 0, 0xf0-1) + MCFG_SCREEN_UPDATE(astrocorp) MCFG_GFXDECODE(astrocorp) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(astrocorp) - MCFG_VIDEO_UPDATE(astrocorp) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index d8c1429c9e9..d7729a27e32 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -421,7 +421,7 @@ static void video_update_common( running_machine *machine, bitmap_t *bitmap, con } -static VIDEO_UPDATE( astrof ) +static SCREEN_UPDATE( astrof ) { pen_t pens[ASTROF_NUM_PENS]; @@ -433,7 +433,7 @@ static VIDEO_UPDATE( astrof ) } -static VIDEO_UPDATE( tomahawk ) +static SCREEN_UPDATE( tomahawk ) { pen_t pens[TOMAHAWK_NUM_PENS]; @@ -979,7 +979,8 @@ static MACHINE_CONFIG_DERIVED( astrof, base ) MCFG_MACHINE_START(astrof) /* video hardware */ - MCFG_VIDEO_UPDATE(astrof) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(astrof) /* audio hardware */ MCFG_FRAGMENT_ADD(astrof_audio) @@ -1004,7 +1005,8 @@ static MACHINE_CONFIG_DERIVED( spfghmk2, base ) MCFG_MACHINE_START(spfghmk2) /* video hardware */ - MCFG_VIDEO_UPDATE(astrof) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(astrof) /* audio hardware */ MCFG_FRAGMENT_ADD(spfghmk2_audio) @@ -1020,7 +1022,8 @@ static MACHINE_CONFIG_DERIVED( tomahawk, base ) MCFG_MACHINE_START(tomahawk) /* video hardware */ - MCFG_VIDEO_UPDATE(tomahawk) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(tomahawk) /* audio hardware */ MCFG_FRAGMENT_ADD(tomahawk_audio) diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index ef2e9552e00..1b9014d2532 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -874,7 +874,7 @@ static MACHINE_RESET( asuka ) memset(state->cval, 0, 26); } -static VIDEO_EOF( asuka ) +static SCREEN_EOF( asuka ) { asuka_state *state = machine->driver_data<asuka_state>(); pc090oj_eof_callback(state->pc090oj); @@ -914,12 +914,12 @@ static MACHINE_CONFIG_START( bonzeadv, asuka_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 31*8-1) + MCFG_SCREEN_UPDATE(bonzeadv) + MCFG_SCREEN_EOF(asuka) + MCFG_GFXDECODE(asuka) MCFG_PALETTE_LENGTH(4096) - MCFG_VIDEO_EOF(asuka) - MCFG_VIDEO_UPDATE(bonzeadv) - MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf) MCFG_TC0100SCN_ADD("tc0100scn", asuka_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf) @@ -960,12 +960,12 @@ static MACHINE_CONFIG_START( asuka, asuka_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(asuka) + MCFG_SCREEN_EOF(asuka) + MCFG_GFXDECODE(asuka) MCFG_PALETTE_LENGTH(4096) - MCFG_VIDEO_EOF(asuka) - MCFG_VIDEO_UPDATE(asuka) - MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf) MCFG_TC0100SCN_ADD("tc0100scn", asuka_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf) @@ -1013,12 +1013,12 @@ static MACHINE_CONFIG_START( cadash, asuka_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(bonzeadv) + MCFG_SCREEN_EOF(asuka) + MCFG_GFXDECODE(asuka) MCFG_PALETTE_LENGTH(4096) - MCFG_VIDEO_EOF(asuka) - MCFG_VIDEO_UPDATE(bonzeadv) - MCFG_PC090OJ_ADD("pc090oj", cadash_pc090oj_intf) MCFG_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf) @@ -1058,12 +1058,12 @@ static MACHINE_CONFIG_START( mofflott, asuka_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(asuka) + MCFG_SCREEN_EOF(asuka) + MCFG_GFXDECODE(asuka) MCFG_PALETTE_LENGTH(4096) /* only Mofflott uses full palette space */ - MCFG_VIDEO_EOF(asuka) - MCFG_VIDEO_UPDATE(asuka) - MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf) MCFG_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf) @@ -1107,12 +1107,12 @@ static MACHINE_CONFIG_START( galmedes, asuka_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(asuka) + MCFG_SCREEN_EOF(asuka) + MCFG_GFXDECODE(asuka) MCFG_PALETTE_LENGTH(4096) /* only Mofflott uses full palette space */ - MCFG_VIDEO_EOF(asuka) - MCFG_VIDEO_UPDATE(asuka) - MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf) MCFG_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf) @@ -1152,12 +1152,12 @@ static MACHINE_CONFIG_START( eto, asuka_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(asuka) + MCFG_SCREEN_EOF(asuka) + MCFG_GFXDECODE(asuka) MCFG_PALETTE_LENGTH(4096) - MCFG_VIDEO_EOF(asuka) - MCFG_VIDEO_UPDATE(asuka) - MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf) MCFG_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf) diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index 08ca89fb076..1d617fe9f68 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -570,12 +570,13 @@ static MACHINE_CONFIG_START( atarifb, atarifb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(38*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 38*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(atarifb) + MCFG_GFXDECODE(atarifb) MCFG_PALETTE_LENGTH(12) MCFG_PALETTE_INIT(atarifb) MCFG_VIDEO_START(atarifb) - MCFG_VIDEO_UPDATE(atarifb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -601,7 +602,8 @@ static MACHINE_CONFIG_DERIVED( abaseb, atarifb ) MCFG_CPU_PROGRAM_MAP(abaseb_map) /* video hardware */ - MCFG_VIDEO_UPDATE(abaseb) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(abaseb) /* sound hardware */ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) @@ -619,8 +621,8 @@ static MACHINE_CONFIG_DERIVED( soccer, atarifb ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 38*8-1, 2*8, 32*8-1) - MCFG_GFXDECODE(soccer) - MCFG_VIDEO_UPDATE(soccer) + MCFG_SCREEN_UPDATE(soccer) + MCFG_GFXDECODE(soccer) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c index fc6d9ede6c9..a952f632a0e 100644 --- a/src/mame/drivers/atarig1.c +++ b/src/mame/drivers/atarig1.c @@ -472,10 +472,10 @@ static MACHINE_CONFIG_START( atarig1, atarig1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) /* note: these parameters are from published specs, not derived */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(atarig1) + MCFG_SCREEN_EOF(atarig1) MCFG_VIDEO_START(atarig1) - MCFG_VIDEO_EOF(atarig1) - MCFG_VIDEO_UPDATE(atarig1) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_ii_mono) diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c index 1442719f387..27acb15317e 100644 --- a/src/mame/drivers/atarig42.c +++ b/src/mame/drivers/atarig42.c @@ -582,10 +582,10 @@ static MACHINE_CONFIG_START( atarig42, atarig42_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(atarig42) + MCFG_SCREEN_EOF(atarig42) MCFG_VIDEO_START(atarig42) - MCFG_VIDEO_EOF(atarig42) - MCFG_VIDEO_UPDATE(atarig42) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_iii_mono) diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index fab1fa310ea..7171f5fa8ef 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -833,10 +833,10 @@ static MACHINE_CONFIG_START( atarigt, atarigt_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a pair of GALs to determine H and V parameters */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(atarigt) + MCFG_SCREEN_EOF(atarigt) MCFG_VIDEO_START(atarigt) - MCFG_VIDEO_EOF(atarigt) - MCFG_VIDEO_UPDATE(atarigt) MCFG_ATARIRLE_ADD("rle", modesc) diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index 768ecd24347..c1738a56636 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -1453,10 +1453,10 @@ static MACHINE_CONFIG_START( atarigx2, atarigx2_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a pair of GALs to determine H and V parameters */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(atarigx2) + MCFG_SCREEN_EOF(atarigx2) MCFG_VIDEO_START(atarigx2) - MCFG_VIDEO_EOF(atarigx2) - MCFG_VIDEO_UPDATE(atarigx2) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_iiis_stereo) diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index a7faa623562..e97166e05d5 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -788,9 +788,9 @@ static MACHINE_CONFIG_START( atarisy1, atarisy1_state ) /* note: these parameters are from published specs, not derived */ /* video timing comes from an 82S163 (H) and an 82S129 (V) */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(atarisy1) MCFG_VIDEO_START(atarisy1) - MCFG_VIDEO_UPDATE(atarisy1) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index 2f7fe5ceea5..14668f32ec8 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -1282,9 +1282,9 @@ static MACHINE_CONFIG_START( atarisy2, atarisy2_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 640, 0, 512, 416, 0, 384) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(atarisy2) MCFG_VIDEO_START(atarisy2) - MCFG_VIDEO_UPDATE(atarisy2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c index 72c6098772b..ef7b0dff910 100644 --- a/src/mame/drivers/atarisy4.c +++ b/src/mame/drivers/atarisy4.c @@ -134,7 +134,7 @@ static VIDEO_RESET( atarisy4 ) gpu.vblank_wait = 0; } -static VIDEO_UPDATE( atarisy4 ) +static SCREEN_UPDATE( atarisy4 ) { atarisy4_state *state = screen->machine->driver_data<atarisy4_state>(); int y; @@ -737,10 +737,10 @@ static MACHINE_CONFIG_START( atarisy4, atarisy4_state ) MCFG_SCREEN_RAW_PARAMS(32000000/2, 660, 0, 512, 404, 0, 384) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) + MCFG_SCREEN_UPDATE(atarisy4) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(atarisy4) - MCFG_VIDEO_UPDATE(atarisy4) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( airrace, atarisy4 ) diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index 001cd41d947..45690e9d82c 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -361,9 +361,9 @@ static MACHINE_CONFIG_START( atetris, atetris_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(atetris) MCFG_VIDEO_START(atetris) - MCFG_VIDEO_UPDATE(atetris) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -397,10 +397,10 @@ static MACHINE_CONFIG_START( atetrisb2, atetris_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(atetris) MCFG_VIDEO_START(atetris) - MCFG_VIDEO_UPDATE(atetris) - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c index 997635dcf6b..72b9ce746e0 100644 --- a/src/mame/drivers/attckufo.c +++ b/src/mame/drivers/attckufo.c @@ -160,7 +160,7 @@ static INTERRUPT_GEN( attckufo_raster_interrupt ) mos6560_raster_interrupt_gen(state->mos6560); } -static VIDEO_UPDATE( attckufo ) +static SCREEN_UPDATE( attckufo ) { attckufo_state *state = screen->machine->driver_data<attckufo_state>(); mos6560_video_update(state->mos6560, bitmap, cliprect); @@ -203,12 +203,11 @@ static MACHINE_CONFIG_START( attckufo, attckufo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((MOS6560_XSIZE + 7) & ~7, MOS6560_YSIZE) MCFG_SCREEN_VISIBLE_AREA(0, 23*8 - 1, 0, 22*8 - 1) + MCFG_SCREEN_UPDATE(attckufo) MCFG_PALETTE_LENGTH(ARRAY_LENGTH(attckufo_palette)) MCFG_PALETTE_INIT(attckufo) - MCFG_VIDEO_UPDATE(attckufo) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_MOS656X_ADD("mos6560", attckufo_6560_intf) diff --git a/src/mame/drivers/atvtrack.c b/src/mame/drivers/atvtrack.c index 4db75bdd56e..1e495cd7452 100644 --- a/src/mame/drivers/atvtrack.c +++ b/src/mame/drivers/atvtrack.c @@ -13,7 +13,7 @@ VIDEO_START(atvtrack) { } -VIDEO_UPDATE(atvtrack) +SCREEN_UPDATE(atvtrack) { return 0; } @@ -54,11 +54,11 @@ static MACHINE_CONFIG_START( atvtrack, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) + MCFG_SCREEN_UPDATE(atvtrack) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(atvtrack) - MCFG_VIDEO_UPDATE(atvtrack) MACHINE_CONFIG_END ROM_START( atvtrack ) diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c index cc95698f37e..8cf3e55f5eb 100644 --- a/src/mame/drivers/avalnche.c +++ b/src/mame/drivers/avalnche.c @@ -58,7 +58,7 @@ static INTERRUPT_GEN( avalnche_interrupt ) * *************************************/ -static VIDEO_UPDATE( avalnche ) +static SCREEN_UPDATE( avalnche ) { avalnche_state *state = screen->machine->driver_data<avalnche_state>(); offs_t offs; @@ -241,14 +241,13 @@ static MACHINE_CONFIG_START( avalnche, avalnche_state ) MCFG_MACHINE_RESET(avalnche) /* video hardware */ - MCFG_VIDEO_UPDATE(avalnche) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(avalnche) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c index 598bafda1ea..6c133dbd5e0 100644 --- a/src/mame/drivers/avt.c +++ b/src/mame/drivers/avt.c @@ -458,7 +458,7 @@ static VIDEO_START( avt ) } -static VIDEO_UPDATE( avt ) +static SCREEN_UPDATE( avt ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -811,6 +811,7 @@ static MACHINE_CONFIG_START( avt, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) /* 240x224 (through CRTC) */ + MCFG_SCREEN_UPDATE(avt) MCFG_GFXDECODE(avt) @@ -818,7 +819,6 @@ static MACHINE_CONFIG_START( avt, driver_device ) MCFG_PALETTE_LENGTH(8*16) MCFG_VIDEO_START(avt) - MCFG_VIDEO_UPDATE(avt) MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) /* guess */ diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c index 288c283dbb8..8098603fd6c 100644 --- a/src/mame/drivers/aztarac.c +++ b/src/mame/drivers/aztarac.c @@ -164,9 +164,9 @@ static MACHINE_CONFIG_START( aztarac, aztarac_state ) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 768-1) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(aztarac) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 39f54891ece..91968e97271 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -153,7 +153,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect -static VIDEO_UPDATE( backfire ) +static SCREEN_UPDATE( backfire ) { backfire_state *state = screen->machine->driver_data<backfire_state>(); @@ -495,6 +495,7 @@ static MACHINE_CONFIG_START( backfire, backfire_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(backfire) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -502,9 +503,9 @@ static MACHINE_CONFIG_START( backfire, backfire_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(backfire) MCFG_VIDEO_START(backfire) - MCFG_VIDEO_UPDATE(backfire) MCFG_DECO16IC_ADD("deco_custom", backfire_deco16ic_intf) diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 1df63e55ea2..08104f14536 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -527,9 +527,9 @@ static MACHINE_CONFIG_START( badlands, badlands_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(badlands) MCFG_VIDEO_START(badlands) - MCFG_VIDEO_UPDATE(badlands) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -736,9 +736,9 @@ static MACHINE_CONFIG_START( badlandsb, badlands_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(badlands) MCFG_VIDEO_START(badlands) - MCFG_VIDEO_UPDATE(badlands) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index 8c3617ca6b9..5761ac43c52 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -482,12 +482,13 @@ static MACHINE_CONFIG_START( bagman, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(bagman) + MCFG_GFXDECODE(bagman) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(bagman) MCFG_VIDEO_START(bagman) - MCFG_VIDEO_UPDATE(bagman) MCFG_DEVICE_ADD("tmsprom", TMSPROM, 640000 / 2) /* rom clock */ MCFG_DEVICE_CONFIG(prom_intf) @@ -518,12 +519,13 @@ static MACHINE_CONFIG_START( pickin, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(bagman) + MCFG_GFXDECODE(pickin) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(bagman) MCFG_VIDEO_START(bagman) - MCFG_VIDEO_UPDATE(bagman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -570,13 +572,13 @@ static MACHINE_CONFIG_START( botanic, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(bagman) MCFG_GFXDECODE(bagman) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(bagman) MCFG_VIDEO_START(bagman) - MCFG_VIDEO_UPDATE(bagman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index dbaeefc1754..4e2c8e536cb 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -1218,10 +1218,11 @@ static MACHINE_CONFIG_START( balsente, balsente_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(BALSENTE_PIXEL_CLOCK, BALSENTE_HTOTAL, BALSENTE_HBEND, BALSENTE_HBSTART, BALSENTE_VTOTAL, BALSENTE_VBEND, BALSENTE_VBSTART) + MCFG_SCREEN_UPDATE(balsente) + MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(balsente) - MCFG_VIDEO_UPDATE(balsente) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c index a2f5929be76..5f6b5c754ab 100644 --- a/src/mame/drivers/bankp.c +++ b/src/mame/drivers/bankp.c @@ -284,12 +284,13 @@ static MACHINE_CONFIG_START( bankp, bankp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(3*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bankp) + MCFG_GFXDECODE(bankp) MCFG_PALETTE_LENGTH(32*4+16*8) MCFG_PALETTE_INIT(bankp) MCFG_VIDEO_START(bankp) - MCFG_VIDEO_UPDATE(bankp) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index 41dd0215565..633158b21e9 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -397,13 +397,14 @@ static MACHINE_CONFIG_START( baraduke, baraduke_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(baraduke) + MCFG_SCREEN_EOF(baraduke) + MCFG_GFXDECODE(baraduke) MCFG_PALETTE_LENGTH(2048) MCFG_PALETTE_INIT(baraduke) MCFG_VIDEO_START(baraduke) - MCFG_VIDEO_UPDATE(baraduke) - MCFG_VIDEO_EOF(baraduke) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bartop52.c b/src/mame/drivers/bartop52.c index 6ba4b51c676..76e663899fd 100644 --- a/src/mame/drivers/bartop52.c +++ b/src/mame/drivers/bartop52.c @@ -118,16 +118,15 @@ static MACHINE_CONFIG_START( a5200, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1)) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y) + MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ) + MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ) + MCFG_SCREEN_UPDATE(atari) + MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(atari) MCFG_VIDEO_START(atari) - MCFG_VIDEO_UPDATE(atari) - - MCFG_SCREEN_MODIFY( "screen" ) - MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ) - MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ) - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT) diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index c6aa6e67012..93a3aa56b14 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -252,9 +252,9 @@ static MACHINE_CONFIG_START( batman, batman_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a VAD chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(batman) MCFG_VIDEO_START(batman) - MCFG_VIDEO_UPDATE(batman) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_iii_mono) diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index 8acf77181c3..1c0e5622dd3 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -315,11 +315,12 @@ static MACHINE_CONFIG_START( battlane, battlane_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32 * 8, 32 * 8) MCFG_SCREEN_VISIBLE_AREA(1 * 8, 31 * 8 - 1, 0 * 8, 32 * 8 - 1) + MCFG_SCREEN_UPDATE(battlane) + MCFG_GFXDECODE(battlane) MCFG_PALETTE_LENGTH(64) MCFG_VIDEO_START(battlane) - MCFG_VIDEO_UPDATE(battlane) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index aa5a29fc56f..58151023325 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -248,11 +248,12 @@ static MACHINE_CONFIG_START( battlera, battlera_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 30*8-1) + MCFG_SCREEN_UPDATE(battlera) + MCFG_GFXDECODE(battlera) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(battlera) - MCFG_VIDEO_UPDATE(battlera) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index 2a7acf4106f..ac38dd6f208 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -227,12 +227,13 @@ static MACHINE_CONFIG_START( battlex, battlex_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(battlex) + MCFG_GFXDECODE(battlex) MCFG_PALETTE_LENGTH(16*8+64) MCFG_PALETTE_INIT(battlex) MCFG_VIDEO_START(battlex) - MCFG_VIDEO_UPDATE(battlex) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 536506fbbd4..e6b404f040a 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -262,11 +262,11 @@ static MACHINE_CONFIG_START( battlnts, battlnts_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(battlnts) + MCFG_GFXDECODE(battlnts) MCFG_PALETTE_LENGTH(128) - MCFG_VIDEO_UPDATE(battlnts) - MCFG_K007342_ADD("k007342", bladestl_k007342_intf) MCFG_K007420_ADD("k007420", bladestl_k007420_intf) diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index 562d0db3228..56b03de24f5 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -664,7 +664,7 @@ static const ym2610_interface ym2610_config = /******************************************************************************/ -static VIDEO_EOF( bbuster ) +static SCREEN_EOF( bbuster ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); @@ -672,7 +672,7 @@ static VIDEO_EOF( bbuster ) buffer_spriteram16_2_w(space,0,0,0xffff); } -static VIDEO_EOF( mechatt ) +static SCREEN_EOF( mechatt ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram16_w(space,0,0,0xffff); @@ -699,12 +699,13 @@ static MACHINE_CONFIG_START( bbusters, bbusters_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bbuster) + MCFG_SCREEN_EOF(bbuster) + MCFG_GFXDECODE(bbusters) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(bbuster) - MCFG_VIDEO_UPDATE(bbuster) - MCFG_VIDEO_EOF(bbuster) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -736,12 +737,13 @@ static MACHINE_CONFIG_START( mechatt, bbusters_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mechatt) + MCFG_SCREEN_EOF(mechatt) + MCFG_GFXDECODE(mechatt) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(mechatt) - MCFG_VIDEO_UPDATE(mechatt) - MCFG_VIDEO_EOF(mechatt) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c index 66c4549903e..5a3f34f4566 100644 --- a/src/mame/drivers/beaminv.c +++ b/src/mame/drivers/beaminv.c @@ -164,7 +164,7 @@ static MACHINE_RESET( beaminv ) * *************************************/ -static VIDEO_UPDATE( beaminv ) +static SCREEN_UPDATE( beaminv ) { beaminv_state *state = screen->machine->driver_data<beaminv_state>(); offs_t offs; @@ -338,13 +338,12 @@ static MACHINE_CONFIG_START( beaminv, beaminv_state ) MCFG_MACHINE_RESET(beaminv) /* video hardware */ - MCFG_VIDEO_UPDATE(beaminv) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 247, 16, 231) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(beaminv) MACHINE_CONFIG_END diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c index d345b29787c..5d4e9e8e8a8 100644 --- a/src/mame/drivers/beezer.c +++ b/src/mame/drivers/beezer.c @@ -92,9 +92,9 @@ static MACHINE_CONFIG_START( beezer, beezer_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 384) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 303) - MCFG_PALETTE_LENGTH(16) + MCFG_SCREEN_UPDATE(beezer) - MCFG_VIDEO_UPDATE(beezer) + MCFG_PALETTE_LENGTH(16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c index 746708e7614..fa9e42d5e3f 100644 --- a/src/mame/drivers/berzerk.c +++ b/src/mame/drivers/berzerk.c @@ -419,7 +419,7 @@ static void get_pens(running_machine *machine, pen_t *pens) } -static VIDEO_UPDATE( berzerk ) +static SCREEN_UPDATE( berzerk ) { pen_t pens[NUM_PENS]; offs_t offs; @@ -1058,11 +1058,11 @@ static MACHINE_CONFIG_START( berzerk, driver_device ) /* video hardware */ MCFG_VIDEO_START(berzerk) - MCFG_VIDEO_UPDATE(berzerk) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(berzerk) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 038ca7e0866..52a75f07c44 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -161,7 +161,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -static VIDEO_UPDATE(bestleag) +static SCREEN_UPDATE(bestleag) { bestleag_state *state = screen->machine->driver_data<bestleag_state>(); tilemap_set_scrollx(state->bg_tilemap,0,(state->vregs[0x00/2] & 0xfff) + (state->vregs[0x08/2] & 0x7) - 3); @@ -178,7 +178,7 @@ static VIDEO_UPDATE(bestleag) return 0; } -static VIDEO_UPDATE(bestleaw) +static SCREEN_UPDATE(bestleaw) { bestleag_state *state = screen->machine->driver_data<bestleag_state>(); tilemap_set_scrollx(state->bg_tilemap,0,state->vregs[0x08/2]); @@ -364,12 +364,12 @@ static MACHINE_CONFIG_START( bestleag, bestleag_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bestleag) MCFG_GFXDECODE(bestleag) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(bestleag) - MCFG_VIDEO_UPDATE(bestleag) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -379,8 +379,8 @@ static MACHINE_CONFIG_START( bestleag, bestleag_state ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bestleaw, bestleag ) - - MCFG_VIDEO_UPDATE(bestleaw) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(bestleaw) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 27fa58e7f88..f1b39ce1df5 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -339,7 +339,7 @@ static VIDEO_START( bfcobra ) } } -static VIDEO_UPDATE( bfcobra ) +static SCREEN_UPDATE( bfcobra ) { bfcobra_state *state = screen->machine->driver_data<bfcobra_state>(); int x, y; @@ -1788,6 +1788,8 @@ static MACHINE_CONFIG_START( bfcobra, bfcobra_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512 - 1, 0, 256 - 1) + MCFG_SCREEN_UPDATE(bfcobra) + MCFG_PALETTE_LENGTH(256) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1799,7 +1801,6 @@ static MACHINE_CONFIG_START( bfcobra, bfcobra_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_VIDEO_START(bfcobra) - MCFG_VIDEO_UPDATE(bfcobra) /* ACIAs */ MCFG_ACIA6850_ADD("acia6850_0", z80_acia_if) diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index 18ec73aae21..6b84bc7cc14 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -1301,10 +1301,10 @@ static MACHINE_CONFIG_DERIVED( scorpion1_adder2, scorpion1 ) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE( 400, 300) MCFG_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 300-1) + MCFG_SCREEN_UPDATE(adder2) MCFG_VIDEO_START( adder2) MCFG_VIDEO_RESET( adder2) - MCFG_VIDEO_UPDATE(adder2) MCFG_PALETTE_LENGTH(16) diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 8b3d67d0c46..ca3eb15d016 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -1499,7 +1499,7 @@ static MACHINE_RESET( init ) //BFM_dm01_reset(machine); No known video based game has a Matrix board } -static VIDEO_UPDATE( addersc2 ) +static SCREEN_UPDATE( addersc2 ) { bfm_sc2_state *state = screen->machine->driver_data<bfm_sc2_state>(); if ( state->sc2_show_door ) @@ -1507,7 +1507,7 @@ static VIDEO_UPDATE( addersc2 ) output_set_value("door",( Scorpion2_GetSwitchState(screen->machine,state->sc2_door_state>>4, state->sc2_door_state & 0x0F) ) ); } - return VIDEO_UPDATE_CALL(adder2); + return SCREEN_UPDATE_CALL(adder2); } // memory map for scorpion2 board video addon ///////////////////////////// @@ -2238,10 +2238,10 @@ static MACHINE_CONFIG_START( scorpion2_vid, bfm_sc2_state ) MCFG_SCREEN_SIZE( 400, 280) MCFG_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 280-1) MCFG_SCREEN_REFRESH_RATE(50) + MCFG_SCREEN_UPDATE(addersc2) MCFG_VIDEO_START( adder2) MCFG_VIDEO_RESET( adder2) - MCFG_VIDEO_UPDATE(addersc2) MCFG_PALETTE_LENGTH(16) MCFG_PALETTE_INIT(adder2) diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c index d18ca488ba1..b72a100ab77 100644 --- a/src/mame/drivers/big10.c +++ b/src/mame/drivers/big10.c @@ -267,14 +267,13 @@ static MACHINE_CONFIG_START( big10, big10_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MCFG_SCREEN_SIZE(512 + 32, (212 + 28) * 2) MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1) + MCFG_SCREEN_UPDATE(generic_bitmapped) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(v9938) MCFG_VIDEO_START(big10) - MCFG_VIDEO_UPDATE(generic_bitmapped) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index 4b030a8a705..c03c5f22be8 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -537,10 +537,11 @@ static MACHINE_CONFIG_START( bigevglf, bigevglf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bigevglf) + MCFG_GFXDECODE(bigevglf) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(bigevglf) - MCFG_VIDEO_UPDATE(bigevglf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 7b113ae560c..8be487ecf9a 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -271,7 +271,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -static VIDEO_UPDATE( bigfghtr ) +static SCREEN_UPDATE( bigfghtr ) { bigfghtr_state *state = screen->machine->driver_data<bigfghtr_state>(); int sprite_enable = state->vreg & 0x200; @@ -306,7 +306,7 @@ static VIDEO_UPDATE( bigfghtr ) -static VIDEO_EOF( bigfghtr ) +static SCREEN_EOF( bigfghtr ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram16_w(space, 0, 0, 0xffff); @@ -702,12 +702,13 @@ static MACHINE_CONFIG_START( bigfghtr, bigfghtr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(bigfghtr) + MCFG_SCREEN_EOF(bigfghtr) + MCFG_GFXDECODE(bigfghtr) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_EOF(bigfghtr) MCFG_VIDEO_START(bigfghtr) - MCFG_VIDEO_UPDATE(bigfghtr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c index 5296434e741..80206267e15 100644 --- a/src/mame/drivers/bigstrkb.c +++ b/src/mame/drivers/bigstrkb.c @@ -208,12 +208,11 @@ static MACHINE_CONFIG_START( bigstrkb, bigstrkb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) - + MCFG_SCREEN_UPDATE(bigstrkb) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(bigstrkb) - MCFG_VIDEO_UPDATE(bigstrkb) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") // MCFG_SOUND_ADD("ymsnd", YM2151, ym2151_config) diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c index 14e86e75a87..889615da72d 100644 --- a/src/mame/drivers/bingoc.c +++ b/src/mame/drivers/bingoc.c @@ -51,7 +51,7 @@ static VIDEO_START(bingoc) } -static VIDEO_UPDATE(bingoc) +static SCREEN_UPDATE(bingoc) { return 0; } @@ -156,11 +156,11 @@ static MACHINE_CONFIG_START( bingoc, bingoc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(bingoc) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(bingoc) - MCFG_VIDEO_UPDATE(bingoc) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") //might just be mono... diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c index fb1fd7adc28..a164c77e9aa 100644 --- a/src/mame/drivers/bingor.c +++ b/src/mame/drivers/bingor.c @@ -449,7 +449,7 @@ static VIDEO_START(bingor) } -static VIDEO_UPDATE(bingor) +static SCREEN_UPDATE(bingor) { int x,y,count; @@ -623,11 +623,11 @@ static MACHINE_CONFIG_START( bingor, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1) + MCFG_SCREEN_UPDATE(bingor) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(bingor) - MCFG_VIDEO_UPDATE(bingor) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("saa", SAA1099, 6000000 ) diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index 2d0b2ce6b8b..9c4b2f0a089 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -383,12 +383,13 @@ static MACHINE_CONFIG_START( bionicc, bionicc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bionicc) + MCFG_SCREEN_EOF(bionicc) + MCFG_GFXDECODE(bionicc) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(bionicc) - MCFG_VIDEO_EOF(bionicc) - MCFG_VIDEO_UPDATE(bionicc) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c index 2ec2c18f07c..a70857c34e5 100644 --- a/src/mame/drivers/bishi.c +++ b/src/mame/drivers/bishi.c @@ -437,11 +437,11 @@ static MACHINE_CONFIG_START( bishi, bishi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(29, 29+288-1, 16, 16+224-1) + MCFG_SCREEN_UPDATE(bishi) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(bishi) - MCFG_VIDEO_UPDATE(bishi) MCFG_K056832_ADD("k056832", bishi_k056832_intf) MCFG_K054338_ADD("k054338", bishi_k054338_intf) diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index d1d82967483..c981ce9c7c0 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -504,13 +504,14 @@ static MACHINE_CONFIG_START( bking, bking_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bking) + MCFG_SCREEN_EOF(bking) + MCFG_GFXDECODE(bking) MCFG_PALETTE_LENGTH(4*8+4*4+4*2+4*2) MCFG_PALETTE_INIT(bking) MCFG_VIDEO_START(bking) - MCFG_VIDEO_UPDATE(bking) - MCFG_VIDEO_EOF(bking) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index 2d55f3e6f82..6a075f7c29b 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -118,7 +118,7 @@ static void draw_main(running_machine *machine, bitmap_t *bitmap, const rectangl } -static VIDEO_UPDATE( blackt96 ) +static SCREEN_UPDATE( blackt96 ) { int count; int x,y; @@ -488,11 +488,11 @@ static MACHINE_CONFIG_START( blackt96, driver_device ) MCFG_SCREEN_SIZE(256, 256) // MCFG_SCREEN_VISIBLE_AREA(0*8, 16*32-1, 0*8, 16*32-1) MCFG_SCREEN_VISIBLE_AREA(0*8, 256-1, 0*8, 208-1) + MCFG_SCREEN_UPDATE(blackt96) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(blackt96) - MCFG_VIDEO_UPDATE(blackt96) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index 094e93523d6..89d94d4edbb 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -355,13 +355,12 @@ static MACHINE_CONFIG_START( bladestl, bladestl_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bladestl) MCFG_GFXDECODE(bladestl) MCFG_PALETTE_INIT(bladestl) MCFG_PALETTE_LENGTH(32 + 16*16) - MCFG_VIDEO_UPDATE(bladestl) - MCFG_K007342_ADD("k007342", bladestl_k007342_intf) MCFG_K007420_ADD("k007420", bladestl_k007420_intf) MCFG_K051733_ADD("k051733") diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c index 87cb1d76025..dc5b18ed55d 100644 --- a/src/mame/drivers/blitz.c +++ b/src/mame/drivers/blitz.c @@ -338,7 +338,7 @@ static VIDEO_START( megadpkr ) bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -static VIDEO_UPDATE( megadpkr ) +static SCREEN_UPDATE( megadpkr ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -789,6 +789,7 @@ static MACHINE_CONFIG_START( megadpkr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((32)*8, (32)*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(megadpkr) MCFG_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf) @@ -796,7 +797,6 @@ static MACHINE_CONFIG_START( megadpkr, driver_device ) MCFG_PALETTE_INIT(megadpkr) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(megadpkr) - MCFG_VIDEO_UPDATE(megadpkr) MACHINE_CONFIG_END diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c index be165e27094..64eec28d2f7 100644 --- a/src/mame/drivers/blitz68k.c +++ b/src/mame/drivers/blitz68k.c @@ -79,7 +79,7 @@ static VIDEO_START(blitz68k_addr_factor1) blit.addr_factor = 1; } -static VIDEO_UPDATE(blitz68k) +static SCREEN_UPDATE(blitz68k) { int x,y; @@ -100,7 +100,7 @@ static VIDEO_UPDATE(blitz68k) static UINT16 *frame_buffer; -static VIDEO_UPDATE(blitz68k_noblit) +static SCREEN_UPDATE(blitz68k_noblit) { int x,y; @@ -1675,12 +1675,13 @@ static MACHINE_CONFIG_START( ilpag, blitz68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(blitz68k) + MCFG_NVRAM_ADD_0FILL("nvram") MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(blitz68k) - MCFG_VIDEO_UPDATE(blitz68k) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 0) @@ -1754,12 +1755,13 @@ static MACHINE_CONFIG_START( cjffruit, blitz68k_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-8-1) + MCFG_SCREEN_UPDATE(blitz68k) + MCFG_MC6845_ADD("crtc", R6545_1, XTAL_22_1184MHz/8, mc6845_intf_irq1) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(blitz68k) - MCFG_VIDEO_UPDATE(blitz68k) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 0) @@ -1785,12 +1787,13 @@ static MACHINE_CONFIG_START( bankrob, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4) + MCFG_SCREEN_UPDATE(blitz68k) + MCFG_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(blitz68k) - MCFG_VIDEO_UPDATE(blitz68k) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 0) @@ -1814,12 +1817,13 @@ static MACHINE_CONFIG_START( bankroba, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+7, 256-1) + MCFG_SCREEN_UPDATE(blitz68k) + MCFG_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq5) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(blitz68k_addr_factor1) - MCFG_VIDEO_UPDATE(blitz68k) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 0) @@ -1842,12 +1846,13 @@ static MACHINE_CONFIG_START( deucesw2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(blitz68k) + MCFG_MC6845_ADD("crtc", R6545_1, XTAL_22_1184MHz/8, mc6845_intf_irq3) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(blitz68k) - MCFG_VIDEO_UPDATE(blitz68k) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 0) @@ -1872,12 +1877,13 @@ static MACHINE_CONFIG_START( dualgame, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4) + MCFG_SCREEN_UPDATE(blitz68k) + MCFG_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(blitz68k) - MCFG_VIDEO_UPDATE(blitz68k) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 0) @@ -1900,12 +1906,13 @@ static MACHINE_CONFIG_START( hermit, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4) + MCFG_SCREEN_UPDATE(blitz68k) + MCFG_MC6845_ADD("crtc", H46505, XTAL_22_1184MHz/8, mc6845_intf_irq1) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(blitz68k) - MCFG_VIDEO_UPDATE(blitz68k) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 0) @@ -1933,12 +1940,12 @@ static MACHINE_CONFIG_START( maxidbl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(blitz68k_noblit) + MCFG_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3) MCFG_PALETTE_LENGTH(0x100) - MCFG_VIDEO_UPDATE(blitz68k_noblit) - MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("saa", SAA1099, XTAL_8MHz/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index 05cc91f4198..be2a6620466 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -345,13 +345,13 @@ static MACHINE_CONFIG_START( blktiger, blktiger_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(blktiger) + MCFG_SCREEN_EOF(blktiger) MCFG_GFXDECODE(blktiger) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(blktiger) - MCFG_VIDEO_EOF(blktiger) - MCFG_VIDEO_UPDATE(blktiger) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 18121382759..b15d6f1bae8 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -373,12 +373,12 @@ static MACHINE_CONFIG_START( blmbycar, blmbycar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x180, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0x100-1) + MCFG_SCREEN_UPDATE(blmbycar) MCFG_GFXDECODE(blmbycar) MCFG_PALETTE_LENGTH(0x300) MCFG_VIDEO_START(blmbycar) - MCFG_VIDEO_UPDATE(blmbycar) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -420,12 +420,12 @@ static MACHINE_CONFIG_START( watrball, blmbycar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x180, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 16, 0x100-1) + MCFG_SCREEN_UPDATE(blmbycar) MCFG_GFXDECODE(blmbycar) MCFG_PALETTE_LENGTH(0x300) MCFG_VIDEO_START(blmbycar) - MCFG_VIDEO_UPDATE(blmbycar) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c index 67098d37e8e..ddc2927c332 100644 --- a/src/mame/drivers/blockade.c +++ b/src/mame/drivers/blockade.c @@ -488,13 +488,13 @@ static MACHINE_CONFIG_START( blockade, blockade_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(blockade) MCFG_GFXDECODE(blockade) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(blockade) MCFG_VIDEO_START(blockade) - MCFG_VIDEO_UPDATE(blockade) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 981654286b0..7271f27fd49 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -239,11 +239,11 @@ static MACHINE_CONFIG_START( blockhl, blockhl_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(blockhl) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(blockhl) - MCFG_VIDEO_UPDATE(blockhl) MCFG_K052109_ADD("k052109", blockhl_k052109_intf) MCFG_K051960_ADD("k051960", blockhl_k051960_intf) diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index 41e3668e459..c58f8785b55 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -289,11 +289,11 @@ static MACHINE_CONFIG_START( blockout, blockout_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 319, 8, 247) + MCFG_SCREEN_UPDATE(blockout) MCFG_PALETTE_LENGTH(513) MCFG_VIDEO_START(blockout) - MCFG_VIDEO_UPDATE(blockout) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c index 9cc0590f026..2b8cd28cb1e 100644 --- a/src/mame/drivers/bloodbro.c +++ b/src/mame/drivers/bloodbro.c @@ -438,12 +438,12 @@ static MACHINE_CONFIG_START( bloodbro, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bloodbro) MCFG_GFXDECODE(bloodbro) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(bloodbro) - MCFG_VIDEO_UPDATE(bloodbro) // sound hardware SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_7_15909MHz/2, XTAL_12MHz/12) @@ -458,7 +458,8 @@ static MACHINE_CONFIG_DERIVED( weststry, bloodbro ) MCFG_GFXDECODE(weststry) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_UPDATE(weststry) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(weststry) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( skysmash, bloodbro ) @@ -466,7 +467,8 @@ static MACHINE_CONFIG_DERIVED( skysmash, bloodbro ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_VBLANK_INT("screen", irq2_line_hold) - MCFG_VIDEO_UPDATE(skysmash) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(skysmash) MACHINE_CONFIG_END /* ROMs */ diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index 6ec5d155ded..b5a75726a4c 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -221,9 +221,9 @@ static MACHINE_CONFIG_START( blstroid, blstroid_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 320*2, 262, 0, 240) + MCFG_SCREEN_UPDATE(blstroid) MCFG_VIDEO_START(blstroid) - MCFG_VIDEO_UPDATE(blstroid) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_i_stereo) diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c index 3c1a06366f6..0bed1f0a36c 100644 --- a/src/mame/drivers/blueprnt.c +++ b/src/mame/drivers/blueprnt.c @@ -319,13 +319,13 @@ static MACHINE_CONFIG_START( blueprnt, blueprnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(blueprnt) MCFG_GFXDECODE(blueprnt) MCFG_PALETTE_LENGTH(128*4+8) MCFG_PALETTE_INIT(blueprnt) MCFG_VIDEO_START(blueprnt) - MCFG_VIDEO_UPDATE(blueprnt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index efd2e5e16c9..a2b74c19073 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -132,7 +132,7 @@ static VIDEO_START( bmcbowl ) { } -static VIDEO_UPDATE( bmcbowl ) +static SCREEN_UPDATE( bmcbowl ) { bmcbowl_state *state = screen->machine->driver_data<bmcbowl_state>(); /* @@ -508,11 +508,11 @@ static MACHINE_CONFIG_START( bmcbowl, bmcbowl_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(35*8, 30*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 0*8, 29*8-1) + MCFG_SCREEN_UPDATE(bmcbowl) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(bmcbowl) - MCFG_VIDEO_UPDATE(bmcbowl) MCFG_NVRAM_HANDLER(bmcbowl) MCFG_MACHINE_RESET(bmcbowl) diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index c3a67e3562f..22ce539845a 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -512,7 +512,7 @@ static VIDEO_START(bnstars) -static VIDEO_UPDATE(bnstars) +static SCREEN_UPDATE(bnstars) { bnstars_state *state = screen->machine->driver_data<bnstars_state>(); device_t *left_screen = screen->machine->device("lscreen"); @@ -1379,6 +1379,7 @@ static MACHINE_CONFIG_START( bnstars, bnstars_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(bnstars) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -1386,9 +1387,9 @@ static MACHINE_CONFIG_START( bnstars, bnstars_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(bnstars) MCFG_VIDEO_START(bnstars) - MCFG_VIDEO_UPDATE(bnstars) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index 4cfbddb5390..d74076b42ea 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -261,13 +261,13 @@ static MACHINE_CONFIG_START( bogeyman, bogeyman_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(bogeyman) MCFG_GFXDECODE(bogeyman) MCFG_PALETTE_LENGTH(16+256) MCFG_PALETTE_INIT(bogeyman) MCFG_VIDEO_START(bogeyman) - MCFG_VIDEO_UPDATE(bogeyman) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index f38efaed66c..1352cd0cbf8 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -366,12 +366,12 @@ static MACHINE_CONFIG_START( bombjack, bombjack_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bombjack) MCFG_GFXDECODE(bombjack) MCFG_PALETTE_LENGTH(128) MCFG_VIDEO_START(bombjack) - MCFG_VIDEO_UPDATE(bombjack) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index 18400582fe0..3fc84b506ef 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -341,12 +341,11 @@ static MACHINE_CONFIG_START( boogwing, boogwing_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(boogwing) MCFG_PALETTE_LENGTH(2048) MCFG_GFXDECODE(boogwing) - MCFG_VIDEO_UPDATE(boogwing) - MCFG_DECO16IC_ADD("deco_custom", boogwing_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index d385064a79b..16664b9916e 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -384,11 +384,11 @@ static MACHINE_CONFIG_START( bottom9, bottom9_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(bottom9) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(bottom9) - MCFG_VIDEO_UPDATE(bottom9) MCFG_K052109_ADD("k052109", bottom9_k052109_intf) MCFG_K051960_ADD("k051960", bottom9_k051960_intf) diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 3dfc385b8d1..73cd8280b8b 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -157,7 +157,7 @@ static void draw_boxer( running_machine *machine, bitmap_t* bitmap, const rectan } -static VIDEO_UPDATE( boxer ) +static SCREEN_UPDATE( boxer ) { boxer_state *state = screen->machine->driver_data<boxer_state>(); int i, j; @@ -450,11 +450,11 @@ static MACHINE_CONFIG_START( boxer, boxer_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 262) MCFG_SCREEN_VISIBLE_AREA(8, 247, 0, 239) + MCFG_SCREEN_UPDATE(boxer) MCFG_GFXDECODE(boxer) MCFG_PALETTE_LENGTH(4) MCFG_PALETTE_INIT(boxer) - MCFG_VIDEO_UPDATE(boxer) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index 7df9762f0ba..41faeb17cc3 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -405,10 +405,10 @@ static MACHINE_CONFIG_START( brkthru, brkthru_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 8, 248, 272, 8, 248) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(brkthru) MCFG_PALETTE_INIT(brkthru) MCFG_VIDEO_START(brkthru) - MCFG_VIDEO_UPDATE(brkthru) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -457,10 +457,10 @@ static MACHINE_CONFIG_START( darwin, brkthru_state ) = 57.444855Hz tuned by Shingo SUZUKI(VSyncMAME Project) 2000/10/19 */ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(brkthru) MCFG_PALETTE_INIT(brkthru) MCFG_VIDEO_START(brkthru) - MCFG_VIDEO_UPDATE(brkthru) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index eadbeb0b98e..63e7eb1b0f8 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -264,13 +264,13 @@ static MACHINE_CONFIG_START( bsktball, bsktball_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(bsktball) MCFG_GFXDECODE(bsktball) MCFG_PALETTE_LENGTH(2*4 + 4*4*4*4) MCFG_PALETTE_INIT(bsktball) MCFG_VIDEO_START(bsktball) - MCFG_VIDEO_UPDATE(bsktball) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index 5e8d4ec4c68..6e933d3a05d 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -1501,6 +1501,7 @@ static MACHINE_CONFIG_START( btime, btime_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(HCLK, 384, 8, 248, 272, 8, 248) + MCFG_SCREEN_UPDATE(btime) MCFG_MACHINE_START(btime) MCFG_MACHINE_RESET(btime) @@ -1510,7 +1511,6 @@ static MACHINE_CONFIG_START( btime, btime_state ) MCFG_PALETTE_INIT(btime) MCFG_VIDEO_START(btime) - MCFG_VIDEO_UPDATE(btime) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1545,8 +1545,9 @@ static MACHINE_CONFIG_DERIVED( cookrace, btime ) /* video hardware */ MCFG_GFXDECODE(cookrace) MCFG_PALETTE_LENGTH(16) - - MCFG_VIDEO_UPDATE(cookrace) + + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(cookrace) MACHINE_CONFIG_END @@ -1563,7 +1564,8 @@ static MACHINE_CONFIG_DERIVED( lnc, btime ) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(lnc) - MCFG_VIDEO_UPDATE(lnc) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(lnc) MACHINE_CONFIG_END @@ -1572,7 +1574,8 @@ static MACHINE_CONFIG_DERIVED( wtennis, lnc ) /* basic machine hardware */ /* video hardware */ - MCFG_VIDEO_UPDATE(eggs) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(eggs) MACHINE_CONFIG_END @@ -1598,7 +1601,8 @@ static MACHINE_CONFIG_DERIVED( sdtennis, btime ) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(bnj) - MCFG_VIDEO_UPDATE(bnj) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(bnj) MACHINE_CONFIG_END @@ -1625,7 +1629,8 @@ static MACHINE_CONFIG_DERIVED( zoar, btime ) MCFG_GFXDECODE(zoar) MCFG_PALETTE_LENGTH(64) - MCFG_VIDEO_UPDATE(zoar) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(zoar) MCFG_SOUND_REPLACE("ay1", AY8910, HCLK1) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23) @@ -1650,7 +1655,8 @@ static MACHINE_CONFIG_DERIVED( disco, btime ) MCFG_GFXDECODE(disco) MCFG_PALETTE_LENGTH(32) - MCFG_VIDEO_UPDATE(disco) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(disco) MACHINE_CONFIG_END diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c index 2d279433e7e..8f3a2b930be 100644 --- a/src/mame/drivers/btoads.c +++ b/src/mame/drivers/btoads.c @@ -351,11 +351,11 @@ static MACHINE_CONFIG_START( btoads, driver_device ) MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) MCFG_VIDEO_START(btoads) - MCFG_VIDEO_UPDATE(tms340x0) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 640, 0, 512, 257, 0, 224) + MCFG_SCREEN_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index c5ec2d6eff7..e0b6ac73e34 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -787,12 +787,11 @@ static MACHINE_CONFIG_START( tokio, bublbobl_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MAIN_XTAL/4, 384, 0, 256, 264, 16, 240) + MCFG_SCREEN_UPDATE(bublbobl) MCFG_GFXDECODE(bublbobl) MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_UPDATE(bublbobl) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -872,12 +871,11 @@ static MACHINE_CONFIG_START( bublbobl, bublbobl_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MAIN_XTAL/4, 384, 0, 256, 264, 16, 240) + MCFG_SCREEN_UPDATE(bublbobl) MCFG_GFXDECODE(bublbobl) MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_UPDATE(bublbobl) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index b1a8bad6f8b..7389d36a301 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -419,13 +419,13 @@ static MACHINE_CONFIG_START( buggychl, buggychl_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(buggychl) MCFG_GFXDECODE(buggychl) MCFG_PALETTE_LENGTH(128+128) MCFG_PALETTE_INIT(buggychl) MCFG_VIDEO_START(buggychl) - MCFG_VIDEO_UPDATE(buggychl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c index 6d934de1c59..89c660a3b6b 100644 --- a/src/mame/drivers/buster.c +++ b/src/mame/drivers/buster.c @@ -18,7 +18,7 @@ static VIDEO_START(buster) } -static VIDEO_UPDATE(buster) +static SCREEN_UPDATE(buster) { const gfx_element *gfx = screen->machine->gfx[0]; int count = 0x0000; @@ -82,12 +82,12 @@ static MACHINE_CONFIG_START( buster, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(buster) MCFG_GFXDECODE(buster) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(buster) - MCFG_VIDEO_UPDATE(buster) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c index b352ee3c18b..801d924b57e 100644 --- a/src/mame/drivers/bwidow.c +++ b/src/mame/drivers/bwidow.c @@ -734,9 +734,9 @@ static MACHINE_CONFIG_START( bwidow, bwidow_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 480, 0, 440) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(avg) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index 3451225152f..b268582a78e 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -444,13 +444,13 @@ static MACHINE_CONFIG_START( bwing, bwing_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(bwing) MCFG_GFXDECODE(bwing) MCFG_PALETTE_LENGTH(64) MCFG_VIDEO_START(bwing) - MCFG_VIDEO_UPDATE(bwing) - + // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index c0a26a8ad05..02a0857c504 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -563,9 +563,9 @@ static MACHINE_CONFIG_START( bzone_base, driver_device ) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 580, 0, 400) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(avg_bzone) - MCFG_VIDEO_UPDATE(vector) /* Drivers */ MCFG_MATHBOX_ADD("mathbox") diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index c7725599d4c..9450e3f4079 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -503,12 +503,12 @@ static MACHINE_CONFIG_START( cabal, cabal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(cabal) MCFG_GFXDECODE(cabal) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(cabal) - MCFG_VIDEO_UPDATE(cabal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -558,12 +558,12 @@ static MACHINE_CONFIG_START( cabalbl, cabal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(cabal) MCFG_GFXDECODE(cabal) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(cabal) - MCFG_VIDEO_UPDATE(cabal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index 7f780c548d2..1988be29105 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -104,7 +104,7 @@ static VIDEO_START(cabaret) } -static VIDEO_UPDATE(cabaret) +static SCREEN_UPDATE(cabaret) { cabaret_state *state = screen->machine->driver_data<cabaret_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -341,12 +341,12 @@ static MACHINE_CONFIG_START( cabaret, cabaret_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(cabaret) MCFG_GFXDECODE(cabaret) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(cabaret) - MCFG_VIDEO_UPDATE(cabaret) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c index 9c92968fceb..8b030ffc638 100644 --- a/src/mame/drivers/calchase.c +++ b/src/mame/drivers/calchase.c @@ -116,7 +116,7 @@ static VIDEO_START(calchase) } -static VIDEO_UPDATE(calchase) +static SCREEN_UPDATE(calchase) { int x,y,count,i; @@ -676,9 +676,9 @@ static MACHINE_CONFIG_START( calchase, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(calchase) MCFG_VIDEO_START(calchase) - MCFG_VIDEO_UPDATE(calchase) MACHINE_CONFIG_END static DRIVER_INIT( calchase ) diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c index a5f9a2bcd26..59689785f29 100644 --- a/src/mame/drivers/calomega.c +++ b/src/mame/drivers/calomega.c @@ -2754,13 +2754,13 @@ static MACHINE_CONFIG_START( sys903, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((39+1)*8, (31+1)*8) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 31*8-1) /* Taken from MC6845 init, registers 01 & 06 */ + MCFG_SCREEN_UPDATE(calomega) MCFG_GFXDECODE(calomega) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(calomega) MCFG_VIDEO_START(calomega) - MCFG_VIDEO_UPDATE(calomega) MCFG_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf) /* 6845 @ CPU clock */ diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index f06ef624bbc..7ead9166498 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -138,7 +138,7 @@ static VIDEO_START( calorie ) tilemap_set_transparent_pen(state->fg_tilemap, 0); } -static VIDEO_UPDATE( calorie ) +static SCREEN_UPDATE( calorie ) { calorie_state *state = screen->machine->driver_data<calorie_state>(); int x; @@ -451,12 +451,12 @@ static MACHINE_CONFIG_START( calorie, calorie_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(calorie) MCFG_GFXDECODE(calorie) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(calorie) - MCFG_VIDEO_UPDATE(calorie) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c index 036aa11e902..80ff6b467ba 100644 --- a/src/mame/drivers/canyon.c +++ b/src/mame/drivers/canyon.c @@ -249,13 +249,13 @@ static MACHINE_CONFIG_START( canyon, canyon_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 240) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE(canyon) MCFG_GFXDECODE(canyon) MCFG_PALETTE_LENGTH(4) MCFG_PALETTE_INIT(canyon) MCFG_VIDEO_START(canyon) - MCFG_VIDEO_UPDATE(canyon) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index d1466a70683..46e06c6e11c 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -380,13 +380,13 @@ static MACHINE_CONFIG_START( capbowl, capbowl_state ) /* video hardware */ MCFG_VIDEO_START(capbowl) - MCFG_VIDEO_UPDATE(capbowl) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(360, 256) MCFG_SCREEN_VISIBLE_AREA(0, 359, 0, 244) MCFG_SCREEN_REFRESH_RATE(57) + MCFG_SCREEN_UPDATE(capbowl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c index 104703fec30..a4c8ede525d 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -33,7 +33,7 @@ static UINT8 *colorram; x<<3, y<<3,\ transparency?transparency:(UINT32)-1); -static VIDEO_UPDATE( cardline ) +static SCREEN_UPDATE( cardline ) { int x,y; bitmap_fill(bitmap,cliprect,0); @@ -207,13 +207,12 @@ static MACHINE_CONFIG_START( cardline, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 35*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(cardline) MCFG_GFXDECODE(cardline) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(cardline) - MCFG_VIDEO_UPDATE(cardline) - MCFG_DEFAULT_LAYOUT(layout_cardline) /* sound hardware */ diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c index 66cfba1ad0d..97ae97663d0 100644 --- a/src/mame/drivers/carjmbre.c +++ b/src/mame/drivers/carjmbre.c @@ -210,13 +210,13 @@ static MACHINE_CONFIG_START( carjmbre, carjmbre_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(carjmbre) MCFG_GFXDECODE(carjmbre) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(carjmbre) MCFG_VIDEO_START(carjmbre) - MCFG_VIDEO_UPDATE(carjmbre) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c index 83ddf68a58c..de69b2789d8 100644 --- a/src/mame/drivers/carpolo.c +++ b/src/mame/drivers/carpolo.c @@ -267,14 +267,14 @@ static MACHINE_CONFIG_START( carpolo, carpolo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 239, 0, 255) + MCFG_SCREEN_UPDATE(carpolo) + MCFG_SCREEN_EOF(carpolo) MCFG_GFXDECODE(carpolo) MCFG_PALETTE_LENGTH(12*2+2*16+4*2) MCFG_PALETTE_INIT(carpolo) MCFG_VIDEO_START(carpolo) - MCFG_VIDEO_UPDATE(carpolo) - MCFG_VIDEO_EOF(carpolo) MACHINE_CONFIG_END diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index 950776263e6..e45fba7cc1e 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -237,7 +237,7 @@ static GFXDECODE_START( carrera ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 1 ) GFXDECODE_END -static VIDEO_UPDATE(carrera) +static SCREEN_UPDATE(carrera) { int x,y; @@ -327,6 +327,7 @@ static MACHINE_CONFIG_START( carrera, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(carrera) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf) @@ -334,8 +335,6 @@ static MACHINE_CONFIG_START( carrera, driver_device ) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(carrera) - MCFG_VIDEO_UPDATE(carrera) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c index bccbaad0b31..2dda9fe3f8b 100644 --- a/src/mame/drivers/caswin.c +++ b/src/mame/drivers/caswin.c @@ -79,7 +79,7 @@ static VIDEO_START(vvillage) state->sc0_tilemap = tilemap_create(machine, get_sc0_tile_info,tilemap_scan_rows,8,8,32,32); } -static VIDEO_UPDATE(vvillage) +static SCREEN_UPDATE(vvillage) { caswin_state *state = screen->machine->driver_data<caswin_state>(); tilemap_draw(bitmap,cliprect,state->sc0_tilemap,0,0); @@ -305,6 +305,7 @@ static MACHINE_CONFIG_START( vvillage, caswin_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(vvillage) MCFG_NVRAM_ADD_0FILL("nvram") @@ -313,7 +314,6 @@ static MACHINE_CONFIG_START( vvillage, caswin_state ) MCFG_PALETTE_INIT(caswin) MCFG_VIDEO_START(vvillage) - MCFG_VIDEO_UPDATE(vvillage) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index f3142ce9d59..6722fa0ee41 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -1875,13 +1875,13 @@ static MACHINE_CONFIG_START( dfeveron, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(dfeveron) MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT(dfeveron) MCFG_VIDEO_START(cave_2_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1918,13 +1918,13 @@ static MACHINE_CONFIG_START( ddonpach, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(ddonpach) MCFG_PALETTE_LENGTH(0x8000 + 0x40*16) // $400 extra entries for layers 1&2 MCFG_PALETTE_INIT(ddonpach) MCFG_VIDEO_START(cave_3_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1965,13 +1965,13 @@ static MACHINE_CONFIG_START( donpachi, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(donpachi) MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT(dfeveron) MCFG_VIDEO_START(cave_3_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2012,13 +2012,13 @@ static MACHINE_CONFIG_START( esprade, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(esprade) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(cave) MCFG_VIDEO_START(cave_3_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2053,13 +2053,13 @@ static MACHINE_CONFIG_START( gaia, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(esprade) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(cave) MCFG_VIDEO_START(cave_3_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2095,13 +2095,13 @@ static MACHINE_CONFIG_START( guwange, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(esprade) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(cave) MCFG_VIDEO_START(cave_3_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2140,13 +2140,13 @@ static MACHINE_CONFIG_START( hotdogst, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 240) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(hotdogst) MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT(dfeveron) MCFG_VIDEO_START(cave_3_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2193,13 +2193,13 @@ static MACHINE_CONFIG_START( korokoro, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1-2, 0, 240-1-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(korokoro) MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT(korokoro) MCFG_VIDEO_START(cave_1_layer) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2248,13 +2248,13 @@ static MACHINE_CONFIG_START( mazinger, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 240) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(mazinger) MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT(mazinger) MCFG_VIDEO_START(cave_2_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2307,13 +2307,13 @@ static MACHINE_CONFIG_START( metmqstr, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 240) MCFG_SCREEN_VISIBLE_AREA(0x7d, 0x7d + 0x180-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(donpachi) MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT(dfeveron) MCFG_VIDEO_START(cave_3_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2363,13 +2363,13 @@ static MACHINE_CONFIG_START( pacslot, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 240) MCFG_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(tjumpman) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(cave) MCFG_VIDEO_START(cave_1_layer) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2420,13 +2420,13 @@ static MACHINE_CONFIG_START( pwrinst2, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 240) MCFG_SCREEN_VISIBLE_AREA(0x70, 0x70 + 0x140-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(pwrinst2) MCFG_PALETTE_LENGTH(0x8000+0x2800) MCFG_PALETTE_INIT(pwrinst2) MCFG_VIDEO_START(cave_4_layers) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2484,13 +2484,13 @@ static MACHINE_CONFIG_START( sailormn, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320+1, 240) MCFG_SCREEN_VISIBLE_AREA(0+1, 320+1-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(sailormn) MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT(sailormn) // 4 bit sprites, 6 bit tiles MCFG_VIDEO_START(sailormn_3_layers) /* Layer 2 has 1 banked ROM */ - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2539,13 +2539,13 @@ static MACHINE_CONFIG_START( tjumpman, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 240) MCFG_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(tjumpman) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(cave) MCFG_VIDEO_START(cave_1_layer) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2581,13 +2581,13 @@ static MACHINE_CONFIG_START( uopoko, cave_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(cave) MCFG_GFXDECODE(uopoko) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(cave) MCFG_VIDEO_START(cave_1_layer) - MCFG_VIDEO_UPDATE(cave) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index 8020ecc888b..3e6c574a20b 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -316,7 +316,7 @@ static const rectangle visible2 = { 0*8, (14+48)*8-1, 10*8, (10+7)*8-1 }; static const rectangle visible3 = { 0*8, (14+48)*8-1, 17*8, (17+7)*8-1 }; static int other1,other2; -static VIDEO_UPDATE(cb2001) +static SCREEN_UPDATE(cb2001) { int count,x,y; bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); @@ -832,11 +832,11 @@ static MACHINE_CONFIG_START( cb2001, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(cb2001) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(cb2001) - MCFG_VIDEO_UPDATE(cb2001) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 508d33b9e5c..405a3c8ed49 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -50,7 +50,7 @@ static VIDEO_START( cball ) } -static VIDEO_UPDATE( cball ) +static SCREEN_UPDATE( cball ) { cball_state *state = screen->machine->driver_data<cball_state>(); @@ -238,13 +238,13 @@ static MACHINE_CONFIG_START( cball, cball_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 262) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 223) + MCFG_SCREEN_UPDATE(cball) MCFG_GFXDECODE(cball) MCFG_PALETTE_LENGTH(6) MCFG_PALETTE_INIT(cball) MCFG_VIDEO_START(cball) - MCFG_VIDEO_UPDATE(cball) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index baa8552aa2a..92d82d2c56c 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -298,12 +298,12 @@ static MACHINE_CONFIG_START( cbasebal, cbasebal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(cbasebal) MCFG_GFXDECODE(cbasebal) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(cbasebal) - MCFG_VIDEO_UPDATE(cbasebal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 250f3f51065..d114604b6ba 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -335,12 +335,11 @@ static MACHINE_CONFIG_START( twocrude, cbuster_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(twocrude) MCFG_GFXDECODE(cbuster) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(twocrude) - MCFG_DECO16IC_ADD("deco_custom", twocrude_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index f4126af05e4..cddce4659d4 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -498,9 +498,9 @@ static MACHINE_CONFIG_START( ccastles, ccastles_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, HTOTAL - 1, VTOTAL, 0, VTOTAL - 1) /* will be adjusted later */ + MCFG_SCREEN_UPDATE(ccastles) MCFG_VIDEO_START(ccastles) - MCFG_VIDEO_UPDATE(ccastles) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c index ce5b02276bf..2784a55207b 100644 --- a/src/mame/drivers/cchance.c +++ b/src/mame/drivers/cchance.c @@ -220,12 +220,11 @@ static MACHINE_CONFIG_START( cchance, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_PALETTE_LENGTH(512) - MCFG_PALETTE_INIT(arknoid2) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c index c406f8eef4d..f20ba3e009f 100644 --- a/src/mame/drivers/cchasm.c +++ b/src/mame/drivers/cchasm.c @@ -171,9 +171,9 @@ static MACHINE_CONFIG_START( cchasm, cchasm_state ) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 768-1) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(cchasm) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SOUND_START(cchasm) diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index 60d41b85b9c..e515a74fcc5 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -998,13 +998,13 @@ static MACHINE_CONFIG_START( root, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(cclimber) MCFG_GFXDECODE(cclimber) MCFG_PALETTE_LENGTH(16*4+8*4) MCFG_PALETTE_INIT(cclimber) MCFG_VIDEO_START(cclimber) - MCFG_VIDEO_UPDATE(cclimber) MACHINE_CONFIG_END @@ -1048,7 +1048,8 @@ static MACHINE_CONFIG_DERIVED( yamato, root ) /* video hardware */ MCFG_PALETTE_LENGTH(16*4+8*4+256) MCFG_PALETTE_INIT(yamato) - MCFG_VIDEO_UPDATE(yamato) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(yamato) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1073,7 +1074,8 @@ static MACHINE_CONFIG_DERIVED( toprollr, cclimber ) MCFG_PALETTE_INIT(toprollr) MCFG_VIDEO_START(toprollr) - MCFG_VIDEO_UPDATE(toprollr) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(toprollr) MACHINE_CONFIG_END @@ -1096,13 +1098,13 @@ static MACHINE_CONFIG_START( swimmer, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(swimmer) MCFG_GFXDECODE(swimmer) MCFG_PALETTE_LENGTH(32*8+4*8+1) MCFG_PALETTE_INIT(swimmer) MCFG_VIDEO_START(swimmer) - MCFG_VIDEO_UPDATE(swimmer) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c index eddceac1e51..0620921c125 100644 --- a/src/mame/drivers/cdi.c +++ b/src/mame/drivers/cdi.c @@ -281,6 +281,7 @@ static MACHINE_CONFIG_START( cdi, cdi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(384, 302) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 22, 302-1) //dynamic resolution,TODO + MCFG_SCREEN_UPDATE(cdimono1) MCFG_SCREEN_ADD("lcd", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -288,13 +289,13 @@ static MACHINE_CONFIG_START( cdi, cdi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(192, 22) MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 22-1) + MCFG_SCREEN_UPDATE(cdimono1_lcd) MCFG_PALETTE_LENGTH(0x100) MCFG_DEFAULT_LAYOUT(layout_cdi) MCFG_VIDEO_START(cdimono1) - MCFG_VIDEO_UPDATE(cdimono1) MCFG_MACHINE_START(cdi) diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index c83c63bbbcf..1318a574f93 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -1618,12 +1618,12 @@ static MACHINE_CONFIG_START( centiped, centiped_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(centiped) MCFG_GFXDECODE(centiped) MCFG_PALETTE_LENGTH(4+4*4*4*4) MCFG_VIDEO_START(centiped) - MCFG_VIDEO_UPDATE(centiped) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1679,7 +1679,8 @@ static MACHINE_CONFIG_DERIVED( milliped, centiped ) MCFG_PALETTE_LENGTH(4*4+4*4*4*4*4) MCFG_VIDEO_START(milliped) - MCFG_VIDEO_UPDATE(milliped) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(milliped) /* sound hardware */ MCFG_SOUND_REPLACE("pokey", POKEY, 12096000/8) @@ -1704,7 +1705,8 @@ static MACHINE_CONFIG_DERIVED( warlords, centiped ) MCFG_PALETTE_INIT(warlords) MCFG_VIDEO_START(warlords) - MCFG_VIDEO_UPDATE(warlords) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(warlords) /* sound hardware */ MCFG_SOUND_REPLACE("pokey", POKEY, 12096000/8) @@ -1718,7 +1720,8 @@ static MACHINE_CONFIG_DERIVED( mazeinv, milliped ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mazeinv_map) - MCFG_VIDEO_UPDATE(centiped) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(centiped) MACHINE_CONFIG_END @@ -1737,12 +1740,12 @@ static MACHINE_CONFIG_START( bullsdrt, centiped_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(bullsdrt) MCFG_GFXDECODE(centiped) MCFG_PALETTE_LENGTH(4+4*4*4*4) MCFG_VIDEO_START(bullsdrt) - MCFG_VIDEO_UPDATE(bullsdrt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index c4103df1f23..51ef632349b 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -287,13 +287,13 @@ static MACHINE_CONFIG_START( chaknpop, chaknpop_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(chaknpop) MCFG_GFXDECODE(chaknpop) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(chaknpop) MCFG_VIDEO_START(chaknpop) - MCFG_VIDEO_UPDATE(chaknpop) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c index 60ff2866d0f..4de9a224f9c 100644 --- a/src/mame/drivers/cham24.c +++ b/src/mame/drivers/cham24.c @@ -269,7 +269,7 @@ static VIDEO_START( cham24 ) { } -static VIDEO_UPDATE( cham24 ) +static SCREEN_UPDATE( cham24 ) { /* render the ppu */ ppu2c0x_render(screen->machine->device("ppu"), bitmap, 0, 0, 0, 0); @@ -323,13 +323,13 @@ static MACHINE_CONFIG_START( cham24, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(cham24) MCFG_GFXDECODE(cham24) MCFG_PALETTE_LENGTH(8*4*16) MCFG_PALETTE_INIT(cham24) MCFG_VIDEO_START(cham24) - MCFG_VIDEO_UPDATE(cham24) MCFG_PPU2C04_ADD("ppu", ppu_interface) diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 5dd6e87df84..48f6d6ba231 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -95,7 +95,7 @@ TODO: * *************************************/ -static VIDEO_EOF( champbas ) +static SCREEN_EOF( champbas ) { champbas_state *state = machine->driver_data<champbas_state>(); state->watchdog_count++; @@ -617,14 +617,14 @@ static MACHINE_CONFIG_START( talbot, champbas_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(champbas) + MCFG_SCREEN_EOF(champbas) MCFG_GFXDECODE(talbot) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(champbas) MCFG_VIDEO_START(champbas) - MCFG_VIDEO_UPDATE(champbas) - MCFG_VIDEO_EOF(champbas) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -653,14 +653,14 @@ static MACHINE_CONFIG_START( champbas, champbas_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(champbas) + MCFG_SCREEN_EOF(champbas) MCFG_GFXDECODE(champbas) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(champbas) MCFG_VIDEO_START(champbas) - MCFG_VIDEO_UPDATE(champbas) - MCFG_VIDEO_EOF(champbas) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -711,14 +711,14 @@ static MACHINE_CONFIG_START( exctsccr, champbas_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(exctsccr) + MCFG_SCREEN_EOF(champbas) MCFG_GFXDECODE(exctsccr) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(exctsccr) MCFG_VIDEO_START(exctsccr) - MCFG_VIDEO_UPDATE(exctsccr) - MCFG_VIDEO_EOF(champbas) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -763,14 +763,14 @@ static MACHINE_CONFIG_START( exctsccrb, champbas_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(exctsccr) + MCFG_SCREEN_EOF(champbas) MCFG_GFXDECODE(exctsccr) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(exctsccr) MCFG_VIDEO_START(exctsccr) - MCFG_VIDEO_UPDATE(exctsccr) - MCFG_VIDEO_EOF(champbas) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 958d75ef865..fea0ee805af 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -374,13 +374,13 @@ static MACHINE_CONFIG_START( champbwl, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_GFXDECODE(champbwl) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(arknoid2) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index 09aa3ab1d30..6292b525703 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -190,7 +190,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE( chanbara ) +static SCREEN_UPDATE( chanbara ) { chanbara_state *state = screen->machine->driver_data<chanbara_state>(); @@ -397,13 +397,13 @@ static MACHINE_CONFIG_START( chanbara, chanbara_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(chanbara) MCFG_GFXDECODE(chanbara) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(chanbara) MCFG_VIDEO_START(chanbara) - MCFG_VIDEO_UPDATE(chanbara) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c index aead64e5265..3ad1a0e81ee 100644 --- a/src/mame/drivers/changela.c +++ b/src/mame/drivers/changela.c @@ -537,11 +537,11 @@ static MACHINE_CONFIG_START( changela, changela_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 262) /* vert size is a guess */ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1) + MCFG_SCREEN_UPDATE(changela) MCFG_PALETTE_LENGTH(0x40) MCFG_VIDEO_START(changela) - MCFG_VIDEO_UPDATE(changela) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c index e24ed5e1530..9b6ee22e232 100644 --- a/src/mame/drivers/cheekyms.c +++ b/src/mame/drivers/cheekyms.c @@ -134,13 +134,13 @@ static MACHINE_CONFIG_START( cheekyms, cheekyms_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(cheekyms) MCFG_GFXDECODE(cheekyms) MCFG_PALETTE_LENGTH(0xc0) MCFG_PALETTE_INIT(cheekyms) MCFG_VIDEO_START(cheekyms) - MCFG_VIDEO_UPDATE(cheekyms) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c index a2d6ed62de4..a8532f9de86 100644 --- a/src/mame/drivers/chihiro.c +++ b/src/mame/drivers/chihiro.c @@ -298,6 +298,11 @@ static MACHINE_START( chihiro ) debug_console_register_command(machine,"jamdis",CMDFLAG_NONE,0,2,3,jamtable_disasm_command); } +static SCREEN_UPDATE( chihiro ) +{ + return 0; +} + static MACHINE_CONFIG_START( chihiro_base, driver_device ) /* basic machine hardware */ @@ -323,6 +328,7 @@ static MACHINE_CONFIG_START( chihiro_base, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(chihiro) MCFG_MACHINE_START(chihiro) diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index e2be45bd2a1..956b730f82d 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -590,12 +590,12 @@ static MACHINE_CONFIG_START( chinagat, ddragon_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */ + MCFG_SCREEN_UPDATE(ddragon) MCFG_GFXDECODE(chinagat) MCFG_PALETTE_LENGTH(384) MCFG_VIDEO_START(chinagat) - MCFG_VIDEO_UPDATE(ddragon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -635,12 +635,12 @@ static MACHINE_CONFIG_START( saiyugoub1, ddragon_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */ + MCFG_SCREEN_UPDATE(ddragon) MCFG_GFXDECODE(chinagat) MCFG_PALETTE_LENGTH(384) MCFG_VIDEO_START(chinagat) - MCFG_VIDEO_UPDATE(ddragon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -677,12 +677,12 @@ static MACHINE_CONFIG_START( saiyugoub2, ddragon_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */ + MCFG_SCREEN_UPDATE(ddragon) MCFG_GFXDECODE(chinagat) MCFG_PALETTE_LENGTH(384) MCFG_VIDEO_START(chinagat) - MCFG_VIDEO_UPDATE(ddragon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index b1bb92cc2b3..f19243f22ce 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -83,7 +83,7 @@ static VIDEO_START( chinsan ) { } -static VIDEO_UPDATE( chinsan ) +static SCREEN_UPDATE( chinsan ) { chinsan_state *state = screen->machine->driver_data<chinsan_state>(); int y, x, count; @@ -607,13 +607,13 @@ static MACHINE_CONFIG_START( chinsan, chinsan_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_VISIBLE_AREA(24, 512-24-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(chinsan) MCFG_GFXDECODE(chinsan) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(chinsan) MCFG_VIDEO_START(chinsan) - MCFG_VIDEO_UPDATE(chinsan) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 1a26d23b773..47330162792 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -409,11 +409,11 @@ static MACHINE_CONFIG_START( chqflag, chqflag_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(chqflag) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(chqflag) - MCFG_VIDEO_UPDATE(chqflag) MCFG_K051960_ADD("k051960", chqflag_k051960_intf) MCFG_K051316_ADD("k051316_1", chqflag_k051316_intf_1) diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c index 429b160966e..7fd1da7c8c8 100644 --- a/src/mame/drivers/chsuper.c +++ b/src/mame/drivers/chsuper.c @@ -21,7 +21,7 @@ static VIDEO_START(chsuper) { } -static VIDEO_UPDATE(chsuper) +static SCREEN_UPDATE(chsuper) { const gfx_element *gfx = screen->machine->gfx[0]; UINT8 *vram = screen->machine->region("vram")->base(); @@ -205,6 +205,7 @@ static MACHINE_CONFIG_START( chsuper, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0, 30*8-1) + MCFG_SCREEN_UPDATE(chsuper) MCFG_NVRAM_ADD_0FILL("nvram") @@ -212,7 +213,6 @@ static MACHINE_CONFIG_START( chsuper, driver_device ) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(chsuper) - MCFG_VIDEO_UPDATE(chsuper) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c index 9df25a8a88f..4d827199fc2 100644 --- a/src/mame/drivers/cinemat.c +++ b/src/mame/drivers/cinemat.c @@ -1009,9 +1009,9 @@ static MACHINE_CONFIG_START( cinemat_nojmi_4k, cinemat_state ) MCFG_SCREEN_REFRESH_RATE(MASTER_CLOCK/4/16/16/16/16/2) MCFG_SCREEN_SIZE(1024, 768) MCFG_SCREEN_VISIBLE_AREA(0, 1023, 0, 767) + MCFG_SCREEN_UPDATE(cinemat) MCFG_VIDEO_START(cinemat_bilevel) - MCFG_VIDEO_UPDATE(cinemat) MACHINE_CONFIG_END @@ -1055,7 +1055,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( spacewar, cinemat_nojmi_4k ) MCFG_FRAGMENT_ADD(spacewar_sound) - MCFG_VIDEO_UPDATE(spacewar) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(spacewar) MACHINE_CONFIG_END diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c index 61e2beeee87..352f3daa779 100644 --- a/src/mame/drivers/circus.c +++ b/src/mame/drivers/circus.c @@ -303,13 +303,13 @@ static MACHINE_CONFIG_START( circus, circus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(circus) MCFG_GFXDECODE(circus) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(circus) - MCFG_VIDEO_UPDATE(circus) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -343,13 +343,13 @@ static MACHINE_CONFIG_START( robotbwl, circus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(robotbwl) MCFG_GFXDECODE(robotbwl) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(circus) - MCFG_VIDEO_UPDATE(robotbwl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -381,13 +381,13 @@ static MACHINE_CONFIG_START( crash, circus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(crash) MCFG_GFXDECODE(circus) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(circus) - MCFG_VIDEO_UPDATE(crash) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -417,13 +417,13 @@ static MACHINE_CONFIG_START( ripcord, circus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(ripcord) MCFG_GFXDECODE(circus) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(circus) - MCFG_VIDEO_UPDATE(ripcord) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index 0f658484437..d90f7029464 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -352,13 +352,13 @@ static MACHINE_CONFIG_START( circusc, circusc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(circusc) MCFG_GFXDECODE(circusc) MCFG_PALETTE_LENGTH(16*16+16*16) MCFG_PALETTE_INIT(circusc) MCFG_VIDEO_START(circusc) - MCFG_VIDEO_UPDATE(circusc) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index f5e3331f7dd..5c40538950b 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -1602,12 +1602,12 @@ static MACHINE_CONFIG_START( bigrun, cischeat_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(bigrun) MCFG_GFXDECODE(bigrun) MCFG_PALETTE_LENGTH(16*16 * 3 + 64*16 * 2 + 64*16) /* scroll 0,1,2; road 0,1; sprites */ MCFG_VIDEO_START(bigrun) - MCFG_VIDEO_UPDATE(bigrun) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1642,12 +1642,12 @@ static MACHINE_CONFIG_DERIVED( cischeat, bigrun ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-8-1) + MCFG_SCREEN_UPDATE(cischeat) MCFG_GFXDECODE(cischeat) MCFG_PALETTE_LENGTH(32*16 * 3 + 64*16 * 2 + 128*16) /* scroll 0,1,2; road 0,1; sprites */ MCFG_VIDEO_START(cischeat) - MCFG_VIDEO_UPDATE(cischeat) MACHINE_CONFIG_END @@ -1674,7 +1674,8 @@ static MACHINE_CONFIG_DERIVED( f1gpstar, bigrun ) MCFG_PALETTE_LENGTH(16*16 * 3 + 64*16 * 2 + 128*16) /* scroll 0,1,2; road 0,1; sprites */ MCFG_VIDEO_START(f1gpstar) - MCFG_VIDEO_UPDATE(f1gpstar) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(f1gpstar) MACHINE_CONFIG_END @@ -1733,12 +1734,12 @@ static MACHINE_CONFIG_START( scudhamm, cischeat_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0 +16, 256-1 -16) + MCFG_SCREEN_UPDATE(scudhamm) MCFG_GFXDECODE(scudhamm) MCFG_PALETTE_LENGTH(16*16+16*16+128*16) MCFG_VIDEO_START(f1gpstar) - MCFG_VIDEO_UPDATE(scudhamm) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index 1a7f429746d..7cc04e1b9bf 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -225,13 +225,13 @@ static MACHINE_CONFIG_START( citycon, citycon_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(citycon) MCFG_GFXDECODE(citycon) MCFG_PALETTE_LENGTH(640+1024) /* 640 real palette + 1024 virtual palette */ MCFG_PALETTE_INIT(all_black) /* guess */ MCFG_VIDEO_START(citycon) - MCFG_VIDEO_UPDATE(citycon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c index 1ecd937bdd8..60bfb7e45fd 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -183,7 +183,7 @@ static MACHINE_START( clayshoo ) * *************************************/ -static VIDEO_UPDATE( clayshoo ) +static SCREEN_UPDATE( clayshoo ) { clayshoo_state *state = screen->machine->driver_data<clayshoo_state>(); offs_t offs; @@ -333,14 +333,13 @@ static MACHINE_CONFIG_START( clayshoo, clayshoo_state ) MCFG_MACHINE_RESET(clayshoo) /* video hardware */ - MCFG_VIDEO_UPDATE(clayshoo) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 64, 255) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) + MCFG_SCREEN_UPDATE(clayshoo) MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] ) MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] ) diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c index dbb4a25eb54..303d88ad710 100644 --- a/src/mame/drivers/cloak.c +++ b/src/mame/drivers/cloak.c @@ -352,12 +352,12 @@ static MACHINE_CONFIG_START( cloak, cloak_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 3*8, 32*8-1) + MCFG_SCREEN_UPDATE(cloak) MCFG_GFXDECODE(cloak) MCFG_PALETTE_LENGTH(64) MCFG_VIDEO_START(cloak) - MCFG_VIDEO_UPDATE(cloak) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index dc92365c00a..8e717228b72 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -448,9 +448,9 @@ static MACHINE_CONFIG_START( cloud9, cloud9_state ) MCFG_SCREEN_SIZE(HTOTAL, VTOTAL) MCFG_SCREEN_VBLANK_TIME(0) /* VBLANK is handled manually */ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 231) + MCFG_SCREEN_UPDATE(cloud9) MCFG_VIDEO_START(cloud9) - MCFG_VIDEO_UPDATE(cloud9) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c index cfe38307289..fcefcc032d4 100644 --- a/src/mame/drivers/clshroad.c +++ b/src/mame/drivers/clshroad.c @@ -246,13 +246,13 @@ static MACHINE_CONFIG_START( firebatl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x120, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x120-1, 0x0+16, 0x100-16-1) + MCFG_SCREEN_UPDATE(clshroad) MCFG_GFXDECODE(firebatl) MCFG_PALETTE_LENGTH(512+64*4) MCFG_PALETTE_INIT(firebatl) MCFG_VIDEO_START(firebatl) - MCFG_VIDEO_UPDATE(clshroad) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -281,13 +281,13 @@ static MACHINE_CONFIG_START( clshroad, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x120, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x120-1, 0x0+16, 0x100-16-1) + MCFG_SCREEN_UPDATE(clshroad) MCFG_GFXDECODE(clshroad) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(clshroad) MCFG_VIDEO_START(clshroad) - MCFG_VIDEO_UPDATE(clshroad) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index 2503ae391eb..2302d5a08a2 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -58,7 +58,7 @@ static VIDEO_START( cmmb ) } -static VIDEO_UPDATE( cmmb ) +static SCREEN_UPDATE( cmmb ) { cmmb_state *state = screen->machine->driver_data<cmmb_state>(); UINT8 *videoram = state->videoram; @@ -310,11 +310,12 @@ static MACHINE_CONFIG_START( cmmb, cmmb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(cmmb) + MCFG_GFXDECODE(cmmb) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(cmmb) - MCFG_VIDEO_UPDATE(cmmb) MCFG_MACHINE_RESET(cmmb) diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index e700004f0a3..8154a3fcf95 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -865,12 +865,11 @@ static MACHINE_CONFIG_START( cninja, cninja_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(cninja) MCFG_GFXDECODE(cninja) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(cninja) - MCFG_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf) /* sound hardware */ @@ -914,12 +913,12 @@ static MACHINE_CONFIG_START( stoneage, cninja_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(cninja) MCFG_GFXDECODE(cninja) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(stoneage) - MCFG_VIDEO_UPDATE(cninja) MCFG_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf) @@ -962,12 +961,11 @@ static MACHINE_CONFIG_START( cninjabl, cninja_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(cninjabl) MCFG_GFXDECODE(cninjabl) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(cninjabl) - MCFG_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf) /* sound hardware */ @@ -1006,12 +1004,11 @@ static MACHINE_CONFIG_START( edrandy, cninja_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(edrandy) MCFG_GFXDECODE(cninja) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(edrandy) - MCFG_DECO16IC_ADD("deco_custom", edrandy_deco16ic_intf) /* sound hardware */ @@ -1055,12 +1052,11 @@ static MACHINE_CONFIG_START( robocop2, cninja_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(robocop2) MCFG_GFXDECODE(robocop2) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(robocop2) - MCFG_DECO16IC_ADD("deco_custom", robocop2_deco16ic_intf) /* sound hardware */ @@ -1105,12 +1101,11 @@ static MACHINE_CONFIG_START( mutantf, cninja_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(mutantf) MCFG_GFXDECODE(mutantf) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(mutantf) - MCFG_DECO16IC_ADD("deco_custom", mutantf_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 831908fd202..6af56253689 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -248,7 +248,7 @@ static void cntsteer_draw_sprites( running_machine *machine, bitmap_t *bitmap, c } } -static VIDEO_UPDATE( zerotrgt ) +static SCREEN_UPDATE( zerotrgt ) { cntsteer_state *state = screen->machine->driver_data<cntsteer_state>(); @@ -299,7 +299,7 @@ static VIDEO_UPDATE( zerotrgt ) return 0; } -static VIDEO_UPDATE( cntsteer ) +static SCREEN_UPDATE( cntsteer ) { cntsteer_state *state = screen->machine->driver_data<cntsteer_state>(); @@ -889,6 +889,7 @@ static MACHINE_CONFIG_START( cntsteer, cntsteer_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(cntsteer) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -897,7 +898,6 @@ static MACHINE_CONFIG_START( cntsteer, cntsteer_state ) // MCFG_PALETTE_INIT(zerotrgt) MCFG_VIDEO_START(cntsteer) - MCFG_VIDEO_UPDATE(cntsteer) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -939,13 +939,13 @@ static MACHINE_CONFIG_START( zerotrgt, cntsteer_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(zerotrgt) MCFG_GFXDECODE(zerotrgt) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(zerotrgt) MCFG_VIDEO_START(zerotrgt) - MCFG_VIDEO_UPDATE(zerotrgt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index 587eb991178..9c27d4ad1be 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -909,7 +909,7 @@ static VIDEO_START( coinmstr ) bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 46, 32); } -static VIDEO_UPDATE( coinmstr ) +static SCREEN_UPDATE( coinmstr ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -1011,12 +1011,12 @@ static MACHINE_CONFIG_START( coinmstr, coinmstr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 46*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(coinmstr) MCFG_GFXDECODE(coinmstr) MCFG_PALETTE_LENGTH(46*32*4) MCFG_VIDEO_START(coinmstr) - MCFG_VIDEO_UPDATE(coinmstr) MCFG_MC6845_ADD("crtc", H46505, 14000000 / 16, h46505_intf) diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c index 3b7a268f816..320a95a5e92 100644 --- a/src/mame/drivers/coinmvga.c +++ b/src/mame/drivers/coinmvga.c @@ -232,7 +232,7 @@ static VIDEO_START( coinmvga ) } -static VIDEO_UPDATE( coinmvga ) +static SCREEN_UPDATE( coinmvga ) { const gfx_element *gfx = screen->machine->gfx[0]; int count = 0x04000/2; @@ -670,6 +670,7 @@ static MACHINE_CONFIG_START( coinmvga, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640,480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) + MCFG_SCREEN_UPDATE(coinmvga) MCFG_GFXDECODE(coinmvga) @@ -677,7 +678,6 @@ static MACHINE_CONFIG_START( coinmvga, driver_device ) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(coinmvga) - MCFG_VIDEO_UPDATE(coinmvga) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 55331d28a41..3db10847bb7 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -1155,9 +1155,9 @@ static MACHINE_CONFIG_START( cojagr3k, cojag_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(COJAG_PIXEL_CLOCK/2, 456, 42, 402, 262, 17, 257) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) + MCFG_SCREEN_UPDATE(cojag) MCFG_VIDEO_START(cojag) - MCFG_VIDEO_UPDATE(cojag) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index 30b8191a816..601d1c51fe5 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -756,13 +756,13 @@ static MACHINE_CONFIG_START( combatsc, combatsc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(combatsc) MCFG_GFXDECODE(combatsc) MCFG_PALETTE_LENGTH(8*16*16) MCFG_PALETTE_INIT(combatsc) MCFG_VIDEO_START(combatsc) - MCFG_VIDEO_UPDATE(combatsc) MCFG_K007121_ADD("k007121_1") MCFG_K007121_ADD("k007121_2") @@ -801,13 +801,13 @@ static MACHINE_CONFIG_START( combatscb, combatsc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(combatscb) MCFG_GFXDECODE(combatscb) MCFG_PALETTE_LENGTH(8*16*16) MCFG_PALETTE_INIT(combatscb) MCFG_VIDEO_START(combatscb) - MCFG_VIDEO_UPDATE(combatscb) /* We are using the original sound subsystem */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c index 9f083a8c3c1..47822423a80 100644 --- a/src/mame/drivers/comebaby.c +++ b/src/mame/drivers/comebaby.c @@ -63,7 +63,7 @@ static VIDEO_START(comebaby) { } -static VIDEO_UPDATE(comebaby) +static SCREEN_UPDATE(comebaby) { return 0; } @@ -88,11 +88,11 @@ static MACHINE_CONFIG_START( comebaby, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(comebaby) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(comebaby) - MCFG_VIDEO_UPDATE(comebaby) MACHINE_CONFIG_END diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index d65e8254b0a..8bfa26f42e3 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -268,14 +268,14 @@ static MACHINE_CONFIG_START( commando, commando_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(commando) + MCFG_SCREEN_EOF(commando) MCFG_GFXDECODE(commando) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(commando) - MCFG_VIDEO_UPDATE(commando) - MCFG_VIDEO_EOF(commando) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index 94c6360a147..737e47472da 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -265,14 +265,14 @@ static MACHINE_CONFIG_START( compgolf, compgolf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(1*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(compgolf) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(compgolf) MCFG_GFXDECODE(compgolf) MCFG_VIDEO_START(compgolf) - MCFG_VIDEO_UPDATE(compgolf) - + MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM2203, 1500000) diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index 6b35df9d1f4..cfa7229e85f 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -202,13 +202,13 @@ static MACHINE_CONFIG_START( contra, contra_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(37*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(contra) MCFG_GFXDECODE(contra) MCFG_PALETTE_LENGTH(2*8*16*16) MCFG_PALETTE_INIT(contra) MCFG_VIDEO_START(contra) - MCFG_VIDEO_UPDATE(contra) MCFG_K007121_ADD("k007121_1") MCFG_K007121_ADD("k007121_2") diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c index 59be637e8ab..82b28e05942 100644 --- a/src/mame/drivers/coolpool.c +++ b/src/mame/drivers/coolpool.c @@ -885,11 +885,10 @@ static MACHINE_CONFIG_START( amerdart, coolpool_state ) MCFG_TIMER_ADD("nvram_timer", nvram_write_timeout) /* video hardware */ - MCFG_VIDEO_UPDATE(tms340x0) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/6, 212*2, 0, 161*2, 262, 0, 241) + MCFG_SCREEN_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -918,11 +917,10 @@ static MACHINE_CONFIG_START( coolpool, coolpool_state ) /* video hardware */ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) - MCFG_VIDEO_UPDATE(tms340x0) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/6, 424, 0, 320, 262, 0, 240) + MCFG_SCREEN_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index 865482acd44..e0b48159d9f 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -292,7 +292,7 @@ static VIDEO_START(coolridr) state->test_offs = 0x2000; } -static VIDEO_UPDATE(coolridr) +static SCREEN_UPDATE(coolridr) { coolridr_state *state = screen->machine->driver_data<coolridr_state>(); /* planes seems to basically be at 0x8000 and 0x28000... */ @@ -1113,12 +1113,12 @@ static MACHINE_CONFIG_START( coolridr, coolridr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(128*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 128*8-1, 0*8, 64*8-1) //TODO: these are just two different screens + MCFG_SCREEN_UPDATE(coolridr) MCFG_PALETTE_LENGTH(0x10000) MCFG_MACHINE_RESET(coolridr) MCFG_VIDEO_START(coolridr) - MCFG_VIDEO_UPDATE(coolridr) MACHINE_CONFIG_END ROM_START( coolridr ) diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index e1d273eb400..90470c814bd 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -458,13 +458,13 @@ static MACHINE_CONFIG_START( cop01, cop01_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(cop01) MCFG_GFXDECODE(cop01) MCFG_PALETTE_LENGTH(16+8*16+16*16) MCFG_PALETTE_INIT(cop01) MCFG_VIDEO_START(cop01) - MCFG_VIDEO_UPDATE(cop01) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -501,13 +501,13 @@ static MACHINE_CONFIG_START( mightguy, cop01_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(cop01) MCFG_GFXDECODE(cop01) MCFG_PALETTE_LENGTH(16+8*16+16*16) MCFG_PALETTE_INIT(cop01) MCFG_VIDEO_START(cop01) - MCFG_VIDEO_UPDATE(cop01) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c index c6d2e38a2e5..9e2f4eddeff 100644 --- a/src/mame/drivers/copsnrob.c +++ b/src/mame/drivers/copsnrob.c @@ -282,12 +282,12 @@ static MACHINE_CONFIG_START( copsnrob, copsnrob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 26*8-1) + MCFG_SCREEN_UPDATE(copsnrob) MCFG_GFXDECODE(copsnrob) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(copsnrob) - MCFG_VIDEO_UPDATE(copsnrob) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index 32b5b5edcd7..cb4a4a252c6 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -1069,7 +1069,8 @@ static MACHINE_CONFIG_DERIVED( panic, cosmic ) MCFG_PALETTE_LENGTH(16+8*4) MCFG_PALETTE_INIT(panic) - MCFG_VIDEO_UPDATE(panic) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(panic) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1096,7 +1097,8 @@ static MACHINE_CONFIG_DERIVED( cosmica, cosmic ) MCFG_PALETTE_LENGTH(8+16*4) MCFG_PALETTE_INIT(cosmica) - MCFG_VIDEO_UPDATE(cosmica) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(cosmica) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1132,11 +1134,11 @@ static MACHINE_CONFIG_START( cosmicg, cosmic_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(cosmicg) MCFG_PALETTE_LENGTH(16) - MCFG_PALETTE_INIT(cosmicg) - MCFG_VIDEO_UPDATE(cosmicg) + MCFG_PALETTE_INIT(cosmicg) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1163,7 +1165,8 @@ static MACHINE_CONFIG_DERIVED( magspot, cosmic ) MCFG_PALETTE_LENGTH(16+8*4) MCFG_PALETTE_INIT(magspot) - MCFG_VIDEO_UPDATE(magspot) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(magspot) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1178,7 +1181,8 @@ static MACHINE_CONFIG_DERIVED( devzone, magspot ) /* basic machine hardware */ /* video hardware */ - MCFG_VIDEO_UPDATE(devzone) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(devzone) MACHINE_CONFIG_END @@ -1195,7 +1199,8 @@ static MACHINE_CONFIG_DERIVED( nomnlnd, cosmic ) MCFG_PALETTE_LENGTH(16+8*4) MCFG_PALETTE_INIT(nomnlnd) - MCFG_VIDEO_UPDATE(nomnlnd) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(nomnlnd) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 15c5aba388e..8f6e7839e79 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -2981,13 +2981,13 @@ static MACHINE_CONFIG_START( cps1_10MHz, cps_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(cps1) + MCFG_SCREEN_EOF(cps1) MCFG_GFXDECODE(cps1) MCFG_PALETTE_LENGTH(0xc00) MCFG_VIDEO_START(cps1) - MCFG_VIDEO_EOF(cps1) - MCFG_VIDEO_UPDATE(cps1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3067,13 +3067,13 @@ static MACHINE_CONFIG_START( cpspicb, cps_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(cps1) + MCFG_SCREEN_EOF(cps1) MCFG_GFXDECODE(cps1) MCFG_PALETTE_LENGTH(0xc00) MCFG_VIDEO_START(cps1) - MCFG_VIDEO_EOF(cps1) - MCFG_VIDEO_UPDATE(cps1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3142,13 +3142,13 @@ static MACHINE_CONFIG_START( sf2mdt, cps_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(cps1) + MCFG_SCREEN_EOF(cps1) MCFG_GFXDECODE(cps1) MCFG_PALETTE_LENGTH(0xc00) MCFG_VIDEO_START(cps1) - MCFG_VIDEO_EOF(cps1) - MCFG_VIDEO_UPDATE(cps1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3227,13 +3227,13 @@ static MACHINE_CONFIG_START( knightsb, cps_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(cps1) + MCFG_SCREEN_EOF(cps1) MCFG_GFXDECODE(cps1) MCFG_PALETTE_LENGTH(0xc00) MCFG_VIDEO_START(cps1) - MCFG_VIDEO_EOF(cps1) - MCFG_VIDEO_UPDATE(cps1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index af21848b3e5..74f821d3f1c 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -1234,6 +1234,8 @@ static MACHINE_CONFIG_START( cps2, cps_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz, 518, 64, 448, 259, 16, 240) + MCFG_SCREEN_UPDATE(cps1) + MCFG_SCREEN_EOF(cps1) /* Measured clocks: V = 59.6376Hz @@ -1249,8 +1251,6 @@ static MACHINE_CONFIG_START( cps2, cps_state ) MCFG_PALETTE_LENGTH(0xc00) MCFG_VIDEO_START(cps2) - MCFG_VIDEO_EOF(cps1) - MCFG_VIDEO_UPDATE(cps1) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index c124bfc11b2..e0772fbceb4 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -894,7 +894,7 @@ static void cps3_draw_tilemapsprite_line(running_machine *machine, int tmnum, in } } -static VIDEO_UPDATE(cps3) +static SCREEN_UPDATE(cps3) { cps3_state *state = screen->machine->driver_data<cps3_state>(); int y,x, count; @@ -2507,6 +2507,7 @@ static MACHINE_CONFIG_START( cps3, cps3_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(XTAL_60MHz/8, 486, 0, 384, 259, 0, 224) + MCFG_SCREEN_UPDATE(cps3) /* Measured clocks: V = 59.5992Hz @@ -2524,7 +2525,6 @@ static MACHINE_CONFIG_START( cps3, cps3_state ) MCFG_PALETTE_LENGTH(0x10000) // actually 0x20000 ... MCFG_VIDEO_START(cps3) - MCFG_VIDEO_UPDATE(cps3) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c index dd56ee32508..34a91c24378 100644 --- a/src/mame/drivers/crbaloon.c +++ b/src/mame/drivers/crbaloon.c @@ -370,7 +370,6 @@ static MACHINE_CONFIG_START( crbaloon, crbaloon_state ) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(crbaloon) - MCFG_VIDEO_UPDATE(crbaloon) MCFG_GFXDECODE(crbaloon) MCFG_PALETTE_LENGTH(32) @@ -382,6 +381,7 @@ static MACHINE_CONFIG_START( crbaloon, crbaloon_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(crbaloon) /* audio hardware */ MCFG_FRAGMENT_ADD(crbaloon_audio) diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index eb1d50046ab..8ed17a92926 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -297,11 +297,11 @@ static MACHINE_CONFIG_START( crimfght, crimfght_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(crimfght) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(crimfght) - MCFG_VIDEO_UPDATE(crimfght) MCFG_K052109_ADD("k052109", crimfght_k052109_intf) MCFG_K051960_ADD("k051960", crimfght_k051960_intf) diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 2301a09acc7..cac0a3dd4e4 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -367,12 +367,12 @@ static MACHINE_CONFIG_START( crospang, crospang_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1) + MCFG_SCREEN_UPDATE(crospang) MCFG_PALETTE_LENGTH(0x300) MCFG_GFXDECODE(crospang) MCFG_VIDEO_START(crospang) - MCFG_VIDEO_UPDATE(crospang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -406,12 +406,12 @@ static MACHINE_CONFIG_START( bestri, crospang_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1) + MCFG_SCREEN_UPDATE(crospang) MCFG_PALETTE_LENGTH(0x300) MCFG_GFXDECODE(crospang) MCFG_VIDEO_START(crospang) - MCFG_VIDEO_UPDATE(crospang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 92b564d76b9..18e6c3fd3c2 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -489,6 +489,8 @@ static MACHINE_CONFIG_START( crshrace, crshrace_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(crshrace) + MCFG_SCREEN_EOF(crshrace) MCFG_GFXDECODE(crshrace) MCFG_PALETTE_LENGTH(2048) @@ -496,8 +498,6 @@ static MACHINE_CONFIG_START( crshrace, crshrace_state ) MCFG_K053936_ADD("k053936", crshrace_k053936_intf) MCFG_VIDEO_START(crshrace) - MCFG_VIDEO_EOF(crshrace) - MCFG_VIDEO_UPDATE(crshrace) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index d7c0583ecdb..bf8d9a3e647 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -631,7 +631,7 @@ static void SetVidReg( address_space *space, UINT16 reg, UINT16 val ) } -static VIDEO_UPDATE( crystal ) +static SCREEN_UPDATE( crystal ) { crystal_state *state = screen->machine->driver_data<crystal_state>(); address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM); @@ -692,7 +692,7 @@ static VIDEO_UPDATE( crystal ) return 0; } -static VIDEO_EOF(crystal) +static SCREEN_EOF(crystal) { crystal_state *state = machine->driver_data<crystal_state>(); address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); @@ -832,9 +832,8 @@ static MACHINE_CONFIG_START( crystal, crystal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) - - MCFG_VIDEO_UPDATE(crystal) - MCFG_VIDEO_EOF(crystal) + MCFG_SCREEN_UPDATE(crystal) + MCFG_SCREEN_EOF(crystal) MCFG_VIDEO_VRENDER0_ADD("vr0", vr0video_config) diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 82d23554b20..9cea0c88c6d 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -147,7 +147,7 @@ static VIDEO_START(cshooter) tilemap_set_transparent_pen(cshooter_txtilemap, 3); } -static VIDEO_UPDATE(cshooter) +static SCREEN_UPDATE(cshooter) { bitmap_fill(bitmap, cliprect, 0/*get_black_pen(screen->screen->machine)*/); tilemap_mark_all_tiles_dirty(cshooter_txtilemap); @@ -450,12 +450,12 @@ static MACHINE_CONFIG_START( cshooter, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16) + MCFG_SCREEN_UPDATE(cshooter) MCFG_GFXDECODE(cshooter) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(cshooter) - MCFG_VIDEO_UPDATE(cshooter) /* sound hardware */ /* YM2151 and ym3931 seibu custom cpu running at XTAL_14_31818MHz/4 */ @@ -478,12 +478,12 @@ static MACHINE_CONFIG_START( airraid, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16) + MCFG_SCREEN_UPDATE(cshooter) MCFG_GFXDECODE(cshooter) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(cshooter) - MCFG_VIDEO_UPDATE(cshooter) /* sound hardware */ SEIBU_AIRRAID_SOUND_SYSTEM_YM2151_INTERFACE(XTAL_14_31818MHz/4) diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c index 3c94dee8721..eae422c04be 100644 --- a/src/mame/drivers/csplayh5.c +++ b/src/mame/drivers/csplayh5.c @@ -50,7 +50,7 @@ static VIDEO_START( csplayh5 ) v9938_reset(0); } -static VIDEO_UPDATE( csplayh5 ) +static SCREEN_UPDATE( csplayh5 ) { bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -532,11 +532,12 @@ static MACHINE_CONFIG_START( csplayh5, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS) MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1) + MCFG_SCREEN_UPDATE(csplayh5) + MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT( v9958 ) MCFG_VIDEO_START(csplayh5) - MCFG_VIDEO_UPDATE(csplayh5) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c index 0556447e228..1124771e703 100644 --- a/src/mame/drivers/cubeqst.c +++ b/src/mame/drivers/cubeqst.c @@ -94,7 +94,7 @@ static WRITE16_HANDLER( palette_w ) } /* TODO: This is a simplified version of what actually happens */ -static VIDEO_UPDATE( cubeqst ) +static SCREEN_UPDATE( cubeqst ) { int y; diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index 2d266d1b426..baf8677813b 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -1068,9 +1068,9 @@ static MACHINE_CONFIG_START( cd32, cubocd32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512*2, 312) MCFG_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1) + MCFG_SCREEN_UPDATE(amiga_aga) MCFG_VIDEO_START(amiga_aga) - MCFG_VIDEO_UPDATE(amiga_aga) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 7781e8ff5a8..b0779c9c2c8 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -82,7 +82,7 @@ static VIDEO_START( cultures ) tilemap_set_scrolldy(state->bg2_tilemap, 255, 0); } -static VIDEO_UPDATE( cultures ) +static SCREEN_UPDATE( cultures ) { cultures_state *state = screen->machine->driver_data<cultures_state>(); int attr; @@ -400,12 +400,12 @@ static MACHINE_CONFIG_START( cultures, cultures_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(cultures) MCFG_GFXDECODE(culture) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(cultures) - MCFG_VIDEO_UPDATE(cultures) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index 8b103b5ddcc..604ef0cff95 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -1077,7 +1077,6 @@ static MACHINE_CONFIG_START( cvs, cvs_state ) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(cvs) - MCFG_VIDEO_UPDATE(cvs) MCFG_GFXDECODE(cvs) MCFG_PALETTE_LENGTH((256+4)*8+8+1) @@ -1089,6 +1088,7 @@ static MACHINE_CONFIG_START( cvs, cvs_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 30*8-1, 1*8, 32*8-1) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1000)) + MCFG_SCREEN_UPDATE(cvs) MCFG_S2636_ADD("s2636_0", s2636_0_config) MCFG_S2636_ADD("s2636_1", s2636_1_config) diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index 113c8dc45fe..47e86912856 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -463,15 +463,16 @@ static MACHINE_CONFIG_START( cyberbal, cyberbal_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) + MCFG_SCREEN_UPDATE(cyberbal) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) + MCFG_SCREEN_UPDATE(cyberbal) MCFG_VIDEO_START(cyberbal) - MCFG_VIDEO_UPDATE(cyberbal) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -510,9 +511,9 @@ static MACHINE_CONFIG_START( cyberbal2p, cyberbal_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) + MCFG_SCREEN_UPDATE(cyberbal) MCFG_VIDEO_START(cyberbal2p) - MCFG_VIDEO_UPDATE(cyberbal) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_ii_mono) diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index 48fe5ebe4ef..f76e9e485ec 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -198,7 +198,7 @@ static void draw_pixel( bitmap_t* bitmap, const rectangle *cliprect, int y, int *BITMAP_ADDR16(bitmap, y, x) = pen; } -static VIDEO_UPDATE( cybertnk ) +static SCREEN_UPDATE( cybertnk ) { device_t *left_screen = screen->machine->device("lscreen"); device_t *right_screen = screen->machine->device("rscreen"); @@ -859,6 +859,7 @@ static MACHINE_CONFIG_START( cybertnk, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(cybertnk) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -866,12 +867,12 @@ static MACHINE_CONFIG_START( cybertnk, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(cybertnk) MCFG_GFXDECODE(cybertnk) MCFG_PALETTE_LENGTH(0x4000) MCFG_VIDEO_START(cybertnk) - MCFG_VIDEO_UPDATE(cybertnk) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c index 43508f5aa25..66cce990409 100644 --- a/src/mame/drivers/cyclemb.c +++ b/src/mame/drivers/cyclemb.c @@ -108,7 +108,7 @@ static VIDEO_START( cyclemb ) } -static VIDEO_UPDATE( cyclemb ) +static SCREEN_UPDATE( cyclemb ) { int x,y,count; const gfx_element *gfx = screen->machine->gfx[0]; @@ -530,12 +530,13 @@ static MACHINE_CONFIG_START( cyclemb, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(cyclemb) + MCFG_GFXDECODE(cyclemb) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(cyclemb) MCFG_VIDEO_START(cyclemb) - MCFG_VIDEO_UPDATE(cyclemb) MCFG_MACHINE_RESET(cyclemb) diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index e02318f9485..877e0b95706 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -57,7 +57,7 @@ static VIDEO_START(d9final) state->sc0_tilemap = tilemap_create(machine, get_sc0_tile_info,tilemap_scan_rows,8,8,64,32); } -static VIDEO_UPDATE(d9final) +static SCREEN_UPDATE(d9final) { d9final_state *state = screen->machine->driver_data<d9final_state>(); tilemap_draw(bitmap,cliprect,state->sc0_tilemap,0,0); @@ -289,13 +289,13 @@ static MACHINE_CONFIG_START( d9final, d9final_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(d9final) MCFG_GFXDECODE(d9final) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(all_black) MCFG_VIDEO_START(d9final) - MCFG_VIDEO_UPDATE(d9final) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index ba0f5f1d488..991605f1ba3 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -362,7 +362,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE(dacholer) +static SCREEN_UPDATE(dacholer) { dacholer_state *state = screen->machine->driver_data<dacholer_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -523,13 +523,13 @@ static MACHINE_CONFIG_START( dacholer, dacholer_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16) + MCFG_SCREEN_UPDATE(dacholer) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(dacholer) MCFG_GFXDECODE(dacholer) MCFG_VIDEO_START(dacholer) - MCFG_VIDEO_UPDATE(dacholer) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dai3wksi.c b/src/mame/drivers/dai3wksi.c index 1a1f9bed609..33795c8afa8 100644 --- a/src/mame/drivers/dai3wksi.c +++ b/src/mame/drivers/dai3wksi.c @@ -123,7 +123,7 @@ static void dai3wksi_get_pens(pen_t *pens) } -static VIDEO_UPDATE( dai3wksi ) +static SCREEN_UPDATE( dai3wksi ) { dai3wksi_state *state = screen->machine->driver_data<dai3wksi_state>(); offs_t offs; @@ -598,13 +598,12 @@ static MACHINE_CONFIG_START( dai3wksi, dai3wksi_state ) MCFG_MACHINE_RESET(dai3wksi) /* video hardware */ - MCFG_VIDEO_UPDATE(dai3wksi) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(4, 251, 8, 247) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(dai3wksi) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c index 102a7ff4730..956dd1be84e 100644 --- a/src/mame/drivers/dambustr.c +++ b/src/mame/drivers/dambustr.c @@ -260,13 +260,13 @@ static MACHINE_CONFIG_START( dambustr, dambustr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(dambustr) MCFG_GFXDECODE(dambustr) MCFG_PALETTE_LENGTH(32+2+64+8) /* 32 for the characters, 2 for the bullets, 64 for the stars, 8 for the background */ MCFG_PALETTE_INIT(dambustr) MCFG_VIDEO_START(dambustr) - MCFG_VIDEO_UPDATE(dambustr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index e049ca49ac2..8acfaeb9267 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -964,6 +964,7 @@ static MACHINE_CONFIG_START( darius, darius_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1) + MCFG_SCREEN_UPDATE(darius) MCFG_SCREEN_ADD("mscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -971,6 +972,7 @@ static MACHINE_CONFIG_START( darius, darius_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1) + MCFG_SCREEN_UPDATE(darius) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -978,9 +980,9 @@ static MACHINE_CONFIG_START( darius, darius_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1) + MCFG_SCREEN_UPDATE(darius) MCFG_VIDEO_START(darius) - MCFG_VIDEO_UPDATE(darius) MCFG_PC080SN_ADD("pc080sn", darius_pc080sn_intf) diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 4fb8db2ff7d..aa174d22832 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -74,7 +74,7 @@ To do: ***************************************************************************/ static VIDEO_START( darkhors ); -static VIDEO_UPDATE( darkhors ); +static SCREEN_UPDATE( darkhors ); static tilemap_t *darkhors_tmap, *darkhors_tmap2; static UINT32 *darkhors_tmapram, *darkhors_tmapscroll; @@ -153,7 +153,7 @@ static VIDEO_START( darkhors ) machine->gfx[0]->color_granularity = 64; /* 256 colour sprites with palette selectable on 64 colour boundaries */ } -static VIDEO_UPDATE( darkhors ) +static SCREEN_UPDATE( darkhors ) { int layers_ctrl = -1; @@ -635,12 +635,12 @@ static MACHINE_CONFIG_START( darkhors, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x190, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1) + MCFG_SCREEN_UPDATE(darkhors) MCFG_GFXDECODE(darkhors) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(darkhors) - MCFG_VIDEO_UPDATE(darkhors) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -666,7 +666,7 @@ static VIDEO_START(jclub2) } -static VIDEO_UPDATE(jclub2) +static SCREEN_UPDATE(jclub2) { return 0; } @@ -685,12 +685,12 @@ static MACHINE_CONFIG_START( jclub2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x190, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1) + MCFG_SCREEN_UPDATE(jclub2) MCFG_GFXDECODE(jclub2) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(jclub2) - MCFG_VIDEO_UPDATE(jclub2) MACHINE_CONFIG_END static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -722,7 +722,7 @@ static VIDEO_START(jclub2o) } -static VIDEO_UPDATE(jclub2o) +static SCREEN_UPDATE(jclub2o) { return 0; } @@ -746,12 +746,12 @@ static MACHINE_CONFIG_START( jclub2o, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x190, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1) + MCFG_SCREEN_UPDATE(jclub2o) MCFG_GFXDECODE(jclub2) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(jclub2o) - MCFG_VIDEO_UPDATE(jclub2o) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c index c9cbfdccf9f..6a8e59bb172 100644 --- a/src/mame/drivers/darkmist.c +++ b/src/mame/drivers/darkmist.c @@ -253,12 +253,12 @@ static MACHINE_CONFIG_START( darkmist, darkmist_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(darkmist) MCFG_GFXDECODE(darkmist) MCFG_PALETTE_INIT(darkmist) MCFG_PALETTE_LENGTH(0x100*4) MCFG_VIDEO_START(darkmist) - MCFG_VIDEO_UPDATE(darkmist) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index 2368610f58c..ff85b5f31e4 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -245,12 +245,12 @@ static MACHINE_CONFIG_START( darkseal, darkseal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(darkseal) MCFG_GFXDECODE(darkseal) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(darkseal) - MCFG_VIDEO_UPDATE(darkseal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 0bf4ef0568f..424c9999986 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -576,12 +576,11 @@ static MACHINE_CONFIG_START( dassault, dassault_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(dassault) MCFG_GFXDECODE(dassault) MCFG_PALETTE_LENGTH(4096) - MCFG_VIDEO_UPDATE(dassault) - MCFG_DECO16IC_ADD("deco_custom", dassault_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index e49258a236e..b0d70c9f1f3 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -190,7 +190,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE(dblewing) +static SCREEN_UPDATE(dblewing) { dblewing_state *state = screen->machine->driver_data<dblewing_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); @@ -753,12 +753,11 @@ static MACHINE_CONFIG_START( dblewing, dblewing_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(dblewing) MCFG_PALETTE_LENGTH(4096) MCFG_GFXDECODE(dblewing) - MCFG_VIDEO_UPDATE(dblewing) - MCFG_DECO16IC_ADD("deco_custom", dblewing_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index e5d46f507c7..2852ad8fc03 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -392,11 +392,11 @@ static MACHINE_CONFIG_START( dbz, dbz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 48*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(dbz) MCFG_GFXDECODE(dbz) MCFG_VIDEO_START(dbz) - MCFG_VIDEO_UPDATE(dbz) MCFG_PALETTE_LENGTH(0x4000/2) MCFG_K056832_ADD("k056832", dbz_k056832_intf) diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index 7bfe3c68b0b..44574730415 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -432,12 +432,12 @@ static MACHINE_CONFIG_START( dcheese, dcheese_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(360, 262) /* guess, need to see what the games write to the vid registers */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(dcheese) MCFG_PALETTE_LENGTH(65534) MCFG_PALETTE_INIT(dcheese) MCFG_VIDEO_START(dcheese) - MCFG_VIDEO_UPDATE(dcheese) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c index 7f525464f14..6577dbaf695 100644 --- a/src/mame/drivers/dcon.c +++ b/src/mame/drivers/dcon.c @@ -261,12 +261,12 @@ static MACHINE_CONFIG_START( dcon, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(dcon) MCFG_GFXDECODE(dcon) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(dcon) - MCFG_VIDEO_UPDATE(dcon) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(4000000,1320000) @@ -290,12 +290,12 @@ static MACHINE_CONFIG_START( sdgndmps, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(sdgndmps) MCFG_GFXDECODE(dcon) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(dcon) - MCFG_VIDEO_UPDATE(sdgndmps) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(14318180/4,1320000) diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c index d9502956e81..5634cb2ed31 100644 --- a/src/mame/drivers/dday.c +++ b/src/mame/drivers/dday.c @@ -258,6 +258,7 @@ static MACHINE_CONFIG_START( dday, dday_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(dday) MCFG_GFXDECODE(dday) MCFG_PALETTE_LENGTH(256) @@ -265,7 +266,6 @@ static MACHINE_CONFIG_START( dday, dday_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) MCFG_VIDEO_START(dday) - MCFG_VIDEO_UPDATE(dday) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 4476cda1e97..3dcd9a39f60 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -380,7 +380,7 @@ static VIDEO_START( ddayjlc ) state->bg_tilemap = tilemap_create(machine, get_tile_info_bg, tilemap_scan_rows, 8, 8, 32, 32); } -static VIDEO_UPDATE( ddayjlc ) +static SCREEN_UPDATE( ddayjlc ) { ddayjlc_state *state = screen->machine->driver_data<ddayjlc_state>(); UINT32 i; @@ -529,13 +529,13 @@ static MACHINE_CONFIG_START( ddayjlc, ddayjlc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(ddayjlc) MCFG_GFXDECODE(ddayjlc) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(ddayjlc) MCFG_VIDEO_START(ddayjlc) - MCFG_VIDEO_UPDATE(ddayjlc) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index e37658e1228..59f1b0c1baa 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -249,7 +249,7 @@ static void ddealer_draw_video_layer( running_machine *machine, UINT16* vreg_bas } -static VIDEO_UPDATE( ddealer ) +static SCREEN_UPDATE( ddealer ) { ddealer_state *state = screen->machine->driver_data<ddealer_state>(); tilemap_set_scrollx(state->back_tilemap, 0, state->flipscreen ? -192 : -64); @@ -633,11 +633,11 @@ static MACHINE_CONFIG_START( ddealer, ddealer_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(ddealer) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(ddealer) - MCFG_VIDEO_UPDATE(ddealer) MCFG_TIMER_ADD_PERIODIC("coinsim", ddealer_mcu_sim, attotime::from_hz(10000)) // not real, but for simulating the MCU diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 019564b7643..b8da40a6552 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -1300,7 +1300,7 @@ static void copylayer(running_machine *machine, bitmap_t *bitmap, const rectangl } } -VIDEO_UPDATE(ddenlovr) +SCREEN_UPDATE(ddenlovr) { dynax_state *state = screen->machine->driver_data<dynax_state>(); @@ -7727,12 +7727,12 @@ static MACHINE_CONFIG_START( ddenlovr, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(336, 256) MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-1) + MCFG_SCREEN_UPDATE(ddenlovr) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(ddenlovr) - MCFG_VIDEO_UPDATE(ddenlovr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -7850,12 +7850,12 @@ static MACHINE_CONFIG_START( quizchq, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(336, 256) MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-1) + MCFG_SCREEN_UPDATE(ddenlovr) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(ddenlovr) - MCFG_VIDEO_UPDATE(ddenlovr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -7929,12 +7929,12 @@ static MACHINE_CONFIG_START( mmpanic, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(336, 256) MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-1) + MCFG_SCREEN_UPDATE(ddenlovr) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(mmpanic) // extra layers - MCFG_VIDEO_UPDATE(ddenlovr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -7998,12 +7998,12 @@ static MACHINE_CONFIG_START( hanakanz, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(336, 256) MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-11-1) + MCFG_SCREEN_UPDATE(ddenlovr) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around - MCFG_VIDEO_UPDATE(ddenlovr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8323,12 +8323,12 @@ static MACHINE_CONFIG_START( jongtei, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(336, 256) MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-11-1) + MCFG_SCREEN_UPDATE(ddenlovr) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around - MCFG_VIDEO_UPDATE(ddenlovr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8365,12 +8365,12 @@ static MACHINE_CONFIG_START( sryudens, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(336, 256) MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 0+5, 256-12-1) + MCFG_SCREEN_UPDATE(ddenlovr) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around - MCFG_VIDEO_UPDATE(ddenlovr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8410,12 +8410,12 @@ static MACHINE_CONFIG_START( daimyojn, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(336, 256) MCFG_SCREEN_VISIBLE_AREA(0, 336-1-1, 1, 256-15-1) + MCFG_SCREEN_UPDATE(ddenlovr) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around - MCFG_VIDEO_UPDATE(ddenlovr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index 410232395ab..e30a9833e14 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -999,9 +999,9 @@ static MACHINE_CONFIG_START( ddragon, ddragon_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) + MCFG_SCREEN_UPDATE(ddragon) MCFG_VIDEO_START(ddragon) - MCFG_VIDEO_UPDATE(ddragon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1063,9 +1063,9 @@ static MACHINE_CONFIG_START( ddragon6809, ddragon_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) + MCFG_SCREEN_UPDATE(ddragon) MCFG_VIDEO_START(ddragon) - MCFG_VIDEO_UPDATE(ddragon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1110,9 +1110,9 @@ static MACHINE_CONFIG_START( ddragon2, ddragon_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) + MCFG_SCREEN_UPDATE(ddragon) MCFG_VIDEO_START(ddragon) - MCFG_VIDEO_UPDATE(ddragon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index 71dd5ce38fa..50416723795 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -607,12 +607,12 @@ static MACHINE_CONFIG_START( ddragon3, ddragon3_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ + MCFG_SCREEN_UPDATE(ddragon3) MCFG_GFXDECODE(ddragon3) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(ddragon3) - MCFG_VIDEO_UPDATE(ddragon3) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -640,8 +640,9 @@ static MACHINE_CONFIG_DERIVED( ctribe, ddragon3 ) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(ctribe_sound_map) - - MCFG_VIDEO_UPDATE(ctribe) + + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(ctribe) MCFG_SOUND_MODIFY("ym2151") MCFG_SOUND_ROUTE(0, "lspeaker", 1.20) diff --git a/src/mame/drivers/ddribble.c b/src/mame/drivers/ddribble.c index b2be06ffd3a..a6032190031 100644 --- a/src/mame/drivers/ddribble.c +++ b/src/mame/drivers/ddribble.c @@ -310,13 +310,13 @@ static MACHINE_CONFIG_START( ddribble, ddribble_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) */ + MCFG_SCREEN_UPDATE(ddribble) MCFG_GFXDECODE(ddribble) MCFG_PALETTE_LENGTH(64 + 256) MCFG_PALETTE_INIT(ddribble) MCFG_VIDEO_START(ddribble) - MCFG_VIDEO_UPDATE(ddribble) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c index ddfc36ba025..dc411f93467 100644 --- a/src/mame/drivers/ddz.c +++ b/src/mame/drivers/ddz.c @@ -26,12 +26,12 @@ static VIDEO_START(ddz) } -static VIDEO_UPDATE(ddz) +static SCREEN_UPDATE(ddz) { return 0; } -static VIDEO_EOF(ddz) +static SCREEN_EOF(ddz) { } @@ -67,12 +67,12 @@ static MACHINE_CONFIG_START( ddz, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(ddz) + MCFG_SCREEN_EOF(ddz) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(ddz) - MCFG_VIDEO_UPDATE(ddz) - MCFG_VIDEO_EOF(ddz) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c index 6ee84d44734..bf5c38a399d 100644 --- a/src/mame/drivers/deadang.c +++ b/src/mame/drivers/deadang.c @@ -241,12 +241,12 @@ static MACHINE_CONFIG_START( deadang, deadang_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(deadang) MCFG_GFXDECODE(deadang) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(deadang) - MCFG_VIDEO_UPDATE(deadang) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM2203_INTERFACE(XTAL_14_31818MHz/4) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 403097a123e..ab167603c39 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -1157,12 +1157,12 @@ static MACHINE_CONFIG_START( automat, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(robocop) MCFG_GFXDECODE(automat) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0) - MCFG_VIDEO_UPDATE(robocop) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1204,12 +1204,12 @@ static MACHINE_CONFIG_START( hbarrel, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(hbarrel) MCFG_GFXDECODE(dec0) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0) - MCFG_VIDEO_UPDATE(hbarrel) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1245,12 +1245,12 @@ static MACHINE_CONFIG_START( baddudes, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(baddudes) MCFG_GFXDECODE(dec0) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0) - MCFG_VIDEO_UPDATE(baddudes) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1286,12 +1286,12 @@ static MACHINE_CONFIG_START( birdtry, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(birdtry) MCFG_GFXDECODE(dec0) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0) - MCFG_VIDEO_UPDATE(birdtry) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1332,12 +1332,12 @@ static MACHINE_CONFIG_START( robocop, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(robocop) MCFG_GFXDECODE(dec0) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0) - MCFG_VIDEO_UPDATE(robocop) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1373,12 +1373,12 @@ static MACHINE_CONFIG_START( robocopb, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(robocop) MCFG_GFXDECODE(dec0) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0) - MCFG_VIDEO_UPDATE(robocop) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1419,12 +1419,12 @@ static MACHINE_CONFIG_START( hippodrm, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(hippodrm) MCFG_GFXDECODE(dec0) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0) - MCFG_VIDEO_UPDATE(hippodrm) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1460,12 +1460,12 @@ static MACHINE_CONFIG_START( slyspy, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(slyspy) MCFG_GFXDECODE(dec0) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0_nodma) - MCFG_VIDEO_UPDATE(slyspy) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1502,12 +1502,12 @@ static MACHINE_CONFIG_START( secretab, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(robocop) MCFG_GFXDECODE(secretab) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0_nodma) - MCFG_VIDEO_UPDATE(robocop) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1543,12 +1543,12 @@ static MACHINE_CONFIG_START( midres, dec0_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(midres) MCFG_GFXDECODE(midres) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(dec0_nodma) - MCFG_VIDEO_UPDATE(midres) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index f5d7b2e42e0..ee9d5657c3a 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -52,7 +52,7 @@ To do: /******************************************************************************/ /* Only used by ghostb, gondo, garyoret, other games can control buffering */ -static VIDEO_EOF( dec8 ) +static SCREEN_EOF( dec8 ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram_w(space, 0, 0); @@ -1996,12 +1996,12 @@ static MACHINE_CONFIG_START( cobracom, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(cobracom) MCFG_GFXDECODE(cobracom) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(cobracom) - MCFG_VIDEO_UPDATE(cobracom) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2043,14 +2043,14 @@ static MACHINE_CONFIG_START( ghostb, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(ghostb) + MCFG_SCREEN_EOF(dec8) MCFG_GFXDECODE(ghostb) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(ghostb) MCFG_VIDEO_START(ghostb) - MCFG_VIDEO_EOF(dec8) - MCFG_VIDEO_UPDATE(ghostb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2090,12 +2090,12 @@ static MACHINE_CONFIG_START( srdarwin, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(srdarwin) MCFG_GFXDECODE(srdarwin) MCFG_PALETTE_LENGTH(144) MCFG_VIDEO_START(srdarwin) - MCFG_VIDEO_UPDATE(srdarwin) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2137,13 +2137,13 @@ static MACHINE_CONFIG_START( gondo, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(gondo) + MCFG_SCREEN_EOF(dec8) MCFG_GFXDECODE(gondo) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(gondo) - MCFG_VIDEO_EOF(dec8) - MCFG_VIDEO_UPDATE(gondo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2186,12 +2186,12 @@ static MACHINE_CONFIG_START( oscar, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(oscar) MCFG_GFXDECODE(oscar) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(oscar) - MCFG_VIDEO_UPDATE(oscar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2233,12 +2233,12 @@ static MACHINE_CONFIG_START( lastmisn, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(lastmisn) MCFG_GFXDECODE(shackled) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(lastmisn) - MCFG_VIDEO_UPDATE(lastmisn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2280,12 +2280,12 @@ static MACHINE_CONFIG_START( shackled, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(shackled) MCFG_GFXDECODE(shackled) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(shackled) - MCFG_VIDEO_UPDATE(shackled) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2328,12 +2328,12 @@ static MACHINE_CONFIG_START( csilver, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(lastmisn) MCFG_GFXDECODE(shackled) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(lastmisn) - MCFG_VIDEO_UPDATE(lastmisn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2376,13 +2376,13 @@ static MACHINE_CONFIG_START( garyoret, dec8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(garyoret) + MCFG_SCREEN_EOF(dec8) MCFG_GFXDECODE(gondo) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(garyoret) - MCFG_VIDEO_EOF(dec8) - MCFG_VIDEO_UPDATE(garyoret) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index 0662ca1977b..9131ad086e9 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -133,7 +133,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan -static VIDEO_UPDATE( wcvol95 ) +static SCREEN_UPDATE( wcvol95 ) { deco156_state *state = screen->machine->driver_data<deco156_state>(); @@ -415,12 +415,12 @@ static MACHINE_CONFIG_START( hvysmsh, deco156_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(wcvol95) MCFG_GFXDECODE(hvysmsh) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(wcvol95) - MCFG_VIDEO_UPDATE(wcvol95) MCFG_DECO16IC_ADD("deco_custom", deco156_deco16ic_intf) @@ -454,12 +454,12 @@ static MACHINE_CONFIG_START( wcvol95, deco156_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(wcvol95) MCFG_GFXDECODE(hvysmsh) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(wcvol95) - MCFG_VIDEO_UPDATE(wcvol95) MCFG_DECO16IC_ADD("deco_custom", deco156_deco16ic_intf) diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 333ddf014dc..3c2239b0443 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -1685,13 +1685,13 @@ static MACHINE_CONFIG_START( captaven, deco32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(captaven) + MCFG_SCREEN_EOF(captaven) MCFG_GFXDECODE(captaven) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(captaven) - MCFG_VIDEO_EOF(captaven) - MCFG_VIDEO_UPDATE(captaven) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1730,12 +1730,12 @@ static MACHINE_CONFIG_START( fghthist, deco32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(fghthist) MCFG_GFXDECODE(fghthist) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(fghthist) - MCFG_VIDEO_UPDATE(fghthist) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1774,12 +1774,12 @@ static MACHINE_CONFIG_START( fghthsta, deco32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(fghthist) MCFG_GFXDECODE(fghthist) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(fghthist) - MCFG_VIDEO_UPDATE(fghthist) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1821,13 +1821,13 @@ static MACHINE_CONFIG_START( dragngun, deco32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(dragngun) + MCFG_SCREEN_EOF(dragngun) MCFG_GFXDECODE(dragngun) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(dragngun) - MCFG_VIDEO_UPDATE(dragngun) - MCFG_VIDEO_EOF(dragngun) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1873,13 +1873,13 @@ static MACHINE_CONFIG_START( lockload, deco32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(dragngun) + MCFG_SCREEN_EOF(dragngun) MCFG_GFXDECODE(dragngun) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(lockload) - MCFG_VIDEO_UPDATE(dragngun) - MCFG_VIDEO_EOF(dragngun) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1923,12 +1923,12 @@ static MACHINE_CONFIG_START( tattass, deco32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(nslasher) MCFG_GFXDECODE(tattass) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nslasher) - MCFG_VIDEO_UPDATE(nslasher) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1962,12 +1962,12 @@ static MACHINE_CONFIG_START( nslasher, deco32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(nslasher) MCFG_GFXDECODE(nslasher) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nslasher) - MCFG_VIDEO_UPDATE(nslasher) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c index 2d17efd097a..626255c718a 100644 --- a/src/mame/drivers/deco_ld.c +++ b/src/mame/drivers/deco_ld.c @@ -122,7 +122,7 @@ public: -static VIDEO_UPDATE( rblaster ) +static SCREEN_UPDATE( rblaster ) { deco_ld_state *state = screen->machine->driver_data<deco_ld_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index 751aa48ca59..5f654ee2fa4 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -394,13 +394,13 @@ static MACHINE_CONFIG_START( avengrgs, deco_mlc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(mlc) + MCFG_SCREEN_EOF(mlc) MCFG_GFXDECODE(deco_mlc) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(mlc) - MCFG_VIDEO_UPDATE(mlc) - MCFG_VIDEO_EOF(mlc) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -427,13 +427,13 @@ static MACHINE_CONFIG_START( mlc, deco_mlc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(mlc) + MCFG_SCREEN_EOF(mlc) MCFG_GFXDECODE(deco_mlc) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(mlc) - MCFG_VIDEO_UPDATE(mlc) - MCFG_VIDEO_EOF(mlc) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index d7a1e561be7..9d61b3cf41c 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -650,13 +650,13 @@ static MACHINE_CONFIG_START( decocass, decocass_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(HCLK, 384, 8, 248, 272, 8, 248) + MCFG_SCREEN_UPDATE(decocass) MCFG_GFXDECODE(decocass) MCFG_PALETTE_LENGTH(32+2*8+2*4) MCFG_PALETTE_INIT(decocass) MCFG_VIDEO_START(decocass) - MCFG_VIDEO_UPDATE(decocass) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index cba12ef3af7..8cdcc7df86e 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -289,12 +289,12 @@ static MACHINE_CONFIG_START( deniam16b, deniam_state ) MCFG_SCREEN_SIZE(512, 256) //MCFG_SCREEN_VISIBLE_AREA(24*8, 64*8-1, 0*8, 28*8-1) // looks better but doesn't match hardware MCFG_SCREEN_VISIBLE_AREA(24*8-4, 64*8-5, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(deniam) MCFG_GFXDECODE(deniam) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(deniam) - MCFG_VIDEO_UPDATE(deniam) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -325,12 +325,12 @@ static MACHINE_CONFIG_START( deniam16c, deniam_state ) MCFG_SCREEN_SIZE(512, 256) //MCFG_SCREEN_VISIBLE_AREA(24*8, 64*8-1, 0*8, 28*8-1) // looks better but doesn't match hardware MCFG_SCREEN_VISIBLE_AREA(24*8-4, 64*8-5, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(deniam) MCFG_GFXDECODE(deniam) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(deniam) - MCFG_VIDEO_UPDATE(deniam) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c index 251c00a8d27..835303a2f07 100644 --- a/src/mame/drivers/deshoros.c +++ b/src/mame/drivers/deshoros.c @@ -39,7 +39,7 @@ static VIDEO_START( deshoros ) state->led_array[20] = 0; } -static VIDEO_UPDATE( deshoros ) +static SCREEN_UPDATE( deshoros ) { deshoros_state *state = screen->machine->driver_data<deshoros_state>(); popmessage("%s",state->led_array); @@ -186,10 +186,10 @@ static MACHINE_CONFIG_START( deshoros, deshoros_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(48*8, 16*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 16*8-1) + MCFG_SCREEN_UPDATE(deshoros) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(deshoros) - MCFG_VIDEO_UPDATE(deshoros) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index f88c6b7abd7..8d796f49f17 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -36,7 +36,7 @@ public: }; -static VIDEO_UPDATE( destroyr ) +static SCREEN_UPDATE( destroyr ) { destroyr_state *state = screen->machine->driver_data<destroyr_state>(); int i, j; @@ -451,11 +451,11 @@ static MACHINE_CONFIG_START( destroyr, destroyr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 262) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE(destroyr) MCFG_GFXDECODE(destroyr) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(destroyr) - MCFG_VIDEO_UPDATE(destroyr) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/dfruit.c b/src/mame/drivers/dfruit.c index d4547b7947c..5477f27b458 100644 --- a/src/mame/drivers/dfruit.c +++ b/src/mame/drivers/dfruit.c @@ -25,7 +25,7 @@ static VIDEO_START( dfruit ) } -static VIDEO_UPDATE( dfruit ) +static SCREEN_UPDATE( dfruit ) { return 0; } @@ -126,13 +126,13 @@ static MACHINE_CONFIG_START( dfruit, dfruit_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(dfruit) MCFG_GFXDECODE( dfruit ) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(dfruit) - MCFG_VIDEO_UPDATE(dfruit) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c index a4c571d0e47..8f7cd85951f 100644 --- a/src/mame/drivers/dgpix.c +++ b/src/mame/drivers/dgpix.c @@ -271,7 +271,7 @@ static VIDEO_START( dgpix ) vram = auto_alloc_array(machine, UINT32, 0x40000*2/4); } -static VIDEO_UPDATE( dgpix ) +static SCREEN_UPDATE( dgpix ) { int y; @@ -323,12 +323,12 @@ static MACHINE_CONFIG_START( dgpix, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(dgpix) MCFG_PALETTE_INIT(BBBBB_GGGGG_RRRRR) MCFG_PALETTE_LENGTH(32768) MCFG_VIDEO_START(dgpix) - MCFG_VIDEO_UPDATE(dgpix) /* sound hardware */ // KS0164 sound chip diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 479a1001408..e31e17e3fd4 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -218,12 +218,11 @@ static MACHINE_CONFIG_START( dietgo, dietgo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(dietgo) MCFG_PALETTE_LENGTH(1024) MCFG_GFXDECODE(dietgo) - MCFG_VIDEO_UPDATE(dietgo) - MCFG_DECO16IC_ADD("deco_custom", dietgo_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 8780547ff86..89d5e358a6c 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -120,7 +120,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -static VIDEO_UPDATE( discoboy ) +static SCREEN_UPDATE( discoboy ) { discoboy_state *state = screen->machine->driver_data<discoboy_state>(); UINT16 x, y; @@ -486,12 +486,12 @@ static MACHINE_CONFIG_START( discoboy, discoboy_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(8*8, 512-1-8*8, 0+8, 256-1-8) + MCFG_SCREEN_UPDATE(discoboy) MCFG_GFXDECODE(discoboy) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(discoboy) - MCFG_VIDEO_UPDATE(discoboy) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index bccaab02ccd..7979291e611 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -109,7 +109,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE(diverboy) +static SCREEN_UPDATE(diverboy) { // bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); draw_sprites(screen->machine, bitmap, cliprect); @@ -268,11 +268,11 @@ static MACHINE_CONFIG_START( diverboy, diverboy_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8+4, 40*8+1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(diverboy) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(diverboy) - MCFG_VIDEO_UPDATE(diverboy) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index 57b4a2b0eaf..276d487038b 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -614,6 +614,8 @@ static MACHINE_CONFIG_START( djboy, djboy_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(djboy) + MCFG_SCREEN_EOF(djboy) MCFG_GFXDECODE(djboy) MCFG_PALETTE_LENGTH(0x200) @@ -621,8 +623,6 @@ static MACHINE_CONFIG_START( djboy, djboy_state ) MCFG_KANEKO_PANDORA_ADD("pandora", djboy_pandora_config) MCFG_VIDEO_START(djboy) - MCFG_VIDEO_UPDATE(djboy) - MCFG_VIDEO_EOF(djboy) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index fa09190029e..4eb4303b806 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -1503,11 +1503,11 @@ static MACHINE_CONFIG_START( djmain, djmain_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(12, 512-12-1, 0, 384-1) + MCFG_SCREEN_UPDATE(djmain) MCFG_PALETTE_LENGTH(0x4440/4) MCFG_GFXDECODE(djmain) MCFG_VIDEO_START(djmain) - MCFG_VIDEO_UPDATE(djmain) MCFG_K056832_ADD("k056832", djmain_k056832_intf) MCFG_K055555_ADD("k055555") diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index 78d628bbfc2..9fffa54e429 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -1674,13 +1674,13 @@ static MACHINE_CONFIG_START( dkong_base, dkong_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(dkong) MCFG_GFXDECODE(dkong) MCFG_PALETTE_LENGTH(DK2B_PALETTE_LENGTH) MCFG_PALETTE_INIT(dkong2b) MCFG_VIDEO_START(dkong) - MCFG_VIDEO_UPDATE(dkong) MACHINE_CONFIG_END @@ -1738,13 +1738,13 @@ static MACHINE_CONFIG_START( dkong3, dkong_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(dkong) MCFG_GFXDECODE(dkong) MCFG_PALETTE_LENGTH(DK3_PALETTE_LENGTH) MCFG_PALETTE_INIT(dkong3) MCFG_VIDEO_START(dkong) - MCFG_VIDEO_UPDATE(dkong) /* sound hardware */ MCFG_FRAGMENT_ADD(dkong3_audio) @@ -1765,7 +1765,8 @@ static MACHINE_CONFIG_DERIVED( pestplce, dkongjr ) MCFG_GFXDECODE(pestplce) MCFG_PALETTE_LENGTH(DK2B_PALETTE_LENGTH) MCFG_PALETTE_INIT(dkong2b) /* wrong! */ - MCFG_VIDEO_UPDATE(pestplce) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(pestplce) MACHINE_CONFIG_END @@ -1802,7 +1803,8 @@ static MACHINE_CONFIG_DERIVED( spclforc, s2650 ) MCFG_DEVICE_REMOVE("soundcpu") /* video hardware */ - MCFG_VIDEO_UPDATE(spclforc) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(spclforc) MACHINE_CONFIG_END diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index ca6b40d3780..e37f852ea1a 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -172,7 +172,7 @@ static PALETTE_INIT( dleuro ) * *************************************/ -static VIDEO_UPDATE( dleuro ) +static SCREEN_UPDATE( dleuro ) { dlair_state *state = screen->machine->driver_data<dlair_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index f5a3ae73df0..a089a51f397 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -325,7 +325,7 @@ static VIDEO_START(dderby) } -static VIDEO_UPDATE(dderby) +static SCREEN_UPDATE(dderby) { int x,y,count; int off,scrolly; @@ -507,13 +507,13 @@ static MACHINE_CONFIG_START( dderby, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(dderby) MCFG_GFXDECODE(dmndrby) MCFG_PALETTE_LENGTH(0x300) MCFG_PALETTE_INIT(dmnderby) MCFG_VIDEO_START(dderby) - MCFG_VIDEO_UPDATE(dderby) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index 700b10ac93a..da71427a95a 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -615,13 +615,13 @@ static MACHINE_CONFIG_START( docastle, docastle_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(docastle) MCFG_GFXDECODE(docastle) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(docastle) MCFG_VIDEO_START(docastle) - MCFG_VIDEO_UPDATE(docastle) MCFG_MACHINE_RESET( docastle ) MCFG_MACHINE_START( docastle ) diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index 8e28d6e3289..7609645c80d 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -268,13 +268,13 @@ static MACHINE_CONFIG_START( dogfgt, dogfgt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(dogfgt) MCFG_GFXDECODE(dogfgt) MCFG_PALETTE_LENGTH(16+64) MCFG_PALETTE_INIT(dogfgt) MCFG_VIDEO_START(dogfgt) - MCFG_VIDEO_UPDATE(dogfgt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index e3643d90c46..45388092c40 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -117,7 +117,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -static VIDEO_UPDATE( dominob ) +static SCREEN_UPDATE( dominob ) { dominob_state *state = screen->machine->driver_data<dominob_state>(); int x,y; @@ -303,12 +303,12 @@ static MACHINE_CONFIG_START( dominob, dominob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(dominob) MCFG_GFXDECODE(dominob) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(dominob) - MCFG_VIDEO_UPDATE(dominob) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index 43c090eb4bf..ca631291bb2 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -885,13 +885,13 @@ static MACHINE_CONFIG_START( lastday, dooyong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(lastday) + MCFG_SCREEN_EOF(dooyong) MCFG_GFXDECODE(lastday) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(lastday) - MCFG_VIDEO_EOF(dooyong) - MCFG_VIDEO_UPDATE(lastday) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -928,13 +928,13 @@ static MACHINE_CONFIG_START( gulfstrm, dooyong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(gulfstrm) + MCFG_SCREEN_EOF(dooyong) MCFG_GFXDECODE(lastday) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(gulfstrm) - MCFG_VIDEO_EOF(dooyong) - MCFG_VIDEO_UPDATE(gulfstrm) /* sound hardware */ MCFG_FRAGMENT_ADD( sound_2203 ) @@ -962,13 +962,13 @@ static MACHINE_CONFIG_START( pollux, dooyong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(pollux) + MCFG_SCREEN_EOF(dooyong) MCFG_GFXDECODE(lastday) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(pollux) - MCFG_VIDEO_EOF(dooyong) - MCFG_VIDEO_UPDATE(pollux) /* sound hardware */ MCFG_FRAGMENT_ADD( sound_2203 ) @@ -995,13 +995,13 @@ static MACHINE_CONFIG_START( bluehawk, dooyong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(bluehawk) + MCFG_SCREEN_EOF(dooyong) MCFG_GFXDECODE(bluehawk) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(bluehawk) - MCFG_VIDEO_EOF(dooyong) - MCFG_VIDEO_UPDATE(bluehawk) /* sound hardware */ MCFG_FRAGMENT_ADD( sound_2151 ) @@ -1028,13 +1028,13 @@ static MACHINE_CONFIG_START( flytiger, dooyong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(flytiger) + MCFG_SCREEN_EOF(dooyong) MCFG_GFXDECODE(flytiger) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(flytiger) - MCFG_VIDEO_EOF(dooyong) - MCFG_VIDEO_UPDATE(flytiger) /* sound hardware */ MCFG_FRAGMENT_ADD( sound_2151 ) @@ -1059,13 +1059,13 @@ static MACHINE_CONFIG_START( primella, dooyong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 0*8, 32*8-1 ) + MCFG_SCREEN_UPDATE(primella) + MCFG_SCREEN_EOF(dooyong) MCFG_GFXDECODE(primella) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(primella) - MCFG_VIDEO_EOF(dooyong) - MCFG_VIDEO_UPDATE(primella) /* sound hardware */ MCFG_FRAGMENT_ADD( sound_2151 ) @@ -1098,13 +1098,13 @@ static MACHINE_CONFIG_START( rshark, dooyong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(rshark) + MCFG_SCREEN_EOF(rshark) MCFG_GFXDECODE(rshark) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(rshark) - MCFG_VIDEO_EOF(rshark) - MCFG_VIDEO_UPDATE(rshark) /* sound hardware */ MCFG_FRAGMENT_ADD( sound_2151_m68k ) @@ -1129,13 +1129,13 @@ static MACHINE_CONFIG_START( superx, dooyong_state ) // dif mem map MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(rshark) + MCFG_SCREEN_EOF(rshark) MCFG_GFXDECODE(rshark) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(rshark) - MCFG_VIDEO_EOF(rshark) - MCFG_VIDEO_UPDATE(rshark) /* sound hardware */ MCFG_FRAGMENT_ADD( sound_2151_m68k ) @@ -1160,13 +1160,13 @@ static MACHINE_CONFIG_START( popbingo, dooyong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(popbingo) + MCFG_SCREEN_EOF(rshark) MCFG_GFXDECODE(popbingo) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(popbingo) - MCFG_VIDEO_EOF(rshark) - MCFG_VIDEO_UPDATE(popbingo) /* sound hardware */ MCFG_FRAGMENT_ADD( sound_2151_m68k ) diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index 760634eed80..3eb39cec646 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -78,7 +78,7 @@ static void get_pens(pen_t *pens) } -static VIDEO_UPDATE( dorachan ) +static SCREEN_UPDATE( dorachan ) { dorachan_state *state = screen->machine->driver_data<dorachan_state>(); pen_t pens[NUM_PENS]; @@ -250,13 +250,12 @@ static MACHINE_CONFIG_START( dorachan, dorachan_state ) MCFG_MACHINE_RESET(dorachan) /* video hardware */ - MCFG_VIDEO_UPDATE(dorachan) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(dorachan) MACHINE_CONFIG_END diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index dddfe710bce..bd06a51a1be 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -59,7 +59,7 @@ static WRITE8_HANDLER( dotrikun_color_w ) } -static VIDEO_UPDATE( dotrikun ) +static SCREEN_UPDATE( dotrikun ) { dotrikun_state *state = screen->machine->driver_data<dotrikun_state>(); int x,y,i; @@ -160,11 +160,10 @@ static MACHINE_CONFIG_START( dotrikun, dotrikun_state ) MCFG_MACHINE_RESET(dotrikun) /* video hardware */ - MCFG_VIDEO_UPDATE(dotrikun) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 256+32, 0, 256, 192+32, 0, 192) // FIXME: h/v params of this are completely inaccurate, shows it especially under the "CRT test" + MCFG_SCREEN_UPDATE(dotrikun) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index f8b5d2f41a6..340c6cb2c7f 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -352,12 +352,12 @@ static MACHINE_CONFIG_START( dragrace, dragrace_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 262) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE(dragrace) MCFG_GFXDECODE(dragrace) MCFG_PALETTE_LENGTH(16) MCFG_PALETTE_INIT(dragrace) MCFG_VIDEO_START(dragrace) - MCFG_VIDEO_UPDATE(dragrace) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index d15cd9bca39..0a908bcf6fd 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -215,7 +215,7 @@ static VIDEO_START( dreamwld ) tilemap_set_transparent_pen(state->bg2_tilemap,0); } -static VIDEO_UPDATE( dreamwld ) +static SCREEN_UPDATE( dreamwld ) { dreamwld_state *state = screen->machine->driver_data<dreamwld_state>(); @@ -435,12 +435,12 @@ static MACHINE_CONFIG_START( dreamwld, dreamwld_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512,256) MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 224-1) + MCFG_SCREEN_UPDATE(dreamwld) MCFG_PALETTE_LENGTH(0x1000) MCFG_GFXDECODE(dreamwld) MCFG_VIDEO_START(dreamwld) - MCFG_VIDEO_UPDATE(dreamwld) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index 9c3c1321d4f..2a797b294df 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -424,11 +424,11 @@ static MACHINE_CONFIG_START( drgnmst, drgnmst_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(drgnmst) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(drgnmst) - MCFG_VIDEO_UPDATE(drgnmst) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c index b2f2605b0ab..db4f0d0017e 100644 --- a/src/mame/drivers/dribling.c +++ b/src/mame/drivers/dribling.c @@ -335,11 +335,11 @@ static MACHINE_CONFIG_START( dribling, dribling_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 40, 255) + MCFG_SCREEN_UPDATE(dribling) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(dribling) - MCFG_VIDEO_UPDATE(dribling) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index 01757623c8d..99b67d8e607 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -267,13 +267,13 @@ static MACHINE_CONFIG_START( drmicro, drmicro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(drmicro) MCFG_GFXDECODE(drmicro) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(drmicro) MCFG_VIDEO_START(drmicro) - MCFG_VIDEO_UPDATE(drmicro) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 5b452cbfa7a..10ca7addd88 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -122,7 +122,7 @@ static VIDEO_START( drtomy ) tilemap_set_transparent_pen(state->tilemap_fg, 0); } -static VIDEO_UPDATE( drtomy ) +static SCREEN_UPDATE( drtomy ) { drtomy_state *state = screen->machine->driver_data<drtomy_state>(); @@ -307,12 +307,12 @@ static MACHINE_CONFIG_START( drtomy, drtomy_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(drtomy) MCFG_GFXDECODE(drtomy) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(drtomy) - MCFG_VIDEO_UPDATE(drtomy) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 5fc87535509..b0379307869 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -305,7 +305,7 @@ static VIDEO_START( drw80pkr ) bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 24, 27); } -static VIDEO_UPDATE( drw80pkr ) +static SCREEN_UPDATE( drw80pkr ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); @@ -443,13 +443,13 @@ static MACHINE_CONFIG_START( drw80pkr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((31+1)*8, (31+1)*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 24*8-1, 0*8, 27*8-1) + MCFG_SCREEN_UPDATE(drw80pkr) MCFG_GFXDECODE(drw80pkr) MCFG_PALETTE_LENGTH(16*16) MCFG_PALETTE_INIT(drw80pkr) MCFG_VIDEO_START(drw80pkr) - MCFG_VIDEO_UPDATE(drw80pkr) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index fc8bdfa8e01..a1c6ddb14f1 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -124,7 +124,7 @@ static VIDEO_START(dunhuang) state->save_item(NAME(state->paldata)); } -static VIDEO_UPDATE( dunhuang ) +static SCREEN_UPDATE( dunhuang ) { dunhuang_state *state = screen->machine->driver_data<dunhuang_state>(); int layers_ctrl = -1; @@ -824,12 +824,12 @@ static MACHINE_CONFIG_START( dunhuang, dunhuang_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0+8, 512-8-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(dunhuang) MCFG_GFXDECODE(dunhuang) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(dunhuang) - MCFG_VIDEO_UPDATE(dunhuang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 66b732aaab7..16c9825f8af 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -741,7 +741,7 @@ static void drawCrt( running_machine *machine, bitmap_t *bitmap,const rectangle } -static VIDEO_UPDATE( dwarfd ) +static SCREEN_UPDATE( dwarfd ) { bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); drawCrt(screen->machine, bitmap, cliprect); @@ -978,13 +978,13 @@ static MACHINE_CONFIG_START( dwarfd, dwarfd_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(272*2, 200) MCFG_SCREEN_VISIBLE_AREA(0, 272*2-1, 0, 200-1) + MCFG_SCREEN_UPDATE(dwarfd) MCFG_GFXDECODE(dwarfd) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(dwarfd) MCFG_VIDEO_START(dwarfd) - MCFG_VIDEO_UPDATE(dwarfd) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("aysnd", AY8910, 1500000) diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index 1d82613f4ba..e617e52e912 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -205,7 +205,7 @@ static VIDEO_START( dynadice ) tilemap_set_scrollx(state->bg_tilemap, 0, -16); } -static VIDEO_UPDATE( dynadice ) +static SCREEN_UPDATE( dynadice ) { dynadice_state *state = screen->machine->driver_data<dynadice_state>(); rectangle myclip = *cliprect; @@ -257,13 +257,13 @@ static MACHINE_CONFIG_START( dynadice, dynadice_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256+16, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 34*8-1, 3*8, 28*8-1) + MCFG_SCREEN_UPDATE(dynadice) MCFG_GFXDECODE(dynadice) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(dynadice) MCFG_VIDEO_START(dynadice) - MCFG_VIDEO_UPDATE(dynadice) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 822c731506b..8f76ccf7ed5 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -4353,12 +4353,12 @@ static MACHINE_CONFIG_START( hanamai, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16+8, 255-8) + MCFG_SCREEN_UPDATE(hanamai) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(sprtmtch) // static palette MCFG_VIDEO_START(hanamai) - MCFG_VIDEO_UPDATE(hanamai) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4411,11 +4411,11 @@ static MACHINE_CONFIG_START( hnoridur, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16, 256-1) + MCFG_SCREEN_UPDATE(hnoridur) MCFG_PALETTE_LENGTH(16*256) MCFG_VIDEO_START(hnoridur) - MCFG_VIDEO_UPDATE(hnoridur) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4457,11 +4457,11 @@ static MACHINE_CONFIG_START( hjingi, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16, 256-1) + MCFG_SCREEN_UPDATE(hnoridur) MCFG_PALETTE_LENGTH(16*256) MCFG_VIDEO_START(hnoridur) - MCFG_VIDEO_UPDATE(hnoridur) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4516,12 +4516,12 @@ static MACHINE_CONFIG_START( sprtmtch, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1) + MCFG_SCREEN_UPDATE(sprtmtch) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(sprtmtch) // static palette MCFG_VIDEO_START(sprtmtch) - MCFG_VIDEO_UPDATE(sprtmtch) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4559,12 +4559,12 @@ static MACHINE_CONFIG_START( mjfriday, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1) + MCFG_SCREEN_UPDATE(mjdialq2) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(sprtmtch) // static palette MCFG_VIDEO_START(mjdialq2) - MCFG_VIDEO_UPDATE(mjdialq2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4715,6 +4715,7 @@ static MACHINE_CONFIG_START( jantouki, dynax_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1) + MCFG_SCREEN_UPDATE(jantouki) MCFG_SCREEN_ADD("bottom", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -4722,10 +4723,10 @@ static MACHINE_CONFIG_START( jantouki, dynax_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1) + MCFG_SCREEN_UPDATE(jantouki) MCFG_PALETTE_INIT(sprtmtch) // static palette MCFG_VIDEO_START(jantouki) - MCFG_VIDEO_UPDATE(jantouki) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4879,12 +4880,12 @@ static MACHINE_CONFIG_START( htengoku, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 0+8, 256-1-8) + MCFG_SCREEN_UPDATE(htengoku) MCFG_PALETTE_LENGTH(16*256) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(htengoku) - MCFG_VIDEO_UPDATE(htengoku) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4956,11 +4957,11 @@ static MACHINE_CONFIG_START( tenkai, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(4, 512-1, 4, 255-8-4) // hide first 4 horizontal pixels (see scroll of gal 4 in test mode) - + MCFG_SCREEN_UPDATE(hnoridur) + MCFG_PALETTE_LENGTH(16*256) MCFG_VIDEO_START(mjelctrn) - MCFG_VIDEO_UPDATE(hnoridur) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -5026,11 +5027,11 @@ static MACHINE_CONFIG_START( gekisha, dynax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(2, 256-1, 16, 256-1) + MCFG_SCREEN_UPDATE(mjdialq2) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(sprtmtch) // static palette MCFG_VIDEO_START(mjdialq2) - MCFG_VIDEO_UPDATE(mjdialq2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c index 44ec0787795..f283b25518a 100644 --- a/src/mame/drivers/dynduke.c +++ b/src/mame/drivers/dynduke.c @@ -295,13 +295,13 @@ static MACHINE_CONFIG_START( dynduke, dynduke_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(dynduke) + MCFG_SCREEN_EOF(dynduke) MCFG_GFXDECODE(dynduke) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(dynduke) - MCFG_VIDEO_UPDATE(dynduke) - MCFG_VIDEO_EOF(dynduke) // sound hardware SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000) diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 75d2c3a9222..3375baa8627 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -172,7 +172,7 @@ static VIDEO_START(egghunt) state->save_item(NAME(state->spram)); } -static VIDEO_UPDATE(egghunt) +static SCREEN_UPDATE(egghunt) { egghunt_state *state = screen->machine->driver_data<egghunt_state>(); tilemap_draw(bitmap,cliprect, state->bg_tilemap, 0, 0); @@ -426,12 +426,12 @@ static MACHINE_CONFIG_START( egghunt, egghunt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(egghunt) MCFG_GFXDECODE(egghunt) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(egghunt) - MCFG_VIDEO_UPDATE(egghunt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c index 1e0931ba408..dfeb0d00f26 100644 --- a/src/mame/drivers/embargo.c +++ b/src/mame/drivers/embargo.c @@ -31,7 +31,7 @@ public: * *************************************/ -static VIDEO_UPDATE( embargo ) +static SCREEN_UPDATE( embargo ) { embargo_state *state = screen->machine->driver_data<embargo_state>(); offs_t offs; @@ -263,13 +263,12 @@ static MACHINE_CONFIG_START( embargo, embargo_state ) MCFG_MACHINE_RESET(embargo) /* video hardware */ - MCFG_VIDEO_UPDATE(embargo) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(embargo) MACHINE_CONFIG_END diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index 78f140fa9b0..eec1a1661f8 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -197,7 +197,7 @@ static void get_pens(pen_t *pens) } -static VIDEO_UPDATE( enigma2 ) +static SCREEN_UPDATE( enigma2 ) { enigma2_state *state = screen->machine->driver_data<enigma2_state>(); pen_t pens[NUM_PENS]; @@ -285,7 +285,7 @@ static VIDEO_UPDATE( enigma2 ) } -static VIDEO_UPDATE( enigma2a ) +static SCREEN_UPDATE( enigma2a ) { enigma2_state *state = screen->machine->driver_data<enigma2_state>(); UINT8 x = 0; @@ -615,11 +615,10 @@ static MACHINE_CONFIG_START( enigma2, enigma2_state ) MCFG_MACHINE_RESET(enigma2) /* video hardware */ - MCFG_VIDEO_UPDATE(enigma2) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(enigma2) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -645,11 +644,10 @@ static MACHINE_CONFIG_START( enigma2a, enigma2_state ) MCFG_MACHINE_RESET(enigma2) /* video hardware */ - MCFG_VIDEO_UPDATE(enigma2a) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(enigma2a) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 591d802b2d8..8e3381b4e68 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -347,12 +347,12 @@ static MACHINE_CONFIG_START( eolith45, eolith_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(eolith) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_PALETTE_LENGTH(32768) MCFG_VIDEO_START(eolith) - MCFG_VIDEO_UPDATE(eolith) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c index a173ef3db5d..b646321cb6f 100644 --- a/src/mame/drivers/eolith16.c +++ b/src/mame/drivers/eolith16.c @@ -122,7 +122,7 @@ static VIDEO_START( eolith16 ) state->vram = auto_alloc_array(machine, UINT16, 0x10000); } -static VIDEO_UPDATE( eolith16 ) +static SCREEN_UPDATE( eolith16 ) { eolith16_state *state = screen->machine->driver_data<eolith16_state>(); int x,y,count; @@ -186,12 +186,12 @@ static MACHINE_CONFIG_START( eolith16, eolith16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 199) + MCFG_SCREEN_UPDATE(eolith16) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(eolith16) MCFG_VIDEO_START(eolith16) - MCFG_VIDEO_UPDATE(eolith16) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index c037da40237..b293df6f411 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -404,14 +404,13 @@ static MACHINE_CONFIG_START( epos, epos_state ) MCFG_MACHINE_RESET(epos) /* video hardware */ - MCFG_VIDEO_UPDATE(epos) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(272, 241) MCFG_SCREEN_VISIBLE_AREA(0, 271, 0, 235) + MCFG_SCREEN_UPDATE(epos) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -434,14 +433,13 @@ static MACHINE_CONFIG_START( dealer, epos_state ) MCFG_MACHINE_RESET(epos) /* video hardware */ - MCFG_VIDEO_UPDATE(epos) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(272, 241) MCFG_SCREEN_VISIBLE_AREA(0, 271, 0, 235) + MCFG_SCREEN_UPDATE(epos) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c index 5322aef8635..a506f977fe2 100644 --- a/src/mame/drivers/eprom.c +++ b/src/mame/drivers/eprom.c @@ -432,9 +432,9 @@ static MACHINE_CONFIG_START( eprom, eprom_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a SYNGEN chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(eprom) MCFG_VIDEO_START(eprom) - MCFG_VIDEO_UPDATE(eprom) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_i_mono_speech) @@ -464,9 +464,9 @@ static MACHINE_CONFIG_START( klaxp, eprom_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a SYNGEN chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(eprom) MCFG_VIDEO_START(eprom) - MCFG_VIDEO_UPDATE(eprom) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_ii_mono) @@ -496,9 +496,9 @@ static MACHINE_CONFIG_START( guts, eprom_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a SYNGEN chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(guts) MCFG_VIDEO_START(guts) - MCFG_VIDEO_UPDATE(guts) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_ii_mono) diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index 09031280173..fa9444719cd 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -1265,12 +1265,12 @@ static MACHINE_CONFIG_START( equites, equites_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 3*8, 29*8-1) + MCFG_SCREEN_UPDATE(equites) MCFG_GFXDECODE(equites) MCFG_PALETTE_LENGTH(0x180) MCFG_PALETTE_INIT(equites) MCFG_VIDEO_START(equites) - MCFG_VIDEO_UPDATE(equites) MCFG_MACHINE_START(equites) MCFG_MACHINE_RESET(equites) @@ -1303,12 +1303,12 @@ static MACHINE_CONFIG_START( splndrbt, equites_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(splndrbt) MCFG_GFXDECODE(splndrbt) MCFG_PALETTE_LENGTH(0x280) MCFG_PALETTE_INIT(splndrbt) MCFG_VIDEO_START(splndrbt) - MCFG_VIDEO_UPDATE(splndrbt) MCFG_MACHINE_START(equites) MCFG_MACHINE_RESET(equites) diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c index b7d37dd66d6..7e8694d40a5 100644 --- a/src/mame/drivers/ertictac.c +++ b/src/mame/drivers/ertictac.c @@ -223,11 +223,11 @@ static MACHINE_CONFIG_START( ertictac, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(1280, 1024) MCFG_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 1024-1) + MCFG_SCREEN_UPDATE(archimds_vidc) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(archimds_vidc) - MCFG_VIDEO_UPDATE(archimds_vidc) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac0", DAC, 0) diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index ddfe9840fda..a504f8bcfc0 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -559,12 +559,12 @@ static MACHINE_CONFIG_START( multchmp, esd16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x140, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0+8, 0x100-8-1) + MCFG_SCREEN_UPDATE(esd16) MCFG_GFXDECODE(esd16) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(esd16) - MCFG_VIDEO_UPDATE(esd16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -588,7 +588,8 @@ static MACHINE_CONFIG_DERIVED( hedpanic, multchmp ) MCFG_PALETTE_LENGTH(0x1000/2) MCFG_GFXDECODE(hedpanic) - MCFG_VIDEO_UPDATE(hedpanic) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(hedpanic) MACHINE_CONFIG_END @@ -620,8 +621,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( hedpanio, hedpanic ) /* basic machine hardware */ - - MCFG_VIDEO_UPDATE(hedpanio) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(hedpanio) MACHINE_CONFIG_END diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 55f8f2ab878..b272bcc93ca 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -40,7 +40,7 @@ static UINT8 *tile_control_ram; static UINT8 ld_video_visible; /* VIDEO GOODS */ -static VIDEO_UPDATE( esh ) +static SCREEN_UPDATE( esh ) { int charx, chary; diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index b162246955f..8dd542ee30f 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -346,13 +346,13 @@ static MACHINE_CONFIG_START( espial, espial_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(espial) MCFG_GFXDECODE(espial) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(espial) MCFG_VIDEO_START(espial) - MCFG_VIDEO_UPDATE(espial) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c index 4406a09b6fb..1f5fbfb77bc 100644 --- a/src/mame/drivers/esripsys.c +++ b/src/mame/drivers/esripsys.c @@ -748,10 +748,10 @@ static MACHINE_CONFIG_START( esripsys, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(ESRIPSYS_PIXEL_CLOCK, ESRIPSYS_HTOTAL, ESRIPSYS_HBLANK_END, ESRIPSYS_HBLANK_START, ESRIPSYS_VTOTAL, ESRIPSYS_VBLANK_END, ESRIPSYS_VBLANK_START) + MCFG_SCREEN_UPDATE(esripsys) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(esripsys) - MCFG_VIDEO_UPDATE(esripsys) /* Sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 4a617f9f759..f551385e09f 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -202,7 +202,7 @@ static VIDEO_START( ettrivia ) tilemap_set_transparent_pen(fg_tilemap,0); } -static VIDEO_UPDATE( ettrivia ) +static SCREEN_UPDATE( ettrivia ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); @@ -253,13 +253,13 @@ static MACHINE_CONFIG_START( ettrivia, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(ettrivia) MCFG_GFXDECODE(ettrivia) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(naughtyb) MCFG_VIDEO_START(ettrivia) - MCFG_VIDEO_UPDATE(ettrivia) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index 484c0eabfd7..5a2db49ab2f 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -235,14 +235,14 @@ static MACHINE_CONFIG_START( exedexes, exedexes_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(exedexes) + MCFG_SCREEN_EOF(exedexes) MCFG_GFXDECODE(exedexes) MCFG_PALETTE_LENGTH(64*4+64*4+16*16+16*16) MCFG_PALETTE_INIT(exedexes) MCFG_VIDEO_START(exedexes) - MCFG_VIDEO_EOF(exedexes) - MCFG_VIDEO_UPDATE(exedexes) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index 5ed78b8c596..398e56c01d0 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -428,13 +428,13 @@ static MACHINE_CONFIG_START( exerion, exerion_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(EXERION_PIXEL_CLOCK, EXERION_HTOTAL, EXERION_HBEND, EXERION_HBSTART, EXERION_VTOTAL, EXERION_VBEND, EXERION_VBSTART) + MCFG_SCREEN_UPDATE(exerion) MCFG_GFXDECODE(exerion) MCFG_PALETTE_LENGTH(256*3) MCFG_PALETTE_INIT(exerion) MCFG_VIDEO_START(exerion) - MCFG_VIDEO_UPDATE(exerion) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index c28116de405..beda55ad11a 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -816,13 +816,13 @@ static MACHINE_CONFIG_START( base, driver_device ) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(exidy) - MCFG_VIDEO_UPDATE(exidy) MCFG_GFXDECODE(exidy) MCFG_PALETTE_LENGTH(8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(EXIDY_PIXEL_CLOCK, EXIDY_HTOTAL, EXIDY_HBEND, EXIDY_HBSTART, EXIDY_VTOTAL, EXIDY_VBEND, EXIDY_VBSTART) + MCFG_SCREEN_UPDATE(exidy) MACHINE_CONFIG_END diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index 06f19da93d7..ee823d39b40 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -504,13 +504,13 @@ static MACHINE_CONFIG_START( galsnew, expro02_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-32-1) + MCFG_SCREEN_UPDATE(galsnew) MCFG_GFXDECODE(1x4bit_1x4bit) MCFG_PALETTE_LENGTH(2048 + 32768) MCFG_MACHINE_RESET( galsnew ) MCFG_VIDEO_START(galsnew) - MCFG_VIDEO_UPDATE(galsnew) MCFG_PALETTE_INIT(berlwall) /* arm watchdog */ diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index f2e0ec799b4..39c83fc1c15 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -513,13 +513,13 @@ static MACHINE_CONFIG_START( exprraid, exprraid_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(exprraid) MCFG_GFXDECODE(exprraid) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(exprraid) - MCFG_VIDEO_UPDATE(exprraid) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c index eb9e580ba86..c38522f119f 100644 --- a/src/mame/drivers/exterm.c +++ b/src/mame/drivers/exterm.c @@ -468,9 +468,9 @@ static MACHINE_CONFIG_START( exterm, exterm_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(40000000/8, 318, 0, 256, 264, 0, 240) + MCFG_SCREEN_UPDATE(tms340x0) MCFG_PALETTE_INIT(exterm) - MCFG_VIDEO_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index 98f8ba039e0..d9d096356e0 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -302,12 +302,12 @@ static MACHINE_CONFIG_START( exzisus, exzisus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(exzisus) MCFG_GFXDECODE(exzisus) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) - MCFG_VIDEO_UPDATE(exzisus) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index 4b32a9c3299..5e00778f62c 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -30,7 +30,7 @@ public: }; -static VIDEO_UPDATE( mosaicf2 ) +static SCREEN_UPDATE( mosaicf2 ) { mosaicf2_state *state = screen->machine->driver_data<mosaicf2_state>(); offs_t offs; @@ -146,12 +146,11 @@ static MACHINE_CONFIG_START( mosaicf2, mosaicf2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 223) + MCFG_SCREEN_UPDATE(mosaicf2) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_PALETTE_LENGTH(32768) - MCFG_VIDEO_UPDATE(mosaicf2) - /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 36f6d54e621..cd3d43c4bb9 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -493,12 +493,12 @@ static MACHINE_CONFIG_START( f1gp, f1gp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(f1gp) MCFG_GFXDECODE(f1gp) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(f1gp) - MCFG_VIDEO_UPDATE(f1gp) MCFG_K053936_ADD("k053936", f1gp_k053936_intf) @@ -537,12 +537,12 @@ static MACHINE_CONFIG_START( f1gpb, f1gp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(f1gpb) MCFG_GFXDECODE(f1gp) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(f1gpb) - MCFG_VIDEO_UPDATE(f1gpb) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -563,12 +563,12 @@ static MACHINE_CONFIG_DERIVED( f1gp2, f1gp ) MCFG_GFXDECODE(f1gp2) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(f1gp2) MCFG_DEVICE_REMOVE("k053936") MCFG_K053936_ADD("k053936", f1gp2_k053936_intf) MCFG_VIDEO_START(f1gp2) - MCFG_VIDEO_UPDATE(f1gp2) MACHINE_CONFIG_END diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index e4dcf47b7a1..6b9b6e99fa6 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -873,11 +873,11 @@ static MACHINE_CONFIG_START( fantland, fantland_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(352,256) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1) + MCFG_SCREEN_UPDATE(fantland) MCFG_GFXDECODE(fantland) MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_UPDATE(fantland) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -924,12 +924,11 @@ static MACHINE_CONFIG_START( galaxygn, fantland_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(352,256) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1) + MCFG_SCREEN_UPDATE(fantland) MCFG_GFXDECODE(fantland) MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_UPDATE(fantland) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1032,12 +1031,11 @@ static MACHINE_CONFIG_START( borntofi, fantland_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(352,256) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1) + MCFG_SCREEN_UPDATE(fantland) MCFG_GFXDECODE(fantland) MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_UPDATE(fantland) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1081,12 +1079,11 @@ static MACHINE_CONFIG_START( wheelrun, fantland_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256,224) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1) + MCFG_SCREEN_UPDATE(fantland) MCFG_GFXDECODE(fantland) MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_UPDATE(fantland) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c index 44a5401529a..10d8ae3ba8f 100644 --- a/src/mame/drivers/fastfred.c +++ b/src/mame/drivers/fastfred.c @@ -635,13 +635,13 @@ static MACHINE_CONFIG_START( fastfred, fastfred_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(fastfred) MCFG_GFXDECODE(fastfred) MCFG_PALETTE_LENGTH(32*8) MCFG_PALETTE_INIT(fastfred) MCFG_VIDEO_START(fastfred) - MCFG_VIDEO_UPDATE(fastfred) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -681,7 +681,8 @@ static MACHINE_CONFIG_DERIVED( imago, fastfred ) MCFG_GFXDECODE(imago) MCFG_VIDEO_START(imago) - MCFG_VIDEO_UPDATE(imago) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(imago) MACHINE_CONFIG_END #undef CLOCK diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index 1382f89195e..56b2ecd48da 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -226,13 +226,13 @@ static MACHINE_CONFIG_START( fastlane, fastlane_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(37*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(fastlane) MCFG_GFXDECODE(fastlane) MCFG_PALETTE_LENGTH(1024*16) MCFG_PALETTE_INIT(fastlane) MCFG_VIDEO_START(fastlane) - MCFG_VIDEO_UPDATE(fastlane) MCFG_K007121_ADD("k007121") MCFG_K051733_ADD("k051733") diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index 287332aa7dd..e7eef691de9 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -311,13 +311,13 @@ static MACHINE_CONFIG_START( fcombat, fcombat_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(FCOMBAT_PIXEL_CLOCK, FCOMBAT_HTOTAL, FCOMBAT_HBEND, FCOMBAT_HBSTART, FCOMBAT_VTOTAL, FCOMBAT_VBEND, FCOMBAT_VBSTART) + MCFG_SCREEN_UPDATE(fcombat) MCFG_GFXDECODE(fcombat) MCFG_PALETTE_LENGTH(256*3) MCFG_PALETTE_INIT(fcombat) MCFG_VIDEO_START(fcombat) - MCFG_VIDEO_UPDATE(fcombat) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index b7e9d25c0c3..cfd5aa3bf75 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -216,7 +216,7 @@ static void fcrash_build_palette( running_machine *machine ) } } -static VIDEO_UPDATE( fcrash ) +static SCREEN_UPDATE( fcrash ) { cps_state *state = screen->machine->driver_data<cps_state>(); int layercontrol, l0, l1, l2, l3; @@ -297,7 +297,7 @@ static VIDEO_UPDATE( fcrash ) } // doesn't have the scroll offsets like fcrash -static VIDEO_UPDATE( kodb ) +static SCREEN_UPDATE( kodb ) { cps_state *state = screen->machine->driver_data<cps_state>(); int layercontrol, l0, l1, l2, l3; @@ -745,13 +745,13 @@ static MACHINE_CONFIG_START( fcrash, cps_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(fcrash) + MCFG_SCREEN_EOF(cps1) MCFG_GFXDECODE(cps1) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(cps1) - MCFG_VIDEO_EOF(cps1) - MCFG_VIDEO_UPDATE(fcrash) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") @@ -796,13 +796,13 @@ static MACHINE_CONFIG_START( kodb, cps_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(kodb) + MCFG_SCREEN_EOF(cps1) MCFG_GFXDECODE(cps1) MCFG_PALETTE_LENGTH(0xc00) MCFG_VIDEO_START(cps1) - MCFG_VIDEO_EOF(cps1) - MCFG_VIDEO_UPDATE(kodb) /* sound hardware */ // MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index 2cb776c92bd..5fb25c44f57 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -70,7 +70,7 @@ static VIDEO_START( feversoc ) } -static VIDEO_UPDATE( feversoc ) +static SCREEN_UPDATE( feversoc ) { UINT32 *spriteram32 = screen->machine->generic.spriteram.u32; int offs,spr_offs,colour,sx,sy,h,w,dx,dy; @@ -248,11 +248,12 @@ static MACHINE_CONFIG_START( feversoc, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) //dynamic resolution? + MCFG_SCREEN_UPDATE(feversoc) + MCFG_GFXDECODE(feversoc) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(feversoc) - MCFG_VIDEO_UPDATE(feversoc) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c index 54dc8ed7ceb..fdf974073b7 100644 --- a/src/mame/drivers/fgoal.c +++ b/src/mame/drivers/fgoal.c @@ -385,13 +385,13 @@ static MACHINE_CONFIG_START( fgoal, fgoal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 263) MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 255) + MCFG_SCREEN_UPDATE(fgoal) MCFG_GFXDECODE(fgoal) MCFG_PALETTE_LENGTH(128 + 16 + 1) MCFG_PALETTE_INIT(fgoal) MCFG_VIDEO_START(fgoal) - MCFG_VIDEO_UPDATE(fgoal) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index e194fee3212..3fee5fbb460 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -288,13 +288,13 @@ static MACHINE_CONFIG_START( finalizr, finalizr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 35*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(finalizr) MCFG_GFXDECODE(finalizr) MCFG_PALETTE_LENGTH(2*16*16) MCFG_PALETTE_INIT(finalizr) MCFG_VIDEO_START(finalizr) - MCFG_VIDEO_UPDATE(finalizr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 41e35171653..a75f0a1b7e7 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -513,7 +513,7 @@ static void gcu_exec_display_list(running_machine *machine, bitmap_t *bitmap, co }; } -static VIDEO_UPDATE(firebeat) +static SCREEN_UPDATE(firebeat) { firebeat_state *state = screen->machine->driver_data<firebeat_state>(); int chip; @@ -1992,12 +1992,12 @@ static MACHINE_CONFIG_START( firebeat, firebeat_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(firebeat) MCFG_PALETTE_LENGTH(32768) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_VIDEO_START(firebeat) - MCFG_VIDEO_UPDATE(firebeat) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2039,6 +2039,7 @@ static MACHINE_CONFIG_START( firebeat2, firebeat_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(firebeat) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -2046,9 +2047,9 @@ static MACHINE_CONFIG_START( firebeat2, firebeat_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(firebeat) MCFG_VIDEO_START(firebeat) - MCFG_VIDEO_UPDATE(firebeat) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 312e16b930c..35422e1b604 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -181,7 +181,7 @@ static VIDEO_START( firefox ) } -static VIDEO_UPDATE( firefox ) +static SCREEN_UPDATE( firefox ) { firefox_state *state = screen->machine->driver_data<firefox_state>(); int sprite; diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index 62e9287e5f5..c2bdcb94350 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -694,13 +694,13 @@ static MACHINE_CONFIG_START( firetrap, firetrap_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(firetrap) MCFG_GFXDECODE(firetrap) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(firetrap) MCFG_VIDEO_START(firetrap) - MCFG_VIDEO_UPDATE(firetrap) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -741,7 +741,7 @@ static MACHINE_CONFIG_START( firetrapbl, firetrap_state ) MCFG_PALETTE_INIT(firetrap) MCFG_VIDEO_START(firetrap) - MCFG_VIDEO_UPDATE(firetrap) + MCFG_SCREEN_UPDATE(firetrap) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index d1911b01847..4908530ad1c 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -905,9 +905,9 @@ static MACHINE_CONFIG_START( firetrk, firetrk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(firetrk) MCFG_VIDEO_START(firetrk) - MCFG_VIDEO_UPDATE(firetrk) MCFG_PALETTE_INIT(firetrk) MCFG_PALETTE_LENGTH(28) MCFG_GFXDECODE(firetrk) @@ -928,8 +928,10 @@ static MACHINE_CONFIG_DERIVED( superbug, firetrk ) MCFG_CPU_PROGRAM_MAP(superbug_map) /* video hardware */ + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(superbug) + MCFG_VIDEO_START(superbug) - MCFG_VIDEO_UPDATE(superbug) MCFG_GFXDECODE(superbug) MCFG_PALETTE_LENGTH(28) @@ -947,8 +949,10 @@ static MACHINE_CONFIG_DERIVED( montecar, firetrk ) MCFG_CPU_PROGRAM_MAP(montecar_map) /* video hardware */ + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(montecar) + MCFG_VIDEO_START(montecar) - MCFG_VIDEO_UPDATE(montecar) MCFG_GFXDECODE(montecar) MCFG_PALETTE_INIT(montecar) diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c index 53b69cafb37..069db241336 100644 --- a/src/mame/drivers/fitfight.c +++ b/src/mame/drivers/fitfight.c @@ -754,11 +754,11 @@ static MACHINE_CONFIG_START( fitfight, fitfight_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 39*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(fitfight) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(fitfight) - MCFG_VIDEO_UPDATE(fitfight) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -783,11 +783,11 @@ static MACHINE_CONFIG_START( bbprot, fitfight_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 39*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(fitfight) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(fitfight) - MCFG_VIDEO_UPDATE(fitfight) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 310bc37178f..5251a38582c 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -244,12 +244,12 @@ static MACHINE_CONFIG_START( flkatck, flkatck_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(37*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(flkatck) MCFG_GFXDECODE(flkatck) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(flkatck) - MCFG_VIDEO_UPDATE(flkatck) MCFG_K007121_ADD("k007121") diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c index d23a12dce69..43a17adac6f 100644 --- a/src/mame/drivers/flower.c +++ b/src/mame/drivers/flower.c @@ -262,6 +262,7 @@ static MACHINE_CONFIG_START( flower, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(34*8, 33*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 34*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(flower) MCFG_GFXDECODE(flower) @@ -269,7 +270,6 @@ static MACHINE_CONFIG_START( flower, driver_device ) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(flower) - MCFG_VIDEO_UPDATE(flower) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index 48d2bfa7dae..2c9e3d7a8fa 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -1116,12 +1116,12 @@ static MACHINE_CONFIG_START( flstory, flstory_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(flstory) MCFG_GFXDECODE(flstory) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(flstory) - MCFG_VIDEO_UPDATE(flstory) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1174,12 +1174,12 @@ static MACHINE_CONFIG_START( onna34ro, flstory_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(flstory) MCFG_GFXDECODE(flstory) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(flstory) - MCFG_VIDEO_UPDATE(flstory) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1232,12 +1232,12 @@ static MACHINE_CONFIG_START( victnine, flstory_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(victnine) MCFG_GFXDECODE(flstory) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(victnine) - MCFG_VIDEO_UPDATE(victnine) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1298,12 +1298,12 @@ static MACHINE_CONFIG_START( rumba, flstory_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(rumba) MCFG_GFXDECODE(flstory) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(rumba) - MCFG_VIDEO_UPDATE(rumba) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index cff36cfa2b6..c0cdd3489dd 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -76,7 +76,7 @@ static VIDEO_START( flyball ) } -static VIDEO_UPDATE( flyball ) +static SCREEN_UPDATE( flyball ) { flyball_state *state = screen->machine->driver_data<flyball_state>(); int pitcherx = state->pitcher_horz; @@ -415,12 +415,12 @@ static MACHINE_CONFIG_START( flyball, flyball_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 262) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE(flyball) MCFG_GFXDECODE(flyball) MCFG_PALETTE_LENGTH(4) MCFG_PALETTE_INIT(flyball) - MCFG_VIDEO_UPDATE(flyball) MCFG_VIDEO_START(flyball) /* sound hardware */ diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index 3896de79c38..e89cd3eaac5 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -378,9 +378,9 @@ static MACHINE_CONFIG_START( foodf, foodf_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 256, 259, 0, 224) + MCFG_SCREEN_UPDATE(foodf) MCFG_VIDEO_START(foodf) - MCFG_VIDEO_UPDATE(foodf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 31954dd8664..8a19d020f24 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -38,7 +38,7 @@ static VIDEO_START(fortecar) { } -static VIDEO_UPDATE(fortecar) +static SCREEN_UPDATE(fortecar) { int x,y,count; count = 0; @@ -291,6 +291,7 @@ static MACHINE_CONFIG_START( fortecar, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 256) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1) + MCFG_SCREEN_UPDATE(fortecar) MCFG_MACHINE_RESET(fortecar) @@ -304,7 +305,6 @@ static MACHINE_CONFIG_START( fortecar, driver_device ) MCFG_PALETTE_INIT(fortecar) MCFG_VIDEO_START(fortecar) - MCFG_VIDEO_UPDATE(fortecar) MCFG_MC6845_ADD("crtc", MC6845, 6000000/4, mc6845_intf) /* unknown type / hand tuned to get ~60 fps */ diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index cbbe249363c..ad220cfd537 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -658,12 +658,12 @@ static MACHINE_CONFIG_START( base, freekick_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pbillrd) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(freekick) - MCFG_VIDEO_UPDATE(pbillrd) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -699,7 +699,8 @@ static MACHINE_CONFIG_DERIVED( freekickb, base ) MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] ) MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] ) - MCFG_VIDEO_UPDATE(freekick) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(freekick) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( gigas, base ) @@ -711,7 +712,8 @@ static MACHINE_CONFIG_DERIVED( gigas, base ) MCFG_MACHINE_START(freekick) MCFG_MACHINE_RESET(freekick) - MCFG_VIDEO_UPDATE(gigas) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(gigas) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( oigas, gigas ) diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index df6c35b8c38..27acb9b0c67 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -587,6 +587,7 @@ static MACHINE_CONFIG_START( fromanc2, fromanc2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromanc2) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -594,9 +595,9 @@ static MACHINE_CONFIG_START( fromanc2, fromanc2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromanc2) MCFG_VIDEO_START(fromanc2) - MCFG_VIDEO_UPDATE(fromanc2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -639,6 +640,7 @@ static MACHINE_CONFIG_START( fromancr, fromanc2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromanc2) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -646,10 +648,10 @@ static MACHINE_CONFIG_START( fromancr, fromanc2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromanc2) MCFG_VIDEO_START(fromancr) - MCFG_VIDEO_UPDATE(fromanc2) - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -688,6 +690,7 @@ static MACHINE_CONFIG_START( fromanc4, fromanc2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(2048, 256) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromanc2) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -695,9 +698,9 @@ static MACHINE_CONFIG_START( fromanc4, fromanc2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromanc2) MCFG_VIDEO_START(fromanc4) - MCFG_VIDEO_UPDATE(fromanc2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index 9b0a6c62cff..0fac42242f5 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -1028,12 +1028,12 @@ static MACHINE_CONFIG_START( nekkyoku, fromance_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromance) MCFG_GFXDECODE(fromance) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(nekkyoku) - MCFG_VIDEO_UPDATE(fromance) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1067,12 +1067,12 @@ static MACHINE_CONFIG_START( idolmj, fromance_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromance) MCFG_GFXDECODE(fromance) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(fromance) - MCFG_VIDEO_UPDATE(fromance) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1106,12 +1106,12 @@ static MACHINE_CONFIG_START( fromance, fromance_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) + MCFG_SCREEN_UPDATE(fromance) MCFG_GFXDECODE(fromance) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(fromance) - MCFG_VIDEO_UPDATE(fromance) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/funkball.c b/src/mame/drivers/funkball.c index 34f53fed5bf..98027d62966 100644 --- a/src/mame/drivers/funkball.c +++ b/src/mame/drivers/funkball.c @@ -70,7 +70,7 @@ static VIDEO_START(funkball) { } -static VIDEO_UPDATE(funkball) +static SCREEN_UPDATE(funkball) { return 0; } @@ -97,10 +97,10 @@ static MACHINE_CONFIG_START( funkball, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199) + MCFG_SCREEN_UPDATE(funkball) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(funkball) - MCFG_VIDEO_UPDATE(funkball) MACHINE_CONFIG_END ROM_START( funkball ) diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index e728bec04fc..45df02297cd 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -310,13 +310,13 @@ static MACHINE_CONFIG_START( funkybee, funkybee_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12, 32*8-8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(funkybee) MCFG_GFXDECODE(funkybee) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(funkybee) MCFG_VIDEO_START(funkybee) - MCFG_VIDEO_UPDATE(funkybee) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 922e5ef12bf..e356e2736b9 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -324,12 +324,11 @@ static MACHINE_CONFIG_START( funkyjet, funkyjet_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(funkyjet) MCFG_GFXDECODE(funkyjet) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_UPDATE(funkyjet) - MCFG_DECO16IC_ADD("deco_custom", funkyjet_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index 20c9ade1a89..153041e6713 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -2126,13 +2126,13 @@ static MACHINE_CONFIG_START( fw1stpal, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((124+1)*4, (30+1)*8) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */ MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* Taken from MC6845 init, registers 01 & 06 */ + MCFG_SCREEN_UPDATE(funworld) MCFG_GFXDECODE(fw1stpal) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(funworld) MCFG_VIDEO_START(funworld) - MCFG_VIDEO_UPDATE(funworld) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/8, mc6845_intf) /* 2MHz, veryfied on jollycrd & royalcrd */ diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c index 78dfe7e6b21..86add4fb919 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -237,12 +237,12 @@ static MACHINE_CONFIG_START( funybubl, funybubl_state ) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(12*8, 512-12*8-1, 16, 256-16-1) // MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(funybubl) MCFG_GFXDECODE(funybubl) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(funybubl) - MCFG_VIDEO_UPDATE(funybubl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index ddd84171fb2..00de545ed48 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -466,12 +466,12 @@ static MACHINE_CONFIG_START( fuuki16, fuuki16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-16-1) + MCFG_SCREEN_UPDATE(fuuki16) MCFG_GFXDECODE(fuuki16) MCFG_PALETTE_LENGTH(0x800*4) MCFG_VIDEO_START(fuuki16) - MCFG_VIDEO_UPDATE(fuuki16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 6bd682b5290..2a9d4bacdac 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -568,13 +568,13 @@ static MACHINE_CONFIG_START( fuuki32, fuuki32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1) + MCFG_SCREEN_UPDATE(fuuki32) + MCFG_SCREEN_EOF(fuuki32) MCFG_GFXDECODE(fuuki32) MCFG_PALETTE_LENGTH(0x4000/2) MCFG_VIDEO_START(fuuki32) - MCFG_VIDEO_UPDATE(fuuki32) - MCFG_VIDEO_EOF(fuuki32) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index 48b89769a9e..835d9065488 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -518,12 +518,12 @@ static MACHINE_CONFIG_START( bigkarnk, gaelco_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(bigkarnk) MCFG_GFXDECODE(0x100000) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(bigkarnk) - MCFG_VIDEO_UPDATE(bigkarnk) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -551,12 +551,12 @@ static MACHINE_CONFIG_START( maniacsq, gaelco_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(maniacsq) MCFG_GFXDECODE(0x100000) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(maniacsq) - MCFG_VIDEO_UPDATE(maniacsq) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -583,12 +583,12 @@ static MACHINE_CONFIG_START( squash, gaelco_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(maniacsq) MCFG_GFXDECODE(0x100000) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(maniacsq) - MCFG_VIDEO_UPDATE(maniacsq) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -615,12 +615,12 @@ static MACHINE_CONFIG_START( thoop, gaelco_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(maniacsq) MCFG_GFXDECODE(0x100000) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(maniacsq) - MCFG_VIDEO_UPDATE(maniacsq) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c index 4aaa94515e5..afd1e2fd4e8 100644 --- a/src/mame/drivers/gaelco2.c +++ b/src/mame/drivers/gaelco2.c @@ -170,13 +170,13 @@ static MACHINE_CONFIG_START( maniacsq, gaelco2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(gaelco2) + MCFG_SCREEN_EOF(gaelco2) MCFG_GFXDECODE(0x0080000) MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START(gaelco2) - MCFG_VIDEO_EOF(gaelco2) - MCFG_VIDEO_UPDATE(gaelco2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -304,13 +304,13 @@ static MACHINE_CONFIG_START( bang, gaelco2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(gaelco2) + MCFG_SCREEN_EOF(gaelco2) MCFG_GFXDECODE(0x0200000) MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START(gaelco2) - MCFG_VIDEO_EOF(gaelco2) - MCFG_VIDEO_UPDATE(gaelco2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -546,13 +546,13 @@ static MACHINE_CONFIG_START( alighunt, gaelco2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(gaelco2) + MCFG_SCREEN_EOF(gaelco2) MCFG_GFXDECODE(0x0400000) MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START(gaelco2) - MCFG_VIDEO_EOF(gaelco2) - MCFG_VIDEO_UPDATE(gaelco2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -792,6 +792,7 @@ static MACHINE_CONFIG_START( touchgo, gaelco2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(64*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 16, 256-1) + MCFG_SCREEN_UPDATE(gaelco2_dual) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -799,10 +800,10 @@ static MACHINE_CONFIG_START( touchgo, gaelco2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(64*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 16, 256-1) + MCFG_SCREEN_UPDATE(gaelco2_dual) + MCFG_SCREEN_EOF(gaelco2) MCFG_VIDEO_START(gaelco2_dual) - MCFG_VIDEO_EOF(gaelco2) - MCFG_VIDEO_UPDATE(gaelco2_dual) /* sound hardware */ /* the chip is stereo, but the game sound is mono because the right channel @@ -984,13 +985,13 @@ static MACHINE_CONFIG_START( snowboar, gaelco2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1) + MCFG_SCREEN_UPDATE(gaelco2) + MCFG_SCREEN_EOF(gaelco2) MCFG_GFXDECODE(0x0400000) MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START(gaelco2) - MCFG_VIDEO_EOF(gaelco2) - MCFG_VIDEO_UPDATE(gaelco2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1229,6 +1230,7 @@ static MACHINE_CONFIG_START( wrally2, gaelco2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(384, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1) + MCFG_SCREEN_UPDATE(gaelco2_dual) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -1236,11 +1238,11 @@ static MACHINE_CONFIG_START( wrally2, gaelco2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(384, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1) + MCFG_SCREEN_UPDATE(gaelco2_dual) + MCFG_SCREEN_EOF(gaelco2) MCFG_VIDEO_START(gaelco2_dual) - MCFG_VIDEO_EOF(gaelco2) - MCFG_VIDEO_UPDATE(gaelco2_dual) /* sound hardware */ /* the chip is stereo, but the game sound is mono because the right channel diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index f1f32a8c5af..9a8e3c5e5e3 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -1022,12 +1022,12 @@ static MACHINE_CONFIG_START( gaelco3d, gaelco3d_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(576, 432) MCFG_SCREEN_VISIBLE_AREA(0, 575, 0, 431) + MCFG_SCREEN_UPDATE(gaelco3d) MCFG_PALETTE_LENGTH(32768) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_VIDEO_START(gaelco3d) - MCFG_VIDEO_UPDATE(gaelco3d) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index 82aca1b0703..a31a3a24a75 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -785,12 +785,12 @@ static MACHINE_CONFIG_START( shadoww, gaiden_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1) + MCFG_SCREEN_UPDATE(gaiden) MCFG_GFXDECODE(gaiden) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(gaiden) - MCFG_VIDEO_UPDATE(gaiden) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -816,9 +816,9 @@ static MACHINE_CONFIG_DERIVED( raiga, shadoww ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) + MCFG_SCREEN_UPDATE(raiga) MCFG_VIDEO_START(raiga) - MCFG_VIDEO_UPDATE(raiga) MCFG_GFXDECODE(raiga) MACHINE_CONFIG_END @@ -843,12 +843,12 @@ static MACHINE_CONFIG_START( drgnbowl, gaiden_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(drgnbowl) MCFG_GFXDECODE(drgnbowl) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(drgnbowl) - MCFG_VIDEO_UPDATE(drgnbowl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -960,12 +960,12 @@ static MACHINE_CONFIG_START( mastninj, gaiden_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gaiden) MCFG_GFXDECODE(mastninj) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(mastninj) - MCFG_VIDEO_UPDATE(gaiden) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c index 3db99fac573..5756a474bfa 100644 --- a/src/mame/drivers/gal3.c +++ b/src/mame/drivers/gal3.c @@ -175,7 +175,7 @@ static void update_palette( running_machine *machine ) } } /* update_palette */ -static VIDEO_UPDATE(gal3) +static SCREEN_UPDATE(gal3) { int i; char mst[18], slv[18]; @@ -664,6 +664,7 @@ static MACHINE_CONFIG_START( gal3, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1) + MCFG_SCREEN_UPDATE(gal3) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -671,12 +672,12 @@ static MACHINE_CONFIG_START( gal3, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1) + MCFG_SCREEN_UPDATE(gal3) MCFG_GFXDECODE(namcos21) MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS) MCFG_VIDEO_START(gal3) - MCFG_VIDEO_UPDATE(gal3) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index f03db6e2e01..4895a6a9a7d 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -1614,14 +1614,14 @@ static MACHINE_CONFIG_START( bosco, _galaga_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 16, 224+16) + MCFG_SCREEN_UPDATE(bosco) + MCFG_SCREEN_EOF(bosco) MCFG_GFXDECODE(bosco) MCFG_PALETTE_LENGTH(64*4+64*4+4+64) MCFG_PALETTE_INIT(bosco) MCFG_VIDEO_START(bosco) - MCFG_VIDEO_UPDATE(bosco) - MCFG_VIDEO_EOF(bosco) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1666,14 +1666,14 @@ static MACHINE_CONFIG_START( galaga, _galaga_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224) + MCFG_SCREEN_UPDATE(galaga) + MCFG_SCREEN_EOF(galaga) MCFG_GFXDECODE(galaga) MCFG_PALETTE_LENGTH(64*4+64*4+64) MCFG_PALETTE_INIT(galaga) MCFG_VIDEO_START(galaga) - MCFG_VIDEO_UPDATE(galaga) - MCFG_VIDEO_EOF(galaga) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1736,13 +1736,13 @@ static MACHINE_CONFIG_START( xevious, _galaga_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224) + MCFG_SCREEN_UPDATE(xevious) MCFG_GFXDECODE(xevious) MCFG_PALETTE_LENGTH(128*4+64*8+64*2) MCFG_PALETTE_INIT(xevious) MCFG_VIDEO_START(xevious) - MCFG_VIDEO_UPDATE(xevious) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1818,13 +1818,13 @@ static MACHINE_CONFIG_START( digdug, _galaga_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224) + MCFG_SCREEN_UPDATE(digdug) MCFG_GFXDECODE(digdug) MCFG_PALETTE_LENGTH(16*2+64*4+64*4) MCFG_PALETTE_INIT(digdug) MCFG_VIDEO_START(digdug) - MCFG_VIDEO_UPDATE(digdug) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c index ff4b9e272ff..a78527a6177 100644 --- a/src/mame/drivers/galastrm.c +++ b/src/mame/drivers/galastrm.c @@ -328,12 +328,12 @@ static MACHINE_CONFIG_START( galastrm, galastrm_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 50*8) MCFG_SCREEN_VISIBLE_AREA(0+96, 40*8-1+96, 3*8+60, 32*8-1+60) + MCFG_SCREEN_UPDATE(galastrm) MCFG_GFXDECODE(galastrm) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(galastrm) - MCFG_VIDEO_UPDATE(galastrm) MCFG_TC0100SCN_ADD("tc0100scn", galastrm_tc0100scn_intf) MCFG_TC0480SCP_ADD("tc0480scp", galastrm_tc0480scp_intf) diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index a56d2eea13b..ff54f540699 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -164,7 +164,7 @@ static VIDEO_START(galaxi) tilemap_set_scrolldx(state->bg3_tmap, -8, 0); } -static VIDEO_UPDATE(galaxi) +static SCREEN_UPDATE(galaxi) { galaxi_state *state = screen->machine->driver_data<galaxi_state>(); int layers_ctrl = -1; @@ -409,12 +409,12 @@ static MACHINE_CONFIG_START( galaxi, galaxi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(16*5, 512-16*2-1, 16*1, 256-1) + MCFG_SCREEN_UPDATE(galaxi) MCFG_GFXDECODE(galaxi) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(galaxi) - MCFG_VIDEO_UPDATE(galaxi) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c index e5cd6d8481f..7e5790a7de0 100644 --- a/src/mame/drivers/galaxia.c +++ b/src/mame/drivers/galaxia.c @@ -31,7 +31,7 @@ TS 2008.08.12: static UINT8 *galaxia_video; static UINT8 *galaxia_color; -static VIDEO_UPDATE( galaxia ) +static SCREEN_UPDATE( galaxia ) { int x,y, count; @@ -270,6 +270,7 @@ static MACHINE_CONFIG_START( galaxia, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) + MCFG_SCREEN_UPDATE(galaxia) MCFG_GFXDECODE(galaxia) MCFG_PALETTE_LENGTH(0x100) @@ -278,8 +279,6 @@ static MACHINE_CONFIG_START( galaxia, driver_device ) MCFG_S2636_ADD("s2636_1", s2636_1_config) MCFG_S2636_ADD("s2636_2", s2636_2_config) - MCFG_VIDEO_UPDATE(galaxia) - MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("s2636snd_0", S2636_SOUND, 0) diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 2133faac21e..72ad8b995fe 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -1972,10 +1972,10 @@ static MACHINE_CONFIG_START( galaxian_base, galaxian_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(GALAXIAN_PIXEL_CLOCK, GALAXIAN_HTOTAL, GALAXIAN_HBEND, GALAXIAN_HBSTART, GALAXIAN_VTOTAL, GALAXIAN_VBEND, GALAXIAN_VBSTART) + MCFG_SCREEN_UPDATE(galaxian) MCFG_PALETTE_INIT(galaxian) MCFG_VIDEO_START(galaxian) - MCFG_VIDEO_UPDATE(galaxian) /* blinking frequency is determined by 555 counter with Ra=100k, Rb=10k, C=10uF */ MCFG_TIMER_ADD_PERIODIC("stars", galaxian_stars_blink_timer, PERIOD_OF_555_ASTABLE(100000, 10000, 0.00001)) diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index eef078a9bf3..82712bae1ad 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -2137,10 +2137,10 @@ static MACHINE_CONFIG_START( galaxold_base, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(galaxold) MCFG_PALETTE_INIT(galaxold) MCFG_VIDEO_START(galaxold) - MCFG_VIDEO_UPDATE(galaxold) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2291,6 +2291,7 @@ static MACHINE_CONFIG_START( drivfrcg, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(galaxold) MCFG_PALETTE_LENGTH(64) MCFG_GFXDECODE(gmgalax) @@ -2298,7 +2299,6 @@ static MACHINE_CONFIG_START( drivfrcg, driver_device ) MCFG_PALETTE_INIT(rockclim) MCFG_VIDEO_START(drivfrcg) - MCFG_VIDEO_UPDATE(galaxold) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2314,7 +2314,8 @@ static MACHINE_CONFIG_DERIVED( bongo, galaxold_base ) MCFG_CPU_IO_MAP(bongo_io) MCFG_VIDEO_START(bongo) - MCFG_VIDEO_UPDATE(galaxold) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(galaxold) MCFG_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4) MCFG_SOUND_CONFIG(bongo_ay8910_interface) @@ -2383,9 +2384,9 @@ static MACHINE_CONFIG_START( racknrol, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(galaxold) MCFG_PALETTE_INIT(rockclim) - MCFG_VIDEO_UPDATE(galaxold) MCFG_VIDEO_START(racknrol) /* sound hardware */ @@ -2439,9 +2440,9 @@ static MACHINE_CONFIG_START( hexpoola, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(galaxold) MCFG_PALETTE_INIT(rockclim) - MCFG_VIDEO_UPDATE(galaxold) MCFG_VIDEO_START(racknrol) /* sound hardware */ diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 94da76fa59f..92ff35469a1 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -478,13 +478,13 @@ static MACHINE_CONFIG_START( galivan, galivan_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(galivan) MCFG_GFXDECODE(galivan) MCFG_PALETTE_LENGTH(8*16+16*16+256*16) MCFG_PALETTE_INIT(galivan) MCFG_VIDEO_START(galivan) - MCFG_VIDEO_UPDATE(galivan) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -522,13 +522,13 @@ static MACHINE_CONFIG_START( ninjemak, galivan_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(ninjemak) MCFG_GFXDECODE(ninjemak) MCFG_PALETTE_LENGTH(8*16+16*16+256*16) MCFG_PALETTE_INIT(galivan) MCFG_VIDEO_START(ninjemak) - MCFG_VIDEO_UPDATE(ninjemak) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index df735059f30..68301f78a4e 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -596,13 +596,13 @@ static MACHINE_CONFIG_START( galpani2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1-16) + MCFG_SCREEN_UPDATE(galpani2) MCFG_GFXDECODE(galpani2) MCFG_PALETTE_LENGTH(0x4000 + 0x200 + 0x8000) // sprites, bg8, bg15 MCFG_PALETTE_INIT(galpani2) MCFG_VIDEO_START(galpani2) - MCFG_VIDEO_UPDATE(galpani2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index b26360858d2..8ab432e6deb 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -193,7 +193,7 @@ static int gp3_is_alpha_pen(running_machine *machine, int pen) } -static VIDEO_UPDATE(galpani3) +static SCREEN_UPDATE(galpani3) { galpani3_state *state = screen->machine->driver_data<galpani3_state>(); int x,y; @@ -957,11 +957,11 @@ static MACHINE_CONFIG_START( galpani3, galpani3_state ) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) //MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 64*8-1) + MCFG_SCREEN_UPDATE(galpani3) MCFG_PALETTE_LENGTH(0x4303) MCFG_VIDEO_START(galpani3) - MCFG_VIDEO_UPDATE(galpani3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c index 90e4ac5c85d..9c4f422e5bb 100644 --- a/src/mame/drivers/galpanic.c +++ b/src/mame/drivers/galpanic.c @@ -125,7 +125,7 @@ The current set of Super Model is an example of type C #include "video/kan_pand.h" #include "includes/galpanic.h" -static VIDEO_EOF( galpanic ) +static SCREEN_EOF( galpanic ) { device_t *pandora = machine->device("pandora"); pandora_eof(pandora); @@ -885,6 +885,8 @@ static MACHINE_CONFIG_START( galpanic, galpanic_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1) + MCFG_SCREEN_UPDATE(galpanic) + MCFG_SCREEN_EOF( galpanic ) MCFG_GFXDECODE(galpanic) MCFG_PALETTE_LENGTH(1024 + 32768) @@ -893,8 +895,6 @@ static MACHINE_CONFIG_START( galpanic, galpanic_state ) MCFG_PALETTE_INIT(galpanic) MCFG_VIDEO_START(galpanic) - MCFG_VIDEO_UPDATE(galpanic) - MCFG_VIDEO_EOF( galpanic ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -922,8 +922,8 @@ static MACHINE_CONFIG_DERIVED( comad, galpanic ) MCFG_DEVICE_REMOVE("pandora") /* video hardware */ - MCFG_VIDEO_UPDATE(comad) - MCFG_VIDEO_EOF(0) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(comad) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( supmodel, comad ) @@ -935,8 +935,8 @@ static MACHINE_CONFIG_DERIVED( supmodel, comad ) MCFG_CPU_VBLANK_INT_HACK(galpanic_interrupt,2) /* video hardware */ - MCFG_VIDEO_UPDATE(comad) - MCFG_VIDEO_EOF(0) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(comad) /* sound hardware */ MCFG_OKIM6295_REPLACE("oki", 1584000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified @@ -952,8 +952,8 @@ static MACHINE_CONFIG_DERIVED( fantsia2, comad ) MCFG_CPU_PROGRAM_MAP(fantsia2_map) /* video hardware */ - MCFG_VIDEO_UPDATE(comad) - MCFG_VIDEO_EOF(0) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(comad) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( galhustl, comad ) @@ -965,8 +965,8 @@ static MACHINE_CONFIG_DERIVED( galhustl, comad ) MCFG_CPU_VBLANK_INT_HACK(galhustl_interrupt,3) /* video hardware */ - MCFG_VIDEO_UPDATE(comad) - MCFG_VIDEO_EOF(0) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(comad) /* sound hardware */ MCFG_OKIM6295_REPLACE("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified @@ -982,7 +982,8 @@ static MACHINE_CONFIG_DERIVED( zipzap, comad ) MCFG_CPU_VBLANK_INT_HACK(galhustl_interrupt,3) /* video hardware */ - MCFG_VIDEO_UPDATE(comad) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(comad) /* sound hardware */ MCFG_OKIM6295_REPLACE("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index 767b62ab005..98db05e322f 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -227,12 +227,12 @@ static MACHINE_CONFIG_START( galspnbl, galspnbl_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) + MCFG_SCREEN_UPDATE(galspnbl) MCFG_GFXDECODE(galspnbl) MCFG_PALETTE_LENGTH(1024 + 32768) MCFG_PALETTE_INIT(galspnbl) - MCFG_VIDEO_UPDATE(galspnbl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 6b368405735..b3e36ef85c8 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -124,7 +124,7 @@ static void draw_char(bitmap_t *bitmap, const rectangle *cliprect, const gfx_ele } } -static VIDEO_UPDATE(gamecstl) +static SCREEN_UPDATE(gamecstl) { int i, j; const gfx_element *gfx = screen->machine->gfx[0]; @@ -691,12 +691,12 @@ static MACHINE_CONFIG_START( gamecstl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199) + MCFG_SCREEN_UPDATE(gamecstl) MCFG_GFXDECODE(CGA) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(gamecstl) - MCFG_VIDEO_UPDATE(gamecstl) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index 3dc861095e5..de9fc54b621 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -570,14 +570,14 @@ static MACHINE_CONFIG_START( gaplus, gaplus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(gaplus) + MCFG_SCREEN_EOF(gaplus) MCFG_GFXDECODE(gaplus) MCFG_PALETTE_LENGTH(64*4+64*8) MCFG_PALETTE_INIT(gaplus) MCFG_VIDEO_START(gaplus) - MCFG_VIDEO_UPDATE(gaplus) - MCFG_VIDEO_EOF(gaplus) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c index 12150c1fd45..48509eb8bea 100644 --- a/src/mame/drivers/gatron.c +++ b/src/mame/drivers/gatron.c @@ -451,12 +451,12 @@ static MACHINE_CONFIG_START( gat, gatron_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(48*8, 16*16) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 16*16-1) + MCFG_SCREEN_UPDATE(gat) MCFG_GFXDECODE(gat) MCFG_PALETTE_INIT(gat) MCFG_PALETTE_LENGTH(8) MCFG_VIDEO_START(gat) - MCFG_VIDEO_UPDATE(gat) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index a784b972e26..0740eaa15b5 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -537,9 +537,9 @@ static MACHINE_CONFIG_START( gauntlet, gauntlet_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a SYNGEN chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(gauntlet) MCFG_VIDEO_START(gauntlet) - MCFG_VIDEO_UPDATE(gauntlet) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 517f93414e5..71b16bbea4c 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -404,13 +404,13 @@ static MACHINE_CONFIG_START( gberet, gberet_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gberet) MCFG_GFXDECODE(gberet) MCFG_PALETTE_LENGTH(2*16*16) MCFG_PALETTE_INIT(gberet) MCFG_VIDEO_START(gberet) - MCFG_VIDEO_UPDATE(gberet) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -430,10 +430,9 @@ static MACHINE_CONFIG_DERIVED( gberetb, gberet ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_UPDATE(gberetb) MCFG_GFXDECODE(gberetb) - - MCFG_VIDEO_UPDATE(gberetb) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( mrgoemon, gberet ) diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 952e7713dfb..ce5e20ea9fd 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -329,11 +329,11 @@ static MACHINE_CONFIG_START( gbusters, gbusters_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(gbusters) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(gbusters) - MCFG_VIDEO_UPDATE(gbusters) MCFG_K052109_ADD("k052109", gbusters_k052109_intf) MCFG_K051960_ADD("k051960", gbusters_k051960_intf) diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index 4e0f441fe30..8cf51da9325 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -447,6 +447,7 @@ static MACHINE_CONFIG_START( gcpinbal, gcpinbal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gcpinbal) MCFG_MACHINE_START(gcpinbal) MCFG_MACHINE_RESET(gcpinbal) @@ -455,7 +456,6 @@ static MACHINE_CONFIG_START( gcpinbal, gcpinbal_state ) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(gcpinbal) - MCFG_VIDEO_UPDATE(gcpinbal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index 48fa21d466d..66b157a349c 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -1059,6 +1059,7 @@ static MACHINE_CONFIG_START( getrivia, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(48, 511-48, 16, 255-16) + MCFG_SCREEN_UPDATE(generic_bitmapped) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(gei) @@ -1066,7 +1067,6 @@ static MACHINE_CONFIG_START( getrivia, driver_device ) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_VIDEO_START(generic_bitmapped) - MCFG_VIDEO_UPDATE(generic_bitmapped) MCFG_PPI8255_ADD( "ppi8255_0", getrivia_ppi8255_intf[0] ) MCFG_PPI8255_ADD( "ppi8255_1", getrivia_ppi8255_intf[1] ) diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c index be4b19a56a4..0b82b0221bb 100644 --- a/src/mame/drivers/ggconnie.c +++ b/src/mame/drivers/ggconnie.c @@ -157,13 +157,13 @@ static MACHINE_CONFIG_START( ggconnie, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242) + MCFG_SCREEN_UPDATE( pce ) /* MCFG_GFXDECODE( pce_gfxdecodeinfo ) */ MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT( vce ) MCFG_VIDEO_START( pce ) - MCFG_VIDEO_UPDATE( pce ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6) diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c index c02c3f45c0f..9f59f92ae43 100644 --- a/src/mame/drivers/ghosteo.c +++ b/src/mame/drivers/ghosteo.c @@ -447,13 +447,13 @@ static MACHINE_CONFIG_START( bballoon, ghosteo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(455, 262) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1) + MCFG_SCREEN_UPDATE(s3c2410) MCFG_PALETTE_LENGTH(256) MCFG_MACHINE_RESET( bballoon ) MCFG_VIDEO_START(s3c2410) - MCFG_VIDEO_UPDATE(s3c2410) MCFG_S3C2410_ADD("s3c2410", 12000000, bballoon_s3c2410_intf) diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index f2efaf4c7e6..560b7a03b08 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -320,11 +320,11 @@ static MACHINE_CONFIG_START( gijoe, gijoe_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(24, 24+288-1, 16, 16+224-1) + MCFG_SCREEN_UPDATE(gijoe) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(gijoe) - MCFG_VIDEO_UPDATE(gijoe) MCFG_K056832_ADD("k056832", gijoe_k056832_intf) MCFG_K053246_ADD("k053246", gijoe_k053247_intf) diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index 6e357ce5d49..bef1375313f 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -358,12 +358,12 @@ static MACHINE_CONFIG_START( ginganin, ginganin_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0 + 16 , 255 - 16) + MCFG_SCREEN_UPDATE(ginganin) MCFG_GFXDECODE(ginganin) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(ginganin) - MCFG_VIDEO_UPDATE(ginganin) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 3aae2de8600..36643020bf4 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -692,12 +692,12 @@ static MACHINE_CONFIG_START( ppking, gladiatr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(ppking) MCFG_GFXDECODE(ppking) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(ppking) - MCFG_VIDEO_UPDATE(ppking) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -741,12 +741,12 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gladiatr) MCFG_GFXDECODE(gladiatr) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(gladiatr) - MCFG_VIDEO_UPDATE(gladiatr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index bccb8d0f75f..327ae30b9f4 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -211,12 +211,12 @@ static MACHINE_CONFIG_START( glass, glass_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 368-1, 16, 256-1) + MCFG_SCREEN_UPDATE(glass) MCFG_GFXDECODE(glass) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(glass) - MCFG_VIDEO_UPDATE(glass) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index fbc22628c76..616ac88bbe9 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -346,13 +346,13 @@ static MACHINE_CONFIG_START( gng, gng_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gng) + MCFG_SCREEN_EOF(gng) MCFG_GFXDECODE(gng) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(gng) - MCFG_VIDEO_EOF(gng) - MCFG_VIDEO_UPDATE(gng) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 936c6fb293a..b39188112e8 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -169,7 +169,7 @@ static VIDEO_START(go2000) { } -static VIDEO_UPDATE(go2000) +static SCREEN_UPDATE(go2000) { go2000_state *state = screen->machine->driver_data<go2000_state>(); int x,y; @@ -338,11 +338,11 @@ static MACHINE_CONFIG_START( go2000, go2000_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(go2000) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(go2000) - MCFG_VIDEO_UPDATE(go2000) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index e184b202424..db76d4c4f80 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -334,13 +334,13 @@ static MACHINE_CONFIG_START( goal92, goal92_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) // black border at bottom is a game bug... + MCFG_SCREEN_UPDATE(goal92) + MCFG_SCREEN_EOF(goal92) MCFG_GFXDECODE(goal92) MCFG_PALETTE_LENGTH(128*16) MCFG_VIDEO_START(goal92) - MCFG_VIDEO_UPDATE(goal92) - MCFG_VIDEO_EOF(goal92) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index 91422c0fb3d..7867651d582 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -264,13 +264,13 @@ static MACHINE_CONFIG_START( goindol, goindol_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goindol) MCFG_GFXDECODE(goindol) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(goindol) - MCFG_VIDEO_UPDATE(goindol) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/goldngam.c b/src/mame/drivers/goldngam.c index 52dadbb7fb2..57e5774ba07 100644 --- a/src/mame/drivers/goldngam.c +++ b/src/mame/drivers/goldngam.c @@ -248,7 +248,7 @@ static VIDEO_START( goldngam ) } -static VIDEO_UPDATE( goldngam ) +static SCREEN_UPDATE( goldngam ) { int x, y; @@ -555,6 +555,7 @@ static MACHINE_CONFIG_START( swisspkr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(4*8, 43*8-1, 1*8, 37*8-1) // 312x288 + MCFG_SCREEN_UPDATE(goldngam) MCFG_GFXDECODE(goldngam) @@ -562,7 +563,6 @@ static MACHINE_CONFIG_START( swisspkr, driver_device ) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(goldngam) - MCFG_VIDEO_UPDATE(goldngam) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 1a08caa3bef..11198b2323f 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -762,7 +762,7 @@ static VIDEO_START( wcrdxtnd ) bg_tilemap = tilemap_create(machine, xtnd_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -static VIDEO_UPDATE( goldnpkr ) +static SCREEN_UPDATE( goldnpkr ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -2901,6 +2901,7 @@ static MACHINE_CONFIG_START( goldnpkr_base, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((39+1)*8, (31+1)*8) /* From MC6845 init, registers 00 & 04 (programmed with value-1). */ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 29*8-1) /* From MC6845 init, registers 01 & 06. */ + MCFG_SCREEN_UPDATE(goldnpkr) MCFG_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf) /* 68B45 or 6845s @ CPU clock */ @@ -2908,7 +2909,6 @@ static MACHINE_CONFIG_START( goldnpkr_base, driver_device ) MCFG_PALETTE_INIT(goldnpkr) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(goldnpkr) - MCFG_VIDEO_UPDATE(goldnpkr) MACHINE_CONFIG_END diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index b616b96a611..34090ee477a 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -5667,13 +5667,13 @@ static MACHINE_CONFIG_START( goldstar, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(goldstar) MCFG_PALETTE_LENGTH(256) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -5702,13 +5702,13 @@ static MACHINE_CONFIG_START( goldstbl, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(bl) MCFG_PALETTE_LENGTH(256) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -5736,13 +5736,13 @@ static MACHINE_CONFIG_START( moonlght, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(ml) MCFG_PALETTE_LENGTH(256) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -5836,6 +5836,7 @@ static MACHINE_CONFIG_START( chrygld, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(chry10) MCFG_PALETTE_LENGTH(256) @@ -5843,7 +5844,6 @@ static MACHINE_CONFIG_START( chrygld, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -5878,6 +5878,7 @@ static MACHINE_CONFIG_START( cb3c, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(cb3c) MCFG_PALETTE_LENGTH(256) @@ -5885,7 +5886,6 @@ static MACHINE_CONFIG_START( cb3c, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -5919,6 +5919,7 @@ static MACHINE_CONFIG_START( ncb3, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(ncb3) MCFG_PALETTE_LENGTH(256) @@ -5927,7 +5928,6 @@ static MACHINE_CONFIG_START( ncb3, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -5960,6 +5960,7 @@ static MACHINE_CONFIG_START( cm, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(cmbitmap) MCFG_PALETTE_LENGTH(256) @@ -5967,7 +5968,6 @@ static MACHINE_CONFIG_START( cm, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(cherrym) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6001,6 +6001,7 @@ static MACHINE_CONFIG_START( cmnobmp, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(cm) MCFG_PALETTE_LENGTH(256) @@ -6008,7 +6009,6 @@ static MACHINE_CONFIG_START( cmnobmp, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(cherrym) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6037,6 +6037,7 @@ static MACHINE_CONFIG_START( cmast91, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(cmast91) MCFG_GFXDECODE(cmast91) MCFG_PALETTE_LENGTH(256) @@ -6044,7 +6045,6 @@ static MACHINE_CONFIG_START( cmast91, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(cherrym) - MCFG_VIDEO_UPDATE(cmast91) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6082,13 +6082,13 @@ static MACHINE_CONFIG_START( lucky8, goldstar_state ) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) MCFG_PALETTE_INIT(lucky8) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(ncb3) MCFG_PALETTE_LENGTH(256) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6139,6 +6139,7 @@ static MACHINE_CONFIG_START( magodds, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(magical) MCFG_PALETTE_INIT(magodds) MCFG_GFXDECODE(magodds) @@ -6146,7 +6147,6 @@ static MACHINE_CONFIG_START( magodds, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(magical) - MCFG_VIDEO_UPDATE(magical) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6181,13 +6181,13 @@ static MACHINE_CONFIG_START( kkojnoli, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_PALETTE_INIT(lucky8) MCFG_GFXDECODE(ncb3) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6217,6 +6217,7 @@ static MACHINE_CONFIG_START( ladylinr, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_PALETTE_INIT(lucky8) MCFG_GFXDECODE(ncb3) @@ -6224,7 +6225,6 @@ static MACHINE_CONFIG_START( ladylinr, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono' @@ -6258,6 +6258,7 @@ static MACHINE_CONFIG_START( wcat3, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_PALETTE_INIT(lucky8) MCFG_GFXDECODE(ncb3) @@ -6265,7 +6266,6 @@ static MACHINE_CONFIG_START( wcat3, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(goldstar) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6300,6 +6300,7 @@ static MACHINE_CONFIG_START( amcoe1, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(cm) MCFG_PALETTE_LENGTH(256) @@ -6307,7 +6308,6 @@ static MACHINE_CONFIG_START( amcoe1, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(cherrym) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6340,6 +6340,7 @@ static MACHINE_CONFIG_START( amcoe1a, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(amcoe1a) MCFG_GFXDECODE(cm) MCFG_PALETTE_LENGTH(256) @@ -6347,7 +6348,6 @@ static MACHINE_CONFIG_START( amcoe1a, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(cherrym) - MCFG_VIDEO_UPDATE(amcoe1a) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6380,6 +6380,7 @@ static MACHINE_CONFIG_START( amcoe2, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(cm) MCFG_PALETTE_LENGTH(256) @@ -6387,7 +6388,6 @@ static MACHINE_CONFIG_START( amcoe2, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(cherrym) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6415,6 +6415,7 @@ static MACHINE_CONFIG_START( nfm, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(nfm) MCFG_PALETTE_LENGTH(256) @@ -6422,7 +6423,6 @@ static MACHINE_CONFIG_START( nfm, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(cherrym) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6447,6 +6447,7 @@ static MACHINE_CONFIG_START( unkch, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(unkch) MCFG_GFXDECODE(unkch) MCFG_PALETTE_LENGTH(512) @@ -6454,7 +6455,6 @@ static MACHINE_CONFIG_START( unkch, goldstar_state ) //MCFG_NVRAM_HANDLER(goldstar) MCFG_VIDEO_START(unkch) - MCFG_VIDEO_UPDATE(unkch) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -6489,6 +6489,7 @@ static MACHINE_CONFIG_START( pkrmast, goldstar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(goldstar) MCFG_GFXDECODE(pkrmast) MCFG_PALETTE_LENGTH(256) @@ -6496,7 +6497,6 @@ static MACHINE_CONFIG_START( pkrmast, goldstar_state ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START(cherrym) - MCFG_VIDEO_UPDATE(goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c index a2bf8e11f2d..a6d517f4ced 100644 --- a/src/mame/drivers/gomoku.c +++ b/src/mame/drivers/gomoku.c @@ -130,13 +130,13 @@ static MACHINE_CONFIG_START( gomoku, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(gomoku) MCFG_GFXDECODE(gomoku) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(gomoku) MCFG_VIDEO_START(gomoku) - MCFG_VIDEO_UPDATE(gomoku) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index 670baa34c3d..1ac39b2bcfc 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -92,7 +92,7 @@ static VIDEO_START( good ) tilemap_set_transparent_pen(state->fg_tilemap, 0xf); } -static VIDEO_UPDATE( good ) +static SCREEN_UPDATE( good ) { good_state *state = screen->machine->driver_data<good_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -286,11 +286,11 @@ static MACHINE_CONFIG_START( good, good_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(1*16, 23*16-1, 0*16, 14*16-1) + MCFG_SCREEN_UPDATE(good) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(good) - MCFG_VIDEO_UPDATE(good) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c index 158bb2c4af6..40d73042de6 100644 --- a/src/mame/drivers/goodejan.c +++ b/src/mame/drivers/goodejan.c @@ -341,12 +341,12 @@ static MACHINE_CONFIG_START( goodejan, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) //TODO: dynamic resolution + MCFG_SCREEN_UPDATE(seibu_crtc) MCFG_GFXDECODE(goodejan) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(seibu_crtc) - MCFG_VIDEO_UPDATE(seibu_crtc) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(GOODEJAN_MHZ1/2,GOODEJAN_MHZ2/16) diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index 2ae68eee405..c6be2a08535 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -294,12 +294,12 @@ static MACHINE_CONFIG_START( gotcha, gotcha_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(gotcha) MCFG_GFXDECODE(gotcha) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(gotcha) - MCFG_VIDEO_UPDATE(gotcha) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c index 08bfda5813f..dab88a39489 100644 --- a/src/mame/drivers/gottlieb.c +++ b/src/mame/drivers/gottlieb.c @@ -1917,12 +1917,12 @@ static MACHINE_CONFIG_START( gottlieb_core, gottlieb_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(SYSTEM_CLOCK/4, GOTTLIEB_VIDEO_HCOUNT, 0, GOTTLIEB_VIDEO_HBLANK, GOTTLIEB_VIDEO_VCOUNT, 0, GOTTLIEB_VIDEO_VBLANK) + MCFG_SCREEN_UPDATE(gottlieb) MCFG_GFXDECODE(gfxdecode) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(gottlieb) - MCFG_VIDEO_UPDATE(gottlieb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c index 48dd1d360a1..9d7be34fefa 100644 --- a/src/mame/drivers/gotya.c +++ b/src/mame/drivers/gotya.c @@ -209,13 +209,13 @@ static MACHINE_CONFIG_START( gotya, gotya_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 36*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gotya) MCFG_GFXDECODE(gotya) MCFG_PALETTE_LENGTH(16*4) MCFG_PALETTE_INIT(gotya) MCFG_VIDEO_START(gotya) - MCFG_VIDEO_UPDATE(gotya) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index b0031029358..bff9150933c 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -216,7 +216,7 @@ static void gpworld_draw_sprites(running_machine *machine, bitmap_t *bitmap, con } -static VIDEO_UPDATE( gpworld ) +static SCREEN_UPDATE( gpworld ) { bitmap_fill(bitmap, cliprect, 0); diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index adb0ec1db14..5ca24a1cf52 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -356,11 +356,11 @@ static MACHINE_CONFIG_START( gradius3, gradius3_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(gradius3) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(gradius3) - MCFG_VIDEO_UPDATE(gradius3) MCFG_K052109_ADD("k052109", gradius3_k052109_intf) MCFG_K051960_ADD("k051960", gradius3_k051960_intf) diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index 81e1f000cb7..47758cb1f17 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -702,10 +702,10 @@ static MACHINE_CONFIG_START( grchamp, grchamp_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(grchamp) MCFG_PALETTE_INIT(grchamp) MCFG_VIDEO_START(grchamp) - MCFG_VIDEO_UPDATE(grchamp) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c index 464e0473c16..ce4dcd7c357 100644 --- a/src/mame/drivers/gridlee.c +++ b/src/mame/drivers/gridlee.c @@ -440,12 +440,12 @@ static MACHINE_CONFIG_START( gridlee, gridlee_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(BALSENTE_PIXEL_CLOCK, BALSENTE_HTOTAL, BALSENTE_HBEND, BALSENTE_HBSTART, BALSENTE_VTOTAL, BALSENTE_VBEND, BALSENTE_VBSTART) + MCFG_SCREEN_UPDATE(gridlee) MCFG_PALETTE_LENGTH(2048) MCFG_PALETTE_INIT(gridlee) MCFG_VIDEO_START(gridlee) - MCFG_VIDEO_UPDATE(gridlee) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index 1ac0a65f582..6df5b61e95e 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -382,12 +382,12 @@ static MACHINE_CONFIG_START( groundfx, groundfx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*8, 32*8-1) + MCFG_SCREEN_UPDATE(groundfx) MCFG_GFXDECODE(groundfx) MCFG_PALETTE_LENGTH(16384) MCFG_VIDEO_START(groundfx) - MCFG_VIDEO_UPDATE(groundfx) MCFG_TC0100SCN_ADD("tc0100scn", groundfx_tc0100scn_intf) MCFG_TC0480SCP_ADD("tc0480scp", groundfx_tc0480scp_intf) diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 46e8dec4110..ba18129267a 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -466,7 +466,7 @@ static VIDEO_START(gstream) tilemap_set_transparent_pen(state->tilemap2, 0); } -static VIDEO_UPDATE(gstream) +static SCREEN_UPDATE(gstream) { /* The tilemaps and sprite are interleaved together. Even Words are tilemap tiles @@ -567,12 +567,12 @@ static MACHINE_CONFIG_START( gstream, gstream_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(gstream) MCFG_PALETTE_LENGTH(0x1000 + 0x400 + 0x400 + 0x400) // sprites + 3 bg layers MCFG_GFXDECODE(gstream) MCFG_VIDEO_START(gstream) - MCFG_VIDEO_UPDATE(gstream) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index 17790830a40..5b13c67039d 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -563,12 +563,12 @@ static MACHINE_CONFIG_START( gstriker, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(gstriker) MCFG_GFXDECODE(gstriker) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(gstriker) - MCFG_VIDEO_UPDATE(gstriker) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -602,12 +602,12 @@ static MACHINE_CONFIG_START( vgoal, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(gstriker) MCFG_GFXDECODE(gstriker) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(vgoalsoc) - MCFG_VIDEO_UPDATE(gstriker) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index 459027ccf24..a2c683566cf 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -709,13 +709,13 @@ static MACHINE_CONFIG_START( gsword, gsword_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gsword) MCFG_GFXDECODE(gsword) MCFG_PALETTE_LENGTH(64*4+64*4) MCFG_PALETTE_INIT(gsword) MCFG_VIDEO_START(gsword) - MCFG_VIDEO_UPDATE(gsword) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -755,13 +755,13 @@ static MACHINE_CONFIG_START( josvolly, gsword_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gsword) MCFG_GFXDECODE(gsword) MCFG_PALETTE_LENGTH(64*4+64*4) MCFG_PALETTE_INIT(josvolly) MCFG_VIDEO_START(gsword) - MCFG_VIDEO_UPDATE(gsword) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index eccad474d9a..ebbe3a707ab 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -807,11 +807,11 @@ static MACHINE_CONFIG_START( gticlub, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(gticlub) MCFG_PALETTE_LENGTH(65536) MCFG_VIDEO_START(gticlub) - MCFG_VIDEO_UPDATE(gticlub) MCFG_K001604_ADD("k001604_1", gticlub_k001604_intf) @@ -909,14 +909,14 @@ static MACHINE_CONFIG_START( hangplt, driver_device ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(hangplt) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) - - MCFG_VIDEO_UPDATE(hangplt) + MCFG_SCREEN_UPDATE(hangplt) MCFG_K001604_ADD("k001604_1", hangplt_k001604_intf_l) MCFG_K001604_ADD("k001604_2", hangplt_k001604_intf_r) diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index 999091f64c0..c52e6e37778 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -243,7 +243,7 @@ static VIDEO_START( guab ) } -static VIDEO_UPDATE( guab ) +static SCREEN_UPDATE( guab ) { int x, y; struct tms34061_display state; @@ -800,11 +800,11 @@ static MACHINE_CONFIG_START( guab, guab_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(guab) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(guab) - MCFG_VIDEO_UPDATE(guab) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c index 8ad13095ca4..8372349b98b 100644 --- a/src/mame/drivers/gumbo.c +++ b/src/mame/drivers/gumbo.c @@ -241,11 +241,11 @@ static MACHINE_CONFIG_START( gumbo, gumbo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gumbo) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(gumbo) - MCFG_VIDEO_UPDATE(gumbo) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index 1da4716681f..197a91eb81a 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -357,12 +357,12 @@ static MACHINE_CONFIG_START( gunbustr, gunbustr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(gunbustr) MCFG_GFXDECODE(gunbustr) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(gunbustr) - MCFG_VIDEO_UPDATE(gunbustr) MCFG_TC0480SCP_ADD("tc0480scp", gunbustr_tc0480scp_intf) diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index cab94779c7d..4b01316b0e7 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -484,12 +484,12 @@ static MACHINE_CONFIG_START( gundealr, gundealr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gundealr) MCFG_GFXDECODE(gundealr) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(gundealr) - MCFG_VIDEO_UPDATE(gundealr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c index 396cedf0016..53945bbbb39 100644 --- a/src/mame/drivers/gunpey.c +++ b/src/mame/drivers/gunpey.c @@ -57,7 +57,7 @@ static VIDEO_START( gunpey ) blit_buffer = auto_alloc_array(machine, UINT16, 512*512); } -static VIDEO_UPDATE( gunpey ) +static SCREEN_UPDATE( gunpey ) { int x,y; int count; @@ -328,12 +328,12 @@ static MACHINE_CONFIG_START( gunpey, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1) + MCFG_SCREEN_UPDATE(gunpey) MCFG_PALETTE_LENGTH(0x800) MCFG_PALETTE_INIT(gunpey) MCFG_VIDEO_START(gunpey) - MCFG_VIDEO_UPDATE(gunpey) MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index f23535af901..1b8af537348 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -322,7 +322,7 @@ static MACHINE_CONFIG_START( gunsmoke, gunsmoke_state ) MCFG_PALETTE_INIT(gunsmoke) MCFG_VIDEO_START(gunsmoke) - MCFG_VIDEO_UPDATE(gunsmoke) + MCFG_SCREEN_UPDATE(gunsmoke) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index 2e3291e883c..d6caddbd189 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -535,13 +535,13 @@ static MACHINE_CONFIG_START( gyruss, gyruss_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gyruss) MCFG_GFXDECODE(gyruss) MCFG_PALETTE_LENGTH(16*4+16*16) MCFG_PALETTE_INIT(gyruss) MCFG_VIDEO_START(gyruss) - MCFG_VIDEO_UPDATE(gyruss) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 6f168f82223..a4ace64a4ec 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1428,7 +1428,7 @@ static void filter_bitmap(bitmap_t *bitmap, int mask) } -static VIDEO_UPDATE( halleys ) +static SCREEN_UPDATE( halleys ) { int i, j; @@ -1456,7 +1456,7 @@ static VIDEO_UPDATE( halleys ) } -static VIDEO_UPDATE( benberob ) +static SCREEN_UPDATE( benberob ) { if (io_ram[0xa0] & 0x80) copy_scroll_op(bitmap, render_layer[2], *scrollx1, *scrolly1); @@ -1952,12 +1952,12 @@ static MACHINE_CONFIG_START( halleys, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(SCREEN_WIDTH, SCREEN_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(VIS_MINX, VIS_MAXX, VIS_MINY, VIS_MAXY) + MCFG_SCREEN_UPDATE(halleys) MCFG_PALETTE_LENGTH(PALETTE_SIZE) MCFG_PALETTE_INIT(halleys) MCFG_VIDEO_START(halleys) - MCFG_VIDEO_UPDATE(halleys) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1981,7 +1981,9 @@ static MACHINE_CONFIG_DERIVED( benberob, halleys ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_19_968MHz/12) /* not verified but pcb identical to halley's comet */ MCFG_CPU_VBLANK_INT_HACK(benberob_interrupt, 4) - MCFG_VIDEO_UPDATE(benberob) + + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(benberob) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c index ce1db76a238..6ccf8f23c0f 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -216,13 +216,13 @@ static MACHINE_CONFIG_START( hanaawas, hanaawas_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(hanaawas) MCFG_GFXDECODE(hanaawas) MCFG_PALETTE_LENGTH(32*8) MCFG_PALETTE_INIT(hanaawas) MCFG_VIDEO_START(hanaawas) - MCFG_VIDEO_UPDATE(hanaawas) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index f46d406f2d2..6af01fb91b3 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -1138,9 +1138,9 @@ static MACHINE_CONFIG_START( driver_nomsp, harddriv_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(4000000*4, 160*4, 0, 127*4, 417, 0, 384) + MCFG_SCREEN_UPDATE(tms340x0) MCFG_VIDEO_START(harddriv) - MCFG_VIDEO_UPDATE(tms340x0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index ac9d6a4ac19..d74a762807a 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -227,13 +227,13 @@ static MACHINE_CONFIG_START( hcastle, hcastle_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(hcastle) MCFG_GFXDECODE(hcastle) MCFG_PALETTE_LENGTH(2*8*16*16) MCFG_PALETTE_INIT(hcastle) MCFG_VIDEO_START(hcastle) - MCFG_VIDEO_UPDATE(hcastle) MCFG_K007121_ADD("k007121_1") MCFG_K007121_ADD("k007121_2") diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c index 8a15cf5ff78..87d34efa04c 100644 --- a/src/mame/drivers/hexion.c +++ b/src/mame/drivers/hexion.c @@ -232,13 +232,13 @@ static MACHINE_CONFIG_START( hexion, hexion_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(hexion) MCFG_GFXDECODE(hexion) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(hexion) - MCFG_VIDEO_UPDATE(hexion) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c index 284c451485c..a9339bdf599 100644 --- a/src/mame/drivers/higemaru.c +++ b/src/mame/drivers/higemaru.c @@ -169,13 +169,13 @@ static MACHINE_CONFIG_START( higemaru, higemaru_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(higemaru) MCFG_GFXDECODE(higemaru) MCFG_PALETTE_LENGTH(32*4+16*16) MCFG_PALETTE_INIT(higemaru) MCFG_VIDEO_START(higemaru) - MCFG_VIDEO_UPDATE(higemaru) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index e07ea911bdc..2fe62f9e449 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -110,7 +110,7 @@ static VIDEO_START(tourvisn) } -static VIDEO_UPDATE(tourvisn) +static SCREEN_UPDATE(tourvisn) { highvdeo_state *state = screen->machine->driver_data<highvdeo_state>(); int x,y,count; @@ -141,7 +141,7 @@ static VIDEO_UPDATE(tourvisn) } /*Later HW, RGB565 instead of RAM-based pens (+ ramdac).*/ -static VIDEO_UPDATE(brasil) +static SCREEN_UPDATE(brasil) { highvdeo_state *state = screen->machine->driver_data<highvdeo_state>(); int x,y,count; @@ -896,11 +896,11 @@ static MACHINE_CONFIG_START( tv_vcf, highvdeo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) + MCFG_SCREEN_UPDATE(tourvisn) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(tourvisn) - MCFG_VIDEO_UPDATE(tourvisn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -963,11 +963,11 @@ static MACHINE_CONFIG_START( brasil, highvdeo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1) + MCFG_SCREEN_UPDATE(brasil) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(tourvisn) - MCFG_VIDEO_UPDATE(brasil) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c index aeeb866caaf..287d84c044d 100644 --- a/src/mame/drivers/hikaru.c +++ b/src/mame/drivers/hikaru.c @@ -332,7 +332,7 @@ static VIDEO_START(hikaru) } -static VIDEO_UPDATE(hikaru) +static SCREEN_UPDATE(hikaru) { return 0; } @@ -394,11 +394,11 @@ static MACHINE_CONFIG_START( hikaru, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) + MCFG_SCREEN_UPDATE(hikaru) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(hikaru) - MCFG_VIDEO_UPDATE(hikaru) // MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") // MCFG_SOUND_ADD("aica", AICA, 0) diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c index cda97e19bed..ec6f9991073 100644 --- a/src/mame/drivers/himesiki.c +++ b/src/mame/drivers/himesiki.c @@ -311,11 +311,12 @@ static MACHINE_CONFIG_START( himesiki, himesiki_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1) + MCFG_SCREEN_UPDATE(himesiki) + MCFG_GFXDECODE(himesiki) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(himesiki) - MCFG_VIDEO_UPDATE(himesiki) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index 3b6cbe734b0..5ac781542f2 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -69,7 +69,7 @@ static VIDEO_START( barricad ) } -static VIDEO_UPDATE( hitme ) +static SCREEN_UPDATE( hitme ) { hitme_state *state = screen->machine->driver_data<hitme_state>(); /* the card width resistor comes from an input port, scaled to the range 0-25 kOhms */ @@ -117,7 +117,7 @@ static VIDEO_UPDATE( hitme ) } -static VIDEO_UPDATE( barricad ) +static SCREEN_UPDATE( barricad ) { hitme_state *state = screen->machine->driver_data<hitme_state>(); tilemap_draw(bitmap, cliprect, state->tilemap, 0, 0); @@ -333,13 +333,13 @@ static MACHINE_CONFIG_START( hitme, hitme_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 19*10) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 19*10-1) + MCFG_SCREEN_UPDATE(hitme) MCFG_GFXDECODE(hitme) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(hitme) - MCFG_VIDEO_UPDATE(hitme) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -363,11 +363,11 @@ static MACHINE_CONFIG_DERIVED( barricad, hitme ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(32*8, 24*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1) + MCFG_SCREEN_UPDATE(barricad) MCFG_GFXDECODE(barricad) MCFG_VIDEO_START(barricad) - MCFG_VIDEO_UPDATE(barricad) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c index 07e94696ce3..b639a95f7dc 100644 --- a/src/mame/drivers/hitpoker.c +++ b/src/mame/drivers/hitpoker.c @@ -62,7 +62,7 @@ static VIDEO_START(hitpoker) colorram = auto_alloc_array(machine, UINT8, 0x2000); } -static VIDEO_UPDATE(hitpoker) +static SCREEN_UPDATE(hitpoker) { int count = 0; int y,x; @@ -475,6 +475,7 @@ static MACHINE_CONFIG_START( hitpoker, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(648, 480) //setted by the CRTC MCFG_SCREEN_VISIBLE_AREA(0, 648-1, 0, 240-1) + MCFG_SCREEN_UPDATE(hitpoker) MCFG_MC6845_ADD("crtc", H46505, CRTC_CLOCK/2, mc6845_intf) /* hand tuned to get ~60 fps */ @@ -482,7 +483,6 @@ static MACHINE_CONFIG_START( hitpoker, driver_device ) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(hitpoker) - MCFG_VIDEO_UPDATE(hitpoker) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index 1cd6704e827..cfb2da855fe 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -575,12 +575,12 @@ static MACHINE_CONFIG_START( hnayayoi, hnayayoi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(hnayayoi) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(hnayayoi) - MCFG_VIDEO_UPDATE(hnayayoi) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index ba321915950..c266bee235f 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -1742,11 +1742,11 @@ static MACHINE_CONFIG_START( hng64, hng64_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(1024, 1024) MCFG_SCREEN_VISIBLE_AREA(0, 0x200-1, 0, 0x1c0-1) + MCFG_SCREEN_UPDATE(hng64) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(hng64) - MCFG_VIDEO_UPDATE(hng64) MACHINE_CONFIG_END diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c index 40fe133203f..3f9d317fed6 100644 --- a/src/mame/drivers/holeland.c +++ b/src/mame/drivers/holeland.c @@ -289,13 +289,13 @@ static MACHINE_CONFIG_START( holeland, holeland_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 2*16, 30*16-1) + MCFG_SCREEN_UPDATE(holeland) MCFG_GFXDECODE(holeland) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(holeland) - MCFG_VIDEO_UPDATE(holeland) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -360,13 +360,13 @@ static MACHINE_CONFIG_START( crzrally, holeland_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(crzrally) MCFG_GFXDECODE(crzrally) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(crzrally) - MCFG_VIDEO_UPDATE(crzrally) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index d8aed4a13be..e4addba4d8c 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -1274,14 +1274,14 @@ static MACHINE_CONFIG_START( mrokumei, homedata_state ) MCFG_SCREEN_SIZE(64*8, 32*8) // visible area can be changed at runtime MCFG_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mrokumei) + MCFG_SCREEN_EOF(homedata) MCFG_GFXDECODE(mrokumei) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(mrokumei) MCFG_VIDEO_START(mrokumei) - MCFG_VIDEO_UPDATE(mrokumei) - MCFG_VIDEO_EOF(homedata) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1343,14 +1343,14 @@ static MACHINE_CONFIG_START( reikaids, homedata_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 256-1-16) + MCFG_SCREEN_UPDATE(reikaids) + MCFG_SCREEN_EOF(homedata) MCFG_GFXDECODE(reikaids) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(reikaids) MCFG_VIDEO_START(reikaids) - MCFG_VIDEO_UPDATE(reikaids) - MCFG_VIDEO_EOF(homedata) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1395,14 +1395,14 @@ static MACHINE_CONFIG_START( pteacher, homedata_state ) MCFG_SCREEN_SIZE(64*8, 32*8) // visible area can be changed at runtime MCFG_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pteacher) + MCFG_SCREEN_EOF(homedata) MCFG_GFXDECODE(pteacher) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(pteacher) MCFG_VIDEO_START(pteacher) - MCFG_VIDEO_UPDATE(pteacher) - MCFG_VIDEO_EOF(homedata) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1560,13 +1560,13 @@ static MACHINE_CONFIG_START( mirderby, homedata_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mirderby) MCFG_GFXDECODE(mirderby) MCFG_PALETTE_LENGTH(0x8000) MCFG_PALETTE_INIT(mirderby) MCFG_VIDEO_START(mirderby) - MCFG_VIDEO_UPDATE(mirderby) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index 8a23969ecd6..f33f9fde69c 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -237,12 +237,12 @@ static MACHINE_CONFIG_START( homerun, homerun_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-25) + MCFG_SCREEN_UPDATE(homerun) MCFG_GFXDECODE(homerun) MCFG_PALETTE_LENGTH(16*4) MCFG_VIDEO_START(homerun) - MCFG_VIDEO_UPDATE(homerun) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 95c8068f185..b06c47231b3 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -391,7 +391,7 @@ static void voodoo_vblank_1(device_t *device, int param) cputag_set_input_line(device->machine, "maincpu", INPUT_LINE_IRQ1, ASSERT_LINE); } -static VIDEO_UPDATE( hornet ) +static SCREEN_UPDATE( hornet ) { hornet_state *state = screen->machine->driver_data<hornet_state>(); device_t *voodoo = screen->machine->device("voodoo0"); @@ -406,7 +406,7 @@ static VIDEO_UPDATE( hornet ) return 0; } -static VIDEO_UPDATE( hornet_2board ) +static SCREEN_UPDATE( hornet_2board ) { hornet_state *state = screen->machine->driver_data<hornet_state>(); if (strcmp(screen->tag(), "lscreen") == 0) @@ -978,11 +978,10 @@ static MACHINE_CONFIG_START( hornet, hornet_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 48*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1) + MCFG_SCREEN_UPDATE(hornet) MCFG_PALETTE_LENGTH(65536) - MCFG_VIDEO_UPDATE(hornet) - MCFG_K037122_ADD("k037122_1", hornet_k037122_intf) MCFG_K056800_ADD("k056800", hornet_k056800_interface) @@ -1024,7 +1023,6 @@ static MACHINE_CONFIG_DERIVED( hornet_2board, hornet ) MCFG_MACHINE_RESET(hornet_2board) - MCFG_VIDEO_UPDATE(hornet_2board) MCFG_DEVICE_REMOVE("k037122_1") MCFG_K037122_ADD("k037122_1", hornet_k037122_intf_l) @@ -1053,12 +1051,14 @@ static MACHINE_CONFIG_DERIVED( hornet_2board, hornet ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(hornet_2board) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(hornet_2board) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( terabrst, hornet_2board ) diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index c4eb3842cf7..dcb37036bb1 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -138,7 +138,7 @@ static VIDEO_START(hotblock) state->save_item(NAME(state->pal)); } -static VIDEO_UPDATE(hotblock) +static SCREEN_UPDATE(hotblock) { hotblock_state *state = screen->machine->driver_data<hotblock_state>(); int y, x, count; @@ -222,11 +222,11 @@ static MACHINE_CONFIG_START( hotblock, hotblock_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(1024,1024) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) + MCFG_SCREEN_UPDATE(hotblock) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(hotblock) - MCFG_VIDEO_UPDATE(hotblock) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hotstuff.c b/src/mame/drivers/hotstuff.c index db75036abce..3ee76f649d0 100644 --- a/src/mame/drivers/hotstuff.c +++ b/src/mame/drivers/hotstuff.c @@ -12,7 +12,7 @@ VIDEO_START( hotstuff ) /* the first 0x20 bytes in every 0x200 (each line) of video ram are the colour data, providing a palette of 16 RGB444 colours for that line */ -VIDEO_UPDATE( hotstuff ) +SCREEN_UPDATE( hotstuff ) { int count, y,yyy,x,xxx; UINT16 row_palette_data[0x10]; @@ -76,11 +76,11 @@ static MACHINE_CONFIG_START( hotstuff, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(128*8, 64*8) MCFG_SCREEN_VISIBLE_AREA((0x10*4)+8, 101*8-1, 0*8, 33*8-1) + MCFG_SCREEN_UPDATE(hotstuff) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(hotstuff) - MCFG_VIDEO_UPDATE(hotstuff) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index a17993b4e05..63c7f78b424 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -159,7 +159,7 @@ static VIDEO_START( hvyunit ) state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); } -static VIDEO_UPDATE( hvyunit ) +static SCREEN_UPDATE( hvyunit ) { #define SX_POS 96 #define SY_POS 0 @@ -174,7 +174,7 @@ static VIDEO_UPDATE( hvyunit ) return 0; } -static VIDEO_EOF( hvyunit ) +static SCREEN_EOF( hvyunit ) { hvyunit_state *state = machine->driver_data<hvyunit_state>(); pandora_eof(state->pandora); @@ -671,6 +671,8 @@ static MACHINE_CONFIG_START( hvyunit, hvyunit_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) + MCFG_SCREEN_UPDATE(hvyunit) + MCFG_SCREEN_EOF(hvyunit) MCFG_GFXDECODE(hvyunit) MCFG_PALETTE_LENGTH(0x800) @@ -678,8 +680,6 @@ static MACHINE_CONFIG_START( hvyunit, hvyunit_state ) MCFG_KANEKO_PANDORA_ADD("pandora", hvyunit_pandora_config) MCFG_VIDEO_START(hvyunit) - MCFG_VIDEO_UPDATE(hvyunit) - MCFG_VIDEO_EOF(hvyunit) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c index d7949f75baa..5a484fdc148 100644 --- a/src/mame/drivers/hyhoo.c +++ b/src/mame/drivers/hyhoo.c @@ -263,9 +263,9 @@ static MACHINE_CONFIG_START( hyhoo, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) + MCFG_SCREEN_UPDATE(hyhoo) MCFG_VIDEO_START(hyhoo) - MCFG_VIDEO_UPDATE(hyhoo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index e357a04d5cb..d1f209d4d0b 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -288,13 +288,13 @@ static MACHINE_CONFIG_START( hyperspt, hyperspt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(hyperspt) MCFG_GFXDECODE(hyperspt) MCFG_PALETTE_LENGTH(16*16+16*16) MCFG_PALETTE_INIT(hyperspt) MCFG_VIDEO_START(hyperspt) - MCFG_VIDEO_UPDATE(hyperspt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index a4cbf2a3902..f46faca0988 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -693,12 +693,12 @@ static MACHINE_CONFIG_START( hyprduel, hyprduel_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, FIRST_VISIBLE_LINE, LAST_VISIBLE_LINE) + MCFG_SCREEN_UPDATE(hyprduel) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(hyprduel_14220) - MCFG_VIDEO_UPDATE(hyprduel) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -736,12 +736,12 @@ static MACHINE_CONFIG_START( magerror, hyprduel_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, FIRST_VISIBLE_LINE, LAST_VISIBLE_LINE) + MCFG_SCREEN_UPDATE(hyprduel) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(magerror_14220) - MCFG_VIDEO_UPDATE(hyprduel) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 66f28d9cec9..09401704e9b 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -258,7 +258,7 @@ static VIDEO_START(gp98) } -static VIDEO_UPDATE(jingbell) +static SCREEN_UPDATE(jingbell) { igs009_state *state = screen->machine->driver_data<igs009_state>(); int layers_ctrl = state->video_enable ? -1 : 0; @@ -689,12 +689,12 @@ static MACHINE_CONFIG_START( jingbell, igs009_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1) + MCFG_SCREEN_UPDATE(jingbell) MCFG_GFXDECODE(jingbell) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(jingbell) - MCFG_VIDEO_UPDATE(jingbell) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c index c3b44624ac8..22e18391cbf 100644 --- a/src/mame/drivers/igs011.c +++ b/src/mame/drivers/igs011.c @@ -142,7 +142,7 @@ static VIDEO_START( igs011 ) state->lhb2_pen_hi = 0; } -static VIDEO_UPDATE( igs011 ) +static SCREEN_UPDATE( igs011 ) { igs011_state *state = screen->machine->driver_data<igs011_state>(); #ifdef MAME_DEBUG @@ -2338,7 +2338,7 @@ static READ16_HANDLER( vbowl_unk_r ) return 0xffff; } -static VIDEO_EOF( vbowl ) +static SCREEN_EOF( vbowl ) { igs011_state *state = machine->driver_data<igs011_state>(); state->vbowl_trackball[0] = state->vbowl_trackball[1]; @@ -3527,12 +3527,12 @@ static MACHINE_CONFIG_START( igs011_base, igs011_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE( igs011 ) MCFG_PALETTE_LENGTH(0x800) // MCFG_GFXDECODE(igs011) MCFG_VIDEO_START( igs011 ) - MCFG_VIDEO_UPDATE( igs011 ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3650,7 +3650,8 @@ static MACHINE_CONFIG_DERIVED( vbowl, igs011_base ) MCFG_CPU_PROGRAM_MAP(vbowl) MCFG_CPU_VBLANK_INT_HACK(vbowl_interrupt,3+4) - MCFG_VIDEO_EOF(vbowl) // trackball + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_EOF(vbowl) // trackball // MCFG_GFXDECODE(igs011_hi) MCFG_DEVICE_REMOVE("oki") diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 49e8f6ec217..d2de293848e 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -338,7 +338,7 @@ static int debug_viewer(running_machine *machine, bitmap_t *bitmap,const rectang return 0; } -static VIDEO_UPDATE( igs017 ) +static SCREEN_UPDATE( igs017 ) { igs017_state *state = screen->machine->driver_data<igs017_state>(); int layers_ctrl = -1; @@ -2112,12 +2112,12 @@ static MACHINE_CONFIG_START( iqblocka, igs017_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE(igs017) MCFG_GFXDECODE(igs017) MCFG_PALETTE_LENGTH(0x100*2) MCFG_VIDEO_START(igs017) - MCFG_VIDEO_UPDATE(igs017) MCFG_VIDEO_RESET(igs017) /* sound hardware */ @@ -2185,12 +2185,12 @@ static MACHINE_CONFIG_START( mgcs, igs017_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE(igs017) MCFG_GFXDECODE(igs017_flipped) MCFG_PALETTE_LENGTH(0x100*2) MCFG_VIDEO_START(igs017) - MCFG_VIDEO_UPDATE(igs017) MCFG_VIDEO_RESET(igs017) /* sound hardware */ @@ -2230,12 +2230,12 @@ static MACHINE_CONFIG_START( sdmg2, igs017_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1) + MCFG_SCREEN_UPDATE(igs017) MCFG_GFXDECODE(igs017) MCFG_PALETTE_LENGTH(0x100*2) MCFG_VIDEO_START(igs017) - MCFG_VIDEO_UPDATE(igs017) MCFG_VIDEO_RESET(igs017) /* sound hardware */ @@ -2289,12 +2289,12 @@ static MACHINE_CONFIG_START( mgdha, igs017_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1) + MCFG_SCREEN_UPDATE(igs017) MCFG_GFXDECODE(igs017_swapped) MCFG_PALETTE_LENGTH(0x100*2) MCFG_VIDEO_START(igs017) - MCFG_VIDEO_UPDATE(igs017) MCFG_VIDEO_RESET(igs017) /* sound hardware */ diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index a59fb88566d..83ff4db38d4 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -163,7 +163,7 @@ static VIDEO_START(igs_majhong) logerror("Video START OK!\n"); } -static VIDEO_UPDATE(igs_majhong) +static SCREEN_UPDATE(igs_majhong) { igs_m027_state *state = screen->machine->driver_data<igs_m027_state>(); //?????????? @@ -404,11 +404,11 @@ static MACHINE_CONFIG_START( igs_majhong, igs_m027_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE( igs_majhong ) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START( igs_majhong ) - MCFG_VIDEO_UPDATE( igs_majhong ) /* sound hardware */ diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index 3532197b581..53ef15ced9b 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -173,7 +173,7 @@ static VIDEO_START(igs_video) tilemap_set_transparent_pen(state->fg_tilemap, 0); } -static VIDEO_UPDATE(igs_video) +static SCREEN_UPDATE(igs_video) { igspoker_state *state = screen->machine->driver_data<igspoker_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -192,7 +192,7 @@ static VIDEO_START(cpokerpk) state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } -static VIDEO_UPDATE(cpokerpk) +static SCREEN_UPDATE(cpokerpk) { igspoker_state *state = screen->machine->driver_data<igspoker_state>(); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); @@ -1604,12 +1604,12 @@ static MACHINE_CONFIG_START( igspoker, igspoker_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(igs_video) MCFG_GFXDECODE(igspoker) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(igs_video) - MCFG_VIDEO_UPDATE(igs_video) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1635,8 +1635,8 @@ static MACHINE_CONFIG_DERIVED( number10, igspoker ) MCFG_CPU_IO_MAP(number10_io_map) MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(cpokerpk) MCFG_VIDEO_START(cpokerpk) - MCFG_VIDEO_UPDATE(cpokerpk) MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index 93538cc6707..b0c2763cbc2 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -244,13 +244,13 @@ static MACHINE_CONFIG_START( ikki, ikki_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(ikki) MCFG_GFXDECODE(ikki) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(ikki) MCFG_VIDEO_START(ikki) - MCFG_VIDEO_UPDATE(ikki) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index f948502e863..0376acb38b6 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -195,7 +195,7 @@ static VIDEO_START( imolagp ) } -static VIDEO_UPDATE( imolagp ) +static SCREEN_UPDATE( imolagp ) { imolagp_state *state = screen->machine->driver_data<imolagp_state>(); int scroll2 = state->scroll ^ 0x03; @@ -570,10 +570,10 @@ static MACHINE_CONFIG_START( imolagp, imolagp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256,256) MCFG_SCREEN_VISIBLE_AREA(0+64-16,255,0+16,255) + MCFG_SCREEN_UPDATE(imolagp) MCFG_PALETTE_LENGTH(0x20) MCFG_VIDEO_START(imolagp) - MCFG_VIDEO_UPDATE(imolagp) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("aysnd", AY8910, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index 6725983baf6..0a31cee0984 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -57,7 +57,7 @@ static VIDEO_START(intrscti) { } -static VIDEO_UPDATE(intrscti) +static SCREEN_UPDATE(intrscti) { int y,x; int count; @@ -94,12 +94,12 @@ static MACHINE_CONFIG_START( intrscti, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 512) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 512-1) + MCFG_SCREEN_UPDATE(intrscti) MCFG_GFXDECODE(intrscti) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(intrscti) - MCFG_VIDEO_UPDATE(intrscti) MACHINE_CONFIG_END diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 50ed84f256e..f7db37f1dce 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -372,12 +372,12 @@ static MACHINE_CONFIG_START( inufuku, inufuku_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(2048, 256) MCFG_SCREEN_VISIBLE_AREA(0, 319-1, 1, 224-1) + MCFG_SCREEN_UPDATE(inufuku) MCFG_GFXDECODE(inufuku) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(inufuku) - MCFG_VIDEO_UPDATE(inufuku) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c index 9b076fa4e3d..2aa5b64c989 100644 --- a/src/mame/drivers/iqblock.c +++ b/src/mame/drivers/iqblock.c @@ -284,12 +284,12 @@ static MACHINE_CONFIG_START( iqblock, iqblock_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(iqblock) MCFG_GFXDECODE(iqblock) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(iqblock) - MCFG_VIDEO_UPDATE(iqblock) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c index 1f4b2a9c6cb..9da6095ba49 100644 --- a/src/mame/drivers/irobot.c +++ b/src/mame/drivers/irobot.c @@ -305,13 +305,13 @@ static MACHINE_CONFIG_START( irobot, irobot_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 29*8-1) + MCFG_SCREEN_UPDATE(irobot) MCFG_GFXDECODE(irobot) MCFG_PALETTE_LENGTH(64 + 32) /* 64 for polygons, 32 for text */ MCFG_PALETTE_INIT(irobot) MCFG_VIDEO_START(irobot) - MCFG_VIDEO_UPDATE(irobot) MCFG_TIMER_ADD("irvg_timer", irobot_irvg_done_callback) MCFG_TIMER_ADD("irmb_timer", irobot_irmb_done_callback) diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index 85fc1be25f3..2780e875a45 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -397,13 +397,13 @@ static MACHINE_CONFIG_START( ironhors, ironhors_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(ironhors) MCFG_GFXDECODE(ironhors) MCFG_PALETTE_LENGTH(16*8*16+16*8*16) MCFG_PALETTE_INIT(ironhors) MCFG_VIDEO_START(ironhors) - MCFG_VIDEO_UPDATE(ironhors) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -472,7 +472,8 @@ static MACHINE_CONFIG_DERIVED( farwest, ironhors ) MCFG_GFXDECODE(farwest) MCFG_VIDEO_START(farwest) - MCFG_VIDEO_UPDATE(farwest) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(farwest) MCFG_SOUND_MODIFY("ym2203") MCFG_SOUND_CONFIG(farwest_ym2203_config) diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index c41aeac5036..a4254f797f7 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -41,7 +41,7 @@ static UINT8 ldp_latch2; static UINT8 z80_2_nmi_enable; /* VIDEO GOODS */ -static VIDEO_UPDATE( istellar ) +static SCREEN_UPDATE( istellar ) { int charx, chary; diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 4100438b527..82373ea8105 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -1715,9 +1715,9 @@ static MACHINE_CONFIG_START( timekill, itech32_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 508, 0, 384, 262, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(itech32) MCFG_VIDEO_START(itech32) - MCFG_VIDEO_UPDATE(itech32) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index 272315d03a0..28320071d6a 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -1806,7 +1806,7 @@ static MACHINE_CONFIG_DERIVED( wfortune, itech8_core_hi ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2layer) + MCFG_SCREEN_UPDATE(itech8_2layer) MACHINE_CONFIG_END @@ -1818,7 +1818,7 @@ static MACHINE_CONFIG_DERIVED( grmatch, itech8_core_hi ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 399, 0, 239) - MCFG_VIDEO_UPDATE(itech8_grmatch) + MCFG_SCREEN_UPDATE(itech8_grmatch) /* palette updater */ MCFG_TIMER_ADD_SCANLINE("palette", grmatch_palette_update, "screen", 0, 0) @@ -1833,7 +1833,7 @@ static MACHINE_CONFIG_DERIVED( stratab_hi, itech8_core_hi ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2layer) + MCFG_SCREEN_UPDATE(itech8_2layer) MACHINE_CONFIG_END @@ -1845,7 +1845,7 @@ static MACHINE_CONFIG_DERIVED( stratab_lo, itech8_core_lo ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2layer) + MCFG_SCREEN_UPDATE(itech8_2layer) MACHINE_CONFIG_END @@ -1861,8 +1861,8 @@ static MACHINE_CONFIG_DERIVED( slikshot_hi, itech8_core_hi ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE(slikshot) MCFG_VIDEO_START(slikshot) - MCFG_VIDEO_UPDATE(slikshot) MACHINE_CONFIG_END @@ -1878,8 +1878,8 @@ static MACHINE_CONFIG_DERIVED( slikshot_lo, itech8_core_lo ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE(slikshot) MCFG_VIDEO_START(slikshot) - MCFG_VIDEO_UPDATE(slikshot) MACHINE_CONFIG_END @@ -1891,7 +1891,7 @@ static MACHINE_CONFIG_DERIVED( slikshot_lo_noz80, itech8_core_lo ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2page) + MCFG_SCREEN_UPDATE(itech8_2page) MACHINE_CONFIG_END @@ -1911,7 +1911,7 @@ static MACHINE_CONFIG_DERIVED( hstennis_hi, itech8_core_hi ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 399, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2page_large) + MCFG_SCREEN_UPDATE(itech8_2page_large) MACHINE_CONFIG_END @@ -1923,7 +1923,7 @@ static MACHINE_CONFIG_DERIVED( hstennis_lo, itech8_core_lo ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 399, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2page_large) + MCFG_SCREEN_UPDATE(itech8_2page_large) MACHINE_CONFIG_END @@ -1939,7 +1939,7 @@ static MACHINE_CONFIG_DERIVED( rimrockn, itech8_core_hi ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(24, 375, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2page_large) + MCFG_SCREEN_UPDATE(itech8_2page_large) MACHINE_CONFIG_END @@ -1955,7 +1955,7 @@ static MACHINE_CONFIG_DERIVED( ninclown, itech8_core_hi ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(64, 423, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2page_large) + MCFG_SCREEN_UPDATE(itech8_2page_large) MACHINE_CONFIG_END @@ -1970,7 +1970,7 @@ static MACHINE_CONFIG_DERIVED( gtg2, itech8_core_lo ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) - MCFG_VIDEO_UPDATE(itech8_2layer) + MCFG_SCREEN_UPDATE(itech8_2layer) MACHINE_CONFIG_END diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c index 642dff0264b..2b97142d1f8 100644 --- a/src/mame/drivers/itgambl2.c +++ b/src/mame/drivers/itgambl2.c @@ -71,7 +71,7 @@ static VIDEO_START( itgambl2 ) } /* (dirty) debug code for looking 8bpps blitter-based gfxs */ -static VIDEO_UPDATE( itgambl2 ) +static SCREEN_UPDATE( itgambl2 ) { int x,y,count; const UINT8 *blit_ram = screen->machine->region("gfx1")->base(); @@ -260,13 +260,14 @@ static MACHINE_CONFIG_START( itgambl2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE( itgambl2 ) + MCFG_MACHINE_RESET( itgambl2 ) MCFG_PALETTE_INIT( itgambl2 ) MCFG_GFXDECODE(itgambl2) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START( itgambl2 ) - MCFG_VIDEO_UPDATE( itgambl2 ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c index 9b6546355cc..7ce359d90cc 100644 --- a/src/mame/drivers/itgambl3.c +++ b/src/mame/drivers/itgambl3.c @@ -59,7 +59,7 @@ static VIDEO_START( itgambl3 ) } /* (dirty) debug code for looking 8bpps blitter-based gfxs */ -static VIDEO_UPDATE( itgambl3 ) +static SCREEN_UPDATE( itgambl3 ) { int x,y,count; const UINT8 *blit_ram = screen->machine->region("gfx1")->base(); @@ -249,13 +249,14 @@ static MACHINE_CONFIG_START( itgambl3, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE( itgambl3 ) + MCFG_MACHINE_RESET( itgambl3 ) MCFG_PALETTE_INIT( itgambl3 ) MCFG_GFXDECODE(itgambl3) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START( itgambl3 ) - MCFG_VIDEO_UPDATE( itgambl3 ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c index 0a2f2b55aeb..81aa908c8f1 100644 --- a/src/mame/drivers/itgamble.c +++ b/src/mame/drivers/itgamble.c @@ -66,7 +66,7 @@ static VIDEO_START( itgamble ) { } -static VIDEO_UPDATE( itgamble ) +static SCREEN_UPDATE( itgamble ) { return 0; } @@ -192,12 +192,13 @@ static MACHINE_CONFIG_START( itgamble, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE( itgamble ) + MCFG_MACHINE_RESET( itgamble ) MCFG_GFXDECODE(itgamble) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START( itgamble ) - MCFG_VIDEO_UPDATE( itgamble ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index 79007a0083d..13c36dbf19c 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -838,12 +838,12 @@ static MACHINE_CONFIG_START( jack, jack_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(jack) MCFG_GFXDECODE(jack) MCFG_PALETTE_LENGTH(32) MCFG_VIDEO_START(jack) - MCFG_VIDEO_UPDATE(jack) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -883,10 +883,10 @@ static MACHINE_CONFIG_DERIVED( joinem, jack ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(joinem) MCFG_PALETTE_INIT(joinem) MCFG_VIDEO_START(joinem) - MCFG_VIDEO_UPDATE(joinem) MACHINE_CONFIG_END @@ -902,10 +902,10 @@ static MACHINE_CONFIG_DERIVED( loverboy, jack ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(joinem) MCFG_PALETTE_INIT(joinem) MCFG_VIDEO_START(joinem) - MCFG_VIDEO_UPDATE(joinem) MACHINE_CONFIG_END /************************************* diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index c9a7e8669c1..7b7789bf662 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -385,13 +385,13 @@ static MACHINE_CONFIG_START( jackal, jackal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(jackal) MCFG_GFXDECODE(jackal) MCFG_PALETTE_LENGTH(0x300) MCFG_PALETTE_INIT(jackal) MCFG_VIDEO_START(jackal) - MCFG_VIDEO_UPDATE(jackal) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index 06bfededf8a..18b556c2a0b 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -171,7 +171,7 @@ static VIDEO_START(jackie) } -static VIDEO_UPDATE(jackie) +static SCREEN_UPDATE(jackie) { jackie_state *state = screen->machine->driver_data<jackie_state>(); int i,j; @@ -573,12 +573,12 @@ static MACHINE_CONFIG_START( jackie, jackie_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(jackie) MCFG_GFXDECODE(jackie) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(jackie) - MCFG_VIDEO_UPDATE(jackie) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index 622135bd733..867d23eb596 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -30,7 +30,7 @@ static VIDEO_START(jackpool) { } -static VIDEO_UPDATE(jackpool) +static SCREEN_UPDATE(jackpool) { const gfx_element *gfx = screen->machine->gfx[0]; int count;// = 0x00000/2; @@ -252,13 +252,13 @@ static MACHINE_CONFIG_START( jackpool, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(jackpool) MCFG_EEPROM_93C46_ADD("eeprom") MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(jackpool) - MCFG_VIDEO_UPDATE(jackpool) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index 625d17e6389..47ce2ad2758 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -269,10 +269,10 @@ static MACHINE_CONFIG_START( jailbrek, jailbrek_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 396, 8, 248, 256, 16, 240) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(jailbrek) MCFG_PALETTE_INIT(jailbrek) MCFG_VIDEO_START(jailbrek) - MCFG_VIDEO_UPDATE(jailbrek) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index e2ed6cca5bf..c8a3635571d 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -345,7 +345,7 @@ static void draw_sc3_layer(bitmap_t *bitmap, const rectangle *cliprect) } } -static VIDEO_UPDATE( jalmah ) +static SCREEN_UPDATE( jalmah ) { static UINT8 cur_prin; jalmah_priority_system(screen->machine); @@ -404,7 +404,7 @@ static VIDEO_UPDATE( jalmah ) return 0; } -static VIDEO_UPDATE( urashima ) +static SCREEN_UPDATE( urashima ) { /*this game doesn't use the RANGE register at all.*/ tilemap_set_scrollx( sc0_tilemap_0, 0, jm_scrollram[0]); @@ -1317,12 +1317,12 @@ static MACHINE_CONFIG_START( jalmah, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(jalmah) MCFG_PALETTE_LENGTH(0x400) MCFG_MACHINE_RESET(jalmah) MCFG_VIDEO_START(jalmah) - MCFG_VIDEO_UPDATE(jalmah) MCFG_TIMER_ADD_PERIODIC("mcusim", jalmah_mcu_sim, attotime::from_hz(10000)) // not real, but for simulating the MCU @@ -1339,7 +1339,8 @@ static MACHINE_CONFIG_DERIVED( urashima, jalmah ) MCFG_GFXDECODE(urashima) MCFG_VIDEO_START(urashima) - MCFG_VIDEO_UPDATE(urashima) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(urashima) MACHINE_CONFIG_END /* diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index a85de728254..ef1f2cc763d 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -119,7 +119,7 @@ static VIDEO_START( jangou ) state->save_item(NAME(state->blit_buffer)); } -static VIDEO_UPDATE( jangou ) +static SCREEN_UPDATE( jangou ) { jangou_state *state = screen->machine->driver_data<jangou_state>(); int x, y; @@ -1001,11 +1001,11 @@ static MACHINE_CONFIG_START( jangou, jangou_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) + MCFG_SCREEN_UPDATE(jangou) MCFG_PALETTE_LENGTH(32) MCFG_VIDEO_START(jangou) - MCFG_VIDEO_UPDATE(jangou) /* sound hardware */ MCFG_SOUND_START(jangou) diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index 5e961666100..304c9fee9eb 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -132,7 +132,7 @@ static VIDEO_START(jantotsu) state->save_item(NAME(state->bitmap)); } -static VIDEO_UPDATE(jantotsu) +static SCREEN_UPDATE(jantotsu) { jantotsu_state *state = screen->machine->driver_data<jantotsu_state>(); int x, y, i; @@ -521,12 +521,12 @@ static MACHINE_CONFIG_START( jantotsu, jantotsu_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) + MCFG_SCREEN_UPDATE(jantotsu) MCFG_PALETTE_INIT(jantotsu) MCFG_PALETTE_LENGTH(0x20) MCFG_VIDEO_START(jantotsu) - MCFG_VIDEO_UPDATE(jantotsu) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index 29c7bac6957..267fb11207b 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -370,7 +370,7 @@ static VIDEO_START(jchan) -static VIDEO_UPDATE(jchan) +static SCREEN_UPDATE(jchan) { jchan_state *state = screen->machine->driver_data<jchan_state>(); int x,y; @@ -382,7 +382,7 @@ static VIDEO_UPDATE(jchan) bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); - VIDEO_UPDATE_CALL(jchan_view2); + SCREEN_UPDATE_CALL(jchan_view2); bitmap_fill(state->sprite_bitmap_1, cliprect, 0x0000); bitmap_fill(state->sprite_bitmap_2, cliprect, 0x0000); @@ -684,11 +684,11 @@ static MACHINE_CONFIG_START( jchan, jchan_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(jchan) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(jchan) - MCFG_VIDEO_UPDATE(jchan) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index d91b8290558..719c9fcab1e 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -141,7 +141,7 @@ static VIDEO_START( jokrwild ) } -static VIDEO_UPDATE( jokrwild ) +static SCREEN_UPDATE( jokrwild ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -474,12 +474,12 @@ static MACHINE_CONFIG_START( jokrwild, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((32+1)*8, (32+1)*8) /* From MC6845, registers 00 & 04. (value-1) */ MCFG_SCREEN_VISIBLE_AREA(0*8, 24*8-1, 0*8, 26*8-1) /* From MC6845, registers 01 & 06 */ + MCFG_SCREEN_UPDATE(jokrwild) MCFG_GFXDECODE(jokrwild) MCFG_PALETTE_INIT(jokrwild) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(jokrwild) - MCFG_VIDEO_UPDATE(jokrwild) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */ diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index fd4e60e7520..17ceab46c1f 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -477,7 +477,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap ) } } -static VIDEO_UPDATE( jollyjgr ) +static SCREEN_UPDATE( jollyjgr ) { jollyjgr_state *state = screen->machine->driver_data<jollyjgr_state>(); UINT8 *spriteram = state->spriteram; @@ -533,12 +533,12 @@ static VIDEO_UPDATE( jollyjgr ) return 0; } -static VIDEO_UPDATE( fspider ) +static SCREEN_UPDATE( fspider ) { jollyjgr_state *state = screen->machine->driver_data<jollyjgr_state>(); // Draw bg and sprites - VIDEO_UPDATE_CALL(jollyjgr); + SCREEN_UPDATE_CALL(jollyjgr); /* Draw bullets 16 bytes, 2 bytes per bullet (y,x). 2 player bullets, 6 enemy bullets. @@ -653,13 +653,13 @@ static MACHINE_CONFIG_START( jollyjgr, jollyjgr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(jollyjgr) MCFG_GFXDECODE(jollyjgr) MCFG_PALETTE_LENGTH(32+8) /* 32 for tilemap and sprites + 8 for the bitmap */ MCFG_PALETTE_INIT(jollyjgr) MCFG_VIDEO_START(jollyjgr) - MCFG_VIDEO_UPDATE(jollyjgr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -672,8 +672,9 @@ static MACHINE_CONFIG_DERIVED( fspider, jollyjgr ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fspider_map) - - MCFG_VIDEO_UPDATE(fspider) + + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(fspider) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index b6709b15f14..e9932d6ba43 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -59,7 +59,7 @@ static VIDEO_START( jongkyo ) } -static VIDEO_UPDATE( jongkyo ) +static SCREEN_UPDATE( jongkyo ) { jongkyo_state *state = screen->machine->driver_data<jongkyo_state>(); int y; @@ -500,12 +500,12 @@ static MACHINE_CONFIG_START( jongkyo, jongkyo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 8, 256-8-1) + MCFG_SCREEN_UPDATE(jongkyo) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(jongkyo) MCFG_VIDEO_START(jongkyo) - MCFG_VIDEO_UPDATE(jongkyo) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("aysnd", AY8910, JONGKYO_CLOCK/8) diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c index 03e2dba2982..17d02137286 100644 --- a/src/mame/drivers/jpmimpct.c +++ b/src/mame/drivers/jpmimpct.c @@ -823,6 +823,7 @@ static MACHINE_CONFIG_START( jpmimpct, jpmimpct_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(40000000/4, 156*4, 0, 100*4, 328, 0, 300) + MCFG_SCREEN_UPDATE(tms340x0) MCFG_PALETTE_LENGTH(256) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -830,7 +831,6 @@ static MACHINE_CONFIG_START( jpmimpct, jpmimpct_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_VIDEO_START(jpmimpct) - MCFG_VIDEO_UPDATE(tms340x0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c index 35daeca79b9..5e77f941ced 100644 --- a/src/mame/drivers/jpmsys5.c +++ b/src/mame/drivers/jpmsys5.c @@ -173,7 +173,7 @@ static VIDEO_START( jpmsys5v ) tms34061_start(machine, &tms34061intf); } -static VIDEO_UPDATE( jpmsys5v ) +static SCREEN_UPDATE( jpmsys5v ) { int x, y; struct tms34061_display state; @@ -625,9 +625,9 @@ static MACHINE_CONFIG_START( jpmsys5v, jpmsys5_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz / 4, 676, 20*4, 147*4, 256, 0, 254) + MCFG_SCREEN_UPDATE(jpmsys5v) MCFG_VIDEO_START(jpmsys5v) - MCFG_VIDEO_UPDATE(jpmsys5v) MCFG_PALETTE_LENGTH(16) diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c index 458f001c3f4..f044a5c3d28 100644 --- a/src/mame/drivers/jrpacman.c +++ b/src/mame/drivers/jrpacman.c @@ -278,13 +278,13 @@ static MACHINE_CONFIG_START( jrpacman, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(pacman) MCFG_GFXDECODE(jrpacman) MCFG_PALETTE_LENGTH(128*4) MCFG_PALETTE_INIT(pacman) MCFG_VIDEO_START(jrpacman) - MCFG_VIDEO_UPDATE(pacman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c index 05234b11e26..44410e55c2a 100644 --- a/src/mame/drivers/jubilee.c +++ b/src/mame/drivers/jubilee.c @@ -121,7 +121,7 @@ static VIDEO_START( jubileep ) } -static VIDEO_UPDATE( jubileep ) +static SCREEN_UPDATE( jubileep ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -412,6 +412,7 @@ static MACHINE_CONFIG_START( jubileep, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(jubileep) MCFG_GFXDECODE(jubileep) @@ -419,7 +420,6 @@ static MACHINE_CONFIG_START( jubileep, driver_device ) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(jubileep) - MCFG_VIDEO_UPDATE(jubileep) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/4, mc6845_intf) /* guess */ diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index 7806d8e9c1c..45ad2c76fcb 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -424,8 +424,7 @@ static MACHINE_CONFIG_START( junofrst, junofrst_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* not sure about the visible area */ - - MCFG_VIDEO_UPDATE(tutankhm) + MCFG_SCREEN_UPDATE(tutankhm) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index ec7c3e10adc..cf0d6217c55 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -1817,13 +1817,13 @@ static MACHINE_CONFIG_START( berlwall, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) + MCFG_SCREEN_UPDATE(berlwall) MCFG_GFXDECODE(1x4bit_1x4bit) MCFG_PALETTE_LENGTH(2048 + 32768) /* 32768 static colors for the bg */ MCFG_PALETTE_INIT(berlwall) MCFG_VIDEO_START(berlwall) - MCFG_VIDEO_UPDATE(berlwall) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1864,12 +1864,12 @@ static MACHINE_CONFIG_START( bakubrkr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) + MCFG_SCREEN_UPDATE(kaneko16) MCFG_GFXDECODE(1x4bit_2x4bit) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(kaneko16_2xVIEW2) - MCFG_VIDEO_UPDATE(kaneko16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1922,12 +1922,12 @@ static MACHINE_CONFIG_START( blazeon, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1 -8) + MCFG_SCREEN_UPDATE(kaneko16) MCFG_GFXDECODE(1x4bit_1x4bit) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(kaneko16_1xVIEW2) - MCFG_VIDEO_UPDATE(kaneko16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1972,12 +1972,12 @@ static MACHINE_CONFIG_START( gtmr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(kaneko16) MCFG_GFXDECODE(1x8bit_2x4bit) MCFG_PALETTE_LENGTH(32768) MCFG_VIDEO_START(kaneko16_2xVIEW2) - MCFG_VIDEO_UPDATE(kaneko16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2060,12 +2060,12 @@ static MACHINE_CONFIG_START( mgcrystl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(kaneko16) MCFG_GFXDECODE(1x4bit_2x4bit) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(kaneko16_2xVIEW2) - MCFG_VIDEO_UPDATE(kaneko16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2177,12 +2177,12 @@ static MACHINE_CONFIG_START( shogwarr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(40, 296-1, 16, 240-1) + MCFG_SCREEN_UPDATE(kaneko16) MCFG_GFXDECODE(1x4bit_1x4bit) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(kaneko16_1xVIEW2) - MCFG_VIDEO_UPDATE(kaneko16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index 2cec1794b9b..f4ae9a0be64 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -448,9 +448,9 @@ static MACHINE_CONFIG_START( nomcu, kangaroo_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 320*2, 0*2, 256*2, 260, 8, 248) + MCFG_SCREEN_UPDATE(kangaroo) MCFG_VIDEO_START(kangaroo) - MCFG_VIDEO_UPDATE(kangaroo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 8955a105a28..e95fa541333 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -832,13 +832,13 @@ static MACHINE_CONFIG_START( karnov, karnov_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(karnov) MCFG_GFXDECODE(karnov) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(karnov) MCFG_VIDEO_START(karnov) - MCFG_VIDEO_UPDATE(karnov) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -874,13 +874,13 @@ static MACHINE_CONFIG_START( wndrplnt, karnov_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(karnov) MCFG_GFXDECODE(karnov) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(karnov) MCFG_VIDEO_START(wndrplnt) - MCFG_VIDEO_UPDATE(karnov) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index ab27b752c0e..f704df6c34f 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -441,13 +441,13 @@ static MACHINE_CONFIG_START( kchampvs, kchamp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(kchampvs) MCFG_GFXDECODE(kchamp) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(kchamp) MCFG_VIDEO_START(kchamp) - MCFG_VIDEO_UPDATE(kchampvs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -492,13 +492,13 @@ static MACHINE_CONFIG_START( kchamp, kchamp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(kchamp) MCFG_GFXDECODE(kchamp) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(kchamp) MCFG_VIDEO_START(kchamp) - MCFG_VIDEO_UPDATE(kchamp) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index fedef87b6ac..8b5ed3acce9 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -698,12 +698,12 @@ static MACHINE_CONFIG_START( kickgoal, kickgoal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(9*8, 55*8-1, 4*8, 60*8-1) + MCFG_SCREEN_UPDATE(kickgoal) MCFG_GFXDECODE(kickgoal) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(kickgoal) - MCFG_VIDEO_UPDATE(kickgoal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -736,12 +736,12 @@ static MACHINE_CONFIG_START( actionhw, kickgoal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(10*8+2, 54*8-1+2, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(actionhw) MCFG_GFXDECODE(actionhw) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(actionhw) - MCFG_VIDEO_UPDATE(actionhw) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index c6bfeb87ff4..3f81d2c80bb 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -182,7 +182,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -static VIDEO_UPDATE(kingdrby) +static SCREEN_UPDATE(kingdrby) { const rectangle &visarea = screen->visible_area(); rectangle clip; @@ -999,9 +999,9 @@ static MACHINE_CONFIG_START( kingdrby, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1) /* controlled by CRTC */ + MCFG_SCREEN_UPDATE(kingdrby) MCFG_VIDEO_START(kingdrby) - MCFG_VIDEO_UPDATE(kingdrby) MCFG_MC6845_ADD("crtc", MC6845, CLK_1/32, mc6845_intf) /* 53.333 Hz. guess */ diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 13d36e709c6..a7116912efe 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -506,13 +506,13 @@ static MACHINE_CONFIG_START( kingofb, kingofb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(kingofb) MCFG_GFXDECODE(kingobox) MCFG_PALETTE_LENGTH(256+8*2) MCFG_PALETTE_INIT(kingofb) MCFG_VIDEO_START(kingofb) - MCFG_VIDEO_UPDATE(kingofb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -559,13 +559,13 @@ static MACHINE_CONFIG_START( ringking, kingofb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(ringking) MCFG_GFXDECODE(rk) MCFG_PALETTE_LENGTH(256+8*2) MCFG_PALETTE_INIT(ringking) MCFG_VIDEO_START(ringking) - MCFG_VIDEO_UPDATE(ringking) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index 117f8f220c3..f7db287394b 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -220,7 +220,7 @@ static MACHINE_RESET( kinst ) * *************************************/ -static VIDEO_UPDATE( kinst ) +static SCREEN_UPDATE( kinst ) { int y; @@ -658,12 +658,11 @@ static MACHINE_CONFIG_START( kinst, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(kinst) MCFG_PALETTE_INIT(BBBBB_GGGGG_RRRRR) MCFG_PALETTE_LENGTH(32768) - MCFG_VIDEO_UPDATE(kinst) - /* sound hardware */ MCFG_FRAGMENT_ADD(dcs_audio_2k) MACHINE_CONFIG_END diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c index c20968df2b0..83f2a7e198d 100644 --- a/src/mame/drivers/klax.c +++ b/src/mame/drivers/klax.c @@ -185,9 +185,9 @@ static MACHINE_CONFIG_START( klax, klax_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(klax) MCFG_VIDEO_START(klax) - MCFG_VIDEO_UPDATE(klax) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index abe0c636b08..e4ffec44a3d 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -296,13 +296,13 @@ static MACHINE_CONFIG_START( kncljoe, kncljoe_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(kncljoe) MCFG_GFXDECODE(kncljoe) MCFG_PALETTE_LENGTH(16*8+16*8) MCFG_PALETTE_INIT(kncljoe) MCFG_VIDEO_START(kncljoe) - MCFG_VIDEO_UPDATE(kncljoe) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index c3cb04f1686..8b2ff698f78 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -82,7 +82,7 @@ static VIDEO_START( koftball ) tilemap_set_transparent_pen(state->tilemap_1,0); } -static VIDEO_UPDATE( koftball ) +static SCREEN_UPDATE( koftball ) { koftball_state *state = screen->machine->driver_data<koftball_state>(); tilemap_draw( bitmap, cliprect, state->tilemap_2, 0, 0); @@ -232,6 +232,7 @@ static MACHINE_CONFIG_START( koftball, koftball_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) + MCFG_SCREEN_UPDATE(koftball) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_GFXDECODE(koftball) @@ -241,7 +242,6 @@ static MACHINE_CONFIG_START( koftball, koftball_state ) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(koftball) - MCFG_VIDEO_UPDATE(koftball) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 40d68e7afe6..4dd3cb116f2 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -132,7 +132,7 @@ static VIDEO_START(koikoi) state->tmap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -static VIDEO_UPDATE(koikoi) +static SCREEN_UPDATE(koikoi) { koikoi_state *state = screen->machine->driver_data<koikoi_state>(); tilemap_draw(bitmap, cliprect, state->tmap, 0, 0); @@ -373,13 +373,13 @@ static MACHINE_CONFIG_START( koikoi, koikoi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(koikoi) MCFG_GFXDECODE(koikoi) MCFG_PALETTE_LENGTH(8*32) MCFG_PALETTE_INIT(koikoi) MCFG_VIDEO_START(koikoi) - MCFG_VIDEO_UPDATE(koikoi) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 54bc8178b10..7afc19bfee3 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -402,12 +402,12 @@ static MACHINE_CONFIG_START( konamigq, konamigq_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 1024 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type1 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index ebdaba8d208..b975af196df 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -357,12 +357,12 @@ static MACHINE_CONFIG_START( konamigv, konamigv_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 512 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type2 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 02265ed5a23..337bc18abc1 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1818,11 +1818,11 @@ static MACHINE_CONFIG_START( konamigx, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(24, 24+288-1, 16, 16+224-1) + MCFG_SCREEN_UPDATE(konamigx) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(konamigx_5bpp) - MCFG_VIDEO_UPDATE(konamigx) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1904,7 +1904,7 @@ static MACHINE_CONFIG_DERIVED( gxtype3, konamigx ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(576, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16) - + MCFG_SCREEN_UPDATE(konamigx) MCFG_GFXDECODE(type34) MACHINE_CONFIG_END @@ -1927,7 +1927,7 @@ static MACHINE_CONFIG_DERIVED( gxtype4, konamigx ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(128*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 32*8-1-16) - + MCFG_SCREEN_UPDATE(konamigx) MCFG_PALETTE_LENGTH(8192) MCFG_GFXDECODE(type4) diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c index 7fe4ce646fe..d1156cefb5e 100644 --- a/src/mame/drivers/konamim2.c +++ b/src/mame/drivers/konamim2.c @@ -233,7 +233,7 @@ static VIDEO_START( m2 ) { } -static VIDEO_UPDATE( m2 ) +static SCREEN_UPDATE( m2 ) { konamim2_state *state = screen->machine->driver_data<konamim2_state>(); int i, j; @@ -1174,12 +1174,12 @@ static MACHINE_CONFIG_START( m2, konamim2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(m2) MCFG_PALETTE_LENGTH(32768) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_VIDEO_START(m2) - MCFG_VIDEO_UPDATE(m2) MACHINE_CONFIG_END diff --git a/src/mame/drivers/kongambl.c b/src/mame/drivers/kongambl.c index 5ac541e7453..ac5f728b250 100644 --- a/src/mame/drivers/kongambl.c +++ b/src/mame/drivers/kongambl.c @@ -29,7 +29,7 @@ static VIDEO_START(kongambl) k056832_set_layer_offs(k056832, 3, 6, 0); } -static VIDEO_UPDATE(kongambl) +static SCREEN_UPDATE(kongambl) { device_t *k056832 = screen->machine->device("k056832"); @@ -141,11 +141,11 @@ static MACHINE_CONFIG_START( kongambl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(kongambl) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(kongambl) - MCFG_VIDEO_UPDATE(kongambl) MCFG_K053247_ADD("k053246", k053247_intf) MCFG_K056832_ADD("k056832", k056832_intf) diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c index cc10f616223..04a134fb0b7 100644 --- a/src/mame/drivers/kopunch.c +++ b/src/mame/drivers/kopunch.c @@ -205,13 +205,13 @@ static MACHINE_CONFIG_START( kopunch, kopunch_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(kopunch) MCFG_GFXDECODE(kopunch) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(kopunch) MCFG_VIDEO_START(kopunch) - MCFG_VIDEO_UPDATE(kopunch) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 0d17553bbbb..df5c2235994 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -294,13 +294,13 @@ static MACHINE_CONFIG_START( ksayakyu, ksayakyu_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(ksayakyu) MCFG_GFXDECODE(ksayakyu) MCFG_PALETTE_INIT(ksayakyu) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(ksayakyu) - MCFG_VIDEO_UPDATE(ksayakyu) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index aecfb0f5747..f7425cf114c 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -2992,12 +2992,12 @@ static MACHINE_CONFIG_START( konami573, ksys573_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 1024 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type2 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c index f5f7a68fb00..f007cf89b71 100644 --- a/src/mame/drivers/kungfur.c +++ b/src/mame/drivers/kungfur.c @@ -114,7 +114,7 @@ static void draw_led(bitmap_t *bitmap, int x, int y,UINT8 value) } /* actually debugging purpose, it will be converted to the artwork system at some point. */ -static VIDEO_UPDATE( kungfur ) +static SCREEN_UPDATE( kungfur ) { kungfur_state *state = screen->machine->driver_data<kungfur_state>(); // popmessage("%02x %02x %02x %02x %02x %02x",io_data[0],io_data[1],io_data[2],io_data[3],io_data[4],io_data[5]); @@ -369,10 +369,10 @@ static MACHINE_CONFIG_START( kungfur, kungfur_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(kungfur) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(kungfur) - MCFG_VIDEO_UPDATE(kungfur) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 08746a50bc9..871c93848ae 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -504,13 +504,13 @@ static MACHINE_CONFIG_START( gyrodine, kyugo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(kyugo) MCFG_GFXDECODE(kyugo) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(kyugo) - MCFG_VIDEO_UPDATE(kyugo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index e409fa14df8..0f8a4a38821 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -209,13 +209,13 @@ static MACHINE_CONFIG_START( labyrunr, labyrunr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(37*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(labyrunr) MCFG_GFXDECODE(labyrunr) MCFG_PALETTE_LENGTH(2*8*16*16) MCFG_PALETTE_INIT(labyrunr) MCFG_VIDEO_START(labyrunr) - MCFG_VIDEO_UPDATE(labyrunr) MCFG_K007121_ADD("k007121") MCFG_K051733_ADD("k051733") diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index 0e89ae2003b..3908fbfa32e 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -788,13 +788,13 @@ static MACHINE_CONFIG_START( ladybug, ladybug_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(ladybug) MCFG_GFXDECODE(ladybug) MCFG_PALETTE_LENGTH(4*8+4*16) MCFG_PALETTE_INIT(ladybug) MCFG_VIDEO_START(ladybug) - MCFG_VIDEO_UPDATE(ladybug) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -829,14 +829,14 @@ static MACHINE_CONFIG_START( sraider, ladybug_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(sraider) + MCFG_SCREEN_EOF(sraider) MCFG_GFXDECODE(sraider) MCFG_PALETTE_LENGTH(4*8+4*16+32+2) MCFG_PALETTE_INIT(sraider) MCFG_VIDEO_START(sraider) - MCFG_VIDEO_UPDATE(sraider) - MCFG_VIDEO_EOF(sraider) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index e1acac35ee2..eb8f08bdc48 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -332,12 +332,12 @@ static MACHINE_CONFIG_START( ladyfrog, ladyfrog_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 29*8-1) // black borders in ladyfrog gameplay are correct + MCFG_SCREEN_UPDATE(ladyfrog) MCFG_GFXDECODE(ladyfrog) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(ladyfrog) - MCFG_VIDEO_UPDATE(ladyfrog) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index 8e508406667..fe6fbb7f6bb 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -44,7 +44,7 @@ static VIDEO_START(laserbas) state->save_item(NAME(state->vram2)); } -static VIDEO_UPDATE(laserbas) +static SCREEN_UPDATE(laserbas) { laserbas_state *state = screen->machine->driver_data<laserbas_state>(); int x, y; @@ -184,10 +184,10 @@ static MACHINE_CONFIG_START( laserbas, laserbas_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(laserbas) MCFG_PALETTE_LENGTH(32) MCFG_VIDEO_START(laserbas) - MCFG_VIDEO_UPDATE(laserbas) MACHINE_CONFIG_END /* diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 45e987c43c5..c2a7ed9c09c 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -503,7 +503,7 @@ static VIDEO_START( laserbat ) state->save_item(NAME(state->colorram)); } -static VIDEO_UPDATE( laserbat ) +static SCREEN_UPDATE( laserbat ) { laserbat_state *state = screen->machine->driver_data<laserbat_state>(); int y; @@ -783,6 +783,7 @@ static MACHINE_CONFIG_START( laserbat, laserbat_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(1*8, 29*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(laserbat) MCFG_GFXDECODE(laserbat) MCFG_PALETTE_LENGTH(1024) @@ -792,7 +793,6 @@ static MACHINE_CONFIG_START( laserbat, laserbat_state ) MCFG_S2636_ADD("s2636_3", s2636_3_config) MCFG_VIDEO_START(laserbat) - MCFG_VIDEO_UPDATE(laserbat) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -831,6 +831,7 @@ static MACHINE_CONFIG_START( catnmous, laserbat_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(laserbat) MCFG_GFXDECODE(laserbat) MCFG_PALETTE_LENGTH(1024) @@ -840,7 +841,6 @@ static MACHINE_CONFIG_START( catnmous, laserbat_state ) MCFG_S2636_ADD("s2636_3", s2636_3_config) MCFG_VIDEO_START(laserbat) - MCFG_VIDEO_UPDATE(laserbat) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index bef3033975a..b63eccc65b4 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -521,13 +521,13 @@ static MACHINE_CONFIG_START( base, lasso_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(lasso) MCFG_GFXDECODE(lasso) MCFG_PALETTE_LENGTH(0x40) MCFG_PALETTE_INIT(lasso) MCFG_VIDEO_START(lasso) - MCFG_VIDEO_UPDATE(lasso) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -557,7 +557,8 @@ static MACHINE_CONFIG_DERIVED( chameleo, base ) MCFG_CPU_PROGRAM_MAP(chameleo_audio_map) /* video hardware */ - MCFG_VIDEO_UPDATE(chameleo) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(chameleo) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( wwjgtin, base ) @@ -575,12 +576,12 @@ static MACHINE_CONFIG_DERIVED( wwjgtin, base ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) // Smaller visible area? + MCFG_SCREEN_UPDATE(wwjgtin) MCFG_GFXDECODE(wwjgtin) // Has 1 additional layer MCFG_PALETTE_LENGTH(0x40 + 16*16) MCFG_PALETTE_INIT(wwjgtin) MCFG_VIDEO_START(wwjgtin) - MCFG_VIDEO_UPDATE(wwjgtin) /* sound hardware */ MCFG_SOUND_ADD("dac", DAC, 0) @@ -603,7 +604,8 @@ static MACHINE_CONFIG_DERIVED( pinbo, base ) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(pinbo) - MCFG_VIDEO_UPDATE(pinbo) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(pinbo) /* sound hardware */ MCFG_DEVICE_REMOVE("sn76489.1") diff --git a/src/mame/drivers/lastbank.c b/src/mame/drivers/lastbank.c index cea866a3aaf..da0f2cc5bba 100644 --- a/src/mame/drivers/lastbank.c +++ b/src/mame/drivers/lastbank.c @@ -25,7 +25,7 @@ static VIDEO_START( lastbank ) } -static VIDEO_UPDATE( lastbank ) +static SCREEN_UPDATE( lastbank ) { return 0; } @@ -124,13 +124,13 @@ static MACHINE_CONFIG_START( lastbank, lastbank_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(lastbank) MCFG_GFXDECODE( lastbank ) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(lastbank) - MCFG_VIDEO_UPDATE(lastbank) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c index 70ceaaaa64b..8e674a07688 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -524,13 +524,13 @@ static MACHINE_CONFIG_START( lastduel, lastduel_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(lastduel) + MCFG_SCREEN_EOF(lastduel) MCFG_GFXDECODE(lastduel) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(lastduel) - MCFG_VIDEO_EOF(lastduel) - MCFG_VIDEO_UPDATE(lastduel) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -566,13 +566,13 @@ static MACHINE_CONFIG_START( madgear, lastduel_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(madgear) + MCFG_SCREEN_EOF(lastduel) MCFG_GFXDECODE(madgear) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(madgear) - MCFG_VIDEO_EOF(lastduel) - MCFG_VIDEO_UPDATE(madgear) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 0d1319d2223..7395316fa59 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -108,7 +108,7 @@ static VIDEO_START( lastfght ) } -static VIDEO_UPDATE( lastfght ) +static SCREEN_UPDATE( lastfght ) { lastfght_state *state = screen->machine->driver_data<lastfght_state>(); @@ -586,9 +586,9 @@ static MACHINE_CONFIG_START( lastfght, lastfght_state ) MCFG_SCREEN_SIZE( 512, 256 ) MCFG_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 ) MCFG_SCREEN_REFRESH_RATE( 60 ) + MCFG_SCREEN_UPDATE( lastfght ) MCFG_VIDEO_START( lastfght ) - MCFG_VIDEO_UPDATE( lastfght ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c index 9b054f2e78a..0e6ca37a409 100644 --- a/src/mame/drivers/lazercmd.c +++ b/src/mame/drivers/lazercmd.c @@ -647,12 +647,12 @@ static MACHINE_CONFIG_START( lazercmd, lazercmd_state ) MCFG_SCREEN_SIZE(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR) MCFG_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1, 0 * VERT_CHR, (VERT_RES - 1) * VERT_CHR - 1) + MCFG_SCREEN_UPDATE(lazercmd) MCFG_GFXDECODE(lazercmd) MCFG_PALETTE_LENGTH(5) MCFG_PALETTE_INIT(lazercmd) - MCFG_VIDEO_UPDATE(lazercmd) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -685,12 +685,12 @@ static MACHINE_CONFIG_START( medlanes, lazercmd_state ) MCFG_SCREEN_SIZE(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR) MCFG_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1, 0 * VERT_CHR, VERT_RES * VERT_CHR - 1) + MCFG_SCREEN_UPDATE(lazercmd) MCFG_GFXDECODE(lazercmd) MCFG_PALETTE_LENGTH(5) MCFG_PALETTE_INIT(lazercmd) - MCFG_VIDEO_UPDATE(lazercmd) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -723,12 +723,12 @@ static MACHINE_CONFIG_START( bbonk, lazercmd_state ) MCFG_SCREEN_SIZE(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR) MCFG_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1, 0 * VERT_CHR, (VERT_RES - 1) * VERT_CHR - 1) + MCFG_SCREEN_UPDATE(lazercmd) MCFG_GFXDECODE(lazercmd) MCFG_PALETTE_LENGTH(5) MCFG_PALETTE_INIT(lazercmd) - MCFG_VIDEO_UPDATE(lazercmd) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index c8603a0a78c..9d0f0b6ce2f 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -1066,13 +1066,13 @@ static MACHINE_CONFIG_START( legionna, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(legionna) MCFG_GFXDECODE(legionna) MCFG_PALETTE_LENGTH(128*16) MCFG_PALETTE_INIT(all_black) MCFG_VIDEO_START(legionna) - MCFG_VIDEO_UPDATE(legionna) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000) @@ -1099,13 +1099,13 @@ static MACHINE_CONFIG_START( heatbrl, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(legionna) MCFG_GFXDECODE(heatbrl) MCFG_PALETTE_LENGTH(128*16) MCFG_PALETTE_INIT(all_black) MCFG_VIDEO_START(legionna) - MCFG_VIDEO_UPDATE(legionna) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000) @@ -1131,13 +1131,13 @@ static MACHINE_CONFIG_START( godzilla, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(godzilla) MCFG_GFXDECODE(heatbrl) MCFG_PALETTE_LENGTH(128*16) MCFG_PALETTE_INIT(all_black) MCFG_VIDEO_START(godzilla) - MCFG_VIDEO_UPDATE(godzilla) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(14318180/4,1320000) @@ -1163,13 +1163,13 @@ static MACHINE_CONFIG_START( denjinmk, driver_device ) MCFG_SCREEN_REFRESH_RATE(61) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(godzilla) MCFG_GFXDECODE(heatbrl) MCFG_PALETTE_LENGTH(128*16) MCFG_PALETTE_INIT(all_black) MCFG_VIDEO_START(denjinmk) - MCFG_VIDEO_UPDATE(godzilla) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(14318180/4,1320000) @@ -1195,13 +1195,13 @@ static MACHINE_CONFIG_START( grainbow, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 42*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(grainbow) MCFG_GFXDECODE(grainbow) MCFG_PALETTE_LENGTH(128*16) MCFG_PALETTE_INIT(all_black) MCFG_VIDEO_START(grainbow) - MCFG_VIDEO_UPDATE(grainbow) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(14318180/4,1320000) @@ -1228,13 +1228,13 @@ static MACHINE_CONFIG_START( cupsoc, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(grainbow) MCFG_GFXDECODE(cupsoc) MCFG_PALETTE_LENGTH(128*16) MCFG_PALETTE_INIT(all_black) MCFG_VIDEO_START(cupsoc) - MCFG_VIDEO_UPDATE(grainbow) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000) @@ -1269,13 +1269,13 @@ static MACHINE_CONFIG_START( cupsocbl, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(grainbow) MCFG_GFXDECODE(heatbrl_csb) MCFG_PALETTE_LENGTH(128*16) MCFG_PALETTE_INIT(all_black) MCFG_VIDEO_START(cupsoc) - MCFG_VIDEO_UPDATE(grainbow) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index db8f47db356..c73fc3b52b2 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -283,13 +283,13 @@ static MACHINE_CONFIG_START( lemmings, lemmings_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(lemmings) + MCFG_SCREEN_EOF(lemmings) MCFG_GFXDECODE(lemmings) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_EOF(lemmings) MCFG_VIDEO_START(lemmings) - MCFG_VIDEO_UPDATE(lemmings) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index 421eac09122..e2e847584b4 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -688,11 +688,11 @@ static MACHINE_CONFIG_START( lethalen, lethal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(216, 504-1, 16, 240-1) + MCFG_SCREEN_UPDATE(lethalen) MCFG_PALETTE_LENGTH(7168+1) MCFG_VIDEO_START(lethalen) - MCFG_VIDEO_UPDATE(lethalen) MCFG_K056832_ADD("k056832", lethalen_k056832_intf) MCFG_K053244_ADD("k053244", lethalen_k05324x_intf) diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c index 0b363a745f2..9e6be2dadcb 100644 --- a/src/mame/drivers/lethalj.c +++ b/src/mame/drivers/lethalj.c @@ -604,9 +604,9 @@ static MACHINE_CONFIG_START( gameroom, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 701, 0, 512, 263, 0, 236) + MCFG_SCREEN_UPDATE(tms340x0) MCFG_VIDEO_START(lethalj) - MCFG_VIDEO_UPDATE(tms340x0) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_PALETTE_LENGTH(32768) diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index 5b7a1803c2b..bc1a980fbb8 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -82,7 +82,7 @@ static emu_timer *irq_timer; /* VIDEO GOODS */ -static VIDEO_UPDATE( lgp ) +static SCREEN_UPDATE( lgp ) { int charx, chary; diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index 0c01dbdff72..d72b26a3d6b 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -850,13 +850,13 @@ static MACHINE_CONFIG_START( liberate, liberate_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(liberate) MCFG_GFXDECODE(liberate) MCFG_PALETTE_LENGTH(33) MCFG_PALETTE_INIT(liberate) MCFG_VIDEO_START(liberate) - MCFG_VIDEO_UPDATE(liberate) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -879,7 +879,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( boomrang, liberate ) MCFG_VIDEO_START(boomrang) - MCFG_VIDEO_UPDATE(boomrang) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(boomrang) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( prosoccr, liberate ) @@ -898,11 +899,11 @@ static MACHINE_CONFIG_DERIVED( prosoccr, liberate ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(prosoccr) MCFG_GFXDECODE(prosoccr) MCFG_VIDEO_START(prosoccr) - MCFG_VIDEO_UPDATE(prosoccr) MACHINE_CONFIG_END static MACHINE_CONFIG_START( prosport, liberate_state ) @@ -929,12 +930,12 @@ static MACHINE_CONFIG_START( prosport, liberate_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(prosport) MCFG_GFXDECODE(prosport) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(prosport) - MCFG_VIDEO_UPDATE(prosport) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 3e852237980..5c305f0f383 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -427,7 +427,7 @@ static VIDEO_START( limenko ) sprites_bitmap_pri = auto_bitmap_alloc(machine,384,240,BITMAP_FORMAT_INDEXED8); } -static VIDEO_UPDATE( limenko ) +static SCREEN_UPDATE( limenko ) { // limenko_videoreg[4] ???? It always has this value: 0xffeffff8 (2 signed bytes? values: -17 and -8 ?) @@ -655,12 +655,12 @@ static MACHINE_CONFIG_START( limenko, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 240) MCFG_SCREEN_VISIBLE_AREA(0, 383, 0, 239) + MCFG_SCREEN_UPDATE(limenko) MCFG_GFXDECODE(limenko) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(limenko) - MCFG_VIDEO_UPDATE(limenko) /* sound hardware */ MACHINE_CONFIG_END @@ -683,12 +683,12 @@ static MACHINE_CONFIG_START( spotty, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 240) MCFG_SCREEN_VISIBLE_AREA(0, 383, 0, 239) + MCFG_SCREEN_UPDATE(limenko) MCFG_GFXDECODE(limenko) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(limenko) - MCFG_VIDEO_UPDATE(limenko) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index 829e659fbbf..9c800cac073 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -457,7 +457,7 @@ static void draw_sprite(bitmap_t *bitmap, int xsize,int ysize, int offset, int x } /* sprite format / offset could be completely wrong, this is just based on our (currently incorrect) vram access */ -static VIDEO_UPDATE(littlerb) +static SCREEN_UPDATE(littlerb) { int x,y,offs, code; int xsize,ysize; @@ -506,13 +506,13 @@ static MACHINE_CONFIG_START( littlerb, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8, 256-1) + MCFG_SCREEN_UPDATE(littlerb) MCFG_PALETTE_LENGTH(256) MCFG_DEVICE_ADD("littlerbvdp", LITTLERBVDP, 0) // MCFG_PALETTE_INIT(littlerb) - MCFG_VIDEO_UPDATE(littlerb) MACHINE_CONFIG_END ROM_START( littlerb ) diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index 8b64fc7d963..5cfe790d20c 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -579,12 +579,12 @@ static MACHINE_CONFIG_START( lkage, lkage_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(lkage) MCFG_GFXDECODE(lkage) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(lkage) - MCFG_VIDEO_UPDATE(lkage) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -626,12 +626,12 @@ static MACHINE_CONFIG_START( lkageb, lkage_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(lkage) MCFG_GFXDECODE(lkage) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(lkage) - MCFG_VIDEO_UPDATE(lkage) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index 5adeee862d5..462566d374c 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -543,14 +543,14 @@ static MACHINE_CONFIG_START( lockon, lockon_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(lockon) + MCFG_SCREEN_EOF(lockon) MCFG_GFXDECODE(lockon) MCFG_PALETTE_INIT(lockon) MCFG_PALETTE_LENGTH(1024 + 2048) MCFG_VIDEO_START(lockon) - MCFG_VIDEO_UPDATE(lockon) - MCFG_VIDEO_EOF(lockon) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index fde0ad41410..acdf924fe6a 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -277,7 +277,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -static VIDEO_UPDATE( looping ) +static SCREEN_UPDATE( looping ) { looping_state *state = screen->machine->driver_data<looping_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -634,13 +634,13 @@ static MACHINE_CONFIG_START( looping, looping_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(looping) MCFG_GFXDECODE(looping) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(looping) MCFG_VIDEO_START(looping) - MCFG_VIDEO_UPDATE(looping) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index bb8a9ae86bc..bd89474208f 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -692,12 +692,12 @@ static MACHINE_CONFIG_START( lordgun, lordgun_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 0x100) MCFG_SCREEN_VISIBLE_AREA(0,0x1c0-1, 0,0xe0-1) + MCFG_SCREEN_UPDATE(lordgun) MCFG_GFXDECODE(lordgun) MCFG_PALETTE_LENGTH(0x800 * 8) // 0x800 real colors, repeated per priority level MCFG_VIDEO_START(lordgun) - MCFG_VIDEO_UPDATE(lordgun) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") @@ -736,12 +736,12 @@ static MACHINE_CONFIG_START( aliencha, lordgun_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 0x100) MCFG_SCREEN_VISIBLE_AREA(0,0x1c0-1, 0,0xe0-1) + MCFG_SCREEN_UPDATE(lordgun) MCFG_GFXDECODE(lordgun) MCFG_PALETTE_LENGTH(0x800 * 8) // 0x800 real colors, repeated per priority level MCFG_VIDEO_START(lordgun) - MCFG_VIDEO_UPDATE(lordgun) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index 006e6f984d3..26edf7bc908 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -643,12 +643,12 @@ static MACHINE_CONFIG_START( lsasquad, lsasquad_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(lsasquad) MCFG_GFXDECODE(lsasquad) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) - MCFG_VIDEO_UPDATE(lsasquad) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -705,7 +705,7 @@ static MACHINE_CONFIG_START( daikaiju, lsasquad_state ) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) - MCFG_VIDEO_UPDATE(daikaiju) + MCFG_SCREEN_UPDATE(daikaiju) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 217b6251080..f4968485f38 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -619,7 +619,7 @@ static GFXDECODE_START( ltcasino ) GFXDECODE_END -static VIDEO_UPDATE(ltcasino) +static SCREEN_UPDATE(ltcasino) { tilemap_draw(bitmap,cliprect,ltcasino_tilemap,0,0); return 0; @@ -639,12 +639,12 @@ static MACHINE_CONFIG_START( ltcasino, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(6*8, 58*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(ltcasino) MCFG_GFXDECODE(ltcasino) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(ltcasino) - MCFG_VIDEO_UPDATE(ltcasino) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index 1cfec0d1a9a..587d6555ab5 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -234,7 +234,7 @@ static VIDEO_START(luckgrln) tilemap_set_transparent_pen( reel4_tilemap, 0 ); } -static VIDEO_UPDATE(luckgrln) +static SCREEN_UPDATE(luckgrln) { int y,x; int count = 0; @@ -829,12 +829,12 @@ static MACHINE_CONFIG_START( luckgrln, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(luckgrln) MCFG_GFXDECODE(luckgrln) MCFG_PALETTE_LENGTH(0x8000) MCFG_VIDEO_START(luckgrln) - MCFG_VIDEO_UPDATE(luckgrln) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c index 8b609bfa981..d02d880c22f 100644 --- a/src/mame/drivers/lucky74.c +++ b/src/mame/drivers/lucky74.c @@ -1255,6 +1255,7 @@ static MACHINE_CONFIG_START( lucky74, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 30*8-1) + MCFG_SCREEN_UPDATE(lucky74) MCFG_GFXDECODE(lucky74) @@ -1262,7 +1263,6 @@ static MACHINE_CONFIG_START( lucky74, driver_device ) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(lucky74) - MCFG_VIDEO_UPDATE(lucky74) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c index 4838f34545c..d92d98a03ea 100644 --- a/src/mame/drivers/lvcards.c +++ b/src/mame/drivers/lvcards.c @@ -478,13 +478,13 @@ static MACHINE_CONFIG_START( lvcards, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(lvcards) MCFG_GFXDECODE(lvcards) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(lvcards) MCFG_VIDEO_START(lvcards) - MCFG_VIDEO_UPDATE(lvcards) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index ede8a05b1eb..c35474e708f 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -797,13 +797,13 @@ static MACHINE_CONFIG_START( lwings, lwings_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(lwings) + MCFG_SCREEN_EOF(lwings) MCFG_GFXDECODE(lwings) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(lwings) - MCFG_VIDEO_EOF(lwings) - MCFG_VIDEO_UPDATE(lwings) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -840,7 +840,8 @@ static MACHINE_CONFIG_DERIVED( trojan, lwings ) MCFG_GFXDECODE(trojan) MCFG_VIDEO_START(trojan) - MCFG_VIDEO_UPDATE(trojan) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(trojan) /* sound hardware */ MCFG_SOUND_ADD("5205", MSM5205, XTAL_455kHz) /* verified on PCB */ diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index 5580fd2ab54..231e37f6750 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -848,13 +848,13 @@ static MACHINE_CONFIG_START( m10, m10_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(IREMM10_PIXEL_CLOCK, IREMM10_HTOTAL, IREMM10_HBEND, IREMM10_HBSTART, IREMM10_VTOTAL, IREMM10_VBEND, IREMM10_VBSTART) + MCFG_SCREEN_UPDATE(m10) MCFG_GFXDECODE(m10) MCFG_PALETTE_LENGTH(2*8) MCFG_PALETTE_INIT(m10) MCFG_VIDEO_START(m10) - MCFG_VIDEO_UPDATE(m10) /* 74LS123 */ @@ -895,12 +895,12 @@ static MACHINE_CONFIG_START( m15, m10_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(IREMM15_PIXEL_CLOCK, IREMM15_HTOTAL, IREMM15_HBEND, IREMM15_HBSTART, IREMM15_VTOTAL, IREMM15_VBEND, IREMM15_VBSTART) + MCFG_SCREEN_UPDATE(m15) MCFG_PALETTE_LENGTH(2*8) MCFG_PALETTE_INIT(m10) MCFG_VIDEO_START( m15 ) - MCFG_VIDEO_UPDATE(m15) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index a54a349429f..b3f1ae34316 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -840,12 +840,12 @@ static MACHINE_CONFIG_START( firebarr, m107_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(80, 511-112, 8, 247) /* 320 x 240 */ + MCFG_SCREEN_UPDATE(m107) MCFG_GFXDECODE(firebarr) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(m107) - MCFG_VIDEO_UPDATE(m107) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index 6dc84172490..be462c599fe 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -120,7 +120,7 @@ static VIDEO_START( m14 ) state->m14_tilemap = tilemap_create(machine, m14_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -static VIDEO_UPDATE( m14 ) +static SCREEN_UPDATE( m14 ) { m14_state *state = screen->machine->driver_data<m14_state>(); @@ -347,12 +347,12 @@ static MACHINE_CONFIG_START( m14, m14_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(m14) MCFG_GFXDECODE(m14) MCFG_PALETTE_LENGTH(0x20) MCFG_PALETTE_INIT(m14) MCFG_VIDEO_START(m14) - MCFG_VIDEO_UPDATE(m14) /* sound hardware */ // MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c index 086f045ffb0..dacd001e340 100644 --- a/src/mame/drivers/m52.c +++ b/src/mame/drivers/m52.c @@ -408,10 +408,10 @@ static MACHINE_CONFIG_START( m52, m52_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 136, 376, 282, 22, 274) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m52) MCFG_PALETTE_INIT(m52) MCFG_VIDEO_START(m52) - MCFG_VIDEO_UPDATE(m52) /* sound hardware */ MCFG_FRAGMENT_ADD(m52_sound_c_audio) diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c index fe5d65695c2..1f0c5b2636e 100644 --- a/src/mame/drivers/m57.c +++ b/src/mame/drivers/m57.c @@ -239,13 +239,13 @@ static MACHINE_CONFIG_START( m57, m57_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(m57) MCFG_GFXDECODE(m57) MCFG_PALETTE_LENGTH(32*8+32*8) MCFG_PALETTE_INIT(m57) MCFG_VIDEO_START(m57) - MCFG_VIDEO_UPDATE(m57) /* sound hardware */ MCFG_FRAGMENT_ADD(m52_sound_c_audio) diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c index 6aa7c6044a1..d2e6dfbbb00 100644 --- a/src/mame/drivers/m58.c +++ b/src/mame/drivers/m58.c @@ -202,10 +202,10 @@ static MACHINE_CONFIG_START( yard, m58_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 256, 282, 42, 266) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(yard) MCFG_PALETTE_INIT(yard) MCFG_VIDEO_START(yard) - MCFG_VIDEO_UPDATE(yard) /* sound hardware */ MCFG_FRAGMENT_ADD(m52_large_audio) diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index 63bc973c773..0b4b5fe1d79 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -973,13 +973,13 @@ static MACHINE_CONFIG_START( ldrun, m62_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA((64*8-384)/2, 64*8-(64*8-384)/2-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(ldrun) MCFG_GFXDECODE(ldrun) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(m62) MCFG_VIDEO_START(ldrun) - MCFG_VIDEO_UPDATE(ldrun) /* sound hardware */ MCFG_FRAGMENT_ADD(m62_audio) @@ -997,9 +997,9 @@ static MACHINE_CONFIG_DERIVED( kungfum, ldrun ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(kungfum) MCFG_VIDEO_START(kungfum) - MCFG_VIDEO_UPDATE(kungfum) MACHINE_CONFIG_END @@ -1014,12 +1014,12 @@ static MACHINE_CONFIG_DERIVED( battroad, ldrun ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(battroad) MCFG_GFXDECODE(battroad) MCFG_PALETTE_LENGTH(544) MCFG_PALETTE_INIT(battroad) MCFG_VIDEO_START(battroad) - MCFG_VIDEO_UPDATE(battroad) MACHINE_CONFIG_END @@ -1031,7 +1031,8 @@ static MACHINE_CONFIG_DERIVED( ldrun2, ldrun ) MCFG_CPU_IO_MAP(ldrun2_io_map) MCFG_VIDEO_START(ldrun2) - MCFG_VIDEO_UPDATE(ldrun) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(ldrun) MACHINE_CONFIG_END @@ -1045,7 +1046,8 @@ static MACHINE_CONFIG_DERIVED( ldrun3, ldrun ) /* video hardware */ MCFG_GFXDECODE(ldrun3) MCFG_VIDEO_START(ldrun2) - MCFG_VIDEO_UPDATE(ldrun3) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(ldrun3) MACHINE_CONFIG_END @@ -1059,7 +1061,8 @@ static MACHINE_CONFIG_DERIVED( ldrun4, ldrun ) /* video hardware */ MCFG_GFXDECODE(ldrun3) MCFG_VIDEO_START(ldrun4) - MCFG_VIDEO_UPDATE(ldrun4) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(ldrun4) MACHINE_CONFIG_END @@ -1075,7 +1078,8 @@ static MACHINE_CONFIG_DERIVED( lotlot, ldrun ) MCFG_PALETTE_INIT(lotlot) MCFG_VIDEO_START(lotlot) - MCFG_VIDEO_UPDATE(lotlot) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(lotlot) MACHINE_CONFIG_END @@ -1090,7 +1094,8 @@ static MACHINE_CONFIG_DERIVED( kidniki, ldrun ) MCFG_GFXDECODE(kidniki) MCFG_VIDEO_START(kidniki) - MCFG_VIDEO_UPDATE(kidniki) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(kidniki) MACHINE_CONFIG_END @@ -1104,7 +1109,8 @@ static MACHINE_CONFIG_DERIVED( spelunkr, ldrun ) MCFG_GFXDECODE(spelunkr) MCFG_VIDEO_START(spelunkr) - MCFG_VIDEO_UPDATE(spelunkr) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(spelunkr) MACHINE_CONFIG_END @@ -1120,7 +1126,8 @@ static MACHINE_CONFIG_DERIVED( spelunk2, ldrun ) MCFG_PALETTE_INIT(spelunk2) MCFG_VIDEO_START(spelunk2) - MCFG_VIDEO_UPDATE(spelunk2) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(spelunk2) MACHINE_CONFIG_END @@ -1135,10 +1142,10 @@ static MACHINE_CONFIG_DERIVED( youjyudn, ldrun ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(youjyudn) MCFG_GFXDECODE(youjyudn) MCFG_VIDEO_START(youjyudn) - MCFG_VIDEO_UPDATE(youjyudn) MACHINE_CONFIG_END @@ -1151,9 +1158,9 @@ static MACHINE_CONFIG_DERIVED( horizon, ldrun ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(horizon) MCFG_VIDEO_START(horizon) - MCFG_VIDEO_UPDATE(horizon) MACHINE_CONFIG_END diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 06c940db5ae..34e4eb6eb45 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -332,7 +332,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE( m63 ) +static SCREEN_UPDATE( m63 ) { m63_state *state = screen->machine->driver_data<m63_state>(); @@ -752,13 +752,13 @@ static MACHINE_CONFIG_START( m63, m63_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(m63) MCFG_GFXDECODE(m63) MCFG_PALETTE_LENGTH(256+4) MCFG_PALETTE_INIT(m63) MCFG_VIDEO_START(m63) - MCFG_VIDEO_UPDATE(m63) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") /* ????? */ @@ -797,13 +797,13 @@ static MACHINE_CONFIG_START( fghtbskt, m63_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(m63) MCFG_GFXDECODE(fghtbskt) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(m63) - MCFG_VIDEO_UPDATE(m63) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index 668a092082c..7b42046e26d 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -1869,9 +1869,9 @@ static MACHINE_CONFIG_START( m72_base, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(m72) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1926,9 +1926,9 @@ static MACHINE_CONFIG_START( rtype, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(m72) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1965,9 +1965,9 @@ static MACHINE_CONFIG_START( xmultipl, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(m72) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2008,9 +2008,9 @@ static MACHINE_CONFIG_START( xmultiplm72, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(m72) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2051,9 +2051,9 @@ static MACHINE_CONFIG_START( dbreed, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(hharry) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2094,9 +2094,9 @@ static MACHINE_CONFIG_START( dbreedm72, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(m72) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2137,9 +2137,9 @@ static MACHINE_CONFIG_START( rtype2, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(rtype2) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2180,9 +2180,9 @@ static MACHINE_CONFIG_START( majtitle, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(majtitle) MCFG_VIDEO_START(majtitle) - MCFG_VIDEO_UPDATE(majtitle) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2223,9 +2223,9 @@ static MACHINE_CONFIG_START( hharry, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(hharry) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2266,9 +2266,9 @@ static MACHINE_CONFIG_START( hharryu, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(rtype2) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2309,9 +2309,9 @@ static MACHINE_CONFIG_START( dkgenm72, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(m72) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2352,9 +2352,9 @@ static MACHINE_CONFIG_START( poundfor, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(poundfor) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2395,9 +2395,9 @@ static MACHINE_CONFIG_START( cosmccop, m72_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(m72) MCFG_VIDEO_START(poundfor) - MCFG_VIDEO_UPDATE(m72) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index 106274f6265..ba70fc5d2a0 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -80,7 +80,7 @@ static WRITE8_HANDLER( ramtek_videoram_w ) state->videoram[offset] = data & ~*state->mask; } -static VIDEO_UPDATE( ramtek ) +static SCREEN_UPDATE( ramtek ) { m79amb_state *state = screen->machine->driver_data<m79amb_state>(); offs_t offs; @@ -217,8 +217,7 @@ static MACHINE_CONFIG_START( m79amb, m79amb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1) - - MCFG_VIDEO_UPDATE(ramtek) + MCFG_SCREEN_UPDATE(ramtek) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c index b22c745a8d2..d26769332a2 100644 --- a/src/mame/drivers/m90.c +++ b/src/mame/drivers/m90.c @@ -718,12 +718,12 @@ static MACHINE_CONFIG_START( m90, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8, 47*8-1) + MCFG_SCREEN_UPDATE(m90) MCFG_GFXDECODE(m90) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(m90) - MCFG_VIDEO_UPDATE(m90) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -801,9 +801,9 @@ static MACHINE_CONFIG_DERIVED( bomblord, m90 ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1) + MCFG_SCREEN_UPDATE(bomblord) MCFG_VIDEO_START(bomblord) - MCFG_VIDEO_UPDATE(bomblord) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( dynablsb, m90 ) @@ -815,9 +815,9 @@ static MACHINE_CONFIG_DERIVED( dynablsb, m90 ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(dynablsb) MCFG_VIDEO_START(dynablsb) - MCFG_VIDEO_UPDATE(dynablsb) MACHINE_CONFIG_END /***************************************************************************/ diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index b0e8fb7adca..eb431cd03c0 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -952,12 +952,12 @@ static MACHINE_CONFIG_START( m92, m92_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(80, 511-112, 8, 247) /* 320 x 240 */ + MCFG_SCREEN_UPDATE(m92) MCFG_GFXDECODE(m92) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(m92) - MCFG_VIDEO_UPDATE(m92) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1037,12 +1037,12 @@ static MACHINE_CONFIG_START( ppan, m92_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(80, 511-112, 8, 247) /* 320 x 240 */ + MCFG_SCREEN_UPDATE(m92) MCFG_GFXDECODE(m92) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(m92) - MCFG_VIDEO_UPDATE(m92) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 95712534d6a..79a14fb6d64 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -645,13 +645,13 @@ static MACHINE_CONFIG_START( macrossp, macrossp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*16, 16*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 0*16, 15*16-1) + MCFG_SCREEN_UPDATE(macrossp) + MCFG_SCREEN_EOF(macrossp) MCFG_GFXDECODE(macrossp) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(macrossp) - MCFG_VIDEO_EOF(macrossp) - MCFG_VIDEO_UPDATE(macrossp) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 86ae70be228..2e7363bf356 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -474,12 +474,12 @@ static MACHINE_CONFIG_START( macs, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(128*8, 128*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 128*8-1, 0*8, 128*8-1) + MCFG_SCREEN_UPDATE(st0016) MCFG_GFXDECODE(macs) MCFG_PALETTE_LENGTH(16*16*4+1) MCFG_VIDEO_START(st0016) - MCFG_VIDEO_UPDATE(st0016) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index f2958f4f397..d5a7c0c9944 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -262,12 +262,12 @@ static MACHINE_CONFIG_START( madmotor, madmotor_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(madmotor) MCFG_GFXDECODE(madmotor) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(madmotor) - MCFG_VIDEO_UPDATE(madmotor) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 50d770a213e..b1bb3df620d 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -163,7 +163,7 @@ static VIDEO_START( magic10 ) tilemap_set_transparent_pen(layer2_tilemap, 0); } -static VIDEO_UPDATE( magic10 ) +static SCREEN_UPDATE( magic10 ) { /*TODO: understand where this comes from. */ tilemap_set_scrollx(layer2_tilemap, 0, layer2_offset[0]); @@ -707,12 +707,12 @@ static MACHINE_CONFIG_START( magic10, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(magic10) MCFG_PALETTE_LENGTH(0x100) MCFG_GFXDECODE(magic10) MCFG_VIDEO_START(magic10) - MCFG_VIDEO_UPDATE(magic10) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c index 18a9c7a9eb9..31e944db883 100644 --- a/src/mame/drivers/magicard.c +++ b/src/mame/drivers/magicard.c @@ -361,7 +361,7 @@ static VIDEO_START(magicard) } -static VIDEO_UPDATE(magicard) +static SCREEN_UPDATE(magicard) { int x,y; UINT32 count; @@ -634,11 +634,11 @@ static MACHINE_CONFIG_START( magicard, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1) //dynamic resolution,TODO + MCFG_SCREEN_UPDATE(magicard) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(magicard) - MCFG_VIDEO_UPDATE(magicard) MCFG_MACHINE_RESET(magicard) diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 1d5f59a3119..ffa68ec0ea6 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -482,7 +482,7 @@ static VIDEO_START( 7mezzo ) bg_tilemap = tilemap_create(machine, get_7mezzo_tile_info, tilemap_scan_rows, 8, 8, 32, 29); } -static VIDEO_UPDATE( magicfly ) +static SCREEN_UPDATE( magicfly ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -772,13 +772,13 @@ static MACHINE_CONFIG_START( magicfly, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((39+1)*8, (31+1)*8) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1). */ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 29*8-1) /* Taken from MC6845 init, registers 01 & 06. */ + MCFG_SCREEN_UPDATE(magicfly) MCFG_GFXDECODE(magicfly) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(magicfly) MCFG_VIDEO_START(magicfly) - MCFG_VIDEO_UPDATE(magicfly) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */ diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c index cf63071aae7..6629d15be8b 100644 --- a/src/mame/drivers/magictg.c +++ b/src/mame/drivers/magictg.c @@ -119,7 +119,7 @@ static VIDEO_START(magictg) } -static VIDEO_UPDATE(magictg) +static SCREEN_UPDATE(magictg) { return 0; } @@ -151,11 +151,11 @@ static MACHINE_CONFIG_START( magictg, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(1024, 1024) MCFG_SCREEN_VISIBLE_AREA(0, 511, 16, 447) + MCFG_SCREEN_UPDATE(magictg) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(magictg) - MCFG_VIDEO_UPDATE(magictg) MACHINE_CONFIG_END static INPUT_PORTS_START( magictg ) diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c index 3e4606dadfa..a00b5737e07 100644 --- a/src/mame/drivers/magmax.c +++ b/src/mame/drivers/magmax.c @@ -370,13 +370,13 @@ static MACHINE_CONFIG_START( magmax, magmax_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(magmax) MCFG_GFXDECODE(magmax) MCFG_PALETTE_LENGTH(1*16 + 16*16 + 256) MCFG_PALETTE_INIT(magmax) MCFG_VIDEO_START(magmax) - MCFG_VIDEO_UPDATE(magmax) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index 0f201d963b5..9f4e1fec218 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -462,11 +462,11 @@ static MACHINE_CONFIG_START( mainevt, mainevt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(mainevt) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(mainevt) - MCFG_VIDEO_UPDATE(mainevt) MCFG_K052109_ADD("k052109", mainevt_k052109_intf) MCFG_K051960_ADD("k051960", mainevt_k051960_intf) @@ -523,11 +523,11 @@ static MACHINE_CONFIG_START( devstors, mainevt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(dv) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(dv) - MCFG_VIDEO_UPDATE(dv) MCFG_K052109_ADD("k052109", dv_k052109_intf) MCFG_K051960_ADD("k051960", dv_k051960_intf) diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index a3e5e6f9ce3..0c1fd580fe2 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -408,14 +408,14 @@ static MACHINE_CONFIG_START( mainsnk, mainsnk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1) + MCFG_SCREEN_UPDATE(mainsnk) MCFG_GFXDECODE(mainsnk) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(mainsnk) MCFG_VIDEO_START(mainsnk) - MCFG_VIDEO_UPDATE(mainsnk) - + MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ay1", AY8910, 2000000) diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c index d66119826ec..e4365b936c8 100644 --- a/src/mame/drivers/malzak.c +++ b/src/mame/drivers/malzak.c @@ -412,6 +412,7 @@ static MACHINE_CONFIG_START( malzak, malzak_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(480, 512) /* vert size is a guess */ MCFG_SCREEN_VISIBLE_AREA(0, 479, 0, 479) + MCFG_SCREEN_UPDATE(malzak) MCFG_GFXDECODE(malzak) MCFG_PALETTE_LENGTH(128) @@ -421,7 +422,6 @@ static MACHINE_CONFIG_START( malzak, malzak_state ) MCFG_S2636_ADD("s2636_1", malzac_s2636_1_config) MCFG_SAA5050_ADD("saa5050", malzac_saa5050_intf) - MCFG_VIDEO_UPDATE(malzak) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index 98a548ce424..3161df8ea94 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -1628,10 +1628,10 @@ static MACHINE_CONFIG_START( superpac, mappy_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(superpac) MCFG_PALETTE_INIT(superpac) MCFG_VIDEO_START(superpac) - MCFG_VIDEO_UPDATE(superpac) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1701,10 +1701,10 @@ static MACHINE_CONFIG_START( phozon, mappy_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(phozon) MCFG_PALETTE_INIT(phozon) MCFG_VIDEO_START(phozon) - MCFG_VIDEO_UPDATE(phozon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1741,10 +1741,10 @@ static MACHINE_CONFIG_START( mappy, mappy_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(mappy) MCFG_PALETTE_INIT(mappy) MCFG_VIDEO_START(mappy) - MCFG_VIDEO_UPDATE(mappy) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c index 1f8a1cf0553..490f37d1a9f 100644 --- a/src/mame/drivers/marineb.c +++ b/src/mame/drivers/marineb.c @@ -549,13 +549,13 @@ static MACHINE_CONFIG_START( marineb, marineb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(marineb) MCFG_GFXDECODE(marineb) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(marineb) MCFG_VIDEO_START(marineb) - MCFG_VIDEO_UPDATE(marineb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -570,7 +570,8 @@ static MACHINE_CONFIG_DERIVED( changes, marineb ) /* video hardware */ MCFG_GFXDECODE(changes) - MCFG_VIDEO_UPDATE(changes) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(changes) MACHINE_CONFIG_END @@ -580,7 +581,8 @@ static MACHINE_CONFIG_DERIVED( springer, marineb ) MCFG_MACHINE_RESET(springer) /* video hardware */ - MCFG_VIDEO_UPDATE(springer) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(springer) MACHINE_CONFIG_END @@ -590,7 +592,8 @@ static MACHINE_CONFIG_DERIVED( hoccer, marineb ) /* video hardware */ MCFG_GFXDECODE(hoccer) - MCFG_VIDEO_UPDATE(hoccer) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(hoccer) MACHINE_CONFIG_END @@ -603,7 +606,8 @@ static MACHINE_CONFIG_DERIVED( wanted, marineb ) /* video hardware */ MCFG_GFXDECODE(wanted) - MCFG_VIDEO_UPDATE(springer) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(springer) /* sound hardware */ MCFG_SOUND_REPLACE("ay1", AY8910, 1500000) @@ -620,7 +624,8 @@ static MACHINE_CONFIG_DERIVED( hopprobo, marineb ) /* video hardware */ MCFG_GFXDECODE(hopprobo) - MCFG_VIDEO_UPDATE(hopprobo) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(hopprobo) MACHINE_CONFIG_END diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 177801cb177..13017407b15 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -492,7 +492,7 @@ static VIDEO_START( marinedt ) #define OBJ_FLIPX(a) ((state->pf & 0x02) == 0) #define OBJ_FLIPY(a) ((a) & 0x80) -static VIDEO_UPDATE( marinedt ) +static SCREEN_UPDATE( marinedt ) { marinedt_state *state = screen->machine->driver_data<marinedt_state>(); int sx, sy; @@ -661,13 +661,13 @@ static MACHINE_CONFIG_START( marinedt, marinedt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(4*8+32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1) + MCFG_SCREEN_UPDATE(marinedt) MCFG_GFXDECODE(marinedt) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(marinedt) MCFG_VIDEO_START(marinedt) - MCFG_VIDEO_UPDATE(marinedt) /* sound hardware */ //discrete sound diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c index f219cdbcac5..4b346e71b57 100644 --- a/src/mame/drivers/mario.c +++ b/src/mame/drivers/mario.c @@ -332,12 +332,12 @@ static MACHINE_CONFIG_START( mario_base, mario_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(mario) MCFG_GFXDECODE(mario) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(mario) MCFG_VIDEO_START(mario) - MCFG_VIDEO_UPDATE(mario) MACHINE_CONFIG_END diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c index 53e97e70adc..4886778d62a 100644 --- a/src/mame/drivers/markham.c +++ b/src/mame/drivers/markham.c @@ -192,13 +192,13 @@ static MACHINE_CONFIG_START( markham, markham_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(markham) MCFG_GFXDECODE(markham) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(markham) MCFG_VIDEO_START(markham) - MCFG_VIDEO_UPDATE(markham) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index 36917f21654..a2dc57ece23 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -475,7 +475,7 @@ static VIDEO_START(mastboy) gfx_element_set_source(machine->gfx[0], mastboy_vram); } -static VIDEO_UPDATE(mastboy) +static SCREEN_UPDATE(mastboy) { int y,x,i; int count = 0x000; @@ -886,12 +886,12 @@ static MACHINE_CONFIG_START( mastboy, mastboy_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(mastboy) MCFG_GFXDECODE(mastboy) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(mastboy) - MCFG_VIDEO_UPDATE(mastboy) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index a3184195c26..708dba7a490 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -330,13 +330,13 @@ static MACHINE_CONFIG_START( matmania, matmania_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(matmania) MCFG_GFXDECODE(matmania) MCFG_PALETTE_LENGTH(64+16) MCFG_PALETTE_INIT(matmania) MCFG_VIDEO_START(matmania) - MCFG_VIDEO_UPDATE(matmania) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -432,13 +432,13 @@ static MACHINE_CONFIG_START( maniach, matmania_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(maniach) MCFG_GFXDECODE(maniach) MCFG_PALETTE_LENGTH(64+16) MCFG_PALETTE_INIT(matmania) MCFG_VIDEO_START(matmania) - MCFG_VIDEO_UPDATE(maniach) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c index 22e807e9b8a..f594f3bbef7 100644 --- a/src/mame/drivers/maxaflex.c +++ b/src/mame/drivers/maxaflex.c @@ -387,13 +387,13 @@ static MACHINE_CONFIG_START( a600xl, maxaflex_state ) MCFG_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y) MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ) MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ) + MCFG_SCREEN_UPDATE(atari) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(atari) MCFG_DEFAULT_LAYOUT(layout_maxaflex) MCFG_VIDEO_START(atari) - MCFG_VIDEO_UPDATE(atari) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index ecd040072a2..f638f73311a 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -280,7 +280,7 @@ static VIDEO_START( maygayv1 ) } -static VIDEO_UPDATE( maygayv1 ) +static SCREEN_UPDATE( maygayv1 ) { maygayv1_state *state = screen->machine->driver_data<maygayv1_state>(); i82716_t &i82716 = state->i82716; @@ -411,7 +411,7 @@ static VIDEO_UPDATE( maygayv1 ) return 0; } -static VIDEO_EOF( maygayv1 ) +static SCREEN_EOF( maygayv1 ) { maygayv1_state *state = machine->driver_data<maygayv1_state>(); i82716_t &i82716 = state->i82716; @@ -1047,14 +1047,14 @@ static MACHINE_CONFIG_START( maygayv1, maygayv1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 300) MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 300 - 1) + MCFG_SCREEN_UPDATE(maygayv1) + MCFG_SCREEN_EOF(maygayv1) MCFG_PALETTE_LENGTH(16) MCFG_DUART68681_ADD("duart68681", DUART_CLOCK, maygayv1_duart68681_config) MCFG_VIDEO_START(maygayv1) - MCFG_VIDEO_UPDATE(maygayv1) - MCFG_VIDEO_EOF(maygayv1) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index ded8f7e3b6f..91c9c140285 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -61,7 +61,7 @@ static WRITE8_HANDLER( mayumi_videoram_w ) tilemap_mark_tile_dirty(state->tilemap, offset & 0x7ff); } -static VIDEO_UPDATE( mayumi ) +static SCREEN_UPDATE( mayumi ) { mayumi_state *state = screen->machine->driver_data<mayumi_state>(); tilemap_draw(bitmap, cliprect, state->tilemap, 0, 0); @@ -385,13 +385,13 @@ static MACHINE_CONFIG_START( mayumi, mayumi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 62*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mayumi) MCFG_GFXDECODE(mayumi) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(mayumi) - MCFG_VIDEO_UPDATE(mayumi) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 5247b0caea3..a5b90bb2bc6 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -150,7 +150,7 @@ static int dbg_lookup = 4; //4= off static int planes_enabled[4] = {1,1,1,1}; //all enabled -VIDEO_UPDATE( test_vcu ) +SCREEN_UPDATE( test_vcu ) { mazerbla_state *state = screen->machine->driver_data<mazerbla_state>(); char buf[128]; @@ -248,7 +248,7 @@ VIDEO_UPDATE( test_vcu ) #endif -static VIDEO_UPDATE( mazerbla ) +static SCREEN_UPDATE( mazerbla ) { mazerbla_state *state = screen->machine->driver_data<mazerbla_state>(); UINT32 color_base = 0; @@ -1505,12 +1505,12 @@ static MACHINE_CONFIG_START( mazerbla, mazerbla_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(mazerbla) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(mazerbla) MCFG_VIDEO_START(mazerbla) - MCFG_VIDEO_UPDATE(mazerbla) /* sound hardware */ MACHINE_CONFIG_END @@ -1546,12 +1546,12 @@ static MACHINE_CONFIG_START( greatgun, mazerbla_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(mazerbla) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(mazerbla) MCFG_VIDEO_START(mazerbla) - MCFG_VIDEO_UPDATE(mazerbla) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index cbabb1f124f..85e735fa8bf 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -461,6 +461,8 @@ static MACHINE_CONFIG_START( mcatadv, mcatadv_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(mcatadv) + MCFG_SCREEN_EOF(mcatadv) // Buffer Spriteram MCFG_GFXDECODE(mcatadv) MCFG_PALETTE_LENGTH(0x2000/2) @@ -468,8 +470,6 @@ static MACHINE_CONFIG_START( mcatadv, mcatadv_state ) MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */ MCFG_VIDEO_START(mcatadv) - MCFG_VIDEO_EOF(mcatadv) // Buffer Spriteram - MCFG_VIDEO_UPDATE(mcatadv) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index ce673d72671..84d7ce341ef 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -1592,12 +1592,12 @@ static MACHINE_CONFIG_START( mcr_90009, mcr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 30*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 0*16, 30*16-1) + MCFG_SCREEN_UPDATE(mcr) MCFG_GFXDECODE(mcr) MCFG_PALETTE_LENGTH(32) MCFG_VIDEO_START(mcr) - MCFG_VIDEO_UPDATE(mcr) /* sound hardware */ MCFG_FRAGMENT_ADD(mcr_ssio) diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c index 6ab4aa80227..d2c54eb5784 100644 --- a/src/mame/drivers/mcr3.c +++ b/src/mame/drivers/mcr3.c @@ -1097,12 +1097,12 @@ static MACHINE_CONFIG_START( mcr3_base, mcr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 30*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 0*16, 30*16-1) + MCFG_SCREEN_UPDATE(mcr) MCFG_GFXDECODE(mcr3) MCFG_PALETTE_LENGTH(64) MCFG_VIDEO_START(mcr) - MCFG_VIDEO_UPDATE(mcr) MACHINE_CONFIG_END @@ -1120,7 +1120,8 @@ static MACHINE_CONFIG_DERIVED( mcrmono, mcr3_base ) /* video hardware */ MCFG_VIDEO_START(mcrmono) - MCFG_VIDEO_UPDATE(mcr3) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(mcr3) MACHINE_CONFIG_END @@ -1157,12 +1158,12 @@ static MACHINE_CONFIG_DERIVED( mcrscroll, mcr3_base ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(30*16, 30*16) MCFG_SCREEN_VISIBLE_AREA(0, 30*16-1, 0, 30*16-1) + MCFG_SCREEN_UPDATE(spyhunt) MCFG_GFXDECODE(spyhunt) MCFG_PALETTE_LENGTH(64+4) MCFG_PALETTE_INIT(spyhunt) MCFG_VIDEO_START(spyhunt) - MCFG_VIDEO_UPDATE(spyhunt) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c index 5ba891f135f..82e8833a842 100644 --- a/src/mame/drivers/mcr68.c +++ b/src/mame/drivers/mcr68.c @@ -990,13 +990,13 @@ static MACHINE_CONFIG_START( zwackery, mcr68_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 30*16) MCFG_SCREEN_VISIBLE_AREA(0, 32*16-1, 0, 30*16-1) + MCFG_SCREEN_UPDATE(zwackery) MCFG_GFXDECODE(zwackery) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(zwackery) - MCFG_VIDEO_UPDATE(zwackery) - + /* sound hardware */ MCFG_FRAGMENT_ADD(chip_squeak_deluxe) MACHINE_CONFIG_END @@ -1020,12 +1020,12 @@ static MACHINE_CONFIG_START( mcr68, mcr68_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 30*16) MCFG_SCREEN_VISIBLE_AREA(0, 32*16-1, 0, 30*16-1) + MCFG_SCREEN_UPDATE(mcr68) MCFG_GFXDECODE(mcr68) MCFG_PALETTE_LENGTH(64) MCFG_VIDEO_START(mcr68) - MCFG_VIDEO_UPDATE(mcr68) /* sound hardware -- determined by specific machine */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c index 1e1c7ef36cf..bb8704ebea7 100644 --- a/src/mame/drivers/meadows.c +++ b/src/mame/drivers/meadows.c @@ -662,13 +662,13 @@ static MACHINE_CONFIG_START( meadows, meadows_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 30*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(meadows) MCFG_GFXDECODE(meadows) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(meadows) MCFG_VIDEO_START(meadows) - MCFG_VIDEO_UPDATE(meadows) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -696,13 +696,13 @@ static MACHINE_CONFIG_START( minferno, meadows_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 24*8-1) + MCFG_SCREEN_UPDATE(meadows) MCFG_GFXDECODE(minferno) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(meadows) MCFG_VIDEO_START(meadows) - MCFG_VIDEO_UPDATE(meadows) /* audio hardware */ MACHINE_CONFIG_END @@ -726,13 +726,13 @@ static MACHINE_CONFIG_START( bowl3d, meadows_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 30*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(meadows) MCFG_GFXDECODE(meadows) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(meadows) MCFG_VIDEO_START(meadows) - MCFG_VIDEO_UPDATE(meadows) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 4d5b95fd064..e36176a669b 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -343,7 +343,7 @@ static void draw_cga(running_machine *machine, bitmap_t *bitmap, const rectangle } } -static VIDEO_UPDATE(mediagx) +static SCREEN_UPDATE(mediagx) { mediagx_state *state = screen->machine->driver_data<mediagx_state>(); bitmap_fill(bitmap, cliprect, 0); @@ -1133,12 +1133,12 @@ static MACHINE_CONFIG_START( mediagx, mediagx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) + MCFG_SCREEN_UPDATE(mediagx) MCFG_GFXDECODE(CGA) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(mediagx) - MCFG_VIDEO_UPDATE(mediagx) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 917e79ee327..914cc5f3ecc 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -618,17 +618,17 @@ static VIDEO_START(megplay) // VIDEO_START_CALL(megaplay_normal); } -static VIDEO_UPDATE(megplay) +static SCREEN_UPDATE(megplay) { //printf("megplay vu\n"); - VIDEO_UPDATE_CALL(megadriv); -// VIDEO_UPDATE_CALL(megaplay_normal); - VIDEO_UPDATE_CALL(megaplay_bios); + SCREEN_UPDATE_CALL(megadriv); +// SCREEN_UPDATE_CALL(megaplay_normal); + SCREEN_UPDATE_CALL(megaplay_bios); return 0; } -//extern VIDEO_EOF(megadriv); +//extern SCREEN_EOF(megadriv); static MACHINE_RESET( megaplay ) { mplay_state *state = machine->driver_data<mplay_state>(); @@ -639,10 +639,10 @@ static MACHINE_RESET( megaplay ) MACHINE_RESET_CALL(megatech_bios); } -static VIDEO_EOF( megaplay ) +static SCREEN_EOF( megaplay ) { - VIDEO_EOF_CALL(megadriv); - VIDEO_EOF_CALL(megatech_bios); + SCREEN_EOF_CALL(megadriv); + SCREEN_EOF_CALL(megatech_bios); } static MACHINE_CONFIG_START( megaplay, mplay_state ) @@ -657,7 +657,6 @@ static MACHINE_CONFIG_START( megaplay, mplay_state ) //MCFG_CPU_VBLANK_INT_HACK(megaplay_bios_irq, 262) MCFG_MACHINE_RESET( megaplay ) - MCFG_VIDEO_EOF( megaplay ) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -667,7 +666,9 @@ static MACHINE_CONFIG_START( megaplay, mplay_state ) /* New update functions to handle the extra layer */ MCFG_VIDEO_START(megplay) - MCFG_VIDEO_UPDATE(megplay) + MCFG_SCREEN_MODIFY("megadriv") + MCFG_SCREEN_UPDATE(megplay) + MCFG_SCREEN_EOF( megaplay ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 905a4db59e2..c267973f67c 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -1475,14 +1475,14 @@ static MACHINE_CONFIG_START( system_A, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(megasys1) + MCFG_SCREEN_EOF(megasys1) MCFG_GFXDECODE(ABC) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(megasys1) MCFG_VIDEO_START(megasys1) - MCFG_VIDEO_UPDATE(megasys1) - MCFG_VIDEO_EOF(megasys1) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1535,14 +1535,14 @@ static MACHINE_CONFIG_START( system_Bbl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(megasys1) + MCFG_SCREEN_EOF(megasys1) MCFG_GFXDECODE(ABC) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(megasys1) MCFG_VIDEO_START(megasys1) - MCFG_VIDEO_UPDATE(megasys1) - MCFG_VIDEO_EOF(megasys1) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1607,14 +1607,14 @@ static MACHINE_CONFIG_START( system_D, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(megasys1) + MCFG_SCREEN_EOF(megasys1) MCFG_GFXDECODE(ABC) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(megasys1) MCFG_VIDEO_START(megasys1) - MCFG_VIDEO_UPDATE(megasys1) - MCFG_VIDEO_EOF(megasys1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1671,12 +1671,12 @@ static MACHINE_CONFIG_START( system_Z, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(megasys1) MCFG_GFXDECODE(Z) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(megasys1) - MCFG_VIDEO_UPDATE(megasys1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 2e9481b1645..58e62a05398 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -442,7 +442,7 @@ static VIDEO_START(mtnew) } //attotime::never -static VIDEO_UPDATE(mtnew) +static SCREEN_UPDATE(mtnew) { mtech_state *state = screen->machine->driver_data<mtech_state>(); device_t *megadriv_screen = screen->machine->device("megadriv"); @@ -452,24 +452,24 @@ static VIDEO_UPDATE(mtnew) { /* if we're running an sms game then use the SMS update.. maybe this should be moved to the megadrive emulation core as compatibility mode is a feature of the chip */ if (!state->current_game_is_sms) - VIDEO_UPDATE_CALL(megadriv); + SCREEN_UPDATE_CALL(megadriv); else - VIDEO_UPDATE_CALL(megatech_md_sms); + SCREEN_UPDATE_CALL(megatech_md_sms); } else if (screen == menu_screen) - VIDEO_UPDATE_CALL(megatech_bios); + SCREEN_UPDATE_CALL(megatech_bios); return 0; } -static VIDEO_EOF(mtnew) +static SCREEN_EOF(mtnew) { mtech_state *state = machine->driver_data<mtech_state>(); if (!state->current_game_is_sms) - VIDEO_EOF_CALL(megadriv); + SCREEN_EOF_CALL(megadriv); else - VIDEO_EOF_CALL(megatech_md_sms); + SCREEN_EOF_CALL(megatech_md_sms); - VIDEO_EOF_CALL(megatech_bios); + SCREEN_EOF_CALL(megatech_bios); } static MACHINE_RESET(mtnew) @@ -495,8 +495,6 @@ static MACHINE_CONFIG_START( megatech, mtech_state ) MCFG_MACHINE_RESET(mtnew) MCFG_VIDEO_START(mtnew) - MCFG_VIDEO_UPDATE(mtnew) - MCFG_VIDEO_EOF(mtnew) MCFG_DEFAULT_LAYOUT(layout_dualhovu) @@ -505,6 +503,8 @@ static MACHINE_CONFIG_START( megatech, mtech_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(342,262) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1) + MCFG_SCREEN_UPDATE(mtnew) + MCFG_SCREEN_EOF(mtnew) /* sound hardware */ MCFG_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15) diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index 1d7e0ad85a8..d21d7dcb7fa 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -271,13 +271,13 @@ static MACHINE_CONFIG_START( megazone, megazone_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(megazone) MCFG_GFXDECODE(megazone) MCFG_PALETTE_LENGTH(16*16+16*16) MCFG_PALETTE_INIT(megazone) MCFG_VIDEO_START(megazone) - MCFG_VIDEO_UPDATE(megazone) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index 6c525255669..202d233fdfa 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -277,7 +277,7 @@ static PALETTE_INIT( meijinsn ) } -static VIDEO_UPDATE(meijinsn) +static SCREEN_UPDATE(meijinsn) { meijinsn_state *state = screen->machine->driver_data<meijinsn_state>(); int offs; @@ -359,12 +359,12 @@ static MACHINE_CONFIG_START( meijinsn, meijinsn_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12, 243, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(meijinsn) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(meijinsn) MCFG_VIDEO_START(meijinsn) - MCFG_VIDEO_UPDATE(meijinsn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index 5c5757f8aea..79739820036 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -1153,7 +1153,7 @@ static INPUT_PORTS_START( couplep ) INPUT_PORTS_END -static VIDEO_UPDATE( merit ) +static SCREEN_UPDATE( merit ) { device_t *mc6845 = screen->machine->device("crtc"); mc6845_update(mc6845, bitmap, cliprect); @@ -1238,10 +1238,10 @@ static MACHINE_CONFIG_START( pitboss, merit_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 512, 0, 512, 256, 0, 256) /* temporary, CRTC will configure screen */ + MCFG_SCREEN_UPDATE(merit) MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) - MCFG_VIDEO_UPDATE(merit) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 97080339380..e7195a4570a 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -362,7 +362,7 @@ static VIDEO_START( meritm ) } -static VIDEO_UPDATE( meritm ) +static SCREEN_UPDATE( meritm ) { meritm_state *state = screen->machine->driver_data<meritm_state>(); if(input_code_pressed_once(screen->machine, KEYCODE_Q)) @@ -1093,12 +1093,12 @@ static MACHINE_CONFIG_START( meritm_crt250, meritm_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS) MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1) + MCFG_SCREEN_UPDATE(meritm) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT( v9938 ) MCFG_VIDEO_START(meritm) - MCFG_VIDEO_UPDATE(meritm) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c index 68ee245cdb0..7ca0c619464 100644 --- a/src/mame/drivers/mermaid.c +++ b/src/mame/drivers/mermaid.c @@ -456,14 +456,14 @@ static MACHINE_CONFIG_START( mermaid, mermaid_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mermaid) + MCFG_SCREEN_EOF(mermaid) MCFG_GFXDECODE(mermaid) MCFG_PALETTE_LENGTH(4*16+2*2) MCFG_PALETTE_INIT(mermaid) MCFG_VIDEO_START(mermaid) - MCFG_VIDEO_UPDATE(mermaid) - MCFG_VIDEO_EOF(mermaid) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c index c01030f2df8..a95e30d8b0a 100644 --- a/src/mame/drivers/metalmx.c +++ b/src/mame/drivers/metalmx.c @@ -278,7 +278,7 @@ static VIDEO_START( metalmx ) } -static VIDEO_UPDATE( metalmx ) +static SCREEN_UPDATE( metalmx ) { /* TODO: TMS34020 should take care of this */ metalmx_state *state = screen->machine->driver_data<metalmx_state>(); @@ -766,12 +766,12 @@ static MACHINE_CONFIG_START( metalmx, metalmx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(metalmx) MCFG_PALETTE_LENGTH(65536) MCFG_PALETTE_INIT(RRRRR_GGGGGG_BBBBB) MCFG_VIDEO_START(metalmx) - MCFG_VIDEO_UPDATE(metalmx) MCFG_FRAGMENT_ADD(cage) MACHINE_CONFIG_END diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index 4f6137385ed..92e989be465 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -316,12 +316,12 @@ static MACHINE_CONFIG_START( metlclsh, metlclsh_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 30*8-1) + MCFG_SCREEN_UPDATE(metlclsh) MCFG_GFXDECODE(metlclsh) MCFG_PALETTE_LENGTH(3 * 16) MCFG_VIDEO_START(metlclsh) - MCFG_VIDEO_UPDATE(metlclsh) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 0897dc42fcf..fd94c6607cf 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -3626,12 +3626,12 @@ static MACHINE_CONFIG_START( balcube, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14220) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3660,12 +3660,12 @@ static MACHINE_CONFIG_START( daitoa, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14220) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3694,12 +3694,12 @@ static MACHINE_CONFIG_START( msgogo, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14220) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3728,12 +3728,12 @@ static MACHINE_CONFIG_START( bangball, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14220) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3762,12 +3762,12 @@ static MACHINE_CONFIG_START( batlbubl, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14220) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3800,12 +3800,12 @@ static MACHINE_CONFIG_START( daitorid, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14220) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3843,12 +3843,12 @@ static MACHINE_CONFIG_START( dharma, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3885,12 +3885,12 @@ static MACHINE_CONFIG_START( karatour, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3927,12 +3927,12 @@ static MACHINE_CONFIG_START( 3kokushi, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14220) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14220) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3969,12 +3969,12 @@ static MACHINE_CONFIG_START( lastfort, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(360, 224) MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4010,12 +4010,12 @@ static MACHINE_CONFIG_START( lastforg, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(360, 224) MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4046,12 +4046,12 @@ static MACHINE_CONFIG_START( dokyusei, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256-32) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14300) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14300) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4083,12 +4083,12 @@ static MACHINE_CONFIG_START( dokyusp, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 256-32) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 256-32-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14300) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14300) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4121,12 +4121,12 @@ static MACHINE_CONFIG_START( gakusai, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14300) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14300) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4159,12 +4159,12 @@ static MACHINE_CONFIG_START( gakusai2, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14300) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14300) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4201,12 +4201,12 @@ static MACHINE_CONFIG_START( pangpoms, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(360, 224) MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4243,12 +4243,12 @@ static MACHINE_CONFIG_START( poitto, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(360, 224) MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4286,12 +4286,12 @@ static MACHINE_CONFIG_START( pururun, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4329,12 +4329,12 @@ static MACHINE_CONFIG_START( skyalert, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(360, 224) MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4371,12 +4371,12 @@ static MACHINE_CONFIG_START( toride2g, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14100) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14100) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4408,12 +4408,12 @@ static MACHINE_CONFIG_START( mouja, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14300) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14300) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4453,12 +4453,12 @@ static MACHINE_CONFIG_START( blzntrnd, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(8, 320-8-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(blzntrnd) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(blzntrnd) - MCFG_VIDEO_UPDATE(metro) MCFG_K053936_ADD("k053936", blzntrnd_k053936_intf) @@ -4501,12 +4501,12 @@ static MACHINE_CONFIG_START( gstrik2, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(8, 320-8-1, 0, 224-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(gstrik2) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(gstrik2) - MCFG_VIDEO_UPDATE(metro) MCFG_K053936_ADD("k053936", gstrik2_k053936_intf) @@ -4573,12 +4573,12 @@ static MACHINE_CONFIG_START( puzzlet, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256-32) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1) + MCFG_SCREEN_UPDATE(metro) MCFG_GFXDECODE(14300) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(metro_14300) - MCFG_VIDEO_UPDATE(metro) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index e43d0bc160f..19cce3498dc 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -501,12 +501,12 @@ static MACHINE_CONFIG_START( mexico86, mexico86_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mexico86) MCFG_GFXDECODE(mexico86) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) - MCFG_VIDEO_UPDATE(mexico86) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -527,7 +527,8 @@ static MACHINE_CONFIG_DERIVED( knightb, mexico86 ) MCFG_DEVICE_REMOVE("sub") /* video hardware */ - MCFG_VIDEO_UPDATE(kikikai) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(kikikai) MACHINE_CONFIG_END @@ -541,7 +542,8 @@ static MACHINE_CONFIG_DERIVED( kikikai, knightb ) MCFG_DEVICE_REMOVE("mcu") // we don't have code for the MC6801U4 /* video hardware */ - MCFG_VIDEO_UPDATE(kikikai) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(kikikai) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 3e6a4c600c3..58ef6239706 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -54,7 +54,7 @@ static VIDEO_START( mgolf ) } -static VIDEO_UPDATE( mgolf ) +static SCREEN_UPDATE( mgolf ) { mgolf_state *state = screen->machine->driver_data<mgolf_state>(); int i; @@ -334,13 +334,13 @@ static MACHINE_CONFIG_START( mgolf, mgolf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 262) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 223) + MCFG_SCREEN_UPDATE(mgolf) MCFG_GFXDECODE(mgolf) MCFG_PALETTE_LENGTH(4) MCFG_PALETTE_INIT(mgolf) MCFG_VIDEO_START(mgolf) - MCFG_VIDEO_UPDATE(mgolf) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c index 16c6b2450b2..cdaded7a805 100644 --- a/src/mame/drivers/mhavoc.c +++ b/src/mame/drivers/mhavoc.c @@ -492,9 +492,9 @@ static MACHINE_CONFIG_START( mhavoc, mhavoc_state ) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 300, 0, 260) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(avg_mhavoc) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index 604445c4e3a..9cbde3c04d8 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -360,10 +360,10 @@ static MACHINE_CONFIG_START( micro3d, micro3d_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/8*4, 192*4, 0, 144*4, 434, 0, 400) + MCFG_SCREEN_UPDATE(tms340x0) MCFG_VIDEO_START(micro3d) MCFG_VIDEO_RESET(micro3d) - MCFG_VIDEO_UPDATE(tms340x0) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index c75c8602689..57a9db212b7 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -59,7 +59,7 @@ static UINT16 *midas_gfxram, *midas_gfxregs; static VIDEO_START( midas ); -static VIDEO_UPDATE( midas ); +static SCREEN_UPDATE( midas ); static tilemap_t *tmap; @@ -162,7 +162,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -static VIDEO_UPDATE( midas ) +static SCREEN_UPDATE( midas ) { int layers_ctrl = -1; @@ -687,12 +687,12 @@ static MACHINE_CONFIG_START( livequiz, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(midas) MCFG_GFXDECODE(midas) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(midas) - MCFG_VIDEO_UPDATE(midas) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -722,12 +722,12 @@ static MACHINE_CONFIG_START( hammer, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(midas) MCFG_GFXDECODE(midas) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(midas) - MCFG_VIDEO_UPDATE(midas) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c index 11aa2102eba..b2688aeb0aa 100644 --- a/src/mame/drivers/midqslvr.c +++ b/src/mame/drivers/midqslvr.c @@ -27,7 +27,7 @@ static VIDEO_START(midqslvr) { } -static VIDEO_UPDATE(midqslvr) +static SCREEN_UPDATE(midqslvr) { return 0; } @@ -55,10 +55,10 @@ static MACHINE_CONFIG_START( midqslvr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199) + MCFG_SCREEN_UPDATE(midqslvr) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(midqslvr) - MCFG_VIDEO_UPDATE(midqslvr) MACHINE_CONFIG_END ROM_START( offrthnd ) diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c index 060e9bf92cf..81dd7bccfac 100644 --- a/src/mame/drivers/midtunit.c +++ b/src/mame/drivers/midtunit.c @@ -618,9 +618,9 @@ static MACHINE_CONFIG_START( tunit_core, midtunit_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK * 2, 505, 0, 399, 289, 0, 253) + MCFG_SCREEN_UPDATE(tms340x0) MCFG_VIDEO_START(midtunit) - MCFG_VIDEO_UPDATE(tms340x0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c index 9d507bb1238..1ef3e22dfc5 100644 --- a/src/mame/drivers/midvunit.c +++ b/src/mame/drivers/midvunit.c @@ -1034,9 +1034,9 @@ static MACHINE_CONFIG_START( midvcommon, midvunit_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MIDVUNIT_VIDEO_CLOCK/2, 666, 0, 512, 432, 0, 400) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(midvunit) MCFG_VIDEO_START(midvunit) - MCFG_VIDEO_UPDATE(midvunit) MACHINE_CONFIG_END diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c index 59e2002a5fb..4d6ceb86da9 100644 --- a/src/mame/drivers/midwunit.c +++ b/src/mame/drivers/midwunit.c @@ -648,9 +648,9 @@ static MACHINE_CONFIG_START( wunit, midwxunit_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 505, 0, 399, 289, 0, 253) + MCFG_SCREEN_UPDATE(tms340x0) MCFG_VIDEO_START(midwunit) - MCFG_VIDEO_UPDATE(tms340x0) /* sound hardware */ MCFG_FRAGMENT_ADD(dcs_audio_8k) diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c index 42cfab6009b..093b131691a 100644 --- a/src/mame/drivers/midxunit.c +++ b/src/mame/drivers/midxunit.c @@ -273,9 +273,8 @@ static MACHINE_CONFIG_START( midxunit, midwxunit_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 505, 0, 399, 289, 0, 253) - + MCFG_SCREEN_UPDATE(tms340x0) MCFG_VIDEO_START(midxunit) - MCFG_VIDEO_UPDATE(tms340x0) /* sound hardware */ MCFG_FRAGMENT_ADD(dcs_audio_2k_uart) diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c index a0f7a85c495..62080f33e83 100644 --- a/src/mame/drivers/midyunit.c +++ b/src/mame/drivers/midyunit.c @@ -1013,9 +1013,9 @@ static MACHINE_CONFIG_START( zunit, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MEDRES_PIXEL_CLOCK*2, 673, 0, 511, 433, 0, 399) + MCFG_SCREEN_UPDATE(tms340x0) MCFG_VIDEO_START(midzunit) - MCFG_VIDEO_UPDATE(tms340x0) /* sound hardware */ MCFG_FRAGMENT_ADD(williams_narc_sound) @@ -1046,8 +1046,7 @@ static MACHINE_CONFIG_START( yunit_core, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(STDRES_PIXEL_CLOCK*2, 505, 0, 399, 289, 0, 253) - - MCFG_VIDEO_UPDATE(tms340x0) + MCFG_SCREEN_UPDATE(tms340x0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c index c1faf2251d2..ea6260af050 100644 --- a/src/mame/drivers/midzeus.c +++ b/src/mame/drivers/midzeus.c @@ -1109,9 +1109,9 @@ static MACHINE_CONFIG_START( midzeus, midzeus_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MIDZEUS_VIDEO_CLOCK/8, 529, 0, 400, 278, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(midzeus) MCFG_VIDEO_START(midzeus) - MCFG_VIDEO_UPDATE(midzeus) /* sound hardware */ MCFG_FRAGMENT_ADD(dcs2_audio_2104) @@ -1148,9 +1148,9 @@ static MACHINE_CONFIG_START( midzeus2, midzeus_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MIDZEUS_VIDEO_CLOCK/4, 666, 0, 512, 438, 0, 400) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) + MCFG_SCREEN_UPDATE(midzeus2) MCFG_VIDEO_START(midzeus2) - MCFG_VIDEO_UPDATE(midzeus2) /* sound hardware */ MCFG_FRAGMENT_ADD(dcs2_audio_2104) diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c index 0d6623945b5..0f95b38ab50 100644 --- a/src/mame/drivers/mikie.c +++ b/src/mame/drivers/mikie.c @@ -264,13 +264,13 @@ static MACHINE_CONFIG_START( mikie, mikie_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mikie) MCFG_GFXDECODE(mikie) MCFG_PALETTE_LENGTH(16*8*16+16*8*16) MCFG_PALETTE_INIT(mikie) MCFG_VIDEO_START(mikie) - MCFG_VIDEO_UPDATE(mikie) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index 9b288d4ffb7..4d1c81074c7 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -158,7 +158,7 @@ static VIDEO_START(mil4000) tilemap_set_transparent_pen(sc3_tilemap,0); } -static VIDEO_UPDATE(mil4000) +static SCREEN_UPDATE(mil4000) { tilemap_draw(bitmap,cliprect,sc0_tilemap,0,0); tilemap_draw(bitmap,cliprect,sc1_tilemap,0,0); @@ -351,13 +351,13 @@ static MACHINE_CONFIG_START( mil4000, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) + MCFG_SCREEN_UPDATE(mil4000) MCFG_PALETTE_LENGTH(0x800) MCFG_PALETTE_INIT(all_black) MCFG_GFXDECODE(mil4000) MCFG_VIDEO_START(mil4000) - MCFG_VIDEO_UPDATE(mil4000) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // frequency from 1000 kHz resonator. pin 7 high not verified. diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index 9a21d38e6f7..91ec798d38a 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -196,7 +196,7 @@ static VIDEO_START( miniboy7 ) bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 37, 37); } -static VIDEO_UPDATE( miniboy7 ) +static SCREEN_UPDATE( miniboy7 ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -446,13 +446,13 @@ static MACHINE_CONFIG_START( miniboy7, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((47+1)*8, (39+1)*8) /* Taken from MC6845, registers 00 & 04. Normally programmed with (value-1) */ MCFG_SCREEN_VISIBLE_AREA(0*8, 37*8-1, 0*8, 37*8-1) /* Taken from MC6845, registers 01 & 06 */ + MCFG_SCREEN_UPDATE(miniboy7) MCFG_GFXDECODE(miniboy7) MCFG_PALETTE_INIT(miniboy7) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(miniboy7) - MCFG_VIDEO_UPDATE(miniboy7) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/12, mc6845_intf) /* guess */ diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c index 2334432e706..394d9b5cb1f 100644 --- a/src/mame/drivers/minivadr.c +++ b/src/mame/drivers/minivadr.c @@ -31,7 +31,7 @@ public: * *************************************/ -static VIDEO_UPDATE( minivadr ) +static SCREEN_UPDATE( minivadr ) { minivadr_state *state = screen->machine->driver_data<minivadr_state>(); offs_t offs; @@ -92,8 +92,7 @@ static MACHINE_CONFIG_START( minivadr, minivadr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) - - MCFG_VIDEO_UPDATE(minivadr) + MCFG_SCREEN_UPDATE(minivadr) /* the board has no sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index c490797e822..10d5c86a962 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -140,7 +140,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE( mirage ) +static SCREEN_UPDATE( mirage ) { mirage_state *state = screen->machine->driver_data<mirage_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); @@ -158,7 +158,7 @@ static VIDEO_UPDATE( mirage ) return 0; } -static VIDEO_EOF( mirage ) +static SCREEN_EOF( mirage ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram16_w(space,0,0,0xffff); @@ -399,13 +399,12 @@ static MACHINE_CONFIG_START( mirage, mirage_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(mirage) + MCFG_SCREEN_EOF(mirage) MCFG_GFXDECODE(mirage) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_UPDATE(mirage) - MCFG_VIDEO_EOF(mirage) - MCFG_DECO16IC_ADD("deco_custom", mirage_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index f2d2a42a5c0..f18f2d0fc29 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -110,7 +110,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -static VIDEO_UPDATE(mirax) +static SCREEN_UPDATE(mirax) { const gfx_element *gfx = screen->machine->gfx[0]; int count = 0x00000; @@ -392,12 +392,12 @@ static MACHINE_CONFIG_START( mirax, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(mirax) MCFG_PALETTE_LENGTH(0x40) MCFG_PALETTE_INIT(mirax) MCFG_GFXDECODE(mirax) MCFG_VIDEO_START(mirax) - MCFG_VIDEO_UPDATE(mirax) MCFG_SOUND_START(mirax) diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index 7db17485971..0bdf74c93d4 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -24,7 +24,7 @@ OKI M6295 sound ROM dump is bad. /* Video Hardware */ -static VIDEO_UPDATE( missb2 ) +static SCREEN_UPDATE( missb2 ) { bublbobl_state *state = screen->machine->driver_data<bublbobl_state>(); int offs; @@ -468,12 +468,11 @@ static MACHINE_CONFIG_START( missb2, bublbobl_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(missb2) MCFG_GFXDECODE(missb2) MCFG_PALETTE_LENGTH(512) - MCFG_VIDEO_UPDATE(missb2) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c index 578e3ec5934..e8101571678 100644 --- a/src/mame/drivers/missile.c +++ b/src/mame/drivers/missile.c @@ -664,7 +664,7 @@ static UINT8 read_vram(address_space *space, offs_t address) * *************************************/ -static VIDEO_UPDATE( missile ) +static SCREEN_UPDATE( missile ) { missile_state *state = screen->machine->driver_data<missile_state>(); UINT8 *videoram = state->videoram; @@ -1040,8 +1040,7 @@ static MACHINE_CONFIG_START( missile, missile_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) - - MCFG_VIDEO_UPDATE(missile) + MCFG_SCREEN_UPDATE(missile) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index a6e06a00b66..d8d80218c6d 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -1121,12 +1121,12 @@ static MACHINE_CONFIG_START( mgakuen, mitchell_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(pang) MCFG_GFXDECODE(mgakuen) MCFG_PALETTE_LENGTH(1024) /* less colors than the others */ MCFG_VIDEO_START(pang) - MCFG_VIDEO_UPDATE(pang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1165,7 +1165,7 @@ static MACHINE_CONFIG_START( pang, mitchell_state ) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pang) - MCFG_VIDEO_UPDATE(pang) + MCFG_SCREEN_UPDATE(pang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1264,7 +1264,7 @@ static MACHINE_CONFIG_START( mstworld, mitchell_state ) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pang) - MCFG_VIDEO_UPDATE(pang) + MCFG_SCREEN_UPDATE(pang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1297,7 +1297,7 @@ static MACHINE_CONFIG_START( marukin, mitchell_state ) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pang) - MCFG_VIDEO_UPDATE(pang) + MCFG_SCREEN_UPDATE(pang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1350,7 +1350,7 @@ static MACHINE_CONFIG_START( pkladiesbl, mitchell_state ) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pang) - MCFG_VIDEO_UPDATE(pang) + MCFG_SCREEN_UPDATE(pang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index 406f6b80667..507d7967469 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -388,13 +388,13 @@ static MACHINE_CONFIG_START( mjkjidai, mjkjidai_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(3*8, 61*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mjkjidai) MCFG_GFXDECODE(mjkjidai) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(mjkjidai) - MCFG_VIDEO_UPDATE(mjkjidai) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 157bed18922..9ee0f9ac671 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -113,7 +113,7 @@ static WRITE8_HANDLER( mjsister_videoram_w ) } } -static VIDEO_UPDATE( mjsister ) +static SCREEN_UPDATE( mjsister ) { mjsister_state *state = screen->machine->driver_data<mjsister_state>(); int flip = state->flip_screen; @@ -508,12 +508,12 @@ static MACHINE_CONFIG_START( mjsister, mjsister_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256+4, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255+4, 8, 247) + MCFG_SCREEN_UPDATE(mjsister) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(mjsister) - MCFG_VIDEO_UPDATE(mjsister) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 4ff729fa9c8..dcbf7c5212f 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -47,7 +47,7 @@ static VIDEO_START(mlanding) // 256: Cockpit // 512: control centre screen // 768: plane landing sequence -static VIDEO_UPDATE(mlanding) +static SCREEN_UPDATE(mlanding) { int x, y; @@ -749,11 +749,11 @@ static MACHINE_CONFIG_START( mlanding, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 511, 14*8, 511) + MCFG_SCREEN_UPDATE(mlanding) MCFG_PALETTE_LENGTH(512*16) MCFG_VIDEO_START(mlanding) - MCFG_VIDEO_UPDATE(mlanding) MCFG_MACHINE_RESET(mlanding) diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index 988dc50bc6b..effdced95aa 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -1519,12 +1519,12 @@ static MACHINE_CONFIG_START( model1, model1_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15) + MCFG_SCREEN_UPDATE(model1) + MCFG_SCREEN_EOF(model1) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(model1) - MCFG_VIDEO_UPDATE(model1) - MCFG_VIDEO_EOF(model1) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1563,12 +1563,12 @@ static MACHINE_CONFIG_START( model1_vr, model1_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15) + MCFG_SCREEN_UPDATE(model1) + MCFG_SCREEN_EOF(model1) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(model1) - MCFG_VIDEO_UPDATE(model1) - MCFG_VIDEO_EOF(model1) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 6577a4cc907..e0a6ffd981a 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -2036,11 +2036,11 @@ static MACHINE_CONFIG_START( model2o, model2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(62*8, 48*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*8-1) + MCFG_SCREEN_UPDATE(model2) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(model2) - MCFG_VIDEO_UPDATE(model2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2093,11 +2093,11 @@ static MACHINE_CONFIG_START( model2a, model2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(62*8, 48*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*8-1) + MCFG_SCREEN_UPDATE(model2) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(model2) - MCFG_VIDEO_UPDATE(model2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2196,11 +2196,11 @@ static MACHINE_CONFIG_START( model2b, model2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(62*8, 48*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*8-1) + MCFG_SCREEN_UPDATE(model2) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(model2) - MCFG_VIDEO_UPDATE(model2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2242,11 +2242,11 @@ static MACHINE_CONFIG_START( model2c, model2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(62*8, 48*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*8-1) + MCFG_SCREEN_UPDATE(model2) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(model2) - MCFG_VIDEO_UPDATE(model2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index f26172e6e87..bf25800cb42 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -4992,12 +4992,12 @@ static MACHINE_CONFIG_START( model3_10, model3_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 383) MCFG_SCREEN_SIZE(512, 400) + MCFG_SCREEN_UPDATE(model3) MCFG_PALETTE_LENGTH(32768) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_VIDEO_START(model3) - MCFG_VIDEO_UPDATE(model3) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("scsp1", SCSP, 0) @@ -5032,12 +5032,12 @@ static MACHINE_CONFIG_START( model3_15, model3_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 383) MCFG_SCREEN_SIZE(496, 400) + MCFG_SCREEN_UPDATE(model3) MCFG_PALETTE_LENGTH(32768) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_VIDEO_START(model3) - MCFG_VIDEO_UPDATE(model3) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("scsp1", SCSP, 0) @@ -5072,12 +5072,12 @@ static MACHINE_CONFIG_START( model3_20, model3_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 383) MCFG_SCREEN_SIZE(496, 400) + MCFG_SCREEN_UPDATE(model3) MCFG_PALETTE_LENGTH(32768) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_VIDEO_START(model3) - MCFG_VIDEO_UPDATE(model3) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("scsp1", SCSP, 0) @@ -5113,12 +5113,12 @@ static MACHINE_CONFIG_START( model3_21, model3_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 383) MCFG_SCREEN_SIZE(496, 400) + MCFG_SCREEN_UPDATE(model3) MCFG_PALETTE_LENGTH(32768) MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB) MCFG_VIDEO_START(model3) - MCFG_VIDEO_UPDATE(model3) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("scsp1", SCSP, 0) diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 734bc4e281e..052e0838c11 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -78,7 +78,7 @@ static VIDEO_START( mogura ) state->tilemap = tilemap_create(machine, get_mogura_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } -static VIDEO_UPDATE( mogura ) +static SCREEN_UPDATE( mogura ) { mogura_state *state = screen->machine->driver_data<mogura_state>(); const rectangle &visarea = screen->visible_area(); @@ -218,12 +218,12 @@ static MACHINE_CONFIG_START( mogura, mogura_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1) + MCFG_SCREEN_UPDATE(mogura) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(mogura) MCFG_VIDEO_START(mogura) - MCFG_VIDEO_UPDATE(mogura) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 6b56b2f50be..1cce41c00c7 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -120,7 +120,7 @@ static WRITE8_HANDLER( mole_flipscreen_w ) flip_screen_set(space->machine, data & 0x01); } -static VIDEO_UPDATE( mole ) +static SCREEN_UPDATE( mole ) { mole_state *state = screen->machine->driver_data<mole_state>(); @@ -331,13 +331,13 @@ static MACHINE_CONFIG_START( mole, mole_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 25*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 25*8-1) + MCFG_SCREEN_UPDATE(mole) MCFG_GFXDECODE(mole) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(mole) MCFG_VIDEO_START(mole) - MCFG_VIDEO_UPDATE(mole) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index c0d02865963..293a27a21b0 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -280,12 +280,11 @@ static MACHINE_CONFIG_START( momoko, momoko_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 29*8-1) + MCFG_SCREEN_UPDATE(momoko) MCFG_GFXDECODE(momoko) MCFG_PALETTE_LENGTH(512) - MCFG_VIDEO_UPDATE(momoko) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c index ef48a8f77cd..c321493fbb3 100644 --- a/src/mame/drivers/monzagp.c +++ b/src/mame/drivers/monzagp.c @@ -53,7 +53,7 @@ static VIDEO_START(monzagp) vram = auto_alloc_array(machine, UINT8, 0x10000); } -static VIDEO_UPDATE(monzagp) +static SCREEN_UPDATE(monzagp) { int x,y; @@ -251,13 +251,13 @@ static MACHINE_CONFIG_START( monzagp, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(monzagp) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(monzagp) MCFG_GFXDECODE(monzagp) MCFG_VIDEO_START(monzagp) - MCFG_VIDEO_UPDATE(monzagp) MACHINE_CONFIG_END ROM_START( monzagp ) diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 94fa5ec47e4..479f6308d6e 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -531,11 +531,11 @@ static MACHINE_CONFIG_START( moo, moo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1) + MCFG_SCREEN_UPDATE(moo) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(moo) - MCFG_VIDEO_UPDATE(moo) MCFG_K053247_ADD("k053246", moo_k053247_intf) MCFG_K056832_ADD("k056832", moo_k056832_intf) @@ -575,11 +575,11 @@ static MACHINE_CONFIG_START( moobl, moo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1) + MCFG_SCREEN_UPDATE(moo) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(moo) - MCFG_VIDEO_UPDATE(moo) MCFG_K053247_ADD("k053246", moo_k053247_intf) MCFG_K056832_ADD("k056832", moo_k056832_intf) diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c index 7636fcba10f..2a82d6bd54b 100644 --- a/src/mame/drivers/mosaic.c +++ b/src/mame/drivers/mosaic.c @@ -285,12 +285,12 @@ static MACHINE_CONFIG_START( mosaic, mosaic_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mosaic) MCFG_GFXDECODE(mosaic) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(mosaic) - MCFG_VIDEO_UPDATE(mosaic) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index 332e0d7d37a..fab71eeab40 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -229,12 +229,12 @@ static MACHINE_CONFIG_START( mouser, mouser_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mouser) MCFG_GFXDECODE(mouser) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(mouser) - MCFG_VIDEO_UPDATE(mouser) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c index bb088e75ab0..248988de25b 100644 --- a/src/mame/drivers/mpoker.c +++ b/src/mame/drivers/mpoker.c @@ -191,7 +191,7 @@ static VIDEO_START(mpoker) } -static VIDEO_UPDATE(mpoker) +static SCREEN_UPDATE(mpoker) { mpoker_state *state = screen->machine->driver_data<mpoker_state>(); int y,x; @@ -592,13 +592,13 @@ static MACHINE_CONFIG_START( mpoker, mpoker_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(mpoker) MCFG_GFXDECODE(mpoker) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(mpoker) MCFG_VIDEO_START(mpoker) - MCFG_VIDEO_UPDATE(mpoker) /* sound hardware */ // MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 759ef942a24..130f64d9697 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -485,7 +485,7 @@ static UINT8 IR13_scn2674_scroll_end; static UINT8 IR13_scn2674_split_register_2; -static VIDEO_UPDATE( mpu4_vid ) +static SCREEN_UPDATE( mpu4_vid ) { int x, y/*, count = 0*/; @@ -2188,7 +2188,7 @@ static PALETTE_INIT( dealem ) } -static VIDEO_UPDATE(dealem) +static SCREEN_UPDATE(dealem) { int x,y; int count = 0; @@ -2381,6 +2381,7 @@ static MACHINE_CONFIG_START( mpu4_vid, driver_device ) MCFG_SCREEN_SIZE(64*8, 40*8) // note this directly affects the scanline counters used below, and thus the timing of everything MCFG_SCREEN_VISIBLE_AREA(0*8, 63*8-1, 0*8, 37*8-1) MCFG_SCREEN_REFRESH_RATE(50) + MCFG_SCREEN_UPDATE(mpu4_vid) MCFG_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK ) MCFG_CPU_PROGRAM_MAP(mpu4_68k_map) @@ -2390,7 +2391,6 @@ static MACHINE_CONFIG_START( mpu4_vid, driver_device ) MCFG_MACHINE_START(mpu4_vid) MCFG_MACHINE_RESET(mpu4_vid) MCFG_VIDEO_START (mpu4_vid) - MCFG_VIDEO_UPDATE(mpu4_vid) MCFG_PALETTE_LENGTH(16) @@ -2446,6 +2446,7 @@ static MACHINE_CONFIG_START( bwbvid, driver_device ) MCFG_SCREEN_SIZE(64*8, 40*8) // note this directly affects the scanline counters used below, and thus the timing of everything MCFG_SCREEN_VISIBLE_AREA(0*8, 63*8-1, 0*8, 37*8-1) MCFG_SCREEN_REFRESH_RATE(50) + MCFG_SCREEN_UPDATE(mpu4_vid) MCFG_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK ) MCFG_CPU_PROGRAM_MAP(bwbvid_68k_map) @@ -2455,7 +2456,6 @@ static MACHINE_CONFIG_START( bwbvid, driver_device ) MCFG_MACHINE_START(mpu4_vid) MCFG_MACHINE_RESET(mpu4_vid) MCFG_VIDEO_START (mpu4_vid) - MCFG_VIDEO_UPDATE(mpu4_vid) MCFG_PALETTE_LENGTH(16) @@ -2518,9 +2518,9 @@ static MACHINE_CONFIG_START( dealem, driver_device ) MCFG_SCREEN_SIZE((54+1)*8, (32+1)*8) /* Taken from 6845 init, registers 00 & 04. Normally programmed with (value-1) */ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 31*8-1) /* Taken from 6845 init, registers 01 & 06 */ MCFG_SCREEN_REFRESH_RATE(56) /* Measured accurately from the flip-flop, but 6845 handles this */ + MCFG_SCREEN_UPDATE(dealem) MCFG_GFXDECODE(dealem) - MCFG_VIDEO_UPDATE(dealem) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(dealem) diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c index f1676b117ed..6fb48ffce33 100644 --- a/src/mame/drivers/mpu5.c +++ b/src/mame/drivers/mpu5.c @@ -28,7 +28,7 @@ static VIDEO_START(mpu5) } -static VIDEO_UPDATE(mpu5) +static SCREEN_UPDATE(mpu5) { return 0; } @@ -44,11 +44,11 @@ static MACHINE_CONFIG_START( mpu5, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mpu5) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(mpu5) - MCFG_VIDEO_UPDATE(mpu5) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* unknown sound */ diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index bee99d10739..d7c5097bcfa 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -375,12 +375,12 @@ static MACHINE_CONFIG_START( mquake, amiga_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512*2, 262) MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1) + MCFG_SCREEN_UPDATE(amiga) MCFG_PALETTE_LENGTH(4096) MCFG_PALETTE_INIT(amiga) MCFG_VIDEO_START(amiga) - MCFG_VIDEO_UPDATE(amiga) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c index 11b9b821e57..1d70fb27340 100644 --- a/src/mame/drivers/mrdo.c +++ b/src/mame/drivers/mrdo.c @@ -176,13 +176,13 @@ static MACHINE_CONFIG_START( mrdo, mrdo_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/4, 312, 8, 248, 262, 32, 224) + MCFG_SCREEN_UPDATE(mrdo) MCFG_GFXDECODE(mrdo) MCFG_PALETTE_LENGTH(64*4+16*4) MCFG_PALETTE_INIT(mrdo) MCFG_VIDEO_START(mrdo) - MCFG_VIDEO_UPDATE(mrdo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 579024dba4d..bb955fce313 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -382,11 +382,11 @@ static MACHINE_CONFIG_START( mrflea, mrflea_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 31*8-1) + MCFG_SCREEN_UPDATE(mrflea) MCFG_GFXDECODE(mrflea) MCFG_PALETTE_LENGTH(32) - MCFG_VIDEO_UPDATE(mrflea) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c index 1f7a6bb4ba4..cdb021fefd9 100644 --- a/src/mame/drivers/mrjong.c +++ b/src/mame/drivers/mrjong.c @@ -193,13 +193,13 @@ static MACHINE_CONFIG_START( mrjong, mrjong_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 30*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(mrjong) MCFG_GFXDECODE(mrjong) MCFG_PALETTE_LENGTH(4*32) MCFG_PALETTE_INIT(mrjong) MCFG_VIDEO_START(mrjong) - MCFG_VIDEO_UPDATE(mrjong) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index 1bd3928670c..a631938bc2b 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -1334,12 +1334,12 @@ static MACHINE_CONFIG_START( ms32, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(ms32) MCFG_GFXDECODE(ms32) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(ms32) - MCFG_VIDEO_UPDATE(ms32) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index fccc567349e..7800598b046 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -507,12 +507,12 @@ static MACHINE_CONFIG_START( msisaac, msisaac_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(msisaac) MCFG_GFXDECODE(msisaac) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(msisaac) - MCFG_VIDEO_UPDATE(msisaac) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index 12278b22fc1..7b7a0a8b60f 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -425,12 +425,12 @@ static MACHINE_CONFIG_START( mugsmash, mugsmash_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(mugsmash) MCFG_GFXDECODE(mugsmash) MCFG_PALETTE_LENGTH(0x300) MCFG_VIDEO_START(mugsmash) - MCFG_VIDEO_UPDATE(mugsmash) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index dce7d52345c..cd7fe0cab8e 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -241,7 +241,7 @@ static VIDEO_START(multfish) tilemap_set_scroll_cols(state->reel_tilemap, 64); } -static VIDEO_UPDATE(multfish) +static SCREEN_UPDATE(multfish) { multfish_state *state = screen->machine->driver_data<multfish_state>(); int i; @@ -1036,11 +1036,11 @@ static MACHINE_CONFIG_START( multfish, multfish_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(17*16, 1024-16*7-1, 1*16, 32*16-1*16-1) + MCFG_SCREEN_UPDATE(multfish) MCFG_GFXDECODE(multfish) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(multfish) - MCFG_VIDEO_UPDATE(multfish) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("aysnd", AY8910, 6000000/4) diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index 2a445383438..41df9c7fa17 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -1056,7 +1056,7 @@ static VIDEO_START( multigam ) { } -static VIDEO_UPDATE( multigam ) +static SCREEN_UPDATE( multigam ) { /* render the ppu */ ppu2c0x_render(screen->machine->device("ppu"), bitmap, 0, 0, 0, 0); @@ -1147,13 +1147,13 @@ static MACHINE_CONFIG_START( multigam, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(multigam) MCFG_GFXDECODE(multigam) MCFG_PALETTE_LENGTH(8*4*16) MCFG_PALETTE_INIT(multigam) MCFG_VIDEO_START(multigam) - MCFG_VIDEO_UPDATE(multigam) MCFG_PPU2C04_ADD("ppu", ppu_interface) diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index 1010cb87168..d13460d3592 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -349,13 +349,13 @@ static MACHINE_CONFIG_START( mnchmobl, munchmo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256+32+32, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255+32+32,0, 255-16) + MCFG_SCREEN_UPDATE(mnchmobl) MCFG_GFXDECODE(mnchmobl) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(mnchmobl) MCFG_VIDEO_START(mnchmobl) - MCFG_VIDEO_UPDATE(mnchmobl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index 068a8cfaf6c..088b7b59ab6 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -167,7 +167,7 @@ GFXDECODE_END static PALETTE_INIT(murogem) {} -static VIDEO_UPDATE(murogem) +static SCREEN_UPDATE(murogem) { int xx,yy,count; count = 0x000; @@ -220,12 +220,12 @@ static MACHINE_CONFIG_START( murogem, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((39+1)*8, (38+1)*8) // Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1). MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) // Taken from MC6845 init, registers 01 & 06. + MCFG_SCREEN_UPDATE(murogem) MCFG_GFXDECODE(murogem) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(murogem) - MCFG_VIDEO_UPDATE(murogem) MCFG_MC6845_ADD("crtc", MC6845, 750000, mc6845_intf) /* ? MHz */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c index fec46632936..3e0748c3db6 100644 --- a/src/mame/drivers/murogmbl.c +++ b/src/mame/drivers/murogmbl.c @@ -81,7 +81,7 @@ static VIDEO_START(murogmbl) } -static VIDEO_UPDATE(murogmbl) +static SCREEN_UPDATE(murogmbl) { const gfx_element *gfx = screen->machine->gfx[0]; int count = 0; @@ -182,11 +182,11 @@ static MACHINE_CONFIG_START( murogmbl, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(murogmbl) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(murogmbl) - MCFG_VIDEO_UPDATE(murogmbl) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac1", DAC, 0) diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c index 3db0e5c5318..386eaf5dd09 100644 --- a/src/mame/drivers/mustache.c +++ b/src/mame/drivers/mustache.c @@ -215,13 +215,13 @@ static MACHINE_CONFIG_START( mustache, mustache_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0, 31*8-1) + MCFG_SCREEN_UPDATE(mustache) MCFG_GFXDECODE(mustache) MCFG_PALETTE_LENGTH(8*16+16*8) MCFG_PALETTE_INIT(mustache) MCFG_VIDEO_START(mustache) - MCFG_VIDEO_UPDATE(mustache) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c index 64f3bdb8718..f4a13e4573b 100644 --- a/src/mame/drivers/mw8080bw.c +++ b/src/mame/drivers/mw8080bw.c @@ -231,12 +231,10 @@ MACHINE_CONFIG_START( mw8080bw_root, mw8080bw_state ) MCFG_MACHINE_RESET(mw8080bw) /* video hardware */ - MCFG_VIDEO_UPDATE(mw8080bw) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(MW8080BW_PIXEL_CLOCK, MW8080BW_HTOTAL, MW8080BW_HBEND, MW8080BW_HPIXCOUNT, MW8080BW_VTOTAL, MW8080BW_VBEND, MW8080BW_VBSTART) - + MCFG_SCREEN_UPDATE(mw8080bw) MACHINE_CONFIG_END @@ -2289,7 +2287,8 @@ static MACHINE_CONFIG_DERIVED( spcenctr, mw8080bw_root ) MCFG_TIMER_PARAM(FALSE) /* indicates strobe OFF */ /* video hardware */ - MCFG_VIDEO_UPDATE(spcenctr) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(spcenctr) /* audio hardware */ MCFG_FRAGMENT_ADD(spcenctr_audio) @@ -2376,8 +2375,9 @@ static MACHINE_CONFIG_DERIVED( phantom2, mw8080bw_root ) MCFG_WATCHDOG_TIME_INIT(attotime::from_usec(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL))) /* video hardware */ - MCFG_VIDEO_UPDATE(phantom2) - MCFG_VIDEO_EOF(phantom2) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(phantom2) + MCFG_SCREEN_EOF(phantom2) /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -2731,7 +2731,8 @@ MACHINE_CONFIG_DERIVED( invaders, mw8080bw_root ) MCFG_WATCHDOG_TIME_INIT(attotime::from_usec(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL))) /* video hardware */ - MCFG_VIDEO_UPDATE(invaders) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(invaders) /* add shifter */ MCFG_MB14241_ADD("mb14241") diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 260808ef35a..1e503322946 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -457,7 +457,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE( mwarr ) +static SCREEN_UPDATE( mwarr ) { mwarr_state *state = screen->machine->driver_data<mwarr_state>(); int i; @@ -549,12 +549,12 @@ static MACHINE_CONFIG_START( mwarr, mwarr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8+1, 48*8-1-8-1, 0, 30*8-1) + MCFG_SCREEN_UPDATE(mwarr) MCFG_GFXDECODE(mwarr) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(mwarr) - MCFG_VIDEO_UPDATE(mwarr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index 91a1c920099..c718c8b219e 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -972,11 +972,11 @@ static MACHINE_CONFIG_START( mystwarr, mystwarr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(24, 24+288-1, 16, 16+224-1) + MCFG_SCREEN_UPDATE(mystwarr) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(mystwarr) - MCFG_VIDEO_UPDATE(mystwarr) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1003,7 +1003,8 @@ static MACHINE_CONFIG_DERIVED( viostorm, mystwarr ) /* video hardware */ MCFG_VIDEO_START(viostorm) - MCFG_VIDEO_UPDATE(metamrph) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(metamrph) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(900)) @@ -1022,7 +1023,8 @@ static MACHINE_CONFIG_DERIVED( metamrph, mystwarr ) /* video hardware */ MCFG_VIDEO_START(metamrph) - MCFG_VIDEO_UPDATE(metamrph) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(metamrph) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(900)) @@ -1043,7 +1045,8 @@ static MACHINE_CONFIG_DERIVED( dadandrn, mystwarr ) /* video hardware */ MCFG_VIDEO_START(dadandrn) - MCFG_VIDEO_UPDATE(dadandrn) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(dadandrn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600)) @@ -1067,7 +1070,8 @@ static MACHINE_CONFIG_DERIVED( gaiapols, mystwarr ) /* video hardware */ MCFG_VIDEO_START(gaiapols) - MCFG_VIDEO_UPDATE(dadandrn) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(dadandrn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(8000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223) @@ -1088,7 +1092,8 @@ static MACHINE_CONFIG_DERIVED( martchmp, mystwarr ) MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK) MCFG_VIDEO_START(martchmp) - MCFG_VIDEO_UPDATE(martchmp) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(martchmp) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c index 09a724bdaec..adbb14dc009 100644 --- a/src/mame/drivers/n8080.c +++ b/src/mame/drivers/n8080.c @@ -523,11 +523,11 @@ static MACHINE_CONFIG_START( spacefev, n8080_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 239) + MCFG_SCREEN_UPDATE(spacefev) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(n8080) MCFG_VIDEO_START(spacefev) - MCFG_VIDEO_UPDATE(spacefev) MCFG_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256) MCFG_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256) @@ -554,11 +554,11 @@ static MACHINE_CONFIG_START( sheriff, n8080_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 239) + MCFG_SCREEN_UPDATE(sheriff) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(n8080) MCFG_VIDEO_START(sheriff) - MCFG_VIDEO_UPDATE(sheriff) MCFG_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256) MCFG_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256) @@ -585,12 +585,12 @@ static MACHINE_CONFIG_START( helifire, n8080_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 239) + MCFG_SCREEN_UPDATE(helifire) + MCFG_SCREEN_EOF(helifire) MCFG_PALETTE_LENGTH(8 + 0x400) MCFG_PALETTE_INIT(helifire) MCFG_VIDEO_START(helifire) - MCFG_VIDEO_UPDATE(helifire) - MCFG_VIDEO_EOF(helifire) MCFG_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256) MCFG_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256) diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c index 24ee34881e6..576a546cfc9 100644 --- a/src/mame/drivers/namcofl.c +++ b/src/mame/drivers/namcofl.c @@ -605,13 +605,13 @@ static MACHINE_CONFIG_START( namcofl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL) MCFG_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1) + MCFG_SCREEN_UPDATE(namcofl) MCFG_PALETTE_LENGTH(8192) MCFG_GFXDECODE(2) MCFG_VIDEO_START(namcofl) - MCFG_VIDEO_UPDATE(namcofl) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("c352", C352, 48384000/3) diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index 1477d686c51..68e79528926 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -1029,11 +1029,11 @@ static MACHINE_CONFIG_START( namcona1, namcona1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(38*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8, 38*8-1-8, 4*8, 32*8-1) + MCFG_SCREEN_UPDATE(namcona1) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(namcona1) - MCFG_VIDEO_UPDATE(namcona1) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index 8118c4638a9..d4d43ff288a 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -1030,11 +1030,11 @@ static MACHINE_CONFIG_START( namconb1, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL) MCFG_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1) + MCFG_SCREEN_UPDATE(namconb1) MCFG_GFXDECODE(namconb1) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(namconb1) - MCFG_VIDEO_UPDATE(namconb1) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("c352", C352, MASTER_CLOCK_HZ/3) @@ -1063,11 +1063,11 @@ static MACHINE_CONFIG_START( namconb2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL) MCFG_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1) + MCFG_SCREEN_UPDATE(namconb2) MCFG_GFXDECODE(2) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(namconb2) - MCFG_VIDEO_UPDATE(namconb2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("c352", C352, MASTER_CLOCK_HZ/3) diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c index d440800c8c8..02f35af0d7b 100644 --- a/src/mame/drivers/namcond1.c +++ b/src/mame/drivers/namcond1.c @@ -312,12 +312,12 @@ static MACHINE_CONFIG_START( namcond1, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(288, 224) // maximum display resolution (512x512 in theory) MCFG_SCREEN_VISIBLE_AREA(0, 287, 0, 223) // default visible area + MCFG_SCREEN_UPDATE(ygv608) MCFG_GFXDECODE(namcond1) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(ygv608) - MCFG_VIDEO_UPDATE(ygv608) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c index 46cbb172baf..1111a56f9e6 100644 --- a/src/mame/drivers/namcops2.c +++ b/src/mame/drivers/namcops2.c @@ -28,7 +28,7 @@ static VIDEO_START(system246) { } -static VIDEO_UPDATE(system246) +static SCREEN_UPDATE(system246) { return 0; } @@ -58,11 +58,11 @@ static MACHINE_CONFIG_START( system246, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(system246) MCFG_PALETTE_LENGTH(65536) MCFG_VIDEO_START(system246) - MCFG_VIDEO_UPDATE(system246) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( system256, system246 ) diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index fb4cd65b1a3..7decc303990 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -1113,13 +1113,13 @@ static MACHINE_CONFIG_START( ns1, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(9 + 8*8, 9 + 44*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(namcos1) + MCFG_SCREEN_EOF(namcos1) MCFG_GFXDECODE(namcos1) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(namcos1) - MCFG_VIDEO_UPDATE(namcos1) - MCFG_VIDEO_EOF(namcos1) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c index 72fbee76cb7..f1a6a1550aa 100644 --- a/src/mame/drivers/namcos10.c +++ b/src/mame/drivers/namcos10.c @@ -493,12 +493,12 @@ static MACHINE_CONFIG_START( namcos10, namcos10_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 1024 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type2 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index 8bd44515e98..86928ea1146 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -1012,12 +1012,12 @@ static MACHINE_CONFIG_START( coh100, namcos11_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 1024 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type1 ) - MCFG_VIDEO_UPDATE( psx ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("c352", C352, 16384000) diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 037314c7a37..6f5782b6c72 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1670,12 +1670,12 @@ static MACHINE_CONFIG_START( coh700, namcos12_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 1024 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type2 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index e9c7238ae7a..a6bc8009be8 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -1637,12 +1637,12 @@ static MACHINE_CONFIG_START( default, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 264) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(namcos2_default) MCFG_GFXDECODE(namcos2) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(namcos2) - MCFG_VIDEO_UPDATE(namcos2_default) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1714,12 +1714,12 @@ static MACHINE_CONFIG_START( gollygho, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 264) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(namcos2_default) MCFG_GFXDECODE(namcos2) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(namcos2) - MCFG_VIDEO_UPDATE(namcos2_default) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1764,12 +1764,12 @@ static MACHINE_CONFIG_START( finallap, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 264) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(finallap) MCFG_GFXDECODE(finallap) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(finallap) - MCFG_VIDEO_UPDATE(finallap) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1814,12 +1814,12 @@ static MACHINE_CONFIG_START( sgunner, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 264) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(sgunner) MCFG_GFXDECODE(sgunner) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(sgunner) - MCFG_VIDEO_UPDATE(sgunner) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1864,12 +1864,12 @@ static MACHINE_CONFIG_START( luckywld, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 264) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(luckywld) MCFG_GFXDECODE(luckywld) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(luckywld) - MCFG_VIDEO_UPDATE(luckywld) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1914,12 +1914,12 @@ static MACHINE_CONFIG_START( metlhawk, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 264) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(metlhawk) MCFG_GFXDECODE(metlhawk) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(metlhawk) - MCFG_VIDEO_UPDATE(metlhawk) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index 3a095102929..881e73af5e6 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1564,12 +1564,12 @@ static MACHINE_CONFIG_START( s21base, namcos21_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(0,495,0,479) + MCFG_SCREEN_UPDATE(namcos21) MCFG_GFXDECODE(namcos21) MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS) MCFG_VIDEO_START(namcos21) - MCFG_VIDEO_UPDATE(namcos21) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( poly_c140_typeA, s21base ) @@ -1636,12 +1636,12 @@ static MACHINE_CONFIG_START( driveyes, namcos21_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(0,495,0,479) + MCFG_SCREEN_UPDATE(namcos21) MCFG_GFXDECODE(namcos21) MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS) MCFG_VIDEO_START(namcos21) - MCFG_VIDEO_UPDATE(namcos21) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1695,11 +1695,11 @@ static MACHINE_CONFIG_START( winrun_c140_typeB, namcos21_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(0,495,0,479) + MCFG_SCREEN_UPDATE(namcos21) MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS) MCFG_VIDEO_START(namcos21) - MCFG_VIDEO_UPDATE(namcos21) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index c0420cf674e..6e4815b0610 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -2898,11 +2898,11 @@ static MACHINE_CONFIG_START( namcos22s, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(NAMCOS22_NUM_COLS*16,NAMCOS22_NUM_ROWS*16) MCFG_SCREEN_VISIBLE_AREA(0,NAMCOS22_NUM_COLS*16-1,0,NAMCOS22_NUM_ROWS*16-1) + MCFG_SCREEN_UPDATE(namcos22s) MCFG_PALETTE_LENGTH(NAMCOS22_PALETTE_SIZE) MCFG_GFXDECODE(super) MCFG_VIDEO_START(namcos22s) - MCFG_VIDEO_UPDATE(namcos22s) MCFG_MACHINE_RESET(namcoss22) /* sound hardware */ @@ -3311,11 +3311,11 @@ static MACHINE_CONFIG_START( namcos22, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(NAMCOS22_NUM_COLS*16,NAMCOS22_NUM_ROWS*16) MCFG_SCREEN_VISIBLE_AREA(0,NAMCOS22_NUM_COLS*16-1,0,NAMCOS22_NUM_ROWS*16-1) + MCFG_SCREEN_UPDATE(namcos22) MCFG_PALETTE_LENGTH(NAMCOS22_PALETTE_SIZE) MCFG_GFXDECODE(namcos22) MCFG_VIDEO_START(namcos22) - MCFG_VIDEO_UPDATE(namcos22) MCFG_MACHINE_RESET(namcos22) /* sound hardware */ diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index b8e9b4c48c2..cd496e79054 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -2014,7 +2014,7 @@ static VIDEO_START( ss23 ) polymgr = poly_alloc(machine, 10000, sizeof(namcos23_render_data), POLYFLAG_NO_WORK_QUEUE); } -static VIDEO_UPDATE( ss23 ) +static SCREEN_UPDATE( ss23 ) { bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -2722,6 +2722,7 @@ static MACHINE_CONFIG_START( gorgon, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(ss23) MCFG_PALETTE_LENGTH(0x8000) @@ -2730,7 +2731,6 @@ static MACHINE_CONFIG_START( gorgon, driver_device ) MCFG_GFXDECODE(namcos23) MCFG_VIDEO_START(ss23) - MCFG_VIDEO_UPDATE(ss23) MCFG_MACHINE_START(s23) @@ -2768,6 +2768,7 @@ static MACHINE_CONFIG_START( s23, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(ss23) MCFG_PALETTE_LENGTH(0x8000) @@ -2776,7 +2777,6 @@ static MACHINE_CONFIG_START( s23, driver_device ) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_VIDEO_START(ss23) - MCFG_VIDEO_UPDATE(ss23) MCFG_MACHINE_START(s23) @@ -2810,6 +2810,7 @@ static MACHINE_CONFIG_START( ss23, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(ss23) MCFG_PALETTE_LENGTH(0x8000) @@ -2818,7 +2819,6 @@ static MACHINE_CONFIG_START( ss23, driver_device ) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_VIDEO_START(ss23) - MCFG_VIDEO_UPDATE(ss23) MCFG_MACHINE_START(s23) diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index dfdbe5b645a..00278fae0f1 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -1021,14 +1021,14 @@ static MACHINE_CONFIG_START( hopmappy, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(3 + 8*8, 3 + 44*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(namcos86) + MCFG_SCREEN_EOF(namcos86) MCFG_GFXDECODE(namcos86) MCFG_PALETTE_LENGTH(4096) MCFG_PALETTE_INIT(namcos86) MCFG_VIDEO_START(namcos86) - MCFG_VIDEO_UPDATE(namcos86) - MCFG_VIDEO_EOF(namcos86) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 61ef0d12181..72ceddf26af 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -2043,11 +2043,11 @@ static MACHINE_CONFIG_START( naomi_base, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) + MCFG_SCREEN_UPDATE(dc) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(dc) - MCFG_VIDEO_UPDATE(dc) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("aica", AICA, 0) diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c index dbb615c2426..363829f7ece 100644 --- a/src/mame/drivers/naughtyb.c +++ b/src/mame/drivers/naughtyb.c @@ -448,13 +448,13 @@ static MACHINE_CONFIG_START( naughtyb, naughtyb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(naughtyb) MCFG_GFXDECODE(naughtyb) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(naughtyb) MCFG_VIDEO_START(naughtyb) - MCFG_VIDEO_UPDATE(naughtyb) /* sound hardware */ /* uses the TMS3615NS for sound */ @@ -484,13 +484,13 @@ static MACHINE_CONFIG_START( popflame, naughtyb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(naughtyb) MCFG_GFXDECODE(naughtyb) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(naughtyb) MCFG_VIDEO_START(naughtyb) - MCFG_VIDEO_UPDATE(naughtyb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c index 3ef37e7323b..6748521b90a 100644 --- a/src/mame/drivers/nbmj8688.c +++ b/src/mame/drivers/nbmj8688.c @@ -2933,12 +2933,12 @@ static MACHINE_CONFIG_START( NBMJDRV_4096, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) + MCFG_SCREEN_UPDATE(mbmj8688) MCFG_PALETTE_LENGTH(4096) MCFG_PALETTE_INIT(mbmj8688_12bit) MCFG_VIDEO_START(mbmj8688_pure_12bit) - MCFG_VIDEO_UPDATE(mbmj8688) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3062,6 +3062,7 @@ static MACHINE_CONFIG_START( mbmj_p16bit_LCD, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) + MCFG_SCREEN_UPDATE(mbmj8688) MCFG_SCREEN_ADD("lcd0", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -3069,6 +3070,7 @@ static MACHINE_CONFIG_START( mbmj_p16bit_LCD, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(480, 64) MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 0, 64-1) + MCFG_SCREEN_UPDATE(mbmj8688_lcd0) MCFG_SCREEN_ADD("lcd1", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -3076,9 +3078,9 @@ static MACHINE_CONFIG_START( mbmj_p16bit_LCD, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(480, 64) MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 0, 64-1) + MCFG_SCREEN_UPDATE(mbmj8688_lcd1) MCFG_VIDEO_START(mbmj8688_pure_16bit_LCD) - MCFG_VIDEO_UPDATE(mbmj8688_LCD) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index fee5f0347d8..31972e0ae2d 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -2624,11 +2624,11 @@ static MACHINE_CONFIG_START( gionbana, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 8, 248-1) + MCFG_SCREEN_UPDATE(nbmj8891) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(nbmj8891_2layer) - MCFG_VIDEO_UPDATE(nbmj8891) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c index dceee3f0428..02821d2e0c3 100644 --- a/src/mame/drivers/nbmj8900.c +++ b/src/mame/drivers/nbmj8900.c @@ -333,10 +333,10 @@ static MACHINE_CONFIG_START( ohpaipee, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 8, 248-1) + MCFG_SCREEN_UPDATE(nbmj8900) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(nbmj8900_2layer) - MCFG_VIDEO_UPDATE(nbmj8900) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index 8f1292a762b..b698cc7bca0 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -1492,11 +1492,11 @@ static MACHINE_CONFIG_START( nbmjdrv1, driver_device ) // galkoku MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(1024, 512) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1) + MCFG_SCREEN_UPDATE(nbmj8991_type1) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(nbmj8991) - MCFG_VIDEO_UPDATE(nbmj8991_type1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1530,11 +1530,11 @@ static MACHINE_CONFIG_START( nbmjdrv2, driver_device ) // pstadium MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(1024, 512) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1) + MCFG_SCREEN_UPDATE(nbmj8991_type2) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(nbmj8991) - MCFG_VIDEO_UPDATE(nbmj8991_type2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index 0d2e1d13c8d..9b6f17477e9 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -2938,11 +2938,11 @@ static MACHINE_CONFIG_START( NBMJDRV1, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(1024, 512) /* no way this is correct */ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1) + MCFG_SCREEN_UPDATE(nbmj9195) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(nbmj9195_2layer) - MCFG_VIDEO_UPDATE(nbmj9195) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2975,7 +2975,8 @@ static MACHINE_CONFIG_DERIVED( NBMJDRV3, NBMJDRV1 ) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(nbmj9195_nb22090) - MCFG_VIDEO_UPDATE(nbmj9195) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(nbmj9195) MACHINE_CONFIG_END diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index 4cd3d7f1c20..c4b0e703fd4 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -1703,12 +1703,12 @@ static MACHINE_CONFIG_START( nemesis, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1750,12 +1750,12 @@ static MACHINE_CONFIG_START( gx400, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1796,12 +1796,12 @@ static MACHINE_CONFIG_START( konamigt, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1840,12 +1840,12 @@ static MACHINE_CONFIG_START( rf2_gx400, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1888,12 +1888,12 @@ static MACHINE_CONFIG_START( salamand, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1938,12 +1938,12 @@ static MACHINE_CONFIG_START( blkpnthr, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1984,12 +1984,12 @@ static MACHINE_CONFIG_START( citybomb, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2034,12 +2034,12 @@ static MACHINE_CONFIG_START( nyanpani, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2082,12 +2082,12 @@ static MACHINE_CONFIG_START( hcrash, nemesis_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nemesis) MCFG_GFXDECODE(nemesis) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(nemesis) - MCFG_VIDEO_UPDATE(nemesis) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 9f5e89073a1..e1586caabb0 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -1361,12 +1361,12 @@ static MACHINE_CONFIG_START( neogeo, neogeo_state ) /* video hardware */ MCFG_VIDEO_START(neogeo) MCFG_VIDEO_RESET(neogeo) - MCFG_VIDEO_UPDATE(neogeo) MCFG_DEFAULT_LAYOUT(layout_neogeo) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART) + MCFG_SCREEN_UPDATE(neogeo) /* audio hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index 31cfad864f2..dddc0e52f45 100644 --- a/src/mame/drivers/neoprint.c +++ b/src/mame/drivers/neoprint.c @@ -81,7 +81,7 @@ static void draw_layer(running_machine *machine, bitmap_t *bitmap,const rectangl } } -VIDEO_UPDATE(neoprint) +SCREEN_UPDATE(neoprint) { bitmap_fill(bitmap, cliprect, 0); @@ -91,7 +91,7 @@ VIDEO_UPDATE(neoprint) return 0; } -VIDEO_UPDATE(nprsp) +SCREEN_UPDATE(nprsp) { bitmap_fill(bitmap, cliprect, 0); @@ -460,11 +460,11 @@ static MACHINE_CONFIG_START( neoprint, neoprint_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(neoprint) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(neoprint) - MCFG_VIDEO_UPDATE(neoprint) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -502,13 +502,13 @@ static MACHINE_CONFIG_START( nprsp, neoprint_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(nprsp) MCFG_MACHINE_RESET(nprsp) MCFG_PALETTE_LENGTH(0x10000) MCFG_VIDEO_START(neoprint) - MCFG_VIDEO_UPDATE(nprsp) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/neptunp2.c b/src/mame/drivers/neptunp2.c index d4c281e088e..3176c1e3f7d 100644 --- a/src/mame/drivers/neptunp2.c +++ b/src/mame/drivers/neptunp2.c @@ -14,7 +14,7 @@ static VIDEO_START( neptunp2 ) } -static VIDEO_UPDATE( neptunp2 ) +static SCREEN_UPDATE( neptunp2 ) { return 0; } @@ -81,11 +81,11 @@ static MACHINE_CONFIG_START( neptunp2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(neptunp2) MCFG_GFXDECODE(neptunp2) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(neptunp2) - MCFG_VIDEO_UPDATE(neptunp2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c index 0a5ba321e71..667e904ff3c 100644 --- a/src/mame/drivers/news.c +++ b/src/mame/drivers/news.c @@ -144,12 +144,12 @@ static MACHINE_CONFIG_START( news, news_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(news) MCFG_GFXDECODE(news) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(news) - MCFG_VIDEO_UPDATE(news) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 2470efba272..51cc19f5c7c 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -67,7 +67,7 @@ static VIDEO_START( nightgal ) state->save_item(NAME(state->blit_buffer)); } -static VIDEO_UPDATE( nightgal ) +static SCREEN_UPDATE( nightgal ) { nightgal_state *state = screen->machine->driver_data<nightgal_state>(); int x, y; @@ -879,12 +879,12 @@ static MACHINE_CONFIG_START( royalqn, nightgal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) + MCFG_SCREEN_UPDATE(nightgal) MCFG_PALETTE_INIT(nightgal) MCFG_PALETTE_LENGTH(0x10) MCFG_VIDEO_START(nightgal) - MCFG_VIDEO_UPDATE(nightgal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index 2da20e8aed6..f16c58c28e4 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -924,13 +924,13 @@ static MACHINE_CONFIG_START( ninjakd2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(ninjakd2) + MCFG_SCREEN_EOF(ninjakd2) MCFG_GFXDECODE(ninjakd2) MCFG_PALETTE_LENGTH(0x300) MCFG_VIDEO_START(ninjakd2) - MCFG_VIDEO_UPDATE(ninjakd2) - MCFG_VIDEO_EOF(ninjakd2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -995,7 +995,8 @@ static MACHINE_CONFIG_DERIVED( robokid, mnight ) MCFG_PALETTE_LENGTH(0x400) // RAM is this large, but still only 0x300 colors used MCFG_VIDEO_START(robokid) - MCFG_VIDEO_UPDATE(robokid) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(robokid) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( omegaf, robokid ) @@ -1009,7 +1010,8 @@ static MACHINE_CONFIG_DERIVED( omegaf, robokid ) /* video hardware */ MCFG_VIDEO_START(omegaf) - MCFG_VIDEO_UPDATE(omegaf) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(omegaf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index aa944227969..d1cc2e3965b 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -829,6 +829,7 @@ static MACHINE_CONFIG_START( ninjaw, ninjaw_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) + MCFG_SCREEN_UPDATE(ninjaw) MCFG_SCREEN_ADD("mscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -836,6 +837,7 @@ static MACHINE_CONFIG_START( ninjaw, ninjaw_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) + MCFG_SCREEN_UPDATE(ninjaw) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -843,9 +845,9 @@ static MACHINE_CONFIG_START( ninjaw, ninjaw_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) + MCFG_SCREEN_UPDATE(ninjaw) MCFG_VIDEO_START(ninjaw) - MCFG_VIDEO_UPDATE(ninjaw) MCFG_TC0100SCN_ADD("tc0100scn_1", darius2_tc0100scn_intf_l) MCFG_TC0100SCN_ADD("tc0100scn_2", darius2_tc0100scn_intf_m) @@ -913,6 +915,7 @@ static MACHINE_CONFIG_START( darius2, ninjaw_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) + MCFG_SCREEN_UPDATE(ninjaw) MCFG_SCREEN_ADD("mscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -920,6 +923,7 @@ static MACHINE_CONFIG_START( darius2, ninjaw_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) + MCFG_SCREEN_UPDATE(ninjaw) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -927,9 +931,9 @@ static MACHINE_CONFIG_START( darius2, ninjaw_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) + MCFG_SCREEN_UPDATE(ninjaw) MCFG_VIDEO_START(ninjaw) - MCFG_VIDEO_UPDATE(ninjaw) MCFG_TC0100SCN_ADD("tc0100scn_1", darius2_tc0100scn_intf_l) MCFG_TC0100SCN_ADD("tc0100scn_2", darius2_tc0100scn_intf_m) diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c index 688b7d06782..f542c21fb72 100644 --- a/src/mame/drivers/nitedrvr.c +++ b/src/mame/drivers/nitedrvr.c @@ -154,13 +154,13 @@ static MACHINE_CONFIG_START( nitedrvr, nitedrvr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(nitedrvr) MCFG_GFXDECODE(nitedrvr) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(nitedrvr) - MCFG_VIDEO_UPDATE(nitedrvr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c index cd5fea2d8bc..5225d2e38c2 100644 --- a/src/mame/drivers/niyanpai.c +++ b/src/mame/drivers/niyanpai.c @@ -789,11 +789,11 @@ static MACHINE_CONFIG_START( niyanpai, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(1024, 512) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1) + MCFG_SCREEN_UPDATE(niyanpai) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(niyanpai) - MCFG_VIDEO_UPDATE(niyanpai) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 86f61ef3fee..77dc7bed5f6 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -907,7 +907,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap ) } -static VIDEO_UPDATE( nmg5 ) +static SCREEN_UPDATE( nmg5 ) { nmg5_state *state = screen->machine->driver_data<nmg5_state>(); @@ -1051,12 +1051,12 @@ static MACHINE_CONFIG_START( nmg5, nmg5_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(nmg5) MCFG_GFXDECODE(nmg5) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(nmg5) - MCFG_VIDEO_UPDATE(nmg5) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 786552fef4d..470345fa51a 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -3570,13 +3570,13 @@ static MACHINE_CONFIG_START( tharrier, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tharrier) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(tharrier) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(tharrier) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3614,13 +3614,13 @@ static MACHINE_CONFIG_START( manybloc, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(manybloc) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(tharrier) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(manybloc) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3656,14 +3656,13 @@ static MACHINE_CONFIG_START( mustang, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3701,13 +3700,13 @@ static MACHINE_CONFIG_START( mustangb, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4, 1320000) @@ -3734,13 +3733,13 @@ static MACHINE_CONFIG_START( bioship, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bioship) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(bioship) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(bioship) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(bioship) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3776,13 +3775,13 @@ static MACHINE_CONFIG_START( vandyke, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3821,13 +3820,13 @@ static MACHINE_CONFIG_START( vandykeb, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3853,13 +3852,13 @@ static MACHINE_CONFIG_START( acrobatm, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3899,13 +3898,13 @@ static MACHINE_CONFIG_START( tdragonb, driver_device ) /* bootleg using Raiden s MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4, 1320000) @@ -3929,13 +3928,13 @@ static MACHINE_CONFIG_START( tdragon, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tdragon) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(tdragon) MCFG_TIMER_ADD_PERIODIC("coinsim", tdragon_mcu_sim, attotime::from_hz(10000)) // not real, but for simulating the MCU /* sound hardware */ @@ -3973,13 +3972,13 @@ static MACHINE_CONFIG_START( ssmissin, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4006,13 +4005,13 @@ static MACHINE_CONFIG_START( strahl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(strahl) + MCFG_SCREEN_EOF(strahl) MCFG_GFXDECODE(strahl) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(strahl) - MCFG_VIDEO_EOF(strahl) - MCFG_VIDEO_UPDATE(strahl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4048,13 +4047,13 @@ static MACHINE_CONFIG_START( hachamf, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(hachamf) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(hachamf) MCFG_TIMER_ADD_PERIODIC("coinsim", hachamf_mcu_sim, attotime::from_hz(10000)) // not real, but for simulating the MCU /* sound hardware */ @@ -4091,13 +4090,13 @@ static MACHINE_CONFIG_START( macross, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4133,13 +4132,13 @@ static MACHINE_CONFIG_START( blkheart, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4175,13 +4174,13 @@ static MACHINE_CONFIG_START( gunnail, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gunnail) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(gunnail) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(gunnail) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4219,13 +4218,13 @@ static MACHINE_CONFIG_START( macross2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gunnail) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross2) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross2) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(gunnail) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4262,13 +4261,13 @@ static MACHINE_CONFIG_START( tdragon2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gunnail) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross2) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross2) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(gunnail) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4304,13 +4303,13 @@ static MACHINE_CONFIG_START( raphero, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(gunnail) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross2) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(raphero) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(gunnail) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4343,13 +4342,13 @@ static MACHINE_CONFIG_START( bjtwin, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bjtwin) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(bjtwin) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(bjtwin) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(bjtwin) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4851,13 +4850,13 @@ static MACHINE_CONFIG_START( stagger1, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(afega) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(stagger1) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(afega) - MCFG_VIDEO_UPDATE(afega) - MCFG_VIDEO_EOF(nmk) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -4876,7 +4875,8 @@ static MACHINE_CONFIG_DERIVED( redhawki, stagger1 ) /* basic machine hardware */ /* video hardware */ - MCFG_VIDEO_UPDATE(redhawki) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(redhawki) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( redhawkb, stagger1 ) @@ -4884,7 +4884,8 @@ static MACHINE_CONFIG_DERIVED( redhawkb, stagger1 ) /* basic machine hardware */ /* video hardware */ MCFG_GFXDECODE(redhawkb) - MCFG_VIDEO_UPDATE(redhawkb) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(redhawkb) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( grdnstrm, stagger1 ) @@ -4894,7 +4895,8 @@ static MACHINE_CONFIG_DERIVED( grdnstrm, stagger1 ) /* video hardware */ MCFG_GFXDECODE(grdnstrm) MCFG_VIDEO_START(firehawk) - MCFG_VIDEO_UPDATE(firehawk) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(firehawk) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( grdnstrmk, stagger1 ) @@ -4912,7 +4914,8 @@ static MACHINE_CONFIG_DERIVED( popspops, grdnstrm ) /* basic machine hardware */ /* video hardware */ - MCFG_VIDEO_UPDATE(bubl2000) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(bubl2000) MACHINE_CONFIG_END static MACHINE_CONFIG_START( firehawk, driver_device ) @@ -4932,13 +4935,13 @@ static MACHINE_CONFIG_START( firehawk, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(firehawk) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(grdnstrm) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(firehawk) - MCFG_VIDEO_UPDATE(firehawk) - MCFG_VIDEO_EOF(nmk) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4968,14 +4971,13 @@ static MACHINE_CONFIG_START( twinactn, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(macross) + MCFG_SCREEN_EOF(nmk) MCFG_GFXDECODE(macross) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(macross) - MCFG_VIDEO_EOF(nmk) - MCFG_VIDEO_UPDATE(macross) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index c7ccdd797c8..6b64068dae5 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -566,7 +566,7 @@ static VIDEO_START( norautp ) } -static VIDEO_UPDATE( norautp ) +static SCREEN_UPDATE( norautp ) { int x, y, count; @@ -1264,13 +1264,13 @@ static MACHINE_CONFIG_START( noraut_base, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(2*16, 31*16-1, (0*16) + 8, 16*16-1) /* the hardware clips the top 8 pixels */ + MCFG_SCREEN_UPDATE(norautp) MCFG_GFXDECODE(norautp) MCFG_PALETTE_INIT(norautp) MCFG_PALETTE_LENGTH(8) MCFG_VIDEO_START(norautp) - MCFG_VIDEO_UPDATE(norautp) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c index cea8d161d7b..323d203335d 100644 --- a/src/mame/drivers/nova2001.c +++ b/src/mame/drivers/nova2001.c @@ -693,13 +693,13 @@ static MACHINE_CONFIG_START( nova2001, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(nova2001) MCFG_GFXDECODE(nova2001) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(nova2001) MCFG_VIDEO_START(nova2001) - MCFG_VIDEO_UPDATE(nova2001) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -735,12 +735,12 @@ static MACHINE_CONFIG_START( ninjakun, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1 ) + MCFG_SCREEN_UPDATE(ninjakun) MCFG_GFXDECODE(ninjakun) MCFG_PALETTE_LENGTH(0x300) MCFG_VIDEO_START(ninjakun) - MCFG_VIDEO_UPDATE(ninjakun) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -768,13 +768,13 @@ static MACHINE_CONFIG_START( pkunwar, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(pkunwar) MCFG_GFXDECODE(pkunwar) MCFG_PALETTE_LENGTH(0x200) MCFG_PALETTE_INIT(nova2001) MCFG_VIDEO_START(pkunwar) - MCFG_VIDEO_UPDATE(pkunwar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -808,12 +808,12 @@ static MACHINE_CONFIG_START( raiders5, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(raiders5) MCFG_GFXDECODE(raiders5) MCFG_PALETTE_LENGTH(0x300) MCFG_VIDEO_START(raiders5) - MCFG_VIDEO_UPDATE(raiders5) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c index b1c15fa6a60..c7df56789a6 100644 --- a/src/mame/drivers/nsmpoker.c +++ b/src/mame/drivers/nsmpoker.c @@ -110,7 +110,7 @@ static VIDEO_START( nsmpoker ) } -static VIDEO_UPDATE( nsmpoker ) +static SCREEN_UPDATE( nsmpoker ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -389,6 +389,7 @@ static MACHINE_CONFIG_START( nsmpoker, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(nsmpoker) MCFG_GFXDECODE(nsmpoker) @@ -396,7 +397,6 @@ static MACHINE_CONFIG_START( nsmpoker, driver_device ) MCFG_PALETTE_LENGTH(8) MCFG_VIDEO_START(nsmpoker) - MCFG_VIDEO_UPDATE(nsmpoker) MACHINE_CONFIG_END diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index 182f82099ca..dc657f13b9b 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -656,11 +656,11 @@ static MACHINE_CONFIG_START( snes, snes_state ) /* video hardware */ MCFG_VIDEO_START( snes ) - MCFG_VIDEO_UPDATE( snes ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC) + MCFG_SCREEN_UPDATE( snes ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 15325296604..414539c472c 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -259,7 +259,7 @@ static void voodoo_vblank_0(device_t *device, int param) } -static VIDEO_UPDATE( nwktr ) +static SCREEN_UPDATE( nwktr ) { nwktr_state *state = screen->machine->driver_data<nwktr_state>(); device_t *voodoo = screen->machine->device("voodoo"); @@ -704,11 +704,10 @@ static MACHINE_CONFIG_START( nwktr, nwktr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(nwktr) MCFG_PALETTE_LENGTH(65536) - MCFG_VIDEO_UPDATE(nwktr) - MCFG_K001604_ADD("k001604", racingj_k001604_intf) MCFG_K056800_ADD("k056800", nwktr_k056800_interface) diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index 024879a141c..ad94f79b0a7 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -871,12 +871,12 @@ static MACHINE_CONFIG_START( nycaptor, nycaptor_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nycaptor) MCFG_GFXDECODE(nycaptor) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(nycaptor) - MCFG_VIDEO_UPDATE(nycaptor) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -933,12 +933,12 @@ static MACHINE_CONFIG_START( cyclshtg, nycaptor_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nycaptor) MCFG_GFXDECODE(nycaptor) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(nycaptor) - MCFG_VIDEO_UPDATE(nycaptor) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -991,12 +991,12 @@ static MACHINE_CONFIG_START( bronx, nycaptor_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(nycaptor) MCFG_GFXDECODE(nycaptor) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(nycaptor) - MCFG_VIDEO_UPDATE(nycaptor) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index f3a4f45d398..beebbbd0fd5 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -426,7 +426,7 @@ static const mc6845_interface mc6845_intf = }; -static VIDEO_UPDATE( nyny ) +static SCREEN_UPDATE( nyny ) { nyny_state *state = screen->machine->driver_data<nyny_state>(); @@ -730,11 +730,10 @@ static MACHINE_CONFIG_START( nyny, nyny_state ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_VIDEO_UPDATE(nyny) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */ + MCFG_SCREEN_UPDATE(nyny) MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c index c144d7404b2..106c6ce335b 100644 --- a/src/mame/drivers/offtwall.c +++ b/src/mame/drivers/offtwall.c @@ -423,9 +423,9 @@ static MACHINE_CONFIG_START( offtwall, offtwall_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a VAD chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(offtwall) MCFG_VIDEO_START(offtwall) - MCFG_VIDEO_UPDATE(offtwall) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_iii_mono_noadpcm) diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index e4930f17ca5..937fe7a77dd 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -336,12 +336,12 @@ static MACHINE_CONFIG_START( ohmygod, ohmygod_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 0*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(ohmygod) MCFG_GFXDECODE(ohmygod) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(ohmygod) - MCFG_VIDEO_UPDATE(ohmygod) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index 696497e62a8..e0baf2e0a74 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -876,12 +876,12 @@ static MACHINE_CONFIG_START( ojankohs, ojankohs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1) + MCFG_SCREEN_UPDATE(ojankohs) MCFG_GFXDECODE(ojankohs) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(ojankohs) - MCFG_VIDEO_UPDATE(ojankohs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -914,13 +914,13 @@ static MACHINE_CONFIG_START( ojankoy, ojankohs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1) + MCFG_SCREEN_UPDATE(ojankohs) MCFG_GFXDECODE(ojankohs) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(ojankoy) MCFG_VIDEO_START(ojankoy) - MCFG_VIDEO_UPDATE(ojankohs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -953,12 +953,12 @@ static MACHINE_CONFIG_START( ccasino, ojankohs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1) + MCFG_SCREEN_UPDATE(ojankohs) MCFG_GFXDECODE(ojankohs) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(ojankoy) - MCFG_VIDEO_UPDATE(ojankohs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -991,11 +991,11 @@ static MACHINE_CONFIG_START( ojankoc, ojankohs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 8, 248-1) + MCFG_SCREEN_UPDATE(ojankoc) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(ojankoc) - MCFG_VIDEO_UPDATE(ojankoc) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 4a002f6c61a..0a5fccbd9f0 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -219,7 +219,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -static VIDEO_UPDATE( olibochu ) +static SCREEN_UPDATE( olibochu ) { olibochu_state *state = screen->machine->driver_data<olibochu_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -459,13 +459,13 @@ static MACHINE_CONFIG_START( olibochu, olibochu_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(olibochu) MCFG_GFXDECODE(olibochu) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(olibochu) MCFG_VIDEO_START(olibochu) - MCFG_VIDEO_UPDATE(olibochu) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c index 3a7b6aad7d8..96448f125fe 100644 --- a/src/mame/drivers/omegrace.c +++ b/src/mame/drivers/omegrace.c @@ -496,9 +496,9 @@ static MACHINE_CONFIG_START( omegrace, driver_device ) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(522, 1566, 522, 1566) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(dvg) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index ff529d09aca..faa3aa44c8a 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -390,12 +390,12 @@ static MACHINE_CONFIG_START( oneshot, oneshot_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 20*16-1, 0*16, 15*16-1) + MCFG_SCREEN_UPDATE(oneshot) MCFG_GFXDECODE(oneshot) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(oneshot) - MCFG_VIDEO_UPDATE(oneshot) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -412,7 +412,8 @@ static MACHINE_CONFIG_DERIVED( maddonna, oneshot ) /* basic machine hardware */ /* video hardware */ - MCFG_VIDEO_UPDATE(maddonna) // no crosshair + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(maddonna) // no crosshair MACHINE_CONFIG_END diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 1804955aed0..e47419f577c 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -90,7 +90,7 @@ static VIDEO_START( onetwo ) state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } -static VIDEO_UPDATE( onetwo ) +static SCREEN_UPDATE( onetwo ) { onetwo_state *state = screen->machine->driver_data<onetwo_state>(); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); @@ -372,12 +372,12 @@ static MACHINE_CONFIG_START( onetwo, onetwo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(onetwo) MCFG_GFXDECODE(onetwo) MCFG_PALETTE_LENGTH(0x80) MCFG_VIDEO_START(onetwo) - MCFG_VIDEO_UPDATE(onetwo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index b4e5bcf4456..cd5d131b4e7 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -757,12 +757,11 @@ static MACHINE_CONFIG_START( opwolf, opwolf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(opwolf) MCFG_GFXDECODE(opwolf) MCFG_PALETTE_LENGTH(8192) - MCFG_VIDEO_UPDATE(opwolf) - MCFG_PC080SN_ADD("pc080sn", opwolf_pc080sn_intf) MCFG_PC090OJ_ADD("pc090oj", opwolf_pc090oj_intf) @@ -813,12 +812,11 @@ static MACHINE_CONFIG_START( opwolfb, opwolf_state ) /* OSC clocks unknown for t MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(opwolf) MCFG_GFXDECODE(opwolfb) MCFG_PALETTE_LENGTH(8192) - MCFG_VIDEO_UPDATE(opwolf) - MCFG_PC080SN_ADD("pc080sn", opwolf_pc080sn_intf) MCFG_PC090OJ_ADD("pc090oj", opwolf_pc090oj_intf) diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index 26372c53bdf..620b476748f 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -314,12 +314,12 @@ static MACHINE_CONFIG_START( orbit, orbit_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2, 384*2, 0, 256*2, 261*2, 0, 240*2) + MCFG_SCREEN_UPDATE(orbit) MCFG_GFXDECODE(orbit) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(orbit) - MCFG_VIDEO_UPDATE(orbit) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c index c101c02ba4e..538db55ea3c 100644 --- a/src/mame/drivers/othello.c +++ b/src/mame/drivers/othello.c @@ -116,7 +116,7 @@ static PALETTE_INIT( othello ) palette_set_color(machine, 0x0f, MAKE_RGB(0xff, 0xff, 0xff)); } -static VIDEO_UPDATE( othello ) +static SCREEN_UPDATE( othello ) { othello_state *state = screen->machine->driver_data<othello_state>(); @@ -435,12 +435,11 @@ static MACHINE_CONFIG_START( othello, othello_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*6, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*6-1, 0*8, 64*8-1) + MCFG_SCREEN_UPDATE(othello) MCFG_PALETTE_LENGTH(0x10) MCFG_PALETTE_INIT(othello) - MCFG_VIDEO_UPDATE(othello) - MCFG_MC6845_ADD("crtc", H46505, 1000000 /* ? MHz */, h46505_intf) /* H46505 @ CPU clock */ /* sound hardware */ diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index 22934ca4eb8..191741f969f 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -254,13 +254,13 @@ static MACHINE_CONFIG_START( othldrby, othldrby_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(othldrby) + MCFG_SCREEN_EOF(othldrby) MCFG_GFXDECODE(othldrby) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(othldrby) - MCFG_VIDEO_EOF(othldrby) - MCFG_VIDEO_UPDATE(othldrby) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index b2572b6a347..3b45b6492d8 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -743,12 +743,12 @@ static MACHINE_CONFIG_START( othunder, othunder_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(othunder) MCFG_GFXDECODE(othunder) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(othunder) - MCFG_VIDEO_UPDATE(othunder) MCFG_TC0100SCN_ADD("tc0100scn", othunder_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", othunder_tc0110pcr_intf) diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index 6d0d1b598d4..7f5fa81fb57 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -363,12 +363,11 @@ static MACHINE_CONFIG_START( overdriv, overdriv_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 0*8, 32*8-1 ) + MCFG_SCREEN_UPDATE(overdriv) // MCFG_GFXDECODE(overdriv) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(overdriv) - MCFG_K053246_ADD("k053246", overdriv_k053246_intf) MCFG_K051316_ADD("k051316_1", overdriv_k051316_intf_1) MCFG_K051316_ADD("k051316_2", overdriv_k051316_intf_2) diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index e7ea0fe09b5..81a4ce49b4b 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -419,13 +419,13 @@ static MACHINE_CONFIG_START( pacland, pacland_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(3*8, 39*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pacland) MCFG_GFXDECODE(pacland) MCFG_PALETTE_LENGTH(256*4+256*4+64*16) MCFG_PALETTE_INIT(pacland) MCFG_VIDEO_START(pacland) - MCFG_VIDEO_UPDATE(pacland) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 8ec8f6a09f0..3be5315c554 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -3178,10 +3178,10 @@ static MACHINE_CONFIG_START( pacman, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(pacman) MCFG_PALETTE_INIT(pacman) MCFG_VIDEO_START(pacman) - MCFG_VIDEO_UPDATE(pacman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3330,9 +3330,9 @@ static MACHINE_CONFIG_DERIVED( s2650games, pacman ) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) + MCFG_SCREEN_UPDATE(s2650games) MCFG_VIDEO_START(s2650games) - MCFG_VIDEO_UPDATE(s2650games) /* sound hardware */ MCFG_SOUND_REPLACE("namco", SN76496, MASTER_CLOCK/6) /* 1H */ diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index f401f337c1c..ba9c27a52a3 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -379,13 +379,13 @@ static MACHINE_CONFIG_START( pandoras, pandoras_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pandoras) MCFG_GFXDECODE(pandoras) MCFG_PALETTE_LENGTH(16*16+16*16) MCFG_PALETTE_INIT(pandoras) MCFG_VIDEO_START(pandoras) - MCFG_VIDEO_UPDATE(pandoras) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c index d5e57e2d9a3..6182aaf7b66 100644 --- a/src/mame/drivers/pangofun.c +++ b/src/mame/drivers/pangofun.c @@ -96,7 +96,7 @@ static VIDEO_START(pangofun) { } -static VIDEO_UPDATE(pangofun) +static SCREEN_UPDATE(pangofun) { return 0; } @@ -122,11 +122,11 @@ static MACHINE_CONFIG_START( pangofun, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(pangofun) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(pangofun) - MCFG_VIDEO_UPDATE(pangofun) MACHINE_CONFIG_END diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index e1be1189e19..8e5ed1372b3 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -236,7 +236,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -static VIDEO_UPDATE( panicr) +static SCREEN_UPDATE( panicr) { bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); tilemap_mark_all_tiles_dirty( txttilemap ); @@ -388,13 +388,13 @@ static MACHINE_CONFIG_START( panicr, panicr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(panicr) MCFG_GFXDECODE(panicr) MCFG_PALETTE_LENGTH(256*3) MCFG_PALETTE_INIT(panicr) MCFG_VIDEO_START(panicr) - MCFG_VIDEO_UPDATE(panicr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 714ea0ef24b..d159ba3599a 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -580,12 +580,12 @@ static MACHINE_CONFIG_START( paradise, paradise_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-1-16) + MCFG_SCREEN_UPDATE(paradise) MCFG_GFXDECODE(paradise) MCFG_PALETTE_LENGTH(0x800 + 16) MCFG_VIDEO_START(paradise) - MCFG_VIDEO_UPDATE(paradise) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -612,8 +612,8 @@ static MACHINE_CONFIG_DERIVED( torus, paradise ) MCFG_CPU_IO_MAP(torus_io_map) MCFG_GFXDECODE(torus) - - MCFG_VIDEO_UPDATE(torus) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(torus) MCFG_DEVICE_REMOVE("oki2") MACHINE_CONFIG_END @@ -627,7 +627,8 @@ static MACHINE_CONFIG_DERIVED( madball, paradise ) MCFG_GFXDECODE(madball) - MCFG_VIDEO_UPDATE(madball) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(madball) MCFG_DEVICE_REMOVE("oki2") MACHINE_CONFIG_END diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c index 438ad73a09a..c0df499c5cf 100644 --- a/src/mame/drivers/paranoia.c +++ b/src/mame/drivers/paranoia.c @@ -157,13 +157,13 @@ static MACHINE_CONFIG_START( paranoia, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242) + MCFG_SCREEN_UPDATE( pce ) /* MCFG_GFXDECODE( pce_gfxdecodeinfo ) */ MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT( vce ) MCFG_VIDEO_START( pce ) - MCFG_VIDEO_UPDATE( pce ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6) diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index 355ac11f089..4fd714d5f13 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -319,11 +319,10 @@ static MACHINE_CONFIG_START( parodius, parodius_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(parodius) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(parodius) - MCFG_K052109_ADD("k052109", parodius_k052109_intf) MCFG_K053245_ADD("k053245", parodius_k05324x_intf) MCFG_K053251_ADD("k053251") diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index c276c42f9b7..8ac192d6b5e 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -332,7 +332,7 @@ static VIDEO_START( pasha2 ) state->save_item(NAME(state->bitmap1)); } -static VIDEO_UPDATE( pasha2 ) +static SCREEN_UPDATE( pasha2 ) { pasha2_state *state = screen->machine->driver_data<pasha2_state>(); int x, y, count; @@ -416,11 +416,11 @@ static MACHINE_CONFIG_START( pasha2, pasha2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 383, 0, 239) + MCFG_SCREEN_UPDATE(pasha2) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(pasha2) - MCFG_VIDEO_UPDATE(pasha2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c index dad8e2a3a2e..c8acbff0f29 100644 --- a/src/mame/drivers/pass.c +++ b/src/mame/drivers/pass.c @@ -250,12 +250,12 @@ static MACHINE_CONFIG_START( pass, pass_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pass) MCFG_PALETTE_LENGTH(0x200) MCFG_GFXDECODE(pass) MCFG_VIDEO_START(pass) - MCFG_VIDEO_UPDATE(pass) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c index 12dab511d97..50aeeb27e7b 100644 --- a/src/mame/drivers/pastelg.c +++ b/src/mame/drivers/pastelg.c @@ -424,12 +424,12 @@ static MACHINE_CONFIG_START( pastelg, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) + MCFG_SCREEN_UPDATE(pastelg) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(pastelg) MCFG_VIDEO_START(pastelg) - MCFG_VIDEO_UPDATE(pastelg) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -483,12 +483,12 @@ static MACHINE_CONFIG_START( threeds, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) + MCFG_SCREEN_UPDATE(pastelg) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(pastelg) MCFG_VIDEO_START(pastelg) - MCFG_VIDEO_UPDATE(pastelg) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c index 544360a59e7..b17c050c0e1 100644 --- a/src/mame/drivers/pbaction.c +++ b/src/mame/drivers/pbaction.c @@ -292,12 +292,12 @@ static MACHINE_CONFIG_START( pbaction, pbaction_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pbaction) MCFG_GFXDECODE(pbaction) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(pbaction) - MCFG_VIDEO_UPDATE(pbaction) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c index 5c7925d8cce..970d123bd85 100644 --- a/src/mame/drivers/pcat_dyn.c +++ b/src/mame/drivers/pcat_dyn.c @@ -101,7 +101,7 @@ static void cga_alphanumeric_tilemap(running_machine *machine, bitmap_t *bitmap, } } -static VIDEO_UPDATE(pcat_dyn) +static SCREEN_UPDATE(pcat_dyn) { cga_alphanumeric_tilemap(screen->machine,bitmap,cliprect,RES_640x200,0x10000/4,0); @@ -522,6 +522,7 @@ static MACHINE_CONFIG_START( pcat_dyn, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(pcat_dyn) MCFG_GFXDECODE( pcat_dyn ) MCFG_MACHINE_START(pcat_dyn) @@ -539,7 +540,6 @@ static MACHINE_CONFIG_START( pcat_dyn, driver_device ) MCFG_PALETTE_LENGTH(0x300) MCFG_VIDEO_START(pcat_dyn) - MCFG_VIDEO_UPDATE(pcat_dyn) MACHINE_CONFIG_END /*************************************** diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c index 8d5264c2a29..2cdad474992 100644 --- a/src/mame/drivers/pcktgal.c +++ b/src/mame/drivers/pcktgal.c @@ -234,13 +234,13 @@ static MACHINE_CONFIG_START( pcktgal, pcktgal_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pcktgal) MCFG_GFXDECODE(pcktgal) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(pcktgal) MCFG_VIDEO_START(pcktgal) - MCFG_VIDEO_UPDATE(pcktgal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index 08fc51d7ebd..4147571ce67 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -203,7 +203,7 @@ static void cga_alphanumeric_tilemap(running_machine *machine, bitmap_t *bitmap, } -static VIDEO_UPDATE( filetto ) +static SCREEN_UPDATE( filetto ) { /* xx1x xxxx Attribute bit 7. 0=blink, 1=Intesity xxx1 xxxx 640x200 mode @@ -255,7 +255,7 @@ static void vga_bitmap_layer(running_machine *machine, bitmap_t *bitmap,const re } /*S3 Video card,VGA*/ -static VIDEO_UPDATE( tetriskr ) +static SCREEN_UPDATE( tetriskr ) { bitmap_fill(bitmap, cliprect, 0); @@ -945,13 +945,13 @@ static MACHINE_CONFIG_START( filetto, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0*8, 640-1, 0*8, 480-1) + MCFG_SCREEN_UPDATE(filetto) MCFG_PALETTE_LENGTH(0x300) MCFG_PALETTE_INIT(filetto) MCFG_VIDEO_START(filetto) - MCFG_VIDEO_UPDATE(filetto) /*Sound Hardware*/ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -992,13 +992,13 @@ static MACHINE_CONFIG_START( tetriskr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0*8, 640-1, 0*8, 480-1) + MCFG_SCREEN_UPDATE(tetriskr) MCFG_PALETTE_LENGTH(0x300) MCFG_PALETTE_INIT(filetto) MCFG_VIDEO_START(tetriskr) - MCFG_VIDEO_UPDATE(tetriskr) /*Sound Hardware*/ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c index 335b55717dc..1164bb4e910 100644 --- a/src/mame/drivers/pengo.c +++ b/src/mame/drivers/pengo.c @@ -358,10 +358,10 @@ static MACHINE_CONFIG_START( pengo, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(pacman) MCFG_PALETTE_INIT(pacman) MCFG_VIDEO_START(pengo) - MCFG_VIDEO_UPDATE(pacman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index fef9e2beeeb..34768725d32 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -664,7 +664,7 @@ static VIDEO_START( peplus ) memset(palette_ram2, 0, 0x3000); } -static VIDEO_UPDATE( peplus ) +static SCREEN_UPDATE( peplus ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); @@ -1030,6 +1030,7 @@ static MACHINE_CONFIG_START( peplus, peplus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE((52+1)*8, (31+1)*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 25*8-1) + MCFG_SCREEN_UPDATE(peplus) MCFG_GFXDECODE(peplus) MCFG_PALETTE_LENGTH(16*16*2) @@ -1039,7 +1040,6 @@ static MACHINE_CONFIG_START( peplus, peplus_state ) MCFG_PALETTE_INIT(peplus) MCFG_VIDEO_START(peplus) - MCFG_VIDEO_UPDATE(peplus) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 558853a3520..8d4afe4e80a 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -1391,13 +1391,13 @@ static MACHINE_CONFIG_START( pgm, pgm_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 56*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(pgm) + MCFG_SCREEN_EOF(pgm) MCFG_GFXDECODE(pgm) MCFG_PALETTE_LENGTH(0x1200/2) MCFG_VIDEO_START(pgm) - MCFG_VIDEO_EOF(pgm) - MCFG_VIDEO_UPDATE(pgm) /*sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1544,13 +1544,13 @@ static MACHINE_CONFIG_START( cavepgm, cavepgm_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 56*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(pgm) + MCFG_SCREEN_EOF(pgm) MCFG_GFXDECODE(pgm) MCFG_PALETTE_LENGTH(0x1200/2) MCFG_VIDEO_START(pgm) - MCFG_VIDEO_EOF(pgm) - MCFG_VIDEO_UPDATE(pgm) /*sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c index 1945729d33b..869caeda814 100644 --- a/src/mame/drivers/phoenix.c +++ b/src/mame/drivers/phoenix.c @@ -462,13 +462,13 @@ static MACHINE_CONFIG_START( phoenix, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(phoenix) MCFG_GFXDECODE(phoenix) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(phoenix) MCFG_VIDEO_START(phoenix) - MCFG_VIDEO_UPDATE(phoenix) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -536,13 +536,13 @@ static MACHINE_CONFIG_START( survival, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(phoenix) MCFG_GFXDECODE(phoenix) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(survival) MCFG_VIDEO_START(phoenix) - MCFG_VIDEO_UPDATE(phoenix) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c index cfc8fc562ac..f0126930847 100644 --- a/src/mame/drivers/photon.c +++ b/src/mame/drivers/photon.c @@ -187,7 +187,7 @@ static VIDEO_START( photon ) { } -static VIDEO_UPDATE( photon ) +static SCREEN_UPDATE( photon ) { return pk8000_video_update(screen, bitmap, cliprect, screen->machine->region("maincpu")->base()); } @@ -209,11 +209,11 @@ static MACHINE_CONFIG_START( photon, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256+32, 192+32) MCFG_SCREEN_VISIBLE_AREA(0, 256+32-1, 0, 192+32-1) + MCFG_SCREEN_UPDATE(photon) MCFG_PALETTE_LENGTH(16) MCFG_PALETTE_INIT(pk8000) MCFG_VIDEO_START(photon) - MCFG_VIDEO_UPDATE(photon) MCFG_I8255A_ADD( "ppi8255_1", pk8000_ppi8255_interface_1 ) MCFG_I8255A_ADD( "ppi8255_2", pk8000_ppi8255_interface_2 ) diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c index ccc928f1973..e2aa3afea08 100644 --- a/src/mame/drivers/photon2.c +++ b/src/mame/drivers/photon2.c @@ -94,7 +94,7 @@ INLINE unsigned char get_display_color (unsigned char color, int invert) /* Code to change the FLASH status every 25 frames. Note this must be independent of frame skip etc. */ -static VIDEO_EOF( spectrum ) +static SCREEN_EOF( spectrum ) { spectrum_frame_number++; if (spectrum_frame_number >= 25) @@ -109,7 +109,7 @@ INLINE void spectrum_plot_pixel(bitmap_t *bitmap, int x, int y, UINT32 color) *BITMAP_ADDR16(bitmap, y, x) = (UINT16)color; } -static VIDEO_UPDATE( spectrum ) +static SCREEN_UPDATE( spectrum ) { /* for now do a full-refresh */ int x, y, b, scrx, scry; @@ -313,12 +313,13 @@ static MACHINE_CONFIG_START( photon2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(SPEC_SCREEN_WIDTH, SPEC_SCREEN_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(0, SPEC_SCREEN_WIDTH-1, 0, SPEC_SCREEN_HEIGHT-1) + MCFG_SCREEN_UPDATE( spectrum ) + MCFG_SCREEN_EOF( spectrum ) + MCFG_PALETTE_LENGTH(16) MCFG_PALETTE_INIT( spectrum ) MCFG_VIDEO_START( spectrum ) - MCFG_VIDEO_UPDATE( spectrum ) - MCFG_VIDEO_EOF( spectrum ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/photoply.c b/src/mame/drivers/photoply.c index b11f4e75fd3..01e00fc956f 100644 --- a/src/mame/drivers/photoply.c +++ b/src/mame/drivers/photoply.c @@ -95,7 +95,7 @@ static void cga_alphanumeric_tilemap(running_machine *machine, bitmap_t *bitmap, } -static VIDEO_UPDATE(photoply) +static SCREEN_UPDATE(photoply) { cga_alphanumeric_tilemap(screen->machine,bitmap,cliprect,RES_640x200,0x18000/4,0); @@ -507,6 +507,7 @@ static MACHINE_CONFIG_START( photoply, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(photoply) MCFG_GFXDECODE( photoply ) @@ -525,7 +526,6 @@ static MACHINE_CONFIG_START( photoply, driver_device ) MCFG_PALETTE_LENGTH(0x300) MCFG_VIDEO_START(photoply) - MCFG_VIDEO_UPDATE(photoply) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index b88e4cb5f73..62be2265e89 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -463,13 +463,13 @@ static MACHINE_CONFIG_START( pingpong, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pingpong) MCFG_GFXDECODE(pingpong) MCFG_PALETTE_LENGTH(64*4+64*4) MCFG_PALETTE_INIT(pingpong) MCFG_VIDEO_START(pingpong) - MCFG_VIDEO_UPDATE(pingpong) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c index d03c47261c0..8924840e548 100644 --- a/src/mame/drivers/pinkiri8.c +++ b/src/mame/drivers/pinkiri8.c @@ -189,7 +189,7 @@ ronjan */ -static VIDEO_UPDATE( pinkiri8 ) +static SCREEN_UPDATE( pinkiri8 ) { static int col_bank; const gfx_element *gfx = screen->machine->gfx[0]; @@ -1119,11 +1119,12 @@ static MACHINE_CONFIG_START( pinkiri8, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 64*8-1) + MCFG_SCREEN_UPDATE(pinkiri8) + MCFG_GFXDECODE(pinkiri8) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(pinkiri8) - MCFG_VIDEO_UPDATE(pinkiri8) MCFG_DEVICE_ADD("janshivdp", JANSHIVDP, 0) diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index f81540e8d96..753ae81441d 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -655,12 +655,12 @@ static MACHINE_CONFIG_START( pipedrm, fromance_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(44*8, 30*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(pipedrm) MCFG_GFXDECODE(pipedrm) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(pipedrm) - MCFG_VIDEO_UPDATE(pipedrm) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -695,12 +695,12 @@ static MACHINE_CONFIG_START( hatris, fromance_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(44*8, 30*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(fromance) MCFG_GFXDECODE(hatris) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(hatris) - MCFG_VIDEO_UPDATE(fromance) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 6f8b49fbc1f..bad66d37a00 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -112,7 +112,7 @@ static VIDEO_START ( pipeline ) tilemap_set_transparent_pen(tilemap2,0); } -static VIDEO_UPDATE ( pipeline ) +static SCREEN_UPDATE( pipeline ) { tilemap_draw(bitmap,cliprect,tilemap1, 0,0); tilemap_draw(bitmap,cliprect,tilemap2, 0,0); @@ -388,6 +388,7 @@ static MACHINE_CONFIG_START( pipeline, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 319, 16, 239) + MCFG_SCREEN_UPDATE(pipeline) MCFG_GFXDECODE(pipeline) @@ -395,7 +396,6 @@ static MACHINE_CONFIG_START( pipeline, driver_device ) MCFG_PALETTE_LENGTH(0x100+0x100) MCFG_VIDEO_START(pipeline) - MCFG_VIDEO_UPDATE(pipeline) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index 1f696b28019..cf2cccbba4f 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -276,11 +276,11 @@ static MACHINE_CONFIG_START( pirates, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pirates) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(pirates) - MCFG_VIDEO_UPDATE(pirates) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c index 11136911ea5..0281fef5e47 100644 --- a/src/mame/drivers/pitnrun.c +++ b/src/mame/drivers/pitnrun.c @@ -253,12 +253,12 @@ static MACHINE_CONFIG_START( pitnrun, pitnrun_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pitnrun) MCFG_GFXDECODE(pitnrun) MCFG_PALETTE_LENGTH(32*3) MCFG_PALETTE_INIT(pitnrun) MCFG_VIDEO_START(pitnrun) - MCFG_VIDEO_UPDATE(pitnrun) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 444cf7d0a49..33304d2122f 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -219,7 +219,7 @@ static VIDEO_START( pkscramble ) tilemap_set_transparent_pen(fg_tilemap,15); } -static VIDEO_UPDATE( pkscramble ) +static SCREEN_UPDATE( pkscramble ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,md_tilemap,0,0); @@ -293,12 +293,12 @@ static MACHINE_CONFIG_START( pkscramble, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1) + MCFG_SCREEN_UPDATE(pkscramble) MCFG_PALETTE_LENGTH(0x800) MCFG_GFXDECODE(pkscram) MCFG_VIDEO_START(pkscramble) - MCFG_VIDEO_UPDATE(pkscramble) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index f42c3e87005..c1be80416c0 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -334,12 +334,11 @@ static MACHINE_CONFIG_START( pktgaldx, pktgaldx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(pktgaldx) MCFG_PALETTE_LENGTH(4096) MCFG_GFXDECODE(pktgaldx) - MCFG_VIDEO_UPDATE(pktgaldx) - MCFG_DECO16IC_ADD("deco_custom", pktgaldx_deco16ic_intf) /* sound hardware */ @@ -371,12 +370,11 @@ static MACHINE_CONFIG_START( pktgaldb, pktgaldx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(pktgaldb) MCFG_PALETTE_LENGTH(4096) MCFG_GFXDECODE(bootleg) - MCFG_VIDEO_UPDATE(pktgaldb) - /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c index e5b844ee56b..0c5d1b1dd4d 100644 --- a/src/mame/drivers/playch10.c +++ b/src/mame/drivers/playch10.c @@ -696,16 +696,17 @@ static MACHINE_CONFIG_START( playch10, playch10_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(32*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(playch10) MCFG_SCREEN_ADD("bottom", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(32*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(playch10) MCFG_PALETTE_INIT(playch10) MCFG_VIDEO_START(playch10) - MCFG_VIDEO_UPDATE(playch10) MCFG_PPU2C03B_ADD("ppu", playch10_ppu_interface) diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index 48e89a7860d..0c38bfe5333 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -967,12 +967,12 @@ static MACHINE_CONFIG_START( bigtwin, playmark_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(bigtwin) MCFG_GFXDECODE(playmark) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(bigtwin) - MCFG_VIDEO_UPDATE(bigtwin) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1006,12 +1006,12 @@ static MACHINE_CONFIG_START( wbeachvl, playmark_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(wbeachvl) MCFG_GFXDECODE(wbeachvl) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(wbeachvl) - MCFG_VIDEO_UPDATE(wbeachvl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1041,12 +1041,12 @@ static MACHINE_CONFIG_START( excelsr, playmark_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(excelsr) MCFG_GFXDECODE(excelsr) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(excelsr) - MCFG_VIDEO_UPDATE(excelsr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1079,12 +1079,12 @@ static MACHINE_CONFIG_START( hotmind, playmark_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(hrdtimes) MCFG_GFXDECODE(hrdtimes) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(hotmind) - MCFG_VIDEO_UPDATE(hrdtimes) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1114,12 +1114,12 @@ static MACHINE_CONFIG_START( hrdtimes, playmark_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(hrdtimes) MCFG_GFXDECODE(hrdtimes) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(hrdtimes) - MCFG_VIDEO_UPDATE(hrdtimes) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index 76fdd6ddbfa..889c83995b0 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -660,11 +660,11 @@ static MACHINE_CONFIG_START( plygonet, polygonet_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(64, 64+368-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(polygonet) MCFG_PALETTE_LENGTH(32768) MCFG_VIDEO_START(polygonet) - MCFG_VIDEO_UPDATE(polygonet) MCFG_K053936_ADD("k053936", polygonet_k053936_intf) diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index 6447dfb4e4f..54cd560d88b 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -168,7 +168,7 @@ static VIDEO_START( pntnpuzl ) pntnpuzl_3a0000ram=auto_alloc_array(machine, UINT16, 0x100000/2); } -static VIDEO_UPDATE( pntnpuzl ) +static SCREEN_UPDATE( pntnpuzl ) { int x,y; int count; @@ -450,11 +450,11 @@ static MACHINE_CONFIG_START( pntnpuzl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(pntnpuzl) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(pntnpuzl) - MCFG_VIDEO_UPDATE(pntnpuzl) MACHINE_CONFIG_END ROM_START( pntnpuzl ) diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c index 9d692ff2b8c..0ea9015e40b 100644 --- a/src/mame/drivers/pokechmp.c +++ b/src/mame/drivers/pokechmp.c @@ -240,12 +240,12 @@ static MACHINE_CONFIG_START( pokechmp, pokechmp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pokechmp) MCFG_GFXDECODE(pokechmp) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(pokechmp) - MCFG_VIDEO_UPDATE(pokechmp) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c index 7f8299beeb7..c6db3cefbbd 100644 --- a/src/mame/drivers/poker72.c +++ b/src/mame/drivers/poker72.c @@ -22,7 +22,7 @@ static VIDEO_START(poker72) } -static VIDEO_UPDATE(poker72) +static SCREEN_UPDATE(poker72) { int x,y,count; @@ -346,13 +346,13 @@ static MACHINE_CONFIG_START( poker72, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(poker72) MCFG_GFXDECODE(poker72) MCFG_PALETTE_LENGTH(0xe00) MCFG_PALETTE_INIT(poker72) MCFG_VIDEO_START(poker72) - MCFG_VIDEO_UPDATE(poker72) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 9ff530efa95..a064b1ffe24 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -897,6 +897,7 @@ static MACHINE_CONFIG_START( polepos, polepos_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(polepos) /* should be correct, but makes polepos2 and clones fail to boot */ // MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 384, 0, 256, 264, 16, 224+16) @@ -907,7 +908,6 @@ static MACHINE_CONFIG_START( polepos, polepos_state ) MCFG_PALETTE_INIT(polepos) MCFG_VIDEO_START(polepos) - MCFG_VIDEO_UPDATE(polepos) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -980,6 +980,7 @@ static MACHINE_CONFIG_START( topracern, polepos_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(polepos) MCFG_GFXDECODE(polepos) MCFG_PALETTE_LENGTH(0x0f00) @@ -987,7 +988,6 @@ static MACHINE_CONFIG_START( topracern, polepos_state ) MCFG_PALETTE_INIT(polepos) MCFG_VIDEO_START(polepos) - MCFG_VIDEO_UPDATE(polepos) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index 3aa6b8474b4..4b9a3556154 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -445,11 +445,11 @@ static MACHINE_CONFIG_START( policetr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(400, 262) /* needs to be verified */ MCFG_SCREEN_VISIBLE_AREA(0, 393, 0, 239) + MCFG_SCREEN_UPDATE(policetr) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(policetr) - MCFG_VIDEO_UPDATE(policetr) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c index 23bb227e9d4..6cc67335f97 100644 --- a/src/mame/drivers/polyplay.c +++ b/src/mame/drivers/polyplay.c @@ -296,13 +296,13 @@ static MACHINE_CONFIG_START( polyplay, polyplay_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(polyplay) MCFG_GFXDECODE(polyplay) MCFG_PALETTE_LENGTH(10) MCFG_PALETTE_INIT(polyplay) MCFG_VIDEO_START(polyplay) - MCFG_VIDEO_UPDATE(polyplay) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/poo.c b/src/mame/drivers/poo.c index b9fe4e84d7f..06f0dd84d3e 100644 --- a/src/mame/drivers/poo.c +++ b/src/mame/drivers/poo.c @@ -53,7 +53,7 @@ static VIDEO_START(unclepoo) } -static VIDEO_UPDATE(unclepoo) +static SCREEN_UPDATE(unclepoo) { int y,x; int count; @@ -330,13 +330,13 @@ static MACHINE_CONFIG_START( unclepoo, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1) + MCFG_SCREEN_UPDATE(unclepoo) MCFG_GFXDECODE(unclepoo) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(unclepoo) MCFG_VIDEO_START(unclepoo) - MCFG_VIDEO_UPDATE(unclepoo) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ay", AY8910, 18000000/12) /* ? Mhz */ diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c index d2e6d048310..c66ae63d335 100644 --- a/src/mame/drivers/poolshrk.c +++ b/src/mame/drivers/poolshrk.c @@ -226,12 +226,12 @@ static MACHINE_CONFIG_START( poolshrk, poolshrk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(1, 255, 24, 255) + MCFG_SCREEN_UPDATE(poolshrk) MCFG_GFXDECODE(poolshrk) MCFG_PALETTE_LENGTH(4) MCFG_PALETTE_INIT(poolshrk) MCFG_VIDEO_START(poolshrk) - MCFG_VIDEO_UPDATE(poolshrk) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c index b1f430cc4ff..e6426c3d899 100644 --- a/src/mame/drivers/pooyan.c +++ b/src/mame/drivers/pooyan.c @@ -239,13 +239,13 @@ static MACHINE_CONFIG_START( pooyan, pooyan_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pooyan) MCFG_GFXDECODE(pooyan) MCFG_PALETTE_LENGTH(16*16+16*16) MCFG_PALETTE_INIT(pooyan) MCFG_VIDEO_START(pooyan) - MCFG_VIDEO_UPDATE(pooyan) /* sound hardware */ MCFG_FRAGMENT_ADD(timeplt_sound) diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index e06fb51fe4a..24e6d3ad2d5 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -439,13 +439,13 @@ static MACHINE_CONFIG_START( skyskipr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 2*16, 30*16-1) + MCFG_SCREEN_UPDATE(popeye) MCFG_GFXDECODE(popeye) MCFG_PALETTE_LENGTH(16+16*2+64*4) MCFG_PALETTE_INIT(popeye) MCFG_VIDEO_START(skyskipr) - MCFG_VIDEO_UPDATE(popeye) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index ee77bb7cde5..ae2887960e5 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -348,13 +348,13 @@ static MACHINE_CONFIG_START( popper, popper_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(33*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 33*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(popper) MCFG_GFXDECODE(popper) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(popper) MCFG_VIDEO_START(popper) - MCFG_VIDEO_UPDATE(popper) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c index bd46f9e1544..1dc90c3a862 100644 --- a/src/mame/drivers/portrait.c +++ b/src/mame/drivers/portrait.c @@ -257,13 +257,13 @@ static MACHINE_CONFIG_START( portrait, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 0*8, 40*8-1) + MCFG_SCREEN_UPDATE(portrait) MCFG_GFXDECODE(portrait) MCFG_PALETTE_LENGTH(0x800) MCFG_PALETTE_INIT(portrait) MCFG_VIDEO_START(portrait) - MCFG_VIDEO_UPDATE(portrait) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 32ee5282691..730cfc27dab 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -427,7 +427,7 @@ static VIDEO_START( powerbal ) tilemap_set_scrolly(state->bg_tilemap, 0, state->bg_yoffset); } -static VIDEO_UPDATE( powerbal ) +static SCREEN_UPDATE( powerbal ) { playmark_state *state = screen->machine->driver_data<playmark_state>(); @@ -500,12 +500,12 @@ static MACHINE_CONFIG_START( powerbal, playmark_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(128*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(powerbal) MCFG_GFXDECODE(powerbal) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(powerbal) - MCFG_VIDEO_UPDATE(powerbal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -534,12 +534,12 @@ static MACHINE_CONFIG_START( magicstk, playmark_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(128*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(powerbal) MCFG_GFXDECODE(powerbal) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(powerbal) - MCFG_VIDEO_UPDATE(powerbal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c index 3e00e4d7226..54b394fe559 100644 --- a/src/mame/drivers/powerins.c +++ b/src/mame/drivers/powerins.c @@ -360,12 +360,12 @@ static MACHINE_CONFIG_START( powerins, powerins_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(powerins) MCFG_GFXDECODE(powerins) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(powerins) - MCFG_VIDEO_UPDATE(powerins) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index f54025b482c..798a13a6e20 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -349,7 +349,7 @@ static VIDEO_START( ppmast93 ) tilemap_set_transparent_pen(state->fg_tilemap,0); } -static VIDEO_UPDATE( ppmast93 ) +static SCREEN_UPDATE( ppmast93 ) { ppmast93_state *state = screen->machine->driver_data<ppmast93_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,0,0); @@ -376,6 +376,7 @@ static MACHINE_CONFIG_START( ppmast93, ppmast93_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) + MCFG_SCREEN_UPDATE(ppmast93) MCFG_GFXDECODE(ppmast93) @@ -383,7 +384,6 @@ static MACHINE_CONFIG_START( ppmast93, ppmast93_state ) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(ppmast93) - MCFG_VIDEO_UPDATE(ppmast93) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index fd94be28e2c..6dae28fc19e 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -221,12 +221,12 @@ static MACHINE_CONFIG_START( prehisle, prehisle_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(prehisle) MCFG_GFXDECODE(prehisle) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(prehisle) - MCFG_VIDEO_UPDATE(prehisle) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index 2149e016aa3..2f1c8610d22 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -87,7 +87,7 @@ static VIDEO_START( progolf ) } -static VIDEO_UPDATE( progolf ) +static SCREEN_UPDATE( progolf ) { progolf_state *state = screen->machine->driver_data<progolf_state>(); UINT8 *videoram = state->videoram; @@ -468,6 +468,7 @@ static MACHINE_CONFIG_START( progolf, progolf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(progolf) MCFG_GFXDECODE(progolf) MCFG_PALETTE_LENGTH(32*3) @@ -475,7 +476,6 @@ static MACHINE_CONFIG_START( progolf, progolf_state ) MCFG_MC6845_ADD("crtc", MC6845, 3000000/4, mc6845_intf) /* hand tuned to get ~57 fps */ MCFG_VIDEO_START(progolf) - MCFG_VIDEO_UPDATE(progolf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c index c7f7c358e77..b7f5e0283b4 100644 --- a/src/mame/drivers/psattack.c +++ b/src/mame/drivers/psattack.c @@ -109,12 +109,12 @@ static VIDEO_START(psattack) } -static VIDEO_UPDATE(psattack) +static SCREEN_UPDATE(psattack) { return 0; } -static VIDEO_EOF(psattack) +static SCREEN_EOF(psattack) { } @@ -174,10 +174,10 @@ static MACHINE_CONFIG_START( psattack, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(psattack) + MCFG_SCREEN_EOF(psattack) MCFG_VIDEO_START(psattack) - MCFG_VIDEO_UPDATE(psattack) - MCFG_VIDEO_EOF(psattack) MCFG_PALETTE_INIT(RRRRR_GGGGGG_BBBBB) MCFG_PALETTE_LENGTH(65536) diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index f1486f73622..58c0b3fbc52 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -1081,13 +1081,13 @@ static MACHINE_CONFIG_START( sngkace, psikyo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1) + MCFG_SCREEN_UPDATE(psikyo) + MCFG_SCREEN_EOF(psikyo) MCFG_GFXDECODE(psikyo) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(sngkace) - MCFG_VIDEO_EOF(psikyo) - MCFG_VIDEO_UPDATE(psikyo) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1133,13 +1133,13 @@ static MACHINE_CONFIG_START( gunbird, psikyo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1) + MCFG_SCREEN_UPDATE(psikyo) + MCFG_SCREEN_EOF(psikyo) MCFG_GFXDECODE(psikyo) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(psikyo) - MCFG_VIDEO_EOF(psikyo) - MCFG_VIDEO_UPDATE(psikyo) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1169,13 +1169,13 @@ static MACHINE_CONFIG_START( s1945bl, psikyo_state ) /* Bootleg hardware based o MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1) + MCFG_SCREEN_UPDATE(psikyo_bootleg) + MCFG_SCREEN_EOF(psikyo) MCFG_GFXDECODE(psikyo) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(psikyo) - MCFG_VIDEO_UPDATE(psikyo_bootleg) - MCFG_VIDEO_EOF(psikyo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1226,13 +1226,13 @@ static MACHINE_CONFIG_START( s1945, psikyo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1) + MCFG_SCREEN_UPDATE(psikyo) + MCFG_SCREEN_EOF(psikyo) MCFG_GFXDECODE(psikyo) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(psikyo) - MCFG_VIDEO_EOF(psikyo) - MCFG_VIDEO_UPDATE(psikyo) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 2f433413e4e..89912a1c793 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -747,6 +747,7 @@ static MACHINE_CONFIG_START( ps4big, psikyo4_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(psikyo4) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -754,9 +755,9 @@ static MACHINE_CONFIG_START( ps4big, psikyo4_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(psikyo4) MCFG_VIDEO_START(psikyo4) - MCFG_VIDEO_UPDATE(psikyo4) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index 0fef1e41238..123829f9b0c 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -832,13 +832,13 @@ static MACHINE_CONFIG_START( psikyo3v1, psikyosh_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 28*8-1) + MCFG_SCREEN_UPDATE(psikyosh) + MCFG_SCREEN_EOF(psikyosh) MCFG_GFXDECODE(psikyosh) MCFG_PALETTE_LENGTH(0x5000/4) MCFG_VIDEO_START(psikyosh) - MCFG_VIDEO_EOF(psikyosh) - MCFG_VIDEO_UPDATE(psikyosh) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c index 253d55f3a1d..1213f74cbae 100644 --- a/src/mame/drivers/psychic5.c +++ b/src/mame/drivers/psychic5.c @@ -681,13 +681,13 @@ static MACHINE_CONFIG_START( psychic5, psychic5_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(psychic5) MCFG_GFXDECODE(psychic5) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(psychic5) MCFG_VIDEO_RESET(psychic5) - MCFG_VIDEO_UPDATE(psychic5) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -727,13 +727,13 @@ static MACHINE_CONFIG_START( bombsa, psychic5_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(bombsa) MCFG_GFXDECODE(bombsa) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(bombsa) MCFG_VIDEO_RESET(bombsa) - MCFG_VIDEO_UPDATE(bombsa) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index e454ec88d16..60f3381b5ad 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -145,7 +145,7 @@ static VIDEO_START(pturn) tilemap_set_transparent_pen(state->bgmap,0); } -static VIDEO_UPDATE(pturn) +static SCREEN_UPDATE(pturn) { pturn_state *state = screen->machine->driver_data<pturn_state>(); UINT8 *spriteram = screen->machine->generic.spriteram.u8; @@ -493,12 +493,12 @@ static MACHINE_CONFIG_START( pturn, pturn_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pturn) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(pturn) - MCFG_VIDEO_UPDATE(pturn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index f992b3a24cf..b2ae988619f 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -949,6 +949,7 @@ static MACHINE_CONFIG_START( punchout, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(punchout) MCFG_SCREEN_ADD("bottom", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -956,9 +957,9 @@ static MACHINE_CONFIG_START( punchout, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(punchout) MCFG_VIDEO_START(punchout) - MCFG_VIDEO_UPDATE(punchout) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -983,7 +984,10 @@ static MACHINE_CONFIG_DERIVED( armwrest, punchout ) MCFG_GFXDECODE(armwrest) MCFG_VIDEO_START(armwrest) - MCFG_VIDEO_UPDATE(armwrest) + MCFG_SCREEN_MODIFY("top") + MCFG_SCREEN_UPDATE(armwrest) + MCFG_SCREEN_MODIFY("bottom") + MCFG_SCREEN_UPDATE(armwrest) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index 409f3f54952..6095f2c6c6d 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -459,12 +459,12 @@ static MACHINE_CONFIG_START( pushman, pushman_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pushman) MCFG_GFXDECODE(pushman) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(pushman) - MCFG_VIDEO_UPDATE(pushman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -509,12 +509,12 @@ static MACHINE_CONFIG_START( bballs, pushman_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pushman) MCFG_GFXDECODE(pushman) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(pushman) - MCFG_VIDEO_UPDATE(pushman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index a879575abbb..87b1c93cce0 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -74,7 +74,7 @@ static VIDEO_START( pzletime ) tilemap_set_transparent_pen(state->txt_tilemap, 0); } -static VIDEO_UPDATE( pzletime ) +static SCREEN_UPDATE( pzletime ) { pzletime_state *state = screen->machine->driver_data<pzletime_state>(); int count; @@ -323,13 +323,13 @@ static MACHINE_CONFIG_START( pzletime, pzletime_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(pzletime) MCFG_GFXDECODE(pzletime) MCFG_PALETTE_LENGTH(0x300 + 32768) MCFG_EEPROM_93C46_ADD("eeprom") MCFG_PALETTE_INIT(pzletime) MCFG_VIDEO_START(pzletime) - MCFG_VIDEO_UPDATE(pzletime) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index c87e332bfcc..e4df16c1a10 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -664,11 +664,11 @@ static MACHINE_CONFIG_START( qdrmfgp, qdrmfgp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1) + MCFG_SCREEN_UPDATE(qdrmfgp) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(qdrmfgp) - MCFG_VIDEO_UPDATE(qdrmfgp) MCFG_K056832_ADD("k056832", qdrmfgp_k056832_intf) MCFG_K053252_ADD("k053252") @@ -702,11 +702,11 @@ static MACHINE_CONFIG_START( qdrmfgp2, qdrmfgp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1) + MCFG_SCREEN_UPDATE(qdrmfgp) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(qdrmfgp2) - MCFG_VIDEO_UPDATE(qdrmfgp) MCFG_K056832_ADD("k056832", qdrmfgp2_k056832_intf) MCFG_K053252_ADD("k053252") diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c index a8f12c6ff2d..9a73e59aa70 100644 --- a/src/mame/drivers/quakeat.c +++ b/src/mame/drivers/quakeat.c @@ -66,7 +66,7 @@ static VIDEO_START(quake) { } -static VIDEO_UPDATE(quake) +static SCREEN_UPDATE(quake) { return 0; } @@ -165,11 +165,11 @@ static MACHINE_CONFIG_START( quake, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(quake) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(quake) - MCFG_VIDEO_UPDATE(quake) MACHINE_CONFIG_END diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c index 66f4baaaa0e..ac311020cf2 100644 --- a/src/mame/drivers/quantum.c +++ b/src/mame/drivers/quantum.c @@ -240,9 +240,9 @@ static MACHINE_CONFIG_START( quantum, driver_device ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 900, 0, 600) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(avg_quantum) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index 6877010952e..6daf97ffaae 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -383,6 +383,7 @@ static MACHINE_CONFIG_START( quasar, cvs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(1*8+1, 29*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(quasar) MCFG_GFXDECODE(quasar) MCFG_PALETTE_LENGTH((64+1)*8+(4*256)) @@ -393,7 +394,6 @@ static MACHINE_CONFIG_START( quasar, cvs_state ) MCFG_PALETTE_INIT(quasar) MCFG_VIDEO_START(quasar) - MCFG_VIDEO_UPDATE(quasar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c index 9cc5f2c7a01..04e3b1ba172 100644 --- a/src/mame/drivers/queen.c +++ b/src/mame/drivers/queen.c @@ -27,7 +27,7 @@ static VIDEO_START(queen) } -static VIDEO_UPDATE(queen) +static SCREEN_UPDATE(queen) { return 0; } @@ -82,11 +82,11 @@ static MACHINE_CONFIG_START( queen, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(queen) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(queen) - MCFG_VIDEO_UPDATE(queen) MACHINE_CONFIG_END diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c index 0c8bd97e427..7d2af50f5df 100644 --- a/src/mame/drivers/quizdna.c +++ b/src/mame/drivers/quizdna.c @@ -456,12 +456,12 @@ static MACHINE_CONFIG_START( quizdna, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(quizdna) MCFG_GFXDECODE(quizdna) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(quizdna) - MCFG_VIDEO_UPDATE(quizdna) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c index 09d08481ca6..931458f2f56 100644 --- a/src/mame/drivers/quizo.c +++ b/src/mame/drivers/quizo.c @@ -74,7 +74,7 @@ static PALETTE_INIT(quizo) } } -static VIDEO_UPDATE( quizo ) +static SCREEN_UPDATE( quizo ) { quizo_state *state = screen->machine->driver_data<quizo_state>(); UINT8 *videoram = state->videoram; @@ -213,12 +213,11 @@ static MACHINE_CONFIG_START( quizo, quizo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 200) MCFG_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8, 200-1) + MCFG_SCREEN_UPDATE(quizo) MCFG_PALETTE_LENGTH(16) MCFG_PALETTE_INIT(quizo) - MCFG_VIDEO_UPDATE(quizo) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("aysnd", AY8910, XTAL2/16 ) diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c index 8cbba799a5d..dcea9a78319 100644 --- a/src/mame/drivers/quizpani.c +++ b/src/mame/drivers/quizpani.c @@ -209,9 +209,9 @@ static MACHINE_CONFIG_START( quizpani, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(quizpani) MCFG_VIDEO_START(quizpani) - MCFG_VIDEO_UPDATE(quizpani) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index bbc3ba4ceb1..d18535b92bc 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -85,7 +85,7 @@ static VIDEO_START(quizpun2) tilemap_set_transparent_pen(fg_tmap, 0); } -static VIDEO_UPDATE(quizpun2) +static SCREEN_UPDATE(quizpun2) { int layers_ctrl = -1; @@ -437,12 +437,12 @@ static MACHINE_CONFIG_START( quizpun2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) + MCFG_SCREEN_UPDATE(quizpun2) MCFG_GFXDECODE(quizpun2) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(quizpun2) - MCFG_VIDEO_UPDATE(quizpun2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c index 343e20e51d8..e4ef65a6d6e 100644 --- a/src/mame/drivers/r2dtank.c +++ b/src/mame/drivers/r2dtank.c @@ -382,7 +382,7 @@ static const mc6845_interface mc6845_intf = }; -static VIDEO_UPDATE( r2dtank ) +static SCREEN_UPDATE( r2dtank ) { device_t *mc6845 = screen->machine->device("crtc"); mc6845_update(mc6845, bitmap, cliprect); @@ -527,11 +527,10 @@ static MACHINE_CONFIG_START( r2dtank, driver_device ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_VIDEO_UPDATE(r2dtank) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */ + MCFG_SCREEN_UPDATE(r2dtank) MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index 48f29e4566c..408eaa6796b 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -167,7 +167,7 @@ static VIDEO_START( rdx_v33 ) tilemap_set_transparent_pen(tx_tilemap, 15); } -static VIDEO_UPDATE( rdx_v33 ) +static SCREEN_UPDATE( rdx_v33 ) { bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -657,12 +657,12 @@ static MACHINE_CONFIG_START( rdx_v33, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(rdx_v33) MCFG_GFXDECODE(rdx_v33) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(rdx_v33) - MCFG_VIDEO_UPDATE(rdx_v33) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -692,11 +692,11 @@ static MACHINE_CONFIG_START( nzerotea, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(rdx_v33) MCFG_GFXDECODE(rdx_v33) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(rdx_v33) - MCFG_VIDEO_UPDATE(rdx_v33) /* sound hardware */ // SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(28636360/8,28636360/28,1,2) diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index d6d0ee91240..871e3beb802 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -430,7 +430,7 @@ static void rabbit_drawtilemap( running_machine *machine, bitmap_t *bitmap, cons tran ? 0 : TILEMAP_DRAW_OPAQUE,0); } -static VIDEO_UPDATE(rabbit) +static SCREEN_UPDATE(rabbit) { rabbit_state *state = screen->machine->driver_data<rabbit_state>(); int prilevel; @@ -976,12 +976,12 @@ static MACHINE_CONFIG_START( rabbit, rabbit_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) // MCFG_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*16, 64*16-1) // MCFG_SCREEN_VISIBLE_AREA(0*8, 20*16-1, 32*16, 48*16-1) + MCFG_SCREEN_UPDATE(rabbit) MCFG_PALETTE_LENGTH(0x4000) MCFG_PALETTE_INIT( all_black ) // the status bar palette doesn't get transfered (or our colour select is wrong).. more obvious when it's black than in 'MAME default' colours MCFG_VIDEO_START(rabbit) - MCFG_VIDEO_UPDATE(rabbit) MACHINE_CONFIG_END diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c index 81f55f663d6..5d7f2263f2f 100644 --- a/src/mame/drivers/raiden.c +++ b/src/mame/drivers/raiden.c @@ -243,7 +243,7 @@ static INTERRUPT_GEN( raiden_interrupt ) cpu_set_input_line_and_vector(device, 0, HOLD_LINE, 0xc8/4); /* VBL */ } -static VIDEO_EOF( raiden ) +static SCREEN_EOF( raiden ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram16_w(space,0,0,0xffff); /* Could be a memory location instead */ @@ -275,13 +275,13 @@ static MACHINE_CONFIG_START( raiden, raiden_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(raiden) + MCFG_SCREEN_EOF(raiden) MCFG_GFXDECODE(raiden) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(raiden) - MCFG_VIDEO_EOF(raiden) - MCFG_VIDEO_UPDATE(raiden) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_14_31818MHz/4,XTAL_12MHz/12) // frequency and pin 7 verified (pin set in audio\seibu.h) diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 571548fa0c3..ede1312fb3a 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -879,9 +879,9 @@ static VIDEO_START( raiden2 ) tilemap_set_transparent_pen(state->text_layer, 15); } -/* VIDEO UPDATE (move to video file) */ +/* SCREEN_UPDATE (move to video file) */ -static VIDEO_UPDATE ( raiden2 ) +static SCREEN_UPDATE( raiden2 ) { raiden2_state *state = screen->machine->driver_data<raiden2_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -1732,11 +1732,11 @@ static MACHINE_CONFIG_START( raiden2, raiden2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 30*8-1) + MCFG_SCREEN_UPDATE(raiden2) MCFG_GFXDECODE(raiden2) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(raiden2) - MCFG_VIDEO_UPDATE(raiden2) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(28636360/8,28636360/28,1,2) @@ -1788,11 +1788,11 @@ static MACHINE_CONFIG_START( zeroteam, raiden2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1) + MCFG_SCREEN_UPDATE(raiden2) MCFG_GFXDECODE(raiden2) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(raiden2) - MCFG_VIDEO_UPDATE(raiden2) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000) diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 41a18ec553a..7926ec50e69 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -695,12 +695,11 @@ static MACHINE_CONFIG_START( rainbow, rainbow_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(rainbow) MCFG_GFXDECODE(rainbow) MCFG_PALETTE_LENGTH(8192) - MCFG_VIDEO_UPDATE(rainbow) - MCFG_PC080SN_ADD("pc080sn", rainbow_pc080sn_intf) MCFG_PC090OJ_ADD("pc090oj", rainbow_pc090oj_intf) @@ -738,12 +737,12 @@ static MACHINE_CONFIG_START( jumping, rainbow_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(jumping) MCFG_GFXDECODE(jumping) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(jumping) - MCFG_VIDEO_UPDATE(jumping) MCFG_PC080SN_ADD("pc080sn", jumping_pc080sn_intf) diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index 3576db06d25..5dd5aa626d7 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -912,13 +912,13 @@ static MACHINE_CONFIG_START( rallyx, rallyx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(rallyx) MCFG_GFXDECODE(rallyx) MCFG_PALETTE_LENGTH(64*4+4) MCFG_PALETTE_INIT(rallyx) MCFG_VIDEO_START(rallyx) - MCFG_VIDEO_UPDATE(rallyx) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -952,13 +952,13 @@ static MACHINE_CONFIG_START( jungler, rallyx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(jungler) MCFG_GFXDECODE(jungler) MCFG_PALETTE_LENGTH(64*4+4+64) MCFG_PALETTE_INIT(jungler) MCFG_VIDEO_START(jungler) - MCFG_VIDEO_UPDATE(jungler) /* sound hardware */ MCFG_FRAGMENT_ADD(locomotn_sound) @@ -971,7 +971,8 @@ static MACHINE_CONFIG_DERIVED( tactcian, jungler ) /* video hardware */ MCFG_VIDEO_START(locomotn) - MCFG_VIDEO_UPDATE(locomotn) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(locomotn) MACHINE_CONFIG_END @@ -982,8 +983,8 @@ static MACHINE_CONFIG_DERIVED( locomotn, jungler ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(locomotn) MCFG_VIDEO_START(locomotn) - MCFG_VIDEO_UPDATE(locomotn) MACHINE_CONFIG_END @@ -994,8 +995,8 @@ static MACHINE_CONFIG_DERIVED( commsega, jungler ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(locomotn) MCFG_VIDEO_START(commsega) - MCFG_VIDEO_UPDATE(locomotn) MACHINE_CONFIG_END diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c index 84d24d15b80..3a557d998a5 100644 --- a/src/mame/drivers/rampart.c +++ b/src/mame/drivers/rampart.c @@ -363,9 +363,9 @@ static MACHINE_CONFIG_START( rampart, rampart_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240) + MCFG_SCREEN_UPDATE(rampart) MCFG_VIDEO_START(rampart) - MCFG_VIDEO_UPDATE(rampart) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index 09b66708c90..d8e5d59cb7d 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -431,12 +431,11 @@ static MACHINE_CONFIG_START( rastan, rastan_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(rastan) MCFG_GFXDECODE(rastan) MCFG_PALETTE_LENGTH(8192) - MCFG_VIDEO_UPDATE(rastan) - MCFG_PC080SN_ADD("pc080sn", rastan_pc080sn_intf) MCFG_PC090OJ_ADD("pc090oj", rastan_pc090oj_intf) diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index 02d483b1c39..f69a3591a79 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -478,7 +478,7 @@ static VIDEO_START(rbmk) { } -static VIDEO_UPDATE(rbmk) +static SCREEN_UPDATE(rbmk) { int x,y; int count = 0; @@ -531,11 +531,11 @@ static MACHINE_CONFIG_START( rbmk, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(rbmk) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(rbmk) - MCFG_VIDEO_UPDATE(rbmk) MCFG_EEPROM_93C46_ADD("eeprom") diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c index 7d6adbe4a23..f1a4be0c7b5 100644 --- a/src/mame/drivers/rcorsair.c +++ b/src/mame/drivers/rcorsair.c @@ -100,7 +100,7 @@ static VIDEO_START( rcorsair ) { } -static VIDEO_UPDATE( rcorsair ) +static SCREEN_UPDATE( rcorsair ) { return 0; @@ -121,12 +121,12 @@ static MACHINE_CONFIG_START( rcorsair, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) + MCFG_SCREEN_UPDATE(rcorsair) MCFG_GFXDECODE(rcorsair) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(rcorsair) - MCFG_VIDEO_UPDATE(rcorsair) MACHINE_CONFIG_END ROM_START( rcorsair ) diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index bce36cbac7c..bb460a52727 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -693,12 +693,12 @@ static MACHINE_CONFIG_START( realbrk, realbrk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x140, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(realbrk) MCFG_GFXDECODE(realbrk) MCFG_PALETTE_LENGTH(0x8000) MCFG_VIDEO_START(realbrk) - MCFG_VIDEO_UPDATE(realbrk) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -727,7 +727,8 @@ static MACHINE_CONFIG_DERIVED( dai2kaku, realbrk ) MCFG_CPU_PROGRAM_MAP(dai2kaku_mem) MCFG_GFXDECODE(dai2kaku) - MCFG_VIDEO_UPDATE(dai2kaku) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(dai2kaku) MACHINE_CONFIG_END diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c index 683cb52c144..761fdb5b820 100644 --- a/src/mame/drivers/redclash.c +++ b/src/mame/drivers/redclash.c @@ -370,14 +370,14 @@ static MACHINE_CONFIG_START( zerohour, ladybug_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(redclash) + MCFG_SCREEN_EOF(redclash) MCFG_GFXDECODE(redclash) MCFG_PALETTE_LENGTH(4*8+4*16+32) MCFG_PALETTE_INIT(redclash) MCFG_VIDEO_START(redclash) - MCFG_VIDEO_UPDATE(redclash) - MCFG_VIDEO_EOF(redclash) /* sound hardware */ MACHINE_CONFIG_END @@ -399,14 +399,14 @@ static MACHINE_CONFIG_START( redclash, ladybug_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(redclash) + MCFG_SCREEN_EOF(redclash) MCFG_GFXDECODE(redclash) MCFG_PALETTE_LENGTH(4*8+4*16+32) MCFG_PALETTE_INIT(redclash) MCFG_VIDEO_START(redclash) - MCFG_VIDEO_UPDATE(redclash) - MCFG_VIDEO_EOF(redclash) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index 06eff6c31e5..00b7e47f240 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -313,9 +313,9 @@ static MACHINE_CONFIG_START( relief, relief_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a VAD chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(relief) MCFG_VIDEO_START(relief) - MCFG_VIDEO_UPDATE(relief) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index 15d22cd74e2..d1fee60213e 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -940,12 +940,12 @@ static MACHINE_CONFIG_START( renegade, renegade_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0, 30*8-1) + MCFG_SCREEN_UPDATE(renegade) MCFG_GFXDECODE(renegade) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(renegade) - MCFG_VIDEO_UPDATE(renegade) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c index 64fa270c244..da0b8b751c0 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -364,13 +364,13 @@ static MACHINE_CONFIG_START( retofinv, retofinv_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(retofinv) MCFG_GFXDECODE(retofinv) MCFG_PALETTE_LENGTH(256*2+64*16+64*16) MCFG_PALETTE_INIT(retofinv) MCFG_VIDEO_START(retofinv) - MCFG_VIDEO_UPDATE(retofinv) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c index fc8874c3323..2c23b5040f9 100644 --- a/src/mame/drivers/rgum.c +++ b/src/mame/drivers/rgum.c @@ -25,7 +25,7 @@ static VIDEO_START(royalgum) } -static VIDEO_UPDATE(royalgum) +static SCREEN_UPDATE(royalgum) { int x,y,count; const gfx_element *gfx = screen->machine->gfx[0]; @@ -262,6 +262,7 @@ static MACHINE_CONFIG_START( rgum, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) + MCFG_SCREEN_UPDATE(royalgum) MCFG_MC6845_ADD("crtc", MC6845, 24000000/16, mc6845_intf) /* unknown clock & type, hand tuned to get ~50 fps (?) */ @@ -271,7 +272,6 @@ static MACHINE_CONFIG_START( rgum, driver_device ) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(royalgum) - MCFG_VIDEO_UPDATE(royalgum) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 6c2a61bac14..47c4544cffc 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -80,7 +80,7 @@ static VIDEO_START( rmhaihai ) 8, 8, 64, 32); } -static VIDEO_UPDATE( rmhaihai ) +static SCREEN_UPDATE( rmhaihai ) { rmhaihai_state *state = screen->machine->driver_data<rmhaihai_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -470,13 +470,13 @@ static MACHINE_CONFIG_START( rmhaihai, rmhaihai_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(4*8, 60*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(rmhaihai) MCFG_GFXDECODE(rmhaihai) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(rmhaihai) - MCFG_VIDEO_UPDATE(rmhaihai) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index a2b8299d0c9..a8518a56d37 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -315,6 +315,7 @@ static MACHINE_CONFIG_START( rockrage, rockrage_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(rockrage) MCFG_K007342_ADD("k007342", rockrage_k007342_intf) MCFG_K007420_ADD("k007420", rockrage_k007420_intf) @@ -323,7 +324,6 @@ static MACHINE_CONFIG_START( rockrage, rockrage_state ) MCFG_PALETTE_LENGTH(64 + 2*16*16) MCFG_PALETTE_INIT(rockrage) - MCFG_VIDEO_UPDATE(rockrage) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c index 17a5d4882fe..a6e3e35e9da 100644 --- a/src/mame/drivers/rocnrope.c +++ b/src/mame/drivers/rocnrope.c @@ -197,13 +197,13 @@ static MACHINE_CONFIG_START( rocnrope, rocnrope_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(rocnrope) MCFG_GFXDECODE(rocnrope) MCFG_PALETTE_LENGTH(16*16+16*16) MCFG_PALETTE_INIT(rocnrope) MCFG_VIDEO_START(rocnrope) - MCFG_VIDEO_UPDATE(rocnrope) /* sound hardware */ MCFG_FRAGMENT_ADD(timeplt_sound) diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index 315254bb8a3..07d897c11a9 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -791,12 +791,12 @@ static MACHINE_CONFIG_START( rohga, rohga_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(rohga) MCFG_GFXDECODE(rohga) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(rohga) - MCFG_VIDEO_UPDATE(rohga) MCFG_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf) @@ -836,12 +836,11 @@ static MACHINE_CONFIG_START( wizdfire, rohga_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(wizdfire) MCFG_GFXDECODE(wizdfire) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(wizdfire) - MCFG_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf) /* sound hardware */ @@ -880,12 +879,11 @@ static MACHINE_CONFIG_START( nitrobal, rohga_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(nitrobal) MCFG_GFXDECODE(wizdfire) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(nitrobal) - MCFG_DECO16IC_ADD("deco_custom", nitrobal_deco16ic_intf) /* sound hardware */ @@ -924,12 +922,12 @@ static MACHINE_CONFIG_START( schmeisr, rohga_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(schmeisr) MCFG_GFXDECODE(schmeisr) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(rohga) - MCFG_VIDEO_UPDATE(schmeisr) MCFG_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf) diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index d4f808eb1ce..29836e91943 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -283,11 +283,11 @@ static MACHINE_CONFIG_START( rollerg, rollerg_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(rollerg) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(rollerg) - MCFG_VIDEO_UPDATE(rollerg) MCFG_K053244_ADD("k053244", rollerg_k05324x_intf) MCFG_K051316_ADD("k051316", rollerg_k051316_intf) diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index 8da32885729..09bbde55c46 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -214,12 +214,12 @@ static MACHINE_CONFIG_START( rollrace, rollrace_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(16,255,16, 255-16) + MCFG_SCREEN_UPDATE(rollrace) MCFG_GFXDECODE(rollrace) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(rollrace) - MCFG_VIDEO_UPDATE(rollrace) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c index 2c7c05485ae..18e351e85ca 100644 --- a/src/mame/drivers/rotaryf.c +++ b/src/mame/drivers/rotaryf.c @@ -57,7 +57,7 @@ static INTERRUPT_GEN( rotaryf_interrupt ) * *************************************/ -static VIDEO_UPDATE( rotaryf ) +static SCREEN_UPDATE( rotaryf ) { rotaryf_state *state = screen->machine->driver_data<rotaryf_state>(); offs_t offs; @@ -170,13 +170,12 @@ static MACHINE_CONFIG_START( rotaryf, rotaryf_state ) MCFG_CPU_VBLANK_INT_HACK(rotaryf_interrupt,5) /* video hardware */ - MCFG_VIDEO_UPDATE(rotaryf) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 262) /* vert size is a guess, taken from mw8080bw */ MCFG_SCREEN_VISIBLE_AREA(1*8, 30*8-1, 0*8, 32*8-1) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(rotaryf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c index 092c2df591c..e068d7035e7 100644 --- a/src/mame/drivers/roul.c +++ b/src/mame/drivers/roul.c @@ -184,7 +184,7 @@ static VIDEO_START(roul) videobuf = auto_alloc_array_clear(machine, UINT8, VIDEOBUF_SIZE); } -static VIDEO_UPDATE(roul) +static SCREEN_UPDATE(roul) { int i,j; for (i = 0; i < 256; i++) @@ -263,11 +263,11 @@ static MACHINE_CONFIG_START( roul, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(roul) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(roul) - MCFG_VIDEO_UPDATE(roul) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("aysnd", AY8910, 1000000) diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c index 67c5d35e73f..799774444bd 100644 --- a/src/mame/drivers/route16.c +++ b/src/mame/drivers/route16.c @@ -610,14 +610,13 @@ static MACHINE_CONFIG_START( route16, driver_device ) MCFG_CPU_PROGRAM_MAP(route16_cpu2_map) /* video hardware */ - MCFG_VIDEO_UPDATE(route16) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) MCFG_SCREEN_REFRESH_RATE(57) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) /* frames per second, vblank duration */ + MCFG_SCREEN_UPDATE(route16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -644,7 +643,8 @@ static MACHINE_CONFIG_DERIVED( stratvox, route16 ) MCFG_CPU_PROGRAM_MAP(stratvox_cpu2_map) /* video hardware */ - MCFG_VIDEO_UPDATE(stratvox) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(stratvox) /* sound hardware */ MCFG_SOUND_MODIFY("ay8910") @@ -682,7 +682,8 @@ static MACHINE_CONFIG_DERIVED( ttmahjng, route16 ) MCFG_CPU_IO_MAP(0) /* video hardware */ - MCFG_VIDEO_UPDATE(ttmahjng) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(ttmahjng) MACHINE_CONFIG_END diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index 0ce3d3280c2..a5b27c0e1de 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -209,7 +209,7 @@ static WRITE8_HANDLER( mjderngr_palbank_w ) } -static VIDEO_UPDATE( royalmah ) +static SCREEN_UPDATE( royalmah ) { royalmah_state *state = screen->machine->driver_data<royalmah_state>(); UINT8 *videoram = state->videoram; @@ -3178,7 +3178,6 @@ static MACHINE_CONFIG_START( royalmah, royalmah_state ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_VIDEO_UPDATE(royalmah) MCFG_PALETTE_LENGTH(16*2) MCFG_PALETTE_INIT(royalmah) @@ -3188,6 +3187,7 @@ static MACHINE_CONFIG_START( royalmah, royalmah_state ) MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 247) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) + MCFG_SCREEN_UPDATE(royalmah) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c index 5fc1e28d368..1785b65624a 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -481,12 +481,12 @@ static MACHINE_CONFIG_START( rpunch, rpunch_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(304, 224) MCFG_SCREEN_VISIBLE_AREA(8, 303-8, 0, 223-8) + MCFG_SCREEN_UPDATE(rpunch) MCFG_GFXDECODE(rpunch) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(rpunch) - MCFG_VIDEO_UPDATE(rpunch) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c index e65d5cd55a8..33fba05f8ff 100644 --- a/src/mame/drivers/runaway.c +++ b/src/mame/drivers/runaway.c @@ -364,12 +364,12 @@ static MACHINE_CONFIG_START( runaway, runaway_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 263) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE(runaway) MCFG_GFXDECODE(runaway) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(runaway) - MCFG_VIDEO_UPDATE(runaway) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -392,7 +392,8 @@ static MACHINE_CONFIG_DERIVED( qwak, runaway ) MCFG_GFXDECODE(qwak) MCFG_VIDEO_START(qwak) - MCFG_VIDEO_UPDATE(qwak) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(qwak) MACHINE_CONFIG_END diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 8710803c482..b5dc236e5f1 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -422,11 +422,11 @@ static MACHINE_CONFIG_START( rng, rungun_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(88, 88+384-1, 24, 24+224-1) + MCFG_SCREEN_UPDATE(rng) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(rng) - MCFG_VIDEO_UPDATE(rng) MCFG_K053936_ADD("k053936", rng_k053936_intf) MCFG_K055673_ADD("k055673", rng_k055673_intf) diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index a0048c3b356..e94bbca684f 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -193,7 +193,7 @@ static VIDEO_START( safarir ) } -static VIDEO_UPDATE( safarir ) +static SCREEN_UPDATE( safarir ) { safarir_state *state = screen->machine->driver_data<safarir_state>(); @@ -406,7 +406,6 @@ static MACHINE_CONFIG_START( safarir, safarir_state ) /* video hardware */ MCFG_VIDEO_START(safarir) - MCFG_VIDEO_UPDATE(safarir) MCFG_PALETTE_INIT(safarir) MCFG_PALETTE_LENGTH(2*8) MCFG_GFXDECODE(safarir) @@ -416,6 +415,7 @@ static MACHINE_CONFIG_START( safarir, safarir_state ) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 26*8-1) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(safarir) /* audio hardware */ MCFG_FRAGMENT_ADD(safarir_audio) diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index 0f099d81a1f..f1dd2d360c6 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -133,7 +133,7 @@ static INTERRUPT_GEN( sandscrp_interrupt ) } -static VIDEO_EOF( sandscrp ) +static SCREEN_EOF( sandscrp ) { sandscrp_state *state = machine->driver_data<sandscrp_state>(); device_t *pandora = machine->device("pandora"); @@ -482,6 +482,8 @@ static MACHINE_CONFIG_START( sandscrp, sandscrp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(sandscrp) + MCFG_SCREEN_EOF(sandscrp) MCFG_GFXDECODE(sandscrp) MCFG_PALETTE_LENGTH(2048) @@ -489,8 +491,6 @@ static MACHINE_CONFIG_START( sandscrp, sandscrp_state ) MCFG_KANEKO_PANDORA_ADD("pandora", sandscrp_pandora_config) MCFG_VIDEO_START(sandscrp_1xVIEW2) - MCFG_VIDEO_EOF(sandscrp) - MCFG_VIDEO_UPDATE(sandscrp) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index ee6cf3709c8..3f11d4a2fe0 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -383,6 +383,7 @@ static MACHINE_CONFIG_START( pzlestar, sangho_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512 + 32, (212 + 28) * 2) MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1) + MCFG_SCREEN_UPDATE( generic_bitmapped ) MCFG_PALETTE_LENGTH(512) @@ -391,7 +392,6 @@ static MACHINE_CONFIG_START( pzlestar, sangho_state ) MCFG_PALETTE_INIT( v9938 ) MCFG_VIDEO_START( sangho ) - MCFG_VIDEO_UPDATE( generic_bitmapped ) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -416,6 +416,7 @@ static MACHINE_CONFIG_START( sexyboom, sangho_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512 + 32, (212 + 28) * 2) MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1) + MCFG_SCREEN_UPDATE( generic_bitmapped ) MCFG_PALETTE_LENGTH(512) @@ -424,7 +425,6 @@ static MACHINE_CONFIG_START( sexyboom, sangho_state ) MCFG_PALETTE_INIT( v9938 ) MCFG_VIDEO_START( sangho ) - MCFG_VIDEO_UPDATE( generic_bitmapped ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM2413, 3580000) diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c index dbb42d1fd64..89151d1e968 100644 --- a/src/mame/drivers/sauro.c +++ b/src/mame/drivers/sauro.c @@ -406,7 +406,8 @@ static MACHINE_CONFIG_DERIVED( trckydoc, tecfri ) MCFG_GFXDECODE(trckydoc) MCFG_VIDEO_START(trckydoc) - MCFG_VIDEO_UPDATE(trckydoc) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(trckydoc) MACHINE_CONFIG_END @@ -423,7 +424,8 @@ static MACHINE_CONFIG_DERIVED( sauro, tecfri ) MCFG_GFXDECODE(sauro) MCFG_VIDEO_START(sauro) - MCFG_VIDEO_UPDATE(sauro) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(sauro) MCFG_SOUND_ADD("speech", SP0256, 3120000) MCFG_SOUND_CONFIG(sauro_sp256) diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c index 868fcb4ecf1..d75ebb3f126 100644 --- a/src/mame/drivers/savquest.c +++ b/src/mame/drivers/savquest.c @@ -38,7 +38,7 @@ static VIDEO_START(savquest) { } -static VIDEO_UPDATE(savquest) +static SCREEN_UPDATE(savquest) { return 0; } @@ -66,10 +66,10 @@ static MACHINE_CONFIG_START( savquest, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199) + MCFG_SCREEN_UPDATE(savquest) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(savquest) - MCFG_VIDEO_UPDATE(savquest) MACHINE_CONFIG_END ROM_START( savquest ) diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index 3200f955889..11e803d2bc8 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -189,13 +189,13 @@ static MACHINE_CONFIG_START( sbasketb, sbasketb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(sbasketb) MCFG_GFXDECODE(sbasketb) MCFG_PALETTE_LENGTH(16*16+16*16*16) MCFG_PALETTE_INIT(sbasketb) MCFG_VIDEO_START(sbasketb) - MCFG_VIDEO_UPDATE(sbasketb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index c99a3f3287e..a796711f7f8 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -105,7 +105,7 @@ static WRITE8_HANDLER( sbw_videoram_w ) } } -static VIDEO_UPDATE(sbowling) +static SCREEN_UPDATE(sbowling) { sbowling_state *state = screen->machine->driver_data<sbowling_state>(); @@ -382,11 +382,11 @@ static MACHINE_CONFIG_START( sbowling, sbowling_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 262) /* vert size taken from mw8080bw */ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 32*8-1) + MCFG_SCREEN_UPDATE(sbowling) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(sbowling) MCFG_VIDEO_START(sbowling) - MCFG_VIDEO_UPDATE(sbowling) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index 2bdaab6a671..cf4557761d8 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -321,7 +321,7 @@ static WRITE8_HANDLER( sbrkout_videoram_w ) * *************************************/ -static VIDEO_UPDATE( sbrkout ) +static SCREEN_UPDATE( sbrkout ) { sbrkout_state *state = screen->machine->driver_data<sbrkout_state>(); UINT8 *videoram = state->videoram; @@ -511,10 +511,10 @@ static MACHINE_CONFIG_START( sbrkout, sbrkout_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 384, 0, 256, 262, 0, 224) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(sbrkout) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(sbrkout) - MCFG_VIDEO_UPDATE(sbrkout) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index 3c3b8449ca0..e5a009cb06c 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -228,12 +228,12 @@ static MACHINE_CONFIG_START( sbugger, sbugger_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(sbugger) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(sbugger) MCFG_VIDEO_START(sbugger) - MCFG_VIDEO_UPDATE(sbugger) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c index 6a4286f0a45..cc6699adb66 100644 --- a/src/mame/drivers/scobra.c +++ b/src/mame/drivers/scobra.c @@ -891,13 +891,13 @@ static MACHINE_CONFIG_START( type1, scobra_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(galaxold) MCFG_GFXDECODE(scobra) MCFG_PALETTE_LENGTH(32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 1 for background */ MCFG_PALETTE_INIT(scrambold) MCFG_VIDEO_START(scrambold) - MCFG_VIDEO_UPDATE(galaxold) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1017,13 +1017,13 @@ static MACHINE_CONFIG_START( hustler, scobra_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(galaxold) MCFG_GFXDECODE(scobra) MCFG_PALETTE_LENGTH(32+64+2) /* 32 for characters, 64 for stars, 2 for bullets */ MCFG_PALETTE_INIT(galaxold) MCFG_VIDEO_START(scrambold) - MCFG_VIDEO_UPDATE(galaxold) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index bc494d1d0c6..0ad9d06fc2a 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -199,13 +199,13 @@ static MACHINE_CONFIG_START( scotrsht, scotrsht_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(scotrsht) MCFG_GFXDECODE(scotrsht) MCFG_PALETTE_LENGTH(16*8*16+16*8*16) MCFG_PALETTE_INIT(scotrsht) MCFG_VIDEO_START(scotrsht) - MCFG_VIDEO_UPDATE(scotrsht) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c index da411b50af9..12fd17ac61b 100644 --- a/src/mame/drivers/scramble.c +++ b/src/mame/drivers/scramble.c @@ -1262,13 +1262,13 @@ static MACHINE_CONFIG_START( scramble, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(galaxold) MCFG_GFXDECODE(scramble) MCFG_PALETTE_LENGTH(32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT(scrambold) MCFG_VIDEO_START(scrambold) - MCFG_VIDEO_UPDATE(galaxold) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1483,13 +1483,13 @@ static MACHINE_CONFIG_START( ad2083, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(galaxold) MCFG_GFXDECODE(ad2083) MCFG_PALETTE_LENGTH(32+64+2+8) /* 32 for characters, 64 for stars, 2 for bullets, 8 for background */ MCFG_PALETTE_INIT(turtles) MCFG_VIDEO_START(ad2083) - MCFG_VIDEO_UPDATE(galaxold) /* sound hardware */ diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c index a9f95d212ff..ab074e230dc 100644 --- a/src/mame/drivers/scregg.c +++ b/src/mame/drivers/scregg.c @@ -243,13 +243,13 @@ static MACHINE_CONFIG_START( dommy, btime_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(eggs) MCFG_GFXDECODE(scregg) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(btime) MCFG_VIDEO_START(btime) - MCFG_VIDEO_UPDATE(eggs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -279,13 +279,13 @@ static MACHINE_CONFIG_START( scregg, btime_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(eggs) MCFG_GFXDECODE(scregg) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(btime) MCFG_VIDEO_START(btime) - MCFG_VIDEO_UPDATE(eggs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c index a8dbc45bca2..e111a7e5961 100644 --- a/src/mame/drivers/sderby.c +++ b/src/mame/drivers/sderby.c @@ -468,11 +468,11 @@ static MACHINE_CONFIG_START( sderby, sderby_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(4*8, 44*8-1, 3*8, 33*8-1) + MCFG_SCREEN_UPDATE(sderby) MCFG_GFXDECODE(sderby) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(sderby) - MCFG_VIDEO_UPDATE(sderby) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */ @@ -493,11 +493,11 @@ static MACHINE_CONFIG_START( spacewin, sderby_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(4*8, 44*8-1, 3*8, 33*8-1) + MCFG_SCREEN_UPDATE(pmroulet) MCFG_GFXDECODE(sderby) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(sderby) - MCFG_VIDEO_UPDATE(pmroulet) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */ @@ -518,11 +518,11 @@ static MACHINE_CONFIG_START( pmroulet, sderby_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(4*8, 44*8-1, 3*8, 33*8-1) + MCFG_SCREEN_UPDATE(pmroulet) MCFG_GFXDECODE(sderby) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(sderby) - MCFG_VIDEO_UPDATE(pmroulet) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */ diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c index a62438a4163..1d14645590f 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -477,7 +477,7 @@ static void update_widget_irq(running_machine *machine); * *************************************/ -static VIDEO_UPDATE( seattle ) +static SCREEN_UPDATE( seattle ) { seattle_state *state = screen->machine->driver_data<seattle_state>(); return voodoo_update(state->voodoo, bitmap, cliprect) ? 0 : UPDATE_HAS_NOT_CHANGED; @@ -2520,8 +2520,7 @@ static MACHINE_CONFIG_START( seattle_common, seattle_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) - - MCFG_VIDEO_UPDATE(seattle) + MCFG_SCREEN_UPDATE(seattle) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 5dfc25ce160..a109948263f 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -1326,7 +1326,7 @@ static VIDEO_START(segac2_new) megadrive_vdp_palette_lookup_highlight = auto_alloc_array(machine, UINT16, 0x1000/2); } -static VIDEO_UPDATE(segac2_new) +static SCREEN_UPDATE(segac2_new) { segac2_state *state = screen->machine->driver_data<segac2_state>(); if (!state->segac2_enable_display) @@ -1335,7 +1335,7 @@ static VIDEO_UPDATE(segac2_new) return 0; } - VIDEO_UPDATE_CALL(megadriv); + SCREEN_UPDATE_CALL(megadriv); return 0; } @@ -1361,12 +1361,12 @@ static MACHINE_CONFIG_START( segac, segac2_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually. MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1) + MCFG_SCREEN_UPDATE(segac2_new) + MCFG_SCREEN_EOF( megadriv ) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(segac2_new) - MCFG_VIDEO_UPDATE(segac2_new) - MCFG_VIDEO_EOF( megadriv ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index 720929a7302..82cc0f39be3 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -881,13 +881,12 @@ static MACHINE_CONFIG_START( systeme, driver_device ) MCFG_SCREEN_SIZE(256, 256) // MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 223) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 191) - + MCFG_SCREEN_UPDATE(systeme) /* Copies a bitmap */ + MCFG_SCREEN_EOF(systeme) /* Used to Sync the timing */ MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(sms) - MCFG_VIDEO_UPDATE(systeme) /* Copies a bitmap */ - MCFG_VIDEO_EOF(systeme) /* Used to Sync the timing */ /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index e84ee89e320..4bbe6fd991b 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -849,9 +849,9 @@ static MACHINE_CONFIG_START( g80r_base, segag80r_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(segag80r) MCFG_VIDEO_START(segag80r) - MCFG_VIDEO_UPDATE(segag80r) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c index 59d3c5d1746..2e7278c1002 100644 --- a/src/mame/drivers/segag80v.c +++ b/src/mame/drivers/segag80v.c @@ -926,9 +926,9 @@ static MACHINE_CONFIG_START( g80v_base, segag80v_state ) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(512, 1536, 640-32, 1408+32) + MCFG_SCREEN_UPDATE(segag80v) MCFG_VIDEO_START(segag80v) - MCFG_VIDEO_UPDATE(segag80v) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index d8ef7c3576a..7b02b4120a4 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -936,9 +936,9 @@ static MACHINE_CONFIG_START( hangon_base, segas1x_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224) + MCFG_SCREEN_UPDATE(hangon) MCFG_VIDEO_START(hangon) - MCFG_VIDEO_UPDATE(hangon) MACHINE_CONFIG_END diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index 7b98e082720..93021db7491 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -89,7 +89,7 @@ static void astron_draw_sprites(running_machine *machine, bitmap_t *bitmap, cons } -static VIDEO_UPDATE( astron ) +static SCREEN_UPDATE( astron ) { bitmap_fill(bitmap, cliprect, 0); diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 93b4d064c64..64fe69bdcbc 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -1129,9 +1129,9 @@ static MACHINE_CONFIG_START( outrun_base, segas1x_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224) + MCFG_SCREEN_UPDATE(outrun) MCFG_VIDEO_START(outrun) - MCFG_VIDEO_UPDATE(outrun) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1162,9 +1162,9 @@ static MACHINE_CONFIG_DERIVED( shangon, outrun_base ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 321, 262, 0, 224) + MCFG_SCREEN_UPDATE(shangon) MCFG_VIDEO_START(shangon) - MCFG_VIDEO_UPDATE(shangon) MCFG_SEGA16SP_ADD_16B("segaspr1") MACHINE_CONFIG_END diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index eba6871d1f6..9ac1b70892f 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -1969,6 +1969,7 @@ static MACHINE_CONFIG_START( system16a, segas1x_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(342,262) /* to be verified */ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(system16a) MCFG_SEGA16SP_ADD_16A("segaspr1") @@ -1976,7 +1977,6 @@ static MACHINE_CONFIG_START( system16a, segas1x_state ) MCFG_PALETTE_LENGTH(2048*3) MCFG_VIDEO_START(system16a) - MCFG_VIDEO_UPDATE(system16a) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 6c90c77d1e7..d8b0f37e5b7 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -3289,9 +3289,9 @@ static MACHINE_CONFIG_START( system16b, segas1x_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224) + MCFG_SCREEN_UPDATE(system16b) MCFG_VIDEO_START(system16b) - MCFG_VIDEO_UPDATE(system16b) MCFG_SEGA16SP_ADD_16B("segaspr1") diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 1263dbfd407..dee0f095a01 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -1295,12 +1295,12 @@ static MACHINE_CONFIG_START( system18, segas1x_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(342,262) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(system18) MCFG_GFXDECODE(segas18) MCFG_PALETTE_LENGTH(2048*3+2048) MCFG_VIDEO_START(system18) - MCFG_VIDEO_UPDATE(system18) MCFG_SEGA16SP_ADD_16B("segaspr1") diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index 950025f5e47..a00a04d8c66 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -1794,11 +1794,11 @@ static MACHINE_CONFIG_START( system24, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(system24) MCFG_PALETTE_LENGTH(8192*2) MCFG_VIDEO_START(system24) - MCFG_VIDEO_UPDATE(system24) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index ddc26994924..be07d4d37f3 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -2196,9 +2196,9 @@ static MACHINE_CONFIG_START( system32, segas32_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(52*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(system32) MCFG_VIDEO_START(system32) - MCFG_VIDEO_UPDATE(system32) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2257,15 +2257,16 @@ static MACHINE_CONFIG_START( multi32, segas32_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(52*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(multi32) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(52*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(multi32) MCFG_VIDEO_START(multi32) - MCFG_VIDEO_UPDATE(multi32) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index 730b9f73aab..098ff74da96 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -1366,9 +1366,9 @@ static MACHINE_CONFIG_START( xboard, segas1x_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/8, 400, 0, 320, 262, 0, 224) + MCFG_SCREEN_UPDATE(xboard) MCFG_VIDEO_START(xboard) - MCFG_VIDEO_UPDATE(xboard) MCFG_SEGA16SP_ADD_XBOARD("segaspr1") diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index 78bdee636f6..b7f37ec7ca8 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -1022,6 +1022,7 @@ static MACHINE_CONFIG_START( yboard, segas1x_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(342,262) /* to be verified */ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(yboard) MCFG_SEGA16SP_ADD_YBOARD_16B("segaspr1") MCFG_SEGA16SP_ADD_YBOARD("segaspr2") @@ -1029,7 +1030,6 @@ static MACHINE_CONFIG_START( yboard, segas1x_state ) MCFG_PALETTE_LENGTH(8192*3) MCFG_VIDEO_START(yboard) - MCFG_VIDEO_UPDATE(yboard) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index a581bb6e3ef..7cdb410a593 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1883,12 +1883,12 @@ static MACHINE_CONFIG_START( spi, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(spi) MCFG_GFXDECODE(spi) MCFG_PALETTE_LENGTH(6144) MCFG_VIDEO_START(spi) - MCFG_VIDEO_UPDATE(spi) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2221,7 +2221,7 @@ static MACHINE_CONFIG_START( seibu386, driver_device ) MCFG_PALETTE_LENGTH(6144) MCFG_VIDEO_START(spi) - MCFG_VIDEO_UPDATE(spi) + MCFG_SCREEN_UPDATE(spi) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2277,7 +2277,7 @@ static MACHINE_CONFIG_START( sys386f2, driver_device ) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(sys386f2) - MCFG_VIDEO_UPDATE(sys386f2) + MCFG_SCREEN_UPDATE(sys386f2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index ffc996dd2de..6d6c6aec6b1 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -414,13 +414,13 @@ static MACHINE_CONFIG_START( nvram, seicross_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seicross) MCFG_GFXDECODE(seicross) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(seicross) MCFG_VIDEO_START(seicross) - MCFG_VIDEO_UPDATE(seicross) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c index 4ccd269385b..d8b08578b07 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -296,12 +296,12 @@ static MACHINE_CONFIG_START( sengokmj, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) //TODO: dynamic resolution + MCFG_SCREEN_UPDATE(seibu_crtc) MCFG_GFXDECODE(sengokmj) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(seibu_crtc) - MCFG_VIDEO_UPDATE(seibu_crtc) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000) diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c index 9a8442be047..ddb02b07257 100644 --- a/src/mame/drivers/senjyo.c +++ b/src/mame/drivers/senjyo.c @@ -568,12 +568,12 @@ static MACHINE_CONFIG_START( senjyo, senjyo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(senjyo) MCFG_GFXDECODE(senjyo) MCFG_PALETTE_LENGTH(512+2) /* 512 real palette + 2 for the radar */ MCFG_VIDEO_START(senjyo) - MCFG_VIDEO_UPDATE(senjyo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 36717254265..c702823bbc5 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1545,7 +1545,7 @@ static READ8_DEVICE_HANDLER( dsw2_r ) Sprites Buffering */ -static VIDEO_EOF( seta_buffer_sprites ) +static SCREEN_EOF( seta_buffer_sprites ) { seta_state *state = machine->driver_data<seta_state>(); UINT16 *spriteram16 = state->spriteram; @@ -6879,12 +6879,12 @@ static MACHINE_CONFIG_START( tndrcade, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -6928,12 +6928,12 @@ static MACHINE_CONFIG_START( twineagl, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(downtown) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(twineagl_1_layer) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -6969,12 +6969,12 @@ static MACHINE_CONFIG_START( downtown, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(downtown) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(seta_1_layer) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -7028,13 +7028,13 @@ static MACHINE_CONFIG_START( usclssic, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(usclssic) MCFG_GFXDECODE(usclssic) MCFG_PALETTE_LENGTH(16*32 + 64*32*2) /* sprites, layer */ MCFG_PALETTE_INIT(usclssic) /* layer is 6 planes deep */ MCFG_VIDEO_START(seta_1_layer) - MCFG_VIDEO_UPDATE(usclssic) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7076,12 +7076,12 @@ static MACHINE_CONFIG_START( calibr50, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(downtown) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(seta_1_layer) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -7115,12 +7115,12 @@ static MACHINE_CONFIG_START( metafox, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(downtown) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(seta_1_layer) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7150,12 +7150,12 @@ static MACHINE_CONFIG_START( atehate, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7191,14 +7191,14 @@ static MACHINE_CONFIG_START( blandia, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) + MCFG_SCREEN_EOF(seta_buffer_sprites) /* Blandia uses sprite buffering */ MCFG_GFXDECODE(blandia) MCFG_PALETTE_LENGTH((16*32+64*32*4)*2) /* sprites, layer1, layer2, palette effect */ MCFG_PALETTE_INIT(blandia) /* layers 1&2 are 6 planes deep */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_EOF(seta_buffer_sprites) /* Blandia uses sprite buffering */ - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7223,14 +7223,14 @@ static MACHINE_CONFIG_START( blandiap, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) + MCFG_SCREEN_EOF(seta_buffer_sprites) /* Blandia uses sprite buffering */ MCFG_GFXDECODE(blandia) MCFG_PALETTE_LENGTH((16*32+64*32*4)*2) /* sprites, layer1, layer2, palette effect */ MCFG_PALETTE_INIT(blandia) /* layers 1&2 are 6 planes deep */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_EOF(seta_buffer_sprites) /* Blandia uses sprite buffering */ - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7260,12 +7260,12 @@ static MACHINE_CONFIG_START( blockcar, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7295,12 +7295,12 @@ static MACHINE_CONFIG_START( daioh, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7335,13 +7335,13 @@ static MACHINE_CONFIG_START( drgnunit, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) + MCFG_SCREEN_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ MCFG_GFXDECODE(downtown) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(seta_1_layer) - MCFG_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7369,13 +7369,13 @@ static MACHINE_CONFIG_START( qzkklgy2, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) + MCFG_SCREEN_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ MCFG_GFXDECODE(qzkklgy2) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(seta_1_layer) - MCFG_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7415,14 +7415,14 @@ static MACHINE_CONFIG_START( setaroul, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) + MCFG_SCREEN_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ MCFG_GFXDECODE(setaroul) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(setaroul) MCFG_VIDEO_START(seta_1_layer) - MCFG_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7452,12 +7452,12 @@ static MACHINE_CONFIG_START( eightfrc, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7492,13 +7492,13 @@ static MACHINE_CONFIG_START( extdwnhl, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(zingzip) MCFG_PALETTE_LENGTH(16*32+16*32+64*32*2) /* sprites, layer2, layer1 */ MCFG_PALETTE_INIT(zingzip) /* layer 1 gfx is 6 planes deep */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7553,13 +7553,13 @@ static MACHINE_CONFIG_START( gundhara, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(jjsquawk) MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */ MCFG_PALETTE_INIT(gundhara) /* layers are 6 planes deep (but have only 4 palettes) */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7593,13 +7593,13 @@ static MACHINE_CONFIG_START( jjsquawk, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(jjsquawk) MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */ MCFG_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7624,13 +7624,13 @@ static MACHINE_CONFIG_START( jjsquawb, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(jjsquawk) MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */ MCFG_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7664,12 +7664,12 @@ static MACHINE_CONFIG_START( kamenrid, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7700,12 +7700,12 @@ static MACHINE_CONFIG_START( orbs, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(orbs) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7737,12 +7737,12 @@ static MACHINE_CONFIG_START( keroppi, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(orbs) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7772,12 +7772,12 @@ static MACHINE_CONFIG_START( krzybowl, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7812,6 +7812,7 @@ static MACHINE_CONFIG_START( madshark, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(jjsquawk) MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */ @@ -7819,7 +7820,6 @@ static MACHINE_CONFIG_START( madshark, seta_state ) MCFG_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7858,13 +7858,13 @@ static MACHINE_CONFIG_START( msgundam, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) + MCFG_SCREEN_EOF(seta_buffer_sprites) /* msgundam uses sprite buffering */ MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_EOF(seta_buffer_sprites) /* msgundam uses sprite buffering */ - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7895,12 +7895,12 @@ static MACHINE_CONFIG_START( oisipuzl, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START(oisipuzl_2_layers) // flip is inverted for the tilemaps - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7931,12 +7931,12 @@ static MACHINE_CONFIG_START( triplfun, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START(oisipuzl_2_layers) // flip is inverted for the tilemaps - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -7965,12 +7965,12 @@ static MACHINE_CONFIG_START( kiwame, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 56*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8003,12 +8003,12 @@ static MACHINE_CONFIG_START( rezon, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8041,12 +8041,12 @@ static MACHINE_CONFIG_START( thunderl, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8075,12 +8075,12 @@ static MACHINE_CONFIG_START( wiggie, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(wiggie) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8108,12 +8108,12 @@ static MACHINE_CONFIG_START( wits, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8143,12 +8143,12 @@ static MACHINE_CONFIG_START( umanclub, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8182,12 +8182,12 @@ static MACHINE_CONFIG_START( utoukond, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8230,12 +8230,12 @@ static MACHINE_CONFIG_START( wrofaero, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(msgundam) MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8272,13 +8272,13 @@ static MACHINE_CONFIG_START( zingzip, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(zingzip) MCFG_PALETTE_LENGTH(16*32+16*32+64*32*2) /* sprites, layer2, layer1 */ MCFG_PALETTE_INIT(zingzip) /* layer 1 gfx is 6 planes deep */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8307,12 +8307,12 @@ static MACHINE_CONFIG_START( pairlove, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) /* just draw the sprites */ MCFG_GFXDECODE(tndrcade) MCFG_PALETTE_LENGTH(2048) /* sprites only */ MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -8351,13 +8351,13 @@ static MACHINE_CONFIG_START( crazyfgt, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8-4, 30*8-1-4) + MCFG_SCREEN_UPDATE(seta) MCFG_GFXDECODE(crazyfgt) MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer1, layer2 */ MCFG_PALETTE_INIT(gundhara) /* layers are 6 planes deep (but have only 4 palettes) */ MCFG_VIDEO_START(seta_2_layers) - MCFG_VIDEO_UPDATE(seta) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8444,13 +8444,13 @@ static MACHINE_CONFIG_START( inttoote, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(inttoote) MCFG_GFXDECODE(inttoote) MCFG_PALETTE_LENGTH(512 * 1) MCFG_PALETTE_INIT(inttoote) MCFG_VIDEO_START(seta_1_layer) - MCFG_VIDEO_UPDATE(inttoote) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index a96cfe17d6a..0948251c8ed 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -2322,13 +2322,13 @@ static MACHINE_CONFIG_START( mj4simai, seta2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 0x200) MCFG_SCREEN_VISIBLE_AREA(0x40, 0x1c0-1, 0x80, 0x170-1) + MCFG_SCREEN_UPDATE(seta2) + MCFG_SCREEN_EOF(seta2) MCFG_GFXDECODE(seta2) MCFG_PALETTE_LENGTH(0x8000+0xf0) /* extra 0xf0 because we might draw 256-color object with 16-color granularity */ MCFG_VIDEO_START(seta2) - MCFG_VIDEO_UPDATE(seta2) - MCFG_VIDEO_EOF(seta2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2500,13 +2500,13 @@ static MACHINE_CONFIG_START( funcube, seta2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 0x200) MCFG_SCREEN_VISIBLE_AREA(0x0, 0x140-1, 0x80, 0x170-1) + MCFG_SCREEN_UPDATE(seta2) + MCFG_SCREEN_EOF(seta2) MCFG_GFXDECODE(funcube) MCFG_PALETTE_LENGTH(0x8000+0xf0) /* extra 0xf0 because we might draw 256-color object with 16-color granularity */ MCFG_VIDEO_START(seta2) - MCFG_VIDEO_UPDATE(seta2) - MCFG_VIDEO_EOF(seta2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 3711ae66181..71a93887b19 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -852,12 +852,12 @@ static MACHINE_CONFIG_START( sf, sf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(sf) MCFG_GFXDECODE(sf) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(sf) - MCFG_VIDEO_UPDATE(sf) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index 57cb99a4753..959812a5051 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -904,7 +904,7 @@ static void sfbonus_draw_reel_layer(screen_device *screen, bitmap_t *bitmap, con } -static VIDEO_UPDATE(sfbonus) +static SCREEN_UPDATE(sfbonus) { int globalyscroll = (sfbonus_vregs[2] | sfbonus_vregs[3]<<8); @@ -1266,11 +1266,11 @@ static MACHINE_CONFIG_START( sfbonus, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(128*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 288-1) - + MCFG_SCREEN_UPDATE(sfbonus) + MCFG_PALETTE_LENGTH(0x100*2) // *2 for priority workaraound / custom drawing MCFG_VIDEO_START(sfbonus) - MCFG_VIDEO_UPDATE(sfbonus) /* Parrot 3 seems fine at 1 Mhz, but Double Challenge isn't? */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sfcbox.c b/src/mame/drivers/sfcbox.c index c7acb2cf3e0..b3ec951001e 100644 --- a/src/mame/drivers/sfcbox.c +++ b/src/mame/drivers/sfcbox.c @@ -222,11 +222,11 @@ static MACHINE_CONFIG_START( snes, snes_state ) /* video hardware */ MCFG_VIDEO_START( snes ) - MCFG_VIDEO_UPDATE( snes ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC) + MCFG_SCREEN_UPDATE( snes ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index d7e5ab0e9b4..67dfc7803a4 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -496,6 +496,7 @@ static MACHINE_CONFIG_START( sfkick, sfkick_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS) MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1) + MCFG_SCREEN_UPDATE(generic_bitmapped) MCFG_PALETTE_LENGTH(512) @@ -506,7 +507,6 @@ static MACHINE_CONFIG_START( sfkick, sfkick_state ) MCFG_PALETTE_INIT( v9938 ) MCFG_VIDEO_START(sfkick) - MCFG_VIDEO_UPDATE(generic_bitmapped) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/6) diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index bc298bc5d86..9d664727f2b 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -568,13 +568,13 @@ static MACHINE_CONFIG_START( shadfrce, shadfrce_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 432, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ + MCFG_SCREEN_UPDATE(shadfrce) + MCFG_SCREEN_EOF(shadfrce) MCFG_GFXDECODE(shadfrce) MCFG_PALETTE_LENGTH(0x4000) MCFG_VIDEO_START(shadfrce) - MCFG_VIDEO_EOF(shadfrce) - MCFG_VIDEO_UPDATE(shadfrce) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index ea42929d6e5..d5139f408aa 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -483,12 +483,12 @@ static MACHINE_CONFIG_START( shangha3, shangha3_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(24*16, 16*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1) + MCFG_SCREEN_UPDATE(shangha3) MCFG_GFXDECODE(shangha3) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(shangha3) - MCFG_VIDEO_UPDATE(shangha3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -522,12 +522,12 @@ static MACHINE_CONFIG_START( heberpop, shangha3_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(24*16, 16*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1) + MCFG_SCREEN_UPDATE(shangha3) MCFG_GFXDECODE(shangha3) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(shangha3) - MCFG_VIDEO_UPDATE(shangha3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -562,12 +562,12 @@ static MACHINE_CONFIG_START( blocken, shangha3_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(24*16, 16*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1) + MCFG_SCREEN_UPDATE(shangha3) MCFG_GFXDECODE(shangha3) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(shangha3) - MCFG_VIDEO_UPDATE(shangha3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c index fa1cccdcd9a..81ff177f7de 100644 --- a/src/mame/drivers/shanghai.c +++ b/src/mame/drivers/shanghai.c @@ -61,7 +61,7 @@ static VIDEO_START( shanghai ) { } -static VIDEO_UPDATE( shanghai ) +static SCREEN_UPDATE( shanghai ) { device_t *hd63484 = screen->machine->device("hd63484"); int x, y, b, src; @@ -438,12 +438,12 @@ static MACHINE_CONFIG_START( shanghai, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 280) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1) // Base Screen is 384 pixel + MCFG_SCREEN_UPDATE(shanghai) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(shanghai) MCFG_VIDEO_START(shanghai) - MCFG_VIDEO_UPDATE(shanghai) MCFG_HD63484_ADD("hd63484", shanghai_hd63484_intf) @@ -473,11 +473,11 @@ static MACHINE_CONFIG_START( shangha2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 280) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1) // Base Screen is 384 pixel + MCFG_SCREEN_UPDATE(shanghai) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(shanghai) - MCFG_VIDEO_UPDATE(shanghai) MCFG_HD63484_ADD("hd63484", shanghai_hd63484_intf) @@ -512,11 +512,11 @@ static MACHINE_CONFIG_START( kothello, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(384, 280) MCFG_SCREEN_VISIBLE_AREA(8, 384-1, 0, 250-1) // Base Screen is 376 pixel + MCFG_SCREEN_UPDATE(shanghai) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(shanghai) - MCFG_VIDEO_UPDATE(shanghai) MCFG_HD63484_ADD("hd63484", shanghai_hd63484_intf) diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index b43266534fe..9603849b09d 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -390,13 +390,13 @@ static MACHINE_CONFIG_START( chinhero, shangkid_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(16, 319-16, 0, 223) + MCFG_SCREEN_UPDATE(shangkid) MCFG_GFXDECODE(chinhero) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(shangkid) - MCFG_VIDEO_UPDATE(shangkid) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -470,12 +470,12 @@ static MACHINE_CONFIG_START( dynamski, shangkid_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256+32, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255+32, 16, 255-16) + MCFG_SCREEN_UPDATE(dynamski) MCFG_GFXDECODE(dynamski) MCFG_PALETTE_LENGTH(16*4+16*4) MCFG_PALETTE_INIT(dynamski) - MCFG_VIDEO_UPDATE(dynamski) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c index d8643923b4c..cf0e21a104d 100644 --- a/src/mame/drivers/shaolins.c +++ b/src/mame/drivers/shaolins.c @@ -202,13 +202,13 @@ static MACHINE_CONFIG_START( shaolins, shaolins_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(shaolins) MCFG_GFXDECODE(shaolins) MCFG_PALETTE_LENGTH(16*8*16+16*8*16) MCFG_PALETTE_INIT(shaolins) MCFG_VIDEO_START(shaolins) - MCFG_VIDEO_UPDATE(shaolins) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index ff7d539b9da..3bec559124d 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -233,12 +233,12 @@ static MACHINE_CONFIG_START( shisen, shisen_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(sichuan2) MCFG_GFXDECODE(shisen) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(sichuan2) - MCFG_VIDEO_UPDATE(sichuan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index e1148d309dd..9dc66827b73 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -276,13 +276,13 @@ static MACHINE_CONFIG_START( shootout, shootout_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(shootout) MCFG_GFXDECODE(shootout) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(shootout) MCFG_VIDEO_START(shootout) - MCFG_VIDEO_UPDATE(shootout) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -306,13 +306,13 @@ static MACHINE_CONFIG_START( shootouj, shootout_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(shootouj) MCFG_GFXDECODE(shootout) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(shootout) MCFG_VIDEO_START(shootout) - MCFG_VIDEO_UPDATE(shootouj) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index 7c6bf982753..8ce220f14cb 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -160,7 +160,7 @@ static PALETTE_INIT( shougi ) -static VIDEO_UPDATE( shougi ) +static SCREEN_UPDATE( shougi ) { shougi_state *state = screen->machine->driver_data<shougi_state>(); int offs; @@ -415,11 +415,11 @@ static MACHINE_CONFIG_START( shougi, shougi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 255) + MCFG_SCREEN_UPDATE(shougi) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(shougi) - MCFG_VIDEO_UPDATE(shougi) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c index 2fb57ae012e..a59567afe14 100644 --- a/src/mame/drivers/shuuz.c +++ b/src/mame/drivers/shuuz.c @@ -278,9 +278,9 @@ static MACHINE_CONFIG_START( shuuz, shuuz_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a VAD chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(shuuz) MCFG_VIDEO_START(shuuz) - MCFG_VIDEO_UPDATE(shuuz) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index 5b39c18ec3f..22dcaa7e697 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -671,13 +671,13 @@ static MACHINE_CONFIG_START( sidearms, sidearms_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(sidearms) + MCFG_SCREEN_EOF(sidearms) MCFG_GFXDECODE(sidearms) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(sidearms) - MCFG_VIDEO_EOF(sidearms) - MCFG_VIDEO_UPDATE(sidearms) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -716,13 +716,13 @@ static MACHINE_CONFIG_START( turtship, sidearms_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_EOF(sidearms) + MCFG_SCREEN_UPDATE(sidearms) MCFG_GFXDECODE(turtship) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(sidearms) - MCFG_VIDEO_EOF(sidearms) - MCFG_VIDEO_UPDATE(sidearms) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -764,13 +764,13 @@ static MACHINE_CONFIG_START( whizz, sidearms_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(sidearms) + MCFG_SCREEN_EOF(sidearms) MCFG_GFXDECODE(turtship) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(sidearms) - MCFG_VIDEO_UPDATE(sidearms) - MCFG_VIDEO_EOF(sidearms) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c index ddb7b531a1e..730bf49db65 100644 --- a/src/mame/drivers/sidepckt.c +++ b/src/mame/drivers/sidepckt.c @@ -277,13 +277,13 @@ static MACHINE_CONFIG_START( sidepckt, sidepckt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(sidepckt) MCFG_GFXDECODE(sidepckt) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(sidepckt) MCFG_VIDEO_START(sidepckt) - MCFG_VIDEO_UPDATE(sidepckt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sigmab52.c b/src/mame/drivers/sigmab52.c index ba4cc039657..8727246eecd 100644 --- a/src/mame/drivers/sigmab52.c +++ b/src/mame/drivers/sigmab52.c @@ -144,7 +144,7 @@ static VIDEO_START( jwildb52 ) } -static VIDEO_UPDATE( jwildb52 ) +static SCREEN_UPDATE( jwildb52 ) { device_t *hd63484 = screen->machine->device("hd63484"); @@ -586,6 +586,7 @@ static MACHINE_CONFIG_START( jwildb52, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(1024, 1024) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 384-1) + MCFG_SCREEN_UPDATE(jwildb52) MCFG_HD63484_ADD("hd63484", jwildb52_hd63484_intf) @@ -593,7 +594,6 @@ static MACHINE_CONFIG_START( jwildb52, driver_device ) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(jwildb52) - MCFG_VIDEO_UPDATE(jwildb52) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index 3b1dcc6a7a0..89715d3c90f 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -214,7 +214,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -static VIDEO_UPDATE(sigmab98) +static SCREEN_UPDATE(sigmab98) { int layers_ctrl = -1; @@ -591,7 +591,7 @@ static WRITE8_HANDLER( vblank_w ) vblank = (vblank & ~0x03) | (data & 0x03); } -static VIDEO_EOF( sammymdl ) +static SCREEN_EOF( sammymdl ) { vblank &= ~0x01; } @@ -1552,12 +1552,11 @@ static MACHINE_CONFIG_START( gegege, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x200, 0x200) MCFG_SCREEN_VISIBLE_AREA(0,0x140-1, 0,0xf0-1) + MCFG_SCREEN_UPDATE(sigmab98) MCFG_GFXDECODE(sigmab98) MCFG_PALETTE_LENGTH(0x100) - MCFG_VIDEO_UPDATE(sigmab98) - // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1606,13 +1605,12 @@ static MACHINE_CONFIG_START( sammymdl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x140, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xf0-1) + MCFG_SCREEN_UPDATE(sigmab98) + MCFG_SCREEN_EOF(sammymdl) MCFG_GFXDECODE(sigmab98) MCFG_PALETTE_LENGTH(0x100) - MCFG_VIDEO_UPDATE(sigmab98) - MCFG_VIDEO_EOF(sammymdl) - // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index 6a13d9494cb..3de92c77824 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -292,12 +292,12 @@ static MACHINE_CONFIG_START( silkroad, silkroad_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(6*8+2, 64*8-1-(10*8)-2, 2*8, 32*8-1-(2*8)) + MCFG_SCREEN_UPDATE(silkroad) MCFG_GFXDECODE(silkroad) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(silkroad) - MCFG_VIDEO_UPDATE(silkroad) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index 8c894b3e48f..e5dcee4c237 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -431,11 +431,11 @@ static MACHINE_CONFIG_START( chainrec, simpl156_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(simpl156) MCFG_PALETTE_LENGTH(4096) MCFG_GFXDECODE(simpl156) MCFG_VIDEO_START(simpl156) - MCFG_VIDEO_UPDATE(simpl156) MCFG_DECO16IC_ADD("deco_custom", simpl156_deco16ic_intf) diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 1c5fdb5ca1f..24bc5c9b0d1 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -330,11 +330,10 @@ static MACHINE_CONFIG_START( simpsons, simpsons_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(simpsons) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(simpsons) - MCFG_K052109_ADD("k052109", simpsons_k052109_intf) MCFG_K053246_ADD("k053246", simpsons_k053246_intf) MCFG_K053251_ADD("k053251") diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c index 3ec7ac060c4..f0cd5ad9db6 100644 --- a/src/mame/drivers/skeetsht.c +++ b/src/mame/drivers/skeetsht.c @@ -263,9 +263,9 @@ static MACHINE_CONFIG_START( skeetsht, skeetsht_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(48000000 / 8, 156*4, 0, 100*4, 328, 0, 300) // FIXME + MCFG_SCREEN_UPDATE(tms340x0) MCFG_VIDEO_START(skeetsht) - MCFG_VIDEO_UPDATE(tms340x0) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c index fdd75d1fde0..0d6721b4597 100644 --- a/src/mame/drivers/skimaxx.c +++ b/src/mame/drivers/skimaxx.c @@ -134,11 +134,11 @@ static VIDEO_START( skimaxx ) memory_configure_bank(machine, "bank1", 1, 1, skimaxx_bg_buffer_front, 0); } -static VIDEO_UPDATE( skimaxx ) +static SCREEN_UPDATE( skimaxx ) { // popmessage("%02x %02x", input_port_read(screen->machine, "X"), input_port_read(screen->machine, "Y") ); - VIDEO_UPDATE_CALL(tms340x0); + SCREEN_UPDATE_CALL(tms340x0); return 0; } @@ -525,10 +525,10 @@ static MACHINE_CONFIG_START( skimaxx, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(0x400, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x280-1, 0, 0xf0-1) +// MCFG_SCREEN_UPDATE(tms340x0) + MCFG_SCREEN_UPDATE(skimaxx) MCFG_VIDEO_START(skimaxx) -// MCFG_VIDEO_UPDATE(tms340x0) - MCFG_VIDEO_UPDATE(skimaxx) // MCFG_GFXDECODE( skimaxx ) diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c index 6bf03492e72..dbc377d70df 100644 --- a/src/mame/drivers/skullxbo.c +++ b/src/mame/drivers/skullxbo.c @@ -274,9 +274,9 @@ static MACHINE_CONFIG_START( skullxbo, skullxbo_state ) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) + MCFG_SCREEN_UPDATE(skullxbo) MCFG_VIDEO_START(skullxbo) - MCFG_VIDEO_UPDATE(skullxbo) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_ii_mono) diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index f081853fe87..82cf8a71bc2 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -115,7 +115,7 @@ static VIDEO_START( skyarmy ) } -static VIDEO_UPDATE( skyarmy ) +static SCREEN_UPDATE( skyarmy ) { skyarmy_state *state = screen->machine->driver_data<skyarmy_state>(); UINT8 *spriteram = state->spriteram; @@ -286,13 +286,13 @@ static MACHINE_CONFIG_START( skyarmy, skyarmy_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8,32*8) MCFG_SCREEN_VISIBLE_AREA(0*8,32*8-1,1*8,31*8-1) + MCFG_SCREEN_UPDATE(skyarmy) MCFG_GFXDECODE(skyarmy) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(skyarmy) MCFG_VIDEO_START(skyarmy) - MCFG_VIDEO_UPDATE(skyarmy) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c index 108c7e38d22..b1084c89751 100644 --- a/src/mame/drivers/skydiver.c +++ b/src/mame/drivers/skydiver.c @@ -389,13 +389,13 @@ static MACHINE_CONFIG_START( skydiver, skydiver_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(skydiver) MCFG_GFXDECODE(skydiver) MCFG_PALETTE_LENGTH(sizeof(colortable_source) / sizeof(colortable_source[0])) MCFG_PALETTE_INIT(skydiver) MCFG_VIDEO_START(skydiver) - MCFG_VIDEO_UPDATE(skydiver) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index 80456eabf60..0623f1fecd1 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -258,12 +258,12 @@ static MACHINE_CONFIG_START( skyfox, skyfox_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0+0x60, 320-1+0x60, 0+16, 256-1-16) // from $30*2 to $CC*2+8 + MCFG_SCREEN_UPDATE(skyfox) MCFG_GFXDECODE(skyfox) MCFG_PALETTE_LENGTH(256+256) /* 256 static colors (+256 for the background??) */ MCFG_PALETTE_INIT(skyfox) - MCFG_VIDEO_UPDATE(skyfox) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index bdedcdf6a56..22a6a26020a 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -450,13 +450,13 @@ static MACHINE_CONFIG_START( skykid, skykid_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(skykid) MCFG_GFXDECODE(skykid) MCFG_PALETTE_LENGTH(64*4+128*4+64*8) MCFG_PALETTE_INIT(skykid) MCFG_VIDEO_START(skykid) - MCFG_VIDEO_UPDATE(skykid) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index f5a90d4ef3d..4492d7a7ff4 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -138,7 +138,7 @@ static const rectangle visible2 = { 0*8, (20+48)*8-1, 12*8, (12+7)*8-1 }; static const rectangle visible3 = { 0*8, (20+48)*8-1, 20*8, (20+7)*8-1 }; -static VIDEO_UPDATE( skylncr ) +static SCREEN_UPDATE( skylncr ) { int i; @@ -678,12 +678,12 @@ static MACHINE_CONFIG_START( skylncr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_UPDATE(skylncr) MCFG_GFXDECODE(skylncr) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(skylncr) - MCFG_VIDEO_UPDATE(skylncr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c index dba8dfd591d..41535cffd90 100644 --- a/src/mame/drivers/skyraid.c +++ b/src/mame/drivers/skyraid.c @@ -234,6 +234,7 @@ static MACHINE_CONFIG_START( skyraid, skyraid_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 240) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 239) + MCFG_SCREEN_UPDATE(skyraid) MCFG_GFXDECODE(skyraid) @@ -241,7 +242,6 @@ static MACHINE_CONFIG_START( skyraid, skyraid_state ) MCFG_PALETTE_LENGTH(20) MCFG_VIDEO_START(skyraid) - MCFG_VIDEO_UPDATE(skyraid) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index d17bae8caf8..bcc8e59b127 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -737,7 +737,7 @@ static const ay8910_interface ay8910_interface_2 = DEVCB_NULL }; -static VIDEO_EOF( perfrman ) +static SCREEN_EOF( perfrman ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram_w(space, 0, 0); @@ -768,14 +768,14 @@ static MACHINE_CONFIG_START( perfrman, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 34*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(perfrman) + MCFG_SCREEN_EOF(perfrman) MCFG_GFXDECODE(perfrman) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(perfrman) - MCFG_VIDEO_EOF(perfrman) - MCFG_VIDEO_UPDATE(perfrman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -815,14 +815,14 @@ static MACHINE_CONFIG_START( tigerhb, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 36*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(slapfight) + MCFG_SCREEN_EOF(perfrman) MCFG_GFXDECODE(slapfght) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(slapfight) - MCFG_VIDEO_EOF(perfrman) - MCFG_VIDEO_UPDATE(slapfight) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -864,14 +864,14 @@ static MACHINE_CONFIG_START( tigerh, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 36*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(slapfight) + MCFG_SCREEN_EOF(perfrman) MCFG_GFXDECODE(slapfght) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(slapfight) - MCFG_VIDEO_EOF(perfrman) - MCFG_VIDEO_UPDATE(slapfight) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -914,14 +914,14 @@ static MACHINE_CONFIG_START( slapfigh, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 36*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(slapfight) + MCFG_SCREEN_EOF(perfrman) MCFG_GFXDECODE(slapfght) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(slapfight) - MCFG_VIDEO_EOF(perfrman) - MCFG_VIDEO_UPDATE(slapfight) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 9c8b286eec9..209264e6029 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -574,13 +574,13 @@ static MACHINE_CONFIG_START( slapshot, slapshot_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(slapshot) + MCFG_SCREEN_EOF(taito_no_buffer) MCFG_GFXDECODE(slapshot) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(slapshot) - MCFG_VIDEO_EOF(taito_no_buffer) - MCFG_VIDEO_UPDATE(slapshot) MCFG_TC0480SCP_ADD("tc0480scp", slapshot_tc0480scp_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -623,13 +623,13 @@ static MACHINE_CONFIG_START( opwolf3, slapshot_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(slapshot) + MCFG_SCREEN_EOF(taito_no_buffer) MCFG_GFXDECODE(slapshot) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(slapshot) - MCFG_VIDEO_EOF(taito_no_buffer) - MCFG_VIDEO_UPDATE(slapshot) MCFG_TC0480SCP_ADD("tc0480scp", slapshot_tc0480scp_intf) MCFG_TC0360PRI_ADD("tc0360pri") diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index 9dc440080dd..5953f4d0853 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -483,7 +483,7 @@ static VIDEO_START(sliver) state->bitmap_fg = machine->primary_screen->alloc_compatible_bitmap(); } -static VIDEO_UPDATE(sliver) +static SCREEN_UPDATE(sliver) { sliver_state *state = screen->machine->driver_data<sliver_state>(); @@ -585,9 +585,9 @@ static MACHINE_CONFIG_START( sliver, sliver_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 384-1-16, 0*8, 240-1) + MCFG_SCREEN_UPDATE(sliver) MCFG_VIDEO_START(sliver) - MCFG_VIDEO_UPDATE(sliver) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c index f394deb037d..76a0d790213 100644 --- a/src/mame/drivers/slotcarn.c +++ b/src/mame/drivers/slotcarn.c @@ -523,7 +523,7 @@ GFXDECODE_END -static VIDEO_UPDATE( slotcarn ) +static SCREEN_UPDATE( slotcarn ) { device_t *mc6845 = screen->machine->device("crtc"); mc6845_update(mc6845, bitmap, cliprect); @@ -609,12 +609,12 @@ static MACHINE_CONFIG_START( slotcarn, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 512, 0, 512, 256, 0, 256) /* temporary, CRTC will configure screen */ + MCFG_SCREEN_UPDATE(slotcarn) MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) MCFG_GFXDECODE(slotcarn) MCFG_PALETTE_LENGTH(0x400) - MCFG_VIDEO_UPDATE(slotcarn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c index 582326df68c..964363c7806 100644 --- a/src/mame/drivers/sms.c +++ b/src/mame/drivers/sms.c @@ -457,7 +457,7 @@ static VIDEO_START( sms ) state_save_register_global_bitmap(machine, sms_bitmap); } -static VIDEO_UPDATE( sms ) +static SCREEN_UPDATE( sms ) { copybitmap(bitmap, sms_bitmap, 0, 0, 0, 0, cliprect); return 0; @@ -557,12 +557,12 @@ static MACHINE_CONFIG_START( sms, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x1b0, 0x100) MCFG_SCREEN_VISIBLE_AREA(0, 0x1af, 0, 0xff) + MCFG_SCREEN_UPDATE(sms) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(sms) MCFG_VIDEO_START(sms) - MCFG_VIDEO_UPDATE(sms) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c index 6a74d60447a..e3110a1182e 100644 --- a/src/mame/drivers/snesb.c +++ b/src/mame/drivers/snesb.c @@ -514,11 +514,11 @@ static MACHINE_CONFIG_START( kinstb, snes_state ) /* video hardware */ MCFG_VIDEO_START( snes ) - MCFG_VIDEO_UPDATE( snes ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC) + MCFG_SCREEN_UPDATE( snes ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index 624aab2a0b1..e09958f3adf 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -3657,13 +3657,13 @@ static MACHINE_CONFIG_START( marvins, snk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1) + MCFG_SCREEN_UPDATE(marvins) MCFG_GFXDECODE(marvins) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(tnk3) MCFG_VIDEO_START(marvins) - MCFG_VIDEO_UPDATE(marvins) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3727,13 +3727,13 @@ static MACHINE_CONFIG_START( jcross, snk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1) + MCFG_SCREEN_UPDATE(tnk3) MCFG_GFXDECODE(tnk3) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(tnk3) MCFG_VIDEO_START(jcross) - MCFG_VIDEO_UPDATE(tnk3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3806,13 +3806,13 @@ static MACHINE_CONFIG_START( tnk3, snk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1) + MCFG_SCREEN_UPDATE(tnk3) MCFG_GFXDECODE(tnk3) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(tnk3) MCFG_VIDEO_START(tnk3) - MCFG_VIDEO_UPDATE(tnk3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3891,13 +3891,13 @@ static MACHINE_CONFIG_START( ikari, snk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1) + MCFG_SCREEN_UPDATE(ikari) MCFG_GFXDECODE(ikari) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(ikari) - MCFG_VIDEO_UPDATE(ikari) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3948,13 +3948,13 @@ static MACHINE_CONFIG_START( bermudat, snk_state ) // this visible area matches the psychos pcb MCFG_SCREEN_SIZE(50*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(gwar) MCFG_GFXDECODE(gwar) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(gwar) - MCFG_VIDEO_UPDATE(gwar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4053,13 +4053,13 @@ static MACHINE_CONFIG_START( tdfever, snk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(50*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(tdfever) MCFG_GFXDECODE(tdfever) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(tdfever) - MCFG_VIDEO_UPDATE(tdfever) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c index 8737c6f1eba..bd2950a86c8 100644 --- a/src/mame/drivers/snk6502.c +++ b/src/mame/drivers/snk6502.c @@ -838,13 +838,13 @@ static MACHINE_CONFIG_START( sasuke, snk6502_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(snk6502) MCFG_GFXDECODE(sasuke) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(satansat) MCFG_VIDEO_START(satansat) - MCFG_VIDEO_UPDATE(snk6502) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf) @@ -914,13 +914,13 @@ static MACHINE_CONFIG_START( vanguard, snk6502_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(snk6502) MCFG_GFXDECODE(vanguard) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(snk6502) MCFG_VIDEO_START(snk6502) - MCFG_VIDEO_UPDATE(snk6502) MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf) diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index ee469f17bab..bd06147a1ab 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -608,12 +608,12 @@ static MACHINE_CONFIG_START( pow, snk68_state ) // give a theoretical refresh rate of 59.1856Hz while the measured // rate on a SAR board is 59.16Hz. MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 384, 0, 256, 264, 16, 240) + MCFG_SCREEN_UPDATE(pow) MCFG_GFXDECODE(pow) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(pow) - MCFG_VIDEO_UPDATE(pow) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c index 06bd08229f9..42c2c3555ba 100644 --- a/src/mame/drivers/snookr10.c +++ b/src/mame/drivers/snookr10.c @@ -704,13 +704,13 @@ static MACHINE_CONFIG_START( snookr10, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(96*4, 30*8) MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(snookr10) MCFG_GFXDECODE(snookr10) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(snookr10) MCFG_VIDEO_START(snookr10) - MCFG_VIDEO_UPDATE(snookr10) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index 2b598c033ae..f10afc8bc99 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -80,7 +80,7 @@ static WRITE16_HANDLER( snowbros_flipscreen_w ) } -static VIDEO_UPDATE( snowbros ) +static SCREEN_UPDATE( snowbros ) { device_t *pandora = screen->machine->device("pandora"); @@ -91,7 +91,7 @@ static VIDEO_UPDATE( snowbros ) } -static VIDEO_EOF( snowbros ) +static SCREEN_EOF( snowbros ) { device_t *pandora = machine->device("pandora"); pandora_eof(pandora); @@ -1464,13 +1464,12 @@ static MACHINE_CONFIG_START( snowbros, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(snowbros) + MCFG_SCREEN_EOF(snowbros) MCFG_GFXDECODE(snowbros) MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_UPDATE(snowbros) - MCFG_VIDEO_EOF(snowbros) - MCFG_KANEKO_PANDORA_ADD("pandora", snowbros_pandora_config) /* sound hardware */ @@ -1493,8 +1492,8 @@ static MACHINE_CONFIG_DERIVED( wintbob, snowbros ) /* video hardware */ MCFG_GFXDECODE(wb) - MCFG_VIDEO_UPDATE(wintbob) - MCFG_VIDEO_EOF(0) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(wintbob) MACHINE_CONFIG_END @@ -1575,12 +1574,11 @@ static MACHINE_CONFIG_START( honeydol, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(honeydol) MCFG_GFXDECODE(honeydol) MCFG_PALETTE_LENGTH(0x800/2) - MCFG_VIDEO_UPDATE(honeydol) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1614,12 +1612,11 @@ static MACHINE_CONFIG_START( twinadv, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(twinadv) MCFG_GFXDECODE(twinadv) MCFG_PALETTE_LENGTH(0x100) - MCFG_VIDEO_UPDATE(twinadv) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1688,12 +1685,11 @@ static MACHINE_CONFIG_START( snowbro3, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(snowbro3) MCFG_GFXDECODE(sb3) MCFG_PALETTE_LENGTH(512) - MCFG_VIDEO_UPDATE(snowbro3) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c index e7b0879f116..183377449be 100644 --- a/src/mame/drivers/solomon.c +++ b/src/mame/drivers/solomon.c @@ -208,12 +208,12 @@ static MACHINE_CONFIG_START( solomon, solomon_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(solomon) MCFG_GFXDECODE(solomon) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(solomon) - MCFG_VIDEO_UPDATE(solomon) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index a8228066962..d22ec046f11 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -263,13 +263,13 @@ static MACHINE_CONFIG_START( sonson, sonson_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(sonson) MCFG_GFXDECODE(sonson) MCFG_PALETTE_LENGTH(64*4+32*8) MCFG_PALETTE_INIT(sonson) MCFG_VIDEO_START(sonson) - MCFG_VIDEO_UPDATE(sonson) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c index d8471f2c511..0e24a55a5d0 100644 --- a/src/mame/drivers/sothello.c +++ b/src/mame/drivers/sothello.c @@ -370,10 +370,11 @@ static MACHINE_CONFIG_START( sothello, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512 + 32, (212 + 28) * 2) MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1) + MCFG_SCREEN_UPDATE(generic_bitmapped) + MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT( v9938 ) MCFG_VIDEO_START(sothello) - MCFG_VIDEO_UPDATE(generic_bitmapped) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c index d5f02307ceb..1171327443e 100644 --- a/src/mame/drivers/spacefb.c +++ b/src/mame/drivers/spacefb.c @@ -351,11 +351,11 @@ static MACHINE_CONFIG_START( spacefb, driver_device ) /* video hardware */ MCFG_VIDEO_START(spacefb) - MCFG_VIDEO_UPDATE(spacefb) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(SPACEFB_PIXEL_CLOCK, SPACEFB_HTOTAL, SPACEFB_HBEND, SPACEFB_HBSTART, SPACEFB_VTOTAL, SPACEFB_VBEND, SPACEFB_VBSTART) + MCFG_SCREEN_UPDATE(spacefb) /* audio hardware */ MCFG_FRAGMENT_ADD(spacefb_audio) diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index e348f12012b..f46ee3fdfe1 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -292,7 +292,7 @@ static READ8_HANDLER(spaceg_colorram_r) } -static VIDEO_UPDATE( spaceg ) +static SCREEN_UPDATE( spaceg ) { spaceg_state *state = screen->machine->driver_data<spaceg_state>(); offs_t offs; @@ -415,10 +415,10 @@ static MACHINE_CONFIG_START( spaceg, spaceg_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 32, 255) + MCFG_SCREEN_UPDATE( spaceg ) MCFG_PALETTE_LENGTH(16+128-16) MCFG_PALETTE_INIT( spaceg ) - MCFG_VIDEO_UPDATE( spaceg ) /* sound hardware */ // MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c index bfbfa22b377..6bfe90a1741 100644 --- a/src/mame/drivers/spbactn.c +++ b/src/mame/drivers/spbactn.c @@ -350,12 +350,12 @@ static MACHINE_CONFIG_START( spbactn, spbactn_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(spbactn) MCFG_GFXDECODE(spbactn) MCFG_PALETTE_LENGTH(0x2800/2) MCFG_VIDEO_START(spbactn) - MCFG_VIDEO_UPDATE(spbactn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c index 32f57166556..3ab172d0f7f 100644 --- a/src/mame/drivers/spcforce.c +++ b/src/mame/drivers/spcforce.c @@ -257,12 +257,12 @@ static MACHINE_CONFIG_START( spcforce, spcforce_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(spcforce) MCFG_GFXDECODE(spcforce) MCFG_PALETTE_LENGTH(sizeof(colortable_source) / sizeof(colortable_source[0])) MCFG_PALETTE_INIT(spcforce) - MCFG_VIDEO_UPDATE(spcforce) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 95cfc13fe73..60a8aadcdba 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -438,13 +438,13 @@ static MACHINE_CONFIG_START( spdodgeb, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(spdodgeb) MCFG_GFXDECODE(spdodgeb) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(spdodgeb) MCFG_VIDEO_START(spdodgeb) - MCFG_VIDEO_UPDATE(spdodgeb) MCFG_MACHINE_RESET( spdodgeb ) diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c index 92ac079c97e..22d9a96b9a4 100644 --- a/src/mame/drivers/speedatk.c +++ b/src/mame/drivers/speedatk.c @@ -341,6 +341,7 @@ static MACHINE_CONFIG_START( speedatk, speedatk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(speedatk) MCFG_MC6845_ADD("crtc", H46505, MASTER_CLOCK/16, mc6845_intf) /* hand tuned to get ~60 fps */ @@ -349,7 +350,6 @@ static MACHINE_CONFIG_START( speedatk, speedatk_state ) MCFG_PALETTE_INIT(speedatk) MCFG_VIDEO_START(speedatk) - MCFG_VIDEO_UPDATE(speedatk) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c index 167c81ab6b4..f3db81c32a1 100644 --- a/src/mame/drivers/speedbal.c +++ b/src/mame/drivers/speedbal.c @@ -240,12 +240,12 @@ static MACHINE_CONFIG_START( speedbal, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(speedbal) MCFG_GFXDECODE(speedbal) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(speedbal) - MCFG_VIDEO_UPDATE(speedbal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c index 36281b3bbd6..bc65f5ffdcd 100644 --- a/src/mame/drivers/speedspn.c +++ b/src/mame/drivers/speedspn.c @@ -285,12 +285,12 @@ static MACHINE_CONFIG_START( speedspn, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(speedspn) MCFG_GFXDECODE(speedspn) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(speedspn) - MCFG_VIDEO_UPDATE(speedspn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index f0ed2c8bf61..5ab67977332 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -341,12 +341,12 @@ static MACHINE_CONFIG_START( speglsht, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 319, 8, 239-8) + MCFG_SCREEN_UPDATE(st0016) MCFG_GFXDECODE(speglsht) MCFG_PALETTE_LENGTH(16*16*4+1) MCFG_VIDEO_START(st0016) - MCFG_VIDEO_UPDATE(st0016) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c index d16cc46d954..9b28637d445 100644 --- a/src/mame/drivers/spiders.c +++ b/src/mame/drivers/spiders.c @@ -529,7 +529,7 @@ static const mc6845_interface mc6845_intf = }; -static VIDEO_UPDATE( spiders ) +static SCREEN_UPDATE( spiders ) { device_t *mc6845 = screen->machine->device("crtc"); mc6845_update(mc6845, bitmap, cliprect); @@ -720,11 +720,10 @@ static MACHINE_CONFIG_START( spiders, driver_device ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_VIDEO_UPDATE(spiders) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */ + MCFG_SCREEN_UPDATE(spiders) MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index 13cad981348..90f3f939e4d 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -400,12 +400,12 @@ static MACHINE_CONFIG_START( splash, splash_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 48*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(splash) MCFG_GFXDECODE(splash) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(splash) - MCFG_VIDEO_UPDATE(splash) MCFG_MACHINE_RESET( splash ) @@ -455,12 +455,12 @@ static MACHINE_CONFIG_START( roldfrog, splash_state ) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 48*8-1, 2*8, 32*8-1) // MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 64*8-1) + MCFG_SCREEN_UPDATE(splash) MCFG_GFXDECODE(splash) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(splash) - MCFG_VIDEO_UPDATE(splash) MCFG_MACHINE_RESET( splash ) @@ -493,12 +493,12 @@ static MACHINE_CONFIG_START( funystrp, splash_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(funystrp) MCFG_GFXDECODE(splash) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(splash) - MCFG_VIDEO_UPDATE(funystrp) MCFG_MACHINE_RESET( splash ) diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index 81d78733a7c..b8d81918d95 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -85,7 +85,7 @@ static VIDEO_START(spoker) tilemap_set_transparent_pen(state->fg_tilemap, 0); } -static VIDEO_UPDATE(spoker) +static SCREEN_UPDATE(spoker) { spoker_state *state = screen->machine->driver_data<spoker_state>(); @@ -404,12 +404,12 @@ static MACHINE_CONFIG_START( spoker, spoker_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1) + MCFG_SCREEN_UPDATE(spoker) MCFG_GFXDECODE(spoker) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(spoker) - MCFG_VIDEO_UPDATE(spoker) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index 4944db0beca..a871b132e3b 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -126,7 +126,7 @@ static VIDEO_START(spool99) state->sc0_tilemap = tilemap_create(machine, get_spool99_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } -static VIDEO_UPDATE(spool99) +static SCREEN_UPDATE(spool99) { spool99_state *state = screen->machine->driver_data<spool99_state>(); @@ -347,13 +347,13 @@ static MACHINE_CONFIG_START( spool99, spool99_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(7*8, 55*8-1, 1*8, 31*8-1) //384x240,raw guess + MCFG_SCREEN_UPDATE(spool99) MCFG_PALETTE_LENGTH(0x200) MCFG_EEPROM_93C46_ADD("eeprom") MCFG_VIDEO_START(spool99) - MCFG_VIDEO_UPDATE(spool99) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index c0041c244bf..e6c99e4cc63 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -285,13 +285,13 @@ static MACHINE_CONFIG_START( sprcros2, sprcros2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(sprcros2) MCFG_GFXDECODE(sprcros2) MCFG_PALETTE_LENGTH(768) MCFG_PALETTE_INIT(sprcros2) MCFG_VIDEO_START(sprcros2) - MCFG_VIDEO_UPDATE(sprcros2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index 13e9de755ee..f08ecf103a0 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -516,14 +516,14 @@ static MACHINE_CONFIG_START( sprint2, sprint2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 262) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 223) + MCFG_SCREEN_UPDATE(sprint2) + MCFG_SCREEN_EOF(sprint2) MCFG_GFXDECODE(sprint2) MCFG_PALETTE_LENGTH(12) MCFG_PALETTE_INIT(sprint2) MCFG_VIDEO_START(sprint2) - MCFG_VIDEO_UPDATE(sprint2) - MCFG_VIDEO_EOF(sprint2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c index 1edf8ef6b61..373a86135da 100644 --- a/src/mame/drivers/sprint4.c +++ b/src/mame/drivers/sprint4.c @@ -408,13 +408,14 @@ static MACHINE_CONFIG_START( sprint4, sprint4_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, 256, VTOTAL, 0, 224) + MCFG_SCREEN_UPDATE(sprint4) + MCFG_SCREEN_EOF(sprint4) + MCFG_GFXDECODE(sprint4) MCFG_PALETTE_LENGTH(10) MCFG_PALETTE_INIT(sprint4) MCFG_VIDEO_START(sprint4) - MCFG_VIDEO_UPDATE(sprint4) - MCFG_VIDEO_EOF(sprint4) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c index 38d1d16a04d..592ecde9277 100644 --- a/src/mame/drivers/sprint8.c +++ b/src/mame/drivers/sprint8.c @@ -469,14 +469,14 @@ static MACHINE_CONFIG_START( sprint8, sprint8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 261) MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 231) + MCFG_SCREEN_UPDATE(sprint8) + MCFG_SCREEN_EOF(sprint8) MCFG_GFXDECODE(sprint8) MCFG_PALETTE_LENGTH(36) MCFG_PALETTE_INIT(sprint8) MCFG_VIDEO_START(sprint8) - MCFG_VIDEO_UPDATE(sprint8) - MCFG_VIDEO_EOF(sprint8) /* sound hardware */ diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 0a528e65236..3c2aabbbdc2 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -564,11 +564,11 @@ static MACHINE_CONFIG_START( spy, spy_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(spy) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(spy) - MCFG_VIDEO_UPDATE(spy) MCFG_K052109_ADD("k052109", spy_k052109_intf) MCFG_K051960_ADD("k051960", spy_k051960_intf) diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index b87cd60f147..f8235a37be1 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -1161,12 +1161,12 @@ static MACHINE_CONFIG_START( srmp2, srmp2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(464, 256-16) MCFG_SCREEN_VISIBLE_AREA(16, 464-1, 8, 256-1-24) + MCFG_SCREEN_UPDATE(srmp2) /* just draw the sprites */ MCFG_GFXDECODE(srmp2) MCFG_PALETTE_LENGTH(1024) /* sprites only */ MCFG_PALETTE_INIT(srmp2) - MCFG_VIDEO_UPDATE(srmp2) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1201,12 +1201,12 @@ static MACHINE_CONFIG_START( srmp3, srmp2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(400, 256-16) MCFG_SCREEN_VISIBLE_AREA(16, 400-1, 8, 256-1-24) + MCFG_SCREEN_UPDATE(srmp3) /* just draw the sprites */ MCFG_GFXDECODE(srmp3) MCFG_PALETTE_LENGTH(512) /* sprites only */ MCFG_PALETTE_INIT(srmp3) - MCFG_VIDEO_UPDATE(srmp3) /* just draw the sprites */ /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1249,12 +1249,11 @@ static MACHINE_CONFIG_START( mjyuugi, srmp2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(400, 256-16) MCFG_SCREEN_VISIBLE_AREA(16, 400-1, 0, 256-1-16) + MCFG_SCREEN_UPDATE(mjyuugi) /* just draw the sprites */ MCFG_GFXDECODE(srmp3) MCFG_PALETTE_LENGTH(512) /* sprites only */ - MCFG_VIDEO_UPDATE(mjyuugi) /* just draw the sprites */ - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 4082f6bdcf4..51e115d5760 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -85,7 +85,7 @@ public: }; -static VIDEO_UPDATE( srmp5 ) +static SCREEN_UPDATE( srmp5 ) { srmp5_state *state = screen->machine->driver_data<srmp5_state>(); int x,y,address,xs,xs2,ys,ys2,height,width,xw,yw,xb,yb,sizex,sizey; @@ -573,13 +573,13 @@ static MACHINE_CONFIG_START( srmp5, srmp5_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(96*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(srmp5) MCFG_PALETTE_LENGTH(0x1800) #ifdef DEBUG_CHAR MCFG_GFXDECODE( srmp5 ) #endif MCFG_VIDEO_START(st0016) - MCFG_VIDEO_UPDATE(srmp5) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 1b714b8285d..33eb10205f1 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -158,7 +158,7 @@ static VIDEO_START(srmp6) static int xixi=0; #endif -static VIDEO_UPDATE(srmp6) +static SCREEN_UPDATE(srmp6) { srmp6_state *state = screen->machine->driver_data<srmp6_state>(); int alpha; @@ -676,11 +676,11 @@ static MACHINE_CONFIG_START( srmp6, srmp6_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(srmp6) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(srmp6) - MCFG_VIDEO_UPDATE(srmp6) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c index 38a29d55b83..7f750f0fec2 100644 --- a/src/mame/drivers/srumbler.c +++ b/src/mame/drivers/srumbler.c @@ -253,13 +253,13 @@ static MACHINE_CONFIG_START( srumbler, srumbler_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(10*8, (64-10)*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE(srumbler) + MCFG_SCREEN_EOF(srumbler) MCFG_GFXDECODE(srumbler) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(srumbler) - MCFG_VIDEO_EOF(srumbler) - MCFG_VIDEO_UPDATE(srumbler) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c index 20711875820..7f47849453b 100644 --- a/src/mame/drivers/ssfindo.c +++ b/src/mame/drivers/ssfindo.c @@ -219,7 +219,7 @@ static emu_timer *PS7500timer0; static emu_timer *PS7500timer1; -static VIDEO_UPDATE(ssfindo) +static SCREEN_UPDATE(ssfindo) { int s,x,y; @@ -609,11 +609,9 @@ static MACHINE_CONFIG_START( ssfindo, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(ssfindo) MCFG_PALETTE_LENGTH(256) - - MCFG_VIDEO_UPDATE(ssfindo) - MACHINE_CONFIG_END static MACHINE_CONFIG_START( ppcar, driver_device ) @@ -632,10 +630,9 @@ static MACHINE_CONFIG_START( ppcar, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(ssfindo) MCFG_PALETTE_LENGTH(256) - - MCFG_VIDEO_UPDATE(ssfindo) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index 4df9bfde180..256590c96ae 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -368,12 +368,12 @@ static MACHINE_CONFIG_START( sshangha, sshangha_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(sshangha) MCFG_GFXDECODE(sshangha) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(sshangha) - MCFG_VIDEO_UPDATE(sshangha) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* sure it's stereo? */ diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index f4ff89d0a45..1b33e4173ad 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -254,7 +254,7 @@ static VIDEO_START(ssingles) } -static VIDEO_UPDATE( ssingles ) +static SCREEN_UPDATE( ssingles ) { device_t *mc6845 = screen->machine->device("crtc"); mc6845_update(mc6845, bitmap, cliprect); @@ -419,11 +419,11 @@ static MACHINE_CONFIG_START( ssingles, ssingles_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(4000000, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */ + MCFG_SCREEN_UPDATE(ssingles) MCFG_PALETTE_LENGTH(4) //guess MCFG_VIDEO_START(ssingles) - MCFG_VIDEO_UPDATE(ssingles) MCFG_MC6845_ADD("crtc", MC6845, 1000000 /* ? MHz */, mc6845_intf) diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c index 29340034f07..22a70adf803 100644 --- a/src/mame/drivers/sslam.c +++ b/src/mame/drivers/sslam.c @@ -727,12 +727,12 @@ static MACHINE_CONFIG_START( sslam, sslam_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(sslam) MCFG_GFXDECODE(sslam) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(sslam) - MCFG_VIDEO_UPDATE(sslam) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -758,12 +758,12 @@ static MACHINE_CONFIG_START( powerbls, sslam_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(powerbls) MCFG_GFXDECODE(powerbls) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(powerbls) - MCFG_VIDEO_UPDATE(powerbls) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c index ec3dc579caf..69c0a435ef9 100644 --- a/src/mame/drivers/ssozumo.c +++ b/src/mame/drivers/ssozumo.c @@ -191,13 +191,13 @@ static MACHINE_CONFIG_START( ssozumo, ssozumo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8 - 1, 1*8, 31*8 - 1) + MCFG_SCREEN_UPDATE(ssozumo) MCFG_GFXDECODE(ssozumo) MCFG_PALETTE_LENGTH(64 + 16) MCFG_PALETTE_INIT(ssozumo) MCFG_VIDEO_START(ssozumo) - MCFG_VIDEO_UPDATE(ssozumo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c index 3f5650f5521..3fd59409b6a 100644 --- a/src/mame/drivers/sspeedr.c +++ b/src/mame/drivers/sspeedr.c @@ -201,14 +201,14 @@ static MACHINE_CONFIG_START( sspeedr, sspeedr_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(376, 256) MCFG_SCREEN_VISIBLE_AREA(0, 375, 0, 247) + MCFG_SCREEN_UPDATE(sspeedr) + MCFG_SCREEN_EOF(sspeedr) MCFG_GFXDECODE(sspeedr) MCFG_PALETTE_LENGTH(16) MCFG_PALETTE_INIT(sspeedr) MCFG_VIDEO_START(sspeedr) - MCFG_VIDEO_UPDATE(sspeedr) - MCFG_VIDEO_EOF(sspeedr) /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c index 4831c9ebd9f..59e8a51769d 100644 --- a/src/mame/drivers/ssrj.c +++ b/src/mame/drivers/ssrj.c @@ -155,13 +155,13 @@ static MACHINE_CONFIG_START( ssrj, ssrj_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 30*8-1, 3*8, 32*8-1) + MCFG_SCREEN_UPDATE(ssrj) MCFG_GFXDECODE(ssrj) MCFG_PALETTE_LENGTH(128) MCFG_PALETTE_INIT(ssrj) MCFG_VIDEO_START(ssrj) - MCFG_VIDEO_UPDATE(ssrj) // MCFG_ASPECT_RATIO(3,4) MCFG_MACHINE_RESET(ssrj) diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index 69804fd7095..a5e7acad71c 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -33,7 +33,7 @@ public: * *************************************/ -static VIDEO_UPDATE( sstrangr ) +static SCREEN_UPDATE( sstrangr ) { sstrangr_state *state = screen->machine->driver_data<sstrangr_state>(); offs_t offs; @@ -82,7 +82,7 @@ static void get_pens(pen_t *pens) } -static VIDEO_UPDATE( sstrngr2 ) +static SCREEN_UPDATE( sstrngr2 ) { sstrangr_state *state = screen->machine->driver_data<sstrangr_state>(); pen_t pens[NUM_PENS]; @@ -200,13 +200,12 @@ static MACHINE_CONFIG_START( sstrangr, sstrangr_state ) MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* video hardware */ - MCFG_VIDEO_UPDATE(sstrangr) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 262) /* vert size is a guess, taken from mw8080bw */ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(sstrangr) /* sound hardware */ @@ -268,7 +267,8 @@ static MACHINE_CONFIG_DERIVED( sstrngr2, sstrangr ) /* basic machine hardware */ /* video hardware */ - MCFG_VIDEO_UPDATE(sstrngr2) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(sstrngr2) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 76f0db07bcd..ff522806660 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -2729,11 +2729,11 @@ static MACHINE_CONFIG_START( ssv, ssv_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x1c6, 0x106) MCFG_SCREEN_VISIBLE_AREA(0, 0x150-1, 0, 0xf0-1) + MCFG_SCREEN_UPDATE(ssv) MCFG_GFXDECODE(ssv) MCFG_PALETTE_LENGTH(0x8000) MCFG_VIDEO_START(ssv) - MCFG_VIDEO_UPDATE(ssv) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2777,10 +2777,10 @@ static MACHINE_CONFIG_DERIVED( gdfs, ssv ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, (0xd5-0x2c)*2-1, 0, (0x102-0x12)-1) + MCFG_SCREEN_UPDATE(gdfs) MCFG_GFXDECODE(gdfs) MCFG_VIDEO_START(gdfs) - MCFG_VIDEO_UPDATE(gdfs) MACHINE_CONFIG_END @@ -2955,10 +2955,10 @@ static MACHINE_CONFIG_DERIVED( eaglshot, ssv ) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, (0xca - 0x2a)*2-1, 0, (0xf6 - 0x16)-1) + MCFG_SCREEN_UPDATE(eaglshot) MCFG_GFXDECODE(eaglshot) MCFG_VIDEO_START(eaglshot) - MCFG_VIDEO_UPDATE(eaglshot) MACHINE_CONFIG_END diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index fe11782b9f3..394d1d2f1d3 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -445,12 +445,12 @@ static MACHINE_CONFIG_START( st0016, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(48*8, 48*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 48*8-1) + MCFG_SCREEN_UPDATE(st0016) MCFG_GFXDECODE(st0016) MCFG_PALETTE_LENGTH(16*16*4+1) MCFG_VIDEO_START(st0016) - MCFG_VIDEO_UPDATE(st0016) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c index 5b2e058887e..4e7940912e2 100644 --- a/src/mame/drivers/stadhero.c +++ b/src/mame/drivers/stadhero.c @@ -225,12 +225,12 @@ static MACHINE_CONFIG_START( stadhero, stadhero_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(stadhero) MCFG_GFXDECODE(stadhero) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(stadhero) - MCFG_VIDEO_UPDATE(stadhero) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c index 719da81069b..b44c8ef6e5d 100644 --- a/src/mame/drivers/starcrus.c +++ b/src/mame/drivers/starcrus.c @@ -149,13 +149,13 @@ static MACHINE_CONFIG_START( starcrus, starcrus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(starcrus) MCFG_GFXDECODE(starcrus) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(starcrus) - MCFG_VIDEO_UPDATE(starcrus) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c index 751fc80daeb..be4bc1ea8ad 100644 --- a/src/mame/drivers/starfire.c +++ b/src/mame/drivers/starfire.c @@ -272,9 +272,9 @@ static MACHINE_CONFIG_START( starfire, starfire_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(STARFIRE_PIXEL_CLOCK, STARFIRE_HTOTAL, STARFIRE_HBEND, STARFIRE_HBSTART, STARFIRE_VTOTAL, STARFIRE_VBEND, STARFIRE_VBSTART) + MCFG_SCREEN_UPDATE(starfire) MCFG_VIDEO_START(starfire) - MCFG_VIDEO_UPDATE(starfire) /* audio hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c index 0ddd16c5096..56a22965b08 100644 --- a/src/mame/drivers/starshp1.c +++ b/src/mame/drivers/starshp1.c @@ -312,14 +312,14 @@ static MACHINE_CONFIG_START( starshp1, starshp1_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(STARSHP1_PIXEL_CLOCK, STARSHP1_HTOTAL, STARSHP1_HBEND, STARSHP1_HBSTART, STARSHP1_VTOTAL, STARSHP1_VBEND, STARSHP1_VBSTART) + MCFG_SCREEN_UPDATE(starshp1) + MCFG_SCREEN_EOF(starshp1) MCFG_GFXDECODE(starshp1) MCFG_PALETTE_LENGTH(19) MCFG_PALETTE_INIT(starshp1) MCFG_VIDEO_START(starshp1) - MCFG_VIDEO_UPDATE(starshp1) - MCFG_VIDEO_EOF(starshp1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c index 8391347d373..db415a4330f 100644 --- a/src/mame/drivers/starwars.c +++ b/src/mame/drivers/starwars.c @@ -338,9 +338,9 @@ static MACHINE_CONFIG_START( starwars, starwars_state ) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 250, 0, 280) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(avg_starwars) - MCFG_VIDEO_UPDATE(vector) /* sound hardware */ MCFG_SOUND_START(starwars) diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index be4ef97124b..de4bd0931e7 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -180,7 +180,7 @@ static WRITE8_HANDLER( statriv2_videoram_w ) * *************************************/ -static VIDEO_UPDATE( statriv2 ) +static SCREEN_UPDATE( statriv2 ) { if (tms9927_screen_reset(screen->machine->device("tms"))) bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -602,6 +602,7 @@ static MACHINE_CONFIG_START( statriv2, statriv2_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 320, 270, 0, 240) + MCFG_SCREEN_UPDATE(statriv2) MCFG_TMS9927_ADD("tms", MASTER_CLOCK/2, tms9927_intf) @@ -610,7 +611,6 @@ static MACHINE_CONFIG_START( statriv2, statriv2_state ) MCFG_PALETTE_INIT(statriv2) MCFG_VIDEO_START(horizontal) - MCFG_VIDEO_UPDATE(statriv2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c index 5a0fb01643b..826cc14f037 100644 --- a/src/mame/drivers/stepstag.c +++ b/src/mame/drivers/stepstag.c @@ -102,7 +102,7 @@ GFXDECODE_END static VIDEO_START(stepstag) { } -static VIDEO_UPDATE(stepstag) +static SCREEN_UPDATE(stepstag) { return 0; @@ -124,6 +124,7 @@ static MACHINE_CONFIG_START( stepstag, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(stepstag) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -131,6 +132,7 @@ static MACHINE_CONFIG_START( stepstag, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(stepstag) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -138,13 +140,13 @@ static MACHINE_CONFIG_START( stepstag, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(stepstag) MCFG_PALETTE_LENGTH(0x200) MCFG_GFXDECODE(stepstag) MCFG_DEFAULT_LAYOUT(layout_stepstag) MCFG_VIDEO_START(stepstag) - MCFG_VIDEO_UPDATE(stepstag) MACHINE_CONFIG_END diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c index 0167d062d27..1bb5e38569c 100644 --- a/src/mame/drivers/stfight.c +++ b/src/mame/drivers/stfight.c @@ -453,13 +453,13 @@ static MACHINE_CONFIG_START( stfight, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(stfight) MCFG_GFXDECODE(stfight) MCFG_PALETTE_LENGTH(16*4+16*16+16*16+16*16) MCFG_PALETTE_INIT(stfight) MCFG_VIDEO_START(stfight) - MCFG_VIDEO_UPDATE(stfight) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index c7b72bf62f9..3a57509b026 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -199,12 +199,12 @@ static MACHINE_CONFIG_START( stlforce, stlforce_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 47*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(stlforce) MCFG_GFXDECODE(stlforce) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(stlforce) - MCFG_VIDEO_UPDATE(stlforce) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c index 0d25cf4ffca..8ebfa546e1f 100644 --- a/src/mame/drivers/strnskil.c +++ b/src/mame/drivers/strnskil.c @@ -335,13 +335,13 @@ static MACHINE_CONFIG_START( strnskil, strnskil_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(strnskil) MCFG_GFXDECODE(strnskil) MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT(strnskil) MCFG_VIDEO_START(strnskil) - MCFG_VIDEO_UPDATE(strnskil) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index d42b24d3e80..46edd00548a 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -2883,12 +2883,12 @@ static MACHINE_CONFIG_START( stv, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 400, 0, 320, 262, 0, 224) + MCFG_SCREEN_UPDATE(stv_vdp2) MCFG_PALETTE_LENGTH(2048+(2048*2))//standard palette + extra memory for rgb brightness. MCFG_GFXDECODE(stv) MCFG_VIDEO_START(stv_vdp2) - MCFG_VIDEO_UPDATE(stv_vdp2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c index dad029af26c..2bf926fb64d 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -130,7 +130,7 @@ static VIDEO_START(sub) { } -static VIDEO_UPDATE(sub) +static SCREEN_UPDATE(sub) { sub_state *state = screen->machine->driver_data<sub_state>(); const gfx_element *gfx = screen->machine->gfx[0]; @@ -438,13 +438,13 @@ static MACHINE_CONFIG_START( sub, sub_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) + MCFG_SCREEN_UPDATE(sub) MCFG_GFXDECODE(sub) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(sub) MCFG_VIDEO_START(sub) - MCFG_VIDEO_UPDATE(sub) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index 502733e5e2e..9ac40cf0773 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -195,6 +195,7 @@ static MACHINE_CONFIG_START( subs, subs_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(subs) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -202,9 +203,9 @@ static MACHINE_CONFIG_START( subs, subs_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(subs) MCFG_PALETTE_INIT(subs) - MCFG_VIDEO_UPDATE(subs) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 870af49cbf7..7b1e9afa0fa 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -414,7 +414,7 @@ static VIDEO_START( stisub ) } -static VIDEO_UPDATE( subsino ) +static SCREEN_UPDATE( subsino ) { bitmap_fill(bitmap,cliprect,0); tilemap_draw(bitmap,cliprect, tmap, 0, 0); @@ -426,7 +426,7 @@ static const rectangle visible1 = { 0*8, (14+48)*8-1, 4*8, (4+7)*8-1 }; static const rectangle visible2 = { 0*8, (14+48)*8-1, 10*8, (10+7)*8-1 }; static const rectangle visible3 = { 0*8, (14+48)*8-1, 18*8, (18+7)*8-1 }; -static VIDEO_UPDATE( subsino_reels ) +static SCREEN_UPDATE( subsino_reels ) { int i; bitmap_fill(bitmap,cliprect,0); @@ -455,7 +455,7 @@ static const rectangle stisub_visible2 = { 0, 511, 88, 143 }; static const rectangle stisub_visible3 = { 0, 511, 144, 223 }; -static VIDEO_UPDATE( stisub_reels ) +static SCREEN_UPDATE( stisub_reels ) { int i; bitmap_fill(bitmap,cliprect,0); @@ -2547,6 +2547,7 @@ static MACHINE_CONFIG_START( victor21, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(subsino) MCFG_GFXDECODE(subsino_depth3) @@ -2554,7 +2555,6 @@ static MACHINE_CONFIG_START( victor21, driver_device ) MCFG_PALETTE_INIT(subsino_2proms) MCFG_VIDEO_START(subsino) - MCFG_VIDEO_UPDATE(subsino) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2588,6 +2588,7 @@ static MACHINE_CONFIG_START( crsbingo, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(subsino) MCFG_GFXDECODE(subsino_depth4) @@ -2595,7 +2596,6 @@ static MACHINE_CONFIG_START( crsbingo, driver_device ) MCFG_PALETTE_INIT(subsino_2proms) MCFG_VIDEO_START(subsino) - MCFG_VIDEO_UPDATE(subsino) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2618,6 +2618,7 @@ static MACHINE_CONFIG_START( srider, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(subsino) MCFG_GFXDECODE(subsino_depth4) @@ -2625,8 +2626,7 @@ static MACHINE_CONFIG_START( srider, driver_device ) MCFG_PALETTE_INIT(subsino_3proms) MCFG_VIDEO_START(subsino) - MCFG_VIDEO_UPDATE(subsino) - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2658,6 +2658,7 @@ static MACHINE_CONFIG_START( tisub, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(subsino_reels) MCFG_GFXDECODE(subsino_depth4_reels) @@ -2665,7 +2666,6 @@ static MACHINE_CONFIG_START( tisub, driver_device ) MCFG_PALETTE_INIT(subsino_3proms) MCFG_VIDEO_START(subsino_reels) - MCFG_VIDEO_UPDATE(subsino_reels) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2687,6 +2687,7 @@ static MACHINE_CONFIG_START( stisub, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(stisub_reels) MCFG_GFXDECODE(subsino_stisub) @@ -2694,7 +2695,6 @@ static MACHINE_CONFIG_START( stisub, driver_device ) //MCFG_PALETTE_INIT(subsino_3proms) MCFG_VIDEO_START(stisub) - MCFG_VIDEO_UPDATE(stisub_reels) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c index f8346f4faee..595c37bd8f4 100644 --- a/src/mame/drivers/subsino2.c +++ b/src/mame/drivers/subsino2.c @@ -455,7 +455,7 @@ static VIDEO_START( xtrain ) ss9601_reelrects = xtrain_reelrects; } -static VIDEO_UPDATE( subsino2 ) +static SCREEN_UPDATE( subsino2 ) { int layers_ctrl = ~ss9601_disable; int y; @@ -1862,12 +1862,12 @@ static MACHINE_CONFIG_START( bishjan, driver_device ) MCFG_SCREEN_SIZE( 512, 256 ) MCFG_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 ) MCFG_SCREEN_REFRESH_RATE( 60 ) + MCFG_SCREEN_UPDATE( subsino2 ) MCFG_GFXDECODE( ss9601 ) MCFG_PALETTE_LENGTH( 256 ) MCFG_VIDEO_START( subsino2 ) - MCFG_VIDEO_UPDATE( subsino2 ) // sound hardware // SS9904? @@ -1891,12 +1891,12 @@ static MACHINE_CONFIG_START( mtrain, driver_device ) MCFG_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-32-1 ) MCFG_SCREEN_REFRESH_RATE( 58.7270 ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // game reads vblank state + MCFG_SCREEN_UPDATE( subsino2 ) MCFG_GFXDECODE( ss9601 ) MCFG_PALETTE_LENGTH( 256 ) MCFG_VIDEO_START( mtrain ) - MCFG_VIDEO_UPDATE( subsino2 ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1925,12 +1925,12 @@ static MACHINE_CONFIG_START( saklove, driver_device ) MCFG_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 ) MCFG_SCREEN_REFRESH_RATE( 58.7270 ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // game reads vblank state + MCFG_SCREEN_UPDATE( subsino2 ) MCFG_GFXDECODE( ss9601 ) MCFG_PALETTE_LENGTH( 256 ) MCFG_VIDEO_START( subsino2 ) - MCFG_VIDEO_UPDATE( subsino2 ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1963,12 +1963,12 @@ static MACHINE_CONFIG_START( xplan, driver_device ) MCFG_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 ) MCFG_SCREEN_REFRESH_RATE( 58.7270 ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // game reads vblank state + MCFG_SCREEN_UPDATE( subsino2 ) MCFG_GFXDECODE( ss9601 ) MCFG_PALETTE_LENGTH( 256 ) MCFG_VIDEO_START( subsino2 ) - MCFG_VIDEO_UPDATE( subsino2 ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 915f3e7e279..ed8d01337ed 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -776,12 +776,12 @@ static MACHINE_CONFIG_START( bssoccer, suna16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(suna16) MCFG_GFXDECODE(suna16) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(suna16) - MCFG_VIDEO_UPDATE(suna16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -836,12 +836,12 @@ static MACHINE_CONFIG_START( uballoon, suna16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(suna16) MCFG_GFXDECODE(suna16) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(suna16) - MCFG_VIDEO_UPDATE(suna16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -886,12 +886,12 @@ static MACHINE_CONFIG_START( sunaq, suna16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(suna16) MCFG_GFXDECODE(suna16) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(suna16) - MCFG_VIDEO_UPDATE(suna16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -959,12 +959,12 @@ static MACHINE_CONFIG_START( bestbest, suna16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(bestbest) MCFG_GFXDECODE(bestbest) MCFG_PALETTE_LENGTH(256*8) MCFG_VIDEO_START(suna16) - MCFG_VIDEO_UPDATE(bestbest) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index e49c053ab02..1de253e7c68 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -1514,12 +1514,12 @@ static MACHINE_CONFIG_START( hardhead, suna8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(suna8) MCFG_GFXDECODE(suna8) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(suna8_textdim12) - MCFG_VIDEO_UPDATE(suna8) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1579,12 +1579,12 @@ static MACHINE_CONFIG_START( rranger, suna8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(suna8) MCFG_GFXDECODE(suna8) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(suna8_textdim8) - MCFG_VIDEO_UPDATE(suna8) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1644,12 +1644,12 @@ static MACHINE_CONFIG_START( brickzn, suna8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(suna8) MCFG_GFXDECODE(suna8) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(suna8_textdim0) - MCFG_VIDEO_UPDATE(suna8) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1743,12 +1743,12 @@ static MACHINE_CONFIG_START( starfigh, suna8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(suna8) MCFG_GFXDECODE(suna8) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(suna8_textdim0) - MCFG_VIDEO_UPDATE(suna8) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1802,12 +1802,12 @@ static MACHINE_CONFIG_START( sparkman, suna8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE(suna8) MCFG_GFXDECODE(suna8) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(suna8_textdim0) - MCFG_VIDEO_UPDATE(suna8) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index e6407c72a30..cfb1fe6be6c 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -360,12 +360,11 @@ static MACHINE_CONFIG_START( supbtime, supbtime_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(supbtime) MCFG_GFXDECODE(supbtime) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_UPDATE(supbtime) - MCFG_DECO16IC_ADD("deco_custom", supbtime_deco16ic_intf) /* sound hardware */ @@ -402,12 +401,11 @@ static MACHINE_CONFIG_START( chinatwn, supbtime_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(supbtime) MCFG_GFXDECODE(supbtime) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_UPDATE(supbtime) - MCFG_DECO16IC_ADD("deco_custom", supbtime_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 5aafbb62a29..158492fb384 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -87,7 +87,7 @@ static VIDEO_START( supdrapo ) } -static VIDEO_UPDATE( supdrapo ) +static SCREEN_UPDATE( supdrapo ) { supdrapo_state *state = screen->machine->driver_data<supdrapo_state>(); int x, y; @@ -448,13 +448,13 @@ static MACHINE_CONFIG_START( supdrapo, supdrapo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(supdrapo) MCFG_GFXDECODE(supdrapo) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(sdpoker) MCFG_VIDEO_START(supdrapo) - MCFG_VIDEO_UPDATE(supdrapo) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index 3c4be41f5e8..7a7d9f2f2f7 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -390,12 +390,12 @@ static MACHINE_CONFIG_START( superchs, superchs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(superchs) MCFG_GFXDECODE(superchs) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(superchs) - MCFG_VIDEO_UPDATE(superchs) MCFG_TC0480SCP_ADD("tc0480scp", superchs_tc0480scp_intf) diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 595f6227917..2d4eaaef28f 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -57,7 +57,7 @@ static VIDEO_START( superdq ) state->tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -static VIDEO_UPDATE( superdq ) +static SCREEN_UPDATE( superdq ) { superdq_state *state = screen->machine->driver_data<superdq_state>(); diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index 8e9db83b9d0..e69a1d17f08 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -1044,12 +1044,12 @@ static MACHINE_CONFIG_START( pbillian, superqix_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pbillian) MCFG_GFXDECODE(pbillian) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(pbillian) - MCFG_VIDEO_UPDATE(pbillian) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1080,12 +1080,12 @@ static MACHINE_CONFIG_START( hotsmash, superqix_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(pbillian) MCFG_GFXDECODE(pbillian) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(pbillian) - MCFG_VIDEO_UPDATE(pbillian) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1120,12 +1120,12 @@ static MACHINE_CONFIG_START( sqix, superqix_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(superqix) MCFG_GFXDECODE(sqix) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(superqix) - MCFG_VIDEO_UPDATE(superqix) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1164,12 +1164,12 @@ static MACHINE_CONFIG_START( sqixbl, superqix_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(superqix) MCFG_GFXDECODE(sqix) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(superqix) - MCFG_VIDEO_UPDATE(superqix) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index c3548e237d2..ffff97eb59f 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -242,7 +242,7 @@ static WRITE8_HANDLER( supertnk_bitplane_select_1_w ) } -static VIDEO_UPDATE( supertnk ) +static SCREEN_UPDATE( supertnk ) { supertnk_state *state = screen->machine->driver_data<supertnk_state>(); offs_t offs; @@ -432,7 +432,6 @@ static MACHINE_CONFIG_START( supertnk, supertnk_state ) /* video hardware */ MCFG_VIDEO_START(supertnk) - MCFG_VIDEO_UPDATE(supertnk) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) @@ -440,6 +439,7 @@ static MACHINE_CONFIG_START( supertnk, supertnk_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_UPDATE(supertnk) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index faec0c8ba3b..4afe1c6832f 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -73,7 +73,7 @@ static VIDEO_START( suprgolf ) tilemap_set_transparent_pen(state->tilemap,15); } -static VIDEO_UPDATE( suprgolf ) +static SCREEN_UPDATE( suprgolf ) { suprgolf_state *state = screen->machine->driver_data<suprgolf_state>(); int x,y,count,color; @@ -490,7 +490,6 @@ static MACHINE_CONFIG_START( suprgolf, suprgolf_state ) MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) MCFG_VIDEO_START(suprgolf) - MCFG_VIDEO_UPDATE(suprgolf) MCFG_MACHINE_RESET(suprgolf) @@ -501,6 +500,7 @@ static MACHINE_CONFIG_START( suprgolf, suprgolf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 191) + MCFG_SCREEN_UPDATE(suprgolf) MCFG_GFXDECODE(suprgolf) MCFG_PALETTE_LENGTH(0x800) diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c index 17996ec25b5..25f7baa4052 100644 --- a/src/mame/drivers/suprloco.c +++ b/src/mame/drivers/suprloco.c @@ -170,13 +170,13 @@ static MACHINE_CONFIG_START( suprloco, suprloco_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(suprloco) MCFG_GFXDECODE(suprloco) MCFG_PALETTE_LENGTH(512+256) MCFG_PALETTE_INIT(suprloco) MCFG_VIDEO_START(suprloco) - MCFG_VIDEO_UPDATE(suprloco) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index 8ad63eb8c2e..45d0f9d5152 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -814,14 +814,14 @@ static MACHINE_CONFIG_START( skns, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(320,240) MCFG_SCREEN_VISIBLE_AREA(0,319,0,239) + MCFG_SCREEN_UPDATE(skns) + MCFG_SCREEN_EOF(skns) MCFG_PALETTE_LENGTH(32768) MCFG_GFXDECODE(skns_bg) MCFG_VIDEO_START(skns) MCFG_VIDEO_RESET(skns) - MCFG_VIDEO_EOF(skns) - MCFG_VIDEO_UPDATE(skns) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c index 7f8c3c546cd..ad7ccf14cd9 100644 --- a/src/mame/drivers/suprridr.c +++ b/src/mame/drivers/suprridr.c @@ -373,13 +373,13 @@ static MACHINE_CONFIG_START( suprridr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(suprridr) MCFG_GFXDECODE(suprridr) MCFG_PALETTE_LENGTH(96) MCFG_PALETTE_INIT(suprridr) MCFG_VIDEO_START(suprridr) - MCFG_VIDEO_UPDATE(suprridr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index 14364114b1a..d4c0b3d8d27 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -340,11 +340,11 @@ static MACHINE_CONFIG_START( suprslam, suprslam_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(suprslam) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(suprslam) - MCFG_VIDEO_UPDATE(suprslam) MCFG_K053936_ADD("k053936", suprslam_k053936_intf) diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index 4d03f4ec758..43cc0a688cc 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -257,11 +257,10 @@ static MACHINE_CONFIG_START( surpratk, surpratk_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(surpratk) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(surpratk) - MCFG_K052109_ADD("k052109", surpratk_k052109_intf) MCFG_K053244_ADD("k053244", surpratk_k05324x_intf) MCFG_K053251_ADD("k053251") diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index f9cca4b52d2..823ded5d0c7 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -2124,12 +2124,12 @@ static MACHINE_CONFIG_START( sys1ppi, system1_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 320, 0, 256, 260, 0, 224) + MCFG_SCREEN_UPDATE(system1) MCFG_GFXDECODE(system1) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(system1) - MCFG_VIDEO_UPDATE(system1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2211,7 +2211,8 @@ static MACHINE_CONFIG_DERIVED( sys2, sys1ppi ) /* video hardware */ MCFG_VIDEO_START(system2) - MCFG_VIDEO_UPDATE(system2) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(system2) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( sys2m, sys2 ) @@ -2222,7 +2223,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( sys2row, sys2 ) /* video hardware */ - MCFG_VIDEO_UPDATE(system2_rowscroll) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(system2_rowscroll) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( sys2rowm, sys2row ) diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index c2edc4c761e..543eda8b02d 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -2063,12 +2063,12 @@ static MACHINE_CONFIG_START( system16, segas1x_bootleg_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(system16) MCFG_GFXDECODE(sys16) MCFG_PALETTE_LENGTH(2048*SHADOW_COLORS_MULTIPLIER) MCFG_VIDEO_START(system16) - MCFG_VIDEO_UPDATE(system16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2152,7 +2152,8 @@ static MACHINE_CONFIG_DERIVED( shinobib, system16 ) MCFG_SEGA16SP_ADD("segaspr1", shinobld_sega16sp_intf) MCFG_VIDEO_START( s16a_bootleg_shinobi ) - MCFG_VIDEO_UPDATE( s16a_bootleg ) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE( s16a_bootleg ) MACHINE_CONFIG_END static const sega16sp_interface passshtb_sega16sp_intf = @@ -2174,7 +2175,8 @@ static MACHINE_CONFIG_DERIVED( passshtb, system16_7759 ) MCFG_SEGA16SP_ADD("segaspr1", passshtb_sega16sp_intf) MCFG_VIDEO_START( s16a_bootleg_passsht ) - MCFG_VIDEO_UPDATE( s16a_bootleg ) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE( s16a_bootleg ) MACHINE_CONFIG_END @@ -2188,7 +2190,8 @@ static MACHINE_CONFIG_DERIVED( passsht4b, system16_7759 ) MCFG_SEGA16SP_ADD("segaspr1", passshtb_sega16sp_intf) MCFG_VIDEO_START( s16a_bootleg_passsht ) - MCFG_VIDEO_UPDATE( s16a_bootleg_passht4b ) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE( s16a_bootleg_passht4b ) MACHINE_CONFIG_END static const sega16sp_interface wb3bbl_sega16sp_intf = @@ -2210,7 +2213,8 @@ static MACHINE_CONFIG_DERIVED( wb3bb, system16 ) MCFG_SEGA16SP_ADD("segaspr1", wb3bbl_sega16sp_intf) MCFG_VIDEO_START( s16a_bootleg_wb3bl ) - MCFG_VIDEO_UPDATE( s16a_bootleg ) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE( s16a_bootleg ) MACHINE_CONFIG_END @@ -2239,6 +2243,7 @@ static MACHINE_CONFIG_START( goldnaxeb1, segas1x_bootleg_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(system16) MCFG_GFXDECODE(sys16) MCFG_PALETTE_LENGTH(2048*SHADOW_COLORS_MULTIPLIER) @@ -2247,7 +2252,6 @@ static MACHINE_CONFIG_START( goldnaxeb1, segas1x_bootleg_state ) MCFG_PALETTE_INIT( all_black ) MCFG_VIDEO_START(system16) - MCFG_VIDEO_UPDATE(system16) MACHINE_CONFIG_END @@ -2395,12 +2399,12 @@ static MACHINE_CONFIG_START( system18, segas1x_bootleg_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(system18old) MCFG_GFXDECODE(sys16) MCFG_PALETTE_LENGTH((2048+2048)*SHADOW_COLORS_MULTIPLIER) // 64 extra colours for vdp (but we use 2048 so shadow mask works) MCFG_VIDEO_START(system18old) - MCFG_VIDEO_UPDATE(system18old) MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf) diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c index 7b62d231385..6dec278d82c 100644 --- a/src/mame/drivers/tagteam.c +++ b/src/mame/drivers/tagteam.c @@ -229,13 +229,13 @@ static MACHINE_CONFIG_START( tagteam, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(tagteam) MCFG_GFXDECODE(tagteam) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(tagteam) MCFG_VIDEO_START(tagteam) - MCFG_VIDEO_UPDATE(tagteam) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index a890ea53258..ccb0a817a11 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -257,12 +257,12 @@ static MACHINE_CONFIG_START( tail2nos, tail2nos_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(tail2nos) MCFG_GFXDECODE(tail2nos) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(tail2nos) - MCFG_VIDEO_UPDATE(tail2nos) MCFG_K051316_ADD("k051316", tail2nos_k051316_intf) diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 814deca10e1..adb9e24697d 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -2240,13 +2240,13 @@ static MACHINE_CONFIG_START( rastsag2, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order0) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf) @@ -2287,13 +2287,13 @@ static MACHINE_CONFIG_START( ashura, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order0) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf) @@ -2334,13 +2334,13 @@ static MACHINE_CONFIG_START( crimec, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order1) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf) @@ -2381,13 +2381,13 @@ static MACHINE_CONFIG_START( tetrist, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order0) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf) @@ -2427,13 +2427,13 @@ static MACHINE_CONFIG_START( tetrista, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order2) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf) @@ -2474,14 +2474,14 @@ static MACHINE_CONFIG_START( hitice, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(hitice) MCFG_VIDEO_RESET(hitice) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf) @@ -2526,13 +2526,13 @@ static MACHINE_CONFIG_START( rambo3, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(rambo3) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order0) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf) @@ -2573,13 +2573,13 @@ static MACHINE_CONFIG_START( rambo3a, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order2) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf) @@ -2623,13 +2623,13 @@ static MACHINE_CONFIG_START( pbobble, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order1) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf) @@ -2674,13 +2674,13 @@ static MACHINE_CONFIG_START( spacedx, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order1) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf) @@ -2721,13 +2721,13 @@ static MACHINE_CONFIG_START( spacedxo, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order2) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf) @@ -2772,13 +2772,13 @@ static MACHINE_CONFIG_START( qzshowby, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order1) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf) @@ -2819,13 +2819,13 @@ static MACHINE_CONFIG_START( viofight, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order2) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf) @@ -2869,13 +2869,13 @@ static MACHINE_CONFIG_START( masterw, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order2) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf) @@ -2917,13 +2917,13 @@ static MACHINE_CONFIG_START( silentd, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order2) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf) @@ -2964,13 +2964,13 @@ static MACHINE_CONFIG_START( selfeena, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order2) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf) @@ -3020,13 +3020,13 @@ static MACHINE_CONFIG_START( ryujin, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order2) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf) @@ -3074,13 +3074,13 @@ static MACHINE_CONFIG_START( sbm, taitob_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitob) + MCFG_SCREEN_EOF(taitob) MCFG_GFXDECODE(taito_b) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitob_color_order0) - MCFG_VIDEO_EOF(taitob) - MCFG_VIDEO_UPDATE(taitob) MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf) diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index ef445f8fc6c..33dff39406c 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -3460,13 +3460,13 @@ static MACHINE_CONFIG_START( taito_f2, taitof2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitof2) + MCFG_SCREEN_EOF(taitof2_no_buffer) MCFG_GFXDECODE(taitof2) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitof2_default) - MCFG_VIDEO_EOF(taitof2_no_buffer) - MCFG_VIDEO_UPDATE(taitof2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3505,7 +3505,8 @@ static MACHINE_CONFIG_DERIVED( finalb, taito_f2_tc0220ioc ) /* video hardware */ MCFG_GFXDECODE(finalb) MCFG_VIDEO_START(taitof2_finalb) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed) MCFG_TC0100SCN_ADD("tc0100scn", finalb_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf) @@ -3521,8 +3522,9 @@ static MACHINE_CONFIG_DERIVED( dondokod, taito_f2_tc0220ioc ) /* video hardware */ MCFG_GFXDECODE(pivot) MCFG_VIDEO_START(taitof2_dondokod) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed) - MCFG_VIDEO_UPDATE(taitof2_pri_roz) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed) + MCFG_SCREEN_UPDATE(taitof2_pri_roz) MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf) MCFG_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf) @@ -3538,7 +3540,8 @@ static MACHINE_CONFIG_DERIVED( megab, taito_f2_tc0220ioc ) /* video hardware */ MCFG_VIDEO_START(taitof2_megab) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3554,8 +3557,9 @@ static MACHINE_CONFIG_DERIVED( thundfox, taito_f2_tc0220ioc ) /* video hardware */ MCFG_GFXDECODE(thundfox) MCFG_VIDEO_START(taitof2_thundfox) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed_thundfox) - MCFG_VIDEO_UPDATE(taitof2_thundfox) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_thundfox) + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed_thundfox) MCFG_TC0100SCN_ADD("tc0100scn_1", thundfox_tc0100scn_intf_1) MCFG_TC0100SCN_ADD("tc0100scn_2", thundfox_tc0100scn_intf_2) @@ -3572,7 +3576,8 @@ static MACHINE_CONFIG_DERIVED( cameltry, taito_f2_tc0220ioc ) /* video hardware */ MCFG_GFXDECODE(pivot) MCFG_VIDEO_START(taitof2_dondokod) - MCFG_VIDEO_UPDATE(taitof2_pri_roz) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri_roz) MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf) MCFG_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf) @@ -3588,7 +3593,8 @@ static MACHINE_CONFIG_DERIVED( qtorimon, taito_f2_tc0220ioc ) /* video hardware */ MCFG_GFXDECODE(yuyugogo) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed) MCFG_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf) @@ -3603,8 +3609,9 @@ static MACHINE_CONFIG_DERIVED( liquidk, taito_f2_tc0220ioc ) /* video hardware */ MCFG_VIDEO_START(taitof2_megab) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3619,7 +3626,8 @@ static MACHINE_CONFIG_DERIVED( quizhq, taito_f2 ) /* video hardware */ MCFG_GFXDECODE(yuyugogo) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed) MCFG_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf) @@ -3634,8 +3642,9 @@ static MACHINE_CONFIG_DERIVED( ssi, taito_f2_tc0510nio ) /* video hardware */ MCFG_VIDEO_START(taitof2_ssi) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed_thundfox) // buffer_delayed_thundfox instead of buffer_delayed fixes the butterfly powerup - MCFG_VIDEO_UPDATE(taitof2_ssi) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_ssi) + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed_thundfox) // buffer_delayed_thundfox instead of buffer_delayed fixes the butterfly powerup MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MACHINE_CONFIG_END @@ -3649,8 +3658,9 @@ static MACHINE_CONFIG_DERIVED( gunfront, taito_f2_tc0510nio ) /* video hardware */ MCFG_VIDEO_START(taitof2_gunfront) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3665,7 +3675,8 @@ static MACHINE_CONFIG_DERIVED( growl, taito_f2 ) /* video hardware */ MCFG_VIDEO_START(taitof2_growl) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3695,8 +3706,9 @@ static MACHINE_CONFIG_DERIVED( footchmp, taito_f2 ) /* video hardware */ MCFG_GFXDECODE(deadconx) MCFG_VIDEO_START(taitof2_footchmp) - MCFG_VIDEO_EOF(taitof2_full_buffer_delayed) - MCFG_VIDEO_UPDATE(taitof2_deadconx) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_deadconx) + MCFG_SCREEN_EOF(taitof2_full_buffer_delayed) MCFG_TC0480SCP_ADD("tc0480scp", footchmp_tc0480scp_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3718,8 +3730,9 @@ static MACHINE_CONFIG_DERIVED( hthero, taito_f2 ) /* video hardware */ MCFG_GFXDECODE(deadconx) MCFG_VIDEO_START(taitof2_hthero) - MCFG_VIDEO_EOF(taitof2_full_buffer_delayed) - MCFG_VIDEO_UPDATE(taitof2_deadconx) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_deadconx) + MCFG_SCREEN_EOF(taitof2_full_buffer_delayed) MCFG_TC0360PRI_ADD("tc0360pri") MCFG_TC0480SCP_ADD("tc0480scp", hthero_tc0480scp_intf) @@ -3734,7 +3747,8 @@ static MACHINE_CONFIG_DERIVED( koshien, taito_f2_tc0510nio ) /* video hardware */ MCFG_VIDEO_START(taitof2_koshien) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", koshien_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3750,7 +3764,8 @@ static MACHINE_CONFIG_DERIVED( yuyugogo, taito_f2_tc0510nio ) /* video hardware */ MCFG_GFXDECODE(yuyugogo) MCFG_VIDEO_START(taitof2_yuyugogo) - MCFG_VIDEO_UPDATE(taitof2_yesnoj) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_yesnoj) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MACHINE_CONFIG_END @@ -3764,7 +3779,8 @@ static MACHINE_CONFIG_DERIVED( ninjak, taito_f2 ) /* video hardware */ MCFG_VIDEO_START(taitof2_ninjak) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", finalb_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3779,7 +3795,8 @@ static MACHINE_CONFIG_DERIVED( solfigtr, taito_f2 ) /* video hardware */ MCFG_VIDEO_START(taitof2_solfigtr) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", solfigtr_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3793,7 +3810,8 @@ static MACHINE_CONFIG_DERIVED( qzquest, taito_f2_tc0510nio ) MCFG_CPU_PROGRAM_MAP(qzquest_map) /* video hardware */ - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed) MCFG_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf) MACHINE_CONFIG_END @@ -3808,7 +3826,8 @@ static MACHINE_CONFIG_DERIVED( pulirula, taito_f2_tc0510nio ) /* video hardware */ MCFG_GFXDECODE(pivot) MCFG_VIDEO_START(taitof2_pulirula) - MCFG_VIDEO_UPDATE(taitof2_pri_roz) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri_roz) MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf) MCFG_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf) @@ -3826,7 +3845,8 @@ static MACHINE_CONFIG_DERIVED( metalb, taito_f2_tc0510nio ) MCFG_GFXDECODE(deadconx) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(taitof2_metalb) - MCFG_VIDEO_UPDATE(taitof2_metalb) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_metalb) MCFG_TC0480SCP_ADD("tc0480scp", metalb_tc0480scp_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3841,7 +3861,8 @@ static MACHINE_CONFIG_DERIVED( qzchikyu, taito_f2_tc0510nio ) /* video hardware */ MCFG_VIDEO_START(taitof2_qzchikyu) - MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed_qzchikyu) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_EOF(taitof2_partial_buffer_delayed_qzchikyu) MCFG_TC0100SCN_ADD("tc0100scn", qzchikyu_tc0100scn_intf) MACHINE_CONFIG_END @@ -3856,7 +3877,8 @@ static MACHINE_CONFIG_DERIVED( yesnoj, taito_f2 ) /* video hardware */ MCFG_GFXDECODE(yuyugogo) MCFG_VIDEO_START(taitof2_yesnoj) - MCFG_VIDEO_UPDATE(taitof2_yesnoj) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_yesnoj) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MACHINE_CONFIG_END @@ -3871,7 +3893,8 @@ static MACHINE_CONFIG_DERIVED( deadconx, taito_f2 ) /* video hardware */ MCFG_GFXDECODE(deadconx) MCFG_VIDEO_START(taitof2_deadconx) - MCFG_VIDEO_UPDATE(taitof2_deadconx) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_deadconx) MCFG_TC0480SCP_ADD("tc0480scp", deadconx_tc0480scp_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3887,7 +3910,8 @@ static MACHINE_CONFIG_DERIVED( deadconxj, taito_f2 ) /* video hardware */ MCFG_GFXDECODE(deadconx) MCFG_VIDEO_START(taitof2_deadconxj) - MCFG_VIDEO_UPDATE(taitof2_deadconx) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_deadconx) MCFG_TC0480SCP_ADD("tc0480scp", deadconxj_tc0480scp_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3902,7 +3926,8 @@ static MACHINE_CONFIG_DERIVED( dinorex, taito_f2_tc0510nio ) /* video hardware */ MCFG_VIDEO_START(taitof2_dinorex) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3917,7 +3942,8 @@ static MACHINE_CONFIG_DERIVED( qjinsei, taito_f2_tc0510nio ) /* video hardware */ MCFG_VIDEO_START(taitof2_quiz) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3932,7 +3958,8 @@ static MACHINE_CONFIG_DERIVED( qcrayon, taito_f2_tc0510nio ) /* video hardware */ MCFG_VIDEO_START(taitof2_quiz) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3947,7 +3974,8 @@ static MACHINE_CONFIG_DERIVED( qcrayon2, taito_f2_tc0510nio ) /* video hardware */ MCFG_VIDEO_START(taitof2_quiz) - MCFG_VIDEO_UPDATE(taitof2_pri) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri) MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf) MCFG_TC0360PRI_ADD("tc0360pri") @@ -3963,7 +3991,8 @@ static MACHINE_CONFIG_DERIVED( driftout, taito_f2_tc0510nio ) /* video hardware */ MCFG_GFXDECODE(pivot) MCFG_VIDEO_START(taitof2_driftout) - MCFG_VIDEO_UPDATE(taitof2_pri_roz) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(taitof2_pri_roz) MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf) MCFG_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf) @@ -3992,13 +4021,13 @@ static MACHINE_CONFIG_START( cameltrya, taitof2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitof2_pri_roz) + MCFG_SCREEN_EOF(taitof2_no_buffer) MCFG_GFXDECODE(pivot) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitof2_dondokod) - MCFG_VIDEO_EOF(taitof2_no_buffer) - MCFG_VIDEO_UPDATE(taitof2_pri_roz) MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf) MCFG_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf) @@ -4042,13 +4071,13 @@ static MACHINE_CONFIG_START( driveout, taitof2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitof2_pri_roz) + MCFG_SCREEN_EOF(taitof2_no_buffer) MCFG_GFXDECODE(pivot) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitof2_driftout) - MCFG_VIDEO_EOF(taitof2_no_buffer) - MCFG_VIDEO_UPDATE(taitof2_pri_roz) MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf) MCFG_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf) diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index 4326585f99f..45eee5f3c6d 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -407,13 +407,13 @@ static MACHINE_CONFIG_START( f3, taito_f3_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8+48*2, 32*8) MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 24, 24+232-1) + MCFG_SCREEN_UPDATE(f3) + MCFG_SCREEN_EOF(f3) MCFG_GFXDECODE(taito_f3) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(f3) - MCFG_VIDEO_EOF(f3) - MCFG_VIDEO_UPDATE(f3) /* sound hardware */ MCFG_FRAGMENT_ADD(taito_f3_sound) @@ -502,13 +502,13 @@ static MACHINE_CONFIG_START( bubsympb, taito_f3_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8+48*2, 32*8) MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 31, 31+224-1) + MCFG_SCREEN_UPDATE(f3) + MCFG_SCREEN_EOF(f3) MCFG_GFXDECODE(bubsympb) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(f3) - MCFG_VIDEO_EOF(f3) - MCFG_VIDEO_UPDATE(f3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index d55fb392257..94b5d0c52e0 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -587,12 +587,11 @@ static MACHINE_CONFIG_START( syvalion, taitoh_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 64*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 28*16-1) + MCFG_SCREEN_UPDATE(syvalion) MCFG_GFXDECODE(syvalion) MCFG_PALETTE_LENGTH(33*16) - MCFG_VIDEO_UPDATE(syvalion) - MCFG_TC0080VCO_ADD("tc0080vco", syvalion_tc0080vco_intf) /* sound hardware */ @@ -632,12 +631,11 @@ static MACHINE_CONFIG_START( recordbr, taitoh_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 64*16) MCFG_SCREEN_VISIBLE_AREA(1*16, 21*16-1, 2*16, 17*16-1) + MCFG_SCREEN_UPDATE(recordbr) MCFG_GFXDECODE(recordbr) MCFG_PALETTE_LENGTH(32*16) - MCFG_VIDEO_UPDATE(recordbr) - MCFG_TC0080VCO_ADD("tc0080vco", recordbr_tc0080vco_intf) /* sound hardware */ @@ -677,12 +675,11 @@ static MACHINE_CONFIG_START( dleague, taitoh_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 64*16) MCFG_SCREEN_VISIBLE_AREA(1*16, 21*16-1, 2*16, 17*16-1) + MCFG_SCREEN_UPDATE(dleague) MCFG_GFXDECODE(dleague) MCFG_PALETTE_LENGTH(33*16) - MCFG_VIDEO_UPDATE(dleague) - MCFG_TC0080VCO_ADD("tc0080vco", recordbr_tc0080vco_intf) /* sound hardware */ diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 158d8e1f960..d8322b07858 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -2044,13 +2044,13 @@ static MACHINE_CONFIG_START( fhawk, taitol_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitol) + MCFG_SCREEN_EOF(taitol) MCFG_GFXDECODE(2) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(taitol) - MCFG_VIDEO_EOF(taitol) - MCFG_VIDEO_UPDATE(taitol) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2141,13 +2141,13 @@ static MACHINE_CONFIG_START( kurikint, taitol_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitol) + MCFG_SCREEN_EOF(taitol) MCFG_GFXDECODE(2) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(taitol) - MCFG_VIDEO_EOF(taitol) - MCFG_VIDEO_UPDATE(taitol) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2188,13 +2188,13 @@ static MACHINE_CONFIG_START( plotting, taitol_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitol) + MCFG_SCREEN_EOF(taitol) MCFG_GFXDECODE(1) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(taitol) - MCFG_VIDEO_EOF(taitol) - MCFG_VIDEO_UPDATE(taitol) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2281,13 +2281,13 @@ static MACHINE_CONFIG_START( evilston, taitol_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitol) + MCFG_SCREEN_EOF(taitol) MCFG_GFXDECODE(2) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(taitol) - MCFG_VIDEO_EOF(taitol) - MCFG_VIDEO_UPDATE(taitol) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c index f99b5caaab4..7c55fd52e30 100644 --- a/src/mame/drivers/taito_o.c +++ b/src/mame/drivers/taito_o.c @@ -260,12 +260,11 @@ static MACHINE_CONFIG_START( parentj, taitoo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 64*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 31*16-1) + MCFG_SCREEN_UPDATE(parentj) MCFG_GFXDECODE(parentj) MCFG_PALETTE_LENGTH(33*16) - MCFG_VIDEO_UPDATE(parentj) - MCFG_TC0080VCO_ADD("tc0080vco", parentj_intf) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index bb75ec104c3..695448291ab 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -931,12 +931,12 @@ static MACHINE_CONFIG_START( superman, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(52*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) MCFG_GFXDECODE(superman) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -972,12 +972,12 @@ static MACHINE_CONFIG_START( daisenpu, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(52*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) MCFG_GFXDECODE(superman) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1011,12 +1011,12 @@ static MACHINE_CONFIG_START( gigandes, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(52*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) MCFG_GFXDECODE(superman) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1052,12 +1052,12 @@ static MACHINE_CONFIG_START( ballbros, seta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(52*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(seta_no_layers) MCFG_GFXDECODE(ballbros) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(seta_no_layers) - MCFG_VIDEO_UPDATE(seta_no_layers) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index eb646604a76..631040f85ed 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -3038,12 +3038,12 @@ static MACHINE_CONFIG_START( contcirc, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 31*8-1) + MCFG_SCREEN_UPDATE(contcirc) MCFG_GFXDECODE(taitoz) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(contcirc) MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) @@ -3103,12 +3103,12 @@ static MACHINE_CONFIG_START( chasehq, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(chasehq) MCFG_GFXDECODE(chasehq) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(chasehq) MCFG_TC0100SCN_ADD("tc0100scn", chasehq_tc0100scn_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) @@ -3168,12 +3168,12 @@ static MACHINE_CONFIG_START( enforce, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 31*8-1) + MCFG_SCREEN_UPDATE(contcirc) MCFG_GFXDECODE(taitoz) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(contcirc) MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) @@ -3231,12 +3231,12 @@ static MACHINE_CONFIG_START( bshark, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(bshark) MCFG_GFXDECODE(taitoz) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(bshark) MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) @@ -3294,12 +3294,12 @@ static MACHINE_CONFIG_START( sci, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(sci) MCFG_GFXDECODE(taitoz) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(sci) MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) @@ -3357,12 +3357,12 @@ static MACHINE_CONFIG_START( nightstr, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(chasehq) MCFG_GFXDECODE(chasehq) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(chasehq) MCFG_TC0100SCN_ADD("tc0100scn", chasehq_tc0100scn_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) @@ -3422,12 +3422,12 @@ static MACHINE_CONFIG_START( aquajack, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(aquajack) MCFG_GFXDECODE(taitoz) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(aquajack) MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) @@ -3484,11 +3484,11 @@ static MACHINE_CONFIG_START( spacegun, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(spacegun) MCFG_GFXDECODE(taitoz) MCFG_PALETTE_LENGTH(4096) - MCFG_VIDEO_UPDATE(spacegun) MCFG_TC0100SCN_ADD("tc0100scn", spacegun_tc0100scn_intf) MCFG_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf) @@ -3546,12 +3546,12 @@ static MACHINE_CONFIG_START( dblaxle, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(dblaxle) MCFG_GFXDECODE(dblaxle) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(dblaxle) MCFG_TC0480SCP_ADD("tc0480scp", taitoz_tc0480scp_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) @@ -3609,12 +3609,12 @@ static MACHINE_CONFIG_START( racingb, taitoz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(dblaxle) MCFG_GFXDECODE(dblaxle) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(taitoz) - MCFG_VIDEO_UPDATE(dblaxle) MCFG_TC0480SCP_ADD("tc0480scp", taitoz_tc0480scp_intf) MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf) diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 19952632d14..1a699b5181e 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -677,12 +677,11 @@ static MACHINE_CONFIG_START( airsys, taitoair_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 64*16) MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 28*16-1) + MCFG_SCREEN_UPDATE(taitoair) MCFG_GFXDECODE(airsys) MCFG_PALETTE_LENGTH(512*16) - MCFG_VIDEO_UPDATE(taitoair) - MCFG_TC0080VCO_ADD("tc0080vco", airsys_tc0080vco_intf) /* sound hardware */ diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c index 96388bad6d2..6a714eb280b 100644 --- a/src/mame/drivers/taitogn.c +++ b/src/mame/drivers/taitogn.c @@ -979,12 +979,12 @@ static MACHINE_CONFIG_START( coh3002t, taitogn_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 1024 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type2 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 2bff6de36da..ca076330520 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -1339,11 +1339,11 @@ static MACHINE_CONFIG_START( taitojc, taitojc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 400) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 399) + MCFG_SCREEN_UPDATE(taitojc) MCFG_PALETTE_LENGTH(32768) MCFG_VIDEO_START(taitojc) - MCFG_VIDEO_UPDATE(taitojc) /* sound hardware */ MCFG_FRAGMENT_ADD(taito_f3_sound) diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c index 7dce83c3496..dd5e8cf8be2 100644 --- a/src/mame/drivers/taitopjc.c +++ b/src/mame/drivers/taitopjc.c @@ -63,7 +63,7 @@ static VIDEO_START( taitopjc ) } -static VIDEO_UPDATE( taitopjc ) +static SCREEN_UPDATE( taitopjc ) { return 0; } @@ -101,9 +101,9 @@ static MACHINE_CONFIG_START( taitopjc, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(taitopjc) MCFG_VIDEO_START(taitopjc) - MCFG_VIDEO_UPDATE(taitopjc) MACHINE_CONFIG_END diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c index 65ea2b9c967..1da0dd20fb6 100644 --- a/src/mame/drivers/taitosj.c +++ b/src/mame/drivers/taitosj.c @@ -1816,12 +1816,12 @@ static MACHINE_CONFIG_START( nomcu, taitosj_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(taitosj) MCFG_GFXDECODE(taitosj) MCFG_PALETTE_LENGTH(64) MCFG_VIDEO_START(taitosj) - MCFG_VIDEO_UPDATE(taitosj) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1867,7 +1867,8 @@ static MACHINE_CONFIG_DERIVED( kikstart, mcu ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(kikstart_main_map) - MCFG_VIDEO_UPDATE(kikstart) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(kikstart) MACHINE_CONFIG_END diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c index 0cd0f8f8386..b93cab0ca22 100644 --- a/src/mame/drivers/taitotz.c +++ b/src/mame/drivers/taitotz.c @@ -76,7 +76,7 @@ static VIDEO_START( taitotz ) { } -static VIDEO_UPDATE( taitotz ) +static SCREEN_UPDATE( taitotz ) { return 0; } @@ -116,9 +116,9 @@ static MACHINE_CONFIG_START( taitotz, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(512, 384) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) + MCFG_SCREEN_UPDATE(taitotz) MCFG_VIDEO_START(taitotz) - MCFG_VIDEO_UPDATE(taitotz) MACHINE_CONFIG_END #define TAITOTZ_BIOS \ diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index 15508931fe8..70a96a93dc4 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -81,7 +81,7 @@ static void draw_char(bitmap_t *bitmap, const rectangle *cliprect, const gfx_ele } } -static VIDEO_UPDATE(taitowlf) +static SCREEN_UPDATE(taitowlf) { taitowlf_state *state = screen->machine->driver_data<taitowlf_state>(); int i, j; @@ -671,13 +671,12 @@ static MACHINE_CONFIG_START( taitowlf, taitowlf_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199) + MCFG_SCREEN_UPDATE(taitowlf) MCFG_GFXDECODE(CGA) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(taitowlf) - MCFG_VIDEO_UPDATE(taitowlf) - MACHINE_CONFIG_END static void set_gate_a20(running_machine *machine, int a20) diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c index a6c3476ae35..0c8ee95cb11 100644 --- a/src/mame/drivers/tank8.c +++ b/src/mame/drivers/tank8.c @@ -344,14 +344,14 @@ static MACHINE_CONFIG_START( tank8, tank8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 524) MCFG_SCREEN_VISIBLE_AREA(16, 495, 0, 463) + MCFG_SCREEN_UPDATE(tank8) + MCFG_SCREEN_EOF(tank8) MCFG_GFXDECODE(tank8) MCFG_PALETTE_LENGTH(20) MCFG_PALETTE_INIT(tank8) MCFG_VIDEO_START(tank8) - MCFG_VIDEO_UPDATE(tank8) - MCFG_VIDEO_EOF(tank8) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c index b57b7e415f3..77419b035e7 100644 --- a/src/mame/drivers/tankbatt.c +++ b/src/mame/drivers/tankbatt.c @@ -307,13 +307,13 @@ static MACHINE_CONFIG_START( tankbatt, tankbatt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tankbatt) MCFG_GFXDECODE(tankbatt) MCFG_PALETTE_LENGTH(256*2) MCFG_PALETTE_INIT(tankbatt) MCFG_VIDEO_START(tankbatt) - MCFG_VIDEO_UPDATE(tankbatt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c index 90f08d9b240..04653ad734e 100644 --- a/src/mame/drivers/tankbust.c +++ b/src/mame/drivers/tankbust.c @@ -347,6 +347,7 @@ static MACHINE_CONFIG_START( tankbust, driver_device ) MCFG_SCREEN_SIZE ( 64*8, 32*8 ) MCFG_SCREEN_VISIBLE_AREA ( 16*8, 56*8-1, 1*8, 31*8-1 ) // MCFG_SCREEN_VISIBLE_AREA ( 0*8, 64*8-1, 1*8, 31*8-1 ) + MCFG_SCREEN_UPDATE ( tankbust ) MCFG_GFXDECODE( tankbust ) @@ -354,7 +355,6 @@ static MACHINE_CONFIG_START( tankbust, driver_device ) MCFG_PALETTE_INIT ( tankbust ) MCFG_VIDEO_START ( tankbust ) - MCFG_VIDEO_UPDATE ( tankbust ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index b2940162f1a..922a7836274 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -348,12 +348,12 @@ static MACHINE_CONFIG_START( taotaido, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(taotaido) + MCFG_SCREEN_EOF( taotaido ) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(taotaido) - MCFG_VIDEO_UPDATE(taotaido) - MCFG_VIDEO_EOF( taotaido ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c index d85c6ee14e0..13b0dd0e18d 100644 --- a/src/mame/drivers/targeth.c +++ b/src/mame/drivers/targeth.c @@ -181,12 +181,12 @@ static MACHINE_CONFIG_START( targeth, targeth_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 32*16) /* 1024x512 */ MCFG_SCREEN_VISIBLE_AREA(0, 24*16-1, 16, 16*16-1) /* 400x240 */ + MCFG_SCREEN_UPDATE(targeth) MCFG_GFXDECODE(0x080000) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(targeth) - MCFG_VIDEO_UPDATE(targeth) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index aa40ca721ee..f85d7af1c59 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -882,12 +882,12 @@ static MACHINE_CONFIG_START( apache3, tatsumi_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(CLOCK_2 / 8, 400, 0, 320, 280, 0, 240) // TODO: Hook up CRTC + MCFG_SCREEN_UPDATE(apache3) MCFG_GFXDECODE(apache3) MCFG_PALETTE_LENGTH(1024 + 4096) /* 1024 real colours, and 4096 arranged as series of cluts */ MCFG_VIDEO_START(apache3) - MCFG_VIDEO_UPDATE(apache3) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -924,12 +924,12 @@ static MACHINE_CONFIG_START( roundup5, tatsumi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(roundup5) MCFG_GFXDECODE(roundup5) MCFG_PALETTE_LENGTH(1024 + 4096) /* 1024 real colours, and 4096 arranged as series of cluts */ MCFG_VIDEO_START(roundup5) - MCFG_VIDEO_UPDATE(roundup5) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -967,12 +967,12 @@ static MACHINE_CONFIG_START( cyclwarr, tatsumi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(cyclwarr) MCFG_GFXDECODE(cyclwarr) MCFG_PALETTE_LENGTH(8192 + 8192) MCFG_VIDEO_START(cyclwarr) - MCFG_VIDEO_UPDATE(cyclwarr) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1010,12 +1010,12 @@ static MACHINE_CONFIG_START( bigfight, tatsumi_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(bigfight) MCFG_GFXDECODE(cyclwarr) MCFG_PALETTE_LENGTH(8192 + 8192) MCFG_VIDEO_START(bigfight) - MCFG_VIDEO_UPDATE(bigfight) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index b5454365155..a188506de42 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -43,7 +43,7 @@ static TILE_GET_INFO( get_tile_info ) 0); } -static VIDEO_UPDATE( tattack ) +static SCREEN_UPDATE( tattack ) { tilemap_mark_all_tiles_dirty(tmap); tilemap_draw(bitmap,cliprect,tmap, 0,0); @@ -194,12 +194,12 @@ static MACHINE_CONFIG_START( tattack, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(tattack) MCFG_GFXDECODE(tattack) MCFG_PALETTE_LENGTH(16) MCFG_PALETTE_INIT(tattack ) - MCFG_VIDEO_UPDATE(tattack) MCFG_VIDEO_START(tattack) /* sound hardware */ diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c index ce7aa6d2bcf..893a12b5d2b 100644 --- a/src/mame/drivers/taxidrvr.c +++ b/src/mame/drivers/taxidrvr.c @@ -390,12 +390,11 @@ static MACHINE_CONFIG_START( taxidrvr, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 27*8-1) + MCFG_SCREEN_UPDATE(taxidrvr) MCFG_GFXDECODE(taxidrvr) MCFG_PALETTE_LENGTH(16) - MCFG_VIDEO_UPDATE(taxidrvr) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index 4c12de27c46..51c0b1e62b5 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -491,6 +491,7 @@ static MACHINE_CONFIG_START( tbowl, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tbowl) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -498,9 +499,9 @@ static MACHINE_CONFIG_START( tbowl, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tbowl) MCFG_VIDEO_START(tbowl) - MCFG_VIDEO_UPDATE(tbowl) MCFG_MACHINE_RESET( tbowl ) diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index 022a34f7c84..d4f8a89743d 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -407,6 +407,7 @@ static MACHINE_CONFIG_START( tceptor, tceptor_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(38*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0) + MCFG_SCREEN_UPDATE(tceptor) MCFG_SCREEN_ADD("3dleft", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -414,6 +415,7 @@ static MACHINE_CONFIG_START( tceptor, tceptor_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(38*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0) + MCFG_SCREEN_UPDATE(tceptor) MCFG_SCREEN_ADD("3dright", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -421,12 +423,12 @@ static MACHINE_CONFIG_START( tceptor, tceptor_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(38*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0) + MCFG_SCREEN_UPDATE(tceptor) + MCFG_SCREEN_EOF(tceptor) MCFG_PALETTE_INIT(tceptor) MCFG_VIDEO_START(tceptor) - MCFG_VIDEO_UPDATE(tceptor) - MCFG_VIDEO_EOF(tceptor) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c index 5ce474acd7c..8a2f03517e2 100644 --- a/src/mame/drivers/tcl.c +++ b/src/mame/drivers/tcl.c @@ -49,7 +49,7 @@ Notes: static VIDEO_START( tcl ) { } -static VIDEO_UPDATE( tcl ) +static SCREEN_UPDATE( tcl ) { return 0; } @@ -125,12 +125,12 @@ static MACHINE_CONFIG_START( tcl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tcl) MCFG_GFXDECODE(tcl) MCFG_PALETTE_LENGTH(16*16) MCFG_VIDEO_START(tcl) - MCFG_VIDEO_UPDATE(tcl) MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] ) MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] ) diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 82b3dc034a1..8975192308b 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -679,12 +679,12 @@ static MACHINE_CONFIG_START( rygar, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tecmo) MCFG_GFXDECODE(tecmo) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(tecmo) - MCFG_VIDEO_UPDATE(tecmo) MCFG_MACHINE_RESET( rygar ) @@ -739,12 +739,12 @@ static MACHINE_CONFIG_START( backfirt, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tecmo) MCFG_GFXDECODE(tecmo) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(tecmo) - MCFG_VIDEO_UPDATE(tecmo) MCFG_MACHINE_RESET( rygar ) diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c index c70bc391ddd..7738d574007 100644 --- a/src/mame/drivers/tecmo16.c +++ b/src/mame/drivers/tecmo16.c @@ -392,12 +392,12 @@ static MACHINE_CONFIG_START( fstarfrc, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tecmo16) MCFG_GFXDECODE(tecmo16) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(fstarfrc) - MCFG_VIDEO_UPDATE(tecmo16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index 700be08ec8a..60af11c9b55 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -768,7 +768,7 @@ static void tecmosys_do_final_mix(running_machine *machine, bitmap_t* bitmap) } } -static VIDEO_UPDATE(deroon) +static SCREEN_UPDATE(deroon) { bitmap_fill(bitmap,cliprect,screen->machine->pens[0x4000]); @@ -898,11 +898,11 @@ static MACHINE_CONFIG_START( deroon, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(deroon) MCFG_PALETTE_LENGTH(0x4000+0x800) MCFG_VIDEO_START(deroon) - MCFG_VIDEO_UPDATE(deroon) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c index 9d2f4a3c310..9b97f5d63f1 100644 --- a/src/mame/drivers/tehkanwc.c +++ b/src/mame/drivers/tehkanwc.c @@ -665,12 +665,12 @@ static MACHINE_CONFIG_START( tehkanwc, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tehkanwc) MCFG_GFXDECODE(tehkanwc) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(tehkanwc) - MCFG_VIDEO_UPDATE(tehkanwc) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c index a3047b080e9..f76f1d9c224 100644 --- a/src/mame/drivers/tempest.c +++ b/src/mame/drivers/tempest.c @@ -601,9 +601,9 @@ static MACHINE_CONFIG_START( tempest, tempest_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 580, 0, 570) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(avg_tempest) - MCFG_VIDEO_UPDATE(vector) /* Drivers */ MCFG_MATHBOX_ADD("mathbox") diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c index 400ba622965..beb2cd260d2 100644 --- a/src/mame/drivers/terracre.c +++ b/src/mame/drivers/terracre.c @@ -548,13 +548,13 @@ static MACHINE_CONFIG_START( amazon, terracre_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(amazon) MCFG_GFXDECODE(terracre) MCFG_PALETTE_LENGTH(1*16+16*16+16*256) MCFG_PALETTE_INIT(amazon) MCFG_VIDEO_START(amazon) - MCFG_VIDEO_UPDATE(amazon) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -585,13 +585,13 @@ static MACHINE_CONFIG_START( ym3526, terracre_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(amazon) MCFG_GFXDECODE(terracre) MCFG_PALETTE_LENGTH(1*16+16*16+16*256) MCFG_PALETTE_INIT(amazon) MCFG_VIDEO_START(amazon) - MCFG_VIDEO_UPDATE(amazon) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -622,13 +622,13 @@ static MACHINE_CONFIG_START( ym2203, terracre_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(amazon) MCFG_GFXDECODE(terracre) MCFG_PALETTE_LENGTH(1*16+16*16+16*256) MCFG_PALETTE_INIT(amazon) MCFG_VIDEO_START(amazon) - MCFG_VIDEO_UPDATE(amazon) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index c0b35274daf..c0eee8ad451 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -1109,12 +1109,12 @@ static MACHINE_CONFIG_START( tetrisp2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x140, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(tetrisp2) MCFG_GFXDECODE(tetrisp2) MCFG_PALETTE_LENGTH(0x8000) MCFG_VIDEO_START(tetrisp2) - MCFG_VIDEO_UPDATE(tetrisp2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1141,12 +1141,12 @@ static MACHINE_CONFIG_START( nndmseal, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x180, 0xf0) MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xf0-1) + MCFG_SCREEN_UPDATE(tetrisp2) MCFG_GFXDECODE(tetrisp2) MCFG_PALETTE_LENGTH(0x8000) MCFG_VIDEO_START(nndmseal) // bg layer offset - MCFG_VIDEO_UPDATE(tetrisp2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1172,12 +1172,12 @@ static MACHINE_CONFIG_START( rockn, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x140, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(rockntread) MCFG_GFXDECODE(tetrisp2) MCFG_PALETTE_LENGTH(0x8000) MCFG_VIDEO_START(rockntread) - MCFG_VIDEO_UPDATE(rockntread) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1204,12 +1204,12 @@ static MACHINE_CONFIG_START( rockn2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x140, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(rockntread) MCFG_GFXDECODE(tetrisp2) MCFG_PALETTE_LENGTH(0x8000) MCFG_VIDEO_START(rockntread) - MCFG_VIDEO_UPDATE(rockntread) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1245,6 +1245,7 @@ static MACHINE_CONFIG_START( rocknms, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(0x140, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(rocknms) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) @@ -1252,10 +1253,9 @@ static MACHINE_CONFIG_START( rocknms, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(0x140, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1) - + MCFG_SCREEN_UPDATE(rocknms) MCFG_VIDEO_START(rocknms) - MCFG_VIDEO_UPDATE(rocknms) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c index 1e253d38661..3651263e882 100644 --- a/src/mame/drivers/tgtpanic.c +++ b/src/mame/drivers/tgtpanic.c @@ -22,7 +22,7 @@ static UINT8 color; * *************************************/ -static VIDEO_UPDATE( tgtpanic ) +static SCREEN_UPDATE( tgtpanic ) { UINT32 colors[4]; UINT32 offs; @@ -126,14 +126,13 @@ static MACHINE_CONFIG_START( tgtpanic, driver_device ) MCFG_CPU_PERIODIC_INT(irq0_line_hold, 20) /* Unverified */ /* video hardware */ - MCFG_VIDEO_UPDATE(tgtpanic) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) /* Unverified */ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* Unverified */ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 192 - 1, 0, 192 - 1) + MCFG_SCREEN_UPDATE(tgtpanic) MACHINE_CONFIG_END diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index 6d5c4b31540..e03c4d147cd 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -371,13 +371,13 @@ static MACHINE_CONFIG_START( thedeep, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x100, 0xf8) MCFG_SCREEN_VISIBLE_AREA(0, 0x100-1, 0, 0xf8-1) + MCFG_SCREEN_UPDATE(thedeep) MCFG_GFXDECODE(thedeep) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(thedeep) MCFG_VIDEO_START(thedeep) - MCFG_VIDEO_UPDATE(thedeep) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c index 8d89adc0864..309df0d19d7 100644 --- a/src/mame/drivers/thepit.c +++ b/src/mame/drivers/thepit.c @@ -649,10 +649,10 @@ static MACHINE_CONFIG_START( thepit, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(thepit) MCFG_PALETTE_INIT(thepit) MCFG_VIDEO_START(thepit) - MCFG_VIDEO_UPDATE(thepit) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c index 1cabab6de15..2f274d5a9cf 100644 --- a/src/mame/drivers/thief.c +++ b/src/mame/drivers/thief.c @@ -448,13 +448,13 @@ static MACHINE_CONFIG_START( sharkatt, thief_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1) + MCFG_SCREEN_UPDATE(thief) MCFG_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(thief) - MCFG_VIDEO_UPDATE(thief) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -486,13 +486,13 @@ static MACHINE_CONFIG_START( thief, thief_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(thief) MCFG_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(thief) - MCFG_VIDEO_UPDATE(thief) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -524,13 +524,13 @@ static MACHINE_CONFIG_START( natodef, thief_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(thief) MCFG_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(thief) - MCFG_VIDEO_UPDATE(thief) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c index 2d504ce4a7c..65569323b15 100644 --- a/src/mame/drivers/thoop2.c +++ b/src/mame/drivers/thoop2.c @@ -200,12 +200,12 @@ static MACHINE_CONFIG_START( thoop2, thoop2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) + MCFG_SCREEN_UPDATE(thoop2) MCFG_GFXDECODE(thoop2) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(thoop2) - MCFG_VIDEO_UPDATE(thoop2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index e7e06f606f3..eea00aa61be 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -309,9 +309,9 @@ static MACHINE_CONFIG_START( thunderj, thunderj_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a VAD chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(thunderj) MCFG_VIDEO_START(thunderj) - MCFG_VIDEO_UPDATE(thunderj) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_ii_mono) diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index 2e0826a0075..007f34fc079 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -701,11 +701,11 @@ static MACHINE_CONFIG_START( scontra, thunderx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(scontra) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(scontra) - MCFG_VIDEO_UPDATE(scontra) MCFG_K052109_ADD("k052109", thunderx_k052109_intf) MCFG_K051960_ADD("k051960", thunderx_k051960_intf) @@ -746,11 +746,11 @@ static MACHINE_CONFIG_START( thunderx, thunderx_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(scontra) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(scontra) - MCFG_VIDEO_UPDATE(scontra) MCFG_K052109_ADD("k052109", thunderx_k052109_intf) MCFG_K051960_ADD("k051960", thunderx_k051960_intf) diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c index c2291e825da..9cee4f238fd 100644 --- a/src/mame/drivers/tiamc1.c +++ b/src/mame/drivers/tiamc1.c @@ -235,13 +235,13 @@ static MACHINE_CONFIG_START( tiamc1, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) + MCFG_SCREEN_UPDATE(tiamc1) MCFG_GFXDECODE(tiamc1) MCFG_PALETTE_LENGTH(16) MCFG_PALETTE_INIT(tiamc1) MCFG_VIDEO_START(tiamc1) - MCFG_VIDEO_UPDATE(tiamc1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c index b93918dcb04..3e68e2b492d 100644 --- a/src/mame/drivers/tickee.c +++ b/src/mame/drivers/tickee.c @@ -749,11 +749,11 @@ static MACHINE_CONFIG_START( tickee, driver_device ) MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) MCFG_VIDEO_START(tickee) - MCFG_VIDEO_UPDATE(tms340x0) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) + MCFG_SCREEN_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -790,11 +790,11 @@ static MACHINE_CONFIG_START( rapidfir, driver_device ) MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) MCFG_VIDEO_START(tickee) - MCFG_VIDEO_UPDATE(tms340x0) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) + MCFG_SCREEN_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -820,11 +820,10 @@ static MACHINE_CONFIG_START( mouseatk, driver_device ) /* video hardware */ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) - MCFG_VIDEO_UPDATE(tms340x0) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) + MCFG_SCREEN_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c index 906d2e6e846..ddbead7850c 100644 --- a/src/mame/drivers/tigeroad.c +++ b/src/mame/drivers/tigeroad.c @@ -537,13 +537,13 @@ static MACHINE_CONFIG_START( tigeroad, tigeroad_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tigeroad) + MCFG_SCREEN_EOF(tigeroad) MCFG_GFXDECODE(tigeroad) MCFG_PALETTE_LENGTH(576) MCFG_VIDEO_START(tigeroad) - MCFG_VIDEO_EOF(tigeroad) - MCFG_VIDEO_UPDATE(tigeroad) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c index 6e67e283fb7..4c8bca5f5ce 100644 --- a/src/mame/drivers/timelimt.c +++ b/src/mame/drivers/timelimt.c @@ -253,13 +253,13 @@ static MACHINE_CONFIG_START( timelimt, timelimt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(timelimt) MCFG_GFXDECODE(timelimt) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(timelimt) MCFG_VIDEO_START(timelimt) - MCFG_VIDEO_UPDATE(timelimt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c index 94d9ac76aef..83e5aacdac8 100644 --- a/src/mame/drivers/timeplt.c +++ b/src/mame/drivers/timeplt.c @@ -395,13 +395,13 @@ static MACHINE_CONFIG_START( timeplt, timeplt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(timeplt) MCFG_GFXDECODE(timeplt) MCFG_PALETTE_LENGTH(32*4+64*4) MCFG_PALETTE_INIT(timeplt) MCFG_VIDEO_START(timeplt) - MCFG_VIDEO_UPDATE(timeplt) /* sound hardware */ MCFG_FRAGMENT_ADD(timeplt_sound) diff --git a/src/mame/drivers/timetrv.c b/src/mame/drivers/timetrv.c index c11824e468e..a91161a8840 100644 --- a/src/mame/drivers/timetrv.c +++ b/src/mame/drivers/timetrv.c @@ -44,7 +44,7 @@ static VIDEO_START( timetrv ) } -static VIDEO_UPDATE( timetrv ) +static SCREEN_UPDATE( timetrv ) { timetrv_state *state = screen->machine->driver_data<timetrv_state>(); popmessage("%s%s",state->led_vram_lo,state->led_vram_hi); @@ -153,11 +153,11 @@ static MACHINE_CONFIG_START( timetrv, timetrv_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1) + MCFG_SCREEN_UPDATE(timetrv) + MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(timetrv) - MCFG_VIDEO_UPDATE(timetrv) - /* sound hardware */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 5c542d25257..f0032ffc21f 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -311,7 +311,7 @@ static VIDEO_START( galgames ) state->compute_addr = galgames_compute_addr; } -static VIDEO_UPDATE( tmaster ) +static SCREEN_UPDATE( tmaster ) { tmaster_state *state = screen->machine->driver_data<tmaster_state>(); int layers_ctrl = -1; @@ -913,11 +913,11 @@ static MACHINE_CONFIG_START( tm3k, tmaster_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(400, 256) MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 256-1) + MCFG_SCREEN_UPDATE(tmaster) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(tmaster) - MCFG_VIDEO_UPDATE(tmaster) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -983,11 +983,11 @@ static MACHINE_CONFIG_START( galgames, tmaster_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(400, 256) MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 256-1) + MCFG_SCREEN_UPDATE(tmaster) MCFG_PALETTE_LENGTH(0x1000) // only 0x100 used MCFG_VIDEO_START(galgames) - MCFG_VIDEO_UPDATE(tmaster) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index b5efdf833c4..cd092743aa2 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -276,7 +276,7 @@ static void ttmjprd_draw_tilemap(running_machine *machine, bitmap_t *bitmap, con } -static VIDEO_UPDATE( tmmjprd ) +static SCREEN_UPDATE( tmmjprd ) { tmmjprd_state *state = screen->machine->driver_data<tmmjprd_state>(); UINT8* gfxroms = screen->machine->region("gfx2")->base(); @@ -762,6 +762,7 @@ static MACHINE_CONFIG_START( tmmjprd, tmmjprd_state ) MCFG_SCREEN_SIZE(64*16, 64*16) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) //MCFG_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*8, 64*16-1) + MCFG_SCREEN_UPDATE(tmmjprd) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -770,10 +771,9 @@ static MACHINE_CONFIG_START( tmmjprd, tmmjprd_state ) MCFG_SCREEN_SIZE(64*16, 64*16) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) //MCFG_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*8, 64*16-1) - + MCFG_SCREEN_UPDATE(tmmjprd) MCFG_VIDEO_START(tmmjprd) - MCFG_VIDEO_UPDATE(tmmjprd) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( tmpdoki, tmmjprd ) diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 60c1c546f75..098a327a0b3 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -2289,12 +2289,12 @@ static MACHINE_CONFIG_START( cuebrick, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(mia) MCFG_PALETTE_LENGTH(1024) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_VIDEO_START(cuebrick) - MCFG_VIDEO_UPDATE(mia) MCFG_K052109_ADD("k052109", cuebrick_k052109_intf) MCFG_K051960_ADD("k051960", cuebrick_k051960_intf) @@ -2331,11 +2331,11 @@ static MACHINE_CONFIG_START( mia, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(mia) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(mia) - MCFG_VIDEO_UPDATE(mia) MCFG_K052109_ADD("k052109", mia_k052109_intf) MCFG_K051960_ADD("k051960", mia_k051960_intf) @@ -2385,11 +2385,11 @@ static MACHINE_CONFIG_START( tmnt, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(tmnt) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(tmnt) - MCFG_VIDEO_UPDATE(tmnt) MCFG_K052109_ADD("k052109", tmnt_k052109_intf) MCFG_K051960_ADD("k051960", tmnt_k051960_intf) @@ -2438,11 +2438,10 @@ static MACHINE_CONFIG_START( punkshot, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(punkshot) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(punkshot) - MCFG_K052109_ADD("k052109", tmnt_k052109_intf) MCFG_K051960_ADD("k051960", punkshot_k051960_intf) MCFG_K053251_ADD("k053251") @@ -2481,11 +2480,11 @@ static MACHINE_CONFIG_START( lgtnfght, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(lgtnfght) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(lgtnfght) - MCFG_VIDEO_UPDATE(lgtnfght) MCFG_K052109_ADD("k052109", tmnt_k052109_intf) MCFG_K053245_ADD("k053245", lgtnfght_k05324x_intf) @@ -2529,12 +2528,12 @@ static MACHINE_CONFIG_START( blswhstl, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(lgtnfght) + MCFG_SCREEN_EOF( blswhstl ) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START( blswhstl ) - MCFG_VIDEO_UPDATE(lgtnfght) - MCFG_VIDEO_EOF( blswhstl ) MCFG_K052109_ADD("k052109", blswhstl_k052109_intf) MCFG_K053245_ADD("k053245", blswhstl_k05324x_intf) @@ -2594,12 +2593,12 @@ static MACHINE_CONFIG_START( glfgreat, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(glfgreat) MCFG_GFXDECODE(glfgreat) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(glfgreat) - MCFG_VIDEO_UPDATE(glfgreat) MCFG_K052109_ADD("k052109", glfgreat_k052109_intf) MCFG_K053245_ADD("k053245", glfgreat_k05324x_intf) @@ -2660,12 +2659,12 @@ static MACHINE_CONFIG_START( prmrsocr, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(glfgreat) MCFG_GFXDECODE(glfgreat) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(prmrsocr) - MCFG_VIDEO_UPDATE(glfgreat) MCFG_K052109_ADD("k052109", glfgreat_k052109_intf) MCFG_K053245_ADD("k053245", prmrsocr_k05324x_intf) @@ -2711,11 +2710,11 @@ static MACHINE_CONFIG_START( tmnt2, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(tmnt2) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(lgtnfght) - MCFG_VIDEO_UPDATE(tmnt2) MCFG_K052109_ADD("k052109", tmnt_k052109_intf) MCFG_K053245_ADD("k053245", lgtnfght_k05324x_intf) @@ -2759,11 +2758,11 @@ static MACHINE_CONFIG_START( ssriders, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(tmnt2) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(lgtnfght) - MCFG_VIDEO_UPDATE(tmnt2) MCFG_K052109_ADD("k052109", tmnt_k052109_intf) MCFG_K053245_ADD("k053245", lgtnfght_k05324x_intf) @@ -2803,6 +2802,7 @@ static MACHINE_CONFIG_START( sunsetbl, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(tmnt2) MCFG_PALETTE_LENGTH(2048) @@ -2810,8 +2810,6 @@ static MACHINE_CONFIG_START( sunsetbl, tmnt_state ) MCFG_K053245_ADD("k053245", lgtnfght_k05324x_intf) MCFG_K053251_ADD("k053251") - MCFG_VIDEO_UPDATE(tmnt2) - /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2845,11 +2843,10 @@ static MACHINE_CONFIG_START( thndrx2, tmnt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(thndrx2) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(thndrx2) - MCFG_K052109_ADD("k052109", tmnt_k052109_intf) MCFG_K051960_ADD("k051960", thndrx2_k051960_intf) MCFG_K053251_ADD("k053251") diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index 58474738dcf..3b3eb857be9 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -1630,13 +1630,13 @@ static MACHINE_CONFIG_START( arknoid2, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_GFXDECODE(tnzs) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(arknoid2) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1670,13 +1670,13 @@ static MACHINE_CONFIG_START( drtoppel, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_GFXDECODE(tnzs) MCFG_PALETTE_LENGTH(512) MCFG_PALETTE_INIT(arknoid2) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1713,12 +1713,12 @@ static MACHINE_CONFIG_START( tnzs, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_GFXDECODE(tnzs) MCFG_PALETTE_LENGTH(512) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1752,13 +1752,12 @@ static MACHINE_CONFIG_START( insectx, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_GFXDECODE(insectx) MCFG_PALETTE_LENGTH(512) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1791,13 +1790,12 @@ static MACHINE_CONFIG_START( kageki, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_GFXDECODE(tnzs) MCFG_PALETTE_LENGTH(512) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1841,13 +1839,12 @@ static MACHINE_CONFIG_START( tnzsb, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_GFXDECODE(tnzs) MCFG_PALETTE_LENGTH(512) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1904,13 +1901,12 @@ static MACHINE_CONFIG_START( jpopnics, tnzs_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tnzs) + MCFG_SCREEN_EOF(tnzs) MCFG_GFXDECODE(tnzs) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_UPDATE(tnzs) - MCFG_VIDEO_EOF(tnzs) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index c9a3d03c04d..3771a890d9c 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -1533,13 +1533,13 @@ static MACHINE_CONFIG_START( rallybik, toaplan1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) /* 512x288 active */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(rallybik) + MCFG_SCREEN_EOF(rallybik) MCFG_GFXDECODE(rallybik) MCFG_PALETTE_LENGTH((64*16)+(64*16)) MCFG_VIDEO_START(rallybik) - MCFG_VIDEO_EOF(rallybik) - MCFG_VIDEO_UPDATE(rallybik) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1573,13 +1573,13 @@ static MACHINE_CONFIG_START( truxton, toaplan1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) /* 512x320 active */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan1) + MCFG_SCREEN_EOF(toaplan1) MCFG_GFXDECODE(toaplan1) MCFG_PALETTE_LENGTH((64*16)+(64*16)) MCFG_VIDEO_START(toaplan1) - MCFG_VIDEO_EOF(toaplan1) - MCFG_VIDEO_UPDATE(toaplan1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1613,13 +1613,13 @@ static MACHINE_CONFIG_START( hellfire, toaplan1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) /* 512x240 active */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 16, 255) + MCFG_SCREEN_UPDATE(toaplan1) + MCFG_SCREEN_EOF(toaplan1) MCFG_GFXDECODE(toaplan1) MCFG_PALETTE_LENGTH((64*16)+(64*16)) MCFG_VIDEO_START(toaplan1) - MCFG_VIDEO_EOF(toaplan1) - MCFG_VIDEO_UPDATE(toaplan1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1653,13 +1653,13 @@ static MACHINE_CONFIG_START( zerowing, toaplan1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) /* 512x240 mostly active, 512x512 actually used */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 16, 255) + MCFG_SCREEN_UPDATE(toaplan1) + MCFG_SCREEN_EOF(toaplan1) MCFG_GFXDECODE(toaplan1) MCFG_PALETTE_LENGTH((64*16)+(64*16)) MCFG_VIDEO_START(toaplan1) - MCFG_VIDEO_EOF(toaplan1) - MCFG_VIDEO_UPDATE(toaplan1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1697,13 +1697,13 @@ static MACHINE_CONFIG_START( demonwld, toaplan1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) /* 512x240 active */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 16, 255) + MCFG_SCREEN_UPDATE(toaplan1) + MCFG_SCREEN_EOF(toaplan1) MCFG_GFXDECODE(toaplan1) MCFG_PALETTE_LENGTH((64*16)+(64*16)) MCFG_VIDEO_START(toaplan1) - MCFG_VIDEO_EOF(toaplan1) - MCFG_VIDEO_UPDATE(toaplan1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1735,13 +1735,13 @@ static MACHINE_CONFIG_START( samesame, toaplan1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) /* 512x320 active */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan1) + MCFG_SCREEN_EOF(samesame) MCFG_GFXDECODE(toaplan1) MCFG_PALETTE_LENGTH((64*16)+(64*16)) MCFG_VIDEO_START(toaplan1) - MCFG_VIDEO_EOF(samesame) - MCFG_VIDEO_UPDATE(toaplan1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1775,13 +1775,13 @@ static MACHINE_CONFIG_START( outzone, toaplan1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) /* 512x256 active */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan1) + MCFG_SCREEN_EOF(toaplan1) MCFG_GFXDECODE(outzone) MCFG_PALETTE_LENGTH((64*16)+(64*16)) MCFG_VIDEO_START(toaplan1) - MCFG_VIDEO_EOF(toaplan1) - MCFG_VIDEO_UPDATE(toaplan1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1813,14 +1813,14 @@ static MACHINE_CONFIG_START( vimana, toaplan1_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) /* 512x256 active */ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan1) + MCFG_SCREEN_EOF(toaplan1) MCFG_GFXDECODE(vm) MCFG_PALETTE_LENGTH((64*16)+(64*16)) MCFG_VIDEO_START(toaplan1) - MCFG_VIDEO_EOF(toaplan1) - MCFG_VIDEO_UPDATE(toaplan1) - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index ce1b624b176..e2b02ced30d 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -3168,17 +3168,15 @@ static MACHINE_CONFIG_START( tekipaki, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(toaplan2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) - MCFG_DEVICE_ADD_VDP0 - MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3211,6 +3209,8 @@ static MACHINE_CONFIG_START( ghox, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(toaplan2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3218,8 +3218,6 @@ static MACHINE_CONFIG_START( ghox, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3302,6 +3300,8 @@ static MACHINE_CONFIG_START( dogyuun, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(dogyuun) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(t2dualvdp) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3310,8 +3310,6 @@ static MACHINE_CONFIG_START( dogyuun, toaplan2_state ) MCFG_DEVICE_ADD_VDP1 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(dogyuun) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3344,6 +3342,8 @@ static MACHINE_CONFIG_START( kbash, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(toaplan2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3351,8 +3351,6 @@ static MACHINE_CONFIG_START( kbash, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3382,6 +3380,8 @@ static MACHINE_CONFIG_START( kbash2, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(toaplan2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3389,8 +3389,6 @@ static MACHINE_CONFIG_START( kbash2, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3420,6 +3418,8 @@ static MACHINE_CONFIG_START( truxton2, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(truxton2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(truxton2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3427,8 +3427,6 @@ static MACHINE_CONFIG_START( truxton2, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(truxton2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(truxton2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3463,6 +3461,8 @@ static MACHINE_CONFIG_START( pipibibs, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(toaplan2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3470,8 +3470,6 @@ static MACHINE_CONFIG_START( pipibibs, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3504,6 +3502,8 @@ static MACHINE_CONFIG_START( whoopee, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(toaplan2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3511,8 +3511,6 @@ static MACHINE_CONFIG_START( whoopee, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3545,6 +3543,8 @@ static MACHINE_CONFIG_START( pipibibi_bootleg, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(toaplan2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3552,8 +3552,6 @@ static MACHINE_CONFIG_START( pipibibi_bootleg, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3631,6 +3629,8 @@ static MACHINE_CONFIG_START( fixeight, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(truxton2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(truxton2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3638,8 +3638,6 @@ static MACHINE_CONFIG_START( fixeight, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(truxton2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(truxton2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3669,6 +3667,8 @@ static MACHINE_CONFIG_START( fixeighb, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(truxton2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(fixeighb) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3676,8 +3676,6 @@ static MACHINE_CONFIG_START( fixeighb, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(fixeighb) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(truxton2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3708,6 +3706,8 @@ static MACHINE_CONFIG_START( vfive, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_DEVICE_ADD_VDP0 @@ -3715,8 +3715,6 @@ static MACHINE_CONFIG_START( vfive, toaplan2_state ) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3755,6 +3753,8 @@ static MACHINE_CONFIG_START( batsugun, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(batsugun) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(t2dualvdp) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3763,8 +3763,6 @@ static MACHINE_CONFIG_START( batsugun, toaplan2_state ) MCFG_DEVICE_ADD_VDP1 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(batsugun) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3794,6 +3792,8 @@ static MACHINE_CONFIG_START( snowbro2, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(toaplan2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(toaplan2) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3801,8 +3801,6 @@ static MACHINE_CONFIG_START( snowbro2, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(toaplan2) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(toaplan2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3837,6 +3835,8 @@ static MACHINE_CONFIG_START( mahoudai, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(truxton2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(raizing) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3844,8 +3844,6 @@ static MACHINE_CONFIG_START( mahoudai, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(bgaregga) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(truxton2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3880,6 +3878,8 @@ static MACHINE_CONFIG_START( shippumd, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(truxton2) + MCFG_SCREEN_EOF(toaplan2) MCFG_DEVICE_ADD_VDP0 @@ -3887,8 +3887,6 @@ static MACHINE_CONFIG_START( shippumd, toaplan2_state ) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) MCFG_VIDEO_START(bgaregga) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(truxton2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3934,6 +3932,8 @@ static MACHINE_CONFIG_START( bgaregga, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(truxton2) + MCFG_SCREEN_EOF(toaplan2) MCFG_GFXDECODE(raizing) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3941,8 +3941,6 @@ static MACHINE_CONFIG_START( bgaregga, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(bgaregga) - MCFG_VIDEO_EOF(toaplan2) - MCFG_VIDEO_UPDATE(truxton2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3980,6 +3978,7 @@ static MACHINE_CONFIG_START( batrider, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(batrider) MCFG_GFXDECODE(batrider) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -3987,7 +3986,6 @@ static MACHINE_CONFIG_START( batrider, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(batrider) - MCFG_VIDEO_UPDATE(batrider) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4029,6 +4027,7 @@ static MACHINE_CONFIG_START( bbakraid, toaplan2_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(432, 262) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(batrider) MCFG_GFXDECODE(batrider) MCFG_PALETTE_LENGTH(T2PALETTE_LENGTH) @@ -4036,7 +4035,6 @@ static MACHINE_CONFIG_START( bbakraid, toaplan2_state ) MCFG_DEVICE_ADD_VDP0 MCFG_VIDEO_START(batrider) - MCFG_VIDEO_UPDATE(batrider) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index cc241650de6..77e3e774ef9 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -432,13 +432,13 @@ static MACHINE_CONFIG_START( toki, toki_state ) /* KOYO 20.000MHz near the cpu * MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* verified */ + MCFG_SCREEN_UPDATE(toki) + MCFG_SCREEN_EOF(toki) MCFG_GFXDECODE(toki) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(toki) - MCFG_VIDEO_EOF(toki) - MCFG_VIDEO_UPDATE(toki) /* sound hardware */ SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_14_31818MHz/4,XTAL_12MHz/12) /* verifed on pcb */ @@ -463,13 +463,13 @@ static MACHINE_CONFIG_START( tokib, toki_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* verified */ + MCFG_SCREEN_UPDATE(tokib) + MCFG_SCREEN_EOF(tokib) MCFG_GFXDECODE(tokib) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(toki) - MCFG_VIDEO_EOF(tokib) - MCFG_VIDEO_UPDATE(tokib) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tokyocop.c b/src/mame/drivers/tokyocop.c index aac4ae203ec..c71fd5d1676 100644 --- a/src/mame/drivers/tokyocop.c +++ b/src/mame/drivers/tokyocop.c @@ -23,7 +23,7 @@ static VIDEO_START(tokyocop) { } -static VIDEO_UPDATE(tokyocop) +static SCREEN_UPDATE(tokyocop) { return 0; } @@ -48,11 +48,11 @@ static MACHINE_CONFIG_START( tokyocop, driver_device ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(tokyocop) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(tokyocop) - MCFG_VIDEO_UPDATE(tokyocop) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index 3b5a6d7ff0b..634500a6558 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -414,9 +414,9 @@ static MACHINE_CONFIG_START( tomcat, tomcat_state ) //MCFG_SCREEN_REFRESH_RATE((double)XTAL_12MHz / 16 / 16 / 16 / 12 / 5 ) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 280, 0, 250) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(avg_tomcat) - MCFG_VIDEO_UPDATE(vector) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("pokey1", POKEY, XTAL_14_31818MHz / 8) diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c index e2788b72ae6..7b847254c48 100644 --- a/src/mame/drivers/toobin.c +++ b/src/mame/drivers/toobin.c @@ -240,12 +240,12 @@ static MACHINE_CONFIG_START( toobin, toobin_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 640, 0, 512, 416, 0, 384) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) + MCFG_SCREEN_UPDATE(toobin) MCFG_GFXDECODE(toobin) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(toobin) - MCFG_VIDEO_UPDATE(toobin) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_i_stereo_pokey) diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 24dc2785d78..aeaaec2059f 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -719,12 +719,11 @@ static MACHINE_CONFIG_START( topspeed, topspeed_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(topspeed) MCFG_GFXDECODE(topspeed) MCFG_PALETTE_LENGTH(8192) - MCFG_VIDEO_UPDATE(topspeed) - MCFG_PC080SN_ADD("pc080sn_1", topspeed_pc080sn_intf) MCFG_PC080SN_ADD("pc080sn_2", topspeed_pc080sn_intf) diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c index e852bbab57c..b19ccdd5ae5 100644 --- a/src/mame/drivers/toratora.c +++ b/src/mame/drivers/toratora.c @@ -65,7 +65,7 @@ static WRITE_LINE_DEVICE_HANDLER( cb2_u3_w ) * *************************************/ -static VIDEO_UPDATE( toratora ) +static SCREEN_UPDATE( toratora ) { toratora_state *state = screen->machine->driver_data<toratora_state>(); offs_t offs; @@ -409,14 +409,13 @@ static MACHINE_CONFIG_START( toratora, toratora_state ) MCFG_MACHINE_RESET(toratora) /* video hardware */ - MCFG_VIDEO_UPDATE(toratora) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0,256-1,8,248-1) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_UPDATE(toratora) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c index 7ebdf9187b0..2e691fea969 100644 --- a/src/mame/drivers/tourtabl.c +++ b/src/mame/drivers/tourtabl.c @@ -179,12 +179,12 @@ static MACHINE_CONFIG_START( tourtabl, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS( MASTER_CLOCK, 228, 34, 34 + 160, 262, 46, 46 + 200 ) + MCFG_SCREEN_UPDATE(tia) MCFG_PALETTE_LENGTH(TIA_PALETTE_LENGTH) MCFG_PALETTE_INIT(tia_NTSC) MCFG_VIDEO_START(tia) - MCFG_VIDEO_UPDATE(tia) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index 0321a03bf32..c9868e63946 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -573,13 +573,13 @@ static MACHINE_CONFIG_START( liblrabl, toypop_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(toypop) MCFG_GFXDECODE(toypop) MCFG_PALETTE_LENGTH(128*4+64*4+16*2) MCFG_PALETTE_INIT(toypop) MCFG_VIDEO_START(toypop) - MCFG_VIDEO_UPDATE(toypop) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index 54233f09f15..614d45cc937 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -301,13 +301,13 @@ static MACHINE_CONFIG_START( tp84, tp84_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tp84) MCFG_GFXDECODE(tp84) MCFG_PALETTE_LENGTH(4096) MCFG_PALETTE_INIT(tp84) MCFG_VIDEO_START(tp84) - MCFG_VIDEO_UPDATE(tp84) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index e11e39764a6..2eb6a38b9e8 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -903,13 +903,13 @@ static MACHINE_CONFIG_START( trackfld, trackfld_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(trackfld) MCFG_GFXDECODE(trackfld) MCFG_PALETTE_LENGTH(16*16+16*16) MCFG_PALETTE_INIT(trackfld) MCFG_VIDEO_START(trackfld) - MCFG_VIDEO_UPDATE(trackfld) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -949,13 +949,13 @@ static MACHINE_CONFIG_START( yieartf, trackfld_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(trackfld) MCFG_GFXDECODE(trackfld) MCFG_PALETTE_LENGTH(16*16+16*16) MCFG_PALETTE_INIT(trackfld) MCFG_VIDEO_START(trackfld) - MCFG_VIDEO_UPDATE(trackfld) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index 5f5d7934695..07f2a034aae 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -315,6 +315,7 @@ static MACHINE_CONFIG_START( travrusa, travrusa_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(travrusa) MCFG_GFXDECODE(travrusa) @@ -322,7 +323,6 @@ static MACHINE_CONFIG_START( travrusa, travrusa_state ) MCFG_PALETTE_INIT(travrusa) MCFG_VIDEO_START(travrusa) - MCFG_VIDEO_UPDATE(travrusa) /* sound hardware */ MCFG_FRAGMENT_ADD(m52_sound_c_audio) diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c index 781301a57d1..af6a8d3cfaa 100644 --- a/src/mame/drivers/triforce.c +++ b/src/mame/drivers/triforce.c @@ -410,7 +410,7 @@ static VIDEO_START(triforce) } -static VIDEO_UPDATE(triforce) +static SCREEN_UPDATE(triforce) { return 0; } @@ -432,11 +432,11 @@ static MACHINE_CONFIG_START( triforce_base, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) + MCFG_SCREEN_UPDATE(triforce) MCFG_PALETTE_LENGTH(65536) MCFG_VIDEO_START(triforce) - MCFG_VIDEO_UPDATE(triforce) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( triforcegd, triforce_base ) diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c index bc5629b7c78..7531b798b7b 100644 --- a/src/mame/drivers/triplhnt.c +++ b/src/mame/drivers/triplhnt.c @@ -324,12 +324,12 @@ static MACHINE_CONFIG_START( triplhnt, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 262) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) + MCFG_SCREEN_UPDATE(triplhnt) MCFG_GFXDECODE(triplhnt) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(triplhnt) MCFG_VIDEO_START(triplhnt) - MCFG_VIDEO_UPDATE(triplhnt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c index 23e06f5d688..57aab7ab610 100644 --- a/src/mame/drivers/truco.c +++ b/src/mame/drivers/truco.c @@ -149,11 +149,10 @@ static MACHINE_CONFIG_START( truco, truco_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 192) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1) + MCFG_SCREEN_UPDATE(truco) MCFG_PALETTE_LENGTH(16) - MCFG_PALETTE_INIT(truco) - MCFG_VIDEO_UPDATE(truco) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c index 1008e4f8cc0..7d9f42093bc 100644 --- a/src/mame/drivers/trucocl.c +++ b/src/mame/drivers/trucocl.c @@ -140,13 +140,13 @@ static MACHINE_CONFIG_START( trucocl, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(trucocl) MCFG_GFXDECODE(trucocl) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(trucocl) MCFG_VIDEO_START(trucocl) - MCFG_VIDEO_UPDATE(trucocl) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index f0f8c4327a1..d6b2cee97a9 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -271,7 +271,7 @@ static VIDEO_START( trvmadns ) gfx_element_set_source(machine->gfx[0], trvmadns_gfxram); } -static VIDEO_UPDATE( trvmadns ) +static SCREEN_UPDATE( trvmadns ) { int x,y,count; const gfx_element *gfx = screen->machine->gfx[0]; @@ -337,12 +337,12 @@ static MACHINE_CONFIG_START( trvmadns, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(trvmadns) MCFG_GFXDECODE(trvmadns) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(trvmadns) - MCFG_VIDEO_UPDATE(trvmadns) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index 85da8e426ed..a4f862a3724 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -201,13 +201,13 @@ static MACHINE_CONFIG_START( tryout, tryout_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(tryout) MCFG_GFXDECODE(tryout) MCFG_PALETTE_LENGTH(0x20) MCFG_PALETTE_INIT(tryout) MCFG_VIDEO_START(tryout) - MCFG_VIDEO_UPDATE(tryout) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c index 2dfd6d23751..b2e3c878d70 100644 --- a/src/mame/drivers/tsamurai.c +++ b/src/mame/drivers/tsamurai.c @@ -669,13 +669,13 @@ static MACHINE_CONFIG_START( tsamurai, tsamurai_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) + MCFG_SCREEN_UPDATE(tsamurai) MCFG_GFXDECODE(tsamurai) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(tsamurai) - MCFG_VIDEO_UPDATE(tsamurai) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -717,13 +717,13 @@ static MACHINE_CONFIG_START( m660, tsamurai_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) + MCFG_SCREEN_UPDATE(tsamurai) MCFG_GFXDECODE(tsamurai) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(tsamurai) - MCFG_VIDEO_UPDATE(tsamurai) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -758,13 +758,13 @@ static MACHINE_CONFIG_START( vsgongf, tsamurai_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) + MCFG_SCREEN_UPDATE(vsgongf) MCFG_GFXDECODE(tsamurai) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(vsgongf) - MCFG_VIDEO_UPDATE(vsgongf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 3c8f1094f9d..7007fa0a975 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -51,7 +51,7 @@ static VIDEO_START(ttchamp) { } -static VIDEO_UPDATE(ttchamp) +static SCREEN_UPDATE(ttchamp) { int y,x,count; // int i; @@ -236,11 +236,11 @@ static MACHINE_CONFIG_START( ttchamp, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(1024,1024) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) + MCFG_SCREEN_UPDATE(ttchamp) MCFG_PALETTE_LENGTH(0x8000) MCFG_VIDEO_START(ttchamp) - MCFG_VIDEO_UPDATE(ttchamp) MACHINE_CONFIG_END ROM_START( ttchamp ) diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c index 0f9dbd3df1f..d9592548a6f 100644 --- a/src/mame/drivers/tubep.c +++ b/src/mame/drivers/tubep.c @@ -921,13 +921,13 @@ static MACHINE_CONFIG_START( tubep, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 264) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(tubep) MCFG_PALETTE_LENGTH(32 + 256*64) MCFG_PALETTE_INIT(tubep) MCFG_VIDEO_START(tubep) MCFG_VIDEO_RESET(tubep) - MCFG_VIDEO_UPDATE(tubep) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -982,13 +982,13 @@ static MACHINE_CONFIG_START( rjammer, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 264) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(rjammer) MCFG_PALETTE_LENGTH(64) MCFG_PALETTE_INIT(rjammer) MCFG_VIDEO_START(tubep) MCFG_VIDEO_RESET(tubep) - MCFG_VIDEO_UPDATE(rjammer) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 6e5608ebdbb..575f09eb14d 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -115,7 +115,7 @@ static void draw_tilemap(running_machine *machine, bitmap_t *bitmap,const rectan } } -static VIDEO_UPDATE( tugboat ) +static SCREEN_UPDATE( tugboat ) { int startaddr0 = hd46505_0_reg[0x0c]*256 + hd46505_0_reg[0x0d]; int startaddr1 = hd46505_1_reg[0x0c]*256 + hd46505_1_reg[0x0d]; @@ -328,12 +328,12 @@ static MACHINE_CONFIG_START( tugboat, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8,32*8) MCFG_SCREEN_VISIBLE_AREA(1*8,31*8-1,2*8,30*8-1) + MCFG_SCREEN_UPDATE(tugboat) MCFG_GFXDECODE(tugboat) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(tugboat) - MCFG_VIDEO_UPDATE(tugboat) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 4858c0109e0..6cee48fcfec 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -2089,12 +2089,12 @@ static MACHINE_CONFIG_START( tumblepb, tumbleb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(tumblepb) MCFG_GFXDECODE(tumbleb) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(tumblepb) - MCFG_VIDEO_UPDATE(tumblepb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2121,12 +2121,12 @@ static MACHINE_CONFIG_START( tumbleb2, tumbleb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(tumblepb) MCFG_GFXDECODE(tumbleb) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(tumblepb) - MCFG_VIDEO_UPDATE(tumblepb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2156,12 +2156,12 @@ static MACHINE_CONFIG_START( jumpkids, tumbleb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(jumpkids) MCFG_GFXDECODE(tumbleb) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(tumblepb) - MCFG_VIDEO_UPDATE(jumpkids) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2187,12 +2187,12 @@ static MACHINE_CONFIG_START( fncywld, tumbleb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(fncywld) MCFG_GFXDECODE(fncywld) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(fncywld) - MCFG_VIDEO_UPDATE(fncywld) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2254,12 +2254,12 @@ static MACHINE_CONFIG_START( htchctch, tumbleb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(semicom) MCFG_GFXDECODE(tumbleb) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(tumblepb) - MCFG_VIDEO_UPDATE(semicom) /* sound hardware - same as hyperpac */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2275,7 +2275,8 @@ static MACHINE_CONFIG_START( htchctch, tumbleb_state ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cookbib, htchctch ) - MCFG_VIDEO_UPDATE( semicom_altoffsets ) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE( semicom_altoffsets ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cookbib_mcu, htchctch ) @@ -2286,11 +2287,13 @@ static MACHINE_CONFIG_DERIVED( cookbib_mcu, htchctch ) MCFG_CPU_IO_MAP(protection_iomap) /* video hardware */ - MCFG_VIDEO_UPDATE( semicom_altoffsets ) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE( semicom_altoffsets ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bcstory, htchctch ) - MCFG_VIDEO_UPDATE(bcstory) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(bcstory) MCFG_SOUND_REPLACE("ymsnd", YM2151, 3427190) MCFG_SOUND_CONFIG(semicom_ym2151_interface) @@ -2299,12 +2302,14 @@ static MACHINE_CONFIG_DERIVED( bcstory, htchctch ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( semibase, bcstory ) - MCFG_VIDEO_UPDATE(semibase ) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(semibase ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( sdfight, bcstory ) MCFG_VIDEO_START(sdfight) - MCFG_VIDEO_UPDATE(sdfight) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(sdfight) MACHINE_CONFIG_END @@ -2338,12 +2343,12 @@ static MACHINE_CONFIG_START( jumppop, tumbleb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(jumppop) MCFG_GFXDECODE(jumppop) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(jumppop) - MCFG_VIDEO_UPDATE(jumppop) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2376,12 +2381,12 @@ static MACHINE_CONFIG_START( suprtrio, tumbleb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8-1, 31*8-2) + MCFG_SCREEN_UPDATE(suprtrio) MCFG_GFXDECODE(suprtrio) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(suprtrio) - MCFG_VIDEO_UPDATE(suprtrio) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2408,12 +2413,12 @@ static MACHINE_CONFIG_START( pangpang, tumbleb_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(pangpang) MCFG_GFXDECODE(tumbleb) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(pangpang) - MCFG_VIDEO_UPDATE(pangpang) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 04ad7a052c5..d49c20c21fd 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -322,12 +322,11 @@ static MACHINE_CONFIG_START( tumblep, tumblep_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-2, 1*8, 31*8-1) // hmm + MCFG_SCREEN_UPDATE(tumblep) MCFG_GFXDECODE(tumblep) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_UPDATE(tumblep) - MCFG_DECO16IC_ADD("deco_custom", tumblep_deco16ic_intf) /* sound hardware */ diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c index 9d20a421a3b..657495548ca 100644 --- a/src/mame/drivers/tunhunt.c +++ b/src/mame/drivers/tunhunt.c @@ -315,13 +315,13 @@ static MACHINE_CONFIG_START( tunhunt, tunhunt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256-16) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 255-16) + MCFG_SCREEN_UPDATE(tunhunt) MCFG_GFXDECODE(tunhunt) MCFG_PALETTE_LENGTH(0x1a) MCFG_PALETTE_INIT(tunhunt) MCFG_VIDEO_START(tunhunt) - MCFG_VIDEO_UPDATE(tunhunt) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c index ad72ebe8d08..f47b03babc5 100644 --- a/src/mame/drivers/turbo.c +++ b/src/mame/drivers/turbo.c @@ -1094,10 +1094,10 @@ static MACHINE_CONFIG_START( turbo, turbo_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(turbo) MCFG_PALETTE_INIT(turbo) MCFG_VIDEO_START(turbo) - MCFG_VIDEO_UPDATE(turbo) /* sound hardware */ MCFG_FRAGMENT_ADD(turbo_samples) @@ -1122,10 +1122,10 @@ static MACHINE_CONFIG_START( subroc3d, turbo_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(subroc3d) MCFG_PALETTE_INIT(subroc3d) MCFG_VIDEO_START(turbo) - MCFG_VIDEO_UPDATE(subroc3d) /* sound hardware */ MCFG_FRAGMENT_ADD(subroc3d_samples) @@ -1157,10 +1157,10 @@ static MACHINE_CONFIG_START( buckrog, turbo_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(buckrog) MCFG_PALETTE_INIT(buckrog) MCFG_VIDEO_START(buckrog) - MCFG_VIDEO_UPDATE(buckrog) /* sound hardware */ MCFG_FRAGMENT_ADD(buckrog_samples) diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c index be7f515fcb8..887a0b97916 100644 --- a/src/mame/drivers/turrett.c +++ b/src/mame/drivers/turrett.c @@ -69,7 +69,7 @@ static VIDEO_START(turrett) } -static VIDEO_UPDATE(turrett) +static SCREEN_UPDATE(turrett) { return 0; } @@ -116,11 +116,11 @@ static MACHINE_CONFIG_START( turrett, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(turrett) MCFG_PALETTE_LENGTH(0x2000) MCFG_VIDEO_START(turrett) - MCFG_VIDEO_UPDATE(turrett) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index 38db2f9470a..46d1ef8a770 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -236,8 +236,7 @@ static MACHINE_CONFIG_START( tutankhm, tutankhm_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* not sure about the visible area */ - - MCFG_VIDEO_UPDATE(tutankhm) + MCFG_SCREEN_UPDATE(tutankhm) /* sound hardware */ MCFG_FRAGMENT_ADD(timeplt_sound) diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index 84b9c9fd4e6..6709ec487c9 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -750,13 +750,13 @@ static MACHINE_CONFIG_START( twin16, twin16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(twin16) + MCFG_SCREEN_EOF(twin16) MCFG_GFXDECODE(twin16) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(twin16) - MCFG_VIDEO_UPDATE(twin16) - MCFG_VIDEO_EOF(twin16) // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -804,13 +804,13 @@ static MACHINE_CONFIG_START( fround, twin16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(twin16) + MCFG_SCREEN_EOF(twin16) MCFG_GFXDECODE(twin16) MCFG_PALETTE_LENGTH(0x400) MCFG_VIDEO_START(twin16) - MCFG_VIDEO_UPDATE(twin16) - MCFG_VIDEO_EOF(twin16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index 37648845c58..c00a83f5af6 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -584,13 +584,13 @@ static MACHINE_CONFIG_START( twincobr, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz/4, 446, 0, 320, 286, 0, 240) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(toaplan0) + MCFG_SCREEN_EOF(toaplan0) MCFG_GFXDECODE(twincobr) MCFG_PALETTE_LENGTH(1792) MCFG_VIDEO_START(toaplan0) - MCFG_VIDEO_EOF(toaplan0) - MCFG_VIDEO_UPDATE(toaplan0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c index ac0be644a03..53194b40e11 100644 --- a/src/mame/drivers/twinkle.c +++ b/src/mame/drivers/twinkle.c @@ -941,12 +941,12 @@ static MACHINE_CONFIG_START( twinkle, twinkle_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 1024 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type2 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("speakerleft", "speakerright") diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c index f68842b5134..1131362f6e9 100644 --- a/src/mame/drivers/twins.c +++ b/src/mame/drivers/twins.c @@ -110,7 +110,7 @@ static VIDEO_START(twins) state->pal = auto_alloc_array(machine, UINT16, 0x100); } -static VIDEO_UPDATE(twins) +static SCREEN_UPDATE(twins) { twins_state *state = screen->machine->driver_data<twins_state>(); int y,x,count; @@ -194,11 +194,11 @@ static MACHINE_CONFIG_START( twins, twins_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320,256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) + MCFG_SCREEN_UPDATE(twins) MCFG_PALETTE_LENGTH(0x100) MCFG_VIDEO_START(twins) - MCFG_VIDEO_UPDATE(twins) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -217,7 +217,7 @@ static VIDEO_START(twinsa) state->pal = auto_alloc_array(machine, UINT16, 0x1000); } -static VIDEO_UPDATE(twinsa) +static SCREEN_UPDATE(twinsa) { twins_state *state = screen->machine->driver_data<twins_state>(); int y,x,count; @@ -285,11 +285,11 @@ static MACHINE_CONFIG_START( twinsa, twins_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320,256) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) + MCFG_SCREEN_UPDATE(twinsa) MCFG_PALETTE_LENGTH(0x1000) MCFG_VIDEO_START(twinsa) - MCFG_VIDEO_UPDATE(twinsa) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c index c2416f18b9c..7333ccc0e05 100644 --- a/src/mame/drivers/tx1.c +++ b/src/mame/drivers/tx1.c @@ -721,24 +721,26 @@ static MACHINE_CONFIG_START( tx1, driver_device ) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(tx1) - MCFG_VIDEO_EOF(tx1) MCFG_DEFAULT_LAYOUT(layout_triphsxs) MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART) + MCFG_SCREEN_UPDATE(tx1) MCFG_SCREEN_ADD("cscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART) + MCFG_SCREEN_UPDATE(tx1) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART) + MCFG_SCREEN_UPDATE(tx1) + MCFG_SCREEN_EOF(tx1) MCFG_VIDEO_START(tx1) - MCFG_VIDEO_UPDATE(tx1) MCFG_SPEAKER_STANDARD_STEREO("frontleft", "frontright") // MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright") @@ -777,20 +779,22 @@ static MACHINE_CONFIG_START( buggyboy, driver_device ) MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART) + MCFG_SCREEN_UPDATE(buggyboy) MCFG_SCREEN_ADD("cscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART) + MCFG_SCREEN_UPDATE(buggyboy) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART) + MCFG_SCREEN_UPDATE(buggyboy) + MCFG_SCREEN_EOF(buggyboy) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(buggyboy) MCFG_VIDEO_START(buggyboy) - MCFG_VIDEO_UPDATE(buggyboy) - MCFG_VIDEO_EOF(buggyboy) MCFG_SPEAKER_STANDARD_STEREO("frontleft", "frontright") // MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright") @@ -827,14 +831,13 @@ static MACHINE_CONFIG_START( buggybjr, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART) + MCFG_SCREEN_UPDATE(buggybjr) + MCFG_SCREEN_EOF(buggyboy) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(buggyboy) MCFG_VIDEO_START(buggybjr) - MCFG_VIDEO_UPDATE(buggybjr) - MCFG_VIDEO_EOF(buggyboy) MCFG_SPEAKER_STANDARD_STEREO("frontleft", "frontright") // MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright") diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index e4954932f8f..1225b709a22 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -202,13 +202,13 @@ static MACHINE_CONFIG_START( uapce, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242) + MCFG_SCREEN_UPDATE( pce ) /* MCFG_GFXDECODE( pce_gfxdecodeinfo ) */ MCFG_PALETTE_LENGTH(1024) MCFG_PALETTE_INIT( vce ) MCFG_VIDEO_START( pce ) - MCFG_VIDEO_UPDATE( pce ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6) diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 71b9c3883c6..be0d86579eb 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -241,11 +241,11 @@ static MACHINE_CONFIG_START( ultraman, ultraman_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(ultraman) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(ultraman) - MCFG_VIDEO_UPDATE(ultraman) MCFG_K051960_ADD("k051960", ultraman_k051960_intf) MCFG_K051316_ADD("k051316_1", ultraman_k051316_intf_0) diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c index 3e25cfe593b..64e1ac36889 100644 --- a/src/mame/drivers/ultratnk.c +++ b/src/mame/drivers/ultratnk.c @@ -305,14 +305,14 @@ static MACHINE_CONFIG_START( ultratnk, ultratnk_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, 256, VTOTAL, 0, 224) + MCFG_SCREEN_UPDATE(ultratnk) + MCFG_SCREEN_EOF(ultratnk) MCFG_GFXDECODE(ultratnk) MCFG_PALETTE_LENGTH(10) MCFG_PALETTE_INIT(ultratnk) MCFG_VIDEO_START(ultratnk) - MCFG_VIDEO_UPDATE(ultratnk) - MCFG_VIDEO_EOF(ultratnk) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index 6bafff7b6d8..4be517961e6 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -30,7 +30,7 @@ public: -static VIDEO_UPDATE( ultrsprt ) +static SCREEN_UPDATE( ultrsprt ) { ultrsprt_state *state = screen->machine->driver_data<ultrsprt_state>(); int i, j; @@ -235,11 +235,10 @@ static MACHINE_CONFIG_START( ultrsprt, ultrsprt_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 400) MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 399) + MCFG_SCREEN_UPDATE(ultrsprt) MCFG_PALETTE_LENGTH(8192) - MCFG_VIDEO_UPDATE(ultrsprt) - /* sound hardware */ MCFG_K056800_ADD("k056800", ultrsprt_k056800_interface) diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index d51ca5faf85..eee42cd4ee6 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -732,12 +732,12 @@ static MACHINE_CONFIG_START( undrfire, undrfire_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*8, 32*8-1) + MCFG_SCREEN_UPDATE(undrfire) MCFG_GFXDECODE(undrfire) MCFG_PALETTE_LENGTH(16384) MCFG_VIDEO_START(undrfire) - MCFG_VIDEO_UPDATE(undrfire) MCFG_TC0100SCN_ADD("tc0100scn", undrfire_tc0100scn_intf) MCFG_TC0480SCP_ADD("tc0480scp", undrfire_tc0480scp_intf) @@ -769,12 +769,12 @@ static MACHINE_CONFIG_START( cbombers, undrfire_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*8, 32*8-1) + MCFG_SCREEN_UPDATE(cbombers) MCFG_GFXDECODE(cbombers) MCFG_PALETTE_LENGTH(16384) MCFG_VIDEO_START(undrfire) - MCFG_VIDEO_UPDATE(cbombers) MCFG_TC0100SCN_ADD("tc0100scn", undrfire_tc0100scn_intf) MCFG_TC0480SCP_ADD("tc0480scp", undrfire_tc0480scp_intf) diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index 4bdb971aacc..4052eea5a34 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -617,12 +617,12 @@ static MACHINE_CONFIG_START( burglarx, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x180, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(unico) MCFG_GFXDECODE(unico) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(unico) - MCFG_VIDEO_UPDATE(unico) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -663,12 +663,12 @@ static MACHINE_CONFIG_START( zeropnt, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x180, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(unico) MCFG_GFXDECODE(unico) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(unico) - MCFG_VIDEO_UPDATE(unico) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -706,12 +706,12 @@ static MACHINE_CONFIG_START( zeropnt2, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x180, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(zeropnt2) MCFG_GFXDECODE(unico) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(zeropnt2) - MCFG_VIDEO_UPDATE(zeropnt2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c index 61c459f15ba..4a05e76841f 100644 --- a/src/mame/drivers/upscope.c +++ b/src/mame/drivers/upscope.c @@ -330,12 +330,12 @@ static MACHINE_CONFIG_START( upscope, upscope_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512*2, 262) MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1) + MCFG_SCREEN_UPDATE(amiga) MCFG_PALETTE_LENGTH(4096) MCFG_PALETTE_INIT(amiga) MCFG_VIDEO_START(amiga) - MCFG_VIDEO_UPDATE(amiga) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c index 1ce01e5f367..6dc5792b668 100644 --- a/src/mame/drivers/usgames.c +++ b/src/mame/drivers/usgames.c @@ -245,13 +245,13 @@ static MACHINE_CONFIG_START( usg32, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(7*8, 57*8-1, 0*8, 31*8-1) + MCFG_SCREEN_UPDATE(usgames) MCFG_GFXDECODE(usgames) MCFG_PALETTE_LENGTH(2*256) MCFG_PALETTE_INIT(usgames) MCFG_VIDEO_START(usgames) - MCFG_VIDEO_UPDATE(usgames) MCFG_MC6845_ADD("crtc", MC6845, XTAL_18MHz / 16, mc6845_intf) diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index e9da285e089..1480f2eb669 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -492,14 +492,14 @@ static void draw_sprites_aoh(screen_device *screen, bitmap_t *bitmap) } -static VIDEO_UPDATE( common ) +static SCREEN_UPDATE( common ) { bitmap_fill(bitmap,cliprect,0); draw_sprites(screen, bitmap); return 0; } -static VIDEO_UPDATE( aoh ) +static SCREEN_UPDATE( aoh ) { bitmap_fill(bitmap,cliprect,0); draw_sprites_aoh(screen, bitmap); @@ -648,11 +648,10 @@ static MACHINE_CONFIG_START( common, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(31, 350, 16, 255) + MCFG_SCREEN_UPDATE(common) MCFG_PALETTE_LENGTH(0x8000) MCFG_GFXDECODE(vamphalf) - - MCFG_VIDEO_UPDATE(common) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( sound_ym_oki ) @@ -779,12 +778,11 @@ static MACHINE_CONFIG_START( aoh, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(64, 511-64, 16, 255-16) + MCFG_SCREEN_UPDATE(aoh) MCFG_PALETTE_LENGTH(0x8000) MCFG_GFXDECODE(vamphalf) - MCFG_VIDEO_UPDATE(aoh) - /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index ce382a636e4..0a1bfbfc3a8 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -271,10 +271,10 @@ static MACHINE_CONFIG_START( vaportra, vaportra_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) + MCFG_SCREEN_UPDATE(vaportra) MCFG_GFXDECODE(vaportra) MCFG_PALETTE_LENGTH(1280) - MCFG_VIDEO_UPDATE(vaportra) MCFG_DECO16IC_ADD("deco_custom", vaportra_deco16ic_intf) diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index c8ec8c7b16e..564a4a54756 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -316,13 +316,13 @@ static MACHINE_CONFIG_START( vastar, vastar_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(vastar) MCFG_GFXDECODE(vastar) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(RRRR_GGGG_BBBB) MCFG_VIDEO_START(vastar) - MCFG_VIDEO_UPDATE(vastar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index 6bedff8f0bc..fad54b99e8d 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -430,12 +430,12 @@ static MACHINE_CONFIG_START( vball, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 8, 248) /* based on ddragon driver */ + MCFG_SCREEN_UPDATE(vb) MCFG_GFXDECODE(vb) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(vb) - MCFG_VIDEO_UPDATE(vb) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c index b5f211429a1..10aa8a01f2b 100644 --- a/src/mame/drivers/vcombat.c +++ b/src/mame/drivers/vcombat.c @@ -100,7 +100,7 @@ static UINT16* vid_1_shared_RAM; static int crtc_select; -static VIDEO_UPDATE( vcombat ) +static SCREEN_UPDATE( vcombat ) { int y; const rgb_t *const pens = tlc34076_get_pens(screen->machine->device("tlc34076")); @@ -583,12 +583,12 @@ static MACHINE_CONFIG_START( vcombat, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz / 2, 400, 0, 256, 291, 0, 208) - + MCFG_SCREEN_UPDATE(vcombat) + MCFG_SCREEN_ADD("aux", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz / 2, 400, 0, 256, 291, 0, 208) - - MCFG_VIDEO_UPDATE(vcombat) + MCFG_SCREEN_UPDATE(vcombat) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -620,8 +620,7 @@ static MACHINE_CONFIG_START( shadfgtr, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz / 4, 320, 0, 256, 277, 0, 224) - - MCFG_VIDEO_UPDATE(vcombat) + MCFG_SCREEN_UPDATE(vcombat) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c index ea41afda458..37e9045eff0 100644 --- a/src/mame/drivers/vega.c +++ b/src/mame/drivers/vega.c @@ -30,7 +30,7 @@ static PALETTE_INIT(vega) } -static VIDEO_UPDATE(vega) +static SCREEN_UPDATE(vega) { return 0; } @@ -46,11 +46,11 @@ static MACHINE_CONFIG_START( vega, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(vega) MCFG_PALETTE_LENGTH(0x100) MCFG_PALETTE_INIT(vega) - MCFG_VIDEO_UPDATE(vega) MACHINE_CONFIG_END ROM_START( vega ) diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c index 81cd2812c65..0671624173a 100644 --- a/src/mame/drivers/vegaeo.c +++ b/src/mame/drivers/vegaeo.c @@ -147,7 +147,7 @@ static VIDEO_START( vega ) state->vega_vram = auto_alloc_array(machine, UINT32, 0x14000*2/4); } -static VIDEO_UPDATE( vega ) +static SCREEN_UPDATE( vega ) { vegaeo_state *state = screen->machine->driver_data<vegaeo_state>(); int x,y,count; @@ -191,11 +191,11 @@ static MACHINE_CONFIG_START( vega, vegaeo_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(vega) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(vega) - MCFG_VIDEO_UPDATE(vega) /* sound hardware */ MCFG_AT28C16_ADD( "at28c16", NULL ) diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index 4b49542a5df..533c45a993f 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -508,7 +508,7 @@ static void remap_dynamic_addresses(running_machine *machine); * *************************************/ -static VIDEO_UPDATE( vegas ) +static SCREEN_UPDATE( vegas ) { vegas_state *state = screen->machine->driver_data<vegas_state>(); return voodoo_update(state->voodoo, bitmap, cliprect) ? 0 : UPDATE_HAS_NOT_CHANGED; @@ -2279,8 +2279,7 @@ static MACHINE_CONFIG_START( vegascore, vegas_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) - - MCFG_VIDEO_UPDATE(vegas) + MCFG_SCREEN_UPDATE(vegas) MACHINE_CONFIG_END diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index cde28b48758..dc4ab8c141e 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -523,11 +523,10 @@ static MACHINE_CONFIG_START( vendetta, vendetta_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) + MCFG_SCREEN_UPDATE(vendetta) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(vendetta) - MCFG_K052109_ADD("k052109", vendetta_k052109_intf) MCFG_K053246_ADD("k053246", vendetta_k053246_intf) MCFG_K053251_ADD("k053251") diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c index d99104800f2..27e1d7a614a 100644 --- a/src/mame/drivers/vertigo.c +++ b/src/mame/drivers/vertigo.c @@ -132,9 +132,9 @@ static MACHINE_CONFIG_START( vertigo, vertigo_state ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(400, 300) MCFG_SCREEN_VISIBLE_AREA(0, 510, 0, 400) + MCFG_SCREEN_UPDATE(vector) MCFG_VIDEO_START(vector) - MCFG_VIDEO_UPDATE(vector) MACHINE_CONFIG_END diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c index 81eeee8ad62..06b6be14b5a 100644 --- a/src/mame/drivers/vicdual.c +++ b/src/mame/drivers/vicdual.c @@ -311,7 +311,8 @@ static MACHINE_CONFIG_DERIVED( depthch, vicdual_root ) MCFG_CPU_IO_MAP(depthch_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_bw) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_bw) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -398,7 +399,8 @@ static MACHINE_CONFIG_DERIVED( safari, vicdual_root ) MCFG_CPU_IO_MAP(safari_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_bw) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_bw) MACHINE_CONFIG_END @@ -500,7 +502,8 @@ static MACHINE_CONFIG_DERIVED( frogs, vicdual_root ) MCFG_MACHINE_START(frogs_audio) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_bw) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_bw) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -687,7 +690,8 @@ static MACHINE_CONFIG_DERIVED( headon, vicdual_root ) MCFG_CPU_IO_MAP(headon_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_bw_or_color) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_bw_or_color) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -698,7 +702,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( headons, headon ) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_bw) // no colour prom on PCB, must be bw? + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_bw) // no colour prom on PCB, must be bw? MACHINE_CONFIG_END @@ -711,7 +716,8 @@ static MACHINE_CONFIG_DERIVED( sspaceat, vicdual_root ) MCFG_CPU_IO_MAP(sspaceat_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_bw_or_color) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_bw_or_color) MACHINE_CONFIG_END @@ -904,7 +910,8 @@ static MACHINE_CONFIG_DERIVED( headon2, vicdual_root ) MCFG_CPU_IO_MAP(headon2_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_color) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_color) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -916,7 +923,8 @@ static MACHINE_CONFIG_DERIVED( headon2bw, headon2 ) /* basic machine hardware */ /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_bw) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_bw) MACHINE_CONFIG_END @@ -928,7 +936,8 @@ static MACHINE_CONFIG_DERIVED( digger, vicdual_root ) MCFG_CPU_IO_MAP(digger_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_color) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_color) MACHINE_CONFIG_END @@ -1911,7 +1920,8 @@ static MACHINE_CONFIG_DERIVED( vicdual_dualgame_root, vicdual_root ) MCFG_CPU_PROGRAM_MAP(vicdual_dualgame_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_color) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_color) MACHINE_CONFIG_END @@ -2159,7 +2169,8 @@ static MACHINE_CONFIG_DERIVED( samurai, vicdual_root ) MCFG_CPU_IO_MAP(samurai_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_color) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_color) MACHINE_CONFIG_END @@ -2253,7 +2264,8 @@ static MACHINE_CONFIG_DERIVED( nsub, vicdual_root ) MCFG_CPU_IO_MAP(nsub_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_color) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_color) MACHINE_CONFIG_END @@ -2351,7 +2363,8 @@ static MACHINE_CONFIG_DERIVED( invinco, vicdual_root ) MCFG_CPU_IO_MAP(invinco_io_map) /* video hardware */ - MCFG_VIDEO_UPDATE(vicdual_color) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(vicdual_color) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c index 06aff20ddc0..d342d9c6e67 100644 --- a/src/mame/drivers/victory.c +++ b/src/mame/drivers/victory.c @@ -225,11 +225,11 @@ static MACHINE_CONFIG_START( victory, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) /* using the standard Exidy video parameters for now, needs to be confirmed */ MCFG_SCREEN_RAW_PARAMS(VICTORY_PIXEL_CLOCK, VICTORY_HTOTAL, VICTORY_HBEND, VICTORY_HBSTART, VICTORY_VTOTAL, VICTORY_VBEND, VICTORY_VBSTART) + MCFG_SCREEN_UPDATE(victory) MCFG_PALETTE_LENGTH(64) MCFG_VIDEO_START(victory) - MCFG_VIDEO_UPDATE(victory) /* audio hardware */ MCFG_FRAGMENT_ADD(victory_audio) diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c index 7b9732b48c0..a623577f022 100644 --- a/src/mame/drivers/videopin.c +++ b/src/mame/drivers/videopin.c @@ -334,13 +334,13 @@ static MACHINE_CONFIG_START( videopin, videopin_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(304, 263) MCFG_SCREEN_VISIBLE_AREA(0, 303, 0, 255) + MCFG_SCREEN_UPDATE(videopin) MCFG_GFXDECODE(videopin) MCFG_PALETTE_LENGTH(2) MCFG_PALETTE_INIT(black_and_white) MCFG_VIDEO_START(videopin) - MCFG_VIDEO_UPDATE(videopin) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index 41f4484ccf1..8be8d66f687 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -469,7 +469,7 @@ static VIDEO_START( vidadcba ) } -static VIDEO_UPDATE( videopkr ) +static SCREEN_UPDATE( videopkr ) { tilemap_mark_all_tiles_dirty(bg_tilemap); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); @@ -1201,11 +1201,12 @@ static MACHINE_CONFIG_START( videopkr, driver_device ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(2080) + MCFG_SCREEN_UPDATE(videopkr) + MCFG_GFXDECODE(videopkr) MCFG_PALETTE_INIT(videopkr) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(videopkr) - MCFG_VIDEO_UPDATE(videopkr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index c1fafaa74ce..cac0a7df7ef 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -536,13 +536,13 @@ static MACHINE_CONFIG_START( vigilant, vigilant_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(16*8, (64-16)*8-1, 0*8, 32*8-1 ) + MCFG_SCREEN_UPDATE(vigilant) MCFG_GFXDECODE(vigilant) MCFG_PALETTE_LENGTH(512+32) /* 512 real palette, 32 virtual palette */ MCFG_VIDEO_START(vigilant) MCFG_VIDEO_RESET(vigilant) - MCFG_VIDEO_UPDATE(vigilant) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -580,13 +580,13 @@ static MACHINE_CONFIG_START( buccanrs, vigilant_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(16*8, (64-16)*8-1, 0*8, 32*8-1 ) + MCFG_SCREEN_UPDATE(vigilant) MCFG_GFXDECODE(buccanrs) MCFG_PALETTE_LENGTH(512+32) /* 512 real palette, 32 virtual palette */ MCFG_VIDEO_START(vigilant) MCFG_VIDEO_RESET(vigilant) - MCFG_VIDEO_UPDATE(vigilant) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -640,13 +640,13 @@ static MACHINE_CONFIG_START( kikcubic, vigilant_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 0*8, 32*8-1 ) + MCFG_SCREEN_UPDATE(kikcubic) MCFG_GFXDECODE(kikcubic) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(vigilant) MCFG_VIDEO_RESET(vigilant) - MCFG_VIDEO_UPDATE(kikcubic) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c index a8dfc124954..f2173b4d433 100644 --- a/src/mame/drivers/vindictr.c +++ b/src/mame/drivers/vindictr.c @@ -213,9 +213,9 @@ static MACHINE_CONFIG_START( vindictr, vindictr_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a SYNGEN chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(vindictr) MCFG_VIDEO_START(vindictr) - MCFG_VIDEO_UPDATE(vindictr) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_i_stereo_pokey) diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c index f4d1fb71ed0..8012b7ae270 100644 --- a/src/mame/drivers/viper.c +++ b/src/mame/drivers/viper.c @@ -62,7 +62,7 @@ public: //#define VIPER_DEBUG_LOG -static VIDEO_UPDATE(viper) +static SCREEN_UPDATE(viper) { device_t *device = screen->machine->device("voodoo"); return voodoo_update(device, bitmap, cliprect) ? 0 : UPDATE_HAS_NOT_CHANGED; @@ -660,11 +660,10 @@ static MACHINE_CONFIG_START( viper, viper_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(800, 600) MCFG_SCREEN_VISIBLE_AREA(0, 799, 0, 599) + MCFG_SCREEN_UPDATE(viper) MCFG_PALETTE_LENGTH(65536) - MCFG_VIDEO_UPDATE(viper) - /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index 0b50cfab429..f8d17005e79 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -398,7 +398,7 @@ static VIDEO_START(varia) tilemap_set_transparent_pen(state->vmetal_mid2tilemap, 15); } -static VIDEO_UPDATE(varia) +static SCREEN_UPDATE(varia) { metro_state *state = screen->machine->driver_data<metro_state>(); @@ -435,12 +435,12 @@ static MACHINE_CONFIG_START( varia, metro_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(2048, 2048) MCFG_SCREEN_VISIBLE_AREA(0+64, 319+64, 0+64, 223+64) + MCFG_SCREEN_UPDATE(varia) MCFG_GFXDECODE(vmetal) MCFG_PALETTE_LENGTH(0x4000) MCFG_VIDEO_START(varia) - MCFG_VIDEO_UPDATE(varia) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index 89e1fb0038a..3a326ad8e9f 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -279,12 +279,12 @@ static MACHINE_CONFIG_START( volfied, volfied_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 256) MCFG_SCREEN_VISIBLE_AREA(0, 319, 8, 247) + MCFG_SCREEN_UPDATE(volfied) MCFG_GFXDECODE(volfied) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(volfied) - MCFG_VIDEO_UPDATE(volfied) MCFG_PC090OJ_ADD("pc090oj", volfied_pc090oj_intf) diff --git a/src/mame/drivers/vp101.c b/src/mame/drivers/vp101.c index 8e11e7d9dbd..c9328a128f3 100644 --- a/src/mame/drivers/vp101.c +++ b/src/mame/drivers/vp101.c @@ -16,7 +16,7 @@ #include "cpu/mips/mips3.h" #include "machine/idectrl.h" -static VIDEO_UPDATE( vp101 ) +static SCREEN_UPDATE( vp101 ) { return 0; } @@ -66,10 +66,10 @@ static MACHINE_CONFIG_START( vp101, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) + MCFG_SCREEN_UPDATE(vp101) MCFG_PALETTE_LENGTH(32768) MCFG_VIDEO_START(vp101) - MCFG_VIDEO_UPDATE(vp101) MACHINE_CONFIG_END ROM_START(jnero) diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c index 0b97aab00ea..5f46025d0ab 100644 --- a/src/mame/drivers/vpoker.c +++ b/src/mame/drivers/vpoker.c @@ -128,7 +128,7 @@ static VIDEO_START( vpoker ) state->videoram = auto_alloc_array(machine, UINT8, 0x200); } -static VIDEO_UPDATE( vpoker ) +static SCREEN_UPDATE( vpoker ) { vpoker_state *state = screen->machine->driver_data<vpoker_state>(); UINT8 *videoram = state->videoram; @@ -663,12 +663,13 @@ static MACHINE_CONFIG_START( vpoker, vpoker_state ) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 480-1, 0*8, 240-1) // MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 256-1) + MCFG_SCREEN_UPDATE(vpoker) + MCFG_GFXDECODE(vpoker) MCFG_PALETTE_LENGTH(8) MCFG_PALETTE_INIT(vpoker) MCFG_VIDEO_START(vpoker) - MCFG_VIDEO_UPDATE(vpoker) /* 6840 PTM */ MCFG_PTM6840_ADD("6840ptm", ptm_intf) diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 7c5e850932f..05644d85346 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -94,7 +94,7 @@ static VIDEO_START(vroulet) 8, 8, 32, 32); } -static VIDEO_UPDATE(vroulet) +static SCREEN_UPDATE(vroulet) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); drawgfx_transpen(bitmap, cliprect, screen->machine->gfx[0], 0x320, 1, 0, 0, @@ -280,12 +280,12 @@ static MACHINE_CONFIG_START( vroulet, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(vroulet) MCFG_GFXDECODE(vroulet) MCFG_PALETTE_LENGTH(128*4) MCFG_VIDEO_START(vroulet) - MCFG_VIDEO_UPDATE(vroulet) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c index 6188b37154f..4546cb6380e 100644 --- a/src/mame/drivers/vsnes.c +++ b/src/mame/drivers/vsnes.c @@ -1656,12 +1656,12 @@ static MACHINE_CONFIG_START( vsnes, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(vsnes) MCFG_PALETTE_LENGTH(8*4*16) MCFG_PALETTE_INIT(vsnes) MCFG_VIDEO_START(vsnes) - MCFG_VIDEO_UPDATE(vsnes) MCFG_PPU2C04_ADD("ppu1", vsnes_ppu_interface_1) @@ -1721,16 +1721,17 @@ static MACHINE_CONFIG_START( vsdual, driver_device ) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(32*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(vsnes) MCFG_SCREEN_ADD("bottom", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(32*8, 262) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(vsnes_bottom) MCFG_PALETTE_INIT(vsdual) MCFG_VIDEO_START(vsdual) - MCFG_VIDEO_UPDATE(vsdual) MCFG_PPU2C04_ADD("ppu1", vsnes_ppu_interface_1) MCFG_PPU2C04_ADD("ppu2", vsnes_ppu_interface_2) diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c index 390d1dad4bd..a1a3e98bd88 100644 --- a/src/mame/drivers/vulgus.c +++ b/src/mame/drivers/vulgus.c @@ -235,13 +235,13 @@ static MACHINE_CONFIG_START( vulgus, vulgus_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(vulgus) MCFG_GFXDECODE(vulgus) MCFG_PALETTE_LENGTH(64*4+16*16+4*32*8) MCFG_PALETTE_INIT(vulgus) MCFG_VIDEO_START(vulgus) - MCFG_VIDEO_UPDATE(vulgus) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index b60b9ed1d65..34870f45ec4 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -147,7 +147,7 @@ static VIDEO_START( wallc ) state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); } -static VIDEO_UPDATE( wallc ) +static SCREEN_UPDATE( wallc ) { wallc_state *state = screen->machine->driver_data<wallc_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -305,13 +305,13 @@ static MACHINE_CONFIG_START( wallc, wallc_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(wallc) MCFG_GFXDECODE(wallc) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(wallc) MCFG_VIDEO_START(wallc) - MCFG_VIDEO_UPDATE(wallc) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index df3059f879b..8dbb4e3e4a5 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -421,13 +421,13 @@ static MACHINE_CONFIG_START( wardner, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_14MHz/2, 446, 0, 320, 286, 0, 240) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(toaplan0) + MCFG_SCREEN_EOF(toaplan0) MCFG_GFXDECODE(wardner) MCFG_PALETTE_LENGTH(1792) MCFG_VIDEO_START(toaplan0) - MCFG_VIDEO_EOF(toaplan0) - MCFG_VIDEO_UPDATE(toaplan0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index 18c23338246..955b87efb20 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -733,13 +733,13 @@ static MACHINE_CONFIG_START( geebee, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224) + MCFG_SCREEN_UPDATE(geebee) MCFG_GFXDECODE(1k) MCFG_PALETTE_LENGTH(4*2) MCFG_PALETTE_INIT(geebee) MCFG_VIDEO_START(geebee) - MCFG_VIDEO_UPDATE(geebee) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -769,13 +769,13 @@ static MACHINE_CONFIG_START( bombbee, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224) + MCFG_SCREEN_UPDATE(geebee) MCFG_GFXDECODE(color) MCFG_PALETTE_LENGTH(2*256+1) MCFG_PALETTE_INIT(warpwarp) MCFG_VIDEO_START(warpwarp) - MCFG_VIDEO_UPDATE(geebee) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index 2aff04ae46f..2041c8b09f0 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -597,6 +597,7 @@ static MACHINE_CONFIG_START( darius2d, warriorb_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 32*8-1) + MCFG_SCREEN_UPDATE(warriorb) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -604,9 +605,9 @@ static MACHINE_CONFIG_START( darius2d, warriorb_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 32*8-1) + MCFG_SCREEN_UPDATE(warriorb) MCFG_VIDEO_START(warriorb) - MCFG_VIDEO_UPDATE(warriorb) MCFG_TC0100SCN_ADD("tc0100scn_1", darius2d_tc0100scn_intf_l) MCFG_TC0100SCN_ADD("tc0100scn_2", darius2d_tc0100scn_intf_r) @@ -664,6 +665,7 @@ static MACHINE_CONFIG_START( warriorb, warriorb_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(warriorb) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -671,9 +673,9 @@ static MACHINE_CONFIG_START( warriorb, warriorb_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(warriorb) MCFG_VIDEO_START(warriorb) - MCFG_VIDEO_UPDATE(warriorb) MCFG_TC0100SCN_ADD("tc0100scn_1", warriorb_tc0100scn_intf_l) MCFG_TC0100SCN_ADD("tc0100scn_2", warriorb_tc0100scn_intf_r) diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index c35082cf9cf..7f3abd85351 100644 --- a/src/mame/drivers/wc90.c +++ b/src/mame/drivers/wc90.c @@ -328,12 +328,12 @@ static MACHINE_CONFIG_START( wc90, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(wc90) MCFG_GFXDECODE(wc90) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(wc90) - MCFG_VIDEO_UPDATE(wc90) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index 91f3b359e0f..78c03d8419c 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -382,12 +382,12 @@ static MACHINE_CONFIG_START( wc90b, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(wc90b) MCFG_GFXDECODE(wc90b) MCFG_PALETTE_LENGTH(1024) MCFG_VIDEO_START(wc90b) - MCFG_VIDEO_UPDATE(wc90b) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index 7c73cfdd031..2d14f1c4afb 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -1056,13 +1056,13 @@ static MACHINE_CONFIG_START( wecleman, wecleman_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(320 +16, 224 +16) MCFG_SCREEN_VISIBLE_AREA(0 +8, 320-1 +8, 0 +8, 224-1 +8) + MCFG_SCREEN_UPDATE(wecleman) MCFG_GFXDECODE(wecleman) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(wecleman) - MCFG_VIDEO_UPDATE(wecleman) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1127,12 +1127,12 @@ static MACHINE_CONFIG_START( hotchase, wecleman_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(320, 224) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1) + MCFG_SCREEN_UPDATE(hotchase) MCFG_GFXDECODE(hotchase) MCFG_PALETTE_LENGTH(2048*2) MCFG_VIDEO_START(hotchase) - MCFG_VIDEO_UPDATE(hotchase) MCFG_K051316_ADD("k051316_1", hotchase_k051316_intf_0) MCFG_K051316_ADD("k051316_2", hotchase_k051316_intf_1) diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 79ae8801ca7..d1697711538 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -723,12 +723,12 @@ static MACHINE_CONFIG_START( welltris, welltris_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(15, 367-1, 8, 248-1) + MCFG_SCREEN_UPDATE(welltris) MCFG_GFXDECODE(welltris) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(welltris) - MCFG_VIDEO_UPDATE(welltris) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 7ecc2f80415..feeef12850a 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -1026,12 +1026,12 @@ static MACHINE_CONFIG_START( wgp, wgp_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) + MCFG_SCREEN_UPDATE(wgp) MCFG_GFXDECODE(wgp) MCFG_PALETTE_LENGTH(4096) MCFG_VIDEO_START(wgp) - MCFG_VIDEO_UPDATE(wgp) MCFG_TC0100SCN_ADD("tc0100scn", wgp_tc0100scn_intf) diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index 349f4ba92c3..ed2c7d07cdb 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -565,7 +565,7 @@ static VIDEO_START(wheelfir) state->tmp_bitmap[1] = auto_bitmap_alloc(machine, 512, 512, BITMAP_FORMAT_INDEXED16); } -static VIDEO_UPDATE(wheelfir) +static SCREEN_UPDATE(wheelfir) { wheelfir_state *state = screen->machine->driver_data<wheelfir_state>(); @@ -596,7 +596,7 @@ static VIDEO_UPDATE(wheelfir) return 0; } -static VIDEO_EOF( wheelfir ) +static SCREEN_EOF( wheelfir ) { wheelfir_state *state = machine->driver_data<wheelfir_state>(); bitmap_fill(state->tmp_bitmap[LAYER_FG], &machine->primary_screen->visible_area(),0); @@ -821,11 +821,11 @@ static MACHINE_CONFIG_START( wheelfir, wheelfir_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) - - MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(336, NUM_SCANLINES+NUM_VBLANK_LINES) MCFG_SCREEN_VISIBLE_AREA(0,335, 0, NUM_SCANLINES-1) + MCFG_SCREEN_UPDATE(wheelfir) + MCFG_SCREEN_EOF(wheelfir) MCFG_PALETTE_LENGTH(NUM_COLORS) @@ -834,8 +834,6 @@ static MACHINE_CONFIG_START( wheelfir, wheelfir_state ) MCFG_MACHINE_START(wheelfir) MCFG_VIDEO_START(wheelfir) - MCFG_VIDEO_UPDATE(wheelfir) - MCFG_VIDEO_EOF(wheelfir) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c index fc4147641e9..fb5e6ce61e4 100644 --- a/src/mame/drivers/williams.c +++ b/src/mame/drivers/williams.c @@ -1449,9 +1449,9 @@ static MACHINE_CONFIG_START( defender, williams_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 10, 304, 260, 7, 245) + MCFG_SCREEN_UPDATE(williams) MCFG_VIDEO_START(williams) - MCFG_VIDEO_UPDATE(williams) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1588,7 +1588,8 @@ static MACHINE_CONFIG_DERIVED( blaster, williams ) /* video hardware */ MCFG_VIDEO_START(blaster) - MCFG_VIDEO_UPDATE(blaster) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(blaster) /* pia */ MCFG_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf) @@ -1628,9 +1629,9 @@ static MACHINE_CONFIG_START( williams2, williams_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 8, 284, 260, 8, 248) + MCFG_SCREEN_UPDATE(williams2) MCFG_VIDEO_START(williams2) - MCFG_VIDEO_UPDATE(williams2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index 153b133aa25..6338fbaddb8 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -52,7 +52,7 @@ static VIDEO_START( wink ) state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -static VIDEO_UPDATE( wink ) +static SCREEN_UPDATE( wink ) { wink_state *state = screen->machine->driver_data<wink_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -353,12 +353,12 @@ static MACHINE_CONFIG_START( wink, wink_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_UPDATE(wink) MCFG_GFXDECODE(wink) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(wink) - MCFG_VIDEO_UPDATE(wink) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c index 8a4a7bc5c5b..1813862adee 100644 --- a/src/mame/drivers/wiping.c +++ b/src/mame/drivers/wiping.c @@ -297,12 +297,12 @@ static MACHINE_CONFIG_START( wiping, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) + MCFG_SCREEN_UPDATE(wiping) MCFG_GFXDECODE(wiping) MCFG_PALETTE_LENGTH(64*4+64*4) MCFG_PALETTE_INIT(wiping) - MCFG_VIDEO_UPDATE(wiping) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 087172c4360..8c622dad3cc 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -733,7 +733,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -static VIDEO_UPDATE(witch) +static SCREEN_UPDATE(witch) { tilemap_set_scrollx( gfx1_tilemap, 0, scrollx-7 ); //offset to have it aligned with the sprites tilemap_set_scrolly( gfx1_tilemap, 0, scrolly+8 ); @@ -777,12 +777,12 @@ static MACHINE_CONFIG_START( witch, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(8, 256-1-8, 8*4, 256-8*4-1) + MCFG_SCREEN_UPDATE(witch) MCFG_GFXDECODE(witch) MCFG_PALETTE_LENGTH(0x800) MCFG_VIDEO_START(witch) - MCFG_VIDEO_UPDATE(witch) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index 8c3063c6654..9a3729699c5 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -699,13 +699,13 @@ static MACHINE_CONFIG_START( wiz, wiz_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(wiz) MCFG_GFXDECODE(wiz) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(wiz) MCFG_VIDEO_START(wiz) - MCFG_VIDEO_UPDATE(wiz) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -730,7 +730,8 @@ static MACHINE_CONFIG_DERIVED( stinger, wiz ) /* video hardware */ MCFG_GFXDECODE(stinger) - MCFG_VIDEO_UPDATE(stinger) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(stinger) /* sound hardware */ MCFG_SOUND_MODIFY("8910.1") @@ -764,7 +765,8 @@ static MACHINE_CONFIG_DERIVED( kungfut, wiz ) /* video hardware */ MCFG_GFXDECODE(stinger) - MCFG_VIDEO_UPDATE(kungfut) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(kungfut) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c index 3bdb23abee8..d5dbed8c358 100644 --- a/src/mame/drivers/wldarrow.c +++ b/src/mame/drivers/wldarrow.c @@ -52,7 +52,7 @@ static void get_pens(pen_t *pens) } -static VIDEO_UPDATE( wldarrow ) +static SCREEN_UPDATE( wldarrow ) { pen_t pens[NUM_PENS]; offs_t offs; @@ -354,14 +354,13 @@ static MACHINE_CONFIG_START( wldarrow, driver_device ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_VIDEO_UPDATE(wldarrow) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) + MCFG_SCREEN_UPDATE(wldarrow) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c index 212d55fed27..805a12a5d07 100644 --- a/src/mame/drivers/wolfpack.c +++ b/src/mame/drivers/wolfpack.c @@ -302,13 +302,13 @@ static MACHINE_CONFIG_START( wolfpack, wolfpack_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 262) MCFG_SCREEN_VISIBLE_AREA(0, 511, 16, 239) + MCFG_SCREEN_UPDATE(wolfpack) + MCFG_SCREEN_EOF(wolfpack) MCFG_GFXDECODE(wolfpack) MCFG_PALETTE_LENGTH(12) MCFG_PALETTE_INIT(wolfpack) MCFG_VIDEO_START(wolfpack) - MCFG_VIDEO_UPDATE(wolfpack) - MCFG_VIDEO_EOF(wolfpack) /* sound hardware */ MCFG_SOUND_ADD("speech", S14001A, 20000) /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */ diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c index c3c67720109..0aff2b85bd6 100644 --- a/src/mame/drivers/wrally.c +++ b/src/mame/drivers/wrally.c @@ -266,12 +266,12 @@ static MACHINE_CONFIG_START( wrally, wrally_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*16, 32*16) MCFG_SCREEN_VISIBLE_AREA(8, 24*16-8-1, 16, 16*16-8-1) + MCFG_SCREEN_UPDATE(wrally) MCFG_GFXDECODE(wrally) MCFG_PALETTE_LENGTH(1024*8) MCFG_VIDEO_START(wrally) - MCFG_VIDEO_UPDATE(wrally) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index fb93afefd8e..35719e15f03 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -441,12 +441,12 @@ static MACHINE_CONFIG_START( wwfsstar, wwfsstar_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 320, 0, 256, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ + MCFG_SCREEN_UPDATE(wwfsstar) MCFG_GFXDECODE(wwfsstar) MCFG_PALETTE_LENGTH(384) MCFG_VIDEO_START(wwfsstar) - MCFG_VIDEO_UPDATE(wwfsstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c index cc29546a160..b83fffe8e33 100644 --- a/src/mame/drivers/wwfwfest.c +++ b/src/mame/drivers/wwfwfest.c @@ -379,7 +379,7 @@ static const ym2151_interface ym2151_config = dd3_ymirq_handler }; -static VIDEO_EOF( wwfwfest ) +static SCREEN_EOF( wwfwfest ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); @@ -406,13 +406,13 @@ static MACHINE_CONFIG_START( wwfwfest, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ + MCFG_SCREEN_UPDATE(wwfwfest) + MCFG_SCREEN_EOF(wwfwfest) MCFG_GFXDECODE(wwfwfest) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(wwfwfest) - MCFG_VIDEO_EOF(wwfwfest) - MCFG_VIDEO_UPDATE(wwfwfest) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c index 522a56276f7..1053f39d258 100644 --- a/src/mame/drivers/xain.c +++ b/src/mame/drivers/xain.c @@ -607,12 +607,12 @@ static MACHINE_CONFIG_START( xsleena, driver_device ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 8, 248) /* based on ddragon driver */ + MCFG_SCREEN_UPDATE(xain) MCFG_GFXDECODE(xain) MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(xain) - MCFG_VIDEO_UPDATE(xain) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index d9c004c9a9d..282b51e455e 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -548,11 +548,11 @@ static MACHINE_CONFIG_START( xexex, xexex_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 0, 0+256-1) + MCFG_SCREEN_UPDATE(xexex) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(xexex) - MCFG_VIDEO_UPDATE(xexex) MCFG_K056832_ADD("k056832", xexex_k056832_intf) MCFG_K053246_ADD("k053246", xexex_k053246_intf) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 5ad02717f54..243a0e31183 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -390,10 +390,9 @@ static MACHINE_CONFIG_START( xmen, xmen_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) /* correct, same issue of TMNT2 */ + MCFG_SCREEN_UPDATE(xmen) MCFG_PALETTE_LENGTH(2048) - MCFG_VIDEO_UPDATE(xmen) - MCFG_K052109_ADD("k052109", xmen_k052109_intf) MCFG_K053246_ADD("k053246", xmen_k053246_intf) MCFG_K053251_ADD("k053251") @@ -481,6 +480,7 @@ static MACHINE_CONFIG_START( xmen6p, xmen_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(12*8, 48*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(xmen6p) MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -488,10 +488,10 @@ static MACHINE_CONFIG_START( xmen6p, xmen_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(16*8, 52*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(xmen6p) + MCFG_SCREEN_EOF(xmen6p) MCFG_VIDEO_START(xmen6p) - MCFG_VIDEO_UPDATE(xmen6p) - MCFG_VIDEO_EOF(xmen6p) MCFG_K052109_ADD("k052109", xmen_k052109_intf) MCFG_K053246_ADD("k053246", xmen6p_k053246_intf) diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c index fb49cbe0ee3..f12dc1ec120 100644 --- a/src/mame/drivers/xorworld.c +++ b/src/mame/drivers/xorworld.c @@ -191,13 +191,13 @@ static MACHINE_CONFIG_START( xorworld, xorworld_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(xorworld) MCFG_GFXDECODE(xorworld) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(xorworld) MCFG_VIDEO_START(xorworld) - MCFG_VIDEO_UPDATE(xorworld) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c index 5f3cd427bce..1e37bd7e9da 100644 --- a/src/mame/drivers/xtheball.c +++ b/src/mame/drivers/xtheball.c @@ -334,12 +334,11 @@ static MACHINE_CONFIG_START( xtheball, driver_device ) /* video hardware */ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) - - MCFG_VIDEO_UPDATE(tms340x0) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(10000000, 640, 114, 626, 257, 24, 248) + MCFG_SCREEN_UPDATE(tms340x0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c index 0e8de971ec4..109984856f7 100644 --- a/src/mame/drivers/xtom3d.c +++ b/src/mame/drivers/xtom3d.c @@ -50,7 +50,7 @@ static VIDEO_START(xtom3d) { } -static VIDEO_UPDATE(xtom3d) +static SCREEN_UPDATE(xtom3d) { return 0; } @@ -78,10 +78,10 @@ static MACHINE_CONFIG_START( xtom3d, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199) + MCFG_SCREEN_UPDATE(xtom3d) MCFG_PALETTE_LENGTH(16) MCFG_VIDEO_START(xtom3d) - MCFG_VIDEO_UPDATE(xtom3d) MACHINE_CONFIG_END ROM_START( xtom3d ) diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index 640fc94f1f2..d0f712a3066 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -309,12 +309,12 @@ static MACHINE_CONFIG_START( xxmissio, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 4*8, 28*8-1) + MCFG_SCREEN_UPDATE(xxmissio) MCFG_GFXDECODE(xxmissio) MCFG_PALETTE_LENGTH(768) MCFG_VIDEO_START(xxmissio) - MCFG_VIDEO_UPDATE(xxmissio) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c index a04d16605d1..cb447d24fd3 100644 --- a/src/mame/drivers/xybots.c +++ b/src/mame/drivers/xybots.c @@ -212,9 +212,9 @@ static MACHINE_CONFIG_START( xybots, xybots_state ) /* note: these parameters are from published specs, not derived */ /* the board uses a SYNGEN chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_UPDATE(xybots) MCFG_VIDEO_START(xybots) - MCFG_VIDEO_UPDATE(xybots) /* sound hardware */ MCFG_FRAGMENT_ADD(jsa_i_stereo_swapped) diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index f57a681aabb..cf7411ba8e6 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -230,13 +230,13 @@ static MACHINE_CONFIG_START( xyonix, xyonix_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(80*4, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 80*4-1, 0, 28*8-1) + MCFG_SCREEN_UPDATE(xyonix) MCFG_GFXDECODE(xyonix) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(xyonix) MCFG_VIDEO_START(xyonix) - MCFG_VIDEO_UPDATE(xyonix) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index 6e880848e13..c0abab911d2 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -274,13 +274,13 @@ static MACHINE_CONFIG_START( yiear, yiear_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(yiear) MCFG_GFXDECODE(yiear) MCFG_PALETTE_LENGTH(32) MCFG_PALETTE_INIT(yiear) MCFG_VIDEO_START(yiear) - MCFG_VIDEO_UPDATE(yiear) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index b2d41b11927..f06537a9ead 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -609,12 +609,12 @@ static MACHINE_CONFIG_START( magicbub, yunsun16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x180, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0+0x20, 0x180-1-0x20, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(yunsun16) MCFG_GFXDECODE(yunsun16) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(yunsun16) - MCFG_VIDEO_UPDATE(yunsun16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -651,12 +651,12 @@ static MACHINE_CONFIG_START( shocking, yunsun16_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(0x180, 0xe0) MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1-4, 0, 0xe0-1) + MCFG_SCREEN_UPDATE(yunsun16) MCFG_GFXDECODE(yunsun16) MCFG_PALETTE_LENGTH(8192) MCFG_VIDEO_START(yunsun16) - MCFG_VIDEO_UPDATE(yunsun16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 16a5093c11d..af7f128d2e9 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -521,12 +521,12 @@ static MACHINE_CONFIG_START( yunsung8, yunsung8_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0+64, 512-64-1, 0+8, 256-8-1) + MCFG_SCREEN_UPDATE(yunsung8) MCFG_GFXDECODE(yunsung8) MCFG_PALETTE_LENGTH(2048) MCFG_VIDEO_START(yunsung8) - MCFG_VIDEO_UPDATE(yunsung8) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c index 30d3f491e5f..a1363c995f2 100644 --- a/src/mame/drivers/zac2650.c +++ b/src/mame/drivers/zac2650.c @@ -245,13 +245,13 @@ static MACHINE_CONFIG_START( tinvader, zac2650_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(30*24, 32*24) MCFG_SCREEN_VISIBLE_AREA(0, 719, 0, 767) + MCFG_SCREEN_UPDATE(tinvader) MCFG_GFXDECODE(tinvader) MCFG_PALETTE_LENGTH(4) MCFG_PALETTE_INIT(zac2650) MCFG_VIDEO_START(tinvader) - MCFG_VIDEO_UPDATE(tinvader) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c index 32552f6483c..706f6685e78 100644 --- a/src/mame/drivers/zaccaria.c +++ b/src/mame/drivers/zaccaria.c @@ -604,13 +604,13 @@ static MACHINE_CONFIG_START( zaccaria, driver_device ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(zaccaria) MCFG_GFXDECODE(zaccaria) MCFG_PALETTE_LENGTH(32*8+32*8) MCFG_PALETTE_INIT(zaccaria) MCFG_VIDEO_START(zaccaria) - MCFG_VIDEO_UPDATE(zaccaria) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index f533581b029..7c457902ee3 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -952,10 +952,10 @@ static MACHINE_CONFIG_START( root, zaxxon_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(zaxxon) MCFG_PALETTE_INIT(zaxxon) MCFG_VIDEO_START(zaxxon) - MCFG_VIDEO_UPDATE(zaxxon) MACHINE_CONFIG_END @@ -970,7 +970,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( futspy, root ) /* video hardware */ - MCFG_VIDEO_UPDATE(futspy) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(futspy) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -984,7 +985,8 @@ static MACHINE_CONFIG_DERIVED( razmataz, root ) /* video hardware */ MCFG_VIDEO_START(razmataz) - MCFG_VIDEO_UPDATE(razmataz) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(razmataz) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1006,7 +1008,8 @@ static MACHINE_CONFIG_DERIVED( congo, root ) /* video hardware */ MCFG_PALETTE_LENGTH(512) MCFG_VIDEO_START(congo) - MCFG_VIDEO_UPDATE(congo) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(congo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c index 3e9e683d9b3..b6812d336b0 100644 --- a/src/mame/drivers/zerozone.c +++ b/src/mame/drivers/zerozone.c @@ -206,12 +206,12 @@ static MACHINE_CONFIG_START( zerozone, zerozone_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(1*8, 47*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(zerozone) MCFG_GFXDECODE(zerozone) MCFG_PALETTE_LENGTH(256) MCFG_VIDEO_START(zerozone) - MCFG_VIDEO_UPDATE(zerozone) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 7a160ddcc0c..d0f0a72f5ea 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -515,12 +515,12 @@ static MACHINE_CONFIG_START( zn1_1mb_vram, zn_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 512 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type2 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -551,12 +551,12 @@ static MACHINE_CONFIG_START( zn2, zn_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE( 1024, 1024 ) MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 ) + MCFG_SCREEN_UPDATE( psx ) MCFG_PALETTE_LENGTH( 65536 ) MCFG_PALETTE_INIT( psx ) MCFG_VIDEO_START( psx_type2 ) - MCFG_VIDEO_UPDATE( psx ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c index 59773842452..0a37a1873e7 100644 --- a/src/mame/drivers/zodiack.c +++ b/src/mame/drivers/zodiack.c @@ -592,13 +592,13 @@ static MACHINE_CONFIG_START( zodiack, zodiack_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE(zodiack) MCFG_GFXDECODE(zodiack) MCFG_PALETTE_LENGTH(4*8+2*8+2*1) MCFG_PALETTE_INIT(zodiack) MCFG_VIDEO_START(zodiack) - MCFG_VIDEO_UPDATE(zodiack) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 3b857f84a2f..bf8bc115396 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -202,7 +202,7 @@ static VIDEO_START( jetwave ) } -static VIDEO_UPDATE( jetwave ) +static SCREEN_UPDATE( jetwave ) { zr107_state *state = screen->machine->driver_data<zr107_state>(); device_t *k001604 = screen->machine->device("k001604"); @@ -255,7 +255,7 @@ static VIDEO_START( zr107 ) K001005_init(machine); } -static VIDEO_UPDATE( zr107 ) +static SCREEN_UPDATE( zr107 ) { zr107_state *state = screen->machine->driver_data<zr107_state>(); device_t *k056832 = screen->machine->device("k056832"); @@ -763,11 +763,11 @@ static MACHINE_CONFIG_START( zr107, zr107_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 48*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1) + MCFG_SCREEN_UPDATE(zr107) MCFG_PALETTE_LENGTH(65536) MCFG_VIDEO_START(zr107) - MCFG_VIDEO_UPDATE(zr107) MCFG_K056832_ADD("k056832", zr107_k056832_intf) @@ -824,11 +824,11 @@ static MACHINE_CONFIG_START( jetwave, zr107_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(64*8, 48*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1) + MCFG_SCREEN_UPDATE(jetwave) MCFG_PALETTE_LENGTH(65536) MCFG_VIDEO_START(jetwave) - MCFG_VIDEO_UPDATE(jetwave) MCFG_K001604_ADD("k001604", jetwave_k001604_intf) diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 55279b4f8f3..8a7b8cc4ba4 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -37,4 +37,4 @@ extern WRITE8_HANDLER( c1942_palette_bank_w ); extern PALETTE_INIT( 1942 ); extern VIDEO_START( 1942 ); -extern VIDEO_UPDATE( 1942 ); +extern SCREEN_UPDATE( 1942 ); diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index babed5918b5..3d676288426 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -35,4 +35,4 @@ extern WRITE8_HANDLER( c1943_colorram_w ); extern PALETTE_INIT( 1943 ); extern VIDEO_START( 1943 ); -extern VIDEO_UPDATE( 1943 ); +extern SCREEN_UPDATE( 1943 ); diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 97d4e9229c4..52f1a48af57 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -57,5 +57,5 @@ READ8_HANDLER( fortyl_pixram_r ); WRITE8_HANDLER( fortyl_pixram_w ); VIDEO_START( fortyl ); -VIDEO_UPDATE( fortyl ); +SCREEN_UPDATE( fortyl ); PALETTE_INIT( fortyl ); diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index 8298f063305..88dba59ac13 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -28,4 +28,4 @@ public: WRITE8_HANDLER( fenraya_videoram_w ); VIDEO_START( 4enraya ); -VIDEO_UPDATE( 4enraya ); +SCREEN_UPDATE( 4enraya ); diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index d5193904698..76c9319bc7e 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -40,4 +40,4 @@ void _88games_sprite_callback(running_machine *machine, int *code, int *color, i void _88games_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority); void _88games_zoom_callback(running_machine *machine, int *code, int *color, int *flags); -VIDEO_UPDATE( 88games ); +SCREEN_UPDATE( 88games ); diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 9406e7bd3d1..386304a58ac 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -44,5 +44,5 @@ WRITE8_HANDLER( actfancr_pf2_control_w ); VIDEO_START( actfancr ); VIDEO_START( triothep ); -VIDEO_UPDATE( actfancr ); -VIDEO_UPDATE( triothep ); +SCREEN_UPDATE( actfancr ); +SCREEN_UPDATE( triothep ); diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index a9a02ebe522..8754aecdf69 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -41,7 +41,7 @@ public: /*----------- defined in video/aeroboto.c -----------*/ VIDEO_START( aeroboto ); -VIDEO_UPDATE( aeroboto ); +SCREEN_UPDATE( aeroboto ); READ8_HANDLER( aeroboto_in0_r ); WRITE8_HANDLER( aeroboto_3000_w ); diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 4b4c5802921..39487f932fc 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -60,13 +60,13 @@ VIDEO_START( karatblz ); VIDEO_START( spinlbrk ); VIDEO_START( turbofrc ); VIDEO_START( wbbc97 ); -VIDEO_UPDATE( pspikes ); -VIDEO_UPDATE( pspikesb ); -VIDEO_UPDATE( spikes91 ); -VIDEO_UPDATE( karatblz ); -VIDEO_UPDATE( spinlbrk ); -VIDEO_UPDATE( turbofrc ); -VIDEO_UPDATE( aerofgt ); -VIDEO_UPDATE( aerfboot ); -VIDEO_UPDATE( aerfboo2 ); -VIDEO_UPDATE( wbbc97 ); +SCREEN_UPDATE( pspikes ); +SCREEN_UPDATE( pspikesb ); +SCREEN_UPDATE( spikes91 ); +SCREEN_UPDATE( karatblz ); +SCREEN_UPDATE( spinlbrk ); +SCREEN_UPDATE( turbofrc ); +SCREEN_UPDATE( aerofgt ); +SCREEN_UPDATE( aerfboot ); +SCREEN_UPDATE( aerfboo2 ); +SCREEN_UPDATE( wbbc97 ); diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 77bbc04713c..6e385fc0cf9 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -45,5 +45,5 @@ WRITE8_HANDLER( airbustr_colorram2_w ); WRITE8_HANDLER( airbustr_scrollregs_w ); VIDEO_START( airbustr ); -VIDEO_UPDATE( airbustr ); -VIDEO_EOF( airbustr ); +SCREEN_UPDATE( airbustr ); +SCREEN_EOF( airbustr ); diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 310aeefb207..030c78e1fd9 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -39,7 +39,7 @@ INTERRUPT_GEN( ajax_interrupt ); /*----------- defined in video/ajax.c -----------*/ VIDEO_START( ajax ); -VIDEO_UPDATE( ajax ); +SCREEN_UPDATE( ajax ); extern void ajax_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void ajax_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow); diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index cacd11d8095..c80f333512e 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -34,4 +34,4 @@ extern void aliens_tile_callback(running_machine *machine, int layer,int bank,in extern void aliens_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask,int *shadow); VIDEO_START( aliens ); -VIDEO_UPDATE( aliens ); +SCREEN_UPDATE( aliens ); diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index a0c2e47171c..6ec8e3f5536 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -51,12 +51,12 @@ PALETTE_INIT( paddlem ); VIDEO_START( alpha68k ); -VIDEO_UPDATE( kyros ); -VIDEO_UPDATE( sstingry ); -VIDEO_UPDATE( alpha68k_I ); -VIDEO_UPDATE( alpha68k_II ); -VIDEO_UPDATE( alpha68k_V ); -VIDEO_UPDATE( alpha68k_V_sb ); +SCREEN_UPDATE( kyros ); +SCREEN_UPDATE( sstingry ); +SCREEN_UPDATE( alpha68k_I ); +SCREEN_UPDATE( alpha68k_II ); +SCREEN_UPDATE( alpha68k_V ); +SCREEN_UPDATE( alpha68k_V_sb ); void alpha68k_V_video_bank_w(running_machine *machine, int bank); void alpha68k_flipscreen_w(running_machine *machine, int flip); diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index 73d06abb092..b268b8c5dd3 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -25,4 +25,4 @@ public: /*----------- defined in video/ambush.c -----------*/ PALETTE_INIT( ambush ); -VIDEO_UPDATE( ambush ); +SCREEN_UPDATE( ambush ); diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index e2ae8c574fc..30aeb363bb4 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -477,7 +477,7 @@ extern const UINT16 amiga_expand_byte[256]; PALETTE_INIT( amiga ); VIDEO_START( amiga ); -VIDEO_UPDATE( amiga ); +SCREEN_UPDATE( amiga ); void amiga_copper_setpc(running_machine *machine, UINT32 pc); int amiga_copper_execute_next(running_machine *machine, int xpos); @@ -491,7 +491,7 @@ void amiga_sprite_enable_comparitor(running_machine *machine, int which, int ena /*----------- defined in video/amigaaga.c -----------*/ VIDEO_START( amiga_aga ); -VIDEO_UPDATE( amiga_aga ); +SCREEN_UPDATE( amiga_aga ); void amiga_aga_render_scanline(running_machine *machine, bitmap_t *bitmap, int scanline); void amiga_aga_palette_write(running_machine *machine, int color_reg, UINT16 data); diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index e7b68e65c3d..2789c6d3b5c 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -14,4 +14,4 @@ WRITE8_HANDLER( ampoker2_videoram_w ); PALETTE_INIT( ampoker2 ); VIDEO_START( ampoker2 ); VIDEO_START( sigma2k ); -VIDEO_UPDATE( ampoker2 ); +SCREEN_UPDATE( ampoker2 ); diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index f296db2294b..416e24e2a01 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -38,4 +38,4 @@ WRITE8_HANDLER( amspdwy_paletteram_w ); WRITE8_HANDLER( amspdwy_flipscreen_w ); VIDEO_START( amspdwy ); -VIDEO_UPDATE( amspdwy ); +SCREEN_UPDATE( amspdwy ); diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 50300a963db..291711325f1 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -47,4 +47,4 @@ WRITE8_HANDLER( angelkds_paletteram_w ); WRITE8_HANDLER( angelkds_layer_ctrl_write ); VIDEO_START( angelkds ); -VIDEO_UPDATE( angelkds ); +SCREEN_UPDATE( angelkds ); diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 5db69c9517f..717d6a54abc 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -42,5 +42,5 @@ PALETTE_INIT( robowres ); WRITE8_HANDLER( appoooh_scroll_w ); WRITE8_HANDLER( appoooh_out_w ); VIDEO_START( appoooh ); -VIDEO_UPDATE( appoooh ); -VIDEO_UPDATE( robowres ); +SCREEN_UPDATE( appoooh ); +SCREEN_UPDATE( robowres ); diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 5ef1be2d572..a8a66090dbf 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -34,4 +34,4 @@ WRITE16_HANDLER( aquarium_mid_videoram_w ); WRITE16_HANDLER( aquarium_bak_videoram_w ); VIDEO_START(aquarium); -VIDEO_UPDATE(aquarium); +SCREEN_UPDATE(aquarium); diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index fb26633ffec..8bdb6dd7bee 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -37,4 +37,4 @@ WRITE8_HANDLER( arabian_videoram_w ); PALETTE_INIT( arabian ); VIDEO_START( arabian ); -VIDEO_UPDATE( arabian ); +SCREEN_UPDATE( arabian ); diff --git a/src/mame/includes/arcadecl.h b/src/mame/includes/arcadecl.h index ff452304e47..d025fe556d7 100644 --- a/src/mame/includes/arcadecl.h +++ b/src/mame/includes/arcadecl.h @@ -8,4 +8,4 @@ /*----------- defined in video/arcadecl.c -----------*/ VIDEO_START( arcadecl ); -VIDEO_UPDATE( arcadecl ); +SCREEN_UPDATE( arcadecl ); diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h index 1413dd2cd0c..cceac00151f 100644 --- a/src/mame/includes/archimds.h +++ b/src/mame/includes/archimds.h @@ -106,7 +106,7 @@ extern UINT8 vidc_interlace; /*----------- defined in video/archimds.c -----------*/ extern VIDEO_START( archimds_vidc ); -extern VIDEO_UPDATE( archimds_vidc ); +extern SCREEN_UPDATE( archimds_vidc ); #define VIDC_HCR 0x80 #define VIDC_HSWR 0x84 diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index af4fd3fc6dc..82920fb0754 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -44,9 +44,9 @@ VIDEO_START( butasan ); VIDEO_RESET( argus ); VIDEO_RESET( valtric ); VIDEO_RESET( butasan ); -VIDEO_UPDATE( argus ); -VIDEO_UPDATE( valtric ); -VIDEO_UPDATE( butasan ); +SCREEN_UPDATE( argus ); +SCREEN_UPDATE( valtric ); +SCREEN_UPDATE( butasan ); READ8_HANDLER( argus_txram_r ); READ8_HANDLER( argus_bg1ram_r ); diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 7c7a3fa3485..9604773d9a3 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -51,8 +51,8 @@ extern WRITE8_HANDLER( tetrsark_d008_w ); extern WRITE8_HANDLER( hexa_d008_w ); extern VIDEO_START( arkanoid ); -extern VIDEO_UPDATE( arkanoid ); -extern VIDEO_UPDATE( hexa ); +extern SCREEN_UPDATE( arkanoid ); +extern SCREEN_UPDATE( hexa ); /*----------- defined in machine/arkanoid.c -----------*/ diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index c59604182ac..637c27d1771 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -30,8 +30,8 @@ public: /*----------- defined in video/armedf.c -----------*/ -VIDEO_UPDATE( armedf ); -VIDEO_EOF( armedf ); +SCREEN_UPDATE( armedf ); +SCREEN_EOF( armedf ); VIDEO_START( armedf ); WRITE16_HANDLER( armedf_bg_videoram_w ); diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index f992bc5b327..56e506154df 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -48,4 +48,4 @@ WRITE16_HANDLER( joe_tilemaps_xscroll_w ); WRITE16_HANDLER( joe_tilemaps_yscroll_w ); VIDEO_START( ashnojoe ); -VIDEO_UPDATE( ashnojoe ); +SCREEN_UPDATE( ashnojoe ); diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 62d1becb025..1ed7bc09f90 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -37,7 +37,7 @@ public: /*----------- defined in video/asterix.c -----------*/ -VIDEO_UPDATE( asterix ); +SCREEN_UPDATE( asterix ); WRITE16_HANDLER( asterix_spritebank_w ); extern void asterix_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags); diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index 8c4c407aca5..65dc218384b 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -32,8 +32,8 @@ PALETTE_INIT( profpac ); VIDEO_START( astrocde ); VIDEO_START( profpac ); -VIDEO_UPDATE( astrocde ); -VIDEO_UPDATE( profpac ); +SCREEN_UPDATE( astrocde ); +SCREEN_UPDATE( profpac ); WRITE8_HANDLER( astrocade_pattern_board_w ); READ8_HANDLER( astrocade_data_chip_register_r ); diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index 49cdb16ee6d..3bfd6ce38f5 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -51,5 +51,5 @@ WRITE16_HANDLER( bonzeadv_cchip_ram_w ); WRITE16_HANDLER( asuka_spritectrl_w ); -VIDEO_UPDATE( asuka ); -VIDEO_UPDATE( bonzeadv ); +SCREEN_UPDATE( asuka ); +SCREEN_UPDATE( bonzeadv ); diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h index 7a4fd1adda0..b1a19e3311d 100644 --- a/src/mame/includes/atari.h +++ b/src/mame/includes/atari.h @@ -586,7 +586,7 @@ extern char atari_frame_message[64+1]; extern int atari_frame_counter; extern VIDEO_START( atari ); -extern VIDEO_UPDATE( atari ); +extern SCREEN_UPDATE( atari ); INTERRUPT_GEN( a400_interrupt ); INTERRUPT_GEN( a800_interrupt ); diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index 0d5d30c01bb..ef51f518a49 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -76,9 +76,9 @@ DISCRETE_SOUND_EXTERN( abaseb ); /*----------- defined in video/atarifb.c -----------*/ VIDEO_START( atarifb ); -VIDEO_UPDATE( atarifb ); -VIDEO_UPDATE( abaseb ); -VIDEO_UPDATE( soccer ); +SCREEN_UPDATE( atarifb ); +SCREEN_UPDATE( abaseb ); +SCREEN_UPDATE( soccer ); WRITE8_HANDLER( atarifb_alpha1_videoram_w ); WRITE8_HANDLER( atarifb_alpha2_videoram_w ); diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index 631e2752da4..62864db3a66 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -37,7 +37,7 @@ public: WRITE16_HANDLER( atarig1_mo_control_w ); VIDEO_START( atarig1 ); -VIDEO_EOF( atarig1 ); -VIDEO_UPDATE( atarig1 ); +SCREEN_EOF( atarig1 ); +SCREEN_UPDATE( atarig1 ); void atarig1_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index e0613aeacb2..3b960528d91 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -36,8 +36,8 @@ public: /*----------- defined in video/atarig42.c -----------*/ VIDEO_START( atarig42 ); -VIDEO_EOF( atarig42 ); -VIDEO_UPDATE( atarig42 ); +SCREEN_EOF( atarig42 ); +SCREEN_UPDATE( atarig42 ); WRITE16_HANDLER( atarig42_mo_control_w ); diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index aa3351d0556..5904651bcef 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -55,7 +55,7 @@ void atarigt_colorram_w(atarigt_state *state, offs_t address, UINT16 data, UINT1 UINT16 atarigt_colorram_r(atarigt_state *state, offs_t address); VIDEO_START( atarigt ); -VIDEO_EOF( atarigt ); -VIDEO_UPDATE( atarigt ); +SCREEN_EOF( atarigt ); +SCREEN_UPDATE( atarigt ); void atarigt_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 5e6080c5581..165d72b307c 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -33,8 +33,8 @@ public: /*----------- defined in video/atarigx2.c -----------*/ VIDEO_START( atarigx2 ); -VIDEO_EOF( atarigx2 ); -VIDEO_UPDATE( atarigx2 ); +SCREEN_EOF( atarigx2 ); +SCREEN_UPDATE( atarigx2 ); WRITE16_HANDLER( atarigx2_mo_control_w ); diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index a69b99e1874..f115ae307b5 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -60,4 +60,4 @@ WRITE16_HANDLER( atarisy1_yscroll_w ); WRITE16_HANDLER( atarisy1_priority_w ); VIDEO_START( atarisy1 ); -VIDEO_UPDATE( atarisy1 ); +SCREEN_UPDATE( atarisy1 ); diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 16f4f11284f..79e1f991dae 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -60,4 +60,4 @@ WRITE16_HANDLER( atarisy2_videoram_w ); WRITE16_HANDLER( atarisy2_paletteram_w ); VIDEO_START( atarisy2 ); -VIDEO_UPDATE( atarisy2 ); +SCREEN_UPDATE( atarisy2 ); diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 0b5eac7ac6b..f0c43b0c90c 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -24,6 +24,6 @@ public: /*----------- defined in video/atetris.c -----------*/ VIDEO_START( atetris ); -VIDEO_UPDATE( atetris ); +SCREEN_UPDATE( atetris ); WRITE8_HANDLER( atetris_videoram_w ); diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index c311f70cc61..f05ee5ebfdd 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -26,4 +26,4 @@ public: WRITE16_HANDLER( badlands_pf_bank_w ); VIDEO_START( badlands ); -VIDEO_UPDATE( badlands ); +SCREEN_UPDATE( badlands ); diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index a3d6c1a1591..ccb9f07531a 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -38,4 +38,4 @@ WRITE8_HANDLER( bagman_flipscreen_w ); PALETTE_INIT( bagman ); VIDEO_START( bagman ); -VIDEO_UPDATE( bagman ); +SCREEN_UPDATE( bagman ); diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index e245cdcae0b..8adbf6f41e7 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -181,7 +181,7 @@ WRITE16_HANDLER( shrike_io_68k_w ); /*----------- defined in video/balsente.c -----------*/ VIDEO_START( balsente ); -VIDEO_UPDATE( balsente ); +SCREEN_UPDATE( balsente ); WRITE8_HANDLER( balsente_videoram_w ); WRITE8_HANDLER( balsente_paletteram_w ); diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 0f948917d73..6f2317fe80d 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -38,6 +38,6 @@ WRITE8_HANDLER( bankp_out_w ); PALETTE_INIT( bankp ); VIDEO_START( bankp ); -VIDEO_UPDATE( bankp ); +SCREEN_UPDATE( bankp ); diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index f3f05d0bf1d..6380ec875f9 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -20,8 +20,8 @@ public: /*----------- defined in video/baraduke.c -----------*/ VIDEO_START( baraduke ); -VIDEO_UPDATE( baraduke ); -VIDEO_EOF( baraduke ); +SCREEN_UPDATE( baraduke ); +SCREEN_EOF( baraduke ); READ8_HANDLER( baraduke_videoram_r ); WRITE8_HANDLER( baraduke_videoram_w ); READ8_HANDLER( baraduke_textram_r ); diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index 8760463dba9..46e21818d6b 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -21,6 +21,6 @@ public: /*----------- defined in video/batman.c -----------*/ VIDEO_START( batman ); -VIDEO_UPDATE( batman ); +SCREEN_UPDATE( batman ); void batman_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index aa06b5393a2..58f6577c340 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -37,4 +37,4 @@ WRITE8_HANDLER( battlane_bitmap_w ); WRITE8_HANDLER( battlane_video_ctrl_w ); VIDEO_START( battlane ); -VIDEO_UPDATE( battlane ); +SCREEN_UPDATE( battlane ); diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index 4414c0e8bcf..fed506e2724 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -28,7 +28,7 @@ public: /*----------- defined in video/battlera.c -----------*/ -VIDEO_UPDATE( battlera ); +SCREEN_UPDATE( battlera ); VIDEO_START( battlera ); INTERRUPT_GEN( battlera_interrupt ); diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 1b8b8d4044a..814f73c3ea6 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -30,4 +30,4 @@ extern WRITE8_HANDLER( battlex_flipscreen_w ); extern PALETTE_INIT( battlex ); extern VIDEO_START( battlex ); -extern VIDEO_UPDATE( battlex ); +extern SCREEN_UPDATE( battlex ); diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index 12c097f75fb..89363784421 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -28,7 +28,7 @@ public: WRITE8_HANDLER( battlnts_spritebank_w ); -VIDEO_UPDATE( battlnts ); +SCREEN_UPDATE( battlnts ); void battlnts_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags); void battlnts_sprite_callback(running_machine *machine, int *code, int *color); diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 1da6442732b..9c57e09edee 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -28,8 +28,8 @@ public: VIDEO_START( bbuster ); VIDEO_START( mechatt ); -VIDEO_UPDATE( bbuster ); -VIDEO_UPDATE( mechatt ); +SCREEN_UPDATE( bbuster ); +SCREEN_UPDATE( mechatt ); WRITE16_HANDLER( bbusters_pf1_w ); WRITE16_HANDLER( bbusters_pf2_w ); diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h index 7219134f704..68a361ae82b 100644 --- a/src/mame/includes/beathead.h +++ b/src/mame/includes/beathead.h @@ -20,7 +20,7 @@ public: virtual void machine_reset(); virtual void video_start(); - virtual bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); + virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); required_device<asap_device> m_maincpu; diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h index 6eb7669c97f..b7802157d59 100644 --- a/src/mame/includes/beezer.h +++ b/src/mame/includes/beezer.h @@ -34,6 +34,6 @@ READ8_DEVICE_HANDLER( beezer_noise_r ); /*----------- defined in video/beezer.c -----------*/ INTERRUPT_GEN( beezer_interrupt ); -VIDEO_UPDATE( beezer ); +SCREEN_UPDATE( beezer ); WRITE8_HANDLER( beezer_map_w ); READ8_HANDLER( beezer_line_r ); diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index fc6cc41b8d9..e9a357c7b0f 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -60,7 +60,7 @@ READ8_HANDLER( bigevglf_mcu_status_r ); /*----------- defined in video/bigevglf.c -----------*/ VIDEO_START( bigevglf ); -VIDEO_UPDATE( bigevglf ); +SCREEN_UPDATE( bigevglf ); READ8_HANDLER( bigevglf_vidram_r ); WRITE8_HANDLER( bigevglf_vidram_w ); diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 3a0fe14f328..76ea70e7aa8 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -24,4 +24,4 @@ WRITE16_HANDLER( bsb_videoram_w ); WRITE16_HANDLER( bsb_videoram2_w ); WRITE16_HANDLER( bsb_videoram3_w ); VIDEO_START(bigstrkb); -VIDEO_UPDATE(bigstrkb); +SCREEN_UPDATE(bigstrkb); diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 88ccb28fc36..4cc5847f689 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -36,5 +36,5 @@ WRITE16_HANDLER( bionicc_scroll_w ); WRITE16_HANDLER( bionicc_gfxctrl_w ); VIDEO_START( bionicc ); -VIDEO_UPDATE( bionicc ); -VIDEO_EOF( bionicc ); +SCREEN_UPDATE( bionicc ); +SCREEN_EOF( bionicc ); diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index c103aaa13ca..612d1b22054 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -37,4 +37,4 @@ public: extern void bishi_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags); VIDEO_START(bishi); -VIDEO_UPDATE(bishi); +SCREEN_UPDATE(bishi); diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 497a6c4caba..048118ed250 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -60,5 +60,5 @@ READ8_HANDLER( bking_pos_r ); PALETTE_INIT( bking ); VIDEO_START( bking ); -VIDEO_UPDATE( bking ); -VIDEO_EOF( bking ); +SCREEN_UPDATE( bking ); +SCREEN_EOF( bking ); diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 8011e018531..af7936c39df 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -32,7 +32,7 @@ public: PALETTE_INIT( bladestl ); -VIDEO_UPDATE( bladestl ); +SCREEN_UPDATE( bladestl ); void bladestl_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags); void bladestl_sprite_callback(running_machine *machine, int *code, int *color); diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 2c938c3d9ce..1067502399d 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -48,5 +48,5 @@ WRITE8_HANDLER( blktiger_scrollx_w ); WRITE8_HANDLER( blktiger_scrolly_w ); VIDEO_START( blktiger ); -VIDEO_UPDATE( blktiger ); -VIDEO_EOF( blktiger ); +SCREEN_UPDATE( blktiger ); +SCREEN_EOF( blktiger ); diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 492c157a620..fdc255011db 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -37,4 +37,4 @@ WRITE16_HANDLER( blmbycar_vram_0_w ); WRITE16_HANDLER( blmbycar_vram_1_w ); VIDEO_START( blmbycar ); -VIDEO_UPDATE( blmbycar ); +SCREEN_UPDATE( blmbycar ); diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index fbfe05e7130..27efebdf803 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -23,7 +23,7 @@ public: WRITE8_HANDLER( blockade_videoram_w ); VIDEO_START( blockade ); -VIDEO_UPDATE( blockade ); +SCREEN_UPDATE( blockade ); /*----------- defined in audio/blockade.c -----------*/ diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h index 16526853ce3..187eb346b29 100644 --- a/src/mame/includes/blockhl.h +++ b/src/mame/includes/blockhl.h @@ -34,4 +34,4 @@ extern void blockhl_tile_callback(running_machine *machine, int layer,int bank,i extern void blockhl_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow); VIDEO_START( blockhl ); -VIDEO_UPDATE( blockhl ); +SCREEN_UPDATE( blockhl ); diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index 8fc6beda47b..f52394ed9e0 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -31,4 +31,4 @@ WRITE16_HANDLER( blockout_paletteram_w ); WRITE16_HANDLER( blockout_frontcolor_w ); VIDEO_START( blockout ); -VIDEO_UPDATE( blockout ); +SCREEN_UPDATE( blockout ); diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index 5ce3578d71b..5cb9ced9113 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -8,7 +8,7 @@ WRITE16_HANDLER( bloodbro_bgvideoram_w ); WRITE16_HANDLER( bloodbro_fgvideoram_w ); WRITE16_HANDLER( bloodbro_txvideoram_w ); -VIDEO_UPDATE( bloodbro ); -VIDEO_UPDATE( weststry ); -VIDEO_UPDATE( skysmash ); +SCREEN_UPDATE( bloodbro ); +SCREEN_UPDATE( weststry ); +SCREEN_UPDATE( skysmash ); VIDEO_START( bloodbro ); diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index 4afce0645d4..170ae8f1957 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -19,6 +19,6 @@ public: /*----------- defined in video/blstroid.c -----------*/ VIDEO_START( blstroid ); -VIDEO_UPDATE( blstroid ); +SCREEN_UPDATE( blstroid ); void blstroid_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index ff6c7cefe74..9bad50241ac 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -37,4 +37,4 @@ WRITE8_HANDLER( blueprnt_flipscreen_w ); PALETTE_INIT( blueprnt ); VIDEO_START( blueprnt ); -VIDEO_UPDATE( blueprnt ); +SCREEN_UPDATE( blueprnt ); diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index cfdb22a75d1..a3d6bdf6d34 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -39,4 +39,4 @@ WRITE8_HANDLER( bogeyman_paletteram_w ); PALETTE_INIT( bogeyman ); VIDEO_START( bogeyman ); -VIDEO_UPDATE( bogeyman ); +SCREEN_UPDATE( bogeyman ); diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index 1a30181daf1..e783c93ca3b 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -34,4 +34,4 @@ WRITE8_HANDLER( bombjack_background_w ); WRITE8_HANDLER( bombjack_flipscreen_w ); VIDEO_START( bombjack ); -VIDEO_UPDATE( bombjack ); +SCREEN_UPDATE( bombjack ); diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index db4766fec06..9fdf5ec4d70 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -35,5 +35,5 @@ public: /*----------- defined in video/boogwing.c -----------*/ -VIDEO_UPDATE( boogwing ); +SCREEN_UPDATE( boogwing ); diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index 022784aa16c..e6b3220cd86 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -38,4 +38,4 @@ extern void bottom9_sprite_callback(running_machine *machine, int *code,int *col extern void bottom9_zoom_callback(running_machine *machine, int *code,int *color,int *flags); VIDEO_START( bottom9 ); -VIDEO_UPDATE( bottom9 ); +SCREEN_UPDATE( bottom9 ); diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 5083928f0ab..811d53245ac 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -38,4 +38,4 @@ WRITE8_HANDLER( brkthru_bgram_w ); WRITE8_HANDLER( brkthru_fgram_w ); VIDEO_START( brkthru ); PALETTE_INIT( brkthru ); -VIDEO_UPDATE( brkthru ); +SCREEN_UPDATE( brkthru ); diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index a2646dba2ee..7206911e6f0 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -60,6 +60,6 @@ DISCRETE_SOUND_EXTERN( bsktball ); /*----------- defined in video/bsktball.c -----------*/ VIDEO_START( bsktball ); -VIDEO_UPDATE( bsktball ); +SCREEN_UPDATE( bsktball ); WRITE8_HANDLER( bsktball_videoram_w ); diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 7f20d7e05ef..72d4692c8f1 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -59,13 +59,13 @@ PALETTE_INIT( lnc ); VIDEO_START( btime ); VIDEO_START( bnj ); -VIDEO_UPDATE( btime ); -VIDEO_UPDATE( cookrace ); -VIDEO_UPDATE( bnj ); -VIDEO_UPDATE( lnc ); -VIDEO_UPDATE( zoar ); -VIDEO_UPDATE( disco ); -VIDEO_UPDATE( eggs ); +SCREEN_UPDATE( btime ); +SCREEN_UPDATE( cookrace ); +SCREEN_UPDATE( bnj ); +SCREEN_UPDATE( lnc ); +SCREEN_UPDATE( zoar ); +SCREEN_UPDATE( disco ); +SCREEN_UPDATE( eggs ); WRITE8_HANDLER( btime_paletteram_w ); WRITE8_HANDLER( bnj_background_w ); diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index e2c4287616d..a0ea7ef17f7 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -94,4 +94,4 @@ WRITE8_HANDLER( bublbobl_68705_ddr_b_w ); /*----------- defined in video/bublbobl.c -----------*/ -VIDEO_UPDATE( bublbobl ); +SCREEN_UPDATE( bublbobl ); diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 324b3faa04d..adef26d4310 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -41,4 +41,4 @@ WRITE8_HANDLER( buggychl_bg_scrollx_w ); PALETTE_INIT( buggychl ); VIDEO_START( buggychl ); -VIDEO_UPDATE( buggychl ); +SCREEN_UPDATE( buggychl ); diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 9955055b1cb..e80b3b3c72d 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -55,4 +55,4 @@ WRITE8_HANDLER( bwing_scrollram_w ); READ8_HANDLER( bwing_scrollram_r ); VIDEO_START( bwing ); -VIDEO_UPDATE( bwing ); +SCREEN_UPDATE( bwing ); diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index 59b43da5040..d5b9b47e263 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -19,7 +19,7 @@ public: /*----------- defined in video/cabal.c -----------*/ extern VIDEO_START( cabal ); -extern VIDEO_UPDATE( cabal ); +extern SCREEN_UPDATE( cabal ); WRITE16_HANDLER( cabal_flipscreen_w ); WRITE16_HANDLER( cabal_background_videoram16_w ); WRITE16_HANDLER( cabal_text_videoram16_w ); diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index 7744fbcc998..cb3e6e4be42 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -6,4 +6,4 @@ WRITE8_HANDLER( calomega_videoram_w ); WRITE8_HANDLER( calomega_colorram_w ); PALETTE_INIT( calomega ); VIDEO_START( calomega ); -VIDEO_UPDATE( calomega ); +SCREEN_UPDATE( calomega ); diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 2b92e8ecef1..1c38ba15065 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -44,6 +44,6 @@ DISCRETE_SOUND_EXTERN( canyon ); /*----------- defined in video/canyon.c -----------*/ VIDEO_START( canyon ); -VIDEO_UPDATE( canyon ); +SCREEN_UPDATE( canyon ); WRITE8_HANDLER( canyon_videoram_w ); diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 18c17004b70..1a91d679438 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -31,7 +31,7 @@ public: /*----------- defined in video/capbowl.c -----------*/ VIDEO_START( capbowl ); -VIDEO_UPDATE( capbowl ); +SCREEN_UPDATE( capbowl ); WRITE8_HANDLER( bowlrama_blitter_w ); READ8_HANDLER( bowlrama_blitter_r ); diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 835ad0dba56..fb088a5227c 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -31,6 +31,6 @@ WRITE8_HANDLER( carjmbre_videoram_w ); PALETTE_INIT( carjmbre ); VIDEO_START( carjmbre ); -VIDEO_UPDATE( carjmbre ); +SCREEN_UPDATE( carjmbre ); diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index 6e309025f26..6f0210a8576 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -92,5 +92,5 @@ void carpolo_generate_car_border_interrupt(running_machine *machine, int car, in PALETTE_INIT( carpolo ); VIDEO_START( carpolo ); -VIDEO_UPDATE( carpolo ); -VIDEO_EOF( carpolo ); +SCREEN_UPDATE( carpolo ); +SCREEN_EOF( carpolo ); diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index c39b75a59a0..1ba96eff55a 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -142,7 +142,7 @@ VIDEO_START( cave_4_layers ); VIDEO_START( sailormn_3_layers ); -VIDEO_UPDATE( cave ); +SCREEN_UPDATE( cave ); void cave_get_sprite_info(running_machine *machine); void sailormn_tilebank_w(running_machine *machine, int bank); diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index 3b4c430cb19..a717f2679c4 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -38,4 +38,4 @@ WRITE8_HANDLER( cbasebal_scrollx_w ); WRITE8_HANDLER( cbasebal_scrolly_w ); VIDEO_START( cbasebal ); -VIDEO_UPDATE( cbasebal ); +SCREEN_UPDATE( cbasebal ); diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index 6086a0e2974..18b8419c487 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -34,4 +34,4 @@ public: WRITE16_HANDLER( twocrude_palette_24bit_rg_w ); WRITE16_HANDLER( twocrude_palette_24bit_b_w ); -VIDEO_UPDATE( twocrude ); +SCREEN_UPDATE( twocrude ); diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 5d8ee1284e7..7c5793ad5a9 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -49,7 +49,7 @@ public: VIDEO_START( ccastles ); -VIDEO_UPDATE( ccastles ); +SCREEN_UPDATE( ccastles ); WRITE8_HANDLER( ccastles_hscroll_w ); WRITE8_HANDLER( ccastles_vscroll_w ); diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 51bd738caaa..310ddc2229b 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -35,18 +35,18 @@ WRITE8_HANDLER( cannonb_flip_screen_w ); PALETTE_INIT( cclimber ); VIDEO_START( cclimber ); -VIDEO_UPDATE( cclimber ); +SCREEN_UPDATE( cclimber ); PALETTE_INIT( swimmer ); VIDEO_START( swimmer ); -VIDEO_UPDATE( swimmer ); +SCREEN_UPDATE( swimmer ); PALETTE_INIT( yamato ); -VIDEO_UPDATE( yamato ); +SCREEN_UPDATE( yamato ); PALETTE_INIT( toprollr ); VIDEO_START( toprollr ); -VIDEO_UPDATE( toprollr ); +SCREEN_UPDATE( toprollr ); /*----------- defined in audio/cclimber.c -----------*/ diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 4b797367b0f..3bad0b8e8c3 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -33,10 +33,10 @@ VIDEO_START( milliped ); VIDEO_START( warlords ); VIDEO_START( bullsdrt ); -VIDEO_UPDATE( centiped ); -VIDEO_UPDATE( milliped ); -VIDEO_UPDATE( warlords ); -VIDEO_UPDATE( bullsdrt ); +SCREEN_UPDATE( centiped ); +SCREEN_UPDATE( milliped ); +SCREEN_UPDATE( warlords ); +SCREEN_UPDATE( bullsdrt ); WRITE8_HANDLER( centiped_paletteram_w ); WRITE8_HANDLER( milliped_paletteram_w ); diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index 7167293d4ca..cd691011a2a 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -45,7 +45,7 @@ WRITE8_HANDLER( chaknpop_mcu_port_c_w ); PALETTE_INIT( chaknpop ); VIDEO_START( chaknpop ); -VIDEO_UPDATE( chaknpop ); +SCREEN_UPDATE( chaknpop ); READ8_HANDLER( chaknpop_gfxmode_r ); WRITE8_HANDLER( chaknpop_gfxmode_w ); diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index e6e62aba70f..cf94641642d 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -46,7 +46,7 @@ PALETTE_INIT( champbas ); PALETTE_INIT( exctsccr ); VIDEO_START( champbas ); VIDEO_START( exctsccr ); -VIDEO_UPDATE( champbas ); -VIDEO_UPDATE( exctsccr ); +SCREEN_UPDATE( champbas ); +SCREEN_UPDATE( exctsccr ); diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index afdf17d012b..d33050c7639 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -52,7 +52,7 @@ public: /*----------- defined in video/changela.c -----------*/ VIDEO_START( changela ); -VIDEO_UPDATE( changela ); +SCREEN_UPDATE( changela ); WRITE8_HANDLER( changela_colors_w ); WRITE8_HANDLER( changela_mem_device_select_w ); diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 81d47f8f09e..bacbf946e63 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -30,6 +30,6 @@ public: PALETTE_INIT( cheekyms ); VIDEO_START( cheekyms ); -VIDEO_UPDATE( cheekyms ); +SCREEN_UPDATE( cheekyms ); WRITE8_HANDLER( cheekyms_port_40_w ); WRITE8_HANDLER( cheekyms_port_80_w ); diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 8aad90d545f..b3eb0c789ad 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -40,4 +40,4 @@ extern void chqflag_zoom_callback_0(running_machine *machine, int *code,int *col extern void chqflag_zoom_callback_1(running_machine *machine, int *code,int *color,int *flags); VIDEO_START( chqflag ); -VIDEO_UPDATE( chqflag ); +SCREEN_UPDATE( chqflag ); diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h index 616b4a05d9d..768b769ee53 100644 --- a/src/mame/includes/cidelsa.h +++ b/src/mame/includes/cidelsa.h @@ -43,7 +43,7 @@ public: virtual void machine_reset(); virtual void video_start(); - bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) { m_vis->update_screen(&bitmap, &cliprect); return false; } + virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) { m_vis->update_screen(&bitmap, &cliprect); return false; } DECLARE_READ8_MEMBER( draco_sound_in_r ); DECLARE_READ8_MEMBER( draco_sound_ay8910_r ); diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 3f5e8eda533..726c246fca6 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -76,6 +76,6 @@ VIDEO_START( cinemat_16level ); VIDEO_START( cinemat_64level ); VIDEO_START( cinemat_color ); VIDEO_START( cinemat_qb3color ); -VIDEO_UPDATE( cinemat ); +SCREEN_UPDATE( cinemat ); -VIDEO_UPDATE( spacewar ); +SCREEN_UPDATE( spacewar ); diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index ba0ccebc60b..96703f38dc6 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -44,7 +44,7 @@ extern WRITE8_HANDLER( circus_clown_y_w ); extern WRITE8_HANDLER( circus_videoram_w ); extern VIDEO_START( circus ); -extern VIDEO_UPDATE( crash ); -extern VIDEO_UPDATE( circus ); -extern VIDEO_UPDATE( robotbwl ); -extern VIDEO_UPDATE( ripcord ); +extern SCREEN_UPDATE( crash ); +extern SCREEN_UPDATE( circus ); +extern SCREEN_UPDATE( robotbwl ); +extern SCREEN_UPDATE( ripcord ); diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 4dbe5a5206e..d0f242b014c 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -42,4 +42,4 @@ WRITE8_HANDLER( circusc_colorram_w ); VIDEO_START( circusc ); WRITE8_HANDLER( circusc_flipscreen_w ); PALETTE_INIT( circusc ); -VIDEO_UPDATE( circusc ); +SCREEN_UPDATE( circusc ); diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index da66ed117c0..e83cd42c2af 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -49,7 +49,7 @@ VIDEO_START( bigrun ); VIDEO_START( cischeat ); VIDEO_START( f1gpstar ); -VIDEO_UPDATE( bigrun ); -VIDEO_UPDATE( cischeat ); -VIDEO_UPDATE( f1gpstar ); -VIDEO_UPDATE( scudhamm ); +SCREEN_UPDATE( bigrun ); +SCREEN_UPDATE( cischeat ); +SCREEN_UPDATE( f1gpstar ); +SCREEN_UPDATE( scudhamm ); diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 7de461ee5c2..05bf5a04591 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -33,5 +33,5 @@ WRITE8_HANDLER( citycon_videoram_w ); WRITE8_HANDLER( citycon_linecolor_w ); WRITE8_HANDLER( citycon_background_w ); -VIDEO_UPDATE( citycon ); +SCREEN_UPDATE( citycon ); VIDEO_START( citycon ); diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 76e35f76a17..07ee2de2e65 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -36,4 +36,4 @@ WRITE8_HANDLER( graph_processor_w ); WRITE8_HANDLER( cloak_clearbmp_w ); VIDEO_START( cloak ); -VIDEO_UPDATE( cloak ); +SCREEN_UPDATE( cloak ); diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 353a727a86e..575bc15314e 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -44,7 +44,7 @@ public: /*----------- defined in video/cloud9.c -----------*/ VIDEO_START( cloud9 ); -VIDEO_UPDATE( cloud9 ); +SCREEN_UPDATE( cloud9 ); WRITE8_HANDLER( cloud9_video_control_w ); diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 42d0d6c18e8..9b14062d209 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -11,4 +11,4 @@ PALETTE_INIT( firebatl ); PALETTE_INIT( clshroad ); VIDEO_START( firebatl ); VIDEO_START( clshroad ); -VIDEO_UPDATE( clshroad ); +SCREEN_UPDATE( clshroad ); diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 7c80cb24179..13d54a68cdd 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -40,8 +40,8 @@ public: VIDEO_START( stoneage ); -VIDEO_UPDATE( cninja ); -VIDEO_UPDATE( cninjabl ); -VIDEO_UPDATE( edrandy ); -VIDEO_UPDATE( robocop2 ); -VIDEO_UPDATE( mutantf ); +SCREEN_UPDATE( cninja ); +SCREEN_UPDATE( cninjabl ); +SCREEN_UPDATE( edrandy ); +SCREEN_UPDATE( robocop2 ); +SCREEN_UPDATE( mutantf ); diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index e0ed1070111..e394276885a 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -55,5 +55,5 @@ PALETTE_INIT( combatsc ); PALETTE_INIT( combatscb ); VIDEO_START( combatsc ); VIDEO_START( combatscb ); -VIDEO_UPDATE( combatscb ); -VIDEO_UPDATE( combatsc ); +SCREEN_UPDATE( combatscb ); +SCREEN_UPDATE( combatsc ); diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index b3e19ff4b63..d838090fdd3 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -39,5 +39,5 @@ WRITE8_HANDLER( commando_scrolly_w ); WRITE8_HANDLER( commando_c804_w ); VIDEO_START( commando ); -VIDEO_UPDATE( commando ); -VIDEO_EOF( commando ); +SCREEN_UPDATE( commando ); +SCREEN_EOF( commando ); diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 8341b5e0d6f..159612cd721 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -31,4 +31,4 @@ WRITE8_HANDLER( compgolf_video_w ); WRITE8_HANDLER( compgolf_back_w ); PALETTE_INIT ( compgolf ); VIDEO_START ( compgolf ); -VIDEO_UPDATE ( compgolf ); +SCREEN_UPDATE( compgolf ); diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index bca9b339c3d..3b00a0127fd 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -47,5 +47,5 @@ WRITE8_HANDLER( contra_text_cram_w ); WRITE8_HANDLER( contra_K007121_ctrl_0_w ); WRITE8_HANDLER( contra_K007121_ctrl_1_w ); -VIDEO_UPDATE( contra ); +SCREEN_UPDATE( contra ); VIDEO_START( contra ); diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 489a088db00..c69b984dc2a 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -35,7 +35,7 @@ public: PALETTE_INIT( cop01 ); VIDEO_START( cop01 ); -VIDEO_UPDATE( cop01 ); +SCREEN_UPDATE( cop01 ); WRITE8_HANDLER( cop01_background_w ); WRITE8_HANDLER( cop01_foreground_w ); diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 965fb899cbe..cf7f86d8a4e 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -35,7 +35,7 @@ READ8_HANDLER( copsnrob_gun_position_r ); /*----------- defined in video/copsnrob.c -----------*/ -VIDEO_UPDATE( copsnrob ); +SCREEN_UPDATE( copsnrob ); /*----------- defined in audio/copsnrob.c -----------*/ diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 92cd77a80e6..07fc35f5851 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -50,9 +50,9 @@ PALETTE_INIT( cosmicg ); PALETTE_INIT( magspot ); PALETTE_INIT( nomnlnd ); -VIDEO_UPDATE( panic ); -VIDEO_UPDATE( magspot ); -VIDEO_UPDATE( devzone ); -VIDEO_UPDATE( cosmica ); -VIDEO_UPDATE( cosmicg ); -VIDEO_UPDATE( nomnlnd ); +SCREEN_UPDATE( panic ); +SCREEN_UPDATE( magspot ); +SCREEN_UPDATE( devzone ); +SCREEN_UPDATE( cosmica ); +SCREEN_UPDATE( cosmicg ); +SCREEN_UPDATE( nomnlnd ); diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index a459e8659c4..834e43573cd 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -167,8 +167,8 @@ WRITE16_HANDLER( cps2_objram2_w ); VIDEO_START( cps1 ); VIDEO_START( cps2 ); -VIDEO_UPDATE( cps1 ); -VIDEO_EOF( cps1 ); +SCREEN_UPDATE( cps1 ); +SCREEN_EOF( cps1 ); void cps1_get_video_base(running_machine *machine); void cps2_set_sprite_priorities(running_machine *machine); diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 85e8f9b2aaa..a1c4bbebdf9 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -40,7 +40,7 @@ MACHINE_CONFIG_EXTERN( crbaloon_audio ); PALETTE_INIT( crbaloon ); VIDEO_START( crbaloon ); -VIDEO_UPDATE( crbaloon ); +SCREEN_UPDATE( crbaloon ); WRITE8_HANDLER( crbaloon_videoram_w ); WRITE8_HANDLER( crbaloon_colorram_w ); diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index 50be912ef51..d7e5504977c 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -30,4 +30,4 @@ extern void crimfght_tile_callback(running_machine *machine, int layer,int bank, extern void crimfght_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow); VIDEO_START( crimfght ); -VIDEO_UPDATE( crimfght ); +SCREEN_UPDATE( crimfght ); diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 25b1b19c320..8ca23316c13 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -30,7 +30,7 @@ public: /*----------- defined in video/crospang.c -----------*/ VIDEO_START( crospang ); -VIDEO_UPDATE( crospang ); +SCREEN_UPDATE( crospang ); WRITE16_HANDLER ( crospang_fg_scrolly_w ); WRITE16_HANDLER ( crospang_bg_scrolly_w ); diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 1278ba64bf0..446d142ffad 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -32,5 +32,5 @@ WRITE16_HANDLER( crshrace_roz_bank_w ); WRITE16_HANDLER( crshrace_gfxctrl_w ); VIDEO_START( crshrace ); -VIDEO_EOF( crshrace ); -VIDEO_UPDATE( crshrace ); +SCREEN_EOF( crshrace ); +SCREEN_UPDATE( crshrace ); diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index dbcb7008630..c8e13cd026a 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -100,11 +100,11 @@ READ8_HANDLER( cvs_collision_clear ); void cvs_scroll_stars(running_machine *machine); PALETTE_INIT( cvs ); -VIDEO_UPDATE( cvs ); +SCREEN_UPDATE( cvs ); VIDEO_START( cvs ); /*----------- defined in video/quasar.c -----------*/ PALETTE_INIT( quasar ); -VIDEO_UPDATE( quasar ); +SCREEN_UPDATE( quasar ); VIDEO_START( quasar ); diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 696dfe997db..e60e6eef039 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -57,6 +57,6 @@ WRITE16_HANDLER( cyberbal_paletteram_1_w ); VIDEO_START( cyberbal ); VIDEO_START( cyberbal2p ); -VIDEO_UPDATE( cyberbal ); +SCREEN_UPDATE( cyberbal ); void cyberbal_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 220ff8803a6..6a3410251df 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -69,4 +69,4 @@ public: WRITE16_HANDLER( darius_fg_layer_w ); VIDEO_START( darius ); -VIDEO_UPDATE( darius ); +SCREEN_UPDATE( darius ); diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 7626b52bd0e..ede6bd7b49f 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -18,6 +18,6 @@ public: /*----------- defined in video/darkmist.c -----------*/ VIDEO_START( darkmist ); -VIDEO_UPDATE( darkmist ); +SCREEN_UPDATE( darkmist ); PALETTE_INIT( darkmist ); diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 0114b7c7564..86b51006b8b 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -22,7 +22,7 @@ public: /*----------- defined in video/darkseal.c -----------*/ VIDEO_START( darkseal ); -VIDEO_UPDATE( darkseal ); +SCREEN_UPDATE( darkseal ); WRITE16_HANDLER( darkseal_pf1_data_w ); WRITE16_HANDLER( darkseal_pf2_data_w ); diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index ca1c40b90fc..a56be36b753 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -37,4 +37,4 @@ public: /*----------- defined in video/dassault.c -----------*/ -VIDEO_UPDATE( dassault ); +SCREEN_UPDATE( dassault ); diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 6fedd64f247..5f18ea0c27f 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -42,4 +42,4 @@ WRITE16_HANDLER(dbz_bg1_videoram_w); WRITE16_HANDLER(dbz_bg2_videoram_w); VIDEO_START(dbz); -VIDEO_UPDATE(dbz); +SCREEN_UPDATE(dbz); diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index f86cd2ca853..8153950771a 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -217,7 +217,7 @@ WRITE64_HANDLER( pvr_ta_w ); WRITE64_HANDLER( ta_fifo_poly_w ); WRITE64_HANDLER( ta_fifo_yuv_w ); VIDEO_START(dc); -VIDEO_UPDATE(dc); +SCREEN_UPDATE(dc); /*--------------- CORE registers --------------*/ #define PVRID ((0x005f8000-0x005f8000)/4) diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index 1955cdf2a0d..216739afa74 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -42,7 +42,7 @@ void dcheese_signal_irq(running_machine *machine, int which); PALETTE_INIT( dcheese ); VIDEO_START( dcheese ); -VIDEO_UPDATE( dcheese ); +SCREEN_UPDATE( dcheese ); WRITE16_HANDLER( madmax_blitter_color_w ); WRITE16_HANDLER( madmax_blitter_xparam_w ); diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index bb3111078c8..5e18150f3d2 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -11,5 +11,5 @@ WRITE16_HANDLER( dcon_control_w ); READ16_HANDLER( dcon_control_r ); VIDEO_START( dcon ); -VIDEO_UPDATE( dcon ); -VIDEO_UPDATE( sdgndmps ); +SCREEN_UPDATE( dcon ); +SCREEN_UPDATE( sdgndmps ); diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index eb60471b9f7..0df5498d3c8 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -34,7 +34,7 @@ public: PALETTE_INIT( dday ); VIDEO_START( dday ); -VIDEO_UPDATE( dday ); +SCREEN_UPDATE( dday ); WRITE8_HANDLER( dday_bgvideoram_w ); WRITE8_HANDLER( dday_fgvideoram_w ); diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index a5c0e5bae57..7d60b23ff48 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -63,5 +63,5 @@ WRITE8_HANDLER( ddragon_fgvideoram_w ); VIDEO_START( chinagat ); VIDEO_START( ddragon ); -VIDEO_UPDATE( ddragon ); +SCREEN_UPDATE( ddragon ); diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 258365da449..d881b501c0c 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -43,5 +43,5 @@ extern WRITE16_HANDLER( ddragon3_scroll_w ); extern READ16_HANDLER( ddragon3_scroll_r ); extern VIDEO_START( ddragon3 ); -extern VIDEO_UPDATE( ddragon3 ); -extern VIDEO_UPDATE( ctribe ); +extern SCREEN_UPDATE( ddragon3 ); +extern SCREEN_UPDATE( ctribe ); diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 18296bc84d9..0ba29ef0bda 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -42,4 +42,4 @@ WRITE8_HANDLER( K005885_1_w ); PALETTE_INIT( ddribble ); VIDEO_START( ddribble ); -VIDEO_UPDATE( ddribble ); +SCREEN_UPDATE( ddribble ); diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 1a0c71b64a2..23aa5bf3bd5 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -17,4 +17,4 @@ WRITE16_HANDLER( deadang_text_w ); WRITE16_HANDLER( deadang_bank_w ); VIDEO_START( deadang ); -VIDEO_UPDATE( deadang ); +SCREEN_UPDATE( deadang ); diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 1b817e310af..676be5b2de5 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -51,13 +51,13 @@ public: /* Video emulation definitions */ VIDEO_START( dec0 ); VIDEO_START( dec0_nodma ); -VIDEO_UPDATE( hbarrel ); -VIDEO_UPDATE( baddudes ); -VIDEO_UPDATE( birdtry ); -VIDEO_UPDATE( robocop ); -VIDEO_UPDATE( hippodrm ); -VIDEO_UPDATE( slyspy ); -VIDEO_UPDATE( midres ); +SCREEN_UPDATE( hbarrel ); +SCREEN_UPDATE( baddudes ); +SCREEN_UPDATE( birdtry ); +SCREEN_UPDATE( robocop ); +SCREEN_UPDATE( hippodrm ); +SCREEN_UPDATE( slyspy ); +SCREEN_UPDATE( midres ); WRITE16_HANDLER( dec0_pf1_control_0_w ); diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 13e80036402..e14619bf1ca 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -41,14 +41,14 @@ public: PALETTE_INIT( ghostb ); -VIDEO_UPDATE( cobracom ); -VIDEO_UPDATE( ghostb ); -VIDEO_UPDATE( srdarwin ); -VIDEO_UPDATE( gondo ); -VIDEO_UPDATE( garyoret ); -VIDEO_UPDATE( lastmisn ); -VIDEO_UPDATE( shackled ); -VIDEO_UPDATE( oscar ); +SCREEN_UPDATE( cobracom ); +SCREEN_UPDATE( ghostb ); +SCREEN_UPDATE( srdarwin ); +SCREEN_UPDATE( gondo ); +SCREEN_UPDATE( garyoret ); +SCREEN_UPDATE( lastmisn ); +SCREEN_UPDATE( shackled ); +SCREEN_UPDATE( oscar ); VIDEO_START( cobracom ); VIDEO_START( oscar ); VIDEO_START( ghostb ); diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 470e919cd1f..74ef89b73f9 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -72,13 +72,13 @@ VIDEO_START( dragngun ); VIDEO_START( lockload ); VIDEO_START( nslasher ); -VIDEO_EOF( captaven ); -VIDEO_EOF( dragngun ); +SCREEN_EOF( captaven ); +SCREEN_EOF( dragngun ); -VIDEO_UPDATE( captaven ); -VIDEO_UPDATE( fghthist ); -VIDEO_UPDATE( dragngun ); -VIDEO_UPDATE( nslasher ); +SCREEN_UPDATE( captaven ); +SCREEN_UPDATE( fghthist ); +SCREEN_UPDATE( dragngun ); +SCREEN_UPDATE( nslasher ); WRITE32_HANDLER( deco32_pf1_data_w ); diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index 7f0ebcff690..6111b9b17f7 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -21,5 +21,5 @@ public: /*----------- defined in video/deco_mlc.c -----------*/ VIDEO_START( mlc ); -VIDEO_UPDATE( mlc ); -VIDEO_EOF( mlc ); +SCREEN_UPDATE( mlc ); +SCREEN_EOF( mlc ); diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index de8b73b0960..e917cc5de8e 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -42,7 +42,7 @@ READ16_HANDLER( deniam_coinctrl_r ); WRITE16_HANDLER( deniam_coinctrl_w ); VIDEO_START( deniam ); -VIDEO_UPDATE( deniam ); +SCREEN_UPDATE( deniam ); DRIVER_INIT( logicpro ); DRIVER_INIT( karianx ); diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index 0f8bc3468c0..46de4888d5c 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -27,4 +27,4 @@ public: /*----------- defined in video/dietgo.c -----------*/ -VIDEO_UPDATE( dietgo ); +SCREEN_UPDATE( dietgo ); diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 9b6698bd78b..6dde642ad8a 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -51,5 +51,5 @@ WRITE8_HANDLER( djboy_videoram_w ); WRITE8_HANDLER( djboy_paletteram_w ); VIDEO_START( djboy ); -VIDEO_UPDATE( djboy ); -VIDEO_EOF( djboy ); +SCREEN_UPDATE( djboy ); +SCREEN_EOF( djboy ); diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 444b2d1bc2c..23dc0db9b2d 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -20,7 +20,7 @@ public: /*----------- defined in video/djmain.c -----------*/ -VIDEO_UPDATE( djmain ); +SCREEN_UPDATE( djmain ); VIDEO_START( djmain ); void djmain_tile_callback(running_machine* machine, int layer, int *code, int *color, int *flags); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index ecddf53c37d..6459a244a99 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -202,9 +202,9 @@ PALETTE_INIT( radarscp1 ); PALETTE_INIT( dkong3 ); VIDEO_START( dkong ); -VIDEO_UPDATE( dkong ); -VIDEO_UPDATE( pestplce ); -VIDEO_UPDATE( spclforc ); +SCREEN_UPDATE( dkong ); +SCREEN_UPDATE( pestplce ); +SCREEN_UPDATE( spclforc ); /*----------- defined in audio/dkong.c -----------*/ diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 2620aa5fe0a..0d778df2b98 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -47,5 +47,5 @@ WRITE8_HANDLER( docastle_flipscreen_on_w ); PALETTE_INIT( docastle ); VIDEO_START( docastle ); VIDEO_START( dorunrun ); -VIDEO_UPDATE( docastle ); +SCREEN_UPDATE( docastle ); diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index c87cfd44a07..b900218508b 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -43,4 +43,4 @@ WRITE8_HANDLER( dogfgt_1800_w ); PALETTE_INIT( dogfgt ); VIDEO_START( dogfgt ); -VIDEO_UPDATE( dogfgt ); +SCREEN_UPDATE( dogfgt ); diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index 2b33d6af1d2..e09b92274f3 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -58,14 +58,14 @@ WRITE8_HANDLER( paletteram_flytiger_w ); WRITE8_HANDLER( flytiger_ctrl_w ); WRITE16_HANDLER( rshark_ctrl_w ); -VIDEO_UPDATE( lastday ); -VIDEO_UPDATE( gulfstrm ); -VIDEO_UPDATE( pollux ); -VIDEO_UPDATE( bluehawk ); -VIDEO_UPDATE( flytiger ); -VIDEO_UPDATE( primella ); -VIDEO_UPDATE( rshark ); -VIDEO_UPDATE( popbingo ); +SCREEN_UPDATE( lastday ); +SCREEN_UPDATE( gulfstrm ); +SCREEN_UPDATE( pollux ); +SCREEN_UPDATE( bluehawk ); +SCREEN_UPDATE( flytiger ); +SCREEN_UPDATE( primella ); +SCREEN_UPDATE( rshark ); +SCREEN_UPDATE( popbingo ); VIDEO_START( lastday ); VIDEO_START( gulfstrm ); @@ -76,5 +76,5 @@ VIDEO_START( primella ); VIDEO_START( rshark ); VIDEO_START( popbingo ); -VIDEO_EOF( dooyong ); -VIDEO_EOF( rshark ); +SCREEN_EOF( dooyong ); +SCREEN_EOF( rshark ); diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 3d4901c33e8..ebf71f0a143 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -51,4 +51,4 @@ DISCRETE_SOUND_EXTERN( dragrace ); /*----------- defined in video/dragrace.c -----------*/ VIDEO_START( dragrace ); -VIDEO_UPDATE( dragrace ); +SCREEN_UPDATE( dragrace ); diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 25dcc20136e..b5704b43243 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -45,4 +45,4 @@ WRITE16_HANDLER( drgnmst_bg_videoram_w ); WRITE16_HANDLER( drgnmst_md_videoram_w ); VIDEO_START(drgnmst); -VIDEO_UPDATE(drgnmst); +SCREEN_UPDATE(drgnmst); diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index 341cba331c2..ec9c70a41af 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -33,4 +33,4 @@ public: PALETTE_INIT( dribling ); WRITE8_HANDLER( dribling_colorram_w ); -VIDEO_UPDATE( dribling ); +SCREEN_UPDATE( dribling ); diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 2d3b266b97b..70d4e2e7440 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -31,6 +31,6 @@ public: PALETTE_INIT( drmicro ); VIDEO_START( drmicro ); -VIDEO_UPDATE( drmicro ); +SCREEN_UPDATE( drmicro ); WRITE8_HANDLER( drmicro_videoram_w ); diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 76b5cc16593..2ea7ebde6c3 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -184,12 +184,12 @@ VIDEO_START( mjelctrn ); VIDEO_START( neruton ); VIDEO_START( htengoku ); -VIDEO_UPDATE( hanamai ); -VIDEO_UPDATE( hnoridur ); -VIDEO_UPDATE( sprtmtch ); -VIDEO_UPDATE( mjdialq2 ); -VIDEO_UPDATE( jantouki ); -VIDEO_UPDATE( htengoku ); +SCREEN_UPDATE( hanamai ); +SCREEN_UPDATE( hnoridur ); +SCREEN_UPDATE( sprtmtch ); +SCREEN_UPDATE( mjdialq2 ); +SCREEN_UPDATE( jantouki ); +SCREEN_UPDATE( htengoku ); PALETTE_INIT( sprtmtch ); @@ -205,4 +205,4 @@ WRITE8_HANDLER( ddenlovr_transparency_pen_w ); WRITE8_HANDLER( ddenlovr_transparency_mask_w ); VIDEO_START(ddenlovr); -VIDEO_UPDATE(ddenlovr); +SCREEN_UPDATE(ddenlovr); diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 3102b6a701f..aede4ce7541 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -19,5 +19,5 @@ WRITE16_HANDLER( dynduke_gfxbank_w ); WRITE16_HANDLER( dynduke_control_w ); WRITE16_HANDLER( dynduke_paletteram_w ); VIDEO_START( dynduke ); -VIDEO_UPDATE( dynduke ); -VIDEO_EOF( dynduke ); +SCREEN_UPDATE( dynduke ); +SCREEN_EOF( dynduke ); diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 044b13c960e..b7c966864cb 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -15,4 +15,4 @@ public: READ32_HANDLER( eolith_vram_r ); WRITE32_HANDLER( eolith_vram_w ); VIDEO_START( eolith ); -VIDEO_UPDATE( eolith ); +SCREEN_UPDATE( eolith ); diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 466b5cb37ab..9c3b4b08a70 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -25,4 +25,4 @@ public: /*----------- defined in video/epos.c -----------*/ WRITE8_HANDLER( epos_port_1_w ); -VIDEO_UPDATE( epos ); +SCREEN_UPDATE( epos ); diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 1c9e42d7205..97277963a16 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -22,9 +22,9 @@ public: /*----------- defined in video/eprom.c -----------*/ VIDEO_START( eprom ); -VIDEO_UPDATE( eprom ); +SCREEN_UPDATE( eprom ); VIDEO_START( guts ); -VIDEO_UPDATE( guts ); +SCREEN_UPDATE( guts ); void eprom_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 8196364eb57..744383d232e 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -65,7 +65,7 @@ extern WRITE16_HANDLER(splndrbt_bg_scrolly_w); extern PALETTE_INIT( equites ); extern VIDEO_START( equites ); -extern VIDEO_UPDATE( equites ); +extern SCREEN_UPDATE( equites ); extern PALETTE_INIT( splndrbt ); extern VIDEO_START( splndrbt ); -extern VIDEO_UPDATE( splndrbt ); +extern SCREEN_UPDATE( splndrbt ); diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 18164fb932a..cbb04b5fb6e 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -40,6 +40,6 @@ WRITE16_HANDLER( esd16_vram_1_w ); WRITE16_HANDLER( esd16_tilemap0_color_w ); VIDEO_START( esd16 ); -VIDEO_UPDATE( esd16 ); -VIDEO_UPDATE( hedpanic ); -VIDEO_UPDATE( hedpanio ); +SCREEN_UPDATE( esd16 ); +SCREEN_UPDATE( hedpanic ); +SCREEN_UPDATE( hedpanio ); diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index efa39a8f0e8..d90c129ac04 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -40,4 +40,4 @@ WRITE8_HANDLER( espial_colorram_w ); WRITE8_HANDLER( espial_attributeram_w ); WRITE8_HANDLER( espial_scrollram_w ); WRITE8_HANDLER( espial_flipscreen_w ); -VIDEO_UPDATE( espial ); +SCREEN_UPDATE( espial ); diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index c48e47b05b8..c9d8682a34b 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -25,7 +25,7 @@ extern int esripsys__12sel; extern int esripsys_video_firq_en; VIDEO_START( esripsys ); -VIDEO_UPDATE( esripsys ); +SCREEN_UPDATE( esripsys ); WRITE8_HANDLER( esripsys_bg_intensity_w ); INTERRUPT_GEN( esripsys_vblank_irq ); diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index d31d3e167d3..dc849d98a71 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -35,5 +35,5 @@ extern WRITE8_HANDLER( exedexes_gfxctrl_w ); extern PALETTE_INIT( exedexes ); extern VIDEO_START( exedexes ); -extern VIDEO_UPDATE( exedexes ); -extern VIDEO_EOF( exedexes ); +extern SCREEN_UPDATE( exedexes ); +extern SCREEN_EOF( exedexes ); diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index bd2914f6846..74a9daf6c77 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -53,7 +53,7 @@ public: PALETTE_INIT( exerion ); VIDEO_START( exerion ); -VIDEO_UPDATE( exerion ); +SCREEN_UPDATE( exerion ); WRITE8_HANDLER( exerion_videoreg_w ); WRITE8_HANDLER( exerion_video_latch_w ); diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 1fb26f41d5c..9ac008f5952 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -33,7 +33,7 @@ extern UINT8 *exidy_sprite_enable; void exidy_video_config(UINT8 _collision_mask, UINT8 _collision_invert, int _is_2bpp); VIDEO_START( exidy ); -VIDEO_UPDATE( exidy ); +SCREEN_UPDATE( exidy ); INTERRUPT_GEN( exidy_vblank_interrupt ); INTERRUPT_GEN( teetert_vblank_interrupt ); diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index abd90c6250d..d60df24da9f 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -41,4 +41,4 @@ extern WRITE8_HANDLER( exprraid_scrollx_w ); extern WRITE8_HANDLER( exprraid_scrolly_w ); extern VIDEO_START( exprraid ); -extern VIDEO_UPDATE( exprraid ); +extern SCREEN_UPDATE( exprraid ); diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 2ffa0ccd4db..95148c0658a 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -28,6 +28,6 @@ WRITE8_HANDLER( exzisus_videoram_1_w ); WRITE8_HANDLER( exzisus_objectram_0_w ); WRITE8_HANDLER( exzisus_objectram_1_w ); -VIDEO_UPDATE( exzisus ); +SCREEN_UPDATE( exzisus ); diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 81b3a709089..7893cff57f0 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -50,6 +50,6 @@ WRITE16_HANDLER( f1gp2_gfxctrl_w ); VIDEO_START( f1gp ); VIDEO_START( f1gpb ); VIDEO_START( f1gp2 ); -VIDEO_UPDATE( f1gp ); -VIDEO_UPDATE( f1gpb ); -VIDEO_UPDATE( f1gp2 ); +SCREEN_UPDATE( f1gp ); +SCREEN_UPDATE( f1gpb ); +SCREEN_UPDATE( f1gp2 ); diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 4f9cf4e607c..e311ec9848b 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -30,4 +30,4 @@ public: /*----------- defined in video/fantland.c -----------*/ -VIDEO_UPDATE( fantland ); +SCREEN_UPDATE( fantland ); diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index 82083a9b5b3..bdc4b49c0c8 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -41,9 +41,9 @@ WRITE8_HANDLER( fastfred_colorbank1_w ); WRITE8_HANDLER( fastfred_colorbank2_w ); WRITE8_HANDLER( fastfred_flip_screen_x_w ); WRITE8_HANDLER( fastfred_flip_screen_y_w ); -VIDEO_UPDATE( fastfred ); +SCREEN_UPDATE( fastfred ); VIDEO_START( imago ); -VIDEO_UPDATE( imago ); +SCREEN_UPDATE( imago ); WRITE8_HANDLER( imago_fg_videoram_w ); WRITE8_HANDLER( imago_charbank_w ); diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index cd1bd72882b..871b7fe3383 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -36,4 +36,4 @@ WRITE8_HANDLER( fastlane_vram2_w ); PALETTE_INIT( fastlane ); VIDEO_START( fastlane ); -VIDEO_UPDATE( fastlane ); +SCREEN_UPDATE( fastlane ); diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index bca6c634d24..0df35c16aaf 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -55,6 +55,6 @@ public: PALETTE_INIT( fcombat ); VIDEO_START( fcombat ); -VIDEO_UPDATE( fcombat ); +SCREEN_UPDATE( fcombat ); WRITE8_HANDLER( fcombat_videoreg_w ); diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index fb531d50361..6ca87da05e4 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -28,7 +28,7 @@ public: /*----------- defined in video/fgoal.c -----------*/ VIDEO_START( fgoal ); -VIDEO_UPDATE( fgoal ); +SCREEN_UPDATE( fgoal ); WRITE8_HANDLER( fgoal_color_w ); WRITE8_HANDLER( fgoal_xpos_w ); diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index e5d63358c1b..cb463107ca7 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -40,4 +40,4 @@ WRITE8_HANDLER( finalizr_videoctrl_w ); PALETTE_INIT( finalizr ); VIDEO_START( finalizr ); -VIDEO_UPDATE( finalizr ); +SCREEN_UPDATE( finalizr ); diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 53c6c238ec5..66091ee1de8 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -50,4 +50,4 @@ WRITE8_HANDLER( firetrap_bg2_scrolly_w ); PALETTE_INIT( firetrap ); VIDEO_START( firetrap ); -VIDEO_UPDATE( firetrap ); +SCREEN_UPDATE( firetrap ); diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 8f919fb97f6..2a8d63ecaec 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -84,8 +84,8 @@ PALETTE_INIT( montecar ); VIDEO_START( firetrk ); VIDEO_START( superbug ); VIDEO_START( montecar ); -VIDEO_UPDATE( firetrk ); -VIDEO_UPDATE( superbug ); -VIDEO_UPDATE( montecar ); +SCREEN_UPDATE( firetrk ); +SCREEN_UPDATE( superbug ); +SCREEN_UPDATE( montecar ); diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index a072cf627df..b0bffcdcb1b 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -34,4 +34,4 @@ WRITE16_HANDLER( fof_mid_tileram_w ); WRITE16_HANDLER( fof_txt_tileram_w ); VIDEO_START(fitfight); -VIDEO_UPDATE(fitfight); +SCREEN_UPDATE(fitfight); diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index 0d71d9acbec..f8d90fb3a2a 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -37,4 +37,4 @@ WRITE8_HANDLER( flkatck_k007121_w ); WRITE8_HANDLER( flkatck_k007121_regs_w ); VIDEO_START( flkatck ); -VIDEO_UPDATE( flkatck ); +SCREEN_UPDATE( flkatck ); diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index 7c386297f65..256a8a05ea3 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -17,6 +17,6 @@ WRITE8_HANDLER( flower_bg0ram_w ); WRITE8_HANDLER( flower_bg1ram_w ); WRITE8_HANDLER( flower_flipscreen_w ); -VIDEO_UPDATE( flower ); +SCREEN_UPDATE( flower ); VIDEO_START( flower ); PALETTE_INIT( flower ); diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index b5e710d307c..f1ce8c0f11d 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -80,11 +80,11 @@ READ8_HANDLER( victnine_mcu_status_r ); /*----------- defined in video/flstory.c -----------*/ VIDEO_START( flstory ); -VIDEO_UPDATE( flstory ); +SCREEN_UPDATE( flstory ); VIDEO_START( victnine ); -VIDEO_UPDATE( victnine ); +SCREEN_UPDATE( victnine ); VIDEO_START( rumba ); -VIDEO_UPDATE( rumba ); +SCREEN_UPDATE( rumba ); WRITE8_HANDLER( flstory_videoram_w ); READ8_HANDLER( flstory_palette_r ); diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index 012492a02a0..2f2bb9ed65d 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -31,4 +31,4 @@ WRITE16_HANDLER( foodf_paletteram_w ); void foodf_set_flip(foodf_state *state, int flip); VIDEO_START( foodf ); -VIDEO_UPDATE( foodf ); +SCREEN_UPDATE( foodf ); diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index 114c7a065e3..c074768d68e 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -26,7 +26,7 @@ public: /*----------- defined in video/freekick.c -----------*/ VIDEO_START(freekick); -VIDEO_UPDATE(gigas); -VIDEO_UPDATE(pbillrd); -VIDEO_UPDATE(freekick); +SCREEN_UPDATE(gigas); +SCREEN_UPDATE(pbillrd); +SCREEN_UPDATE(freekick); WRITE8_HANDLER( freek_videoram_w ); diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index dc8e307a0a3..f0bb69dee64 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -33,7 +33,7 @@ public: /*----------- defined in video/fromanc2.c -----------*/ -VIDEO_UPDATE( fromanc2 ); +SCREEN_UPDATE( fromanc2 ); VIDEO_START( fromanc2 ); VIDEO_START( fromancr ); VIDEO_START( fromanc4 ); diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 2994e7d3498..e496a53ef57 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -50,8 +50,8 @@ VIDEO_START( fromance ); VIDEO_START( nekkyoku ); VIDEO_START( pipedrm ); VIDEO_START( hatris ); -VIDEO_UPDATE( fromance ); -VIDEO_UPDATE( pipedrm ); +SCREEN_UPDATE( fromance ); +SCREEN_UPDATE( pipedrm ); WRITE8_HANDLER( fromance_crtc_data_w ); WRITE8_HANDLER( fromance_crtc_register_w ); diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 44eda8161c7..51dc876ef7d 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -26,4 +26,4 @@ WRITE8_HANDLER( funkybee_flipscreen_w ); PALETTE_INIT( funkybee ); VIDEO_START( funkybee ); -VIDEO_UPDATE( funkybee ); +SCREEN_UPDATE( funkybee ); diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h index 00ff523ef52..dbceef0bef7 100644 --- a/src/mame/includes/funkyjet.h +++ b/src/mame/includes/funkyjet.h @@ -27,4 +27,4 @@ public: /*----------- defined in video/funkyjet.c -----------*/ -VIDEO_UPDATE( funkyjet ); +SCREEN_UPDATE( funkyjet ); diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index c4fcc80021c..41b8aa9d329 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -8,4 +8,4 @@ WRITE8_HANDLER( funworld_colorram_w ); PALETTE_INIT( funworld ); VIDEO_START( funworld ); VIDEO_START( magicrd2 ); -VIDEO_UPDATE( funworld ); +SCREEN_UPDATE( funworld ); diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index 608a361e111..e81a0b56b6a 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -23,4 +23,4 @@ public: WRITE8_HANDLER ( funybubl_paldatawrite ); VIDEO_START(funybubl); -VIDEO_UPDATE(funybubl); +SCREEN_UPDATE(funybubl); diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index c67ddd4d5b7..babe489b440 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -38,4 +38,4 @@ WRITE16_HANDLER( fuuki16_vram_2_w ); WRITE16_HANDLER( fuuki16_vram_3_w ); VIDEO_START( fuuki16 ); -VIDEO_UPDATE( fuuki16 ); +SCREEN_UPDATE( fuuki16 ); diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 0671b679e31..88ce7a2ee1a 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -51,5 +51,5 @@ WRITE32_HANDLER( fuuki32_vram_2_w ); WRITE32_HANDLER( fuuki32_vram_3_w ); VIDEO_START( fuuki32 ); -VIDEO_UPDATE( fuuki32 ); -VIDEO_EOF( fuuki32 ); +SCREEN_UPDATE( fuuki32 ); +SCREEN_EOF( fuuki32 ); diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 707778a6f19..de61ad327b5 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -33,5 +33,5 @@ WRITE16_HANDLER( gaelco_vram_w ); VIDEO_START( bigkarnk ); VIDEO_START( maniacsq ); -VIDEO_UPDATE( bigkarnk ); -VIDEO_UPDATE( maniacsq ); +SCREEN_UPDATE( bigkarnk ); +SCREEN_UPDATE( maniacsq ); diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 0362fb8befa..7934a737c99 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -39,8 +39,8 @@ WRITE16_HANDLER( snowboar_protection_w ); WRITE16_HANDLER( gaelco2_vram_w ); WRITE16_HANDLER( gaelco2_palette_w ); -VIDEO_UPDATE( gaelco2 ); -VIDEO_EOF( gaelco2 ); +SCREEN_UPDATE( gaelco2 ); +SCREEN_EOF( gaelco2 ); VIDEO_START( gaelco2 ); -VIDEO_UPDATE( gaelco2_dual ); +SCREEN_UPDATE( gaelco2_dual ); VIDEO_START( gaelco2_dual ); diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index afa3b10a59e..154730cd608 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -58,4 +58,4 @@ WRITE16_HANDLER( gaelco3d_paletteram_w ); WRITE32_HANDLER( gaelco3d_paletteram_020_w ); VIDEO_START( gaelco3d ); -VIDEO_UPDATE( gaelco3d ); +SCREEN_UPDATE( gaelco3d ); diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 1de400f7e60..5aaccf16417 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -42,9 +42,9 @@ VIDEO_START( raiga ); VIDEO_START( drgnbowl ); VIDEO_START( mastninj ); -VIDEO_UPDATE( gaiden ); -VIDEO_UPDATE( raiga ); -VIDEO_UPDATE( drgnbowl ); +SCREEN_UPDATE( gaiden ); +SCREEN_UPDATE( raiga ); +SCREEN_UPDATE( drgnbowl ); WRITE16_HANDLER( gaiden_videoram_w ); WRITE16_HANDLER( gaiden_videoram2_w ); diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index c0fdd8b0cc9..8487203efb5 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -78,9 +78,9 @@ WRITE8_HANDLER( bosco_scrollx_w ); WRITE8_HANDLER( bosco_scrolly_w ); WRITE8_HANDLER( bosco_starclr_w ); VIDEO_START( bosco ); -VIDEO_UPDATE( bosco ); +SCREEN_UPDATE( bosco ); PALETTE_INIT( bosco ); -VIDEO_EOF( bosco ); /* update starfield */ +SCREEN_EOF( bosco ); /* update starfield */ /*----------- defined in audio/galaga.c -----------*/ @@ -102,8 +102,8 @@ PALETTE_INIT( galaga ); WRITE8_HANDLER( galaga_videoram_w ); WRITE8_HANDLER( gatsbee_bank_w ); VIDEO_START( galaga ); -VIDEO_UPDATE( galaga ); -VIDEO_EOF( galaga ); /* update starfield */ +SCREEN_UPDATE( galaga ); +SCREEN_EOF( galaga ); /* update starfield */ /*----------- defined in video/xevious.c -----------*/ @@ -116,7 +116,7 @@ WRITE8_HANDLER( xevious_bs_w ); READ8_HANDLER( xevious_bb_r ); VIDEO_START( xevious ); PALETTE_INIT( xevious ); -VIDEO_UPDATE( xevious ); +SCREEN_UPDATE( xevious ); PALETTE_INIT( battles ); @@ -145,5 +145,5 @@ INTERRUPT_GEN( battles_interrupt_4 ); WRITE8_HANDLER( digdug_videoram_w ); WRITE8_HANDLER( digdug_PORT_w ); VIDEO_START( digdug ); -VIDEO_UPDATE( digdug ); +SCREEN_UPDATE( digdug ); PALETTE_INIT( digdug ); diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 73e649e4fda..4582cc5bca2 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -39,4 +39,4 @@ public: /*----------- defined in video/galastrm.c -----------*/ VIDEO_START( galastrm ); -VIDEO_UPDATE( galastrm ); +SCREEN_UPDATE( galastrm ); diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index 8e878d4c0f6..32ea1b08001 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -49,7 +49,7 @@ PALETTE_INIT( galaxian ); PALETTE_INIT( moonwar ); VIDEO_START( galaxian ); -VIDEO_UPDATE( galaxian ); +SCREEN_UPDATE( galaxian ); WRITE8_HANDLER( galaxian_videoram_w ); WRITE8_HANDLER( galaxian_objram_w ); diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 85ce85d7a0c..fe3b4aa45eb 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -88,8 +88,8 @@ VIDEO_START( ad2083 ); void galaxold_init_stars(running_machine *machine, int colors_offset); void galaxold_draw_stars(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); -VIDEO_UPDATE( galaxold ); -VIDEO_UPDATE( dambustr ); +SCREEN_UPDATE( galaxold ); +SCREEN_UPDATE( dambustr ); WRITE8_HANDLER( galaxold_gfxbank_w ); WRITE8_HANDLER( galaxold_flip_screen_x_w ); diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 7b6d503e40d..7913ddcdcc4 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -42,5 +42,5 @@ PALETTE_INIT( galivan ); VIDEO_START( galivan ); VIDEO_START( ninjemak ); -VIDEO_UPDATE( galivan ); -VIDEO_UPDATE( ninjemak ); +SCREEN_UPDATE( galivan ); +SCREEN_UPDATE( ninjemak ); diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index 013be2ba202..41caff51a3c 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -17,7 +17,7 @@ PALETTE_INIT( galpanic ); WRITE16_HANDLER( galpanic_bgvideoram_w ); WRITE16_HANDLER( galpanic_paletteram_w ); VIDEO_START( galpanic ); -VIDEO_UPDATE( galpanic ); -VIDEO_UPDATE( comad ); +SCREEN_UPDATE( galpanic ); +SCREEN_UPDATE( comad ); diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index c99ee3c656b..524925d325c 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -29,4 +29,4 @@ public: PALETTE_INIT( galspnbl ); -VIDEO_UPDATE( galspnbl ); +SCREEN_UPDATE( galspnbl ); diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 6b53caf4b35..ceb380d07f1 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -35,5 +35,5 @@ WRITE8_HANDLER( gaplus_videoram_w ); WRITE8_HANDLER( gaplus_starfield_control_w ); VIDEO_START( gaplus ); PALETTE_INIT( gaplus ); -VIDEO_UPDATE( gaplus ); -VIDEO_EOF( gaplus ); /* update starfields */ +SCREEN_UPDATE( gaplus ); +SCREEN_EOF( gaplus ); /* update starfields */ diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index 89b82715f3f..4deeff09de9 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -13,5 +13,5 @@ public: WRITE8_HANDLER( gat_videoram_w ); PALETTE_INIT( gat ); VIDEO_START( gat ); -VIDEO_UPDATE( gat ); +SCREEN_UPDATE( gat ); diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index 96c01ebef9b..6a3d81da743 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -25,4 +25,4 @@ WRITE16_HANDLER( gauntlet_xscroll_w ); WRITE16_HANDLER( gauntlet_yscroll_w ); VIDEO_START( gauntlet ); -VIDEO_UPDATE( gauntlet ); +SCREEN_UPDATE( gauntlet ); diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 678cca7bb80..d8a5d1f070a 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -37,5 +37,5 @@ WRITE8_HANDLER( gberet_sprite_bank_w ); PALETTE_INIT( gberet ); VIDEO_START( gberet ); -VIDEO_UPDATE( gberet ); -VIDEO_UPDATE( gberetb ); +SCREEN_UPDATE( gberet ); +SCREEN_UPDATE( gberetb ); diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h index 9da3877da54..6e86ebe8d62 100644 --- a/src/mame/includes/gbusters.h +++ b/src/mame/includes/gbusters.h @@ -35,4 +35,4 @@ extern void gbusters_tile_callback(running_machine *machine, int layer,int bank, extern void gbusters_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow); VIDEO_START( gbusters ); -VIDEO_UPDATE( gbusters ); +SCREEN_UPDATE( gbusters ); diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index c18083b597e..de7c3c4c93a 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -41,7 +41,7 @@ public: /*----------- defined in video/gcpinbal.c -----------*/ VIDEO_START( gcpinbal ); -VIDEO_UPDATE( gcpinbal ); +SCREEN_UPDATE( gcpinbal ); READ16_HANDLER ( gcpinbal_tilemaps_word_r ); WRITE16_HANDLER( gcpinbal_tilemaps_word_w ); diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index be4af4e86e4..60a62715653 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -39,4 +39,4 @@ extern void gijoe_sprite_callback(running_machine *machine, int *code, int *colo extern void gijoe_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags); VIDEO_START( gijoe ); -VIDEO_UPDATE( gijoe ); +SCREEN_UPDATE( gijoe ); diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 3e89e108005..dea51b79fe2 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -47,4 +47,4 @@ WRITE16_HANDLER( ginganin_txtram16_w ); WRITE16_HANDLER( ginganin_vregs16_w ); VIDEO_START( ginganin ); -VIDEO_UPDATE( ginganin ); +SCREEN_UPDATE( ginganin ); diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index b6cdcfddd9f..b85b4e38072 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -37,6 +37,6 @@ WRITE8_HANDLER( gladiatr_video_registers_w ); WRITE8_HANDLER( gladiatr_spritebuffer_w ); WRITE8_HANDLER( gladiatr_spritebank_w ); VIDEO_START( ppking ); -VIDEO_UPDATE( ppking ); +SCREEN_UPDATE( ppking ); VIDEO_START( gladiatr ); -VIDEO_UPDATE( gladiatr ); +SCREEN_UPDATE( gladiatr ); diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index c6a18b7a830..5343dd85018 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -32,4 +32,4 @@ WRITE16_HANDLER( glass_vram_w ); WRITE16_HANDLER( glass_blitter_w ); VIDEO_START( glass ); -VIDEO_UPDATE( glass ); +SCREEN_UPDATE( glass ); diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index beba55ac16f..fe6588c42fb 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -33,5 +33,5 @@ WRITE8_HANDLER( gng_bgscrolly_w ); WRITE8_HANDLER( gng_flipscreen_w ); VIDEO_START( gng ); -VIDEO_UPDATE( gng ); -VIDEO_EOF( gng ); +SCREEN_UPDATE( gng ); +SCREEN_EOF( gng ); diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 6878b6d45be..a0effc7d473 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -43,5 +43,5 @@ WRITE16_HANDLER( goal92_fg_bank_w ); READ16_HANDLER( goal92_fg_bank_r ); VIDEO_START( goal92 ); -VIDEO_UPDATE( goal92 ); -VIDEO_EOF( goal92 ); +SCREEN_UPDATE( goal92 ); +SCREEN_EOF( goal92 ); diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 95e20f971a5..a5f031921c8 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -38,4 +38,4 @@ WRITE8_HANDLER( goindol_fg_videoram_w ); WRITE8_HANDLER( goindol_bg_videoram_w ); VIDEO_START( goindol ); -VIDEO_UPDATE( goindol ); +SCREEN_UPDATE( goindol ); diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index ec39e26f49a..be5dfaa2123 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -61,8 +61,8 @@ VIDEO_START( goldstar ); VIDEO_START( cherrym ); VIDEO_START( unkch ); VIDEO_START( magical ); -VIDEO_UPDATE( goldstar ); -VIDEO_UPDATE( cmast91 ); -VIDEO_UPDATE( amcoe1a ); -VIDEO_UPDATE( unkch ); -VIDEO_UPDATE( magical ); +SCREEN_UPDATE( goldstar ); +SCREEN_UPDATE( cmast91 ); +SCREEN_UPDATE( amcoe1a ); +SCREEN_UPDATE( unkch ); +SCREEN_UPDATE( magical ); diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 7d812d410f1..6534c843a38 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -16,7 +16,7 @@ extern UINT8 *gomoku_bgram; PALETTE_INIT( gomoku ); VIDEO_START( gomoku ); -VIDEO_UPDATE( gomoku ); +SCREEN_UPDATE( gomoku ); WRITE8_HANDLER( gomoku_videoram_w ); WRITE8_HANDLER( gomoku_colorram_w ); diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index 2435da08406..7d7dbed1416 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -31,7 +31,7 @@ public: VIDEO_START( gotcha ); -VIDEO_UPDATE( gotcha ); +SCREEN_UPDATE( gotcha ); WRITE16_HANDLER( gotcha_fgvideoram_w ); WRITE16_HANDLER( gotcha_bgvideoram_w ); diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index a80c2c8b8be..a8c91582880 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -81,4 +81,4 @@ extern WRITE8_HANDLER( gottlieb_paletteram_w ); VIDEO_START( gottlieb ); VIDEO_START( screwloo ); -VIDEO_UPDATE( gottlieb ); +SCREEN_UPDATE( gottlieb ); diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index 5ce5aa69041..e402ce1d9b3 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -37,4 +37,4 @@ WRITE8_HANDLER( gotya_video_control_w ); PALETTE_INIT( gotya ); VIDEO_START( gotya ); -VIDEO_UPDATE( gotya ); +SCREEN_UPDATE( gotya ); diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index 9f5bf403c93..3ce4dcd38c7 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -39,4 +39,4 @@ READ16_HANDLER( gradius3_gfxrom_r ); WRITE16_HANDLER( gradius3_gfxram_w ); VIDEO_START( gradius3 ); -VIDEO_UPDATE( gradius3 ); +SCREEN_UPDATE( gradius3 ); diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index efa7e33a9a1..e260ced5c7d 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -60,7 +60,7 @@ DISCRETE_SOUND_EXTERN( grchamp ); PALETTE_INIT( grchamp ); VIDEO_START( grchamp ); -VIDEO_UPDATE( grchamp ); +SCREEN_UPDATE( grchamp ); WRITE8_HANDLER( grchamp_left_w ); WRITE8_HANDLER( grchamp_center_w ); WRITE8_HANDLER( grchamp_right_w ); diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index 1f83227ed16..87674888df5 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -44,7 +44,7 @@ DECLARE_LEGACY_SOUND_DEVICE(GRIDLEE, gridlee_sound); PALETTE_INIT( gridlee ); VIDEO_START( gridlee ); -VIDEO_UPDATE( gridlee ); +SCREEN_UPDATE( gridlee ); WRITE8_HANDLER( gridlee_cocktail_flip_w ); WRITE8_HANDLER( gridlee_videoram_w ); diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index 11d909e1a61..d3622350aac 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -27,4 +27,4 @@ public: /*----------- defined in video/groundfx.c -----------*/ VIDEO_START( groundfx ); -VIDEO_UPDATE( groundfx ); +SCREEN_UPDATE( groundfx ); diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 008dfdfddf0..60ccf7968f1 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -72,7 +72,7 @@ extern tCG10103 CG10103[MAX_CG10103]; #define CG10103_0_vram (CG10103[0].vram) #define CG10103_1_vram (CG10103[1].vram) -VIDEO_UPDATE( gstriker ); +SCREEN_UPDATE( gstriker ); VIDEO_START( gstriker ); VIDEO_START( twrldc94 ); VIDEO_START( vgoalsoc ); diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 773f6b5cc3f..6371cd64a85 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -32,4 +32,4 @@ WRITE8_HANDLER( gsword_scroll_w ); PALETTE_INIT( josvolly ); PALETTE_INIT( gsword ); VIDEO_START( gsword ); -VIDEO_UPDATE( gsword ); +SCREEN_UPDATE( gsword ); diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 4485f30d677..36a45311a80 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -27,4 +27,4 @@ WRITE16_HANDLER( gumbo_bg_videoram_w ); WRITE16_HANDLER( gumbo_fg_videoram_w ); VIDEO_START( gumbo ); -VIDEO_UPDATE( gumbo ); +SCREEN_UPDATE( gumbo ); diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index 6fb406023d6..e35f14121fa 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -24,4 +24,4 @@ public: /*----------- defined in video/gunbustr.c -----------*/ VIDEO_START( gunbustr ); -VIDEO_UPDATE( gunbustr ); +SCREEN_UPDATE( gunbustr ); diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index ced67f57318..65f0e6ef424 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -37,5 +37,5 @@ WRITE8_HANDLER( gundealr_fg_scroll_w ); WRITE8_HANDLER( yamyam_fg_scroll_w ); WRITE8_HANDLER( gundealr_flipscreen_w ); -VIDEO_UPDATE( gundealr ); +SCREEN_UPDATE( gundealr ); VIDEO_START( gundealr ); diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 3c04345ce62..e8e19567ce1 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -34,5 +34,5 @@ WRITE8_HANDLER( gunsmoke_colorram_w ); PALETTE_INIT( gunsmoke ); VIDEO_START( gunsmoke ); -VIDEO_UPDATE( gunsmoke ); +SCREEN_UPDATE( gunsmoke ); diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index 4ef31ffe5ef..dca9342d589 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -32,4 +32,4 @@ READ8_HANDLER( gyruss_scanline_r ); PALETTE_INIT( gyruss ); VIDEO_START( gyruss ); -VIDEO_UPDATE( gyruss ); +SCREEN_UPDATE( gyruss ); diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 46ad143c811..6c5a4795c41 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -30,4 +30,4 @@ WRITE8_DEVICE_HANDLER( hanaawas_portB_w ); PALETTE_INIT( hanaawas ); VIDEO_START( hanaawas ); -VIDEO_UPDATE( hanaawas ); +SCREEN_UPDATE( hanaawas ); diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 9ca4dc6b8ee..8601a61d481 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -40,5 +40,5 @@ WRITE8_HANDLER( hcastle_pf1_control_w ); WRITE8_HANDLER( hcastle_pf2_control_w ); PALETTE_INIT( hcastle ); -VIDEO_UPDATE( hcastle ); +SCREEN_UPDATE( hcastle ); VIDEO_START( hcastle ); diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 215a701225d..3a702e495e9 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -17,7 +17,7 @@ public: /*----------- defined in video/hexion.c -----------*/ VIDEO_START( hexion ); -VIDEO_UPDATE( hexion ); +SCREEN_UPDATE( hexion ); WRITE8_HANDLER( hexion_bankswitch_w ); READ8_HANDLER( hexion_bankedram_r ); diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index a42bf0967f8..6aa7e94f102 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -29,4 +29,4 @@ WRITE8_HANDLER( higemaru_c800_w ); PALETTE_INIT( higemaru ); VIDEO_START( higemaru ); -VIDEO_UPDATE( higemaru ); +SCREEN_UPDATE( higemaru ); diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index a2cc1b5d7ff..4bbee9dbf6a 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -28,7 +28,7 @@ public: /*----------- defined in video/himesiki.c -----------*/ VIDEO_START( himesiki ); -VIDEO_UPDATE( himesiki ); +SCREEN_UPDATE( himesiki ); WRITE8_HANDLER( himesiki_bg_ram_w ); WRITE8_HANDLER( himesiki_scrollx_w ); diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index 2acf760e080..0f56ed955e4 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -27,7 +27,7 @@ public: VIDEO_START( hnayayoi ); VIDEO_START( untoucha ); -VIDEO_UPDATE( hnayayoi ); +SCREEN_UPDATE( hnayayoi ); WRITE8_HANDLER( dynax_blitter_rev1_param_w ); WRITE8_HANDLER( dynax_blitter_rev1_start_w ); diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index b6bc4f7b80d..a8ef8a7bb75 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -103,4 +103,4 @@ WRITE32_HANDLER( hng64_videoram_w ); void hng64_command3d(running_machine* machine, const UINT16* packet); VIDEO_START( hng64 ); -VIDEO_UPDATE( hng64 ); +SCREEN_UPDATE( hng64 ); diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 34d6918ed29..e7fced3c66f 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -28,8 +28,8 @@ public: VIDEO_START( holeland ); VIDEO_START( crzrally ); -VIDEO_UPDATE( holeland ); -VIDEO_UPDATE( crzrally ); +SCREEN_UPDATE( holeland ); +SCREEN_UPDATE( crzrally ); WRITE8_HANDLER( holeland_videoram_w ); WRITE8_HANDLER( holeland_colorram_w ); diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 3641f02ed19..500324f2f93 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -63,8 +63,8 @@ VIDEO_START( reikaids ); VIDEO_START( pteacher ); VIDEO_START( lemnangl ); VIDEO_START( mirderby ); -VIDEO_UPDATE( mrokumei ); -VIDEO_UPDATE( reikaids ); -VIDEO_UPDATE( pteacher ); -VIDEO_UPDATE( mirderby ); -VIDEO_EOF( homedata ); +SCREEN_UPDATE( mrokumei ); +SCREEN_UPDATE( reikaids ); +SCREEN_UPDATE( pteacher ); +SCREEN_UPDATE( mirderby ); +SCREEN_EOF( homedata ); diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index ffde5470946..f9be211f45f 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -32,4 +32,4 @@ WRITE8_HANDLER( homerun_color_w ); WRITE8_DEVICE_HANDLER( homerun_banking_w ); VIDEO_START(homerun); -VIDEO_UPDATE(homerun); +SCREEN_UPDATE(homerun); diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index cc0db0a1364..724c14fe0ac 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -2,7 +2,7 @@ extern UINT8 *hyhoo_clut; -VIDEO_UPDATE( hyhoo ); +SCREEN_UPDATE( hyhoo ); VIDEO_START( hyhoo ); WRITE8_HANDLER( hyhoo_blitter_w ); diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index e3912856d24..5fcb9bf6136 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -26,6 +26,6 @@ WRITE8_HANDLER( hyperspt_flipscreen_w ); PALETTE_INIT( hyperspt ); VIDEO_START( hyperspt ); -VIDEO_UPDATE( hyperspt ); +SCREEN_UPDATE( hyperspt ); VIDEO_START( roadf ); diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 02c5415f086..134644341e3 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -62,4 +62,4 @@ WRITE16_HANDLER( hyprduel_scrollreg_init_w ); VIDEO_START( hyprduel_14220 ); VIDEO_START( magerror_14220 ); -VIDEO_UPDATE( hyprduel ); +SCREEN_UPDATE( hyprduel ); diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 94c2638d875..341d4150ffe 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -30,4 +30,4 @@ WRITE8_HANDLER( ikki_scrn_ctrl_w ); PALETTE_INIT( ikki ); VIDEO_START( ikki ); -VIDEO_UPDATE( ikki ); +SCREEN_UPDATE( ikki ); diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index d20e61cbd97..932c3a610b3 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -38,5 +38,5 @@ WRITE16_HANDLER( inufuku_tx_videoram_w ); WRITE16_HANDLER( inufuku_palettereg_w ); WRITE16_HANDLER( inufuku_scrollreg_w ); -VIDEO_UPDATE( inufuku ); +SCREEN_UPDATE( inufuku ); VIDEO_START( inufuku ); diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index c84400612db..1188f88df92 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -22,4 +22,4 @@ READ8_HANDLER( iqblock_bgvideoram_r ); WRITE8_HANDLER( iqblock_fgscroll_w ); VIDEO_START( iqblock ); -VIDEO_UPDATE( iqblock ); +SCREEN_UPDATE( iqblock ); diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index fe69de29f0d..fd8fa698237 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -84,7 +84,7 @@ WRITE8_HANDLER( irobot_sharedmem_w ); PALETTE_INIT( irobot ); VIDEO_START( irobot ); -VIDEO_UPDATE( irobot ); +SCREEN_UPDATE( irobot ); WRITE8_HANDLER( irobot_paletteram_w ); diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index c4d152c743f..f4c30d03396 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -38,6 +38,6 @@ WRITE8_HANDLER( ironhors_flipscreen_w ); PALETTE_INIT( ironhors ); VIDEO_START( ironhors ); -VIDEO_UPDATE( ironhors ); +SCREEN_UPDATE( ironhors ); VIDEO_START( farwest ); -VIDEO_UPDATE( farwest ); +SCREEN_UPDATE( farwest ); diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index ae6c08c4ee7..c0942ddcf43 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -109,4 +109,4 @@ WRITE32_HANDLER( itech020_video_w ); READ32_HANDLER( itech020_video_r ); WRITE32_HANDLER( drivedge_zbuf_control_w ); -VIDEO_UPDATE( itech32 ); +SCREEN_UPDATE( itech32 ); diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index f8a78a79acd..a10e5a23fb0 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -20,7 +20,7 @@ READ8_HANDLER( slikshot_z80_control_r ); WRITE8_HANDLER( slikshot_z80_control_w ); VIDEO_START( slikshot ); -VIDEO_UPDATE( slikshot ); +SCREEN_UPDATE( slikshot ); /*----------- defined in video/itech8.c -----------*/ @@ -43,7 +43,7 @@ WRITE8_HANDLER( grmatch_palette_w ); WRITE8_HANDLER( grmatch_xscroll_w ); TIMER_DEVICE_CALLBACK( grmatch_palette_update ); -VIDEO_UPDATE( itech8_2layer ); -VIDEO_UPDATE( itech8_grmatch ); -VIDEO_UPDATE( itech8_2page ); -VIDEO_UPDATE( itech8_2page_large ); +SCREEN_UPDATE( itech8_2layer ); +SCREEN_UPDATE( itech8_grmatch ); +SCREEN_UPDATE( itech8_2page ); +SCREEN_UPDATE( itech8_2page_large ); diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index ff93f9cf1e2..c88e3c2c3e0 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -42,8 +42,8 @@ READ8_HANDLER( jack_flipscreen_r ); WRITE8_HANDLER( jack_flipscreen_w ); VIDEO_START( jack ); -VIDEO_UPDATE( jack ); +SCREEN_UPDATE( jack ); PALETTE_INIT( joinem ); VIDEO_START( joinem ); -VIDEO_UPDATE( joinem ); +SCREEN_UPDATE( joinem ); diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 49c796c305d..0c21b921a91 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -35,4 +35,4 @@ void jackal_mark_tile_dirty(running_machine *machine, int offset); PALETTE_INIT( jackal ); VIDEO_START( jackal ); -VIDEO_UPDATE( jackal ); +SCREEN_UPDATE( jackal ); diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index 07ec2da851e..31ffc462f84 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -67,4 +67,4 @@ WRITE32_HANDLER( jaguar_tom_regs32_w ); READ32_HANDLER( cojag_gun_input_r ); VIDEO_START( cojag ); -VIDEO_UPDATE( cojag ); +SCREEN_UPDATE( cojag ); diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 94f2ec38435..ca477a2f281 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -36,4 +36,4 @@ WRITE8_HANDLER( jailbrek_colorram_w ); PALETTE_INIT( jailbrek ); VIDEO_START( jailbrek ); -VIDEO_UPDATE( jailbrek ); +SCREEN_UPDATE( jailbrek ); diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index cdc3e3befc3..e370222998d 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -117,13 +117,13 @@ VIDEO_START( berlwall ); VIDEO_START( sandscrp_1xVIEW2 ); -VIDEO_UPDATE( kaneko16 ); -VIDEO_UPDATE( sandscrp ); -VIDEO_UPDATE( berlwall ); -VIDEO_UPDATE( jchan_view2 ); +SCREEN_UPDATE( kaneko16 ); +SCREEN_UPDATE( sandscrp ); +SCREEN_UPDATE( berlwall ); +SCREEN_UPDATE( jchan_view2 ); VIDEO_START( galsnew ); -VIDEO_UPDATE( galsnew ); +SCREEN_UPDATE( galsnew ); extern UINT16* galsnew_bg_pixram; extern UINT16* galsnew_fg_pixram; @@ -140,7 +140,7 @@ extern UINT16 *galpani2_bg15; PALETTE_INIT( galpani2 ); VIDEO_START( galpani2 ); -VIDEO_UPDATE( galpani2 ); +SCREEN_UPDATE( galpani2 ); WRITE16_HANDLER( galpani2_palette_0_w ); WRITE16_HANDLER( galpani2_palette_1_w ); diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index f387ee32950..a620577c5d1 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -28,7 +28,7 @@ public: /*----------- defined in video/kangaroo.c -----------*/ VIDEO_START( kangaroo ); -VIDEO_UPDATE( kangaroo ); +SCREEN_UPDATE( kangaroo ); WRITE8_HANDLER( kangaroo_videoram_w ); WRITE8_HANDLER( kangaroo_video_control_w ); diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index ba564fff0c8..0130906afe6 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -53,4 +53,4 @@ void karnov_flipscreen_w(running_machine *machine, int data); PALETTE_INIT( karnov ); VIDEO_START( karnov ); VIDEO_START( wndrplnt ); -VIDEO_UPDATE( karnov ); +SCREEN_UPDATE( karnov ); diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 304b2575d60..fdd93d02040 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -39,5 +39,5 @@ WRITE8_HANDLER( kchamp_flipscreen_w ); PALETTE_INIT( kchamp ); VIDEO_START( kchamp ); -VIDEO_UPDATE( kchamp ); -VIDEO_UPDATE( kchampvs ); +SCREEN_UPDATE( kchamp ); +SCREEN_UPDATE( kchampvs ); diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 298030e1714..9a821fa34bb 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -46,7 +46,7 @@ WRITE16_HANDLER( kickgoal_bgram_w ); WRITE16_HANDLER( kickgoal_bg2ram_w ); VIDEO_START( kickgoal ); -VIDEO_UPDATE( kickgoal ); +SCREEN_UPDATE( kickgoal ); VIDEO_START( actionhw ); -VIDEO_UPDATE( actionhw ); +SCREEN_UPDATE( actionhw ); diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index a30bf22bccb..807567907b6 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -43,8 +43,8 @@ WRITE8_HANDLER( kingofb_f800_w ); PALETTE_INIT( kingofb ); VIDEO_START( kingofb ); -VIDEO_UPDATE( kingofb ); +SCREEN_UPDATE( kingofb ); PALETTE_INIT( ringking ); VIDEO_START( ringking ); -VIDEO_UPDATE( ringking ); +SCREEN_UPDATE( ringking ); diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h index 2715bc9e493..168436c0094 100644 --- a/src/mame/includes/klax.h +++ b/src/mame/includes/klax.h @@ -19,4 +19,4 @@ public: WRITE16_HANDLER( klax_latch_w ); VIDEO_START( klax ); -VIDEO_UPDATE( klax ); +SCREEN_UPDATE( klax ); diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index ac4de2f3442..1ac9ccaa102 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -38,4 +38,4 @@ WRITE8_HANDLER(kncljoe_scroll_w); PALETTE_INIT( kncljoe ); VIDEO_START( kncljoe ); -VIDEO_UPDATE( kncljoe ); +SCREEN_UPDATE( kncljoe ); diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index a41bcb76d25..7c609133233 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -85,7 +85,7 @@ VIDEO_START(dragoonj); VIDEO_START(winspike); VIDEO_START(opengolf); VIDEO_START(racinfrc); -VIDEO_UPDATE(konamigx); +SCREEN_UPDATE(konamigx); WRITE32_HANDLER( konamigx_palette_w ); #ifdef UNUSED_FUNCTION diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 92e3b598e2a..d30393d3e3f 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -35,4 +35,4 @@ WRITE8_HANDLER( kopunch_gfxbank_w ); PALETTE_INIT( kopunch ); VIDEO_START( kopunch ); -VIDEO_UPDATE( kopunch ); +SCREEN_UPDATE( kopunch ); diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 041cdfcea97..0eafb47cc1c 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -30,4 +30,4 @@ WRITE8_HANDLER( ksayakyu_videoram_w ); WRITE8_HANDLER( ksayakyu_videoctrl_w ); PALETTE_INIT( ksayakyu ); VIDEO_START( ksayakyu ); -VIDEO_UPDATE( ksayakyu ); +SCREEN_UPDATE( ksayakyu ); diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index f29fc279ca6..8bfb8268e49 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -44,4 +44,4 @@ WRITE8_HANDLER( kyugo_scroll_y_w ); WRITE8_HANDLER( kyugo_flipscreen_w ); VIDEO_START( kyugo ); -VIDEO_UPDATE( kyugo ); +SCREEN_UPDATE( kyugo ); diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 1061e61642f..45a1e700e8f 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -34,4 +34,4 @@ WRITE8_HANDLER( labyrunr_vram2_w ); PALETTE_INIT( labyrunr ); VIDEO_START( labyrunr ); -VIDEO_UPDATE( labyrunr ); +SCREEN_UPDATE( labyrunr ); diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 11365909012..9746231a9a4 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -51,12 +51,12 @@ WRITE8_HANDLER( sraider_io_w ); PALETTE_INIT( ladybug ); VIDEO_START( ladybug ); -VIDEO_UPDATE( ladybug ); +SCREEN_UPDATE( ladybug ); PALETTE_INIT( sraider ); VIDEO_START( sraider ); -VIDEO_UPDATE( sraider ); -VIDEO_EOF( sraider ); +SCREEN_UPDATE( sraider ); +SCREEN_EOF( sraider ); /*----------- defined in video/redclash.c -----------*/ @@ -71,8 +71,8 @@ WRITE8_HANDLER( redclash_star_reset_w ); PALETTE_INIT( redclash ); VIDEO_START( redclash ); -VIDEO_UPDATE( redclash ); -VIDEO_EOF( redclash ); +SCREEN_UPDATE( redclash ); +SCREEN_EOF( redclash ); /* sraider uses the zerohour star generator board */ void redclash_set_stars_enable(running_machine *machine, UINT8 on); diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 7a3fbbe72a0..52b067bfbab 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -49,4 +49,4 @@ READ8_HANDLER( ladyfrog_videoram_r ); VIDEO_START( ladyfrog ); VIDEO_START( toucheme ); -VIDEO_UPDATE( ladyfrog ); +SCREEN_UPDATE( ladyfrog ); diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index c209857dbaa..41e2f5b785a 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -49,7 +49,7 @@ VIDEO_START( lasso ); VIDEO_START( wwjgtin ); VIDEO_START( pinbo ); -VIDEO_UPDATE( lasso ); -VIDEO_UPDATE( chameleo ); -VIDEO_UPDATE( wwjgtin ); -VIDEO_UPDATE( pinbo ); +SCREEN_UPDATE( lasso ); +SCREEN_UPDATE( chameleo ); +SCREEN_UPDATE( wwjgtin ); +SCREEN_UPDATE( pinbo ); diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 3034f584b3b..2a6a00b9a5b 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -39,6 +39,6 @@ WRITE16_HANDLER( lastduel_palette_word_w ); VIDEO_START( lastduel ); VIDEO_START( madgear ); -VIDEO_UPDATE( lastduel ); -VIDEO_UPDATE( madgear ); -VIDEO_EOF( lastduel ); +SCREEN_UPDATE( lastduel ); +SCREEN_UPDATE( madgear ); +SCREEN_EOF( lastduel ); diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index 0e90b7d175d..3f5d6e6af84 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -40,4 +40,4 @@ public: /*----------- defined in video/lazercmd.c -----------*/ -VIDEO_UPDATE( lazercmd ); +SCREEN_UPDATE( lazercmd ); diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index e4f7b3ab80b..30addab24af 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -15,6 +15,6 @@ VIDEO_START( cupsoc ); VIDEO_START( denjinmk ); VIDEO_START( grainbow ); VIDEO_START( godzilla ); -VIDEO_UPDATE( legionna ); -VIDEO_UPDATE( godzilla ); -VIDEO_UPDATE( grainbow ); +SCREEN_UPDATE( legionna ); +SCREEN_UPDATE( godzilla ); +SCREEN_UPDATE( grainbow ); diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 63cd2008edc..7e9d9230dd1 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -32,5 +32,5 @@ WRITE16_HANDLER( lemmings_pixel_1_w ); WRITE16_HANDLER( lemmings_vram_w ); VIDEO_START( lemmings ); -VIDEO_EOF( lemmings ); -VIDEO_UPDATE( lemmings ); +SCREEN_EOF( lemmings ); +SCREEN_UPDATE( lemmings ); diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index e5a593d159d..e85dbda983d 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -36,4 +36,4 @@ extern void lethalen_tile_callback(running_machine *machine, int layer, int *cod WRITE8_HANDLER(lethalen_palette_control); VIDEO_START(lethalen); -VIDEO_UPDATE(lethalen); +SCREEN_UPDATE(lethalen); diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index 0350b8f97f3..8cc6d62d7df 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -31,10 +31,10 @@ public: /*----------- defined in video/liberate.c -----------*/ PALETTE_INIT( liberate ); -VIDEO_UPDATE( prosoccr ); -VIDEO_UPDATE( prosport ); -VIDEO_UPDATE( liberate ); -VIDEO_UPDATE( boomrang ); +SCREEN_UPDATE( prosoccr ); +SCREEN_UPDATE( prosport ); +SCREEN_UPDATE( liberate ); +SCREEN_UPDATE( boomrang ); VIDEO_START( prosoccr ); VIDEO_START( prosport ); VIDEO_START( boomrang ); diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h index 2b73dc073d3..64317b3d92f 100644 --- a/src/mame/includes/liberatr.h +++ b/src/mame/includes/liberatr.h @@ -37,7 +37,7 @@ protected: virtual void machine_start(); virtual void video_start(); - virtual bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); + virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); void init_planet(planet &liberatr_planet, UINT8 *planet_rom); void get_pens(pen_t *pens); diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index cf3291aa7e8..f3170c5ca6f 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -57,5 +57,5 @@ READ8_HANDLER( lkage_mcu_status_r ); WRITE8_HANDLER( lkage_videoram_w ); VIDEO_START( lkage ); -VIDEO_UPDATE( lkage ); +SCREEN_UPDATE( lkage ); diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index c6dec719075..c8e7044c17a 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -80,8 +80,8 @@ public: PALETTE_INIT( lockon ); VIDEO_START( lockon ); -VIDEO_UPDATE( lockon ); -VIDEO_EOF( lockon ); +SCREEN_UPDATE( lockon ); +SCREEN_EOF( lockon ); READ16_HANDLER( lockon_crtc_r ); WRITE16_HANDLER( lockon_crtc_w ); WRITE16_HANDLER( lockon_rotate_w ); diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index c4cad837d22..d7dab5f262c 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -56,4 +56,4 @@ float lordgun_crosshair_mapper(const input_field_config *field, float linear_val void lordgun_update_gun(running_machine *machine, int i); VIDEO_START( lordgun ); -VIDEO_UPDATE( lordgun ); +SCREEN_UPDATE( lordgun ); diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index 2b5fd6134d9..ac688b88af9 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -55,5 +55,5 @@ READ8_HANDLER( daikaiju_mcu_status_r ); /*----------- defined in video/lsasquad.c -----------*/ -VIDEO_UPDATE( lsasquad ); -VIDEO_UPDATE( daikaiju ); +SCREEN_UPDATE( lsasquad ); +SCREEN_UPDATE( daikaiju ); diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index f3fc5931e32..60d0dfd4007 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -8,4 +8,4 @@ WRITE8_HANDLER( lucky74_bg_videoram_w ); WRITE8_HANDLER( lucky74_bg_colorram_w ); PALETTE_INIT( lucky74 ); VIDEO_START( lucky74 ); -VIDEO_UPDATE( lucky74 ); +SCREEN_UPDATE( lucky74 ); diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 54c921acaf0..53838f4fd40 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -9,4 +9,4 @@ WRITE8_HANDLER( lvcards_colorram_w ); PALETTE_INIT( lvcards ); PALETTE_INIT( ponttehk ); VIDEO_START( lvcards ); -VIDEO_UPDATE( lvcards ); +SCREEN_UPDATE( lvcards ); diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index b6970085b1d..3b0c5521c3f 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -39,6 +39,6 @@ WRITE8_HANDLER( trojan_bg2_image_w ); VIDEO_START( lwings ); VIDEO_START( trojan ); VIDEO_START( avengers ); -VIDEO_UPDATE( lwings ); -VIDEO_UPDATE( trojan ); -VIDEO_EOF( lwings ); +SCREEN_UPDATE( lwings ); +SCREEN_UPDATE( trojan ); +SCREEN_EOF( lwings ); diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 7b227a3b3be..0c942f88934 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -70,8 +70,8 @@ WRITE8_HANDLER( m10_colorram_w ); WRITE8_HANDLER( m10_chargen_w ); WRITE8_HANDLER( m15_chargen_w ); -VIDEO_UPDATE( m10 ); -VIDEO_UPDATE( m15 ); +SCREEN_UPDATE( m10 ); +SCREEN_UPDATE( m15 ); VIDEO_START( m10 ); VIDEO_START( m15 ); diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 510a5ef57bc..e6232b1f46f 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -36,7 +36,7 @@ public: /*----------- defined in video/m107.c -----------*/ WRITE16_HANDLER( m107_spritebuffer_w ); -VIDEO_UPDATE( m107 ); +SCREEN_UPDATE( m107 ); VIDEO_START( m107 ); WRITE16_HANDLER( m107_control_w ); WRITE16_HANDLER( m107_vram_w ); diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index ed4482684ee..18bea207ab2 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -34,4 +34,4 @@ WRITE8_HANDLER( m52_colorram_w ); PALETTE_INIT( m52 ); VIDEO_START( m52 ); -VIDEO_UPDATE( m52 ); +SCREEN_UPDATE( m52 ); diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index 9f253c046f8..9a4f69906b8 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -23,4 +23,4 @@ WRITE8_HANDLER( m57_flipscreen_w ); PALETTE_INIT( m57 ); VIDEO_START( m57 ); -VIDEO_UPDATE( m57 ); +SCREEN_UPDATE( m57 ); diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index caa6f88b7a7..79f3a5d2912 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -27,4 +27,4 @@ WRITE8_HANDLER( yard_flipscreen_w ); PALETTE_INIT( yard ); VIDEO_START( yard ); -VIDEO_UPDATE( yard ); +SCREEN_UPDATE( yard ); diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index 966a2ac0271..b251bbebb51 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -67,14 +67,14 @@ VIDEO_START( spelunkr ); VIDEO_START( spelunk2 ); VIDEO_START( youjyudn ); -VIDEO_UPDATE( battroad ); -VIDEO_UPDATE( horizon ); -VIDEO_UPDATE( kidniki ); -VIDEO_UPDATE( kungfum ); -VIDEO_UPDATE( ldrun ); -VIDEO_UPDATE( ldrun3 ); -VIDEO_UPDATE( ldrun4 ); -VIDEO_UPDATE( lotlot ); -VIDEO_UPDATE( spelunkr ); -VIDEO_UPDATE( spelunk2 ); -VIDEO_UPDATE( youjyudn ); +SCREEN_UPDATE( battroad ); +SCREEN_UPDATE( horizon ); +SCREEN_UPDATE( kidniki ); +SCREEN_UPDATE( kungfum ); +SCREEN_UPDATE( ldrun ); +SCREEN_UPDATE( ldrun3 ); +SCREEN_UPDATE( ldrun4 ); +SCREEN_UPDATE( lotlot ); +SCREEN_UPDATE( spelunkr ); +SCREEN_UPDATE( spelunk2 ); +SCREEN_UPDATE( youjyudn ); diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 39c30f6ec96..a370b3dedda 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -63,5 +63,5 @@ WRITE16_HANDLER( m72_port02_w ); WRITE16_HANDLER( rtype2_port02_w ); WRITE16_HANDLER( majtitle_gfx_ctrl_w ); -VIDEO_UPDATE( m72 ); -VIDEO_UPDATE( majtitle ); +SCREEN_UPDATE( m72 ); +SCREEN_UPDATE( majtitle ); diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index 859e0b6e4e1..660cfd48139 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -5,8 +5,8 @@ extern UINT16 *m90_video_data; VIDEO_START( m90 ); VIDEO_START( dynablsb ); VIDEO_START( bomblord ); -VIDEO_UPDATE( m90 ); -VIDEO_UPDATE( dynablsb ); -VIDEO_UPDATE( bomblord ); +SCREEN_UPDATE( m90 ); +SCREEN_UPDATE( dynablsb ); +SCREEN_UPDATE( bomblord ); WRITE16_HANDLER( m90_video_w ); WRITE16_HANDLER( m90_video_control_w ); diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 0dedff0178f..f365fa62bf1 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -54,4 +54,4 @@ WRITE16_HANDLER( m92_pf3_control_w ); WRITE16_HANDLER( m92_master_control_w ); VIDEO_START( m92 ); -VIDEO_UPDATE( m92 ); +SCREEN_UPDATE( m92 ); diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index b756a6c4cfc..f785a193f3e 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -47,5 +47,5 @@ WRITE32_HANDLER( macrossp_scrc_videoram_w ); WRITE32_HANDLER( macrossp_text_videoram_w ); VIDEO_START(macrossp); -VIDEO_UPDATE(macrossp); -VIDEO_EOF(macrossp); +SCREEN_UPDATE(macrossp); +SCREEN_EOF(macrossp); diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h index 5ea4045bd43..72c51fcbe97 100644 --- a/src/mame/includes/madmotor.h +++ b/src/mame/includes/madmotor.h @@ -39,4 +39,4 @@ WRITE16_HANDLER( madmotor_pf2_data_w ); WRITE16_HANDLER( madmotor_pf3_data_w ); VIDEO_START( madmotor ); -VIDEO_UPDATE( madmotor ); +SCREEN_UPDATE( madmotor ); diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index 3e91c502b77..92e9811605c 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -15,5 +15,5 @@ extern UINT16 *magmax_scroll_x; extern UINT16 *magmax_scroll_y; PALETTE_INIT( magmax ); -VIDEO_UPDATE( magmax ); +SCREEN_UPDATE( magmax ); VIDEO_START( magmax ); diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index 817ab673f04..06fc6b26e99 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -38,5 +38,5 @@ extern void dv_sprite_callback(running_machine *machine, int *code,int *color,in VIDEO_START( mainevt ); VIDEO_START( dv ); -VIDEO_UPDATE( mainevt ); -VIDEO_UPDATE( dv ); +SCREEN_UPDATE( mainevt ); +SCREEN_UPDATE( dv ); diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index d64e8d3eb40..c59f7188dd8 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -22,4 +22,4 @@ WRITE8_HANDLER(mainsnk_c600_w); WRITE8_HANDLER(mainsnk_fgram_w); WRITE8_HANDLER(mainsnk_bgram_w); VIDEO_START(mainsnk); -VIDEO_UPDATE(mainsnk); +SCREEN_UPDATE(mainsnk); diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index c2a372403eb..964f9dfc665 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -30,4 +30,4 @@ public: WRITE8_HANDLER( malzak_playfield_w ); -VIDEO_UPDATE( malzak ); +SCREEN_UPDATE( malzak ); diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 451649219f6..f176b18a0dd 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -18,14 +18,14 @@ public: VIDEO_START( phozon ); PALETTE_INIT( phozon ); -VIDEO_UPDATE( phozon ); +SCREEN_UPDATE( phozon ); PALETTE_INIT( superpac ); PALETTE_INIT( mappy ); VIDEO_START( superpac ); VIDEO_START( mappy ); -VIDEO_UPDATE( superpac ); -VIDEO_UPDATE( mappy ); +SCREEN_UPDATE( superpac ); +SCREEN_UPDATE( mappy ); WRITE8_HANDLER( superpac_videoram_w ); WRITE8_HANDLER( mappy_videoram_w ); WRITE8_HANDLER( mappy_scroll_w ); diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index c4e35ecf6cb..5ae9c02533c 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -33,8 +33,8 @@ WRITE8_HANDLER( marineb_flipscreen_y_w ); PALETTE_INIT( marineb ); VIDEO_START( marineb ); -VIDEO_UPDATE( marineb ); -VIDEO_UPDATE( changes ); -VIDEO_UPDATE( springer ); -VIDEO_UPDATE( hoccer ); -VIDEO_UPDATE( hopprobo ); +SCREEN_UPDATE( marineb ); +SCREEN_UPDATE( changes ); +SCREEN_UPDATE( springer ); +SCREEN_UPDATE( hoccer ); +SCREEN_UPDATE( hopprobo ); diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index ca5371c5417..ca66984aa43 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -70,7 +70,7 @@ WRITE8_HANDLER( mario_flip_w ); PALETTE_INIT( mario ); VIDEO_START( mario ); -VIDEO_UPDATE( mario ); +SCREEN_UPDATE( mario ); /*----------- defined in audio/mario.c -----------*/ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index 3537b253f5b..a38d60dc6c6 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -28,4 +28,4 @@ WRITE8_HANDLER( markham_flipscreen_w ); PALETTE_INIT( markham ); VIDEO_START( markham ); -VIDEO_UPDATE( markham ); +SCREEN_UPDATE( markham ); diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index 84fedf3177d..3ed0d6a5402 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -59,6 +59,6 @@ READ8_HANDLER( maniach_mcu_status_r ); WRITE8_HANDLER( matmania_paletteram_w ); PALETTE_INIT( matmania ); -VIDEO_UPDATE( maniach ); +SCREEN_UPDATE( maniach ); VIDEO_START( matmania ); -VIDEO_UPDATE( matmania ); +SCREEN_UPDATE( matmania ); diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 7293038703f..fa077e7a789 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -28,9 +28,9 @@ public: /*----------- defined in video/mcatadv.c -----------*/ -VIDEO_UPDATE( mcatadv ); +SCREEN_UPDATE( mcatadv ); VIDEO_START( mcatadv ); -VIDEO_EOF( mcatadv ); +SCREEN_EOF( mcatadv ); WRITE16_HANDLER( mcatadv_videoram1_w ); WRITE16_HANDLER( mcatadv_videoram2_w ); diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 48bb8fe6f06..79cd6920d37 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -76,7 +76,7 @@ READ8_HANDLER( twotiger_videoram_r ); WRITE8_HANDLER( twotiger_videoram_w ); WRITE8_HANDLER( mcr_91490_videoram_w ); -VIDEO_UPDATE( mcr ); +SCREEN_UPDATE( mcr ); /*----------- defined in video/mcr3.c -----------*/ @@ -97,5 +97,5 @@ VIDEO_START( spyhunt ); PALETTE_INIT( spyhunt ); -VIDEO_UPDATE( mcr3 ); -VIDEO_UPDATE( spyhunt ); +SCREEN_UPDATE( mcr3 ); +SCREEN_UPDATE( spyhunt ); diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 94609a22ef1..350228fa942 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -71,11 +71,11 @@ WRITE16_HANDLER( mcr68_paletteram_w ); WRITE16_HANDLER( mcr68_videoram_w ); VIDEO_START( mcr68 ); -VIDEO_UPDATE( mcr68 ); +SCREEN_UPDATE( mcr68 ); WRITE16_HANDLER( zwackery_paletteram_w ); WRITE16_HANDLER( zwackery_videoram_w ); WRITE16_HANDLER( zwackery_spriteram_w ); VIDEO_START( zwackery ); -VIDEO_UPDATE( zwackery ); +SCREEN_UPDATE( zwackery ); diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index bc263656e42..ed24458fc92 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -41,7 +41,7 @@ void meadows_sh_update(running_machine *machine); /*----------- defined in video/meadows.c -----------*/ VIDEO_START( meadows ); -VIDEO_UPDATE( meadows ); +SCREEN_UPDATE( meadows ); WRITE8_HANDLER( meadows_videoram_w ); WRITE8_HANDLER( meadows_spriteram_w ); diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 1605864ac3f..7023cb8e7b2 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -66,8 +66,8 @@ extern UINT8 megadrive_io_ctrl_regs[3]; MACHINE_START( megadriv ); MACHINE_RESET( megadriv ); VIDEO_START( megadriv ); -VIDEO_UPDATE( megadriv ); -VIDEO_EOF( megadriv ); +SCREEN_UPDATE( megadriv ); +SCREEN_EOF( megadriv ); extern UINT16* megadrive_vdp_palette_lookup; diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index 66661bf50e7..86b6c79a975 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -36,8 +36,8 @@ extern int megasys1_bits_per_color_code; /* Functions */ VIDEO_START( megasys1 ); -VIDEO_UPDATE( megasys1 ); -VIDEO_EOF( megasys1 ); +SCREEN_UPDATE( megasys1 ); +SCREEN_EOF( megasys1 ); PALETTE_INIT( megasys1 ); diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 03a912aebea..881ba733a0f 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -43,4 +43,4 @@ WRITE8_HANDLER( megazone_flipscreen_w ); PALETTE_INIT( megazone ); VIDEO_START( megazone ); -VIDEO_UPDATE( megazone ); +SCREEN_UPDATE( megazone ); diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index ae4817cabdf..6b787e139b2 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -60,5 +60,5 @@ READ8_HANDLER( mermaid_collision_r ); PALETTE_INIT( mermaid ); PALETTE_INIT( rougien ); VIDEO_START( mermaid ); -VIDEO_UPDATE( mermaid ); -VIDEO_EOF( mermaid ); +SCREEN_UPDATE( mermaid ); +SCREEN_EOF( mermaid ); diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index dbcff37c864..cda4364bd31 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -38,4 +38,4 @@ WRITE8_HANDLER( metlclsh_gfxbank_w ); WRITE8_HANDLER( metlclsh_rambank_w ); VIDEO_START( metlclsh ); -VIDEO_UPDATE( metlclsh ); +SCREEN_UPDATE( metlclsh ); diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index eee69a17f72..38c93fa9176 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -102,6 +102,6 @@ VIDEO_START( metro_14300 ); VIDEO_START( blzntrnd ); VIDEO_START( gstrik2 ); -VIDEO_UPDATE( metro ); +SCREEN_UPDATE( metro ); void metro_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index 3c327c579d2..66c484214c6 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -53,5 +53,5 @@ WRITE8_HANDLER( mexico86_68705_ddr_b_w ); WRITE8_HANDLER( mexico86_bankswitch_w ); -VIDEO_UPDATE( mexico86 ); -VIDEO_UPDATE( kikikai ); +SCREEN_UPDATE( mexico86 ); +SCREEN_UPDATE( kikikai ); diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index f0ca3563f56..1be8f984121 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -65,4 +65,4 @@ WRITE32_HANDLER( midvunit_textureram_w ); READ32_HANDLER( midvunit_textureram_r ); VIDEO_START( midvunit ); -VIDEO_UPDATE( midvunit ); +SCREEN_UPDATE( midvunit ); diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index bba0a282f80..ea9c34323cc 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -22,7 +22,7 @@ public: extern UINT32 *zeusbase; VIDEO_START( midzeus ); -VIDEO_UPDATE( midzeus ); +SCREEN_UPDATE( midzeus ); READ32_HANDLER( zeus_r ); WRITE32_HANDLER( zeus_w ); @@ -30,7 +30,7 @@ WRITE32_HANDLER( zeus_w ); /*----------- defined in video/midzeus2.c -----------*/ VIDEO_START( midzeus2 ); -VIDEO_UPDATE( midzeus2 ); +SCREEN_UPDATE( midzeus2 ); READ32_HANDLER( zeus2_r ); WRITE32_HANDLER( zeus2_w ); diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 6d99fae93e4..a8e12b09ed9 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -38,4 +38,4 @@ WRITE8_HANDLER( mikie_flipscreen_w ); PALETTE_INIT( mikie ); VIDEO_START( mikie ); -VIDEO_UPDATE( mikie ); +SCREEN_UPDATE( mikie ); diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 476f6f4c9dc..74b68f0d4e1 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -67,4 +67,4 @@ WRITE8_HANDLER( mstworld_gfxctrl_w ); WRITE8_HANDLER( mstworld_video_bank_w ); VIDEO_START( pang ); -VIDEO_UPDATE( pang ); +SCREEN_UPDATE( pang ); diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index b7ecd22cf31..fa91ce9e44c 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -19,7 +19,7 @@ public: /*----------- defined in video/mjkjidai.c -----------*/ VIDEO_START( mjkjidai ); -VIDEO_UPDATE( mjkjidai ); +SCREEN_UPDATE( mjkjidai ); WRITE8_HANDLER( mjkjidai_videoram_w ); WRITE8_HANDLER( mjkjidai_ctrl_w ); diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index 17e8f0baabb..90ce638afd5 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -110,8 +110,8 @@ void model1_tgp_reset(running_machine *machine, int swa); /*----------- defined in video/model1.c -----------*/ VIDEO_START(model1); -VIDEO_UPDATE(model1); -VIDEO_EOF(model1); +SCREEN_UPDATE(model1); +SCREEN_EOF(model1); READ16_HANDLER( model1_listctl_r ); WRITE16_HANDLER( model1_listctl_w ); diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 09f5cef4ef2..f02f56416b2 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -71,6 +71,6 @@ public: /*----------- defined in video/model2.c -----------*/ VIDEO_START(model2); -VIDEO_UPDATE(model2); +SCREEN_UPDATE(model2); void model2_3d_set_zclip( running_machine *machine, UINT8 clip ); diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index e75a6b0ba82..a319efe6ca9 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -128,7 +128,7 @@ READ64_HANDLER(model3_palette_r); WRITE64_HANDLER(model3_palette_w); VIDEO_START(model3); -VIDEO_UPDATE(model3); +SCREEN_UPDATE(model3); WRITE64_HANDLER(real3d_cmd_w); WRITE64_HANDLER(real3d_display_list_w); diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index fcbeefa9d78..ccdc598a97b 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -46,4 +46,4 @@ WRITE8_HANDLER( momoko_fg_select_w); WRITE8_HANDLER( momoko_bg_select_w); WRITE8_HANDLER( momoko_bg_priority_w); -VIDEO_UPDATE( momoko ); +SCREEN_UPDATE( momoko ); diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index 234cad3cef9..fc3637286ca 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -45,4 +45,4 @@ extern void moo_tile_callback(running_machine *machine, int layer, int *code, in extern void moo_sprite_callback(running_machine *machine, int *code, int *color, int *priority_mask); VIDEO_START(moo); -VIDEO_UPDATE(moo); +SCREEN_UPDATE(moo); diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index 4fccd4ccc6d..ae5effea262 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -29,4 +29,4 @@ WRITE8_HANDLER( mosaic_fgvideoram_w ); WRITE8_HANDLER( mosaic_bgvideoram_w ); VIDEO_START( mosaic ); -VIDEO_UPDATE( mosaic ); +SCREEN_UPDATE( mosaic ); diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index 88cb7c5a14b..cdee6709477 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -31,4 +31,4 @@ WRITE8_HANDLER( mouser_flip_screen_x_w ); WRITE8_HANDLER( mouser_flip_screen_y_w ); PALETTE_INIT( mouser ); -VIDEO_UPDATE( mouser ); +SCREEN_UPDATE( mouser ); diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index c91faee8216..bc34ef36f83 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -32,4 +32,4 @@ WRITE8_HANDLER( mrdo_flipscreen_w ); PALETTE_INIT( mrdo ); VIDEO_START( mrdo ); -VIDEO_UPDATE( mrdo ); +SCREEN_UPDATE( mrdo ); diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 2ad07a6bac3..cafbd6548f0 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -36,4 +36,4 @@ WRITE8_HANDLER( mrflea_gfx_bank_w ); WRITE8_HANDLER( mrflea_videoram_w ); WRITE8_HANDLER( mrflea_spriteram_w ); -VIDEO_UPDATE( mrflea ); +SCREEN_UPDATE( mrflea ); diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 0a8f1940454..95fc7a8b851 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -27,4 +27,4 @@ WRITE8_HANDLER( mrjong_flipscreen_w ); PALETTE_INIT( mrjong ); VIDEO_START( mrjong ); -VIDEO_UPDATE( mrjong ); +SCREEN_UPDATE( mrjong ); diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index 5d41c3af6ac..82f511398ee 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -25,4 +25,4 @@ WRITE32_HANDLER( ms32_brightness_w ); WRITE32_HANDLER( ms32_gfxctrl_w ); VIDEO_START( ms32 ); VIDEO_START( f1superb ); -VIDEO_UPDATE( ms32 ); +SCREEN_UPDATE( ms32 ); diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index 1889007c3f4..23c028ded1e 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -53,5 +53,5 @@ WRITE8_HANDLER( msisaac_bg_videoram_w ); WRITE8_HANDLER( msisaac_bg2_videoram_w ); WRITE8_HANDLER( msisaac_fg_videoram_w ); -VIDEO_UPDATE( msisaac ); +SCREEN_UPDATE( msisaac ); VIDEO_START( msisaac ); diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 38b70712ce9..3f4fec0cb3c 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -22,7 +22,7 @@ public: /*----------- defined in video/mugsmash.c -----------*/ VIDEO_START( mugsmash ); -VIDEO_UPDATE( mugsmash ); +SCREEN_UPDATE( mugsmash ); WRITE16_HANDLER( mugsmash_reg_w ); WRITE16_HANDLER( mugsmash_videoram2_w ); diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index cb8ef049fb9..67030e51c42 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -41,4 +41,4 @@ WRITE8_HANDLER( mnchmobl_flipscreen_w ); PALETTE_INIT( mnchmobl ); VIDEO_START( mnchmobl ); -VIDEO_UPDATE( mnchmobl ); +SCREEN_UPDATE( mnchmobl ); diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index cb2b30a9c18..d4aa3b530c4 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -16,5 +16,5 @@ WRITE8_HANDLER( mustache_videoram_w ); WRITE8_HANDLER( mustache_scroll_w ); WRITE8_HANDLER( mustache_video_control_w ); VIDEO_START( mustache ); -VIDEO_UPDATE( mustache ); +SCREEN_UPDATE( mustache ); PALETTE_INIT( mustache ); diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index d0634751bff..74038346547 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -294,29 +294,29 @@ WRITE8_HANDLER( shuttlei_sh_port_2_w ); /*----------- defined in video/mw8080bw.c -----------*/ -VIDEO_UPDATE( mw8080bw ); +SCREEN_UPDATE( mw8080bw ); -VIDEO_UPDATE( spcenctr ); +SCREEN_UPDATE( spcenctr ); -VIDEO_UPDATE( phantom2 ); -VIDEO_EOF( phantom2 ); +SCREEN_UPDATE( phantom2 ); +SCREEN_EOF( phantom2 ); -VIDEO_UPDATE( invaders ); +SCREEN_UPDATE( invaders ); /*----------- defined in video/8080bw.c -----------*/ MACHINE_START( extra_8080bw_vh ); -VIDEO_UPDATE( invadpt2 ); -VIDEO_UPDATE( ballbomb ); -VIDEO_UPDATE( schaser ); -VIDEO_UPDATE( schasercv ); -VIDEO_UPDATE( rollingc ); -VIDEO_UPDATE( polaris ); -VIDEO_UPDATE( lupin3 ); -VIDEO_UPDATE( cosmo ); -VIDEO_UPDATE( indianbt ); -VIDEO_UPDATE( shuttlei ); -VIDEO_UPDATE( sflush ); +SCREEN_UPDATE( invadpt2 ); +SCREEN_UPDATE( ballbomb ); +SCREEN_UPDATE( schaser ); +SCREEN_UPDATE( schasercv ); +SCREEN_UPDATE( rollingc ); +SCREEN_UPDATE( polaris ); +SCREEN_UPDATE( lupin3 ); +SCREEN_UPDATE( cosmo ); +SCREEN_UPDATE( indianbt ); +SCREEN_UPDATE( shuttlei ); +SCREEN_UPDATE( sflush ); diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 364fd131f9c..617abf11011 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -29,10 +29,10 @@ VIDEO_START( viostorm ); VIDEO_START( metamrph ); VIDEO_START( martchmp ); VIDEO_START( mystwarr ); -VIDEO_UPDATE( dadandrn ); -VIDEO_UPDATE( mystwarr ); -VIDEO_UPDATE( metamrph ); -VIDEO_UPDATE( martchmp ); +SCREEN_UPDATE( dadandrn ); +SCREEN_UPDATE( mystwarr ); +SCREEN_UPDATE( metamrph ); +SCREEN_UPDATE( martchmp ); WRITE16_HANDLER( ddd_053936_enable_w ); WRITE16_HANDLER( ddd_053936_clip_w ); diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h index bd072a53db1..7e059b4f459 100644 --- a/src/mame/includes/n64.h +++ b/src/mame/includes/n64.h @@ -19,7 +19,7 @@ public: /*----------- defined in video/n64.c -----------*/ extern VIDEO_START( n64 ); -extern VIDEO_UPDATE( n64 ); +extern SCREEN_UPDATE( n64 ); #define DACRATE_NTSC (48681812) #define DACRATE_PAL (49656530) diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index fec440889d3..93d77ca2264 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -52,10 +52,10 @@ PALETTE_INIT( helifire ); VIDEO_START( spacefev ); VIDEO_START( sheriff ); VIDEO_START( helifire ); -VIDEO_UPDATE( spacefev ); -VIDEO_UPDATE( sheriff ); -VIDEO_UPDATE( helifire ); -VIDEO_EOF( helifire ); +SCREEN_UPDATE( spacefev ); +SCREEN_UPDATE( sheriff ); +SCREEN_UPDATE( helifire ); +SCREEN_EOF( helifire ); void spacefev_start_red_cannon(running_machine *machine); diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index a817d9bb3e8..3b68288b729 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -1,6 +1,6 @@ /*----------- defined in video/namcofl.c -----------*/ VIDEO_START( namcofl ); -VIDEO_UPDATE( namcofl ); +SCREEN_UPDATE( namcofl ); WRITE32_HANDLER( namcofl_spritebank_w ); diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 33ee61124e8..3f45b3d3722 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -40,5 +40,5 @@ extern WRITE16_HANDLER( namcona1_gfxram_w ); extern READ16_HANDLER( namcona1_paletteram_r ); extern WRITE16_HANDLER( namcona1_paletteram_w ); -extern VIDEO_UPDATE( namcona1 ); +extern SCREEN_UPDATE( namcona1 ); extern VIDEO_START( namcona1 ); diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 8822f1433c1..c15d1120b9c 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -20,8 +20,8 @@ extern UINT32 *namconb1_tilebank32; #define NAMCONB1_SPRITEGFX 1 #define NAMCONB1_ROTGFX 2 -VIDEO_UPDATE( namconb1 ); +SCREEN_UPDATE( namconb1 ); VIDEO_START( namconb1 ); -VIDEO_UPDATE( namconb2 ); +SCREEN_UPDATE( namconb2 ); VIDEO_START( namconb2 ); diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 50432dbb18d..d3e85d3efd7 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -52,5 +52,5 @@ READ8_HANDLER( namcos1_spriteram_r ); WRITE8_HANDLER( namcos1_spriteram_w ); VIDEO_START( namcos1 ); -VIDEO_UPDATE( namcos1 ); -VIDEO_EOF( namcos1 ); +SCREEN_UPDATE( namcos1 ); +SCREEN_EOF( namcos1 ); diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 15039bfcca7..cf3b86cc6eb 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -90,19 +90,19 @@ enum #define NAMCOS21_NUM_COLORS 0x8000 VIDEO_START( namcos2 ); -VIDEO_UPDATE( namcos2_default ); +SCREEN_UPDATE( namcos2_default ); VIDEO_START( finallap ); -VIDEO_UPDATE( finallap ); +SCREEN_UPDATE( finallap ); VIDEO_START( luckywld ); -VIDEO_UPDATE( luckywld ); +SCREEN_UPDATE( luckywld ); VIDEO_START( metlhawk ); -VIDEO_UPDATE( metlhawk ); +SCREEN_UPDATE( metlhawk ); VIDEO_START( sgunner ); -VIDEO_UPDATE( sgunner ); +SCREEN_UPDATE( sgunner ); extern UINT16 *namcos2_sprite_ram; WRITE16_HANDLER( namcos2_sprite_ram_w ); diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index cd6485564db..6323b4f0b3b 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -35,4 +35,4 @@ extern READ16_HANDLER(winrun_gpu_register_r); extern WRITE16_HANDLER(winrun_gpu_register_w); extern VIDEO_START( namcos21 ) ; -extern VIDEO_UPDATE( namcos21 ); +extern SCREEN_UPDATE( namcos21 ); diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 489b74c0b93..f8ef2bccb73 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -66,10 +66,10 @@ WRITE32_HANDLER( namcos22_dspram_w ); VIDEO_START( namcos22 ); -VIDEO_UPDATE( namcos22 ); +SCREEN_UPDATE( namcos22 ); VIDEO_START( namcos22s ); -VIDEO_UPDATE( namcos22s ); +SCREEN_UPDATE( namcos22s ); void namcos22_draw_direct_poly( running_machine *machine, const UINT16 *pSource ); extern UINT32 namcos22_point_rom_r( offs_t offs ); diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index cd4db3868b7..b63d32d2c75 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -4,8 +4,8 @@ extern UINT8 *rthunder_videoram1, *rthunder_videoram2, *rthunder_spriteram; PALETTE_INIT( namcos86 ); VIDEO_START( namcos86 ); -VIDEO_UPDATE( namcos86 ); -VIDEO_EOF( namcos86 ); +SCREEN_UPDATE( namcos86 ); +SCREEN_EOF( namcos86 ); READ8_HANDLER( rthunder_videoram1_r ); WRITE8_HANDLER( rthunder_videoram1_w ); diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 8332c270afb..eac3acb68bf 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -19,4 +19,4 @@ WRITE8_HANDLER( popflame_videoreg_w ); VIDEO_START( naughtyb ); PALETTE_INIT( naughtyb ); -VIDEO_UPDATE( naughtyb ); +SCREEN_UPDATE( naughtyb ); diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 9fec5394c5d..791d2162573 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -3,8 +3,9 @@ PALETTE_INIT( mbmj8688_8bit ); PALETTE_INIT( mbmj8688_12bit ); PALETTE_INIT( mbmj8688_16bit ); -VIDEO_UPDATE( mbmj8688 ); -VIDEO_UPDATE( mbmj8688_LCD ); +SCREEN_UPDATE( mbmj8688 ); +SCREEN_UPDATE( mbmj8688_lcd0 ); +SCREEN_UPDATE( mbmj8688_lcd1 ); VIDEO_START( mbmj8688_8bit ); VIDEO_START( mbmj8688_hybrid_12bit ); VIDEO_START( mbmj8688_pure_12bit ); diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 185c87e533f..4d115629ecb 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -1,6 +1,6 @@ /*----------- defined in video/nbmj8891.c -----------*/ -VIDEO_UPDATE( nbmj8891 ); +SCREEN_UPDATE( nbmj8891 ); VIDEO_START( nbmj8891_1layer ); VIDEO_START( nbmj8891_2layer ); diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index a5d932de499..ba9300ce2b4 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -1,6 +1,6 @@ /*----------- defined in video/nbmj8900.c -----------*/ -VIDEO_UPDATE( nbmj8900 ); +SCREEN_UPDATE( nbmj8900 ); VIDEO_START( nbmj8900_2layer ); READ8_HANDLER( nbmj8900_palette_type1_r ); diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index 5b51ff4dae2..08ae19184da 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -1,7 +1,7 @@ /*----------- defined in video/nbmj8991.c -----------*/ -VIDEO_UPDATE( nbmj8991_type1 ); -VIDEO_UPDATE( nbmj8991_type2 ); +SCREEN_UPDATE( nbmj8991_type1 ); +SCREEN_UPDATE( nbmj8991_type2 ); VIDEO_START( nbmj8991 ); WRITE8_HANDLER( nbmj8991_palette_type1_w ); diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index 03e022a2164..19e6db5b0cb 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -1,6 +1,6 @@ /*----------- defined in video/nbmj9195.c -----------*/ -VIDEO_UPDATE( nbmj9195 ); +SCREEN_UPDATE( nbmj9195 ); VIDEO_START( nbmj9195_1layer ); VIDEO_START( nbmj9195_2layer ); VIDEO_START( nbmj9195_nb22090 ); diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index b9721418499..34b418d4351 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -60,4 +60,4 @@ WRITE16_HANDLER( nemesis_colorram2_word_w ); WRITE16_HANDLER( nemesis_charram_word_w ); VIDEO_START( nemesis ); -VIDEO_UPDATE( nemesis ); +SCREEN_UPDATE( nemesis ); diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index 49902356744..18d9675ed8f 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -210,7 +210,7 @@ void matrimbl_decrypt(running_machine *machine); VIDEO_START( neogeo ); VIDEO_RESET( neogeo ); -VIDEO_UPDATE( neogeo ); +SCREEN_UPDATE( neogeo ); READ16_HANDLER( neogeo_video_register_r ); WRITE16_HANDLER( neogeo_video_register_w ); diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index ec6913fba60..15523126818 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -23,4 +23,4 @@ WRITE8_HANDLER( news_bgram_w ); WRITE8_HANDLER( news_bgpic_w ); VIDEO_START( news ); -VIDEO_UPDATE( news ); +SCREEN_UPDATE( news ); diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index dd9f2feb268..18190f6bd46 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -23,10 +23,10 @@ extern VIDEO_START( mnight ); extern VIDEO_START( arkarea ); extern VIDEO_START( robokid ); extern VIDEO_START( omegaf ); -extern VIDEO_UPDATE( ninjakd2 ); -extern VIDEO_UPDATE( robokid ); -extern VIDEO_UPDATE( omegaf ); -extern VIDEO_EOF( ninjakd2 ); +extern SCREEN_UPDATE( ninjakd2 ); +extern SCREEN_UPDATE( robokid ); +extern SCREEN_UPDATE( omegaf ); +extern SCREEN_EOF( ninjakd2 ); extern UINT8* ninjakd2_bg_videoram; extern UINT8* ninjakd2_fg_videoram; diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 1487b9a2189..976bf4b43b3 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -40,4 +40,4 @@ public: /*----------- defined in video/ninjaw.c -----------*/ VIDEO_START( ninjaw ); -VIDEO_UPDATE( ninjaw ); +SCREEN_UPDATE( ninjaw ); diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index 1b300cf3200..530972d8749 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -71,4 +71,4 @@ WRITE8_HANDLER( nitedrvr_hvc_w ); WRITE8_HANDLER( nitedrvr_videoram_w ); VIDEO_START( nitedrvr ); -VIDEO_UPDATE( nitedrvr ); +SCREEN_UPDATE( nitedrvr ); diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 35f368ba453..b1e47828ae5 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -1,6 +1,6 @@ /*----------- defined in video/niyanpai.c -----------*/ -VIDEO_UPDATE( niyanpai ); +SCREEN_UPDATE( niyanpai ); VIDEO_START( niyanpai ); READ16_HANDLER( niyanpai_palette_r ); diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 36479521801..86b458093f8 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -36,29 +36,29 @@ WRITE16_HANDLER( vandykeb_scroll_w ); WRITE16_HANDLER( manybloc_scroll_w ); VIDEO_START( macross ); -VIDEO_UPDATE( manybloc ); +SCREEN_UPDATE( manybloc ); VIDEO_START( gunnail ); VIDEO_START( macross2 ); VIDEO_START( raphero ); VIDEO_START( bjtwin ); VIDEO_START( bioship ); VIDEO_START( strahl ); -VIDEO_UPDATE( bioship ); -VIDEO_UPDATE( strahl ); -VIDEO_UPDATE( macross ); -VIDEO_UPDATE( gunnail ); -VIDEO_UPDATE( bjtwin ); -VIDEO_UPDATE( tharrier ); -VIDEO_UPDATE( hachamf ); -VIDEO_UPDATE( tdragon ); -VIDEO_EOF( nmk ); -VIDEO_EOF( strahl ); +SCREEN_UPDATE( bioship ); +SCREEN_UPDATE( strahl ); +SCREEN_UPDATE( macross ); +SCREEN_UPDATE( gunnail ); +SCREEN_UPDATE( bjtwin ); +SCREEN_UPDATE( tharrier ); +SCREEN_UPDATE( hachamf ); +SCREEN_UPDATE( tdragon ); +SCREEN_EOF( nmk ); +SCREEN_EOF( strahl ); VIDEO_START( afega ); VIDEO_START( grdnstrm ); VIDEO_START( firehawk ); -VIDEO_UPDATE( afega ); -VIDEO_UPDATE( redhawkb ); -VIDEO_UPDATE(redhawki ); -VIDEO_UPDATE( bubl2000 ); -VIDEO_UPDATE( firehawk ); +SCREEN_UPDATE( afega ); +SCREEN_UPDATE( redhawkb ); +SCREEN_UPDATE(redhawki ); +SCREEN_UPDATE( bubl2000 ); +SCREEN_UPDATE( firehawk ); diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 6e6211c2611..171e5d5f9b2 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -14,10 +14,10 @@ extern WRITE8_HANDLER( ninjakun_paletteram_w ); extern PALETTE_INIT( nova2001 ); extern VIDEO_START( nova2001 ); -extern VIDEO_UPDATE( nova2001 ); +extern SCREEN_UPDATE( nova2001 ); extern VIDEO_START( ninjakun ); -extern VIDEO_UPDATE( ninjakun ); +extern SCREEN_UPDATE( ninjakun ); extern VIDEO_START( pkunwar ); -extern VIDEO_UPDATE( pkunwar ); +extern SCREEN_UPDATE( pkunwar ); extern VIDEO_START( raiders5 ); -extern VIDEO_UPDATE( raiders5 ); +extern SCREEN_UPDATE( raiders5 ); diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index bb8ae7290b1..c48f6bf7c9b 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -72,4 +72,4 @@ WRITE8_HANDLER( nycaptor_gfxctrl_w ); WRITE8_HANDLER( nycaptor_scrlram_w ); VIDEO_START( nycaptor ); -VIDEO_UPDATE( nycaptor ); +SCREEN_UPDATE( nycaptor ); diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index 0b71bd72bb6..5bd6991f14c 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -24,4 +24,4 @@ public: /*----------- defined in video/offtwall.c -----------*/ VIDEO_START( offtwall ); -VIDEO_UPDATE( offtwall ); +SCREEN_UPDATE( offtwall ); diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index e61418e3dcd..c3929a47d36 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -35,4 +35,4 @@ WRITE16_HANDLER( ohmygod_scrollx_w ); WRITE16_HANDLER( ohmygod_scrolly_w ); VIDEO_START( ohmygod ); -VIDEO_UPDATE( ohmygod ); +SCREEN_UPDATE( ohmygod ); diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index a8d7b505e95..ffd07a0357f 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -52,8 +52,8 @@ VIDEO_START( ojankohs ); VIDEO_START( ojankoy ); VIDEO_START( ojankoc ); -VIDEO_UPDATE( ojankohs ); -VIDEO_UPDATE( ojankoc ); +SCREEN_UPDATE( ojankohs ); +SCREEN_UPDATE( ojankoc ); void ojankoc_flipscreen(address_space *space, int data); diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 4962e0fa9c9..180ae2638bc 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -32,5 +32,5 @@ WRITE16_HANDLER( oneshot_mid_videoram_w ); WRITE16_HANDLER( oneshot_fg_videoram_w ); VIDEO_START( oneshot ); -VIDEO_UPDATE( oneshot ); -VIDEO_UPDATE( maddonna ); +SCREEN_UPDATE( oneshot ); +SCREEN_UPDATE( maddonna ); diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index 8c3385fc714..e013055f703 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -63,4 +63,4 @@ WRITE16_HANDLER( opwolf_cchip_bank_w ); WRITE16_HANDLER( opwolf_spritectrl_w ); -VIDEO_UPDATE( opwolf ); +SCREEN_UPDATE( opwolf ); diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 2a891698e52..4d4b017633d 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -50,6 +50,6 @@ DISCRETE_SOUND_EXTERN( orbit ); /*----------- defined in video/orbit.c -----------*/ VIDEO_START( orbit ); -VIDEO_UPDATE( orbit ); +SCREEN_UPDATE( orbit ); extern WRITE8_HANDLER( orbit_playfield_w ); diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h index 51954ec1bb8..f890b38f192 100644 --- a/src/mame/includes/othldrby.h +++ b/src/mame/includes/othldrby.h @@ -36,5 +36,5 @@ WRITE16_HANDLER( othldrby_vreg_addr_w ); WRITE16_HANDLER( othldrby_vreg_w ); VIDEO_START( othldrby ); -VIDEO_EOF( othldrby ); -VIDEO_UPDATE( othldrby ); +SCREEN_EOF( othldrby ); +SCREEN_UPDATE( othldrby ); diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 4e36e4326d9..0d65a770185 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -53,4 +53,4 @@ public: /*----------- defined in video/othunder.c -----------*/ VIDEO_START( othunder ); -VIDEO_UPDATE( othunder ); +SCREEN_UPDATE( othunder ); diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index a378378cdf5..cf73da3db0a 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -37,4 +37,4 @@ extern void overdriv_sprite_callback(running_machine *machine, int *code,int *co extern void overdriv_zoom_callback_0(running_machine *machine, int *code,int *color,int *flags); extern void overdriv_zoom_callback_1(running_machine *machine, int *code,int *color,int *flags); -VIDEO_UPDATE( overdriv ); +SCREEN_UPDATE( overdriv ); diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 1220fc27644..15415c2680e 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -28,4 +28,4 @@ WRITE8_HANDLER( pacland_bankswitch_w ); PALETTE_INIT( pacland ); VIDEO_START( pacland ); -VIDEO_UPDATE( pacland ); +SCREEN_UPDATE( pacland ); diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 97292c67a7a..b64db53fb68 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -11,7 +11,7 @@ extern UINT8 *pacman_colorram; PALETTE_INIT( pacman ); VIDEO_START( pacman ); -VIDEO_UPDATE( pacman ); +SCREEN_UPDATE( pacman ); WRITE8_HANDLER( pacman_videoram_w ); WRITE8_HANDLER( pacman_colorram_w ); @@ -29,7 +29,7 @@ WRITE8_HANDLER( vanvan_bgcolor_w ); VIDEO_START( s2650games ); -VIDEO_UPDATE( s2650games ); +SCREEN_UPDATE( s2650games ); extern UINT8 *s2650games_spriteram; extern UINT8 *s2650games_tileram; diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 513874d8660..3ca40265dd4 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -41,5 +41,5 @@ WRITE8_HANDLER( pandoras_flipscreen_w ); WRITE8_HANDLER( pandoras_scrolly_w ); VIDEO_START( pandoras ); -VIDEO_UPDATE( pandoras ); +SCREEN_UPDATE( pandoras ); diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index c9bc56375ed..f533dfc1a0e 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -37,6 +37,6 @@ WRITE8_HANDLER( paradise_palbank_w ); VIDEO_START( paradise ); -VIDEO_UPDATE( paradise ); -VIDEO_UPDATE( torus ); -VIDEO_UPDATE( madball ); +SCREEN_UPDATE( paradise ); +SCREEN_UPDATE( torus ); +SCREEN_UPDATE( madball ); diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index 2612a68b307..184bbed4fa1 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -36,4 +36,4 @@ public: extern void parodius_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void parodius_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask); -VIDEO_UPDATE( parodius ); +SCREEN_UPDATE( parodius ); diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index e6e7f72c523..db0aa56056c 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -18,4 +18,4 @@ WRITE16_HANDLER( pass_fg_videoram_w ); WRITE16_HANDLER( pass_bg_videoram_w ); VIDEO_START( pass ); -VIDEO_UPDATE( pass ); +SCREEN_UPDATE( pass ); diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 74dc6dff818..3041f054671 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -1,7 +1,7 @@ /*----------- defined in video/pastelg.c -----------*/ PALETTE_INIT( pastelg ); -VIDEO_UPDATE( pastelg ); +SCREEN_UPDATE( pastelg ); VIDEO_START( pastelg ); WRITE8_HANDLER( pastelg_clut_w ); diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index c8564db7208..8836720dc6c 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -40,4 +40,4 @@ extern WRITE8_HANDLER( pbaction_flipscreen_w ); extern WRITE8_HANDLER( pbaction_scroll_w ); extern VIDEO_START( pbaction ); -extern VIDEO_UPDATE( pbaction ); +extern SCREEN_UPDATE( pbaction ); diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index e8c29197be4..94790915411 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -18,4 +18,4 @@ WRITE8_HANDLER( pcktgal_flipscreen_w ); PALETTE_INIT( pcktgal ); VIDEO_START( pcktgal ); -VIDEO_UPDATE( pcktgal ); +SCREEN_UPDATE( pcktgal ); diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index f522e895032..2e68f8948b3 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -120,5 +120,5 @@ WRITE16_HANDLER( pgm_tx_videoram_w ); WRITE16_HANDLER( pgm_bg_videoram_w ); VIDEO_START( pgm ); -VIDEO_EOF( pgm ); -VIDEO_UPDATE( pgm ); +SCREEN_EOF( pgm ); +SCREEN_UPDATE( pgm ); diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index 354426cda24..7c2b1bc80aa 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -32,7 +32,7 @@ PALETTE_INIT( phoenix ); PALETTE_INIT( survival ); PALETTE_INIT( pleiads ); VIDEO_START( phoenix ); -VIDEO_UPDATE( phoenix ); +SCREEN_UPDATE( phoenix ); WRITE8_HANDLER( phoenix_videoram_w ); WRITE8_HANDLER( phoenix_videoreg_w ); diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index a72b97f1faf..ca0c23dec53 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -8,4 +8,4 @@ WRITE8_HANDLER( pingpong_colorram_w ); PALETTE_INIT( pingpong ); VIDEO_START( pingpong ); -VIDEO_UPDATE( pingpong ); +SCREEN_UPDATE( pingpong ); diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index 181d1de4a4a..6f458c60c50 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -9,4 +9,4 @@ WRITE16_HANDLER( pirates_fg_tileram_w ); WRITE16_HANDLER( pirates_bg_tileram_w ); VIDEO_START( pirates ); -VIDEO_UPDATE( pirates ); +SCREEN_UPDATE( pirates ); diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index 01396331a1c..0e74035e25f 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -55,4 +55,4 @@ WRITE8_HANDLER( pitnrun_scroll_w ); PALETTE_INIT(pitnrun); VIDEO_START(pitnrun); -VIDEO_UPDATE(pitnrun); +SCREEN_UPDATE(pitnrun); diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index 7389c477853..dac3e039869 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -29,5 +29,5 @@ public: /*----------- defined in video/pktgaldx.c -----------*/ -VIDEO_UPDATE( pktgaldx ); -VIDEO_UPDATE( pktgaldb ); +SCREEN_UPDATE( pktgaldx ); +SCREEN_UPDATE( pktgaldb ); diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 1b9dfb16ce7..12732c49755 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -65,4 +65,4 @@ WRITE8_HANDLER( playch10_videoram_w ); PALETTE_INIT( playch10 ); VIDEO_START( playch10 ); VIDEO_START( playch10_hboard ); -VIDEO_UPDATE( playch10 ); +SCREEN_UPDATE( playch10 ); diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 789033f8242..1c6c039d032 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -63,7 +63,7 @@ VIDEO_START( excelsr ); VIDEO_START( hotmind ); VIDEO_START( hrdtimes ); -VIDEO_UPDATE( bigtwin ); -VIDEO_UPDATE( wbeachvl ); -VIDEO_UPDATE( excelsr ); -VIDEO_UPDATE( hrdtimes ); +SCREEN_UPDATE( bigtwin ); +SCREEN_UPDATE( wbeachvl ); +SCREEN_UPDATE( excelsr ); +SCREEN_UPDATE( hrdtimes ); diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 9c0217096b3..8c7181ae845 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -37,7 +37,7 @@ public: /*----------- defined in video/plygonet.c -----------*/ VIDEO_START( polygonet ); -VIDEO_UPDATE( polygonet ); +SCREEN_UPDATE( polygonet ); READ32_HANDLER( polygonet_ttl_ram_r ); WRITE32_HANDLER( polygonet_ttl_ram_w ); diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 42f6bbfb3a0..ec17bb53549 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -14,4 +14,4 @@ WRITE8_HANDLER( pokechmp_videoram_w ); WRITE8_HANDLER( pokechmp_flipscreen_w ); VIDEO_START( pokechmp ); -VIDEO_UPDATE( pokechmp ); +SCREEN_UPDATE( pokechmp ); diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index 7bf08c6dc54..001a8c9be3c 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -49,7 +49,7 @@ DISCRETE_SOUND_EXTERN( polepos ); VIDEO_START( polepos ); PALETTE_INIT( polepos ); -VIDEO_UPDATE( polepos ); +SCREEN_UPDATE( polepos ); WRITE16_HANDLER( polepos_view16_w ); WRITE16_HANDLER( polepos_road16_w ); diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index a42d501a215..63dcc5f4b4b 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -18,4 +18,4 @@ WRITE32_HANDLER( policetr_palette_offset_w ); WRITE32_HANDLER( policetr_palette_data_w ); VIDEO_START( policetr ); -VIDEO_UPDATE( policetr ); +SCREEN_UPDATE( policetr ); diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 05fd847051b..abaff4050a9 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -25,5 +25,5 @@ extern UINT8 *polyplay_characterram; PALETTE_INIT( polyplay ); VIDEO_START( polyplay ); -VIDEO_UPDATE( polyplay ); +SCREEN_UPDATE( polyplay ); WRITE8_HANDLER( polyplay_characterram_w ); diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index 98777453c1a..254526796f0 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -35,5 +35,5 @@ DISCRETE_SOUND_EXTERN( poolshrk ); /*----------- defined in video/poolshrk.c -----------*/ VIDEO_START( poolshrk ); -VIDEO_UPDATE( poolshrk ); +SCREEN_UPDATE( poolshrk ); diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 864e4297d39..3ccb8e5d0c2 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -29,4 +29,4 @@ WRITE8_HANDLER( pooyan_flipscreen_w ); PALETTE_INIT( pooyan ); VIDEO_START( pooyan ); -VIDEO_UPDATE( pooyan ); +SCREEN_UPDATE( pooyan ); diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 912e369d152..6ada626a2e6 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -14,4 +14,4 @@ PALETTE_INIT( popeye ); PALETTE_INIT( popeyebl ); VIDEO_START( skyskipr ); VIDEO_START( popeye ); -VIDEO_UPDATE( popeye ); +SCREEN_UPDATE( popeye ); diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index f2635dd3c6d..7bcd013c119 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -41,5 +41,5 @@ WRITE8_HANDLER( popper_gfx_bank_w ); PALETTE_INIT( popper ); VIDEO_START( popper ); -VIDEO_UPDATE( popper ); +SCREEN_UPDATE( popper ); diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index a361cb64e71..0c213184c67 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -5,6 +5,6 @@ extern int portrait_scroll; PALETTE_INIT( portrait ); VIDEO_START( portrait ); -VIDEO_UPDATE( portrait ); +SCREEN_UPDATE( portrait ); WRITE8_HANDLER( portrait_bgvideo_write ); WRITE8_HANDLER( portrait_fgvideo_write ); diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 2e9621676b6..285cd11dbf8 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -26,4 +26,4 @@ WRITE16_HANDLER( powerins_vram_0_w ); WRITE16_HANDLER( powerins_vram_1_w ); VIDEO_START( powerins ); -VIDEO_UPDATE( powerins ); +SCREEN_UPDATE( powerins ); diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index c1db8a2aac2..6a184ab6409 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -24,4 +24,4 @@ WRITE16_HANDLER( prehisle_control16_w ); READ16_HANDLER( prehisle_control16_r ); VIDEO_START( prehisle ); -VIDEO_UPDATE( prehisle ); +SCREEN_UPDATE( prehisle ); diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index a62b7ed165e..a0a2f6925bb 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -51,6 +51,6 @@ WRITE32_HANDLER( psikyo_vram_1_w ); VIDEO_START( sngkace ); VIDEO_START( psikyo ); -VIDEO_UPDATE( psikyo ); -VIDEO_UPDATE( psikyo_bootleg ); -VIDEO_EOF( psikyo ); +SCREEN_UPDATE( psikyo ); +SCREEN_UPDATE( psikyo_bootleg ); +SCREEN_EOF( psikyo ); diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 44098877c9c..ebc82dfcea2 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -37,4 +37,4 @@ public: /*----------- defined in video/psikyo4.c -----------*/ VIDEO_START( psikyo4 ); -VIDEO_UPDATE( psikyo4 ); +SCREEN_UPDATE( psikyo4 ); diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 12887119316..bc2c6c2c1ac 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -46,5 +46,5 @@ public: /*----------- defined in video/psikyosh.c -----------*/ VIDEO_START( psikyosh ); -VIDEO_UPDATE( psikyosh ); -VIDEO_EOF( psikyosh ); +SCREEN_UPDATE( psikyosh ); +SCREEN_EOF( psikyosh ); diff --git a/src/mame/includes/psx.h b/src/mame/includes/psx.h index dcf1592cf30..f3746602891 100644 --- a/src/mame/includes/psx.h +++ b/src/mame/includes/psx.h @@ -61,7 +61,7 @@ public: PALETTE_INIT( psx ); VIDEO_START( psx_type1 ); VIDEO_START( psx_type2 ); -VIDEO_UPDATE( psx ); +SCREEN_UPDATE( psx ); INTERRUPT_GEN( psx_vblank ); extern void psx_gpu_reset( running_machine *machine ); extern void psx_gpu_read( running_machine *, UINT32 *p_ram, INT32 n_size ); diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index 650c02ee4b3..f333d7e25dc 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -38,11 +38,11 @@ READ8_HANDLER( psychic5_vram_page_select_r ); VIDEO_START( psychic5 ); VIDEO_RESET( psychic5 ); -VIDEO_UPDATE( psychic5 ); +SCREEN_UPDATE( psychic5 ); WRITE8_HANDLER( bombsa_paged_ram_w ); WRITE8_HANDLER( bombsa_unknown_w ); VIDEO_START( bombsa ); VIDEO_RESET( bombsa ); -VIDEO_UPDATE( bombsa ); +SCREEN_UPDATE( bombsa ); diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 7416c882fe7..9e761344e7b 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -17,8 +17,8 @@ WRITE8_HANDLER( punchout_spr2_videoram_w ); VIDEO_START( punchout ); VIDEO_START( armwrest ); -VIDEO_UPDATE( punchout ); -VIDEO_UPDATE( armwrest ); +SCREEN_UPDATE( punchout ); +SCREEN_UPDATE( armwrest ); DRIVER_INIT( punchout ); DRIVER_INIT( spnchout ); diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index c6eeadb1936..38c68a91036 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -37,4 +37,4 @@ WRITE16_HANDLER( pushman_videoram_w ); VIDEO_START( pushman ); -VIDEO_UPDATE( pushman ); +SCREEN_UPDATE( pushman ); diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index 30dc1fcee96..dbd16cd3b69 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -17,7 +17,7 @@ public: VIDEO_START( qdrmfgp ); VIDEO_START( qdrmfgp2 ); -VIDEO_UPDATE( qdrmfgp ); +SCREEN_UPDATE( qdrmfgp ); void qdrmfgp_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags); void qdrmfgp2_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags); diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index 04611c32bf1..b5f5e51bf32 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -1,7 +1,7 @@ /*----------- defined in video/quizdna.c -----------*/ VIDEO_START( quizdna ); -VIDEO_UPDATE( quizdna ); +SCREEN_UPDATE( quizdna ); WRITE8_HANDLER( quizdna_fg_ram_w ); WRITE8_HANDLER( quizdna_bg_ram_w ); diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index 5c7f4481eab..0dada904b84 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -8,4 +8,4 @@ WRITE16_HANDLER( quizpani_txt_videoram_w ); WRITE16_HANDLER( quizpani_tilesbank_w ); VIDEO_START( quizpani ); -VIDEO_UPDATE( quizpani ); +SCREEN_UPDATE( quizpani ); diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index e4ab873df0f..2b657f822d8 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -19,4 +19,4 @@ VIDEO_START( raiden ); VIDEO_START( raidena ); WRITE16_HANDLER( raiden_control_w ); WRITE16_HANDLER( raidena_control_w ); -VIDEO_UPDATE( raiden ); +SCREEN_UPDATE( raiden ); diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index e1d5529c8b3..8bb1664732e 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -47,9 +47,9 @@ WRITE16_HANDLER( rainbow_cchip_ram_w ); /*----------- defined in video/rainbow.c -----------*/ -VIDEO_UPDATE( rainbow ); +SCREEN_UPDATE( rainbow ); VIDEO_START( jumping ); -VIDEO_UPDATE( jumping ); +SCREEN_UPDATE( jumping ); WRITE16_HANDLER( jumping_spritectrl_w ); WRITE16_HANDLER( rainbow_spritectrl_w ); diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index 51d55bbb012..ea6810677a6 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -48,6 +48,6 @@ VIDEO_START( rallyx ); VIDEO_START( jungler ); VIDEO_START( locomotn ); VIDEO_START( commsega ); -VIDEO_UPDATE( rallyx ); -VIDEO_UPDATE( jungler ); -VIDEO_UPDATE( locomotn ); +SCREEN_UPDATE( rallyx ); +SCREEN_UPDATE( jungler ); +SCREEN_UPDATE( locomotn ); diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h index dfd1327d60e..9a504821929 100644 --- a/src/mame/includes/rampart.h +++ b/src/mame/includes/rampart.h @@ -21,6 +21,6 @@ public: /*----------- defined in video/rampart.c -----------*/ VIDEO_START( rampart ); -VIDEO_UPDATE( rampart ); +SCREEN_UPDATE( rampart ); void rampart_bitmap_render(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index 4e6541ec4c9..8309e3a2bc9 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -33,4 +33,4 @@ public: WRITE16_HANDLER( rastan_spritectrl_w ); -VIDEO_UPDATE( rastan ); +SCREEN_UPDATE( rastan ); diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index 5f9aa0cc2d4..4a565485557 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -27,8 +27,8 @@ public: #define REALBRK_H VIDEO_START(realbrk); -VIDEO_UPDATE(realbrk); -VIDEO_UPDATE(dai2kaku); +SCREEN_UPDATE(realbrk); +SCREEN_UPDATE(dai2kaku); WRITE16_HANDLER( realbrk_vram_0_w ); WRITE16_HANDLER( realbrk_vram_1_w ); diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index df9d00682e9..93388858817 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -21,4 +21,4 @@ public: /*----------- defined in video/relief.c -----------*/ VIDEO_START( relief ); -VIDEO_UPDATE( relief ); +SCREEN_UPDATE( relief ); diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index e119402af0c..4617752fbc4 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -12,7 +12,7 @@ public: extern UINT8 *renegade_videoram2; -VIDEO_UPDATE( renegade ); +SCREEN_UPDATE( renegade ); VIDEO_START( renegade ); WRITE8_HANDLER( renegade_scroll0_w ); WRITE8_HANDLER( renegade_scroll1_w ); diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index b776ff5f789..90a32302d7c 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -48,7 +48,7 @@ READ8_HANDLER( retofinv_mcu_status_r ); VIDEO_START( retofinv ); PALETTE_INIT( retofinv ); -VIDEO_UPDATE( retofinv ); +SCREEN_UPDATE( retofinv ); WRITE8_HANDLER( retofinv_bg_videoram_w ); WRITE8_HANDLER( retofinv_fg_videoram_w ); WRITE8_HANDLER( retofinv_gfx_ctrl_w ); diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 2df882cd395..a5776c9b322 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -28,7 +28,7 @@ public: WRITE8_HANDLER( rockrage_vreg_w ); -VIDEO_UPDATE( rockrage ); +SCREEN_UPDATE( rockrage ); PALETTE_INIT( rockrage ); void rockrage_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags); diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index 0a9e1b262eb..334d2899d43 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -23,4 +23,4 @@ WRITE8_HANDLER( rocnrope_flipscreen_w ); PALETTE_INIT( rocnrope ); VIDEO_START( rocnrope ); -VIDEO_UPDATE( rocnrope ); +SCREEN_UPDATE( rocnrope ); diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index ab0fa2f92e1..7de66e398aa 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -41,7 +41,7 @@ WRITE16_HANDLER( rohga_buffer_spriteram16_w ); VIDEO_START( rohga ); -VIDEO_UPDATE( rohga ); -VIDEO_UPDATE( schmeisr ); -VIDEO_UPDATE( wizdfire ); -VIDEO_UPDATE( nitrobal ); +SCREEN_UPDATE( rohga ); +SCREEN_UPDATE( schmeisr ); +SCREEN_UPDATE( wizdfire ); +SCREEN_UPDATE( nitrobal ); diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index fc78e51dce0..95c9063b31f 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -33,4 +33,4 @@ extern void rollerg_sprite_callback(running_machine *machine, int *code,int *col extern void rollerg_zoom_callback(running_machine *machine, int *code,int *color,int *flags); VIDEO_START( rollerg ); -VIDEO_UPDATE( rollerg ); +SCREEN_UPDATE( rollerg ); diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index 00e7fa82348..a6ee42d1104 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -21,7 +21,7 @@ public: /*----------- defined in video/rollrace.c -----------*/ PALETTE_INIT( rollrace ); -VIDEO_UPDATE( rollrace ); +SCREEN_UPDATE( rollrace ); WRITE8_HANDLER( rollrace_charbank_w ); WRITE8_HANDLER( rollrace_backgroundpage_w ); diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h index 6cc4418dff7..e81c4182f9b 100644 --- a/src/mame/includes/route16.h +++ b/src/mame/includes/route16.h @@ -6,6 +6,6 @@ extern size_t route16_videoram_size; WRITE8_HANDLER( route16_out0_w ); WRITE8_HANDLER( route16_out1_w ); -VIDEO_UPDATE( route16 ); -VIDEO_UPDATE( stratvox ); -VIDEO_UPDATE( ttmahjng ); +SCREEN_UPDATE( route16 ); +SCREEN_UPDATE( stratvox ); +SCREEN_UPDATE( ttmahjng ); diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index a2886ac12e2..0f0960dcb2b 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -15,7 +15,7 @@ extern size_t rpunch_bitmapram_size; extern int rpunch_sprite_palette; VIDEO_START( rpunch ); -VIDEO_UPDATE( rpunch ); +SCREEN_UPDATE( rpunch ); WRITE16_HANDLER( rpunch_videoram_w ); WRITE16_HANDLER( rpunch_videoreg_w ); diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 386625f0f22..8d3386e486c 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -16,8 +16,8 @@ public: VIDEO_START( runaway ); VIDEO_START( qwak ); -VIDEO_UPDATE( runaway ); -VIDEO_UPDATE( qwak ); +SCREEN_UPDATE( runaway ); +SCREEN_UPDATE( qwak ); WRITE8_HANDLER( runaway_paletteram_w ); WRITE8_HANDLER( runaway_video_ram_w ); diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 582f80118e7..44e1899b195 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -46,4 +46,4 @@ WRITE16_HANDLER( rng_ttl_ram_w ); WRITE16_HANDLER( rng_936_videoram_w ); VIDEO_START( rng ); -VIDEO_UPDATE( rng ); +SCREEN_UPDATE( rng ); diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index 27a5bb2d39b..f3056bc4d34 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -29,5 +29,5 @@ WRITE8_HANDLER( sauro_palette_bank_w ); VIDEO_START( sauro ); VIDEO_START( trckydoc ); -VIDEO_UPDATE( sauro ); -VIDEO_UPDATE( trckydoc ); +SCREEN_UPDATE( sauro ); +SCREEN_UPDATE( trckydoc ); diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 935f91e582f..9511bda9e27 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -24,4 +24,4 @@ WRITE8_HANDLER( sbasketb_flipscreen_w ); PALETTE_INIT( sbasketb ); VIDEO_START( sbasketb ); -VIDEO_UPDATE( sbasketb ); +SCREEN_UPDATE( sbasketb ); diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 9c6287a59ad..d32a0cd05f6 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -14,7 +14,7 @@ public: /*----------- defined in video/sbugger.c -----------*/ PALETTE_INIT(sbugger); -VIDEO_UPDATE(sbugger); +SCREEN_UPDATE(sbugger); VIDEO_START(sbugger); WRITE8_HANDLER( sbugger_videoram_attr_w ); WRITE8_HANDLER( sbugger_videoram_w ); diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index b0308591c3a..b57ef736535 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -26,4 +26,4 @@ WRITE8_HANDLER( scotrsht_palettebank_w ); PALETTE_INIT( scotrsht ); VIDEO_START( scotrsht ); -VIDEO_UPDATE( scotrsht ); +SCREEN_UPDATE( scotrsht ); diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index de1a57bf4de..fcea4a5c257 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -25,6 +25,6 @@ WRITE16_HANDLER( sderby_videoram_w ); WRITE16_HANDLER( sderby_md_videoram_w ); WRITE16_HANDLER( sderby_fg_videoram_w ); VIDEO_START( sderby ); -VIDEO_UPDATE( sderby ); -VIDEO_UPDATE( pmroulet ); +SCREEN_UPDATE( sderby ); +SCREEN_UPDATE( pmroulet ); WRITE16_HANDLER( sderby_scroll_w ); diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index f3af8882a18..d63d4218dde 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -47,7 +47,7 @@ READ8_HANDLER( segag80r_video_port_r ); WRITE8_HANDLER( segag80r_video_port_w ); VIDEO_START( segag80r ); -VIDEO_UPDATE( segag80r ); +SCREEN_UPDATE( segag80r ); READ8_HANDLER( spaceod_back_port_r ); diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index 1bfa1027803..2df92c9421c 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -40,4 +40,4 @@ WRITE8_HANDLER( zektor2_sh_w ); /*----------- defined in video/segag80v.c -----------*/ VIDEO_START( segag80v ); -VIDEO_UPDATE( segag80v ); +SCREEN_UPDATE( segag80v ); diff --git a/src/mame/includes/segamsys.h b/src/mame/includes/segamsys.h index 59d1c5dd3e1..3031cc7338a 100644 --- a/src/mame/includes/segamsys.h +++ b/src/mame/includes/segamsys.h @@ -8,15 +8,15 @@ enum sms_mapper ADDRESS_MAP_EXTERN( sms_io_map, 8 ); -extern VIDEO_UPDATE(megatech_bios); -extern VIDEO_UPDATE(megaplay_bios); -extern VIDEO_UPDATE(megatech_md_sms); +extern SCREEN_UPDATE(megatech_bios); +extern SCREEN_UPDATE(megaplay_bios); +extern SCREEN_UPDATE(megatech_md_sms); extern DRIVER_INIT( megatech_bios ); extern DRIVER_INIT( hazemd_segasyse ); extern MACHINE_RESET(megatech_bios); extern MACHINE_RESET(megatech_md_sms); -extern VIDEO_EOF(megatech_bios); -extern VIDEO_EOF(megatech_md_sms); +extern SCREEN_EOF(megatech_bios); +extern SCREEN_EOF(megatech_md_sms); extern READ8_HANDLER( sms_vcounter_r ); extern READ8_HANDLER( sms_vdp_data_r ); @@ -35,14 +35,14 @@ extern READ8_HANDLER( md_sms_vdp_ctrl_r ); extern WRITE8_HANDLER( md_sms_vdp_ctrl_w ); extern VIDEO_START(sms); -extern VIDEO_EOF(sms); +extern SCREEN_EOF(sms); extern MACHINE_RESET(sms); extern READ8_HANDLER( sms_vdp_2_data_r ); extern WRITE8_HANDLER( sms_vdp_2_data_w ); extern READ8_HANDLER( sms_vdp_2_ctrl_r ); extern WRITE8_HANDLER( sms_vdp_2_ctrl_w ); -extern VIDEO_EOF(systeme); -extern VIDEO_UPDATE(systeme); +extern SCREEN_EOF(systeme); +extern SCREEN_UPDATE(systeme); extern MACHINE_RESET(systeme); extern UINT8* sms_mainram; extern UINT8* vdp2_vram_bank0; diff --git a/src/mame/includes/segas16.h b/src/mame/includes/segas16.h index 5bd9a54b0ed..14876b1570a 100644 --- a/src/mame/includes/segas16.h +++ b/src/mame/includes/segas16.h @@ -103,23 +103,23 @@ public: VIDEO_START( hangon ); VIDEO_START( sharrier ); -VIDEO_UPDATE( hangon ); +SCREEN_UPDATE( hangon ); /*----------- defined in video/segas16a.c -----------*/ VIDEO_START( system16a ); -VIDEO_UPDATE( system16a ); +SCREEN_UPDATE( system16a ); /*----------- defined in video/segas16b.c -----------*/ VIDEO_START( system16b ); VIDEO_START( timscanr ); -VIDEO_UPDATE( system16b ); +SCREEN_UPDATE( system16b ); /*----------- defined in video/segas18.c -----------*/ VIDEO_START( system18 ); -VIDEO_UPDATE( system18 ); +SCREEN_UPDATE( system18 ); void system18_set_grayscale(running_machine *machine, int enable); void system18_set_vdp_enable(running_machine *machine, int eanble); @@ -129,18 +129,18 @@ void system18_set_vdp_mixing(running_machine *machine, int mixing); VIDEO_START( outrun ); VIDEO_START( shangon ); -VIDEO_UPDATE( outrun ); -VIDEO_UPDATE( shangon ); +SCREEN_UPDATE( outrun ); +SCREEN_UPDATE( shangon ); /*----------- defined in video/segaxbd.c -----------*/ VIDEO_START( xboard ); -VIDEO_UPDATE( xboard ); +SCREEN_UPDATE( xboard ); /*----------- defined in video/segaybd.c -----------*/ VIDEO_START( yboard ); -VIDEO_UPDATE( yboard ); +SCREEN_UPDATE( yboard ); /*----------- defined in machine/s16fd.c -----------*/ diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index 5e7b7893aad..d2b5e330290 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -33,4 +33,4 @@ extern void s24_fd1094_driver_init(running_machine *machine); /*----------- defined in video/segas24.c -----------*/ VIDEO_START(system24); -VIDEO_UPDATE(system24); +SCREEN_UPDATE(system24); diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 45b899cdf5f..0147b3369e8 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -91,8 +91,8 @@ WRITE16_HANDLER( arescue_dsp_w ); VIDEO_START(system32); VIDEO_START(multi32); -VIDEO_UPDATE(system32); -VIDEO_UPDATE(multi32); +SCREEN_UPDATE(system32); +SCREEN_UPDATE(multi32); void system32_set_vblank(running_machine *machine, int state); READ16_HANDLER( system32_videoram_r ); diff --git a/src/mame/includes/sei_crtc.h b/src/mame/includes/sei_crtc.h index eb2fc8c3101..a2df5d43f92 100644 --- a/src/mame/includes/sei_crtc.h +++ b/src/mame/includes/sei_crtc.h @@ -11,4 +11,4 @@ WRITE16_HANDLER( seibucrtc_sc3vram_w ); WRITE16_HANDLER( seibucrtc_vregs_w ); void seibucrtc_sc0bank_w(UINT16 data); VIDEO_START( seibu_crtc ); -VIDEO_UPDATE( seibu_crtc ); +SCREEN_UPDATE( seibu_crtc ); diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 4889881286e..d86ffc72171 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -28,10 +28,10 @@ void seibuspi_rise11_sprite_decrypt_feversoc(UINT8 *rom, int romsize); extern UINT32 *spi_scrollram; VIDEO_START( spi ); -VIDEO_UPDATE( spi ); +SCREEN_UPDATE( spi ); VIDEO_START( sys386f2 ); -VIDEO_UPDATE( sys386f2 ); +SCREEN_UPDATE( sys386f2 ); READ32_HANDLER( spi_layer_bank_r ); WRITE32_HANDLER( spi_layer_bank_w ); diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index c7e184a3a2b..7784905c04e 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -27,4 +27,4 @@ WRITE8_HANDLER( seicross_colorram_w ); PALETTE_INIT( seicross ); VIDEO_START( seicross ); -VIDEO_UPDATE( seicross ); +SCREEN_UPDATE( seicross ); diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index b9a9b9b533b..727d791f95a 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -62,4 +62,4 @@ WRITE8_HANDLER( senjyo_bg3videoram_w ); WRITE8_HANDLER( senjyo_bgstripes_w ); VIDEO_START( senjyo ); -VIDEO_UPDATE( senjyo ); +SCREEN_UPDATE( senjyo ); diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 835d82aa1fb..46d95bf39dd 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -111,9 +111,9 @@ VIDEO_START( seta_1_layer); VIDEO_START( seta_2_layers); VIDEO_START( oisipuzl_2_layers ); -VIDEO_UPDATE( seta ); -VIDEO_UPDATE( seta_no_layers ); -VIDEO_UPDATE( usclssic ); -VIDEO_UPDATE( inttoote ); +SCREEN_UPDATE( seta ); +SCREEN_UPDATE( seta_no_layers ); +SCREEN_UPDATE( usclssic ); +SCREEN_UPDATE( inttoote ); diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 341588b6732..6a33dad0fe3 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -33,7 +33,7 @@ WRITE16_HANDLER( seta2_vregs_w ); VIDEO_START( seta2 ); VIDEO_START( seta2_offset ); -VIDEO_UPDATE( seta2 ); -VIDEO_EOF( seta2 ); +SCREEN_UPDATE( seta2 ); +SCREEN_EOF( seta2 ); diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index b61fa6d3014..3bf007b198d 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -35,4 +35,4 @@ WRITE16_HANDLER( sf_videoram_w ); WRITE16_HANDLER( sf_gfxctrl_w ); VIDEO_START( sf ); -VIDEO_UPDATE( sf ); +SCREEN_UPDATE( sf ); diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 4a5c0eaf5e5..8f88739f252 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -31,8 +31,8 @@ WRITE16_HANDLER ( shadfrce_bg1scrollx_w ); WRITE16_HANDLER ( shadfrce_bg0scrolly_w ); WRITE16_HANDLER ( shadfrce_bg1scrolly_w ); VIDEO_START( shadfrce ); -VIDEO_EOF(shadfrce); -VIDEO_UPDATE( shadfrce ); +SCREEN_EOF(shadfrce); +SCREEN_UPDATE( shadfrce ); WRITE16_HANDLER( shadfrce_fgvideoram_w ); WRITE16_HANDLER( shadfrce_bg0videoram_w ); WRITE16_HANDLER( shadfrce_bg1videoram_w ); diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 8ce78740eb4..1ba5ab78c36 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -23,4 +23,4 @@ WRITE16_HANDLER( shangha3_flipscreen_w ); WRITE16_HANDLER( shangha3_gfxlist_addr_w ); WRITE16_HANDLER( shangha3_blitter_go_w ); VIDEO_START( shangha3 ); -VIDEO_UPDATE( shangha3 ); +SCREEN_UPDATE( shangha3 ); diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index f6204bc603c..9af00cc2781 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -14,9 +14,9 @@ extern UINT8 *shangkid_videoreg; extern int shangkid_gfx_type; VIDEO_START( shangkid ); -VIDEO_UPDATE( shangkid ); +SCREEN_UPDATE( shangkid ); WRITE8_HANDLER( shangkid_videoram_w ); PALETTE_INIT( dynamski ); -VIDEO_UPDATE( dynamski ); +SCREEN_UPDATE( dynamski ); diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index efae10f1059..6fcd35084a9 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -25,4 +25,4 @@ WRITE8_HANDLER( shaolins_nmi_w ); PALETTE_INIT( shaolins ); VIDEO_START( shaolins ); -VIDEO_UPDATE( shaolins ); +SCREEN_UPDATE( shaolins ); diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 972c3f7d095..2ebe5c17b9a 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -18,4 +18,4 @@ WRITE8_HANDLER( sichuan2_bankswitch_w ); WRITE8_HANDLER( sichuan2_paletteram_w ); VIDEO_START( sichuan2 ); -VIDEO_UPDATE( sichuan2 ); +SCREEN_UPDATE( sichuan2 ); diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 91c3909f845..4bca02d8786 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -19,5 +19,5 @@ WRITE8_HANDLER( shootout_textram_w ); PALETTE_INIT( shootout ); VIDEO_START( shootout ); -VIDEO_UPDATE( shootout ); -VIDEO_UPDATE( shootouj ); +SCREEN_UPDATE( shootout ); +SCREEN_UPDATE( shootouj ); diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index fb4c61a878c..c0ded7077d2 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -19,4 +19,4 @@ public: /*----------- defined in video/shuuz.c -----------*/ VIDEO_START( shuuz ); -VIDEO_UPDATE( shuuz ); +SCREEN_UPDATE( shuuz ); diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index a173c6c74c7..192aa88255c 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -36,5 +36,5 @@ WRITE8_HANDLER( sidearms_c804_w ); WRITE8_HANDLER( sidearms_gfxctrl_w ); VIDEO_START( sidearms ); -VIDEO_UPDATE( sidearms ); -VIDEO_EOF( sidearms ); +SCREEN_UPDATE( sidearms ); +SCREEN_EOF( sidearms ); diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index a4ef848d1c1..8cf2b586108 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -22,7 +22,7 @@ public: PALETTE_INIT( sidepckt ); VIDEO_START( sidepckt ); -VIDEO_UPDATE( sidepckt ); +SCREEN_UPDATE( sidepckt ); WRITE8_HANDLER( sidepckt_flipscreen_w ); WRITE8_HANDLER( sidepckt_videoram_w ); diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 6c1730e7e9c..63832def482 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -21,4 +21,4 @@ WRITE32_HANDLER( silkroad_fgram_w ); WRITE32_HANDLER( silkroad_fgram2_w ); WRITE32_HANDLER( silkroad_fgram3_w ); VIDEO_START(silkroad); -VIDEO_UPDATE(silkroad); +SCREEN_UPDATE(silkroad); diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index 4735075f0b1..71230c7805e 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -36,4 +36,4 @@ public: /*----------- defined in video/simpl156.c -----------*/ VIDEO_START( simpl156 ); -VIDEO_UPDATE( simpl156 ); +SCREEN_UPDATE( simpl156 ); diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 8c364941f52..765bfc3952c 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -41,7 +41,7 @@ MACHINE_START( simpsons ); /*----------- defined in video/simpsons.c -----------*/ void simpsons_video_banking( running_machine *machine, int select ); -VIDEO_UPDATE( simpsons ); +SCREEN_UPDATE( simpsons ); extern void simpsons_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void simpsons_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask); diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index d5622b63bf8..451eb6f6866 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -22,6 +22,6 @@ WRITE16_HANDLER( skullxbo_yscroll_w ); WRITE16_HANDLER( skullxbo_mobmsb_w ); VIDEO_START( skullxbo ); -VIDEO_UPDATE( skullxbo ); +SCREEN_UPDATE( skullxbo ); void skullxbo_scanline_update(running_machine *machine, int param); diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index 99fcafa843e..6e972354437 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -53,4 +53,4 @@ WRITE8_HANDLER( skydiver_2000_201F_w ); WRITE8_HANDLER( skydiver_width_w ); WRITE8_HANDLER( skydiver_coin_lockout_w ); VIDEO_START( skydiver ); -VIDEO_UPDATE( skydiver ); +SCREEN_UPDATE( skydiver ); diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 91d34cd2314..1c3b59bba2c 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -31,5 +31,5 @@ WRITE8_HANDLER( skyfox_vregs_w ); PALETTE_INIT( skyfox ); -VIDEO_UPDATE( skyfox ); +SCREEN_UPDATE( skyfox ); diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 5624584c68b..303a2f496c5 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -19,7 +19,7 @@ public: /*----------- defined in video/skykid.c -----------*/ VIDEO_START( skykid ); -VIDEO_UPDATE( skykid ); +SCREEN_UPDATE( skykid ); PALETTE_INIT( skykid ); READ8_HANDLER( skykid_videoram_r ); diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index adcb7810b7e..38213c8798b 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -29,4 +29,4 @@ extern WRITE8_DEVICE_HANDLER( skyraid_sound_w ); /*----------- defined in video/skyraid.c -----------*/ VIDEO_START(skyraid); -VIDEO_UPDATE(skyraid); +SCREEN_UPDATE(skyraid); diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 4df9b56ebbb..94be499739e 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -89,8 +89,8 @@ extern UINT8 *slapfight_fixvideoram; extern UINT8 *slapfight_fixcolorram; extern UINT8 *slapfight_scrollx_lo,*slapfight_scrollx_hi,*slapfight_scrolly; -VIDEO_UPDATE( slapfight ); -VIDEO_UPDATE( perfrman ); +SCREEN_UPDATE( slapfight ); +SCREEN_UPDATE( perfrman ); VIDEO_START( slapfight ); VIDEO_START( perfrman ); diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index f062f7c027b..68f7f94fca5 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -54,5 +54,5 @@ public: /*----------- defined in video/slapshot.c -----------*/ VIDEO_START( slapshot ); -VIDEO_UPDATE( slapshot ); -VIDEO_EOF( taito_no_buffer ); +SCREEN_UPDATE( slapshot ); +SCREEN_EOF( taito_no_buffer ); diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 1f67028a1ed..8a4df9c0f76 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -672,7 +672,7 @@ extern struct SNES_PPU_STRUCT snes_ppu; extern void snes_latch_counters(running_machine *machine); extern VIDEO_START( snes ); -extern VIDEO_UPDATE( snes ); +extern SCREEN_UPDATE( snes ); extern READ8_HANDLER( snes_ppu_read ); extern WRITE8_HANDLER( snes_ppu_write ); diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index dd36a89279a..976aba860db 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -54,11 +54,11 @@ extern VIDEO_START( gwar ); extern VIDEO_START( psychos ); extern VIDEO_START( tdfever ); -extern VIDEO_UPDATE( marvins ); -extern VIDEO_UPDATE( tnk3 ); -extern VIDEO_UPDATE( ikari ); -extern VIDEO_UPDATE( gwar ); -extern VIDEO_UPDATE( tdfever ); +extern SCREEN_UPDATE( marvins ); +extern SCREEN_UPDATE( tnk3 ); +extern SCREEN_UPDATE( ikari ); +extern SCREEN_UPDATE( gwar ); +extern SCREEN_UPDATE( tdfever ); extern WRITE8_HANDLER( snk_fg_scrollx_w ); extern WRITE8_HANDLER( snk_fg_scrolly_w ); diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index 35cc704ed30..3d4537afc88 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -73,7 +73,7 @@ WRITE8_HANDLER( snk6502_scrolly_w ); PALETTE_INIT( snk6502 ); VIDEO_START( snk6502 ); -VIDEO_UPDATE( snk6502 ); +SCREEN_UPDATE( snk6502 ); VIDEO_START( pballoon ); WRITE8_HANDLER( satansat_b002_w ); diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index a2254c072cc..b16d385d277 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -22,7 +22,7 @@ public: VIDEO_START( pow ); VIDEO_START( searchar ); -VIDEO_UPDATE( pow ); +SCREEN_UPDATE( pow ); WRITE16_HANDLER( pow_paletteram16_word_w ); WRITE16_HANDLER( pow_flipscreen16_w ); WRITE16_HANDLER( searchar_flipscreen16_w ); diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index c0f003dfdc3..5481551c0c4 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -9,5 +9,5 @@ PALETTE_INIT( snookr10 ); PALETTE_INIT( apple10 ); VIDEO_START( snookr10 ); VIDEO_START( apple10 ); -VIDEO_UPDATE( snookr10 ); +SCREEN_UPDATE( snookr10 ); diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index 4ac5f02645d..d208cb76839 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -25,4 +25,4 @@ WRITE8_HANDLER( solomon_colorram2_w ); WRITE8_HANDLER( solomon_flipscreen_w ); VIDEO_START( solomon ); -VIDEO_UPDATE( solomon ); +SCREEN_UPDATE( solomon ); diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 9b1df1a6aeb..0406a89af71 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -37,4 +37,4 @@ WRITE8_HANDLER( sonson_flipscreen_w ); PALETTE_INIT( sonson ); VIDEO_START( sonson ); -VIDEO_UPDATE( sonson ); +SCREEN_UPDATE( sonson ); diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 7305178d2e3..bdf66e081a8 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -40,7 +40,7 @@ extern UINT8 *spacefb_videoram; extern size_t spacefb_videoram_size; VIDEO_START( spacefb ); -VIDEO_UPDATE( spacefb ); +SCREEN_UPDATE( spacefb ); WRITE8_HANDLER( spacefb_port_0_w ); WRITE8_HANDLER( spacefb_port_2_w ); diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 52db40e4266..a67081addaa 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -16,4 +16,4 @@ public: /*----------- defined in video/spbactn.c -----------*/ VIDEO_START( spbactn ); -VIDEO_UPDATE( spbactn ); +SCREEN_UPDATE( spbactn ); diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index 53310eba269..78a2b0d6896 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -16,4 +16,4 @@ public: /*----------- defined in video/spcforce.c -----------*/ WRITE8_HANDLER( spcforce_flip_screen_w ); -VIDEO_UPDATE( spcforce ); +SCREEN_UPDATE( spcforce ); diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 7f5764be070..2205d6a9ec3 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -4,7 +4,7 @@ extern UINT8 *spdodgeb_videoram; PALETTE_INIT( spdodgeb ); VIDEO_START( spdodgeb ); -VIDEO_UPDATE( spdodgeb ); +SCREEN_UPDATE( spdodgeb ); INTERRUPT_GEN( spdodgeb_interrupt ); WRITE8_HANDLER( spdodgeb_scrollx_lo_w ); WRITE8_HANDLER( spdodgeb_ctrl_w ); diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index eb2012e582f..15ee5c05895 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -23,4 +23,4 @@ WRITE8_HANDLER( speedatk_colorram_w ); WRITE8_HANDLER( speedatk_6845_w ); PALETTE_INIT( speedatk ); VIDEO_START( speedatk ); -VIDEO_UPDATE( speedatk ); +SCREEN_UPDATE( speedatk ); diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index a6afb806a69..1bcb67c373a 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -4,6 +4,6 @@ extern UINT8 *speedbal_background_videoram; extern UINT8 *speedbal_foreground_videoram; VIDEO_START( speedbal ); -VIDEO_UPDATE( speedbal ); +SCREEN_UPDATE( speedbal ); WRITE8_HANDLER( speedbal_foreground_videoram_w ); WRITE8_HANDLER( speedbal_background_videoram_w ); diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index a8624768423..fa8d13fadfb 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -3,7 +3,7 @@ extern UINT8 *speedspn_attram; VIDEO_START( speedspn ); -VIDEO_UPDATE( speedspn ); +SCREEN_UPDATE( speedspn ); WRITE8_HANDLER( speedspn_vidram_w ); WRITE8_HANDLER( speedspn_attram_w ); diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index 56a2c337450..7842327c143 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -23,5 +23,5 @@ public: WRITE16_HANDLER( splash_vram_w ); VIDEO_START( splash ); -VIDEO_UPDATE( splash ); -VIDEO_UPDATE( funystrp ); +SCREEN_UPDATE( splash ); +SCREEN_UPDATE( funystrp ); diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index 0e197b3c0ee..b509ade740b 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -24,4 +24,4 @@ WRITE8_HANDLER( sprcros2_bgscrolly_w ); PALETTE_INIT( sprcros2 ); VIDEO_START( sprcros2 ); -VIDEO_UPDATE( sprcros2 ); +SCREEN_UPDATE( sprcros2 ); diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index ef03ab60ac4..a198de8ca51 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -56,7 +56,7 @@ WRITE8_HANDLER( sprint2_collision_reset2_w ); WRITE8_HANDLER( sprint2_video_ram_w ); PALETTE_INIT( sprint2 ); -VIDEO_UPDATE( sprint2 ); +SCREEN_UPDATE( sprint2 ); VIDEO_START( sprint2 ); -VIDEO_EOF( sprint2 ); +SCREEN_EOF( sprint2 ); diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index a7a1940c663..b8fdfce3662 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -20,8 +20,8 @@ public: PALETTE_INIT( sprint4 ); -VIDEO_EOF( sprint4 ); +SCREEN_EOF( sprint4 ); VIDEO_START( sprint4 ); -VIDEO_UPDATE( sprint4 ); +SCREEN_UPDATE( sprint4 ); WRITE8_HANDLER( sprint4_video_ram_w ); diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 6c62744ea74..d80ef8f94f1 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -31,9 +31,9 @@ void sprint8_set_collision(running_machine *machine, int n); /*----------- defined in video/sprint8.c -----------*/ PALETTE_INIT( sprint8 ); -VIDEO_EOF( sprint8 ); +SCREEN_EOF( sprint8 ); VIDEO_START( sprint8 ); -VIDEO_UPDATE( sprint8 ); +SCREEN_UPDATE( sprint8 ); WRITE8_HANDLER( sprint8_video_ram_w ); diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 0399e8f891e..aa79648a28f 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -39,4 +39,4 @@ extern void spy_tile_callback(running_machine *machine, int layer,int bank,int * extern void spy_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask,int *shadow); VIDEO_START( spy ); -VIDEO_UPDATE( spy ); +SCREEN_UPDATE( spy ); diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index cf11c9d3b37..a6106b89f5a 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -25,7 +25,7 @@ public: /*----------- defined in video/srmp2.c -----------*/ PALETTE_INIT( srmp2 ); -VIDEO_UPDATE( srmp2 ); +SCREEN_UPDATE( srmp2 ); PALETTE_INIT( srmp3 ); -VIDEO_UPDATE( srmp3 ); -VIDEO_UPDATE( mjyuugi ); +SCREEN_UPDATE( srmp3 ); +SCREEN_UPDATE( mjyuugi ); diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index 3c9da4aee6c..816868fc8dd 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -20,5 +20,5 @@ WRITE8_HANDLER( srumbler_scroll_w ); WRITE8_HANDLER( srumbler_4009_w ); VIDEO_START( srumbler ); -VIDEO_UPDATE( srumbler ); -VIDEO_EOF( srumbler ); +SCREEN_UPDATE( srumbler ); +SCREEN_EOF( srumbler ); diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index ff6b5b5245c..bb3cab13e0c 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -25,7 +25,7 @@ public: /*----------- defined in video/sshangha.c -----------*/ VIDEO_START( sshangha ); -VIDEO_UPDATE( sshangha ); +SCREEN_UPDATE( sshangha ); WRITE16_HANDLER( sshangha_pf2_data_w ); WRITE16_HANDLER( sshangha_pf1_data_w ); diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 5bc59d0d058..d0037d19c0e 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -39,5 +39,5 @@ WRITE16_HANDLER( sslam_bg_tileram_w ); WRITE16_HANDLER( powerbls_bg_tileram_w ); VIDEO_START(sslam); VIDEO_START(powerbls); -VIDEO_UPDATE(sslam); -VIDEO_UPDATE(powerbls); +SCREEN_UPDATE(sslam); +SCREEN_UPDATE(powerbls); diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index 736c290d27d..b9829f48fc8 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -29,4 +29,4 @@ WRITE8_HANDLER( ssozumo_flipscreen_w ); PALETTE_INIT( ssozumo ); VIDEO_START( ssozumo ); -VIDEO_UPDATE( ssozumo ); +SCREEN_UPDATE( ssozumo ); diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 8b2335016b8..58dc45f44c5 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -37,5 +37,5 @@ WRITE8_HANDLER( sspeedr_track_vert_w ); WRITE8_HANDLER( sspeedr_track_ice_w ); VIDEO_START( sspeedr ); -VIDEO_UPDATE( sspeedr ); -VIDEO_EOF( sspeedr ); +SCREEN_UPDATE( sspeedr ); +SCREEN_EOF( sspeedr ); diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index 454d99408c9..742a1676304 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -21,5 +21,5 @@ WRITE8_HANDLER(ssrj_vram2_w); WRITE8_HANDLER(ssrj_vram4_w); VIDEO_START( ssrj ); -VIDEO_UPDATE( ssrj ); +SCREEN_UPDATE( ssrj ); PALETTE_INIT( ssrj ); diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 28922f5f051..776b52a2fdf 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -63,6 +63,6 @@ VIDEO_START( ssv ); VIDEO_START( eaglshot ); VIDEO_START( gdfs ); -VIDEO_UPDATE( ssv ); -VIDEO_UPDATE( eaglshot ); -VIDEO_UPDATE( gdfs ); +SCREEN_UPDATE( ssv ); +SCREEN_UPDATE( eaglshot ); +SCREEN_UPDATE( gdfs ); diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h index 3a05a1304f4..355fc4a2391 100644 --- a/src/mame/includes/st0016.h +++ b/src/mame/includes/st0016.h @@ -52,7 +52,7 @@ READ8_HANDLER (st0016_vregs_r); WRITE8_HANDLER (st0016_vregs_w); VIDEO_START(st0016); -VIDEO_UPDATE(st0016); +SCREEN_UPDATE(st0016); extern UINT32 st0016_game; diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index 05a162b6452..938875e0cbf 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -17,7 +17,7 @@ public: /*----------- defined in video/stadhero.c -----------*/ VIDEO_START( stadhero ); -VIDEO_UPDATE( stadhero ); +SCREEN_UPDATE( stadhero ); WRITE16_HANDLER( stadhero_pf1_data_w ); READ16_HANDLER( stadhero_pf2_data_r ); diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index 6d99b444f90..420af9247ed 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -55,4 +55,4 @@ WRITE8_HANDLER( starcrus_proj_parm_1_w ); WRITE8_HANDLER( starcrus_proj_parm_2_w ); READ8_HANDLER( starcrus_coll_det_r ); VIDEO_START( starcrus ); -VIDEO_UPDATE( starcrus ); +SCREEN_UPDATE( starcrus ); diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index 600c05c6988..fd6e4263868 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -34,7 +34,7 @@ public: /*----------- defined in video/starfire.c -----------*/ -VIDEO_UPDATE( starfire ); +SCREEN_UPDATE( starfire ); VIDEO_START( starfire ); WRITE8_HANDLER( starfire_videoram_w ); diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index d9e777d091e..cc7006c07a3 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -72,8 +72,8 @@ WRITE8_HANDLER( starshp1_ssadd_w ); WRITE8_HANDLER( starshp1_playfield_w ); PALETTE_INIT( starshp1 ); -VIDEO_UPDATE( starshp1 ); -VIDEO_EOF( starshp1 ); +SCREEN_UPDATE( starshp1 ); +SCREEN_EOF( starshp1 ); VIDEO_START( starshp1 ); diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index b8ff13acab6..e3eb72b08a4 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -27,4 +27,4 @@ WRITE8_HANDLER( stfight_text_attr_w ); WRITE8_HANDLER( stfight_vh_latch_w ); WRITE8_HANDLER( stfight_sprite_bank_w ); VIDEO_START( stfight ); -VIDEO_UPDATE( stfight ); +SCREEN_UPDATE( stfight ); diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index f97e6e1ee5d..f0c49d09937 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -27,7 +27,7 @@ public: /*----------- defined in video/stlforce.c -----------*/ VIDEO_START( stlforce ); -VIDEO_UPDATE( stlforce ); +SCREEN_UPDATE( stlforce ); WRITE16_HANDLER( stlforce_tx_videoram_w ); WRITE16_HANDLER( stlforce_mhigh_videoram_w ); WRITE16_HANDLER( stlforce_mlow_videoram_w ); diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index b19f1ff55df..1c83f46f4f4 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -17,4 +17,4 @@ WRITE8_HANDLER( strnskil_scrl_ctrl_w ); PALETTE_INIT( strnskil ); VIDEO_START( strnskil ); -VIDEO_UPDATE( strnskil ); +SCREEN_UPDATE( strnskil ); diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index fd3b7f59a98..604e954a8dc 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -96,5 +96,5 @@ WRITE32_HANDLER ( stv_vdp2_regs_w ); READ32_HANDLER ( stv_vdp2_regs_r ); VIDEO_START ( stv_vdp2 ); -VIDEO_UPDATE( stv_vdp2 ); +SCREEN_UPDATE( stv_vdp2 ); diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index 548f67a9f56..a54a9f8c400 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -58,7 +58,7 @@ DISCRETE_SOUND_EXTERN( subs ); /*----------- defined in video/subs.c -----------*/ -VIDEO_UPDATE( subs ); +SCREEN_UPDATE( subs ); WRITE8_HANDLER( subs_invert1_w ); WRITE8_HANDLER( subs_invert2_w ); diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index d2aff353fc9..c34b3f0c562 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -21,5 +21,5 @@ READ16_HANDLER ( suna16_paletteram16_r ); WRITE16_HANDLER( suna16_paletteram16_w ); VIDEO_START( suna16 ); -VIDEO_UPDATE( suna16 ); -VIDEO_UPDATE( bestbest ); +SCREEN_UPDATE( suna16 ); +SCREEN_UPDATE( bestbest ); diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 50cc015d068..cd2731ad41a 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -55,4 +55,4 @@ WRITE8_HANDLER( brickzn_banked_paletteram_w ); VIDEO_START( suna8_textdim0 ); VIDEO_START( suna8_textdim8 ); VIDEO_START( suna8_textdim12 ); -VIDEO_UPDATE( suna8 ); +SCREEN_UPDATE( suna8 ); diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h index dbb500687f8..23aff39f8ed 100644 --- a/src/mame/includes/supbtime.h +++ b/src/mame/includes/supbtime.h @@ -29,4 +29,4 @@ public: /*----------- defined in video/supbtime.c -----------*/ -VIDEO_UPDATE( supbtime ); +SCREEN_UPDATE( supbtime ); diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 14181da67d6..188beacf1b6 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -26,4 +26,4 @@ public: /*----------- defined in video/superchs.c -----------*/ VIDEO_START( superchs ); -VIDEO_UPDATE( superchs ); +SCREEN_UPDATE( superchs ); diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 263b6682408..f7cd04f0e00 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -42,6 +42,6 @@ WRITE8_HANDLER( pbillian_0410_w ); WRITE8_HANDLER( superqix_0410_w ); VIDEO_START( pbillian ); -VIDEO_UPDATE( pbillian ); +SCREEN_UPDATE( pbillian ); VIDEO_START( superqix ); -VIDEO_UPDATE( superqix ); +SCREEN_UPDATE( superqix ); diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index 474a4c91c6a..034fb5a062c 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -15,7 +15,7 @@ public: PALETTE_INIT( suprloco ); VIDEO_START( suprloco ); -VIDEO_UPDATE( suprloco ); +SCREEN_UPDATE( suprloco ); WRITE8_HANDLER( suprloco_videoram_w ); WRITE8_HANDLER( suprloco_scrollram_w ); WRITE8_HANDLER( suprloco_control_w ); diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 84149bd0ddd..7ee10bcf43f 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -22,5 +22,5 @@ WRITE32_HANDLER ( skns_pal_regs_w ); WRITE32_HANDLER ( skns_palette_ram_w ); VIDEO_START(skns); VIDEO_RESET(skns); -VIDEO_EOF(skns); -VIDEO_UPDATE(skns); +SCREEN_EOF(skns); +SCREEN_UPDATE(skns); diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index 6d6a67c6d55..239db037b05 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -22,4 +22,4 @@ int suprridr_is_screen_flipped(void); WRITE8_HANDLER( suprridr_fgram_w ); WRITE8_HANDLER( suprridr_bgram_w ); -VIDEO_UPDATE( suprridr ); +SCREEN_UPDATE( suprridr ); diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 8d039e1433d..90db6647dfd 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -39,4 +39,4 @@ WRITE16_HANDLER( suprslam_bg_videoram_w ); WRITE16_HANDLER( suprslam_bank_w ); VIDEO_START( suprslam ); -VIDEO_UPDATE( suprslam ); +SCREEN_UPDATE( suprslam ); diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 5b814545494..0b8e9ded689 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -33,4 +33,4 @@ public: extern void surpratk_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void surpratk_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask); -VIDEO_UPDATE( surpratk ); +SCREEN_UPDATE( surpratk ); diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index e6c8b45561a..e935d38fdab 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -47,6 +47,6 @@ READ8_HANDLER( system1_sprite_collision_r ); WRITE8_HANDLER( system1_sprite_collision_w ); WRITE8_HANDLER( system1_sprite_collision_reset_w ); -VIDEO_UPDATE( system1 ); -VIDEO_UPDATE( system2 ); -VIDEO_UPDATE( system2_rowscroll ); +SCREEN_UPDATE( system1 ); +SCREEN_UPDATE( system2 ); +SCREEN_UPDATE( system2_rowscroll ); diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index b59653bcfb6..21603b40202 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -97,8 +97,8 @@ extern VIDEO_START( s16a_bootleg ); extern VIDEO_START( s16a_bootleg_wb3bl ); extern VIDEO_START( s16a_bootleg_shinobi ); extern VIDEO_START( s16a_bootleg_passsht ); -extern VIDEO_UPDATE( s16a_bootleg ); -extern VIDEO_UPDATE( s16a_bootleg_passht4b ); +extern SCREEN_UPDATE( s16a_bootleg ); +extern SCREEN_UPDATE( s16a_bootleg_passht4b ); extern WRITE16_HANDLER( s16a_bootleg_tilemapselect_w ); extern WRITE16_HANDLER( s16a_bootleg_bgscrolly_w ); extern WRITE16_HANDLER( s16a_bootleg_bgscrollx_w ); @@ -111,8 +111,8 @@ extern WRITE16_HANDLER( sys16_textram_w ); /* "normal" video hardware */ extern VIDEO_START( system16 ); -extern VIDEO_UPDATE( system16 ); +extern SCREEN_UPDATE( system16 ); /* system18 video hardware */ extern VIDEO_START( system18old ); -extern VIDEO_UPDATE( system18old ); +extern SCREEN_UPDATE( system18old ); diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index 8fe3ceeb58b..823f7565d2e 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -14,4 +14,4 @@ WRITE8_HANDLER( tagteam_flipscreen_w ); PALETTE_INIT( tagteam ); VIDEO_START( tagteam ); -VIDEO_UPDATE( tagteam ); +SCREEN_UPDATE( tagteam ); diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index b3660a15ec6..28bbfe29f0d 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -38,4 +38,4 @@ WRITE16_HANDLER( tail2nos_zoomdata_w ); WRITE16_HANDLER( tail2nos_gfxbank_w ); VIDEO_START( tail2nos ); -VIDEO_UPDATE( tail2nos ); +SCREEN_UPDATE( tail2nos ); diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 690eaa7b8c6..e3227deff77 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -49,6 +49,6 @@ VIDEO_START( hitice ); VIDEO_RESET( hitice ); -VIDEO_UPDATE( taitob ); +SCREEN_UPDATE( taitob ); -VIDEO_EOF( taitob ); +SCREEN_EOF( taitob ); diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index bdfb77023d2..fe04e96e004 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -104,20 +104,20 @@ VIDEO_START( taitof2_yesnoj ); VIDEO_START( taitof2_deadconx ); VIDEO_START( taitof2_deadconxj ); VIDEO_START( taitof2_dinorex ); -VIDEO_EOF( taitof2_no_buffer ); -VIDEO_EOF( taitof2_full_buffer_delayed ); -VIDEO_EOF( taitof2_partial_buffer_delayed ); -VIDEO_EOF( taitof2_partial_buffer_delayed_thundfox ); -VIDEO_EOF( taitof2_partial_buffer_delayed_qzchikyu ); - -VIDEO_UPDATE( taitof2 ); -VIDEO_UPDATE( taitof2_pri ); -VIDEO_UPDATE( taitof2_pri_roz ); -VIDEO_UPDATE( taitof2_ssi ); -VIDEO_UPDATE( taitof2_thundfox ); -VIDEO_UPDATE( taitof2_deadconx ); -VIDEO_UPDATE( taitof2_metalb ); -VIDEO_UPDATE( taitof2_yesnoj ); +SCREEN_EOF( taitof2_no_buffer ); +SCREEN_EOF( taitof2_full_buffer_delayed ); +SCREEN_EOF( taitof2_partial_buffer_delayed ); +SCREEN_EOF( taitof2_partial_buffer_delayed_thundfox ); +SCREEN_EOF( taitof2_partial_buffer_delayed_qzchikyu ); + +SCREEN_UPDATE( taitof2 ); +SCREEN_UPDATE( taitof2_pri ); +SCREEN_UPDATE( taitof2_pri_roz ); +SCREEN_UPDATE( taitof2_ssi ); +SCREEN_UPDATE( taitof2_thundfox ); +SCREEN_UPDATE( taitof2_deadconx ); +SCREEN_UPDATE( taitof2_metalb ); +SCREEN_UPDATE( taitof2_yesnoj ); WRITE16_HANDLER( taitof2_spritebank_w ); WRITE16_HANDLER( koshien_spritebank_w ); diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 614302f059f..524f9368f3e 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -60,8 +60,8 @@ extern UINT32 *f3_vram,*f3_line_ram; extern UINT32 *f3_pf_data,*f3_pivot_ram; VIDEO_START( f3 ); -VIDEO_UPDATE( f3 ); -VIDEO_EOF( f3 ); +SCREEN_UPDATE( f3 ); +SCREEN_EOF( f3 ); WRITE32_HANDLER( f3_control_0_w ); WRITE32_HANDLER( f3_control_1_w ); diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index db2aef60b89..8663465ac9e 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -26,6 +26,6 @@ public: /*----------- defined in video/taito_h.c -----------*/ -VIDEO_UPDATE( syvalion ); -VIDEO_UPDATE( recordbr ); -VIDEO_UPDATE( dleague ); +SCREEN_UPDATE( syvalion ); +SCREEN_UPDATE( recordbr ); +SCREEN_UPDATE( dleague ); diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 65eeff2e1ed..4995c996dbc 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -56,9 +56,9 @@ public: /*----------- defined in video/taito_l.c -----------*/ -VIDEO_EOF( taitol ); +SCREEN_EOF( taitol ); VIDEO_START( taitol ); -VIDEO_UPDATE( taitol ); +SCREEN_UPDATE( taitol ); void taitol_chardef14_m(running_machine *machine, int offset); void taitol_chardef15_m(running_machine *machine, int offset); diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index 023d0a3dd32..daee027bc39 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -20,4 +20,4 @@ public: /*----------- defined in video/taito_o.c -----------*/ -VIDEO_UPDATE( parentj ); +SCREEN_UPDATE( parentj ); diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 05eaca63e94..dae63d33229 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -54,10 +54,10 @@ WRITE16_HANDLER( sci_spriteframe_w ); VIDEO_START( taitoz ); -VIDEO_UPDATE( contcirc ); -VIDEO_UPDATE( chasehq ); -VIDEO_UPDATE( bshark ); -VIDEO_UPDATE( sci ); -VIDEO_UPDATE( aquajack ); -VIDEO_UPDATE( spacegun ); -VIDEO_UPDATE( dblaxle ); +SCREEN_UPDATE( contcirc ); +SCREEN_UPDATE( chasehq ); +SCREEN_UPDATE( bshark ); +SCREEN_UPDATE( sci ); +SCREEN_UPDATE( aquajack ); +SCREEN_UPDATE( spacegun ); +SCREEN_UPDATE( dblaxle ); diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 28b3d0b3290..599d09d2507 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -45,4 +45,4 @@ public: /*----------- defined in video/taitoair.c -----------*/ -VIDEO_UPDATE( taitoair ); +SCREEN_UPDATE( taitoair ); diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 5bd91b2ac7b..047167e12ba 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -66,4 +66,4 @@ void taitojc_clear_frame(running_machine *machine); void taitojc_render_polygons(running_machine *machine, UINT16 *polygon_fifo, int length); VIDEO_START(taitojc); -VIDEO_UPDATE(taitojc); +SCREEN_UPDATE(taitojc); diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 60a61cd8d74..2ca8aa37655 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -72,5 +72,5 @@ WRITE8_HANDLER( taitosj_characterram_w ); WRITE8_HANDLER( junglhbr_characterram_w ); WRITE8_HANDLER( taitosj_collision_reg_clear_w ); VIDEO_START( taitosj ); -VIDEO_UPDATE( taitosj ); -VIDEO_UPDATE( kikstart ); +SCREEN_UPDATE( taitosj ); +SCREEN_UPDATE( kikstart ); diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 13584aa6084..a2a28856a93 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -55,9 +55,9 @@ void tank8_set_collision(running_machine *machine, int index); /*----------- defined in video/tank8.c -----------*/ PALETTE_INIT( tank8 ); -VIDEO_EOF( tank8 ); +SCREEN_EOF( tank8 ); VIDEO_START( tank8 ); -VIDEO_UPDATE( tank8 ); +SCREEN_UPDATE( tank8 ); WRITE8_HANDLER( tank8_video_ram_w ); diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 09e886ac387..41eedc1f326 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -19,4 +19,4 @@ WRITE8_HANDLER( tankbatt_videoram_w ); PALETTE_INIT( tankbatt ); VIDEO_START( tankbatt ); -VIDEO_UPDATE( tankbatt ); +SCREEN_UPDATE( tankbatt ); diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index af28170cd2f..b6f03b2564b 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -5,7 +5,7 @@ extern UINT8 *tankbust_videoram; extern UINT8 *tankbust_colorram; VIDEO_START( tankbust ); -VIDEO_UPDATE( tankbust ); +SCREEN_UPDATE( tankbust ); WRITE8_HANDLER( tankbust_background_videoram_w ); READ8_HANDLER( tankbust_background_videoram_r ); diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index a8cfc43082f..26209eaf717 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -9,5 +9,5 @@ WRITE16_HANDLER( taotaido_sprite_character_bank_select_w ); WRITE16_HANDLER( taotaido_tileregs_w ); WRITE16_HANDLER( taotaido_bgvideoram_w ); VIDEO_START( taotaido ); -VIDEO_UPDATE( taotaido ); -VIDEO_EOF( taotaido ); +SCREEN_UPDATE( taotaido ); +SCREEN_EOF( taotaido ); diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index 0c3bc829797..21a2409528a 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -15,4 +15,4 @@ public: WRITE16_HANDLER( targeth_vram_w ); VIDEO_START( targeth ); -VIDEO_UPDATE( targeth ); +SCREEN_UPDATE( targeth ); diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index db5545c0c0c..9350bf54cc0 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -78,8 +78,8 @@ VIDEO_START( roundup5 ); VIDEO_START( cyclwarr ); VIDEO_START( bigfight ); -VIDEO_UPDATE( roundup5 ); -VIDEO_UPDATE( apache3 ); -VIDEO_UPDATE( cyclwarr ); -VIDEO_UPDATE( bigfight ); +SCREEN_UPDATE( roundup5 ); +SCREEN_UPDATE( apache3 ); +SCREEN_UPDATE( cyclwarr ); +SCREEN_UPDATE( bigfight ); diff --git a/src/mame/includes/taxidrvr.h b/src/mame/includes/taxidrvr.h index a07ddccc2f9..a1326df2f0a 100644 --- a/src/mame/includes/taxidrvr.h +++ b/src/mame/includes/taxidrvr.h @@ -7,4 +7,4 @@ extern int taxidrvr_bghide; WRITE8_DEVICE_HANDLER( taxidrvr_spritectrl_w ); -VIDEO_UPDATE( taxidrvr ); +SCREEN_UPDATE( taxidrvr ); diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 0e840b684aa..1c1cd2fc78b 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -17,4 +17,4 @@ WRITE8_HANDLER( tbowl_bgyscroll_lo ); WRITE8_HANDLER( tbowl_bgyscroll_hi ); VIDEO_START( tbowl ); -VIDEO_UPDATE( tbowl ); +SCREEN_UPDATE( tbowl ); diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 4dad1b8d83e..caae11fc377 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -32,8 +32,8 @@ public: PALETTE_INIT( tceptor ); VIDEO_START( tceptor ); -VIDEO_UPDATE( tceptor ); -VIDEO_EOF( tceptor ); +SCREEN_UPDATE( tceptor ); +SCREEN_EOF( tceptor ); WRITE8_HANDLER( tceptor_tile_ram_w ); WRITE8_HANDLER( tceptor_tile_attr_w ); diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index f6144a4bab9..d0b0b9c7868 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -11,4 +11,4 @@ WRITE8_HANDLER( tecmo_bgscroll_w ); WRITE8_HANDLER( tecmo_flipscreen_w ); VIDEO_START( tecmo ); -VIDEO_UPDATE( tecmo ); +SCREEN_UPDATE( tecmo ); diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 0cf08c7e17f..3d89f1249a8 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -23,4 +23,4 @@ WRITE16_HANDLER( tecmo16_scroll_char_y_w ); VIDEO_START( fstarfrc ); VIDEO_START( ginkun ); VIDEO_START( riot ); -VIDEO_UPDATE( tecmo16 ); +SCREEN_UPDATE( tecmo16 ); diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index 8d59a9c25ca..3de2a1614ca 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -15,4 +15,4 @@ extern WRITE8_HANDLER( gridiron_led0_w ); extern WRITE8_HANDLER( gridiron_led1_w ); extern VIDEO_START( tehkanwc ); -extern VIDEO_UPDATE( tehkanwc ); +extern SCREEN_UPDATE( tehkanwc ); diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index c20036df438..cd97f61cea4 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -19,4 +19,4 @@ WRITE16_HANDLER( amazon_scrolly_w ); WRITE16_HANDLER( amazon_scrollx_w ); WRITE16_HANDLER( amazon_flipscreen_w ); VIDEO_START( amazon ); -VIDEO_UPDATE( amazon ); +SCREEN_UPDATE( amazon ); diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index 3bca1761259..14b71b349d0 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -34,13 +34,13 @@ WRITE16_HANDLER( rocknms_sub_vram_fg_w ); WRITE16_HANDLER( rocknms_sub_vram_rot_w ); VIDEO_START( tetrisp2 ); -VIDEO_UPDATE( tetrisp2 ); +SCREEN_UPDATE( tetrisp2 ); VIDEO_START( rockntread ); -VIDEO_UPDATE( rockntread ); +SCREEN_UPDATE( rockntread ); VIDEO_START( rocknms ); -VIDEO_UPDATE( rocknms ); +SCREEN_UPDATE( rocknms ); VIDEO_START( nndmseal ); void tetrisp2_draw_sprites(running_machine *machine, bitmap_t *bitmap, bitmap_t *bitmap_pri, const rectangle *cliprect, UINT8* priram, UINT16 *sprram_top, size_t sprram_size, int gfxnum, int reverseorder, int flip, int allowzoom); diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 4190556fda9..dfa52d8b5a3 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -8,5 +8,5 @@ WRITE8_HANDLER( thedeep_vram_1_w ); PALETTE_INIT( thedeep ); VIDEO_START( thedeep ); -VIDEO_UPDATE( thedeep ); +SCREEN_UPDATE( thedeep ); diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index 05ffa8c70d2..be0cdcfcb1c 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -9,7 +9,7 @@ extern size_t thepit_spriteram_size; PALETTE_INIT( thepit ); PALETTE_INIT( suprmous ); VIDEO_START( thepit ); -VIDEO_UPDATE( thepit ); +SCREEN_UPDATE( thepit ); WRITE8_HANDLER( thepit_videoram_w ); WRITE8_HANDLER( thepit_colorram_w ); WRITE8_HANDLER( thepit_flip_screen_x_w ); diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index 9e7b35f6102..c6373e56c43 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -23,4 +23,4 @@ READ8_HANDLER( thief_coprocessor_r ); WRITE8_HANDLER( thief_coprocessor_w ); VIDEO_START( thief ); -VIDEO_UPDATE( thief ); +SCREEN_UPDATE( thief ); diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index bde87dcad85..3ab54bab577 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -17,4 +17,4 @@ public: WRITE16_HANDLER( thoop2_vram_w ); VIDEO_START( thoop2 ); -VIDEO_UPDATE( thoop2 ); +SCREEN_UPDATE( thoop2 ); diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index 920f678ac07..493f157f354 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -19,4 +19,4 @@ public: /*----------- defined in video/thunderj.c -----------*/ VIDEO_START( thunderj ); -VIDEO_UPDATE( thunderj ); +SCREEN_UPDATE( thunderj ); diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index e7ae3645b23..02ccee4cbb0 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -39,4 +39,4 @@ extern void thunderx_tile_callback(running_machine *machine, int layer,int bank, extern void thunderx_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask,int *shadow); VIDEO_START( scontra ); -VIDEO_UPDATE( scontra ); +SCREEN_UPDATE( scontra ); diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 435ffa1501d..45df09d07ec 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -13,7 +13,7 @@ WRITE8_DEVICE_HANDLER( tiamc1_timer1_gate_w ); PALETTE_INIT( tiamc1 ); VIDEO_START( tiamc1 ); -VIDEO_UPDATE( tiamc1 ); +SCREEN_UPDATE( tiamc1 ); WRITE8_HANDLER( tiamc1_palette_w ); WRITE8_HANDLER( tiamc1_videoram_w ); diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index 65d3c412e2e..d1a01070c93 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -18,5 +18,5 @@ WRITE16_HANDLER( tigeroad_videoram_w ); WRITE16_HANDLER( tigeroad_videoctrl_w ); WRITE16_HANDLER( tigeroad_scroll_w ); VIDEO_START( tigeroad ); -VIDEO_UPDATE( tigeroad ); -VIDEO_EOF( tigeroad ); +SCREEN_UPDATE( tigeroad ); +SCREEN_EOF( tigeroad ); diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index cc8d87b65ec..b932496b796 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -15,7 +15,7 @@ extern size_t timelimt_bg_videoram_size; VIDEO_START( timelimt ); PALETTE_INIT( timelimt ); -VIDEO_UPDATE( timelimt ); +SCREEN_UPDATE( timelimt ); WRITE8_HANDLER( timelimt_videoram_w ); WRITE8_HANDLER( timelimt_bg_videoram_w ); diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 742dbd60c8e..01a820b039f 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -37,4 +37,4 @@ WRITE8_HANDLER( timeplt_flipscreen_w ); PALETTE_INIT( timeplt ); VIDEO_START( timeplt ); VIDEO_START( chkun ); -VIDEO_UPDATE( timeplt ); +SCREEN_UPDATE( timeplt ); diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 0d4ab6aac55..6ea7d9c55a8 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -89,12 +89,12 @@ VIDEO_START( blswhstl ); VIDEO_START( glfgreat ); VIDEO_START( prmrsocr ); -VIDEO_UPDATE( mia ); -VIDEO_UPDATE( tmnt ); -VIDEO_UPDATE( punkshot ); -VIDEO_UPDATE( lgtnfght ); -VIDEO_UPDATE( glfgreat ); -VIDEO_UPDATE( tmnt2 ); -VIDEO_UPDATE( thndrx2 ); +SCREEN_UPDATE( mia ); +SCREEN_UPDATE( tmnt ); +SCREEN_UPDATE( punkshot ); +SCREEN_UPDATE( lgtnfght ); +SCREEN_UPDATE( glfgreat ); +SCREEN_UPDATE( tmnt2 ); +SCREEN_UPDATE( thndrx2 ); -VIDEO_EOF( blswhstl ); +SCREEN_EOF( blswhstl ); diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 1bf1aae5eb9..035735a5787 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -95,5 +95,5 @@ MACHINE_START( jpopnics ); /*----------- defined in video/tnzs.c -----------*/ PALETTE_INIT( arknoid2 ); -VIDEO_UPDATE( tnzs ); -VIDEO_EOF( tnzs ); +SCREEN_UPDATE( tnzs ); +SCREEN_EOF( tnzs ); diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 6434224808a..25500ee737f 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -144,10 +144,10 @@ WRITE16_HANDLER( toaplan1_tileram_offs_w ); READ16_HANDLER ( toaplan1_spriteram_offs_r ); WRITE16_HANDLER( toaplan1_spriteram_offs_w ); -VIDEO_EOF( rallybik ); -VIDEO_EOF( toaplan1 ); -VIDEO_EOF( samesame ); +SCREEN_EOF( rallybik ); +SCREEN_EOF( toaplan1 ); +SCREEN_EOF( samesame ); VIDEO_START( rallybik ); VIDEO_START( toaplan1 ); -VIDEO_UPDATE( rallybik ); -VIDEO_UPDATE( toaplan1 ); +SCREEN_UPDATE( rallybik ); +SCREEN_UPDATE( toaplan1 ); diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index 607e2465baf..35055b5e6ed 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -77,18 +77,18 @@ void fixeight_okisnd_w(device_t *device, int data); /*----------- defined in video/toaplan2.c -----------*/ -VIDEO_EOF( toaplan2 ); +SCREEN_EOF( toaplan2 ); VIDEO_START( toaplan2 ); VIDEO_START( truxton2 ); VIDEO_START( fixeighb ); VIDEO_START( bgaregga ); VIDEO_START( batrider ); -VIDEO_UPDATE( toaplan2 ); -VIDEO_UPDATE( truxton2 ); -VIDEO_UPDATE( batrider ); -VIDEO_UPDATE( dogyuun ); -VIDEO_UPDATE( batsugun ); +SCREEN_UPDATE( toaplan2 ); +SCREEN_UPDATE( truxton2 ); +SCREEN_UPDATE( batrider ); +SCREEN_UPDATE( dogyuun ); +SCREEN_UPDATE( batsugun ); /* non-vdp text layer */ READ16_HANDLER ( toaplan2_txvideoram16_r ); diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index ec5f907c08d..3b26f0e73ed 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -15,10 +15,10 @@ extern UINT16 *toki_background2_videoram16; extern UINT16 *toki_scrollram16; VIDEO_START( toki ); -VIDEO_EOF( toki ); -VIDEO_EOF( tokib ); -VIDEO_UPDATE( toki ); -VIDEO_UPDATE( tokib ); +SCREEN_EOF( toki ); +SCREEN_EOF( tokib ); +SCREEN_UPDATE( toki ); +SCREEN_UPDATE( tokib ); WRITE16_HANDLER( toki_background1_videoram16_w ); WRITE16_HANDLER( toki_background2_videoram16_w ); WRITE16_HANDLER( toki_control_w ); diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index 8b296d24192..6795b65a275 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -28,4 +28,4 @@ WRITE16_HANDLER( toobin_yscroll_w ); WRITE16_HANDLER( toobin_slip_w ); VIDEO_START( toobin ); -VIDEO_UPDATE( toobin ); +SCREEN_UPDATE( toobin ); diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index e3d245d89a7..8fba9818802 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -40,4 +40,4 @@ public: /*----------- defined in video/topspeed.c -----------*/ -VIDEO_UPDATE( topspeed ); +SCREEN_UPDATE( topspeed ); diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index 764d0f49ffd..fe42485d9c5 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -24,5 +24,5 @@ WRITE16_HANDLER( toypop_merged_background_w ); WRITE8_HANDLER( toypop_palettebank_w ); WRITE16_HANDLER( toypop_flipscreen_w ); VIDEO_START( toypop ); -VIDEO_UPDATE( toypop ); +SCREEN_UPDATE( toypop ); PALETTE_INIT( toypop ); diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 96c9e037f0a..0b25a7e58a6 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -27,4 +27,4 @@ READ8_HANDLER( tp84_scanline_r ); PALETTE_INIT( tp84 ); VIDEO_START( tp84 ); -VIDEO_UPDATE( tp84 ); +SCREEN_UPDATE( tp84 ); diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index ac18b066214..373cfdf7511 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -37,6 +37,6 @@ WRITE8_HANDLER( atlantol_gfxbank_w ); PALETTE_INIT( trackfld ); VIDEO_START( trackfld ); -VIDEO_UPDATE( trackfld ); +SCREEN_UPDATE( trackfld ); VIDEO_START( atlantol ); diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index eac2c90e3fb..625c74be7f2 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -24,4 +24,4 @@ WRITE8_HANDLER( travrusa_flipscreen_w ); PALETTE_INIT( travrusa ); PALETTE_INIT( shtrider ); VIDEO_START( travrusa ); -VIDEO_UPDATE( travrusa ); +SCREEN_UPDATE( travrusa ); diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index 6e265e34381..b3983289c7c 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -30,7 +30,7 @@ extern const samples_interface triplhnt_samples_interface; /*----------- defined in video/triplhnt.c -----------*/ VIDEO_START( triplhnt ); -VIDEO_UPDATE( triplhnt ); +SCREEN_UPDATE( triplhnt ); extern UINT8* triplhnt_playfield_ram; extern UINT8* triplhnt_vpos_ram; diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h index 3bf0f8b9ccf..35a38ccffb2 100644 --- a/src/mame/includes/truco.h +++ b/src/mame/includes/truco.h @@ -10,5 +10,5 @@ public: /*----------- defined in video/truco.c -----------*/ -VIDEO_UPDATE( truco ); +SCREEN_UPDATE( truco ); PALETTE_INIT( truco ); diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index c57c1f93f8f..3e8f6e49f59 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -7,4 +7,4 @@ WRITE8_HANDLER( trucocl_videoram_w ); WRITE8_HANDLER( trucocl_colorram_w ); PALETTE_INIT( trucocl ); VIDEO_START( trucocl ); -VIDEO_UPDATE( trucocl ); +SCREEN_UPDATE( trucocl ); diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index fdb380587fe..2d75f6e05b1 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -24,4 +24,4 @@ WRITE8_HANDLER( tryout_flipscreen_w ); PALETTE_INIT( tryout ); VIDEO_START( tryout ); -VIDEO_UPDATE( tryout ); +SCREEN_UPDATE( tryout ); diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index 8076c7f9e70..953e652e4b1 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -38,7 +38,7 @@ WRITE8_HANDLER( tsamurai_fg_videoram_w ); WRITE8_HANDLER( tsamurai_fg_colorram_w ); VIDEO_START( tsamurai ); -VIDEO_UPDATE( tsamurai ); +SCREEN_UPDATE( tsamurai ); VIDEO_START( vsgongf ); -VIDEO_UPDATE( vsgongf ); +SCREEN_UPDATE( vsgongf ); diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 5f2235be7b9..34821364bb5 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -2,9 +2,9 @@ void tubep_vblank_end(void); PALETTE_INIT( tubep ); -VIDEO_UPDATE( tubep ); +SCREEN_UPDATE( tubep ); PALETTE_INIT( rjammer ); -VIDEO_UPDATE( rjammer ); +SCREEN_UPDATE( rjammer ); VIDEO_START( tubep ); VIDEO_RESET( tubep ); diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 7a0956f9783..0b7cac7fbb5 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -57,14 +57,14 @@ VIDEO_START( sdfight ); VIDEO_START( suprtrio ); VIDEO_START( pangpang ); -VIDEO_UPDATE( tumblepb ); -VIDEO_UPDATE( jumpkids ); -VIDEO_UPDATE( fncywld ); -VIDEO_UPDATE( jumppop ); -VIDEO_UPDATE( semicom ); -VIDEO_UPDATE( semicom_altoffsets ); -VIDEO_UPDATE( bcstory ); -VIDEO_UPDATE(semibase ); -VIDEO_UPDATE( suprtrio ); -VIDEO_UPDATE( pangpang ); -VIDEO_UPDATE( sdfight ); +SCREEN_UPDATE( tumblepb ); +SCREEN_UPDATE( jumpkids ); +SCREEN_UPDATE( fncywld ); +SCREEN_UPDATE( jumppop ); +SCREEN_UPDATE( semicom ); +SCREEN_UPDATE( semicom_altoffsets ); +SCREEN_UPDATE( bcstory ); +SCREEN_UPDATE(semibase ); +SCREEN_UPDATE( suprtrio ); +SCREEN_UPDATE( pangpang ); +SCREEN_UPDATE( sdfight ); diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h index 753d0f76c61..dba29353ef7 100644 --- a/src/mame/includes/tumblep.h +++ b/src/mame/includes/tumblep.h @@ -27,4 +27,4 @@ public: /*----------- defined in video/tumblep.c -----------*/ -VIDEO_UPDATE( tumblep ); +SCREEN_UPDATE( tumblep ); diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index cc87e4d58ec..f9c40ca1e6b 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -18,4 +18,4 @@ WRITE8_HANDLER( tunhunt_videoram_w ); PALETTE_INIT( tunhunt ); VIDEO_START( tunhunt ); -VIDEO_UPDATE( tunhunt ); +SCREEN_UPDATE( tunhunt ); diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 7348f33ac61..b37633ab928 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -89,14 +89,14 @@ WRITE8_DEVICE_HANDLER( buckrog_sound_b_w ); PALETTE_INIT( turbo ); VIDEO_START( turbo ); -VIDEO_UPDATE( turbo ); +SCREEN_UPDATE( turbo ); PALETTE_INIT( subroc3d ); -VIDEO_UPDATE( subroc3d ); +SCREEN_UPDATE( subroc3d ); PALETTE_INIT( buckrog ); VIDEO_START( buckrog ); -VIDEO_UPDATE( buckrog ); +SCREEN_UPDATE( buckrog ); WRITE8_HANDLER( turbo_videoram_w ); WRITE8_HANDLER( buckrog_bitmap_w ); diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index 031b82476a0..0e89268aee1 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -26,4 +26,4 @@ public: WRITE8_HANDLER( tutankhm_flip_screen_x_w ); WRITE8_HANDLER( tutankhm_flip_screen_y_w ); -VIDEO_UPDATE( tutankhm ); +SCREEN_UPDATE( tutankhm ); diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 3e2a8ece92f..37dbb8d3f40 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -41,7 +41,7 @@ WRITE16_HANDLER( twin16_video_register_w ); READ16_HANDLER( twin16_sprite_status_r ); VIDEO_START( twin16 ); -VIDEO_UPDATE( twin16 ); -VIDEO_EOF( twin16 ); +SCREEN_UPDATE( twin16 ); +SCREEN_EOF( twin16 ); void twin16_spriteram_process( running_machine *machine ); diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index a8c97f22cdf..c6cb81e0422 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -83,5 +83,5 @@ extern INT32 twincobr_bg_ram_bank; extern INT32 wardner_sprite_hack; VIDEO_START( toaplan0 ); -VIDEO_UPDATE( toaplan0 ); -VIDEO_EOF( toaplan0 ); +SCREEN_UPDATE( toaplan0 ); +SCREEN_EOF( toaplan0 ); diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index b2a64fa6ba1..e6be8c8e74c 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -77,8 +77,8 @@ extern UINT16 *tx1_rcram; extern size_t tx1_objram_size; PALETTE_INIT( tx1 ); VIDEO_START( tx1 ); -VIDEO_UPDATE( tx1 ); -VIDEO_EOF( tx1 ); +SCREEN_UPDATE( tx1 ); +SCREEN_EOF( tx1 ); WRITE16_HANDLER( tx1_slincs_w ); WRITE16_HANDLER( tx1_slock_w ); WRITE16_HANDLER( tx1_scolst_w ); @@ -92,11 +92,11 @@ extern size_t buggyboy_objram_size; extern size_t buggyboy_rcram_size; PALETTE_INIT( buggyboy ); VIDEO_START( buggyboy ); -VIDEO_UPDATE( buggyboy ); -VIDEO_EOF( buggyboy ); +SCREEN_UPDATE( buggyboy ); +SCREEN_EOF( buggyboy ); VIDEO_START( buggybjr ); -VIDEO_UPDATE( buggybjr ); +SCREEN_UPDATE( buggybjr ); WRITE16_HANDLER( buggyboy_slincs_w ); WRITE16_HANDLER( buggyboy_scolst_w ); WRITE16_HANDLER( buggyboy_gas_w ); diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index a7e350141a0..e3cf2b3b046 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -38,4 +38,4 @@ extern void ultraman_zoom_callback_2(running_machine *machine, int *code,int *co WRITE16_HANDLER( ultraman_gfxctrl_w ); VIDEO_START( ultraman ); -VIDEO_UPDATE( ultraman ); +SCREEN_UPDATE( ultraman ); diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index f0502fb1d3c..fa294e09af5 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -23,7 +23,7 @@ public: PALETTE_INIT( ultratnk ); VIDEO_START( ultratnk ); -VIDEO_UPDATE( ultratnk ); -VIDEO_EOF( ultratnk ); +SCREEN_UPDATE( ultratnk ); +SCREEN_EOF( ultratnk ); WRITE8_HANDLER( ultratnk_video_ram_w ); diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index c5237831b2e..a60d90c6079 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -28,5 +28,5 @@ public: /*----------- defined in video/undrfire.c -----------*/ VIDEO_START( undrfire ); -VIDEO_UPDATE( undrfire ); -VIDEO_UPDATE( cbombers ); +SCREEN_UPDATE( undrfire ); +SCREEN_UPDATE( cbombers ); diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index fd68c07cd76..583e11e7305 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -16,8 +16,8 @@ WRITE32_HANDLER( unico_vram32_2_w ); WRITE32_HANDLER( unico_palette32_w ); VIDEO_START( unico ); -VIDEO_UPDATE( unico ); +SCREEN_UPDATE( unico ); VIDEO_START( zeropnt2 ); -VIDEO_UPDATE( zeropnt2 ); +SCREEN_UPDATE( zeropnt2 ); diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 8a5f8ac6b8d..0edc2532055 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -6,4 +6,4 @@ WRITE8_HANDLER( usgames_videoram_w ); WRITE8_HANDLER( usgames_charram_w ); VIDEO_START( usgames ); PALETTE_INIT( usgames ); -VIDEO_UPDATE( usgames ); +SCREEN_UPDATE( usgames ); diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 6b9ab905bca..7202813914b 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -33,4 +33,4 @@ WRITE16_HANDLER( vaportra_priority_w ); WRITE16_HANDLER( vaportra_palette_24bit_rg_w ); WRITE16_HANDLER( vaportra_palette_24bit_b_w ); -VIDEO_UPDATE( vaportra ); +SCREEN_UPDATE( vaportra ); diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index d6273e2e22e..fe6ff46c0cc 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -32,4 +32,4 @@ READ8_HANDLER( vastar_bg1videoram_r ); READ8_HANDLER( vastar_bg2videoram_r ); VIDEO_START( vastar ); -VIDEO_UPDATE( vastar ); +SCREEN_UPDATE( vastar ); diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index df42ad65426..6e8d9808657 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -10,7 +10,7 @@ extern int vball_gfxset; extern int vb_scrollx[256]; VIDEO_START( vb ); -VIDEO_UPDATE( vb ); +SCREEN_UPDATE( vb ); void vb_bgprombank_w(running_machine *machine, int bank); void vb_spprombank_w(running_machine *machine, int bank); WRITE8_HANDLER( vb_attrib_w ); diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index 29fb8a57dd9..1bd6cac4cce 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -38,4 +38,4 @@ extern void vendetta_tile_callback(running_machine *machine, int layer,int bank, extern void esckids_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void vendetta_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask); -VIDEO_UPDATE( vendetta ); +SCREEN_UPDATE( vendetta ); diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 56c3e4fa46b..706924b601e 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -34,9 +34,9 @@ int vicdual_is_cabinet_color(running_machine *machine); WRITE8_HANDLER( vicdual_palette_bank_w ); -VIDEO_UPDATE( vicdual_bw ); -VIDEO_UPDATE( vicdual_color ); -VIDEO_UPDATE( vicdual_bw_or_color ); +SCREEN_UPDATE( vicdual_bw ); +SCREEN_UPDATE( vicdual_color ); +SCREEN_UPDATE( vicdual_bw_or_color ); /*----------- defined in audio/vicdual.c -----------*/ diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 7e306ce7600..f6cad13ef9e 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -22,7 +22,7 @@ extern UINT8 *victory_videoram; extern UINT8 *victory_charram; VIDEO_START( victory ); -VIDEO_UPDATE( victory ); +SCREEN_UPDATE( victory ); INTERRUPT_GEN( victory_vblank_interrupt ); READ8_HANDLER( victory_video_control_r ); diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 2f3d70e2bee..2d6138d74e3 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -43,5 +43,5 @@ WRITE8_HANDLER( videopin_video_ram_w ); WRITE8_HANDLER( videopin_ball_w ); VIDEO_START( videopin ); -VIDEO_UPDATE( videopin ); +SCREEN_UPDATE( videopin ); diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index b95370f9de4..21e19314117 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -16,5 +16,5 @@ WRITE8_HANDLER( vigilant_paletteram_w ); WRITE8_HANDLER( vigilant_horiz_scroll_w ); WRITE8_HANDLER( vigilant_rear_horiz_scroll_w ); WRITE8_HANDLER( vigilant_rear_color_w ); -VIDEO_UPDATE( vigilant ); -VIDEO_UPDATE( kikcubic ); +SCREEN_UPDATE( vigilant ); +SCREEN_UPDATE( kikcubic ); diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index 936446665b5..adad272da4f 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -23,6 +23,6 @@ public: WRITE16_HANDLER( vindictr_paletteram_w ); VIDEO_START( vindictr ); -VIDEO_UPDATE( vindictr ); +SCREEN_UPDATE( vindictr ); void vindictr_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 5b7c993d889..f1f6f0ae369 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -54,5 +54,5 @@ WRITE16_HANDLER( volfied_video_mask_w ); READ16_HANDLER( volfied_video_ram_r ); READ16_HANDLER( volfied_video_ctrl_r ); -VIDEO_UPDATE( volfied ); +SCREEN_UPDATE( volfied ); VIDEO_START( volfied ); diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index 36905e1f8e3..d9a53b03fcc 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -2,9 +2,9 @@ VIDEO_START( vsnes ); PALETTE_INIT( vsnes ); -VIDEO_UPDATE( vsnes ); +SCREEN_UPDATE( vsnes ); VIDEO_START( vsdual ); -VIDEO_UPDATE( vsdual ); +SCREEN_UPDATE( vsnes_bottom ); PALETTE_INIT( vsdual ); extern const ppu2c0x_interface vsnes_ppu_interface_1; diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 5e0310b110b..38181f32c5e 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -23,4 +23,4 @@ WRITE8_HANDLER( vulgus_palette_bank_w ); VIDEO_START( vulgus ); PALETTE_INIT( vulgus ); -VIDEO_UPDATE( vulgus ); +SCREEN_UPDATE( vulgus ); diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index f7532049747..b167515c120 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -15,7 +15,7 @@ PALETTE_INIT( warpwarp ); VIDEO_START( geebee ); VIDEO_START( navarone ); VIDEO_START( warpwarp ); -VIDEO_UPDATE( geebee ); +SCREEN_UPDATE( geebee ); WRITE8_HANDLER( warpwarp_videoram_w ); WRITE8_HANDLER( geebee_videoram_w ); diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 258d51f24df..a011786b8e6 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -36,4 +36,4 @@ public: /*----------- defined in video/warriorb.c -----------*/ VIDEO_START( warriorb ); -VIDEO_UPDATE( warriorb ); +SCREEN_UPDATE( warriorb ); diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 8969f4053bf..675aa759018 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -15,4 +15,4 @@ VIDEO_START( wc90t ); WRITE8_HANDLER( wc90_fgvideoram_w ); WRITE8_HANDLER( wc90_bgvideoram_w ); WRITE8_HANDLER( wc90_txvideoram_w ); -VIDEO_UPDATE( wc90 ); +SCREEN_UPDATE( wc90 ); diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index bf285e5a8a0..5375f2e980d 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -11,7 +11,7 @@ extern UINT8 *wc90b_scroll2y; extern UINT8 *wc90b_scroll_x_lo; VIDEO_START( wc90b ); -VIDEO_UPDATE( wc90b ); +SCREEN_UPDATE( wc90b ); WRITE8_HANDLER( wc90b_bgvideoram_w ); WRITE8_HANDLER( wc90b_fgvideoram_w ); diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 716adfb65bd..ba580f28256 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -46,9 +46,9 @@ WRITE16_HANDLER( wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w ); WRITE16_HANDLER( wecleman_videostatus_w ); WRITE16_HANDLER( wecleman_pageram_w ); WRITE16_HANDLER( wecleman_txtram_w ); -VIDEO_UPDATE( wecleman ); +SCREEN_UPDATE( wecleman ); VIDEO_START( wecleman ); -VIDEO_UPDATE( hotchase ); +SCREEN_UPDATE( hotchase ); VIDEO_START( hotchase ); void hotchase_zoom_callback_0(running_machine *machine, int *code,int *color,int *flags); diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index f80f1cc6bf7..2141a9ba6a9 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -30,4 +30,4 @@ WRITE16_HANDLER( welltris_charvideoram_w ); WRITE16_HANDLER( welltris_scrollreg_w ); VIDEO_START( welltris ); -VIDEO_UPDATE( welltris ); +SCREEN_UPDATE( welltris ); diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index caa98617c30..3b042b5372d 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -53,4 +53,4 @@ WRITE16_HANDLER( wgp_piv_ctrl_word_w ); VIDEO_START( wgp ); VIDEO_START( wgp2 ); -VIDEO_UPDATE( wgp ); +SCREEN_UPDATE( wgp ); diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 6fc91c01d8e..a90acc24c9b 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -130,9 +130,9 @@ VIDEO_START( williams ); VIDEO_START( blaster ); VIDEO_START( williams2 ); -VIDEO_UPDATE( williams ); -VIDEO_UPDATE( blaster ); -VIDEO_UPDATE( williams2 ); +SCREEN_UPDATE( williams ); +SCREEN_UPDATE( blaster ); +SCREEN_UPDATE( williams2 ); WRITE8_HANDLER( williams2_tileram_w ); diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index 450058a4c77..f3024f4899b 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -5,5 +5,5 @@ extern UINT8 *wiping_colorram; WRITE8_HANDLER( wiping_flipscreen_w ); PALETTE_INIT( wiping ); -VIDEO_UPDATE( wiping ); +SCREEN_UPDATE( wiping ); diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index d97b0c6e6e9..c7e940022a2 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -24,6 +24,6 @@ WRITE8_HANDLER( wiz_flipy_w ); VIDEO_START( wiz ); PALETTE_INIT( wiz ); -VIDEO_UPDATE( wiz ); -VIDEO_UPDATE( stinger ); -VIDEO_UPDATE( kungfut ); +SCREEN_UPDATE( wiz ); +SCREEN_UPDATE( stinger ); +SCREEN_UPDATE( kungfut ); diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 59d0af6acf7..8638f2d5f9f 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -27,9 +27,9 @@ public: /*----------- defined in video/wolfpack.c -----------*/ PALETTE_INIT( wolfpack ); -VIDEO_UPDATE( wolfpack ); +SCREEN_UPDATE( wolfpack ); VIDEO_START( wolfpack ); -VIDEO_EOF( wolfpack ); +SCREEN_EOF( wolfpack ); WRITE8_HANDLER( wolfpack_video_invert_w ); WRITE8_HANDLER( wolfpack_ship_reflect_w ); diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 267e7ae37c9..fa93fdde4f5 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -23,5 +23,5 @@ WRITE16_HANDLER( wrally_coin_lockout_w ); /*----------- defined in video/wrally.c -----------*/ VIDEO_START( wrally ); -VIDEO_UPDATE( wrally ); +SCREEN_UPDATE( wrally ); diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index d95588173b1..0bfd615fbfd 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -18,6 +18,6 @@ public: /*----------- defined in video/wwfsstar.c -----------*/ VIDEO_START( wwfsstar ); -VIDEO_UPDATE( wwfsstar ); +SCREEN_UPDATE( wwfsstar ); WRITE16_HANDLER( wwfsstar_fg0_videoram_w ); WRITE16_HANDLER( wwfsstar_bg0_videoram_w ); diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h index 60f986d8125..bbbc7b5ee93 100644 --- a/src/mame/includes/wwfwfest.h +++ b/src/mame/includes/wwfwfest.h @@ -6,7 +6,7 @@ extern UINT16 wwfwfest_bg0_scrollx, wwfwfest_bg0_scrolly, wwfwfest_bg1_scrollx, VIDEO_START( wwfwfest ); VIDEO_START( wwfwfstb ); -VIDEO_UPDATE( wwfwfest ); +SCREEN_UPDATE( wwfwfest ); WRITE16_HANDLER( wwfwfest_fg0_videoram_w ); WRITE16_HANDLER( wwfwfest_bg0_videoram_w ); WRITE16_HANDLER( wwfwfest_bg1_videoram_w ); diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index a9eac616a61..97f2f8b2bc1 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -2,7 +2,7 @@ extern UINT8 *xain_charram, *xain_bgram0, *xain_bgram1, xain_pri; -VIDEO_UPDATE( xain ); +SCREEN_UPDATE( xain ); VIDEO_START( xain ); WRITE8_HANDLER( xain_scrollxP0_w ); WRITE8_HANDLER( xain_scrollyP0_w ); diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index 64a6ea2e4ee..8249ecb52df 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -50,4 +50,4 @@ extern void xexex_sprite_callback(running_machine *machine, int *code, int *colo extern void xexex_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags); VIDEO_START( xexex ); -VIDEO_UPDATE( xexex ); +SCREEN_UPDATE( xexex ); diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index f8bd55313e8..e8038289521 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -42,6 +42,6 @@ void xmen_tile_callback(running_machine *machine, int layer,int bank,int *code,i void xmen_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask); VIDEO_START( xmen6p ); -VIDEO_UPDATE( xmen ); -VIDEO_UPDATE( xmen6p ); -VIDEO_EOF( xmen6p ); +SCREEN_UPDATE( xmen ); +SCREEN_UPDATE( xmen6p ); +SCREEN_EOF( xmen6p ); diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index b423249c72e..b6cfee74306 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -14,4 +14,4 @@ WRITE16_HANDLER( xorworld_videoram16_w ); PALETTE_INIT( xorworld ); VIDEO_START( xorworld ); -VIDEO_UPDATE( xorworld ); +SCREEN_UPDATE( xorworld ); diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 53c0596de3d..bd12a027b40 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -5,7 +5,7 @@ extern UINT8 *xxmissio_fgram; extern UINT8 *xxmissio_spriteram; VIDEO_START( xxmissio ); -VIDEO_UPDATE( xxmissio ); +SCREEN_UPDATE( xxmissio ); WRITE8_DEVICE_HANDLER( xxmissio_scroll_x_w ); WRITE8_DEVICE_HANDLER( xxmissio_scroll_y_w ); diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index d7b4ab0e822..32711458661 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -19,4 +19,4 @@ public: /*----------- defined in video/xybots.c -----------*/ VIDEO_START( xybots ); -VIDEO_UPDATE( xybots ); +SCREEN_UPDATE( xybots ); diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index 7379a32731a..6a1f5300621 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -19,4 +19,4 @@ public: PALETTE_INIT( xyonix ); WRITE8_HANDLER( xyonix_vidram_w ); VIDEO_START(xyonix); -VIDEO_UPDATE(xyonix); +SCREEN_UPDATE(xyonix); diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index 000c7bc698d..ec9d13a70cb 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -24,4 +24,4 @@ WRITE8_HANDLER( yiear_control_w ); PALETTE_INIT( yiear ); VIDEO_START( yiear ); -VIDEO_UPDATE( yiear ); +SCREEN_UPDATE( yiear ); diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 8a20bd19a48..fb7f7f4801d 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -35,4 +35,4 @@ WRITE16_HANDLER( yunsun16_vram_0_w ); WRITE16_HANDLER( yunsun16_vram_1_w ); VIDEO_START( yunsun16 ); -VIDEO_UPDATE( yunsun16 ); +SCREEN_UPDATE( yunsun16 ); diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 18aa7016ffe..f84c45a1d16 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -36,4 +36,4 @@ WRITE8_HANDLER( yunsung8_videoram_w ); WRITE8_HANDLER( yunsung8_flipscreen_w ); VIDEO_START( yunsung8 ); -VIDEO_UPDATE( yunsung8 ); +SCREEN_UPDATE( yunsung8 ); diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 28c66729809..fafae1a3bf1 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -18,5 +18,5 @@ WRITE8_HANDLER( zac_s2636_w ); READ8_HANDLER( tinvader_port_0_r ); VIDEO_START( tinvader ); -VIDEO_UPDATE( tinvader ); +SCREEN_UPDATE( tinvader ); diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index 1154bf5199c..ef46c14e270 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -8,4 +8,4 @@ WRITE8_HANDLER( zaccaria_videoram_w ); WRITE8_HANDLER( zaccaria_attributes_w ); WRITE8_HANDLER( zaccaria_flip_screen_x_w ); WRITE8_HANDLER( zaccaria_flip_screen_y_w ); -VIDEO_UPDATE( zaccaria ); +SCREEN_UPDATE( zaccaria ); diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index 9aec20de189..1d8bc09c19f 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -71,7 +71,7 @@ VIDEO_START( zaxxon ); VIDEO_START( razmataz ); VIDEO_START( congo ); -VIDEO_UPDATE( zaxxon ); -VIDEO_UPDATE( razmataz ); -VIDEO_UPDATE( congo ); -VIDEO_UPDATE( futspy ); +SCREEN_UPDATE( zaxxon ); +SCREEN_UPDATE( razmataz ); +SCREEN_UPDATE( congo ); +SCREEN_UPDATE( futspy ); diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index fe71bb91014..f11395a2e95 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -29,4 +29,4 @@ WRITE16_HANDLER( zerozone_tilemap_w ); WRITE16_HANDLER( zerozone_tilebank_w ); VIDEO_START( zerozone ); -VIDEO_UPDATE( zerozone ); +SCREEN_UPDATE( zerozone ); diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index 0c7cd0dc073..89f54e639ca 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -36,4 +36,4 @@ WRITE8_HANDLER( zodiack_flipscreen_w ); PALETTE_INIT( zodiack ); VIDEO_START( zodiack ); -VIDEO_UPDATE( zodiack ); +SCREEN_UPDATE( zodiack ); diff --git a/src/mame/machine/decocass.h b/src/mame/machine/decocass.h index f754cfe11b0..5e87a925497 100644 --- a/src/mame/machine/decocass.h +++ b/src/mame/machine/decocass.h @@ -195,6 +195,6 @@ extern WRITE8_HANDLER( decocass_center_h_shift_space_w ); extern WRITE8_HANDLER( decocass_center_v_shift_w ); extern VIDEO_START( decocass ); -extern VIDEO_UPDATE( decocass ); +extern SCREEN_UPDATE( decocass ); void decocass_video_state_save_init(running_machine *machine); diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c index 63d1cb8bded..43a44e77046 100644 --- a/src/mame/machine/megadriv.c +++ b/src/mame/machine/megadriv.c @@ -7108,7 +7108,7 @@ VIDEO_START(megadriv) segac2_sp_pal_lookup[3] = 0x30; } -VIDEO_UPDATE(megadriv) +SCREEN_UPDATE(megadriv) { /* Copy our screen buffer here */ copybitmap(bitmap, render_bitmap, 0, 0, 0, 0, cliprect); @@ -9233,7 +9233,7 @@ void megadriv_stop_scanline_timer(void) /* VIDEO_EOF is used to resync the scanline counters */ -VIDEO_EOF(megadriv) +SCREEN_EOF(megadriv) { rectangle visarea; int scr_width = 320; @@ -9404,6 +9404,8 @@ MACHINE_CONFIG_FRAGMENT( md_ntsc ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually. MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1) + MCFG_SCREEN_UPDATE(megadriv) /* Copies a bitmap */ + MCFG_SCREEN_EOF(megadriv) /* Used to Sync the timing */ #ifndef MESS MCFG_NVRAM_HANDLER(megadriv) @@ -9412,8 +9414,6 @@ MACHINE_CONFIG_FRAGMENT( md_ntsc ) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(megadriv) - MCFG_VIDEO_UPDATE(megadriv) /* Copies a bitmap */ - MCFG_VIDEO_EOF(megadriv) /* Used to Sync the timing */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -9455,6 +9455,8 @@ MACHINE_CONFIG_FRAGMENT( md_pal ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually. MCFG_SCREEN_SIZE(64*8, 64*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1) + MCFG_SCREEN_UPDATE(megadriv) /* Copies a bitmap */ + MCFG_SCREEN_EOF(megadriv) /* Used to Sync the timing */ #ifndef MESS MCFG_NVRAM_HANDLER(megadriv) @@ -9463,8 +9465,6 @@ MACHINE_CONFIG_FRAGMENT( md_pal ) MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(megadriv) - MCFG_VIDEO_UPDATE(megadriv) /* Copies a bitmap */ - MCFG_VIDEO_EOF(megadriv) /* Used to Sync the timing */ /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/machine/segamsys.c b/src/mame/machine/segamsys.c index 8893d5e1537..f697fd4ef23 100644 --- a/src/mame/machine/segamsys.c +++ b/src/mame/machine/segamsys.c @@ -1179,7 +1179,7 @@ static void end_of_frame(running_machine *machine, struct sms_vdp *chip) } -VIDEO_EOF(sms) +SCREEN_EOF(sms) { end_of_frame(machine, md_sms_vdp); @@ -1248,24 +1248,24 @@ MACHINE_RESET(megatech_bios) vdp1->sms_scanline_timer->adjust(attotime::zero); } -VIDEO_EOF(systeme) +SCREEN_EOF(systeme) { end_of_frame(machine, vdp1); end_of_frame(machine, vdp2); } -VIDEO_EOF(megatech_md_sms) +SCREEN_EOF(megatech_md_sms) { end_of_frame(machine, md_sms_vdp); } -VIDEO_EOF(megatech_bios) +SCREEN_EOF(megatech_bios) { end_of_frame(machine, vdp1); } -VIDEO_UPDATE(megatech_md_sms) +SCREEN_UPDATE(megatech_md_sms) { int x,y; @@ -1284,7 +1284,7 @@ VIDEO_UPDATE(megatech_md_sms) } -VIDEO_UPDATE(megatech_bios) +SCREEN_UPDATE(megatech_bios) { int x,y; @@ -1302,7 +1302,7 @@ VIDEO_UPDATE(megatech_bios) return 0; } -VIDEO_UPDATE(megaplay_bios) +SCREEN_UPDATE(megaplay_bios) { int x,y; @@ -1323,7 +1323,7 @@ VIDEO_UPDATE(megaplay_bios) return 0; } -VIDEO_UPDATE(systeme) +SCREEN_UPDATE(systeme) { // show_tiles(); int x,y; @@ -1726,12 +1726,12 @@ MACHINE_CONFIG_START( sms, driver_device ) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 223) // MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 191) + MCFG_SCREEN_UPDATE(megatech_md_sms) /* Copies a bitmap */ + MCFG_SCREEN_EOF(sms) /* Used to Sync the timing */ MCFG_PALETTE_LENGTH(0x200) MCFG_VIDEO_START(sms) - MCFG_VIDEO_UPDATE(megatech_md_sms) /* Copies a bitmap */ - MCFG_VIDEO_EOF(sms) /* Used to Sync the timing */ MCFG_NVRAM_HANDLER( sms ) diff --git a/src/mame/machine/slikshot.c b/src/mame/machine/slikshot.c index 0da4c3e9e2d..148fb509c03 100644 --- a/src/mame/machine/slikshot.c +++ b/src/mame/machine/slikshot.c @@ -556,17 +556,17 @@ VIDEO_START( slikshot ) /************************************* * - * VIDEO_UPDATE( slikshot ) + * SCREEN_UPDATE( slikshot ) * *************************************/ -VIDEO_UPDATE( slikshot ) +SCREEN_UPDATE( slikshot ) { int totaldy, totaldx; int temp, i; /* draw the normal video first */ - VIDEO_UPDATE_CALL(itech8_2page); + SCREEN_UPDATE_CALL(itech8_2page); /* add the current X,Y positions to the list */ xbuffer[ybuffer_next % YBUFFER_COUNT] = input_port_read_safe(screen->machine, "FAKEX", 0); diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index 801f0102521..6de6e27bcbe 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -240,7 +240,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( 1942 ) +SCREEN_UPDATE( 1942 ) { _1942_state *state = screen->machine->driver_data<_1942_state>(); diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index d107b980166..fa5fb9dd4e9 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -259,7 +259,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( 1943 ) +SCREEN_UPDATE( 1943 ) { _1943_state *state = screen->machine->driver_data<_1943_state>(); tilemap_set_scrollx(state->bg2_tilemap, 0, state->bgscrollx[0] + 256 * state->bgscrollx[1]); diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c index e0fe40a28a5..22f55284dbe 100644 --- a/src/mame/video/20pacgal.c +++ b/src/mame/video/20pacgal.c @@ -406,7 +406,7 @@ static void draw_stars(_20pacgal_state *state, bitmap_t *bitmap, const rectangle * *************************************/ -static VIDEO_UPDATE( 20pacgal ) +static SCREEN_UPDATE( 20pacgal ) { _20pacgal_state *state = screen->machine->driver_data<_20pacgal_state>(); @@ -428,13 +428,11 @@ static VIDEO_UPDATE( 20pacgal ) *************************************/ MACHINE_CONFIG_FRAGMENT( 20pacgal_video ) - - MCFG_VIDEO_UPDATE(20pacgal) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(SCREEN_WIDTH, SCREEN_HEIGHT) MCFG_SCREEN_VISIBLE_AREA(0, SCREEN_WIDTH - 1, 0, SCREEN_HEIGHT - 1) + MCFG_SCREEN_UPDATE(20pacgal) MACHINE_CONFIG_END diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c index e8f9fa1f28f..ef2a7938610 100644 --- a/src/mame/video/40love.c +++ b/src/mame/video/40love.c @@ -358,7 +358,7 @@ static void draw_pixram( running_machine *machine, bitmap_t *bitmap, const recta copybitmap(bitmap, state->tmp_bitmap2, f, f, state->xoffset, 0, cliprect); } -VIDEO_UPDATE( fortyl ) +SCREEN_UPDATE( fortyl ) { fortyl_state *state = screen->machine->driver_data<fortyl_state>(); draw_pixram(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c index 056c42e62ac..2506f89b604 100644 --- a/src/mame/video/4enraya.c +++ b/src/mame/video/4enraya.c @@ -37,7 +37,7 @@ VIDEO_START( 4enraya ) state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -VIDEO_UPDATE( 4enraya ) +SCREEN_UPDATE( 4enraya ) { _4enraya_state *state = screen->machine->driver_data<_4enraya_state>(); diff --git a/src/mame/video/8080bw.c b/src/mame/video/8080bw.c index 081e6571d39..15613e1f776 100644 --- a/src/mame/video/8080bw.c +++ b/src/mame/video/8080bw.c @@ -112,7 +112,7 @@ static void clear_extra_columns( running_machine *machine, bitmap_t *bitmap, pen } -VIDEO_UPDATE( invadpt2 ) +SCREEN_UPDATE( invadpt2 ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -144,7 +144,7 @@ VIDEO_UPDATE( invadpt2 ) } -VIDEO_UPDATE( ballbomb ) +SCREEN_UPDATE( ballbomb ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -177,7 +177,7 @@ VIDEO_UPDATE( ballbomb ) } -VIDEO_UPDATE( schaser ) +SCREEN_UPDATE( schaser ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -218,7 +218,7 @@ VIDEO_UPDATE( schaser ) } -VIDEO_UPDATE( schasercv ) +SCREEN_UPDATE( schasercv ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -244,7 +244,7 @@ VIDEO_UPDATE( schasercv ) } -VIDEO_UPDATE( rollingc ) +SCREEN_UPDATE( rollingc ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -269,7 +269,7 @@ VIDEO_UPDATE( rollingc ) } -VIDEO_UPDATE( polaris ) +SCREEN_UPDATE( polaris ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -341,7 +341,7 @@ VIDEO_UPDATE( polaris ) } -VIDEO_UPDATE( lupin3 ) +SCREEN_UPDATE( lupin3 ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -366,7 +366,7 @@ VIDEO_UPDATE( lupin3 ) } -VIDEO_UPDATE( cosmo ) +SCREEN_UPDATE( cosmo ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -393,7 +393,7 @@ VIDEO_UPDATE( cosmo ) } -VIDEO_UPDATE( indianbt ) +SCREEN_UPDATE( indianbt ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; @@ -425,7 +425,7 @@ VIDEO_UPDATE( indianbt ) } -VIDEO_UPDATE( shuttlei ) +SCREEN_UPDATE( shuttlei ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[2] = { RGB_BLACK, RGB_WHITE }; @@ -456,7 +456,7 @@ VIDEO_UPDATE( shuttlei ) } -VIDEO_UPDATE( sflush ) +SCREEN_UPDATE( sflush ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); pen_t pens[NUM_PENS]; diff --git a/src/mame/video/88games.c b/src/mame/video/88games.c index 176e1094a5c..afd430be495 100644 --- a/src/mame/video/88games.c +++ b/src/mame/video/88games.c @@ -54,7 +54,7 @@ void _88games_zoom_callback( running_machine *machine, int *code, int *color, in ***************************************************************************/ -VIDEO_UPDATE( 88games ) +SCREEN_UPDATE( 88games ) { _88games_state *state = screen->machine->driver_data<_88games_state>(); diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c index 5222e1e4418..625fb7f8565 100644 --- a/src/mame/video/actfancr.c +++ b/src/mame/video/actfancr.c @@ -150,7 +150,7 @@ READ8_HANDLER( actfancr_pf2_data_r ) /******************************************************************************/ -VIDEO_UPDATE( actfancr ) +SCREEN_UPDATE( actfancr ) { actfancr_state *state = screen->machine->driver_data<actfancr_state>(); UINT8 *buffered_spriteram = screen->machine->generic.buffered_spriteram.u8; @@ -236,7 +236,7 @@ VIDEO_UPDATE( actfancr ) return 0; } -VIDEO_UPDATE( triothep ) +SCREEN_UPDATE( triothep ) { actfancr_state *state = screen->machine->driver_data<actfancr_state>(); UINT8 *buffered_spriteram = screen->machine->generic.buffered_spriteram.u8; diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index 202c76662e8..4aae104c8b0 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -154,7 +154,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( aeroboto ) +SCREEN_UPDATE( aeroboto ) { aeroboto_state *state = screen->machine->driver_data<aeroboto_state>(); diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index fa5568b6f64..13a5f74ebe1 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -838,7 +838,7 @@ static void wbbc97_draw_bitmap( running_machine *machine, bitmap_t *bitmap ) } -VIDEO_UPDATE( pspikes ) +SCREEN_UPDATE( pspikes ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); int i, scrolly; @@ -857,7 +857,7 @@ VIDEO_UPDATE( pspikes ) return 0; } -VIDEO_UPDATE( pspikesb ) +SCREEN_UPDATE( pspikesb ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); int i, scrolly; @@ -873,7 +873,7 @@ VIDEO_UPDATE( pspikesb ) return 0; } -VIDEO_UPDATE( spikes91 ) +SCREEN_UPDATE( spikes91 ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); int i, scrolly; @@ -914,7 +914,7 @@ VIDEO_UPDATE( spikes91 ) return 0; } -VIDEO_UPDATE( karatblz ) +SCREEN_UPDATE( karatblz ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); tilemap_set_scrollx(state->bg1_tilemap, 0, state->bg1scrollx - 8); @@ -935,7 +935,7 @@ VIDEO_UPDATE( karatblz ) return 0; } -VIDEO_UPDATE( spinlbrk ) +SCREEN_UPDATE( spinlbrk ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); int i, scrolly; @@ -961,7 +961,7 @@ VIDEO_UPDATE( spinlbrk ) return 0; } -VIDEO_UPDATE( turbofrc ) +SCREEN_UPDATE( turbofrc ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); int i, scrolly; @@ -988,7 +988,7 @@ VIDEO_UPDATE( turbofrc ) return 0; } -VIDEO_UPDATE( aerofgt ) +SCREEN_UPDATE( aerofgt ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); tilemap_set_scrollx(state->bg1_tilemap, 0, state->rasterram[0x0000] - 18); @@ -1011,7 +1011,7 @@ VIDEO_UPDATE( aerofgt ) } -VIDEO_UPDATE( aerfboot ) +SCREEN_UPDATE( aerfboot ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); int i, scrolly; @@ -1034,7 +1034,7 @@ VIDEO_UPDATE( aerfboot ) return 0; } -VIDEO_UPDATE( aerfboo2 ) +SCREEN_UPDATE( aerfboo2 ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); int i, scrolly; @@ -1061,7 +1061,7 @@ VIDEO_UPDATE( aerfboo2 ) return 0; } -VIDEO_UPDATE( wbbc97 ) +SCREEN_UPDATE( wbbc97 ) { aerofgt_state *state = screen->machine->driver_data<aerofgt_state>(); int i, scrolly; diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c index b256c80c238..d1e2bf51774 100644 --- a/src/mame/video/airbustr.c +++ b/src/mame/video/airbustr.c @@ -133,7 +133,7 @@ VIDEO_START( airbustr ) } -VIDEO_UPDATE( airbustr ) +SCREEN_UPDATE( airbustr ) { airbustr_state *state = screen->machine->driver_data<airbustr_state>(); @@ -146,7 +146,7 @@ VIDEO_UPDATE( airbustr ) return 0; } -VIDEO_EOF( airbustr ) +SCREEN_EOF( airbustr ) { airbustr_state *state = machine->driver_data<airbustr_state>(); diff --git a/src/mame/video/ajax.c b/src/mame/video/ajax.c index 2dbc0717cfc..25dd17850cf 100644 --- a/src/mame/video/ajax.c +++ b/src/mame/video/ajax.c @@ -87,7 +87,7 @@ VIDEO_START( ajax ) ***************************************************************************/ -VIDEO_UPDATE( ajax ) +SCREEN_UPDATE( ajax ) { ajax_state *state = screen->machine->driver_data<ajax_state>(); diff --git a/src/mame/video/aliens.c b/src/mame/video/aliens.c index 9d4ed739c1a..cfbe1b62d95 100644 --- a/src/mame/video/aliens.c +++ b/src/mame/video/aliens.c @@ -75,7 +75,7 @@ VIDEO_START( aliens ) ***************************************************************************/ -VIDEO_UPDATE( aliens ) +SCREEN_UPDATE( aliens ) { aliens_state *state = screen->machine->driver_data<aliens_state>(); diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index 37b2fb4e487..9ef7e4fe0b7 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -128,7 +128,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /******************************************************************************/ -VIDEO_UPDATE( alpha68k_II ) +SCREEN_UPDATE( alpha68k_II ) { alpha68k_state *state = screen->machine->driver_data<alpha68k_state>(); @@ -275,7 +275,7 @@ static void draw_sprites_V( running_machine *machine, bitmap_t *bitmap, const re } } -VIDEO_UPDATE( alpha68k_V ) +SCREEN_UPDATE( alpha68k_V ) { alpha68k_state *state = screen->machine->driver_data<alpha68k_state>(); UINT16 *spriteram = state->spriteram; @@ -316,7 +316,7 @@ VIDEO_UPDATE( alpha68k_V ) return 0; } -VIDEO_UPDATE( alpha68k_V_sb ) +SCREEN_UPDATE( alpha68k_V_sb ) { alpha68k_state *state = screen->machine->driver_data<alpha68k_state>(); @@ -368,7 +368,7 @@ static void draw_sprites_I( running_machine *machine, bitmap_t *bitmap, const re } } -VIDEO_UPDATE( alpha68k_I ) +SCREEN_UPDATE( alpha68k_I ) { alpha68k_state *state = screen->machine->driver_data<alpha68k_state>(); int yshift = (state->microcontroller_id == 0x890a) ? 1 : 0; // The Next Space is 1 pixel off @@ -501,7 +501,7 @@ static void kyros_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons } } -VIDEO_UPDATE( kyros ) +SCREEN_UPDATE( kyros ) { alpha68k_state *state = screen->machine->driver_data<alpha68k_state>(); colortable_entry_set_value(screen->machine->colortable, 0x100, *state->videoram & 0xff); @@ -561,7 +561,7 @@ static void sstingry_draw_sprites( running_machine *machine, bitmap_t *bitmap, c } } -VIDEO_UPDATE( sstingry ) +SCREEN_UPDATE( sstingry ) { alpha68k_state *state = screen->machine->driver_data<alpha68k_state>(); colortable_entry_set_value(screen->machine->colortable, 0x100, *state->videoram & 0xff); diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c index e02ca8205f1..121d0646cdb 100644 --- a/src/mame/video/ambush.c +++ b/src/mame/video/ambush.c @@ -87,7 +87,7 @@ static void draw_chars( running_machine *machine, bitmap_t *bitmap, const rectan } -VIDEO_UPDATE( ambush ) +SCREEN_UPDATE( ambush ) { ambush_state *state = screen->machine->driver_data<ambush_state>(); int offs; diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c index 4e879ac3287..01f998321d0 100644 --- a/src/mame/video/amiga.c +++ b/src/mame/video/amiga.c @@ -999,7 +999,7 @@ void amiga_render_scanline(running_machine *machine, bitmap_t *bitmap, int scanl * *************************************/ -VIDEO_UPDATE( amiga ) +SCREEN_UPDATE( amiga ) { int y; diff --git a/src/mame/video/amigaaga.c b/src/mame/video/amigaaga.c index 013d7f570d4..dec912cee0b 100644 --- a/src/mame/video/amigaaga.c +++ b/src/mame/video/amigaaga.c @@ -860,7 +860,7 @@ void amiga_aga_render_scanline(running_machine *machine, bitmap_t *bitmap, int s * *************************************/ -VIDEO_UPDATE( amiga_aga ) +SCREEN_UPDATE( amiga_aga ) { int y; diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c index 5d2f4c59c92..57322d61562 100644 --- a/src/mame/video/ampoker2.c +++ b/src/mame/video/ampoker2.c @@ -161,7 +161,7 @@ VIDEO_START(sigma2k) 8, 8, 64, 32); } -VIDEO_UPDATE(ampoker2) +SCREEN_UPDATE(ampoker2) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index bb55c475d1d..02519433446 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -146,7 +146,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect ***************************************************************************/ -VIDEO_UPDATE( amspdwy ) +SCREEN_UPDATE( amspdwy ) { amspdwy_state *state = screen->machine->driver_data<amspdwy_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 4446e194936..4b21fabb249 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -272,7 +272,7 @@ VIDEO_START( angelkds ) /* enable bits are uncertain */ -VIDEO_UPDATE( angelkds ) +SCREEN_UPDATE( angelkds ) { angelkds_state *state = screen->machine->driver_data<angelkds_state>(); const rectangle &visarea = screen->visible_area(); diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 105f1c01805..b9113974b56 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -270,7 +270,7 @@ static void robowres_draw_sprites( bitmap_t *dest_bmp, const rectangle *cliprect } -VIDEO_UPDATE( appoooh ) +SCREEN_UPDATE( appoooh ) { appoooh_state *state = screen->machine->driver_data<appoooh_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -300,7 +300,7 @@ VIDEO_UPDATE( appoooh ) return 0; } -VIDEO_UPDATE( robowres ) +SCREEN_UPDATE( robowres ) { appoooh_state *state = screen->machine->driver_data<appoooh_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c index c192866989d..901eaee21be 100644 --- a/src/mame/video/aquarium.c +++ b/src/mame/video/aquarium.c @@ -158,7 +158,7 @@ VIDEO_START(aquarium) tilemap_set_transparent_pen(state->mid_tilemap, 0); } -VIDEO_UPDATE(aquarium) +SCREEN_UPDATE(aquarium) { aquarium_state *state = screen->machine->driver_data<aquarium_state>(); tilemap_set_scrollx(state->mid_tilemap, 0, state->scroll[0]); diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c index cc83b681a63..f0d81f84ad8 100644 --- a/src/mame/video/arabian.c +++ b/src/mame/video/arabian.c @@ -368,7 +368,7 @@ WRITE8_HANDLER( arabian_videoram_w ) * *************************************/ -VIDEO_UPDATE( arabian ) +SCREEN_UPDATE( arabian ) { arabian_state *state = screen->machine->driver_data<arabian_state>(); const pen_t *pens = &screen->machine->pens[(state->video_control >> 3) << 8]; diff --git a/src/mame/video/arcadecl.c b/src/mame/video/arcadecl.c index 0feed3c2a0b..7cab363e43d 100644 --- a/src/mame/video/arcadecl.c +++ b/src/mame/video/arcadecl.c @@ -77,7 +77,7 @@ VIDEO_START( arcadecl ) * *************************************/ -VIDEO_UPDATE( arcadecl ) +SCREEN_UPDATE( arcadecl ) { rampart_state *state = screen->machine->driver_data<rampart_state>(); diff --git a/src/mame/video/archimds.c b/src/mame/video/archimds.c index 08129d07020..1afc19830ec 100644 --- a/src/mame/video/archimds.c +++ b/src/mame/video/archimds.c @@ -11,7 +11,7 @@ VIDEO_START( archimds_vidc ) { } -VIDEO_UPDATE( archimds_vidc ) +SCREEN_UPDATE( archimds_vidc ) { int xstart,ystart,xend,yend; int res_x,res_y; diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index d94821995d6..651284f0889 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -1194,7 +1194,7 @@ static void butasan_log_vram(running_machine *machine) #endif } -VIDEO_UPDATE( argus ) +SCREEN_UPDATE( argus ) { argus_state *state = screen->machine->driver_data<argus_state>(); bg_setting(screen->machine); @@ -1211,7 +1211,7 @@ VIDEO_UPDATE( argus ) return 0; } -VIDEO_UPDATE( valtric ) +SCREEN_UPDATE( valtric ) { argus_state *state = screen->machine->driver_data<argus_state>(); bg_setting(screen->machine); @@ -1225,7 +1225,7 @@ VIDEO_UPDATE( valtric ) return 0; } -VIDEO_UPDATE( butasan ) +SCREEN_UPDATE( butasan ) { argus_state *state = screen->machine->driver_data<argus_state>(); bg_setting(screen->machine); diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index 23474c3b892..49b6595d84c 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -202,7 +202,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( arkanoid ) +SCREEN_UPDATE( arkanoid ) { arkanoid_state *state = screen->machine->driver_data<arkanoid_state>(); @@ -211,7 +211,7 @@ VIDEO_UPDATE( arkanoid ) return 0; } -VIDEO_UPDATE( hexa ) +SCREEN_UPDATE( hexa ) { arkanoid_state *state = screen->machine->driver_data<arkanoid_state>(); diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index ca611132cad..4875030b8e5 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -329,7 +329,7 @@ static void copy_textmap(running_machine *machine, int index) } -VIDEO_UPDATE( armedf ) +SCREEN_UPDATE( armedf ) { armedf_state *state = screen->machine->driver_data<armedf_state>(); int sprite_enable = state->vreg & 0x200; @@ -464,7 +464,7 @@ VIDEO_UPDATE( armedf ) } -VIDEO_EOF( armedf ) +SCREEN_EOF( armedf ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c index 22109c73986..0262559c1f9 100644 --- a/src/mame/video/ashnojoe.c +++ b/src/mame/video/ashnojoe.c @@ -224,7 +224,7 @@ VIDEO_START( ashnojoe ) tilemap_set_transparent_pen(state->joetilemap5, 15); } -VIDEO_UPDATE( ashnojoe ) +SCREEN_UPDATE( ashnojoe ) { ashnojoe_state *state = screen->machine->driver_data<ashnojoe_state>(); diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c index a102f2248ab..6b286a6bea3 100644 --- a/src/mame/video/asterix.c +++ b/src/mame/video/asterix.c @@ -46,7 +46,7 @@ void asterix_tile_callback( running_machine *machine, int layer, int *code, int *code = (*code & 0x03ff) | state->tilebanks[(*code >> 10) & 3]; } -VIDEO_UPDATE( asterix ) +SCREEN_UPDATE( asterix ) { asterix_state *state = screen->machine->driver_data<asterix_state>(); static const int K053251_CI[4] = { K053251_CI0, K053251_CI2, K053251_CI3, K053251_CI4 }; diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c index f7b6ae61fed..763e17d77a4 100644 --- a/src/mame/video/astrocde.c +++ b/src/mame/video/astrocde.c @@ -301,7 +301,7 @@ static void init_savestate(running_machine *machine) * *************************************/ -VIDEO_UPDATE( astrocde ) +SCREEN_UPDATE( astrocde ) { astrocde_state *state = screen->machine->driver_data<astrocde_state>(); UINT8 *videoram = state->videoram; @@ -386,7 +386,7 @@ VIDEO_UPDATE( astrocde ) } -VIDEO_UPDATE( profpac ) +SCREEN_UPDATE( profpac ) { int y; diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c index 013e9d2f3fc..c7fb30ecf87 100644 --- a/src/mame/video/asuka.c +++ b/src/mame/video/asuka.c @@ -19,7 +19,7 @@ WRITE16_HANDLER( asuka_spritectrl_w ) SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( asuka ) +SCREEN_UPDATE( asuka ) { asuka_state *state = screen->machine->driver_data<asuka_state>(); UINT8 layer[3]; @@ -45,7 +45,7 @@ VIDEO_UPDATE( asuka ) } -VIDEO_UPDATE( bonzeadv ) +SCREEN_UPDATE( bonzeadv ) { asuka_state *state = screen->machine->driver_data<asuka_state>(); UINT8 layer[3]; diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c index a6381bd546b..91ef83d768a 100644 --- a/src/mame/video/atari.c +++ b/src/mame/video/atari.c @@ -768,11 +768,11 @@ VIDEO_START( atari ) * Refresh screen bitmap. * Note: Actual drawing is done scanline wise during atari_interrupt ************************************************************************/ -VIDEO_UPDATE( atari ) +SCREEN_UPDATE( atari ) { UINT32 new_tv_artifacts; - VIDEO_UPDATE_CALL(generic_bitmapped); + SCREEN_UPDATE_CALL(generic_bitmapped); new_tv_artifacts = input_port_read_safe(screen->machine, "artifacts", 0); if( tv_artifacts != new_tv_artifacts ) diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index abeb761b6d3..52495e23fb7 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -180,7 +180,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( atarifb ) +SCREEN_UPDATE( atarifb ) { draw_playfield_and_alpha(screen->machine, bitmap, cliprect, 0, 0); @@ -190,7 +190,7 @@ VIDEO_UPDATE( atarifb ) } -VIDEO_UPDATE( abaseb ) +SCREEN_UPDATE( abaseb ) { draw_playfield_and_alpha(screen->machine, bitmap, cliprect, -8, 0); @@ -200,7 +200,7 @@ VIDEO_UPDATE( abaseb ) } -VIDEO_UPDATE( soccer ) +SCREEN_UPDATE( soccer ) { draw_playfield_and_alpha(screen->machine, bitmap, cliprect, 0, 8); diff --git a/src/mame/video/atarig1.c b/src/mame/video/atarig1.c index ba4227ac425..8a0a8be32cf 100644 --- a/src/mame/video/atarig1.c +++ b/src/mame/video/atarig1.c @@ -151,7 +151,7 @@ void atarig1_scanline_update(screen_device &screen, int scanline) * *************************************/ -VIDEO_UPDATE( atarig1 ) +SCREEN_UPDATE( atarig1 ) { atarig1_state *state = screen->machine->driver_data<atarig1_state>(); @@ -166,7 +166,7 @@ VIDEO_UPDATE( atarig1 ) return 0; } -VIDEO_EOF( atarig1 ) +SCREEN_EOF( atarig1 ) { atarig1_state *state = machine->driver_data<atarig1_state>(); diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index f49764e3251..0274d706f87 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -180,7 +180,7 @@ void atarig42_scanline_update(screen_device &screen, int scanline) * *************************************/ -VIDEO_UPDATE( atarig42 ) +SCREEN_UPDATE( atarig42 ) { atarig42_state *state = screen->machine->driver_data<atarig42_state>(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; @@ -227,7 +227,7 @@ VIDEO_UPDATE( atarig42 ) return 0; } -VIDEO_EOF( atarig42 ) +SCREEN_EOF( atarig42 ) { atarig42_state *state = machine->driver_data<atarig42_state>(); diff --git a/src/mame/video/atarigt.c b/src/mame/video/atarigt.c index 5e8d5aa213a..2291a205c34 100644 --- a/src/mame/video/atarigt.c +++ b/src/mame/video/atarigt.c @@ -506,7 +506,7 @@ PrimRage GALs: */ -VIDEO_UPDATE( atarigt ) +SCREEN_UPDATE( atarigt ) { atarigt_state *state = screen->machine->driver_data<atarigt_state>(); bitmap_t *mo_bitmap = atarirle_get_vram(state->rle, 0); @@ -632,7 +632,7 @@ VIDEO_UPDATE( atarigt ) return 0; } -VIDEO_EOF( atarigt ) +SCREEN_EOF( atarigt ) { atarigt_state *state = machine->driver_data<atarigt_state>(); diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c index 37ec19ccebe..c0d6592e81c 100644 --- a/src/mame/video/atarigx2.c +++ b/src/mame/video/atarigx2.c @@ -178,7 +178,7 @@ void atarigx2_scanline_update(screen_device &screen, int scanline) * *************************************/ -VIDEO_UPDATE( atarigx2 ) +SCREEN_UPDATE( atarigx2 ) { atarigx2_state *state = screen->machine->driver_data<atarigx2_state>(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; @@ -220,7 +220,7 @@ VIDEO_UPDATE( atarigx2 ) return 0; } -VIDEO_EOF( atarigx2 ) +SCREEN_EOF( atarigx2 ) { atarigx2_state *state = machine->driver_data<atarigx2_state>(); diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index 180b32ccfee..39dbd0b94a6 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -497,7 +497,7 @@ static void update_timers(running_machine *machine, int scanline) * *************************************/ -VIDEO_UPDATE( atarisy1 ) +SCREEN_UPDATE( atarisy1 ) { atarisy1_state *state = screen->machine->driver_data<atarisy1_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c index c7e5158d8db..8777fc77a89 100644 --- a/src/mame/video/atarisy2.c +++ b/src/mame/video/atarisy2.c @@ -312,7 +312,7 @@ WRITE16_HANDLER( atarisy2_videoram_w ) * *************************************/ -VIDEO_UPDATE( atarisy2 ) +SCREEN_UPDATE( atarisy2 ) { atarisy2_state *state = screen->machine->driver_data<atarisy2_state>(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c index 46eef9b1fe8..836618f0e8e 100644 --- a/src/mame/video/atetris.c +++ b/src/mame/video/atetris.c @@ -64,7 +64,7 @@ VIDEO_START( atetris ) * *************************************/ -VIDEO_UPDATE( atetris ) +SCREEN_UPDATE( atetris ) { atetris_state *state = screen->machine->driver_data<atetris_state>(); diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c index 92705398f82..714c4bc3512 100644 --- a/src/mame/video/badlands.c +++ b/src/mame/video/badlands.c @@ -110,7 +110,7 @@ WRITE16_HANDLER( badlands_pf_bank_w ) * *************************************/ -VIDEO_UPDATE( badlands ) +SCREEN_UPDATE( badlands ) { badlands_state *state = screen->machine->driver_data<badlands_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c index 049424cb85b..0c20da9569e 100644 --- a/src/mame/video/bagman.c +++ b/src/mame/video/bagman.c @@ -146,7 +146,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( bagman ) +SCREEN_UPDATE( bagman ) { if (*bagman_video_enable == 0) return 0; diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c index 25e9dd30497..65c9ca4faa8 100644 --- a/src/mame/video/balsente.c +++ b/src/mame/video/balsente.c @@ -210,7 +210,7 @@ static void draw_one_sprite(running_machine *machine, bitmap_t *bitmap, const re * *************************************/ -VIDEO_UPDATE( balsente ) +SCREEN_UPDATE( balsente ) { balsente_state *state = screen->machine->driver_data<balsente_state>(); const pen_t *pens = &screen->machine->pens[state->palettebank_vis * 256]; diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c index e292ca42e9c..62f7799a5f7 100644 --- a/src/mame/video/bankp.c +++ b/src/mame/video/bankp.c @@ -173,7 +173,7 @@ VIDEO_START( bankp ) state->save_item(NAME(state->priority)); } -VIDEO_UPDATE( bankp ) +SCREEN_UPDATE( bankp ) { bankp_state *state = screen->machine->driver_data<bankp_state>(); diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index 02df5118bf7..a8a58a5bb58 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -312,7 +312,7 @@ static void set_scroll(running_machine *machine, int layer) } -VIDEO_UPDATE( baraduke ) +SCREEN_UPDATE( baraduke ) { baraduke_state *state = screen->machine->driver_data<baraduke_state>(); int back; @@ -339,7 +339,7 @@ VIDEO_UPDATE( baraduke ) } -VIDEO_EOF( baraduke ) +SCREEN_EOF( baraduke ) { baraduke_state *state = machine->driver_data<baraduke_state>(); if (state->copy_sprites) diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c index 5297b4aa3d7..7cdedb77ac2 100644 --- a/src/mame/video/batman.c +++ b/src/mame/video/batman.c @@ -193,7 +193,7 @@ void batman_scanline_update(screen_device &screen, int scanline) * *************************************/ -VIDEO_UPDATE( batman ) +SCREEN_UPDATE( batman ) { batman_state *state = screen->machine->driver_data<batman_state>(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index a7de05b8b67..87977bdb362 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -234,7 +234,7 @@ static void draw_fg_bitmap( running_machine *machine, bitmap_t *bitmap ) } } -VIDEO_UPDATE( battlane ) +SCREEN_UPDATE( battlane ) { battlane_state *state = screen->machine->driver_data<battlane_state>(); diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c index 01542414d24..9a50609d17b 100644 --- a/src/mame/video/battlera.c +++ b/src/mame/video/battlera.c @@ -307,7 +307,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan /******************************************************************************/ -VIDEO_UPDATE( battlera ) +SCREEN_UPDATE( battlera ) { battlera_state *state = screen->machine->driver_data<battlera_state>(); int offs,code,scrollx,scrolly,mx,my; diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index d8679a16c08..de4ce9d382a 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -120,7 +120,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE(battlex) +SCREEN_UPDATE(battlex) { battlex_state *state = screen->machine->driver_data<battlex_state>(); diff --git a/src/mame/video/battlnts.c b/src/mame/video/battlnts.c index af96a522b7b..f62483c791d 100644 --- a/src/mame/video/battlnts.c +++ b/src/mame/video/battlnts.c @@ -43,7 +43,7 @@ WRITE8_HANDLER( battlnts_spritebank_w ) ***************************************************************************/ -VIDEO_UPDATE( battlnts ) +SCREEN_UPDATE( battlnts ) { battlnts_state *state = screen->machine->driver_data<battlnts_state>(); diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index 6a9ba550d7f..fef7305185f 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -279,7 +279,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const UINT1 /******************************************************************************/ -VIDEO_UPDATE( bbuster ) +SCREEN_UPDATE( bbuster ) { bbusters_state *state = screen->machine->driver_data<bbusters_state>(); @@ -297,7 +297,7 @@ VIDEO_UPDATE( bbuster ) return 0; } -VIDEO_UPDATE( mechatt ) +SCREEN_UPDATE( mechatt ) { bbusters_state *state = screen->machine->driver_data<bbusters_state>(); diff --git a/src/mame/video/beathead.c b/src/mame/video/beathead.c index cdd408d2d99..f4d5cf47ad1 100644 --- a/src/mame/video/beathead.c +++ b/src/mame/video/beathead.c @@ -154,7 +154,7 @@ WRITE32_MEMBER( beathead_state::hsync_ram_w ) * *************************************/ -bool beathead_state::video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) +bool beathead_state::screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) { UINT8 *videoram = reinterpret_cast<UINT8 *>(m_videoram); int x, y; diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c index b2185c05a64..5329cfca567 100644 --- a/src/mame/video/beezer.c +++ b/src/mame/video/beezer.c @@ -17,7 +17,7 @@ INTERRUPT_GEN( beezer_interrupt ) cpu_set_input_line(device, M6809_FIRQ_LINE, CLEAR_LINE); } -VIDEO_UPDATE( beezer ) +SCREEN_UPDATE( beezer ) { beezer_state *state = screen->machine->driver_data<beezer_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index 4c8f49e0293..80158ed6b74 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -216,7 +216,7 @@ VIDEO_START( adder2 ) // video update /////////////////////////////////////////////////////////// static const rectangle visible1 = { 0, 400-1, 0, 280-1 }; //minx,maxx, miny,maxy -VIDEO_UPDATE( adder2 ) +SCREEN_UPDATE( adder2 ) { if (adder2_screen_page_reg & SL_DISPLAY) tilemap_draw(bitmap, &visible1, tilemap1, 0, 0); else tilemap_draw(bitmap, &visible1, tilemap0, 0, 0); diff --git a/src/mame/video/bfm_adr2.h b/src/mame/video/bfm_adr2.h index 6613ee174c4..ff15d73c31d 100644 --- a/src/mame/video/bfm_adr2.h +++ b/src/mame/video/bfm_adr2.h @@ -18,7 +18,7 @@ ADDRESS_MAP_EXTERN( adder2_memmap, 8 ); VIDEO_START( adder2 ); VIDEO_RESET( adder2 ); -VIDEO_UPDATE( adder2 ); +SCREEN_UPDATE( adder2 ); PALETTE_INIT( adder2 ); #endif diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c index 88393836ce8..d2a6eb47e45 100644 --- a/src/mame/video/bigevglf.c +++ b/src/mame/video/bigevglf.c @@ -91,7 +91,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( bigevglf ) +SCREEN_UPDATE( bigevglf ) { bigevglf_state *state = screen->machine->driver_data<bigevglf_state>(); diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index 8639f27859b..ea6e71a8a70 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -128,7 +128,7 @@ VIDEO_START(bigstrkb) tilemap_set_transparent_pen(state->tilemap3,15); } -VIDEO_UPDATE(bigstrkb) +SCREEN_UPDATE(bigstrkb) { bigstrkb_state *state = screen->machine->driver_data<bigstrkb_state>(); diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index 2ae32d614dc..6d6211bd670 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -246,7 +246,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( bionicc ) +SCREEN_UPDATE( bionicc ) { bionicc_state *state = screen->machine->driver_data<bionicc_state>(); @@ -260,7 +260,7 @@ VIDEO_UPDATE( bionicc ) return 0; } -VIDEO_EOF( bionicc ) +SCREEN_EOF( bionicc ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/bishi.c b/src/mame/video/bishi.c index b060b090e72..519463aaad7 100644 --- a/src/mame/video/bishi.c +++ b/src/mame/video/bishi.c @@ -45,7 +45,7 @@ VIDEO_START( bishi ) state->layer_colorbase[3] = 0xc0; } -VIDEO_UPDATE(bishi) +SCREEN_UPDATE(bishi) { bishi_state *state = screen->machine->driver_data<bishi_state>(); int layers[4], layerpri[4], i;/*, old;*/ diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index cb554c531e2..abb3cb4d34c 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -249,7 +249,7 @@ VIDEO_START( bking ) } -VIDEO_UPDATE( bking ) +SCREEN_UPDATE( bking ) { bking_state *state = screen->machine->driver_data<bking_state>(); @@ -278,7 +278,7 @@ VIDEO_UPDATE( bking ) } -VIDEO_EOF( bking ) +SCREEN_EOF( bking ) { bking_state *state = machine->driver_data<bking_state>(); static const rectangle rect = { 0, 7, 0, 15 }; diff --git a/src/mame/video/bladestl.c b/src/mame/video/bladestl.c index e5e87351c55..baf5a35d7d3 100644 --- a/src/mame/video/bladestl.c +++ b/src/mame/video/bladestl.c @@ -76,7 +76,7 @@ void bladestl_sprite_callback( running_machine *machine, int *code,int *color ) ***************************************************************************/ -VIDEO_UPDATE( bladestl ) +SCREEN_UPDATE( bladestl ) { bladestl_state *state = screen->machine->driver_data<bladestl_state>(); set_pens(screen->machine); diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index 063f8e71600..56c1e3922cc 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -230,7 +230,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( blktiger ) +SCREEN_UPDATE( blktiger ) { blktiger_state *state = screen->machine->driver_data<blktiger_state>(); @@ -251,7 +251,7 @@ VIDEO_UPDATE( blktiger ) return 0; } -VIDEO_EOF( blktiger ) +SCREEN_EOF( blktiger ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index f923dd10d8e..5fe8cba33e6 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -219,7 +219,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect ***************************************************************************/ -VIDEO_UPDATE( blmbycar ) +SCREEN_UPDATE( blmbycar ) { blmbycar_state *state = screen->machine->driver_data<blmbycar_state>(); int i, layers_ctrl = -1; diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c index b39e99aac36..2e15acf99c7 100644 --- a/src/mame/video/blockade.c +++ b/src/mame/video/blockade.c @@ -28,7 +28,7 @@ VIDEO_START( blockade ) state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -VIDEO_UPDATE( blockade ) +SCREEN_UPDATE( blockade ) { blockade_state *state = screen->machine->driver_data<blockade_state>(); diff --git a/src/mame/video/blockhl.c b/src/mame/video/blockhl.c index 26040a17c70..e00b72ee02d 100644 --- a/src/mame/video/blockhl.c +++ b/src/mame/video/blockhl.c @@ -55,7 +55,7 @@ VIDEO_START( blockhl ) state_save_register_global_pointer(machine, machine->generic.paletteram.u8, 0x800); } -VIDEO_UPDATE( blockhl ) +SCREEN_UPDATE( blockhl ) { blockhl_state *state = screen->machine->driver_data<blockhl_state>(); diff --git a/src/mame/video/blockout.c b/src/mame/video/blockout.c index 7153d0a127c..1c605d9782b 100644 --- a/src/mame/video/blockout.c +++ b/src/mame/video/blockout.c @@ -110,7 +110,7 @@ WRITE16_HANDLER( blockout_videoram_w ) -VIDEO_UPDATE( blockout ) +SCREEN_UPDATE( blockout ) { blockout_state *state = screen->machine->driver_data<blockout_state>(); int x, y; diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c index a6efc8e3c39..12f5cc910ae 100644 --- a/src/mame/video/bloodbro.c +++ b/src/mame/video/bloodbro.c @@ -229,7 +229,7 @@ static void weststry_draw_sprites(running_machine *machine, bitmap_t *bitmap, co -VIDEO_UPDATE( bloodbro ) +SCREEN_UPDATE( bloodbro ) { tilemap_set_scrollx(bg_tilemap,0,bloodbro_scroll[0x10]); /* ? */ tilemap_set_scrolly(bg_tilemap,0,bloodbro_scroll[0x11]); /* ? */ @@ -245,7 +245,7 @@ VIDEO_UPDATE( bloodbro ) return 0; } -VIDEO_UPDATE( weststry ) +SCREEN_UPDATE( weststry ) { // tilemap_set_scrollx(bg_tilemap,0,bloodbro_scroll[0x10]); /* ? */ // tilemap_set_scrolly(bg_tilemap,0,bloodbro_scroll[0x11]); /* ? */ @@ -262,7 +262,7 @@ VIDEO_UPDATE( weststry ) } -VIDEO_UPDATE( skysmash ) +SCREEN_UPDATE( skysmash ) { tilemap_set_scrollx(bg_tilemap,0,bloodbro_scroll[0x08]); tilemap_set_scrolly(bg_tilemap,0,bloodbro_scroll[0x09]); /* ? */ diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c index 4188f470b1e..c35e9d26adf 100644 --- a/src/mame/video/blstroid.c +++ b/src/mame/video/blstroid.c @@ -143,7 +143,7 @@ void blstroid_scanline_update(screen_device &screen, int scanline) * *************************************/ -VIDEO_UPDATE( blstroid ) +SCREEN_UPDATE( blstroid ) { blstroid_state *state = screen->machine->driver_data<blstroid_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index e6e30ae7746..433beb14236 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -124,7 +124,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( blueprnt ) +SCREEN_UPDATE( blueprnt ) { blueprnt_state *state = screen->machine->driver_data<blueprnt_state>(); int i; diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index effedffa24e..3c1a683a2ce 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -151,7 +151,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( bogeyman ) +SCREEN_UPDATE( bogeyman ) { bogeyman_state *state = screen->machine->driver_data<bogeyman_state>(); diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index 46fda310bac..0f1ccbd7bc5 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -133,7 +133,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( bombjack ) +SCREEN_UPDATE( bombjack ) { bombjack_state *state = screen->machine->driver_data<bombjack_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c index 443f80becaa..254975526bc 100644 --- a/src/mame/video/boogwing.c +++ b/src/mame/video/boogwing.c @@ -137,7 +137,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( boogwing ) +SCREEN_UPDATE( boogwing ) { boogwing_state *state = screen->machine->driver_data<boogwing_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index 0fea89e3d49..1ac29922f7c 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -273,7 +273,7 @@ static void draw_stars(running_machine *machine, bitmap_t *bitmap, const rectang } -VIDEO_UPDATE( bosco ) +SCREEN_UPDATE( bosco ) { _galaga_state *state = screen->machine->driver_data<_galaga_state>(); @@ -310,7 +310,7 @@ VIDEO_UPDATE( bosco ) } -VIDEO_EOF( bosco ) +SCREEN_EOF( bosco ) { _galaga_state *state = machine->driver_data<_galaga_state>(); static const int speedsx[8] = { -1, -2, -3, 0, 3, 2, 1, 0 }; diff --git a/src/mame/video/bottom9.c b/src/mame/video/bottom9.c index 6c4d797afb0..a10d483a6a6 100644 --- a/src/mame/video/bottom9.c +++ b/src/mame/video/bottom9.c @@ -73,7 +73,7 @@ VIDEO_START( bottom9 ) ***************************************************************************/ -VIDEO_UPDATE( bottom9 ) +SCREEN_UPDATE( bottom9 ) { bottom9_state *state = screen->machine->driver_data<bottom9_state>(); diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index d4a1ea345a4..f6a33f4cdbc 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -250,7 +250,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( brkthru ) +SCREEN_UPDATE( brkthru ) { brkthru_state *state = screen->machine->driver_data<brkthru_state>(); diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index 96c5ff5f850..02cb1b1a533 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -53,7 +53,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rec } } -VIDEO_UPDATE( bsktball ) +SCREEN_UPDATE( bsktball ) { bsktball_state *state = screen->machine->driver_data<bsktball_state>(); diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c index c3da638f47d..cd70d75745d 100644 --- a/src/mame/video/btime.c +++ b/src/mame/video/btime.c @@ -422,7 +422,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r } -VIDEO_UPDATE( btime ) +SCREEN_UPDATE( btime ) { btime_state *state = screen->machine->driver_data<btime_state>(); if (state->bnj_scroll1 & 0x10) @@ -453,7 +453,7 @@ VIDEO_UPDATE( btime ) } -VIDEO_UPDATE( eggs ) +SCREEN_UPDATE( eggs ) { btime_state *state = screen->machine->driver_data<btime_state>(); draw_chars(screen->machine, bitmap, cliprect, FALSE, 0, -1); @@ -463,7 +463,7 @@ VIDEO_UPDATE( eggs ) } -VIDEO_UPDATE( lnc ) +SCREEN_UPDATE( lnc ) { btime_state *state = screen->machine->driver_data<btime_state>(); draw_chars(screen->machine, bitmap, cliprect, FALSE, 0, -1); @@ -473,7 +473,7 @@ VIDEO_UPDATE( lnc ) } -VIDEO_UPDATE( zoar ) +SCREEN_UPDATE( zoar ) { btime_state *state = screen->machine->driver_data<btime_state>(); if (state->bnj_scroll1 & 0x04) @@ -492,7 +492,7 @@ VIDEO_UPDATE( zoar ) } -VIDEO_UPDATE( bnj ) +SCREEN_UPDATE( bnj ) { btime_state *state = screen->machine->driver_data<btime_state>(); if (state->bnj_scroll1) @@ -542,7 +542,7 @@ VIDEO_UPDATE( bnj ) } -VIDEO_UPDATE( cookrace ) +SCREEN_UPDATE( cookrace ) { btime_state *state = screen->machine->driver_data<btime_state>(); int offs; @@ -574,7 +574,7 @@ VIDEO_UPDATE( cookrace ) } -VIDEO_UPDATE( disco ) +SCREEN_UPDATE( disco ) { btime_state *state = screen->machine->driver_data<btime_state>(); draw_chars(screen->machine, bitmap, cliprect, FALSE, state->btime_palette, -1); diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c index bb0d84dda99..f85dbf52ec5 100644 --- a/src/mame/video/bublbobl.c +++ b/src/mame/video/bublbobl.c @@ -10,7 +10,7 @@ #include "includes/bublbobl.h" -VIDEO_UPDATE( bublbobl ) +SCREEN_UPDATE( bublbobl ) { bublbobl_state *state = screen->machine->driver_data<bublbobl_state>(); int offs; diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c index ebd7d9778e1..230966e2ee3 100644 --- a/src/mame/video/buggychl.c +++ b/src/mame/video/buggychl.c @@ -236,7 +236,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( buggychl ) +SCREEN_UPDATE( buggychl ) { buggychl_state *state = screen->machine->driver_data<buggychl_state>(); diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 9d5f4b4bb3f..14fbaec2d57 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -288,7 +288,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bmp, const rectang } -VIDEO_UPDATE( bwing ) +SCREEN_UPDATE( bwing ) { bwing_state *state = screen->machine->driver_data<bwing_state>(); unsigned x, y, shiftx; diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index 3af140c46bc..482f9eb9d5f 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -146,7 +146,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( cabal ) +SCREEN_UPDATE( cabal ) { cabal_state *state = screen->machine->driver_data<cabal_state>(); tilemap_draw(bitmap,cliprect,state->background_layer,TILEMAP_DRAW_OPAQUE,0); diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c index 9f1af2b04a1..9746257e26c 100644 --- a/src/mame/video/calomega.c +++ b/src/mame/video/calomega.c @@ -62,7 +62,7 @@ VIDEO_START( calomega ) bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 31); } -VIDEO_UPDATE( calomega ) +SCREEN_UPDATE( calomega ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index 224e38feed5..6188f0d49a3 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -82,7 +82,7 @@ static void draw_bombs( running_machine *machine, bitmap_t *bitmap, const rectan } -VIDEO_UPDATE( canyon ) +SCREEN_UPDATE( canyon ) { canyon_state *state = screen->machine->driver_data<canyon_state>(); diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c index e40901d424c..54f5f58195f 100644 --- a/src/mame/video/capbowl.c +++ b/src/mame/video/capbowl.c @@ -165,7 +165,7 @@ INLINE rgb_t pen_for_pixel( UINT8 *src, UINT8 pix ) } -VIDEO_UPDATE( capbowl ) +SCREEN_UPDATE( capbowl ) { struct tms34061_display state; int x, y; diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index f137217f472..ada72525f40 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -93,7 +93,7 @@ VIDEO_START( carjmbre ) state->save_item(NAME(state->bgcolor)); } -VIDEO_UPDATE( carjmbre ) +SCREEN_UPDATE( carjmbre ) { carjmbre_state *state = screen->machine->driver_data<carjmbre_state>(); int offs, troffs, sx, sy, flipx, flipy; diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c index f861a8fc445..fb7fcdbef46 100644 --- a/src/mame/video/carpolo.c +++ b/src/mame/video/carpolo.c @@ -221,7 +221,7 @@ static void draw_sprite(running_machine *machine, bitmap_t *bitmap, const rectan } -VIDEO_UPDATE( carpolo ) +SCREEN_UPDATE( carpolo ) { carpolo_state *state = screen->machine->driver_data<carpolo_state>(); /* draw the playfield elements in the correct priority order */ @@ -549,7 +549,7 @@ static int check_sprite_border_collision(running_machine *machine, UINT8 x1, UIN } -VIDEO_EOF( carpolo ) +SCREEN_EOF( carpolo ) { carpolo_state *state = machine->driver_data<carpolo_state>(); int col_x, col_y; diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index f18b4c59e15..afeca454ac5 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -1590,7 +1590,7 @@ static void cave_tilemap_3_draw( running_machine *machine, bitmap_t *bitmap, con } -VIDEO_UPDATE( cave ) +SCREEN_UPDATE( cave ) { cave_state *state = screen->machine->driver_data<cave_state>(); int pri, pri2; diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index 4c5d7db33ca..b6fc11d1561 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -178,7 +178,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( cbasebal ) +SCREEN_UPDATE( cbasebal ) { cbasebal_state *state = screen->machine->driver_data<cbasebal_state>(); diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c index c50c24330a1..30931dff6df 100644 --- a/src/mame/video/cbuster.c +++ b/src/mame/video/cbuster.c @@ -113,7 +113,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /******************************************************************************/ -VIDEO_UPDATE( twocrude ) +SCREEN_UPDATE( twocrude ) { cbuster_state *state = screen->machine->driver_data<cbuster_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c index 0c0c3e73998..8ac0ccad4c3 100644 --- a/src/mame/video/ccastles.c +++ b/src/mame/video/ccastles.c @@ -265,7 +265,7 @@ WRITE8_HANDLER( ccastles_bitmode_addr_w ) * *************************************/ -VIDEO_UPDATE( ccastles ) +SCREEN_UPDATE( ccastles ) { ccastles_state *state = screen->machine->driver_data<ccastles_state>(); UINT8 *spriteaddr = &state->spriteram[state->video_control[7] * 0x100]; /* BUF1/BUF2 */ diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index 7c44b9bb9b4..86c37e7c1ef 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -664,7 +664,7 @@ static void swimmer_draw_sprites(bitmap_t *bitmap, const rectangle *cliprect, co } -VIDEO_UPDATE( cclimber ) +SCREEN_UPDATE( cclimber ) { bitmap_fill(bitmap, cliprect, CCLIMBER_BG_PEN); draw_playfield(bitmap, cliprect); @@ -687,7 +687,7 @@ VIDEO_UPDATE( cclimber ) } -VIDEO_UPDATE( yamato ) +SCREEN_UPDATE( yamato ) { int i; UINT8 *sky_rom = screen->machine->region("user1")->base() + 0x1200; @@ -721,7 +721,7 @@ VIDEO_UPDATE( yamato ) } -VIDEO_UPDATE( swimmer ) +SCREEN_UPDATE( swimmer ) { swimmer_set_background_pen(screen->machine); @@ -773,7 +773,7 @@ VIDEO_UPDATE( swimmer ) } -VIDEO_UPDATE( toprollr ) +SCREEN_UPDATE( toprollr ) { rectangle scroll_area_clip = *cliprect; scroll_area_clip.min_x = 4*8; diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index f9483dbbe63..e718d60ee71 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -429,7 +429,7 @@ WRITE8_HANDLER( mazeinv_paletteram_w ) * *************************************/ -VIDEO_UPDATE( centiped ) +SCREEN_UPDATE( centiped ) { centiped_state *state = screen->machine->driver_data<centiped_state>(); UINT8 *spriteram = screen->machine->generic.spriteram.u8; @@ -461,7 +461,7 @@ VIDEO_UPDATE( centiped ) } -VIDEO_UPDATE( warlords ) +SCREEN_UPDATE( warlords ) { centiped_state *state = screen->machine->driver_data<centiped_state>(); UINT8 *spriteram = screen->machine->generic.spriteram.u8; @@ -507,7 +507,7 @@ VIDEO_UPDATE( warlords ) } -VIDEO_UPDATE( bullsdrt ) +SCREEN_UPDATE( bullsdrt ) { centiped_state *state = screen->machine->driver_data<centiped_state>(); UINT8 *spriteram = screen->machine->generic.spriteram.u8; @@ -542,7 +542,7 @@ VIDEO_UPDATE( bullsdrt ) * This varies from Centipede, in that flipx is not in * the data, but is determined by VIDROT value at 0x2506. */ -VIDEO_UPDATE( milliped ) +SCREEN_UPDATE( milliped ) { centiped_state *state = screen->machine->driver_data<centiped_state>(); UINT8 *spriteram = screen->machine->generic.spriteram.u8; diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index e0cf0782cf6..dd9a2d62049 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -264,7 +264,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( chaknpop ) +SCREEN_UPDATE( chaknpop ) { chaknpop_state *state = screen->machine->driver_data<chaknpop_state>(); diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index 3ed4436834d..57770666e82 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -282,7 +282,7 @@ static void exctsccr_draw_sprites( running_machine *machine, bitmap_t *bitmap, c -VIDEO_UPDATE( champbas ) +SCREEN_UPDATE( champbas ) { champbas_state *state = screen->machine->driver_data<champbas_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -290,7 +290,7 @@ VIDEO_UPDATE( champbas ) return 0; } -VIDEO_UPDATE( exctsccr ) +SCREEN_UPDATE( exctsccr ) { champbas_state *state = screen->machine->driver_data<champbas_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c index 189132ec568..7c6ee2d9efe 100644 --- a/src/mame/video/changela.c +++ b/src/mame/video/changela.c @@ -722,7 +722,7 @@ static TIMER_CALLBACK( changela_scanline_callback ) state->scanline_timer->adjust(machine->primary_screen->time_until_pos(sy), sy); } -VIDEO_UPDATE( changela ) +SCREEN_UPDATE( changela ) { changela_state *state = screen->machine->driver_data<changela_state>(); copybitmap(bitmap, state->river_bitmap, 0, 0, 0, 0, cliprect); diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index ca7dfec706f..bc6dd0e0bb9 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -148,7 +148,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( cheekyms ) +SCREEN_UPDATE( cheekyms ) { cheekyms_state *state = screen->machine->driver_data<cheekyms_state>(); int y, x; diff --git a/src/mame/video/chqflag.c b/src/mame/video/chqflag.c index ef19bbac2db..99bcfae07a4 100644 --- a/src/mame/video/chqflag.c +++ b/src/mame/video/chqflag.c @@ -71,7 +71,7 @@ VIDEO_START( chqflag ) ***************************************************************************/ -VIDEO_UPDATE( chqflag ) +SCREEN_UPDATE( chqflag ) { chqflag_state *state = screen->machine->driver_data<chqflag_state>(); diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c index 96dfe07be71..f3abc1f3a50 100644 --- a/src/mame/video/cinemat.c +++ b/src/mame/video/cinemat.c @@ -213,9 +213,9 @@ VIDEO_START( cinemat_qb3color ) * *************************************/ -VIDEO_UPDATE( cinemat ) +SCREEN_UPDATE( cinemat ) { - VIDEO_UPDATE_CALL(vector); + SCREEN_UPDATE_CALL(vector); vector_clear_list(); ccpu_wdt_timer_trigger(screen->machine->device("maincpu")); @@ -231,11 +231,11 @@ VIDEO_UPDATE( cinemat ) * *************************************/ -VIDEO_UPDATE( spacewar ) +SCREEN_UPDATE( spacewar ) { int sw_option = input_port_read(screen->machine, "INPUTS"); - VIDEO_UPDATE_CALL(cinemat); + SCREEN_UPDATE_CALL(cinemat); /* set the state of the artwork */ output_set_value("pressed3", (~sw_option >> 0) & 1); diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c index 7d281b441b7..cda56ba1b52 100644 --- a/src/mame/video/circus.c +++ b/src/mame/video/circus.c @@ -113,7 +113,7 @@ static void circus_draw_fg( running_machine *machine, bitmap_t *bitmap, const re draw_line(bitmap, cliprect, 231, 192, 248, 192, 0); } -VIDEO_UPDATE( circus ) +SCREEN_UPDATE( circus ) { circus_state *state = screen->machine->driver_data<circus_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -184,7 +184,7 @@ static void robotbwl_draw_ball( running_machine *machine, bitmap_t *bitmap, cons state->clown_y + 8, state->clown_x + 8, 0); } -VIDEO_UPDATE( robotbwl ) +SCREEN_UPDATE( robotbwl ) { circus_state *state = screen->machine->driver_data<circus_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -205,7 +205,7 @@ static void crash_draw_car( running_machine *machine, bitmap_t *bitmap, const re state->clown_y, state->clown_x - 1, 0); } -VIDEO_UPDATE( crash ) +SCREEN_UPDATE( crash ) { circus_state *state = screen->machine->driver_data<circus_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -213,7 +213,7 @@ VIDEO_UPDATE( crash ) return 0; } -VIDEO_UPDATE( ripcord ) +SCREEN_UPDATE( ripcord ) { circus_state *state = screen->machine->driver_data<circus_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c index 637d0f2e96c..0a80d975f75 100644 --- a/src/mame/video/circusc.c +++ b/src/mame/video/circusc.c @@ -198,7 +198,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( circusc ) +SCREEN_UPDATE( circusc ) { circusc_state *state = screen->machine->driver_data<circusc_state>(); int i; diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index bce2fd536d7..5d549f76c85 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -1144,7 +1144,7 @@ if ( input_code_pressed(screen->machine, KEYCODE_Z) || input_code_pressed(screen Big Run **************************************************************************/ -VIDEO_UPDATE( bigrun ) +SCREEN_UPDATE( bigrun ) { int i; int megasys1_active_layers1, flag; @@ -1200,7 +1200,7 @@ VIDEO_UPDATE( bigrun ) Cisco Heat **************************************************************************/ -VIDEO_UPDATE( cischeat ) +SCREEN_UPDATE( cischeat ) { int megasys1_active_layers1, flag; @@ -1258,7 +1258,7 @@ VIDEO_UPDATE( cischeat ) F1 GrandPrix Star **************************************************************************/ -VIDEO_UPDATE( f1gpstar ) +SCREEN_UPDATE( f1gpstar ) { int megasys1_active_layers1, flag; @@ -1320,7 +1320,7 @@ VIDEO_UPDATE( f1gpstar ) Scud Hammer **************************************************************************/ -VIDEO_UPDATE( scudhamm ) +SCREEN_UPDATE( scudhamm ) { int megasys1_active_layers1, flag; megasys1_active_layers1 = megasys1_active_layers; diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index fded5668401..2dd06cb8bf2 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -140,7 +140,7 @@ INLINE void changecolor_RRRRGGGGBBBBxxxx( running_machine *machine, int color, i palette_set_color_rgb(machine, color, pal4bit(data >> 12), pal4bit(data >> 8), pal4bit(data >> 4)); } -VIDEO_UPDATE( citycon ) +SCREEN_UPDATE( citycon ) { citycon_state *state = screen->machine->driver_data<citycon_state>(); int offs, scroll; diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index 901776d0aad..776875dbaa9 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -236,7 +236,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( cloak ) +SCREEN_UPDATE( cloak ) { cloak_state *state = screen->machine->driver_data<cloak_state>(); set_pens(screen->machine); diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c index 0784f1b4c39..cfc17cc40a9 100644 --- a/src/mame/video/cloud9.c +++ b/src/mame/video/cloud9.c @@ -247,7 +247,7 @@ WRITE8_HANDLER( cloud9_bitmode_addr_w ) * *************************************/ -VIDEO_UPDATE( cloud9 ) +SCREEN_UPDATE( cloud9 ) { cloud9_state *state = screen->machine->driver_data<cloud9_state>(); UINT8 *spriteaddr = state->spriteram; diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c index e52ee1b04a5..3d155523d2c 100644 --- a/src/mame/video/clshroad.c +++ b/src/mame/video/clshroad.c @@ -326,7 +326,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ***************************************************************************/ -VIDEO_UPDATE( clshroad ) +SCREEN_UPDATE( clshroad ) { int scrollx = clshroad_vregs[ 0 ] + (clshroad_vregs[ 1 ] << 8); // int priority = clshroad_vregs[ 2 ]; diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index 2ea3edf544d..242ca088d1a 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -389,7 +389,7 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co /******************************************************************************/ -VIDEO_UPDATE( cninja ) +SCREEN_UPDATE( cninja ) { cninja_state *state = screen->machine->driver_data<cninja_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); @@ -410,7 +410,7 @@ VIDEO_UPDATE( cninja ) return 0; } -VIDEO_UPDATE( cninjabl ) +SCREEN_UPDATE( cninjabl ) { cninja_state *state = screen->machine->driver_data<cninja_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); @@ -431,7 +431,7 @@ VIDEO_UPDATE( cninjabl ) return 0; } -VIDEO_UPDATE( edrandy ) +SCREEN_UPDATE( edrandy ) { cninja_state *state = screen->machine->driver_data<cninja_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); @@ -450,7 +450,7 @@ VIDEO_UPDATE( edrandy ) return 0; } -VIDEO_UPDATE( robocop2 ) +SCREEN_UPDATE( robocop2 ) { cninja_state *state = screen->machine->driver_data<cninja_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); @@ -501,7 +501,7 @@ VIDEO_UPDATE( robocop2 ) return 0; } -VIDEO_UPDATE( mutantf ) +SCREEN_UPDATE( mutantf ) { cninja_state *state = screen->machine->driver_data<cninja_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index c4fea99f0c8..b90d7f3be34 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -403,7 +403,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( combatsc ) +SCREEN_UPDATE( combatsc ) { combatsc_state *state = screen->machine->driver_data<combatsc_state>(); int i; @@ -561,7 +561,7 @@ static void bootleg_draw_sprites( running_machine *machine, bitmap_t *bitmap, co } } -VIDEO_UPDATE( combatscb ) +SCREEN_UPDATE( combatscb ) { combatsc_state *state = screen->machine->driver_data<combatsc_state>(); int i; diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index ee4a2deec1f..6dc70b84e3f 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -135,7 +135,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( commando ) +SCREEN_UPDATE( commando ) { commando_state *state = screen->machine->driver_data<commando_state>(); @@ -145,7 +145,7 @@ VIDEO_UPDATE( commando ) return 0; } -VIDEO_EOF( commando ) +SCREEN_EOF( commando ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c index 2b45c2dd32f..0de45a35df5 100644 --- a/src/mame/video/compgolf.c +++ b/src/mame/video/compgolf.c @@ -118,7 +118,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( compgolf ) +SCREEN_UPDATE( compgolf ) { compgolf_state *state = screen->machine->driver_data<compgolf_state>(); int scrollx = state->scrollx_hi + state->scrollx_lo; diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index d2be57755fd..fd820b6f723 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -316,7 +316,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta k007121_sprites_draw(k007121, bitmap, cliprect, machine->gfx[bank], machine->colortable, source, base_color, 40, 0, (UINT32)-1); } -VIDEO_UPDATE( contra ) +SCREEN_UPDATE( contra ) { contra_state *state = screen->machine->driver_data<contra_state>(); UINT8 ctrl_1_0 = k007121_ctrlram_r(state->k007121_1, 0); diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c index f8fe2e1beaa..e322f3849ad 100644 --- a/src/mame/video/cop01.c +++ b/src/mame/video/cop01.c @@ -206,7 +206,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( cop01 ) +SCREEN_UPDATE( cop01 ) { cop01_state *state = screen->machine->driver_data<cop01_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->vreg[1] + 256 * (state->vreg[2] & 1)); diff --git a/src/mame/video/copsnrob.c b/src/mame/video/copsnrob.c index b7b3a6ac091..9c770da51bb 100644 --- a/src/mame/video/copsnrob.c +++ b/src/mame/video/copsnrob.c @@ -8,7 +8,7 @@ #include "includes/copsnrob.h" -VIDEO_UPDATE( copsnrob ) +SCREEN_UPDATE( copsnrob ) { copsnrob_state *state = screen->machine->driver_data<copsnrob_state>(); int offs, x, y; diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c index 3babe875cdd..bb99addf543 100644 --- a/src/mame/video/cosmic.c +++ b/src/mame/video/cosmic.c @@ -546,7 +546,7 @@ static void nomnlnd_draw_background( screen_device *screen, bitmap_t *bitmap, co } -VIDEO_UPDATE( cosmicg ) +SCREEN_UPDATE( cosmicg ) { bitmap_fill(bitmap, cliprect, 0); draw_bitmap(screen->machine, bitmap, cliprect); @@ -554,7 +554,7 @@ VIDEO_UPDATE( cosmicg ) } -VIDEO_UPDATE( panic ) +SCREEN_UPDATE( panic ) { bitmap_fill(bitmap, cliprect, 0); draw_bitmap(screen->machine, bitmap, cliprect); @@ -563,7 +563,7 @@ VIDEO_UPDATE( panic ) } -VIDEO_UPDATE( cosmica ) +SCREEN_UPDATE( cosmica ) { bitmap_fill(bitmap, cliprect, 0); cosmica_draw_starfield(screen, bitmap, cliprect); @@ -573,7 +573,7 @@ VIDEO_UPDATE( cosmica ) } -VIDEO_UPDATE( magspot ) +SCREEN_UPDATE( magspot ) { bitmap_fill(bitmap, cliprect, 0); draw_bitmap(screen->machine, bitmap, cliprect); @@ -582,7 +582,7 @@ VIDEO_UPDATE( magspot ) } -VIDEO_UPDATE( devzone ) +SCREEN_UPDATE( devzone ) { cosmic_state *state = screen->machine->driver_data<cosmic_state>(); @@ -597,7 +597,7 @@ VIDEO_UPDATE( devzone ) } -VIDEO_UPDATE( nomnlnd ) +SCREEN_UPDATE( nomnlnd ) { cosmic_state *state = screen->machine->driver_data<cosmic_state>(); diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index ff5433ba275..0880b694d4b 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -2794,7 +2794,7 @@ static void cps1_render_high_layer( running_machine *machine, bitmap_t *bitmap, ***************************************************************************/ -VIDEO_UPDATE( cps1 ) +SCREEN_UPDATE( cps1 ) { cps_state *state = screen->machine->driver_data<cps_state>(); int layercontrol, l0, l1, l2, l3; @@ -2946,7 +2946,7 @@ if (0 && input_code_pressed(screen->machine, KEYCODE_Z)) return 0; } -VIDEO_EOF( cps1 ) +SCREEN_EOF( cps1 ) { cps_state *state = machine->driver_data<cps_state>(); diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c index d3f2aef4d52..f9ba08903db 100644 --- a/src/mame/video/crbaloon.c +++ b/src/mame/video/crbaloon.c @@ -148,7 +148,7 @@ static void draw_sprite_and_check_collision(running_machine *machine, bitmap_t * } -VIDEO_UPDATE( crbaloon ) +SCREEN_UPDATE( crbaloon ) { crbaloon_state *state = screen->machine->driver_data<crbaloon_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c index e87fc198a3e..d0b6c315464 100644 --- a/src/mame/video/crgolf.c +++ b/src/mame/video/crgolf.c @@ -111,7 +111,7 @@ static VIDEO_START( crgolf ) * *************************************/ -static VIDEO_UPDATE( crgolf ) +static SCREEN_UPDATE( crgolf ) { crgolf_state *state = screen->machine->driver_data<crgolf_state>(); int flip = *state->screen_flip & 1; @@ -195,12 +195,11 @@ static VIDEO_UPDATE( crgolf ) MACHINE_CONFIG_FRAGMENT( crgolf_video ) MCFG_VIDEO_START(crgolf) - MCFG_VIDEO_UPDATE(crgolf) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 247) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) + MCFG_SCREEN_UPDATE(crgolf) MACHINE_CONFIG_END diff --git a/src/mame/video/crimfght.c b/src/mame/video/crimfght.c index b8698124385..59959fee6f2 100644 --- a/src/mame/video/crimfght.c +++ b/src/mame/video/crimfght.c @@ -77,7 +77,7 @@ VIDEO_START( crimfght ) ***************************************************************************/ -VIDEO_UPDATE( crimfght ) +SCREEN_UPDATE( crimfght ) { crimfght_state *state = screen->machine->driver_data<crimfght_state>(); diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c index 010c517577b..d2531318f9f 100644 --- a/src/mame/video/crospang.c +++ b/src/mame/video/crospang.c @@ -215,7 +215,7 @@ VIDEO_START( crospang ) tilemap_set_transparent_pen(state->fg_layer, 0); } -VIDEO_UPDATE( crospang ) +SCREEN_UPDATE( crospang ) { crospang_state *state = screen->machine->driver_data<crospang_state>(); tilemap_draw(bitmap, cliprect, state->bg_layer, 0, 0); diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index 4f8f7de2050..692e0e33715 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -185,7 +185,7 @@ static void draw_fg(running_machine *machine, bitmap_t *bitmap, const rectangle } -VIDEO_UPDATE( crshrace ) +SCREEN_UPDATE( crshrace ) { crshrace_state *state = screen->machine->driver_data<crshrace_state>(); @@ -217,7 +217,7 @@ VIDEO_UPDATE( crshrace ) return 0; } -VIDEO_EOF( crshrace ) +SCREEN_EOF( crshrace ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c index b851370216b..c988d1526bb 100644 --- a/src/mame/video/cvs.c +++ b/src/mame/video/cvs.c @@ -187,7 +187,7 @@ void cvs_scroll_stars( running_machine *machine ) } -VIDEO_UPDATE( cvs ) +SCREEN_UPDATE( cvs ) { cvs_state *state = screen->machine->driver_data<cvs_state>(); static const int ram_based_char_start_indices[] = { 0xe0, 0xc0, 0x100, 0x80 }; diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index 43189705b8d..a1e8461ba38 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -385,7 +385,7 @@ static void update_one_screen(screen_device &screen, bitmap_t *bitmap, const rec } -VIDEO_UPDATE( cyberbal ) +SCREEN_UPDATE( cyberbal ) { update_one_screen(*screen, bitmap, cliprect); return 0; diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index c558bd07f28..e78e9119325 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -92,7 +92,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect -VIDEO_UPDATE( darius ) +SCREEN_UPDATE( darius ) { darius_state *state = screen->machine->driver_data<darius_state>(); int xoffs = 0; diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index 0358cc6d58a..0974a29ec61 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -127,7 +127,7 @@ VIDEO_START(darkmist) tilemap_set_transparent_pen(state->txtilemap, 0); } -VIDEO_UPDATE( darkmist) +SCREEN_UPDATE( darkmist) { darkmist_state *state = screen->machine->driver_data<darkmist_state>(); UINT8 *spriteram = screen->machine->generic.spriteram.u8; diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c index 1603e0e09f8..96a08d05f73 100644 --- a/src/mame/video/darkseal.c +++ b/src/mame/video/darkseal.c @@ -289,7 +289,7 @@ VIDEO_START( darkseal ) /******************************************************************************/ -VIDEO_UPDATE( darkseal ) +SCREEN_UPDATE( darkseal ) { darkseal_state *state = screen->machine->driver_data<darkseal_state>(); state->flipscreen=!(state->control_0[0]&0x80); diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c index c7533e032fa..34a7c203a8c 100644 --- a/src/mame/video/dassault.c +++ b/src/mame/video/dassault.c @@ -172,7 +172,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect /******************************************************************************/ -VIDEO_UPDATE( dassault ) +SCREEN_UPDATE( dassault ) { dassault_state *state = screen->machine->driver_data<dassault_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c index 8f1c8526e20..135605d305d 100644 --- a/src/mame/video/dbz.c +++ b/src/mame/video/dbz.c @@ -97,7 +97,7 @@ VIDEO_START( dbz ) k053247_set_sprite_offs(state->k053246, -87, 32); } -VIDEO_UPDATE( dbz ) +SCREEN_UPDATE( dbz ) { dbz_state *state = screen->machine->driver_data<dbz_state>(); static const int K053251_CI[6] = { K053251_CI3, K053251_CI4, K053251_CI4, K053251_CI4, K053251_CI2, K053251_CI1 }; diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c index c76f106322e..cd58a0044dd 100644 --- a/src/mame/video/dc.c +++ b/src/mame/video/dc.c @@ -2575,7 +2575,7 @@ VIDEO_START(dc) } -VIDEO_UPDATE(dc) +SCREEN_UPDATE(dc) { /****************** MAME note diff --git a/src/mame/video/dcheese.c b/src/mame/video/dcheese.c index fc2c15549e2..f8c3d40e1b9 100644 --- a/src/mame/video/dcheese.c +++ b/src/mame/video/dcheese.c @@ -116,7 +116,7 @@ VIDEO_START( dcheese ) * *************************************/ -VIDEO_UPDATE( dcheese ) +SCREEN_UPDATE( dcheese ) { dcheese_state *state = screen->machine->driver_data<dcheese_state>(); int x, y; diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c index ccf5e9a096b..a464a58c56b 100644 --- a/src/mame/video/dcon.c +++ b/src/mame/video/dcon.c @@ -269,7 +269,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( dcon ) +SCREEN_UPDATE( dcon ) { bitmap_fill(screen->machine->priority_bitmap,cliprect,0); @@ -294,7 +294,7 @@ VIDEO_UPDATE( dcon ) return 0; } -VIDEO_UPDATE( sdgndmps ) +SCREEN_UPDATE( sdgndmps ) { static int last_gfx_bank=0; diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index 98612a22568..9587ea80380 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -315,7 +315,7 @@ WRITE8_HANDLER( dday_control_w ) ***************************************************************************/ -VIDEO_UPDATE( dday ) +SCREEN_UPDATE( dday ) { dday_state *state = screen->machine->driver_data<dday_state>(); diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c index fb2a545d41e..54b11b2d235 100644 --- a/src/mame/video/ddragon.c +++ b/src/mame/video/ddragon.c @@ -240,7 +240,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap,const recta #undef DRAW_SPRITE -VIDEO_UPDATE( ddragon ) +SCREEN_UPDATE( ddragon ) { ddragon_state *state = screen->machine->driver_data<ddragon_state>(); diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c index 029e75b36e1..1a2ca6da299 100644 --- a/src/mame/video/ddragon3.c +++ b/src/mame/video/ddragon3.c @@ -162,7 +162,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( ddragon3 ) +SCREEN_UPDATE( ddragon3 ) { ddragon3_state *state = screen->machine->driver_data<ddragon3_state>(); @@ -192,7 +192,7 @@ VIDEO_UPDATE( ddragon3 ) return 0; } -VIDEO_UPDATE( ctribe ) +SCREEN_UPDATE( ctribe ) { ddragon3_state *state = screen->machine->driver_data<ddragon3_state>(); diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c index ed11c363e3b..7e6897b52a2 100644 --- a/src/mame/video/ddribble.c +++ b/src/mame/video/ddribble.c @@ -250,7 +250,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect ***************************************************************************/ -VIDEO_UPDATE( ddribble ) +SCREEN_UPDATE( ddribble ) { ddribble_state *state = screen->machine->driver_data<ddribble_state>(); set_pens(screen->machine); diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c index da31d761031..0c3747b344e 100644 --- a/src/mame/video/deadang.c +++ b/src/mame/video/deadang.c @@ -128,7 +128,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( deadang ) +SCREEN_UPDATE( deadang ) { /* Setup the tilemaps */ tilemap_set_scrolly( pf3_layer,0, ((deadang_scroll_ram[0x01]&0xf0)<<4)+((deadang_scroll_ram[0x02]&0x7f)<<1)+((deadang_scroll_ram[0x02]&0x80)>>7) ); diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c index 41101aea8de..7f05d8c5f8a 100644 --- a/src/mame/video/dec0.c +++ b/src/mame/video/dec0.c @@ -338,7 +338,7 @@ static void dec0_pf3_draw(running_machine *machine,bitmap_t *bitmap,const rectan /******************************************************************************/ -VIDEO_UPDATE( hbarrel ) +SCREEN_UPDATE( hbarrel ) { dec0_state *state = screen->machine->driver_data<dec0_state>(); flip_screen_set(screen->machine, state->pf1_control_0[0]&0x80); @@ -356,7 +356,7 @@ VIDEO_UPDATE( hbarrel ) /******************************************************************************/ -VIDEO_UPDATE( baddudes ) +SCREEN_UPDATE( baddudes ) { dec0_state *state = screen->machine->driver_data<dec0_state>(); flip_screen_set(screen->machine, state->pf1_control_0[0]&0x80); @@ -395,7 +395,7 @@ VIDEO_UPDATE( baddudes ) /******************************************************************************/ -VIDEO_UPDATE( robocop ) +SCREEN_UPDATE( robocop ) { dec0_state *state = screen->machine->driver_data<dec0_state>(); int trans; @@ -441,7 +441,7 @@ VIDEO_UPDATE( robocop ) /******************************************************************************/ -VIDEO_UPDATE( birdtry ) +SCREEN_UPDATE( birdtry ) { dec0_state *state = screen->machine->driver_data<dec0_state>(); flip_screen_set(screen->machine, state->pf1_control_0[0]&0x80); @@ -457,7 +457,7 @@ VIDEO_UPDATE( birdtry ) /******************************************************************************/ -VIDEO_UPDATE( hippodrm ) +SCREEN_UPDATE( hippodrm ) { dec0_state *state = screen->machine->driver_data<dec0_state>(); flip_screen_set(screen->machine, state->pf1_control_0[0]&0x80); @@ -480,7 +480,7 @@ VIDEO_UPDATE( hippodrm ) /******************************************************************************/ -VIDEO_UPDATE( slyspy ) +SCREEN_UPDATE( slyspy ) { dec0_state *state = screen->machine->driver_data<dec0_state>(); flip_screen_set(screen->machine, state->pf1_control_0[0]&0x80); @@ -500,7 +500,7 @@ VIDEO_UPDATE( slyspy ) /******************************************************************************/ -VIDEO_UPDATE( midres ) +SCREEN_UPDATE( midres ) { dec0_state *state = screen->machine->driver_data<dec0_state>(); int trans; diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index c07211fa993..c619fc02e12 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -450,7 +450,7 @@ static void draw_characters( running_machine* machine, bitmap_t *bitmap, const r /******************************************************************************/ -VIDEO_UPDATE( cobracom ) +SCREEN_UPDATE( cobracom ) { dec8_state *state = screen->machine->driver_data<dec8_state>(); tilemap_set_scrollx(state->pf0_tilemap, 0, (state->pf0_control[0x10] << 8) + state->pf0_control[0x11]); @@ -543,7 +543,7 @@ VIDEO_START( cobracom ) /******************************************************************************/ -VIDEO_UPDATE( ghostb ) +SCREEN_UPDATE( ghostb ) { dec8_state *state = screen->machine->driver_data<dec8_state>(); if (state->pf0_control[0] & 0x4) @@ -595,7 +595,7 @@ VIDEO_START( ghostb ) /******************************************************************************/ -VIDEO_UPDATE( oscar ) +SCREEN_UPDATE( oscar ) { dec8_state *state = screen->machine->driver_data<dec8_state>(); tilemap_set_scrollx(state->pf0_tilemap,0, (state->pf0_control[0x10] << 8) + state->pf0_control[0x11]); @@ -640,7 +640,7 @@ VIDEO_START( oscar ) /******************************************************************************/ -VIDEO_UPDATE( lastmisn ) +SCREEN_UPDATE( lastmisn ) { dec8_state *state = screen->machine->driver_data<dec8_state>(); tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8)+ state->scroll2[1])); @@ -652,7 +652,7 @@ VIDEO_UPDATE( lastmisn ) return 0; } -VIDEO_UPDATE( shackled ) +SCREEN_UPDATE( shackled ) { dec8_state *state = screen->machine->driver_data<dec8_state>(); tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8) + state->scroll2[1])); @@ -729,7 +729,7 @@ VIDEO_START( shackled ) /******************************************************************************/ -VIDEO_UPDATE( srdarwin ) +SCREEN_UPDATE( srdarwin ) { dec8_state *state = screen->machine->driver_data<dec8_state>(); tilemap_set_scrollx(state->pf0_tilemap, 0, (state->scroll2[0] << 8) + state->scroll2[1]); @@ -794,7 +794,7 @@ VIDEO_START( srdarwin ) /******************************************************************************/ -VIDEO_UPDATE( gondo ) +SCREEN_UPDATE( gondo ) { dec8_state *state = screen->machine->driver_data<dec8_state>(); tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8) + state->scroll2[1])); @@ -808,7 +808,7 @@ VIDEO_UPDATE( gondo ) return 0; } -VIDEO_UPDATE( garyoret ) +SCREEN_UPDATE( garyoret ) { dec8_state *state = screen->machine->driver_data<dec8_state>(); tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8) + state->scroll2[1])); diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 5fb31e3e9d7..12917e2d821 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -1162,12 +1162,12 @@ VIDEO_START( nslasher ) /******************************************************************************/ -VIDEO_EOF( captaven ) +SCREEN_EOF( captaven ) { memcpy(machine->generic.buffered_spriteram.u32,machine->generic.spriteram.u32,machine->generic.spriteram_size); } -VIDEO_EOF( dragngun ) +SCREEN_EOF( dragngun ) { deco32_state *state = machine->driver_data<deco32_state>(); state->raster_display_position=0; @@ -1280,7 +1280,7 @@ static void combined_tilemap_draw(running_machine* machine, bitmap_t *bitmap, co /******************************************************************************/ -VIDEO_UPDATE( captaven ) +SCREEN_UPDATE( captaven ) { deco32_state *state = screen->machine->driver_data<deco32_state>(); int pf1_enable,pf2_enable,pf3_enable; @@ -1340,7 +1340,7 @@ VIDEO_UPDATE( captaven ) return 0; } -VIDEO_UPDATE( dragngun ) +SCREEN_UPDATE( dragngun ) { deco32_state *state = screen->machine->driver_data<deco32_state>(); /* Tilemap graphics banking */ @@ -1426,7 +1426,7 @@ VIDEO_UPDATE( dragngun ) return 0; } -VIDEO_UPDATE( fghthist ) +SCREEN_UPDATE( fghthist ) { deco32_state *state = screen->machine->driver_data<deco32_state>(); /* Dirty tilemaps if any globals change */ @@ -1620,7 +1620,7 @@ static void mixDualAlphaSprites(bitmap_t *bitmap, const rectangle *cliprect, con } } -VIDEO_UPDATE( nslasher ) +SCREEN_UPDATE( nslasher ) { deco32_state *state = screen->machine->driver_data<deco32_state>(); int alphaTilemap=0; diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c index 41b2c70fea7..661fdc5f237 100644 --- a/src/mame/video/deco_mlc.c +++ b/src/mame/video/deco_mlc.c @@ -509,7 +509,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan } } -VIDEO_EOF( mlc ) +SCREEN_EOF( mlc ) { deco_mlc_state *state = machine->driver_data<deco_mlc_state>(); /* Spriteram is definitely double buffered, as the vram lookup tables @@ -520,7 +520,7 @@ VIDEO_EOF( mlc ) memcpy(state->mlc_buffered_spriteram, machine->generic.spriteram.u32, 0x3000); } -VIDEO_UPDATE( mlc ) +SCREEN_UPDATE( mlc ) { // bitmap_fill(temp_bitmap,cliprect,0); bitmap_fill(bitmap,cliprect,screen->machine->pens[0]); /* Pen 0 fill colour confirmed from Skull Fang level 2 */ diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 09f2e87095b..ab1edda7a8f 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -519,7 +519,7 @@ VIDEO_START( decocass ) gfx_element_decode(machine->gfx[2], 16); } -VIDEO_UPDATE( decocass ) +SCREEN_UPDATE( decocass ) { decocass_state *state = screen->machine->driver_data<decocass_state>(); int scrollx, scrolly_l, scrolly_r; diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c index c924273bf0c..a469b3493cd 100644 --- a/src/mame/video/deniam.c +++ b/src/mame/video/deniam.c @@ -377,7 +377,7 @@ static void set_fg_page( running_machine *machine, int page, int value ) } } -VIDEO_UPDATE( deniam ) +SCREEN_UPDATE( deniam ) { deniam_state *state = screen->machine->driver_data<deniam_state>(); int bg_scrollx, bg_scrolly, fg_scrollx, fg_scrolly; diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c index dd734486f8e..5af3588ab0f 100644 --- a/src/mame/video/dietgo.c +++ b/src/mame/video/dietgo.c @@ -72,7 +72,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( dietgo ) +SCREEN_UPDATE( dietgo ) { dietgo_state *state = screen->machine->driver_data<dietgo_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index bedb2422c4e..75b4fb6761e 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -305,7 +305,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( digdug ) +SCREEN_UPDATE( digdug ) { _galaga_state *state = screen->machine->driver_data<_galaga_state>(); diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c index 1602b5585c9..6ec36659a6a 100644 --- a/src/mame/video/djboy.c +++ b/src/mame/video/djboy.c @@ -58,7 +58,7 @@ WRITE8_HANDLER( djboy_paletteram_w ) palette_set_color_rgb(space->machine, offset / 2, pal4bit(val >> 8), pal4bit(val >> 4), pal4bit(val >> 0)); } -VIDEO_UPDATE( djboy ) +SCREEN_UPDATE( djboy ) { /** * xx------ msb x @@ -81,7 +81,7 @@ VIDEO_UPDATE( djboy ) return 0; } -VIDEO_EOF( djboy ) +SCREEN_EOF( djboy ) { djboy_state *state = machine->driver_data<djboy_state>(); pandora_eof(state->pandora); diff --git a/src/mame/video/djmain.c b/src/mame/video/djmain.c index 4b457abbb5b..f78cef9bdfa 100644 --- a/src/mame/video/djmain.c +++ b/src/mame/video/djmain.c @@ -143,7 +143,7 @@ VIDEO_START( djmain ) k056832_set_layer_offs(k056832, 1, -88, -27); } -VIDEO_UPDATE( djmain ) +SCREEN_UPDATE( djmain ) { device_t *k056832 = screen->machine->device("k056832"); device_t *k055555 = screen->machine->device("k055555"); diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index 616bb3d803b..9bf4055d78f 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -974,7 +974,7 @@ VIDEO_START( dkong ) } } -VIDEO_UPDATE( dkong ) +SCREEN_UPDATE( dkong ) { dkong_state *state = screen->machine->driver_data<dkong_state>(); @@ -1002,7 +1002,7 @@ VIDEO_UPDATE( dkong ) return 0; } -VIDEO_UPDATE( pestplce ) +SCREEN_UPDATE( pestplce ) { dkong_state *state = screen->machine->driver_data<dkong_state>(); int offs; @@ -1024,7 +1024,7 @@ VIDEO_UPDATE( pestplce ) return 0; } -VIDEO_UPDATE( spclforc ) +SCREEN_UPDATE( spclforc ) { dkong_state *state = screen->machine->driver_data<dkong_state>(); diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c index 8ee824d96f9..139bb8d3510 100644 --- a/src/mame/video/docastle.c +++ b/src/mame/video/docastle.c @@ -224,7 +224,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( docastle ) +SCREEN_UPDATE( docastle ) { docastle_state *state = screen->machine->driver_data<docastle_state>(); diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c index 1383b48b7c3..f5bc84c27fc 100644 --- a/src/mame/video/dogfgt.c +++ b/src/mame/video/dogfgt.c @@ -217,7 +217,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta } -VIDEO_UPDATE( dogfgt ) +SCREEN_UPDATE( dogfgt ) { dogfgt_state *state = screen->machine->driver_data<dogfgt_state>(); int offs; diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index bdd12a326da..aeb9cb067ef 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -512,7 +512,7 @@ static void rshark_draw_sprites(running_machine *machine, bitmap_t *bitmap, cons } -VIDEO_UPDATE( lastday ) +SCREEN_UPDATE( lastday ) { dooyong_state *state = screen->machine->driver_data<dooyong_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -527,7 +527,7 @@ VIDEO_UPDATE( lastday ) return 0; } -VIDEO_UPDATE( gulfstrm ) +SCREEN_UPDATE( gulfstrm ) { dooyong_state *state = screen->machine->driver_data<dooyong_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -541,7 +541,7 @@ VIDEO_UPDATE( gulfstrm ) return 0; } -VIDEO_UPDATE( pollux ) +SCREEN_UPDATE( pollux ) { dooyong_state *state = screen->machine->driver_data<dooyong_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -555,7 +555,7 @@ VIDEO_UPDATE( pollux ) return 0; } -VIDEO_UPDATE( flytiger ) +SCREEN_UPDATE( flytiger ) { dooyong_state *state = screen->machine->driver_data<dooyong_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -578,7 +578,7 @@ VIDEO_UPDATE( flytiger ) } -VIDEO_UPDATE( bluehawk ) +SCREEN_UPDATE( bluehawk ) { dooyong_state *state = screen->machine->driver_data<dooyong_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -593,7 +593,7 @@ VIDEO_UPDATE( bluehawk ) return 0; } -VIDEO_UPDATE( primella ) +SCREEN_UPDATE( primella ) { dooyong_state *state = screen->machine->driver_data<dooyong_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -605,7 +605,7 @@ VIDEO_UPDATE( primella ) return 0; } -VIDEO_UPDATE( rshark ) +SCREEN_UPDATE( rshark ) { dooyong_state *state = screen->machine->driver_data<dooyong_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -620,7 +620,7 @@ VIDEO_UPDATE( rshark ) return 0; } -VIDEO_UPDATE( popbingo ) +SCREEN_UPDATE( popbingo ) { dooyong_state *state = screen->machine->driver_data<dooyong_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -931,14 +931,14 @@ VIDEO_START( popbingo ) } -VIDEO_EOF( dooyong ) +SCREEN_EOF( dooyong ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram_w(space, 0, 0); } -VIDEO_EOF( rshark ) +SCREEN_EOF( rshark ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/dragrace.c b/src/mame/video/dragrace.c index d5cf61b4598..7f8ec1d1511 100644 --- a/src/mame/video/dragrace.c +++ b/src/mame/video/dragrace.c @@ -47,7 +47,7 @@ VIDEO_START( dragrace ) } -VIDEO_UPDATE( dragrace ) +SCREEN_UPDATE( dragrace ) { dragrace_state *state = screen->machine->driver_data<dragrace_state>(); int y; diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c index 4e6678899ff..dd6fc98020d 100644 --- a/src/mame/video/drgnmst.c +++ b/src/mame/video/drgnmst.c @@ -139,7 +139,7 @@ VIDEO_START(drgnmst) tilemap_set_scroll_rows(state->md_tilemap, 1024); } -VIDEO_UPDATE(drgnmst) +SCREEN_UPDATE(drgnmst) { drgnmst_state *state = screen->machine->driver_data<drgnmst_state>(); int y, rowscroll_bank; diff --git a/src/mame/video/dribling.c b/src/mame/video/dribling.c index 6a4320d716a..8190aba8728 100644 --- a/src/mame/video/dribling.c +++ b/src/mame/video/dribling.c @@ -58,7 +58,7 @@ WRITE8_HANDLER( dribling_colorram_w ) * *************************************/ -VIDEO_UPDATE( dribling ) +SCREEN_UPDATE( dribling ) { dribling_state *state = screen->machine->driver_data<dribling_state>(); UINT8 *prombase = screen->machine->region("proms")->base(); diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c index 04832b05fc7..9e7cd1d9897 100644 --- a/src/mame/video/drmicro.c +++ b/src/mame/video/drmicro.c @@ -116,7 +116,7 @@ VIDEO_START( drmicro) tilemap_set_transparent_pen(state->bg2, 0); } -VIDEO_UPDATE( drmicro ) +SCREEN_UPDATE( drmicro ) { drmicro_state *state = screen->machine->driver_data<drmicro_state>(); int offs, adr, g; diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index e001e605dc2..d0a91b15e19 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -1278,7 +1278,7 @@ static int debug_viewer( running_machine *machine, bitmap_t *bitmap, const recta -VIDEO_UPDATE( hanamai ) +SCREEN_UPDATE( hanamai ) { dynax_state *state = screen->machine->driver_data<dynax_state>(); int layers_ctrl = ~state->layer_enable; @@ -1314,7 +1314,7 @@ VIDEO_UPDATE( hanamai ) } -VIDEO_UPDATE( hnoridur ) +SCREEN_UPDATE( hnoridur ) { dynax_state *state = screen->machine->driver_data<dynax_state>(); int layers_ctrl = ~BITSWAP8(state->hanamai_priority, 7, 6, 5, 4, 0, 1, 2, 3); @@ -1351,7 +1351,7 @@ VIDEO_UPDATE( hnoridur ) } -VIDEO_UPDATE( sprtmtch ) +SCREEN_UPDATE( sprtmtch ) { dynax_state *state = screen->machine->driver_data<dynax_state>(); int layers_ctrl = ~state->layer_enable; @@ -1369,7 +1369,7 @@ VIDEO_UPDATE( sprtmtch ) return 0; } -VIDEO_UPDATE( jantouki ) +SCREEN_UPDATE( jantouki ) { dynax_state *state = screen->machine->driver_data<dynax_state>(); int layers_ctrl = state->layer_enable; @@ -1400,7 +1400,7 @@ VIDEO_UPDATE( jantouki ) } -VIDEO_UPDATE( mjdialq2 ) +SCREEN_UPDATE( mjdialq2 ) { dynax_state *state = screen->machine->driver_data<dynax_state>(); int layers_ctrl = ~state->layer_enable; @@ -1425,13 +1425,13 @@ VIDEO_START(htengoku) VIDEO_START_CALL(hnoridur); } -VIDEO_UPDATE(htengoku) +SCREEN_UPDATE(htengoku) { dynax_state *state = screen->machine->driver_data<dynax_state>(); int layer, x, y; // render the layers, one by one, "dynax.c" style. Then convert the pixmaps to "ddenlovr.c" - // format and let VIDEO_UPDATE(ddenlovr) do the final compositing (priorities + palettes) + // format and let SCREEN_UPDATE(ddenlovr) do the final compositing (priorities + palettes) for (layer = 0; layer < 4; layer++) { bitmap_fill(bitmap, cliprect, 0); @@ -1442,5 +1442,5 @@ VIDEO_UPDATE(htengoku) state->ddenlovr_pixmap[3 - layer][y * 512 + x] = (UINT8)(*BITMAP_ADDR16(bitmap, y, x)); } - return VIDEO_UPDATE_CALL(ddenlovr); + return SCREEN_UPDATE_CALL(ddenlovr); } diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index f95d8644f7f..5565069b66c 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -224,7 +224,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re } } -VIDEO_UPDATE( dynduke ) +SCREEN_UPDATE( dynduke ) { /* Setup the tilemaps */ tilemap_set_scrolly( fg_layer,0, ((dynduke_scroll_ram[0x11]&0x30)<<4)+((dynduke_scroll_ram[0x12]&0x7f)<<1)+((dynduke_scroll_ram[0x12]&0x80)>>7) ); @@ -246,7 +246,7 @@ VIDEO_UPDATE( dynduke ) return 0; } -VIDEO_EOF( dynduke ) +SCREEN_EOF( dynduke ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/eolith.c b/src/mame/video/eolith.c index 12b29e514d9..88a0dc921ea 100644 --- a/src/mame/video/eolith.c +++ b/src/mame/video/eolith.c @@ -33,7 +33,7 @@ VIDEO_START( eolith ) state->vram = auto_alloc_array(machine, UINT32, 0x40000*2/4); } -VIDEO_UPDATE( eolith ) +SCREEN_UPDATE( eolith ) { eolith_state *state = screen->machine->driver_data<eolith_state>(); int y; diff --git a/src/mame/video/epos.c b/src/mame/video/epos.c index 773af94797f..99cb7ba0139 100644 --- a/src/mame/video/epos.c +++ b/src/mame/video/epos.c @@ -72,7 +72,7 @@ WRITE8_HANDLER( epos_port_1_w ) } -VIDEO_UPDATE( epos ) +SCREEN_UPDATE( epos ) { epos_state *state = screen->machine->driver_data<epos_state>(); pen_t pens[0x20]; diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c index f8d4d30d1cc..fd365ce6871 100644 --- a/src/mame/video/eprom.c +++ b/src/mame/video/eprom.c @@ -233,7 +233,7 @@ void eprom_scanline_update(screen_device &screen, int scanline) * *************************************/ -VIDEO_UPDATE( eprom ) +SCREEN_UPDATE( eprom ) { eprom_state *state = screen->machine->driver_data<eprom_state>(); atarimo_rect_list rectlist; @@ -388,7 +388,7 @@ VIDEO_UPDATE( eprom ) } -VIDEO_UPDATE( guts ) +SCREEN_UPDATE( guts ) { eprom_state *state = screen->machine->driver_data<eprom_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index b859460eebe..c8420f90b5a 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -463,7 +463,7 @@ static void splndrbt_copy_bg( running_machine *machine, bitmap_t *dst_bitmap, co -VIDEO_UPDATE( equites ) +SCREEN_UPDATE( equites ) { equites_state *state = screen->machine->driver_data<equites_state>(); bitmap_fill(bitmap, cliprect, state->bgcolor); @@ -477,7 +477,7 @@ VIDEO_UPDATE( equites ) return 0; } -VIDEO_UPDATE( splndrbt ) +SCREEN_UPDATE( splndrbt ) { equites_state *state = screen->machine->driver_data<equites_state>(); bitmap_fill(bitmap, cliprect, state->bgcolor); diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c index 71c9a4d5ceb..bb0acaa70ff 100644 --- a/src/mame/video/esd16.c +++ b/src/mame/video/esd16.c @@ -323,7 +323,7 @@ static void hedpanic_draw_sprites( running_machine *machine, bitmap_t *bitmap, c ***************************************************************************/ -VIDEO_UPDATE( esd16 ) +SCREEN_UPDATE( esd16 ) { esd16_state *state = screen->machine->driver_data<esd16_state>(); int layers_ctrl = -1; @@ -357,7 +357,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) } -VIDEO_UPDATE( hedpanic ) +SCREEN_UPDATE( hedpanic ) { esd16_state *state = screen->machine->driver_data<esd16_state>(); int layers_ctrl = -1; @@ -420,7 +420,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) } // uses older style sprites -VIDEO_UPDATE( hedpanio ) +SCREEN_UPDATE( hedpanio ) { esd16_state *state = screen->machine->driver_data<esd16_state>(); int layers_ctrl = -1; diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c index a70870cd77e..c9a13ed6a0a 100644 --- a/src/mame/video/espial.c +++ b/src/mame/video/espial.c @@ -232,7 +232,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( espial ) +SCREEN_UPDATE( espial ) { espial_state *state = screen->machine->driver_data<espial_state>(); diff --git a/src/mame/video/esripsys.c b/src/mame/video/esripsys.c index 16700fdf89d..5e968fc1e6c 100644 --- a/src/mame/video/esripsys.c +++ b/src/mame/video/esripsys.c @@ -182,7 +182,7 @@ VIDEO_START( esripsys ) state_save_register_global(machine, esripsys__12sel); } -VIDEO_UPDATE( esripsys ) +SCREEN_UPDATE( esripsys ) { int x, y; diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index d61b58a42d4..fca311d0dc8 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -217,7 +217,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( exedexes ) +SCREEN_UPDATE( exedexes ) { exedexes_state *state = screen->machine->driver_data<exedexes_state>(); if (state->sc2on) @@ -245,7 +245,7 @@ VIDEO_UPDATE( exedexes ) return 0; } -VIDEO_EOF( exedexes ) +SCREEN_EOF( exedexes ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index 36685e98d64..9117bb28f47 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -350,7 +350,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r * *************************************/ -VIDEO_UPDATE( exerion ) +SCREEN_UPDATE( exerion ) { exerion_state *state = screen->machine->driver_data<exerion_state>(); int sx, sy, offs, i; diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c index 8c4fe40836e..c1b4dc0415f 100644 --- a/src/mame/video/exidy.c +++ b/src/mame/video/exidy.c @@ -382,7 +382,7 @@ static void check_collision(running_machine *machine) * *************************************/ -VIDEO_UPDATE( exidy ) +SCREEN_UPDATE( exidy ) { /* refresh the colors from the palette (static or dynamic) */ set_colors(screen->machine); diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c index 531cf599618..9f435caf53c 100644 --- a/src/mame/video/exidy440.c +++ b/src/mame/video/exidy440.c @@ -435,7 +435,7 @@ static void update_screen(screen_device &screen, bitmap_t *bitmap, const rectang * *************************************/ -static VIDEO_UPDATE( exidy440 ) +static SCREEN_UPDATE( exidy440 ) { /* redraw the screen */ update_screen(*screen, bitmap, cliprect, 0, TRUE); @@ -467,7 +467,7 @@ static VIDEO_UPDATE( exidy440 ) } -static VIDEO_UPDATE( topsecex ) +static SCREEN_UPDATE( topsecex ) { /* redraw the screen */ update_screen(*screen, bitmap, cliprect, *topsecex_yscroll, FALSE); @@ -486,20 +486,20 @@ static VIDEO_UPDATE( topsecex ) MACHINE_CONFIG_FRAGMENT( exidy440_video ) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(exidy440) - MCFG_VIDEO_UPDATE(exidy440) MCFG_PALETTE_LENGTH(256) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(exidy440) MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( topsecex_video ) MCFG_VIDEO_ATTRIBUTES(0) MCFG_VIDEO_START(topsecex) - MCFG_VIDEO_UPDATE(topsecex) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, TOPSECEX_VBSTART) + MCFG_SCREEN_UPDATE(topsecex) MACHINE_CONFIG_END diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index 1cc7d91c404..b9ea4a90ea4 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -136,7 +136,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( exprraid ) +SCREEN_UPDATE( exprraid ) { exprraid_state *state = screen->machine->driver_data<exprraid_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c index bb96957a2f3..74cf0baba6c 100644 --- a/src/mame/video/exzisus.c +++ b/src/mame/video/exzisus.c @@ -76,7 +76,7 @@ WRITE8_HANDLER( exzisus_objectram_1_w ) Screen refresh ***************************************************************************/ -VIDEO_UPDATE( exzisus ) +SCREEN_UPDATE( exzisus ) { exzisus_state *state = screen->machine->driver_data<exzisus_state>(); int offs; diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index c7db7b4ba44..896898eac97 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -250,7 +250,7 @@ static void f1gp_draw_sprites( running_machine *machine, bitmap_t *bitmap, const } -VIDEO_UPDATE( f1gp ) +SCREEN_UPDATE( f1gp ) { f1gp_state *state = screen->machine->driver_data<f1gp_state>(); @@ -343,7 +343,7 @@ static void f1gpb_draw_sprites( running_machine *machine, bitmap_t *bitmap,const } } -VIDEO_UPDATE( f1gpb ) +SCREEN_UPDATE( f1gpb ) { f1gp_state *state = screen->machine->driver_data<f1gp_state>(); UINT32 startx, starty; @@ -444,7 +444,7 @@ static void f1gp2_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons } -VIDEO_UPDATE( f1gp2 ) +SCREEN_UPDATE( f1gp2 ) { f1gp_state *state = screen->machine->driver_data<f1gp_state>(); diff --git a/src/mame/video/fantland.c b/src/mame/video/fantland.c index a162fd42de5..4f2dd9fcf98 100644 --- a/src/mame/video/fantland.c +++ b/src/mame/video/fantland.c @@ -138,7 +138,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( fantland ) +SCREEN_UPDATE( fantland ) { bitmap_fill(bitmap,cliprect,0); draw_sprites(screen->machine,bitmap,cliprect); diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c index 86cfd66c6b9..ce10e8ce44f 100644 --- a/src/mame/video/fastfred.c +++ b/src/mame/video/fastfred.c @@ -308,7 +308,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( fastfred ) +SCREEN_UPDATE( fastfred ) { fastfred_state *state = screen->machine->driver_data<fastfred_state>(); bitmap_fill(bitmap, cliprect, *state->background_color); @@ -378,7 +378,7 @@ VIDEO_START( imago ) palette_set_color(machine,256+64+1,MAKE_RGB(0x00,0x00,0x00)); } -VIDEO_UPDATE( imago ) +SCREEN_UPDATE( imago ) { fastfred_state *state = screen->machine->driver_data<fastfred_state>(); tilemap_draw(bitmap,cliprect,state->web_tilemap,0,0); diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c index 9f3bfd20e7d..c3805fea6aa 100644 --- a/src/mame/video/fastlane.c +++ b/src/mame/video/fastlane.c @@ -155,7 +155,7 @@ WRITE8_HANDLER( fastlane_vram2_w ) ***************************************************************************/ -VIDEO_UPDATE( fastlane ) +SCREEN_UPDATE( fastlane ) { fastlane_state *state = screen->machine->driver_data<fastlane_state>(); rectangle finalclip0 = state->clip0, finalclip1 = state->clip1; diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index d5258ec0098..64a285c2128 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -134,7 +134,7 @@ WRITE8_HANDLER( fcombat_videoreg_w ) -VIDEO_UPDATE( fcombat ) +SCREEN_UPDATE( fcombat ) { fcombat_state *state = screen->machine->driver_data<fcombat_state>(); int sx, sy, offs, i; diff --git a/src/mame/video/fgoal.c b/src/mame/video/fgoal.c index fac1ca3b276..212463023e8 100644 --- a/src/mame/video/fgoal.c +++ b/src/mame/video/fgoal.c @@ -40,7 +40,7 @@ VIDEO_START( fgoal ) } -VIDEO_UPDATE( fgoal ) +SCREEN_UPDATE( fgoal ) { fgoal_state *state = screen->machine->driver_data<fgoal_state>(); const UINT8* VRAM = state->video_ram; diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c index dd473ed7087..a58e4d44e64 100644 --- a/src/mame/video/finalizr.c +++ b/src/mame/video/finalizr.c @@ -85,7 +85,7 @@ WRITE8_HANDLER( finalizr_videoctrl_w ) -VIDEO_UPDATE( finalizr ) +SCREEN_UPDATE( finalizr ) { finalizr_state *state = screen->machine->driver_data<finalizr_state>(); int offs; diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c index 8ca25cced2f..7886ac1ed06 100644 --- a/src/mame/video/firetrap.c +++ b/src/mame/video/firetrap.c @@ -271,7 +271,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( firetrap ) +SCREEN_UPDATE( firetrap ) { firetrap_state *state = screen->machine->driver_data<firetrap_state>(); tilemap_draw(bitmap, cliprect, state->bg2_tilemap, 0, 0); diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index d63836f5387..fbf066a3bfa 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -357,7 +357,7 @@ static void check_collision(firetrk_state *state, int which) } -VIDEO_UPDATE( firetrk ) +SCREEN_UPDATE( firetrk ) { firetrk_state *state = screen->machine->driver_data<firetrk_state>(); tilemap_mark_all_tiles_dirty_all(screen->machine); @@ -392,7 +392,7 @@ VIDEO_UPDATE( firetrk ) } -VIDEO_UPDATE( superbug ) +SCREEN_UPDATE( superbug ) { firetrk_state *state = screen->machine->driver_data<firetrk_state>(); tilemap_mark_all_tiles_dirty_all(screen->machine); @@ -422,7 +422,7 @@ VIDEO_UPDATE( superbug ) } -VIDEO_UPDATE( montecar ) +SCREEN_UPDATE( montecar ) { firetrk_state *state = screen->machine->driver_data<firetrk_state>(); tilemap_mark_all_tiles_dirty_all(screen->machine); diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index faa187d080a..3b11bb2dbad 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -114,7 +114,7 @@ VIDEO_START(fitfight) tilemap_set_transparent_pen(state->fof_txt_tilemap, 0); } -VIDEO_UPDATE(fitfight) +SCREEN_UPDATE(fitfight) { fitfight_state *state = screen->machine->driver_data<fitfight_state>(); diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index b26338ed4b0..813293a452b 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -132,7 +132,7 @@ WRITE8_HANDLER( flkatck_k007121_regs_w ) ***************************************************************************/ -VIDEO_UPDATE( flkatck ) +SCREEN_UPDATE( flkatck ) { flkatck_state *state = screen->machine->driver_data<flkatck_state>(); rectangle clip[2]; diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c index 0b11d617c4e..b7deca62b3e 100644 --- a/src/mame/video/flower.c +++ b/src/mame/video/flower.c @@ -161,7 +161,7 @@ VIDEO_START(flower) tilemap_set_scrolly(flower_text_right_tilemap, 0, 16); } -VIDEO_UPDATE( flower ) +SCREEN_UPDATE( flower ) { rectangle myclip = *cliprect; diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c index ea753a00319..3dec0178c88 100644 --- a/src/mame/video/flstory.c +++ b/src/mame/video/flstory.c @@ -223,7 +223,7 @@ static void flstory_draw_sprites( running_machine *machine, bitmap_t *bitmap, co } } -VIDEO_UPDATE( flstory ) +SCREEN_UPDATE( flstory ) { flstory_state *state = screen->machine->driver_data<flstory_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0 | TILEMAP_DRAW_LAYER1, 0); @@ -280,7 +280,7 @@ static void victnine_draw_sprites( running_machine *machine, bitmap_t *bitmap, c } } -VIDEO_UPDATE( victnine ) +SCREEN_UPDATE( victnine ) { flstory_state *state = screen->machine->driver_data<flstory_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -288,7 +288,7 @@ VIDEO_UPDATE( victnine ) return 0; } -VIDEO_UPDATE( rumba ) +SCREEN_UPDATE( rumba ) { flstory_state *state = screen->machine->driver_data<flstory_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0 | TILEMAP_DRAW_LAYER1, 0); diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c index 87a84a5e0a6..cb49982c317 100644 --- a/src/mame/video/foodf.c +++ b/src/mame/video/foodf.c @@ -114,7 +114,7 @@ WRITE16_HANDLER( foodf_paletteram_w ) * *************************************/ -VIDEO_UPDATE( foodf ) +SCREEN_UPDATE( foodf ) { foodf_state *state = screen->machine->driver_data<foodf_state>(); int offs; diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c index 0b67ec9dc63..d5a0ed28517 100644 --- a/src/mame/video/freekick.c +++ b/src/mame/video/freekick.c @@ -134,7 +134,7 @@ static void freekick_draw_sprites( running_machine *machine, bitmap_t *bitmap, c } } -VIDEO_UPDATE( gigas ) +SCREEN_UPDATE( gigas ) { freekick_state *state = screen->machine->driver_data<freekick_state>(); tilemap_draw(bitmap, cliprect, state->freek_tilemap, 0, 0); @@ -142,7 +142,7 @@ VIDEO_UPDATE( gigas ) return 0; } -VIDEO_UPDATE( pbillrd ) +SCREEN_UPDATE( pbillrd ) { freekick_state *state = screen->machine->driver_data<freekick_state>(); tilemap_draw(bitmap, cliprect, state->freek_tilemap, 0, 0); @@ -150,7 +150,7 @@ VIDEO_UPDATE( pbillrd ) return 0; } -VIDEO_UPDATE( freekick ) +SCREEN_UPDATE( freekick ) { freekick_state *state = screen->machine->driver_data<freekick_state>(); tilemap_draw(bitmap, cliprect, state->freek_tilemap, 0, 0); diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index 0e188abbaa2..419bfd0e0af 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -547,7 +547,7 @@ VIDEO_START( fromanc4 ) ******************************************************************************/ -VIDEO_UPDATE( fromanc2 ) +SCREEN_UPDATE( fromanc2 ) { fromanc2_state *state = screen->machine->driver_data<fromanc2_state>(); int i; diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index dc1e39f8c64..9afc75eb65a 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -422,7 +422,7 @@ static void draw_sprites( screen_device &screen, bitmap_t *bitmap, const rectang * *************************************/ -VIDEO_UPDATE( fromance ) +SCREEN_UPDATE( fromance ) { fromance_state *state = screen->machine->driver_data<fromance_state>(); @@ -437,7 +437,7 @@ VIDEO_UPDATE( fromance ) } -VIDEO_UPDATE( pipedrm ) +SCREEN_UPDATE( pipedrm ) { fromance_state *state = screen->machine->driver_data<fromance_state>(); diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index eb947c11601..9ab1fb1e4aa 100644 --- a/src/mame/video/funkybee.c +++ b/src/mame/video/funkybee.c @@ -160,7 +160,7 @@ static void draw_columns( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( funkybee ) +SCREEN_UPDATE( funkybee ) { funkybee_state *state = screen->machine->driver_data<funkybee_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c index dd8e76fdfe2..900ee841087 100644 --- a/src/mame/video/funkyjet.c +++ b/src/mame/video/funkyjet.c @@ -77,7 +77,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( funkyjet ) +SCREEN_UPDATE( funkyjet ) { funkyjet_state *state = screen->machine->driver_data<funkyjet_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c index 0ec749561a9..8890169a818 100644 --- a/src/mame/video/funworld.c +++ b/src/mame/video/funworld.c @@ -193,7 +193,7 @@ VIDEO_START(magicrd2) } -VIDEO_UPDATE(funworld) +SCREEN_UPDATE(funworld) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c index 7dee39cf7d1..08bd651481c 100644 --- a/src/mame/video/funybubl.c +++ b/src/mame/video/funybubl.c @@ -73,7 +73,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE(funybubl) +SCREEN_UPDATE(funybubl) { funybubl_state *state = screen->machine->driver_data<funybubl_state>(); int x, y, offs; diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c index 7ea534e3eba..5cf9ff136a1 100644 --- a/src/mame/video/fuukifg2.c +++ b/src/mame/video/fuukifg2.c @@ -279,7 +279,7 @@ static void fuuki16_draw_layer( running_machine *machine, bitmap_t *bitmap, cons } } -VIDEO_UPDATE( fuuki16 ) +SCREEN_UPDATE( fuuki16 ) { fuuki16_state *state = screen->machine->driver_data<fuuki16_state>(); UINT16 layer0_scrollx, layer0_scrolly; diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c index 2755606415d..7d9f7563ac2 100644 --- a/src/mame/video/fuukifg3.c +++ b/src/mame/video/fuukifg3.c @@ -312,7 +312,7 @@ static void fuuki32_draw_layer( running_machine *machine, bitmap_t *bitmap, cons } } -VIDEO_UPDATE( fuuki32 ) +SCREEN_UPDATE( fuuki32 ) { fuuki32_state *state = screen->machine->driver_data<fuuki32_state>(); UINT16 layer0_scrollx, layer0_scrolly; @@ -373,7 +373,7 @@ VIDEO_UPDATE( fuuki32 ) return 0; } -VIDEO_EOF( fuuki32 ) +SCREEN_EOF( fuuki32 ) { fuuki32_state *state = machine->driver_data<fuuki32_state>(); diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index 2a591040fb3..3e62b1229f5 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -187,7 +187,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect ***************************************************************************/ -VIDEO_UPDATE( maniacsq ) +SCREEN_UPDATE( maniacsq ) { gaelco_state *state = screen->machine->driver_data<gaelco_state>(); @@ -216,7 +216,7 @@ VIDEO_UPDATE( maniacsq ) return 0; } -VIDEO_UPDATE( bigkarnk ) +SCREEN_UPDATE( bigkarnk ) { gaelco_state *state = screen->machine->driver_data<gaelco_state>(); diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index 56fe82dbb26..a6849774f33 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -436,7 +436,7 @@ static void draw_sprites(screen_device *screen, bitmap_t *bitmap, const rectangl ***************************************************************************/ -VIDEO_UPDATE( gaelco2 ) +SCREEN_UPDATE( gaelco2 ) { gaelco2_state *state = screen->machine->driver_data<gaelco2_state>(); int i; @@ -466,7 +466,7 @@ VIDEO_UPDATE( gaelco2 ) return 0; } -VIDEO_UPDATE( gaelco2_dual ) +SCREEN_UPDATE( gaelco2_dual ) { gaelco2_state *state = screen->machine->driver_data<gaelco2_state>(); int i; @@ -510,7 +510,7 @@ VIDEO_UPDATE( gaelco2_dual ) } -VIDEO_EOF( gaelco2 ) +SCREEN_EOF( gaelco2 ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/gaelco3d.c b/src/mame/video/gaelco3d.c index 514c3fcc9ef..67c38635687 100644 --- a/src/mame/video/gaelco3d.c +++ b/src/mame/video/gaelco3d.c @@ -445,7 +445,7 @@ WRITE32_HANDLER( gaelco3d_paletteram_020_w ) * *************************************/ -VIDEO_UPDATE( gaelco3d ) +SCREEN_UPDATE( gaelco3d ) { gaelco3d_state *state = screen->machine->driver_data<gaelco3d_state>(); int x, y, ret; diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c index 48c318c2d5b..137733f9476 100644 --- a/src/mame/video/gaiden.c +++ b/src/mame/video/gaiden.c @@ -670,7 +670,7 @@ static void drgnbowl_draw_sprites(running_machine *machine, bitmap_t *bitmap, co } } -VIDEO_UPDATE( gaiden ) +SCREEN_UPDATE( gaiden ) { gaiden_state *state = screen->machine->driver_data<gaiden_state>(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -696,7 +696,7 @@ VIDEO_UPDATE( gaiden ) } -VIDEO_UPDATE( raiga ) +SCREEN_UPDATE( raiga ) { gaiden_state *state = screen->machine->driver_data<gaiden_state>(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -721,7 +721,7 @@ VIDEO_UPDATE( raiga ) return 0; } -VIDEO_UPDATE( drgnbowl ) +SCREEN_UPDATE( drgnbowl ) { gaiden_state *state = screen->machine->driver_data<gaiden_state>(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index da09150c514..5354303b591 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -566,7 +566,7 @@ static void draw_stars(running_machine *machine, bitmap_t *bitmap, const rectang } } -VIDEO_UPDATE( galaga ) +SCREEN_UPDATE( galaga ) { _galaga_state *state = screen->machine->driver_data<_galaga_state>(); @@ -579,7 +579,7 @@ VIDEO_UPDATE( galaga ) -VIDEO_EOF( galaga ) +SCREEN_EOF( galaga ) { _galaga_state *state = machine->driver_data<_galaga_state>(); /* this function is called by galaga_interrupt_1() */ diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c index 1176de2f726..d8ceeb71b4b 100644 --- a/src/mame/video/galastrm.c +++ b/src/mame/video/galastrm.c @@ -435,7 +435,7 @@ static void tc0610_rotate_draw(running_machine *machine, bitmap_t *bitmap, bitma SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( galastrm ) +SCREEN_UPDATE( galastrm ) { galastrm_state *state = screen->machine->driver_data<galastrm_state>(); device_t *tc0100scn = screen->machine->device("tc0100scn"); diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index dc426a926ae..5da06a1382f 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -500,7 +500,7 @@ static void state_save_register(running_machine *machine) * *************************************/ -VIDEO_UPDATE( galaxian ) +SCREEN_UPDATE( galaxian ) { /* draw the background layer (including stars) */ (*galaxian_draw_background_ptr)(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index 2c3f7cb9c7d..a651e755a29 100644 --- a/src/mame/video/galaxold.c +++ b/src/mame/video/galaxold.c @@ -1869,7 +1869,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, UINT8 *spri } -VIDEO_UPDATE( galaxold ) +SCREEN_UPDATE( galaxold ) { draw_background(screen->machine, bitmap, cliprect); @@ -1899,7 +1899,7 @@ VIDEO_UPDATE( galaxold ) } -VIDEO_UPDATE( dambustr ) +SCREEN_UPDATE( dambustr ) { int i, j; UINT8 color; diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index e3e0b51645f..73ff30d6a6f 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -377,7 +377,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( galivan ) +SCREEN_UPDATE( galivan ) { galivan_state *state = screen->machine->driver_data<galivan_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx[0] + 256 * (state->scrollx[1] & 0x07)); @@ -404,7 +404,7 @@ VIDEO_UPDATE( galivan ) return 0; } -VIDEO_UPDATE( ninjemak ) +SCREEN_UPDATE( ninjemak ) { galivan_state *state = screen->machine->driver_data<galivan_state>(); diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c index d995c982c12..24dd99eb3ef 100644 --- a/src/mame/video/galpani2.c +++ b/src/mame/video/galpani2.c @@ -151,7 +151,7 @@ VIDEO_START( galpani2 ) ***************************************************************************/ -VIDEO_UPDATE( galpani2 ) +SCREEN_UPDATE( galpani2 ) { int layers_ctrl = -1; diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c index 7e7ddb14761..3cfbee5a5de 100644 --- a/src/mame/video/galpanic.c +++ b/src/mame/video/galpanic.c @@ -99,7 +99,7 @@ static void draw_fgbitmap(running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( galpanic ) +SCREEN_UPDATE( galpanic ) { device_t *pandora = screen->machine->device("pandora"); @@ -113,7 +113,7 @@ VIDEO_UPDATE( galpanic ) return 0; } -VIDEO_UPDATE( comad ) +SCREEN_UPDATE( comad ) { galpanic_state *state = screen->machine->driver_data<galpanic_state>(); /* copy the temporary bitmap to the screen */ diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c index 362b13bbf44..29efda3b728 100644 --- a/src/mame/video/galspnbl.c +++ b/src/mame/video/galspnbl.c @@ -101,7 +101,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r } -VIDEO_UPDATE( galspnbl ) +SCREEN_UPDATE( galspnbl ) { galspnbl_state *state = screen->machine->driver_data<galspnbl_state>(); int offs; diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c index a3316983dda..58eb1a4607b 100644 --- a/src/mame/video/gameplan.c +++ b/src/mame/video/gameplan.c @@ -69,7 +69,7 @@ static void leprechn_get_pens( pen_t *pens ) * *************************************/ -static VIDEO_UPDATE( gameplan ) +static SCREEN_UPDATE( gameplan ) { gameplan_state *state = screen->machine->driver_data<gameplan_state>(); pen_t pens[GAMEPLAN_NUM_PENS]; @@ -89,7 +89,7 @@ static VIDEO_UPDATE( gameplan ) } -static VIDEO_UPDATE( leprechn ) +static SCREEN_UPDATE( leprechn ) { gameplan_state *state = screen->machine->driver_data<gameplan_state>(); pen_t pens[LEPRECHN_NUM_PENS]; @@ -342,21 +342,23 @@ MACHINE_CONFIG_FRAGMENT( gameplan_video ) MCFG_VIDEO_RESET(gameplan) MCFG_VIDEO_START(gameplan) - MCFG_VIDEO_UPDATE(gameplan) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(GAMEPLAN_PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(gameplan) MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( leprechn_video ) MCFG_VIDEO_START(leprechn) - MCFG_VIDEO_UPDATE(leprechn) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(leprechn) MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED( trvquest_video, gameplan_video ) MCFG_VIDEO_START(trvquest) - MCFG_VIDEO_UPDATE(gameplan) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(gameplan) MACHINE_CONFIG_END diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c index a3d5299c5d9..9eed5d75e71 100644 --- a/src/mame/video/gaplus.c +++ b/src/mame/video/gaplus.c @@ -307,7 +307,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( gaplus ) +SCREEN_UPDATE( gaplus ) { gaplus_state *state = screen->machine->driver_data<gaplus_state>(); /* flip screen control is embedded in RAM */ @@ -329,7 +329,7 @@ VIDEO_UPDATE( gaplus ) } -VIDEO_EOF( gaplus ) /* update starfields */ +SCREEN_EOF( gaplus ) /* update starfields */ { gaplus_state *state = machine->driver_data<gaplus_state>(); struct star *stars = state->stars; diff --git a/src/mame/video/gatron.c b/src/mame/video/gatron.c index ebe76f96cf3..79210690980 100644 --- a/src/mame/video/gatron.c +++ b/src/mame/video/gatron.c @@ -52,7 +52,7 @@ VIDEO_START( gat ) bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 16, 48, 16); } -VIDEO_UPDATE( gat ) +SCREEN_UPDATE( gat ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/gauntlet.c b/src/mame/video/gauntlet.c index 30a6850559d..cee8bf68a24 100644 --- a/src/mame/video/gauntlet.c +++ b/src/mame/video/gauntlet.c @@ -175,7 +175,7 @@ WRITE16_HANDLER( gauntlet_yscroll_w ) * *************************************/ -VIDEO_UPDATE( gauntlet ) +SCREEN_UPDATE( gauntlet ) { gauntlet_state *state = screen->machine->driver_data<gauntlet_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index b53162802f4..d9b56643d6f 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -168,7 +168,7 @@ static void gberet_draw_sprites( running_machine *machine, bitmap_t *bitmap, con } } -VIDEO_UPDATE( gberet ) +SCREEN_UPDATE( gberet ) { gberet_state *state = screen->machine->driver_data<gberet_state>(); @@ -224,7 +224,7 @@ static void gberetb_draw_sprites( running_machine *machine, bitmap_t *bitmap, co } } -VIDEO_UPDATE( gberetb ) +SCREEN_UPDATE( gberetb ) { gberet_state *state = screen->machine->driver_data<gberet_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); diff --git a/src/mame/video/gbusters.c b/src/mame/video/gbusters.c index 6b367be4b22..afbeffacf84 100644 --- a/src/mame/video/gbusters.c +++ b/src/mame/video/gbusters.c @@ -47,7 +47,7 @@ VIDEO_START( gbusters ) } -VIDEO_UPDATE( gbusters ) +SCREEN_UPDATE( gbusters ) { gbusters_state *state = screen->machine->driver_data<gbusters_state>(); diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c index ea1980ca2cf..edc75975525 100644 --- a/src/mame/video/gcpinbal.c +++ b/src/mame/video/gcpinbal.c @@ -248,7 +248,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( gcpinbal ) +SCREEN_UPDATE( gcpinbal ) { gcpinbal_state *state = screen->machine->driver_data<gcpinbal_state>(); int i; diff --git a/src/mame/video/gijoe.c b/src/mame/video/gijoe.c index 549423a4249..19baa33b392 100644 --- a/src/mame/video/gijoe.c +++ b/src/mame/video/gijoe.c @@ -75,7 +75,7 @@ VIDEO_START( gijoe ) state->save_item(NAME(state->layer_pri)); } -VIDEO_UPDATE( gijoe ) +SCREEN_UPDATE( gijoe ) { gijoe_state *state = screen->machine->driver_data<gijoe_state>(); static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 }; diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index 200b10a3a7b..989c56f1d23 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -245,7 +245,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta } -VIDEO_UPDATE( ginganin ) +SCREEN_UPDATE( ginganin ) { ginganin_state *state = screen->machine->driver_data<ginganin_state>(); int layers_ctrl1 = state->layers_ctrl; diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c index b89ae8395ee..bf1d547cb59 100644 --- a/src/mame/video/gladiatr.c +++ b/src/mame/video/gladiatr.c @@ -251,7 +251,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta -VIDEO_UPDATE( ppking ) +SCREEN_UPDATE( ppking ) { gladiatr_state *state = screen->machine->driver_data<gladiatr_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,0,0); @@ -287,7 +287,7 @@ VIDEO_UPDATE( ppking ) return 0; } -VIDEO_UPDATE( gladiatr ) +SCREEN_UPDATE( gladiatr ) { gladiatr_state *state = screen->machine->driver_data<gladiatr_state>(); if (state->video_attributes & 0x20) diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index 9a29419763d..082afe8a858 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -195,7 +195,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect ****************************************************************************/ -VIDEO_UPDATE( glass ) +SCREEN_UPDATE( glass ) { glass_state *state = screen->machine->driver_data<glass_state>(); /* set scroll registers */ diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index a13d4e78666..21b6d6dca1f 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -139,7 +139,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( gng ) +SCREEN_UPDATE( gng ) { gng_state *state = screen->machine->driver_data<gng_state>(); @@ -150,7 +150,7 @@ VIDEO_UPDATE( gng ) return 0; } -VIDEO_EOF( gng ) +SCREEN_EOF( gng ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c index 3872d87a0df..73644dcd1fb 100644 --- a/src/mame/video/goal92.c +++ b/src/mame/video/goal92.c @@ -151,7 +151,7 @@ VIDEO_START( goal92 ) tilemap_set_transparent_pen(state->tx_layer, 15); } -VIDEO_UPDATE( goal92 ) +SCREEN_UPDATE( goal92 ) { goal92_state *state = screen->machine->driver_data<goal92_state>(); tilemap_set_scrollx(state->bg_layer, 0, state->scrollram[0] + 60); @@ -187,7 +187,7 @@ VIDEO_UPDATE( goal92 ) return 0; } -VIDEO_EOF( goal92 ) +SCREEN_EOF( goal92 ) { memcpy(machine->generic.buffered_spriteram.u16, machine->generic.spriteram.u16, 0x400 * 2); } diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c index ca7a89da504..7a8f82bab3b 100644 --- a/src/mame/video/goindol.c +++ b/src/mame/video/goindol.c @@ -123,7 +123,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( goindol ) +SCREEN_UPDATE( goindol ) { goindol_state *state = screen->machine->driver_data<goindol_state>(); tilemap_set_scrollx(state->fg_tilemap, 0, *state->fg_scrollx); diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index b8d5bc74ece..3d59e905729 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -396,7 +396,7 @@ static const rectangle magical_visible1alt = { 0*8, (16+48)*8-1, 4*8, 16*8-1 } static const rectangle magical_visible2alt = { 0*8, (16+48)*8-1, 16*8, 28*8-1 }; -VIDEO_UPDATE( goldstar ) +SCREEN_UPDATE( goldstar ) { goldstar_state *state = screen->machine->driver_data<goldstar_state>(); int i; @@ -442,7 +442,7 @@ VIDEO_UPDATE( goldstar ) } -VIDEO_UPDATE( magical ) +SCREEN_UPDATE( magical ) { goldstar_state *state = screen->machine->driver_data<goldstar_state>(); int i; @@ -494,7 +494,7 @@ VIDEO_UPDATE( magical ) } -VIDEO_UPDATE( unkch ) +SCREEN_UPDATE( unkch ) { goldstar_state *state = screen->machine->driver_data<goldstar_state>(); int i; @@ -544,7 +544,7 @@ VIDEO_UPDATE( unkch ) return 0; } -VIDEO_UPDATE( cmast91 ) +SCREEN_UPDATE( cmast91 ) { goldstar_state *state = screen->machine->driver_data<goldstar_state>(); int i; @@ -576,7 +576,7 @@ VIDEO_UPDATE( cmast91 ) return 0; } -VIDEO_UPDATE( amcoe1a ) +SCREEN_UPDATE( amcoe1a ) { goldstar_state *state = screen->machine->driver_data<goldstar_state>(); int i; diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c index 9e281fd5699..581be0eec17 100644 --- a/src/mame/video/gomoku.c +++ b/src/mame/video/gomoku.c @@ -153,7 +153,7 @@ VIDEO_START( gomoku ) ******************************************************************************/ -VIDEO_UPDATE( gomoku ) +SCREEN_UPDATE( gomoku ) { UINT8 *GOMOKU_BG_X = screen->machine->region( "user1" )->base(); UINT8 *GOMOKU_BG_Y = screen->machine->region( "user2" )->base(); diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c index 5988ebc3e12..91270af34c4 100644 --- a/src/mame/video/gotcha.c +++ b/src/mame/video/gotcha.c @@ -135,7 +135,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( gotcha ) +SCREEN_UPDATE( gotcha ) { gotcha_state *state = screen->machine->driver_data<gotcha_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index 0f79643ce02..da2b65f7142 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -251,7 +251,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta * *************************************/ -VIDEO_UPDATE( gottlieb ) +SCREEN_UPDATE( gottlieb ) { gottlieb_state *state = screen->machine->driver_data<gottlieb_state>(); /* if the background has lower priority, render it first, else clear the screen */ diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index 19c059347b0..c526f5094cc 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -177,7 +177,7 @@ static void draw_status( running_machine *machine, bitmap_t *bitmap, const recta draw_status_row(machine, bitmap, cliprect, 34, 15); } -VIDEO_UPDATE( gotya ) +SCREEN_UPDATE( gotya ) { gotya_state *state = screen->machine->driver_data<gotya_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, -(*state->scroll + (state->scroll_bit_8 * 256)) - 2 * 8); diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c index 04404784a99..ef142c82741 100644 --- a/src/mame/video/gp9001.c +++ b/src/mame/video/gp9001.c @@ -1051,7 +1051,7 @@ void gp9001vdp_device::gp9001_render_vdp(running_machine* machine, bitmap_t* bit } -void gp9001vdp_device::gp9001_video_eof(void) +void gp9001vdp_device::gp9001_screen_eof(void) { /** Shift sprite RAM buffers *** Used to fix sprite lag **/ if (sp.use_sprite_buffer) memcpy(sp.vram16_buffer,sp.vram16,GP9001_SPRITERAM_SIZE); diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h index f7cb8ff84f2..da76b4d37fc 100644 --- a/src/mame/video/gp9001.h +++ b/src/mame/video/gp9001.h @@ -71,7 +71,7 @@ public: void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const UINT8* primap ); void gp9001_draw_custom_tilemap(running_machine* machine, bitmap_t* bitmap, tilemap_t* tilemap, const UINT8* priremap, const UINT8* pri_enable ); void gp9001_render_vdp(running_machine* machine, bitmap_t* bitmap, const rectangle* cliprect); - void gp9001_video_eof(void); + void gp9001_screen_eof(void); void create_tilemaps(int region); void init_scroll_regs(void); diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c index dc42fb459f0..f4b33391c93 100644 --- a/src/mame/video/gradius3.c +++ b/src/mame/video/gradius3.c @@ -123,7 +123,7 @@ WRITE16_HANDLER( gradius3_gfxram_w ) ***************************************************************************/ -VIDEO_UPDATE( gradius3 ) +SCREEN_UPDATE( gradius3 ) { gradius3_state *state = screen->machine->driver_data<gradius3_state>(); diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index 0baf216461e..58fcd0e8798 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -352,7 +352,7 @@ static void draw_objects(running_machine *machine, grchamp_state *state, int y, } -VIDEO_UPDATE( grchamp ) +SCREEN_UPDATE( grchamp ) { static const rgb_t objpix_lookup[8] = { diff --git a/src/mame/video/gridlee.c b/src/mame/video/gridlee.c index 742687f845f..ecda0c1efcd 100644 --- a/src/mame/video/gridlee.c +++ b/src/mame/video/gridlee.c @@ -133,7 +133,7 @@ WRITE8_HANDLER( gridlee_palette_select_w ) /* all the BALSENTE_VBEND adjustments are needed because the hardware has a seperate counting chain to address the video memory instead of using the video chain directly */ -VIDEO_UPDATE( gridlee ) +SCREEN_UPDATE( gridlee ) { gridlee_state *state = screen->machine->driver_data<gridlee_state>(); const pen_t *pens = &screen->machine->pens[state->palettebank_vis * 32]; diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c index 6514824f956..928bcbc36e6 100644 --- a/src/mame/video/groundfx.c +++ b/src/mame/video/groundfx.c @@ -199,7 +199,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( groundfx ) +SCREEN_UPDATE( groundfx ) { groundfx_state *state = screen->machine->driver_data<groundfx_state>(); device_t *tc0100scn = screen->machine->device("tc0100scn"); diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c index 0db05bb8ee8..9996b15734d 100644 --- a/src/mame/video/gstriker.c +++ b/src/mame/video/gstriker.c @@ -530,7 +530,7 @@ WRITE16_HANDLER( gsx_videoram3_w ) #endif -VIDEO_UPDATE(gstriker) +SCREEN_UPDATE(gstriker) { bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c index 5106eb9ddb5..e4ada13b348 100644 --- a/src/mame/video/gsword.c +++ b/src/mame/video/gsword.c @@ -205,7 +205,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( gsword ) +SCREEN_UPDATE( gsword ) { gsword_state *state = screen->machine->driver_data<gsword_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c index cf9a5e42a7a..c7318a9dd2e 100644 --- a/src/mame/video/gticlub.c +++ b/src/mame/video/gticlub.c @@ -981,7 +981,7 @@ VIDEO_START( gticlub ) K001005_init(machine); } -VIDEO_UPDATE( gticlub ) +SCREEN_UPDATE( gticlub ) { device_t *k001604 = screen->machine->device("k001604_1"); @@ -1049,7 +1049,7 @@ VIDEO_UPDATE( gticlub ) return 0; } -VIDEO_UPDATE( hangplt ) +SCREEN_UPDATE( hangplt ) { bitmap_fill(bitmap, cliprect, screen->machine->pens[0]); diff --git a/src/mame/video/gticlub.h b/src/mame/video/gticlub.h index 2ff02e8dced..3afc8289bce 100644 --- a/src/mame/video/gticlub.h +++ b/src/mame/video/gticlub.h @@ -15,5 +15,5 @@ READ32_HANDLER(K001006_1_r); WRITE32_HANDLER(K001006_1_w); VIDEO_START( gticlub ); -VIDEO_UPDATE( gticlub ); -VIDEO_UPDATE( hangplt ); +SCREEN_UPDATE( gticlub ); +SCREEN_UPDATE( hangplt ); diff --git a/src/mame/video/gumbo.c b/src/mame/video/gumbo.c index f7a0b364c03..b2223034754 100644 --- a/src/mame/video/gumbo.c +++ b/src/mame/video/gumbo.c @@ -42,7 +42,7 @@ VIDEO_START( gumbo ) tilemap_set_transparent_pen(state->fg_tilemap, 0xff); } -VIDEO_UPDATE( gumbo ) +SCREEN_UPDATE( gumbo ) { gumbo_state *state = screen->machine->driver_data<gumbo_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/gunbustr.c b/src/mame/video/gunbustr.c index d8e207b4f78..ea513074855 100644 --- a/src/mame/video/gunbustr.c +++ b/src/mame/video/gunbustr.c @@ -202,7 +202,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( gunbustr ) +SCREEN_UPDATE( gunbustr ) { device_t *tc0480scp = screen->machine->device("tc0480scp"); UINT8 layer[5]; diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c index f3005186444..bbb445a7a56 100644 --- a/src/mame/video/gundealr.c +++ b/src/mame/video/gundealr.c @@ -132,7 +132,7 @@ WRITE8_HANDLER( gundealr_flipscreen_w ) ***************************************************************************/ -VIDEO_UPDATE( gundealr ) +SCREEN_UPDATE( gundealr ) { gundealr_state *state = screen->machine->driver_data<gundealr_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index 8971bd6fbdc..9e52e437d0a 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -174,7 +174,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( gunsmoke ) +SCREEN_UPDATE( gunsmoke ) { gunsmoke_state *state = screen->machine->driver_data<gunsmoke_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx[0] + 256 * state->scrollx[1]); diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index 0eaf8917e4b..e0377d3bf99 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -150,7 +150,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( gyruss ) +SCREEN_UPDATE( gyruss ) { gyruss_state *state = screen->machine->driver_data<gyruss_state>(); diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c index 1730fae07a2..ebbb8b88dcb 100644 --- a/src/mame/video/hanaawas.c +++ b/src/mame/video/hanaawas.c @@ -108,7 +108,7 @@ VIDEO_START( hanaawas ) state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } -VIDEO_UPDATE( hanaawas ) +SCREEN_UPDATE( hanaawas ) { hanaawas_state *state = screen->machine->driver_data<hanaawas_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c index ef1ad10bf77..3045e04d414 100644 --- a/src/mame/video/hcastle.c +++ b/src/mame/video/hcastle.c @@ -222,7 +222,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta /*****************************************************************************/ -VIDEO_UPDATE( hcastle ) +SCREEN_UPDATE( hcastle ) { hcastle_state *state = screen->machine->driver_data<hcastle_state>(); diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c index 92c44568380..f401e70834d 100644 --- a/src/mame/video/hexion.c +++ b/src/mame/video/hexion.c @@ -165,7 +165,7 @@ WRITE8_HANDLER( hexion_gfxrom_select_w ) ***************************************************************************/ -VIDEO_UPDATE( hexion ) +SCREEN_UPDATE( hexion ) { hexion_state *state = screen->machine->driver_data<hexion_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap[1],0,0); diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c index 7ff068e3cfc..b7b3568a48a 100644 --- a/src/mame/video/higemaru.c +++ b/src/mame/video/higemaru.c @@ -145,7 +145,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( higemaru ) +SCREEN_UPDATE( higemaru ) { higemaru_state *state = screen->machine->driver_data<higemaru_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c index 0e24d37e3dc..6c59951717f 100644 --- a/src/mame/video/himesiki.c +++ b/src/mame/video/himesiki.c @@ -117,7 +117,7 @@ static void himesiki_draw_sprites( running_machine *machine, bitmap_t *bitmap, c } } -VIDEO_UPDATE( himesiki ) +SCREEN_UPDATE( himesiki ) { himesiki_state *state = screen->machine->driver_data<himesiki_state>(); int x = -(state->scrollx[0] << 8 | state->scrollx[1]) & 0x1ff; diff --git a/src/mame/video/hnayayoi.c b/src/mame/video/hnayayoi.c index 85cff46dd29..a9df21676a6 100644 --- a/src/mame/video/hnayayoi.c +++ b/src/mame/video/hnayayoi.c @@ -263,7 +263,7 @@ static void draw_layer_interleaved( running_machine *machine, bitmap_t *bitmap, } -VIDEO_UPDATE( hnayayoi ) +SCREEN_UPDATE( hnayayoi ) { hnayayoi_state *state = screen->machine->driver_data<hnayayoi_state>(); int col0 = (state->palbank >> 0) & 0x0f; diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index 080bb12161f..a2602e3e72a 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -1446,7 +1446,7 @@ static void hng64_drawtilemap(running_machine* machine, bitmap_t *bitmap, const #define IMPORTANT_DIRTY_TILEFLAG_MASK (0x0600) -VIDEO_UPDATE( hng64 ) +SCREEN_UPDATE( hng64 ) { hng64_state *state = screen->machine->driver_data<hng64_state>(); UINT32 *hng64_videoregs = state->videoregs; diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index 0cdc2889f22..086a4369eec 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -188,7 +188,7 @@ static void crzrally_draw_sprites( running_machine *machine, bitmap_t *bitmap,co } } -VIDEO_UPDATE( holeland ) +SCREEN_UPDATE( holeland ) { holeland_state *state = screen->machine->driver_data<holeland_state>(); /*tilemap_mark_all_tiles_dirty(state->bg_tilemap); */ @@ -198,7 +198,7 @@ VIDEO_UPDATE( holeland ) return 0; } -VIDEO_UPDATE( crzrally ) +SCREEN_UPDATE( crzrally ) { holeland_state *state = screen->machine->driver_data<holeland_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index 643e298c6bc..8bfa2a90342 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -837,7 +837,7 @@ WRITE8_HANDLER( pteacher_blitter_start_w ) ***************************************************************************/ -VIDEO_UPDATE( mrokumei ) +SCREEN_UPDATE( mrokumei ) { homedata_state *state = screen->machine->driver_data<homedata_state>(); int flags,width; @@ -882,7 +882,7 @@ VIDEO_UPDATE( mrokumei ) } #ifdef UNUSED_FUNCTION -VIDEO_UPDATE( reikaids ) +SCREEN_UPDATE( reikaids ) { homedata_state *state = screen->machine->driver_data<homedata_state>(); int flags; @@ -917,7 +917,7 @@ VIDEO_UPDATE( reikaids ) } #endif -VIDEO_UPDATE( reikaids ) +SCREEN_UPDATE( reikaids ) { homedata_state *state = screen->machine->driver_data<homedata_state>(); int flags; @@ -964,7 +964,7 @@ VIDEO_UPDATE( reikaids ) } -VIDEO_UPDATE( pteacher ) +SCREEN_UPDATE( pteacher ) { homedata_state *state = screen->machine->driver_data<homedata_state>(); int flags, scroll_low, scroll_high; @@ -1043,13 +1043,13 @@ VIDEO_UPDATE( pteacher ) return 0; } -VIDEO_UPDATE( mirderby ) +SCREEN_UPDATE( mirderby ) { return 0; } -VIDEO_EOF( homedata ) +SCREEN_EOF( homedata ) { homedata_state *state = machine->driver_data<homedata_state>(); state->visible_page ^= 1; diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 8a78239bef5..3d94b82eb20 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -82,7 +82,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE(homerun) +SCREEN_UPDATE(homerun) { homerun_state *state = screen->machine->driver_data<homerun_state>(); rectangle myclip = *cliprect; diff --git a/src/mame/video/hyhoo.c b/src/mame/video/hyhoo.c index 1776a9b75dc..4b26d9885c6 100644 --- a/src/mame/video/hyhoo.c +++ b/src/mame/video/hyhoo.c @@ -238,7 +238,7 @@ VIDEO_START( hyhoo ) } -VIDEO_UPDATE( hyhoo ) +SCREEN_UPDATE( hyhoo ) { if (hyhoo_dispflag) copybitmap(bitmap, hyhoo_tmpbitmap, hyhoo_flipscreen, hyhoo_flipscreen, 0, 0, cliprect); diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index a7308a162f0..47bd3dd7df0 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -174,7 +174,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( hyperspt ) +SCREEN_UPDATE( hyperspt ) { hyperspt_state *state = screen->machine->driver_data<hyperspt_state>(); int row; diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index f183405d2d3..bcb65fbe9bf 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -671,7 +671,7 @@ static void dirty_tiles( running_machine *machine, int layer, UINT16 *vram ) } -VIDEO_UPDATE( hyprduel ) +SCREEN_UPDATE( hyprduel ) { hyprduel_state *state = screen->machine->driver_data<hyprduel_state>(); int i, pri, layers_ctrl = -1; diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c index b8a9e318a45..d37d90feefb 100644 --- a/src/mame/video/ikki.c +++ b/src/mame/video/ikki.c @@ -124,7 +124,7 @@ VIDEO_START( ikki ) } -VIDEO_UPDATE( ikki ) +SCREEN_UPDATE( ikki ) { ikki_state *state = screen->machine->driver_data<ikki_state>(); offs_t offs; diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c index 75b7af97161..9981c00bb14 100644 --- a/src/mame/video/inufuku.c +++ b/src/mame/video/inufuku.c @@ -234,7 +234,7 @@ VIDEO_START( inufuku ) ******************************************************************************/ -VIDEO_UPDATE( inufuku ) +SCREEN_UPDATE( inufuku ) { inufuku_state *state = screen->machine->driver_data<inufuku_state>(); int i; diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c index e97b28fe9ab..d2338f31024 100644 --- a/src/mame/video/iqblock.c +++ b/src/mame/video/iqblock.c @@ -90,7 +90,7 @@ WRITE8_HANDLER( iqblock_fgscroll_w ) ***************************************************************************/ -VIDEO_UPDATE( iqblock ) +SCREEN_UPDATE( iqblock ) { iqblock_state *state = screen->machine->driver_data<iqblock_state>(); if (!state->videoenable) return 0; diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c index 5b6ba9447ed..f3a9398d6a3 100644 --- a/src/mame/video/irobot.c +++ b/src/mame/video/irobot.c @@ -346,7 +346,7 @@ void irobot_run_video(running_machine *machine) -VIDEO_UPDATE( irobot ) +SCREEN_UPDATE( irobot ) { irobot_state *state = screen->machine->driver_data<irobot_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index fb01e9d7202..6d905f4602e 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -239,7 +239,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( ironhors ) +SCREEN_UPDATE( ironhors ) { ironhors_state *state = screen->machine->driver_data<ironhors_state>(); int row; @@ -352,7 +352,7 @@ static void farwest_draw_sprites( running_machine *machine, bitmap_t *bitmap, co } } -VIDEO_UPDATE( farwest) +SCREEN_UPDATE( farwest) { ironhors_state *state = screen->machine->driver_data<ironhors_state>(); int row; diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c index fa6e72b74b4..004d120fb9b 100644 --- a/src/mame/video/itech32.c +++ b/src/mame/video/itech32.c @@ -1430,7 +1430,7 @@ READ32_HANDLER( itech020_video_r ) * *************************************/ -VIDEO_UPDATE( itech32 ) +SCREEN_UPDATE( itech32 ) { itech32_state *state = screen->machine->driver_data<itech32_state>(); int y; diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c index 5202b1b7ae9..076a3d6186e 100644 --- a/src/mame/video/itech8.c +++ b/src/mame/video/itech8.c @@ -621,7 +621,7 @@ TIMER_DEVICE_CALLBACK( grmatch_palette_update ) * *************************************/ -VIDEO_UPDATE( itech8_2layer ) +SCREEN_UPDATE( itech8_2layer ) { UINT32 page_offset; int x, y; @@ -657,7 +657,7 @@ VIDEO_UPDATE( itech8_2layer ) } -VIDEO_UPDATE( itech8_grmatch ) +SCREEN_UPDATE( itech8_grmatch ) { UINT32 page_offset; int x, y; @@ -704,7 +704,7 @@ VIDEO_UPDATE( itech8_grmatch ) } -VIDEO_UPDATE( itech8_2page ) +SCREEN_UPDATE( itech8_2page ) { UINT32 page_offset; int x, y; @@ -735,7 +735,7 @@ VIDEO_UPDATE( itech8_2page ) } -VIDEO_UPDATE( itech8_2page_large ) +SCREEN_UPDATE( itech8_2page_large ) { UINT32 page_offset; int x, y; diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index d5bb370aaa3..aedb52399c8 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -97,7 +97,7 @@ static void jack_draw_sprites( running_machine *machine, bitmap_t *bitmap, const } } -VIDEO_UPDATE( jack ) +SCREEN_UPDATE( jack ) { jack_state *state = screen->machine->driver_data<jack_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -182,7 +182,7 @@ static void joinem_draw_sprites( running_machine *machine, bitmap_t *bitmap, con } } -VIDEO_UPDATE( joinem ) +SCREEN_UPDATE( joinem ) { jack_state *state = screen->machine->driver_data<jack_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index 3d5344f0191..3d418486140 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -222,7 +222,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect draw_sprites_region(machine, bitmap, cliprect, sr, 0x500, 1); } -VIDEO_UPDATE( jackal ) +SCREEN_UPDATE( jackal ) { set_pens(screen->machine); draw_background(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/jaguar.c b/src/mame/video/jaguar.c index 415674f38b8..c47ebd0daab 100644 --- a/src/mame/video/jaguar.c +++ b/src/mame/video/jaguar.c @@ -926,7 +926,7 @@ VIDEO_START( cojag ) * *************************************/ -VIDEO_UPDATE( cojag ) +SCREEN_UPDATE( cojag ) { /* if not enabled, just blank */ if (!(gpu_regs[VMODE] & 1)) diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c index f2a23d7537f..cf7a4de7d73 100644 --- a/src/mame/video/jailbrek.c +++ b/src/mame/video/jailbrek.c @@ -95,7 +95,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( jailbrek ) +SCREEN_UPDATE( jailbrek ) { jailbrek_state *state = screen->machine->driver_data<jailbrek_state>(); int i; diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c index 1a35bd2a3b9..774a3852c6f 100644 --- a/src/mame/video/jedi.c +++ b/src/mame/video/jedi.c @@ -327,7 +327,7 @@ static void draw_sprites(running_machine *machine, jedi_state *state, bitmap_t * * *************************************/ -static VIDEO_UPDATE( jedi ) +static SCREEN_UPDATE( jedi ) { jedi_state *state = screen->machine->driver_data<jedi_state>(); @@ -355,14 +355,12 @@ static VIDEO_UPDATE( jedi ) *************************************/ MACHINE_CONFIG_FRAGMENT( jedi_video ) - - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(64*8, 262) /* verify vert size */ MCFG_SCREEN_VISIBLE_AREA(0*8, 37*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(jedi) MCFG_VIDEO_START(jedi) - MCFG_VIDEO_UPDATE(jedi) MACHINE_CONFIG_END diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c index 7ac51d0e7ea..6a1bde97e63 100644 --- a/src/mame/video/kan_panb.c +++ b/src/mame/video/kan_panb.c @@ -3,7 +3,7 @@ #include "emu.h" #include "kan_panb.h" -VIDEO_UPDATE( honeydol ) +SCREEN_UPDATE( honeydol ) { UINT16 *spriteram16 = screen->machine->generic.spriteram.u16; int sx=0, sy=0, x=0, y=0, offs; @@ -88,7 +88,7 @@ VIDEO_UPDATE( honeydol ) } -VIDEO_UPDATE( twinadv ) +SCREEN_UPDATE( twinadv ) { UINT16 *spriteram16 = screen->machine->generic.spriteram.u16; int sx=0, sy=0, x=0, y=0, offs; @@ -143,7 +143,7 @@ VIDEO_UPDATE( twinadv ) } -VIDEO_UPDATE( wintbob ) +SCREEN_UPDATE( wintbob ) { UINT16 *spriteram16 = screen->machine->generic.spriteram.u16; int offs; @@ -186,7 +186,7 @@ VIDEO_UPDATE( wintbob ) } -VIDEO_UPDATE( snowbro3 ) +SCREEN_UPDATE( snowbro3 ) { UINT16 *spriteram16 = screen->machine->generic.spriteram.u16; int sx=0, sy=0, x=0, y=0, offs; diff --git a/src/mame/video/kan_panb.h b/src/mame/video/kan_panb.h index 88e99818459..44d5a083038 100644 --- a/src/mame/video/kan_panb.h +++ b/src/mame/video/kan_panb.h @@ -1,4 +1,4 @@ -VIDEO_UPDATE( honeydol ); -VIDEO_UPDATE( twinadv ); -VIDEO_UPDATE( wintbob ); -VIDEO_UPDATE( snowbro3 ); +SCREEN_UPDATE( honeydol ); +SCREEN_UPDATE( twinadv ); +SCREEN_UPDATE( wintbob ); +SCREEN_UPDATE( snowbro3 ); diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index e73094d042d..a4a6314511a 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -1009,7 +1009,7 @@ static void kaneko16_fill_bitmap(running_machine *machine, bitmap_t *bitmap, con bitmap_fill(bitmap,cliprect,0); } -static VIDEO_UPDATE( common ) +static SCREEN_UPDATE( common ) { int i; @@ -1027,7 +1027,7 @@ static VIDEO_UPDATE( common ) return 0; } -VIDEO_UPDATE(berlwall) +SCREEN_UPDATE(berlwall) { // berlwall uses a 15bpp bitmap as a bg, not a solid fill kaneko16_render_15bpp_bitmap(screen->machine,bitmap,cliprect); @@ -1035,17 +1035,17 @@ VIDEO_UPDATE(berlwall) // if the display is disabled, do nothing? if (!kaneko16_disp_enable) return 0; - VIDEO_UPDATE_CALL(common); + SCREEN_UPDATE_CALL(common); kaneko16_render_sprites(screen->machine,bitmap,cliprect); return 0; } -VIDEO_UPDATE( jchan_view2 ) +SCREEN_UPDATE( jchan_view2 ) { int dx,dy; - VIDEO_UPDATE_CALL(common); + SCREEN_UPDATE_CALL(common); /* override the offsets set in common - tuned to char select in jchan2 */ dx = 25;dy = 11; @@ -1060,19 +1060,19 @@ VIDEO_UPDATE( jchan_view2 ) } -VIDEO_UPDATE( kaneko16 ) +SCREEN_UPDATE( kaneko16 ) { kaneko16_fill_bitmap(screen->machine,bitmap,cliprect); // if the display is disabled, do nothing? if (!kaneko16_disp_enable) return 0; - VIDEO_UPDATE_CALL(common); + SCREEN_UPDATE_CALL(common); kaneko16_render_sprites(screen->machine,bitmap,cliprect); return 0; } -VIDEO_UPDATE( galsnew ) +SCREEN_UPDATE( galsnew ) { // kaneko16_fill_bitmap(screen->machine,bitmap,cliprect); int y,x; @@ -1113,14 +1113,14 @@ VIDEO_UPDATE( galsnew ) // if the display is disabled, do nothing? if (!kaneko16_disp_enable) return 0; - VIDEO_UPDATE_CALL(common); + SCREEN_UPDATE_CALL(common); kaneko16_render_sprites(screen->machine,bitmap,cliprect); return 0; } -VIDEO_UPDATE( sandscrp ) +SCREEN_UPDATE( sandscrp ) { device_t *pandora = screen->machine->device("pandora"); kaneko16_fill_bitmap(screen->machine,bitmap,cliprect); @@ -1128,7 +1128,7 @@ VIDEO_UPDATE( sandscrp ) // if the display is disabled, do nothing? if (!kaneko16_disp_enable) return 0; - VIDEO_UPDATE_CALL(common); + SCREEN_UPDATE_CALL(common); // copy sprite bitmap to screen pandora_update(pandora, bitmap, cliprect); diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c index 7eda94b38fe..87140e67bbd 100644 --- a/src/mame/video/kangaroo.c +++ b/src/mame/video/kangaroo.c @@ -136,7 +136,7 @@ static void blitter_execute( running_machine *machine ) * *************************************/ -VIDEO_UPDATE( kangaroo ) +SCREEN_UPDATE( kangaroo ) { kangaroo_state *state = screen->machine->driver_data<kangaroo_state>(); UINT8 scrolly = state->video_control[6]; diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index ac58287b7c4..d04fc3825bb 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -185,7 +185,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /******************************************************************************/ -VIDEO_UPDATE( karnov ) +SCREEN_UPDATE( karnov ) { karnov_state *state = screen->machine->driver_data<karnov_state>(); draw_background(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c index 3af5e0b6528..df955dcf3cc 100644 --- a/src/mame/video/kchamp.c +++ b/src/mame/video/kchamp.c @@ -127,7 +127,7 @@ static void kchampvs_draw_sprites( running_machine *machine, bitmap_t *bitmap, c } -VIDEO_UPDATE( kchamp ) +SCREEN_UPDATE( kchamp ) { kchamp_state *state = screen->machine->driver_data<kchamp_state>(); @@ -136,7 +136,7 @@ VIDEO_UPDATE( kchamp ) return 0; } -VIDEO_UPDATE( kchampvs ) +SCREEN_UPDATE( kchampvs ) { kchamp_state *state = screen->machine->driver_data<kchamp_state>(); diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c index 4241a485861..fe2026a35ca 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -122,7 +122,7 @@ static void kickgoal_draw_sprites( running_machine *machine, bitmap_t *bitmap,co } -VIDEO_UPDATE( kickgoal ) +SCREEN_UPDATE( kickgoal ) { kickgoal_state *state = screen->machine->driver_data<kickgoal_state>(); @@ -253,7 +253,7 @@ static void actionhw_draw_sprites(running_machine *machine, bitmap_t *bitmap,con } -VIDEO_UPDATE( actionhw ) +SCREEN_UPDATE( actionhw ) { kickgoal_state *state = screen->machine->driver_data<kickgoal_state>(); /* set scroll */ diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index 109ee051880..fe43b55987d 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -246,7 +246,7 @@ static void kingofb_draw_sprites(running_machine *machine, bitmap_t *bitmap, con } } -VIDEO_UPDATE( kingofb ) +SCREEN_UPDATE( kingofb ) { kingofb_state *state = screen->machine->driver_data<kingofb_state>(); @@ -308,7 +308,7 @@ static void ringking_draw_sprites( running_machine *machine, bitmap_t *bitmap, c } } -VIDEO_UPDATE( ringking ) +SCREEN_UPDATE( ringking ) { kingofb_state *state = screen->machine->driver_data<kingofb_state>(); diff --git a/src/mame/video/klax.c b/src/mame/video/klax.c index cffa745a721..c192f5dae99 100644 --- a/src/mame/video/klax.c +++ b/src/mame/video/klax.c @@ -100,7 +100,7 @@ WRITE16_HANDLER( klax_latch_w ) * *************************************/ -VIDEO_UPDATE( klax ) +SCREEN_UPDATE( klax ) { klax_state *state = screen->machine->driver_data<klax_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 64d5ea96111..9e66b0ba17f 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -238,7 +238,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( kncljoe ) +SCREEN_UPDATE( kncljoe ) { kncljoe_state *state = screen->machine->driver_data<kncljoe_state>(); diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 1dbaa2def4d..2b8a3a143d0 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -2380,7 +2380,7 @@ VIDEO_START(racinfrc) } -VIDEO_UPDATE(konamigx) +SCREEN_UPDATE(konamigx) { int i, newbank, newbase, dirty, unchained; bitmap_t* realbitmap = bitmap; diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index 6ff0aa28bf7..35944148b31 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -7590,7 +7590,7 @@ void K053250_set_LayerOffset(int chip, int offsx, int offsy) K053250_info.chip[chip].offsy = offsy; } -// The DMA process should be instantaneous but since rendering in MAME is performed at VIDEO_UPDATE() +// The DMA process should be instantaneous but since rendering in MAME is performed at SCREEN_UPDATE() // the K053250 memory must be buffered to maintain visual integrity. static void K053250_dma(running_machine *machine, int chip, int limiter) { diff --git a/src/mame/video/konamiic.h b/src/mame/video/konamiic.h index ba6e1af8fc5..b1970490f41 100644 --- a/src/mame/video/konamiic.h +++ b/src/mame/video/konamiic.h @@ -431,7 +431,7 @@ void K054338_vh_start(running_machine *machine); WRITE16_HANDLER( K054338_word_w ); // "CLCT" registers WRITE32_HANDLER( K054338_long_w ); int K054338_read_register(int reg); -void K054338_update_all_shadows(running_machine *machine, int rushingheroes_hack); // called at the beginning of VIDEO_UPDATE() +void K054338_update_all_shadows(running_machine *machine, int rushingheroes_hack); // called at the beginning of SCREEN_UPDATE() void K054338_fill_solid_bg(bitmap_t *bitmap); // solid backcolor fill void K054338_fill_backcolor(running_machine *machine, bitmap_t *bitmap, int mode); // unified fill, 0=solid, 1=gradient int K054338_set_alpha_level(int pblend); // blend style 0-2 diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index 860c2b73bac..d50b120ac3a 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -8475,7 +8475,7 @@ INLINE const k053250_interface *k053250_get_interface( device_t *device ) DEVICE HANDLERS *****************************************************************************/ -// The DMA process should be instantaneous but since rendering in MAME is performed at VIDEO_UPDATE() +// The DMA process should be instantaneous but since rendering in MAME is performed at SCREEN_UPDATE() // the k053250 memory must be buffered to maintain visual integrity. void k053250_dma( device_t *device, int limiter ) { diff --git a/src/mame/video/konicdev.h b/src/mame/video/konicdev.h index 12d305a5ea7..801eb933ad1 100644 --- a/src/mame/video/konicdev.h +++ b/src/mame/video/konicdev.h @@ -710,7 +710,7 @@ int k055555_get_palette_index(device_t *device, int idx); WRITE16_DEVICE_HANDLER( k054338_word_w ); // "CLCT" registers WRITE32_DEVICE_HANDLER( k054338_long_w ); int k054338_register_r(device_t *device, int reg); -void k054338_update_all_shadows(device_t *device, int rushingheroes_hack); // called at the beginning of VIDEO_UPDATE() +void k054338_update_all_shadows(device_t *device, int rushingheroes_hack); // called at the beginning of SCREEN_UPDATE() void k054338_fill_solid_bg(device_t *device, bitmap_t *bitmap); // solid backcolor fill void k054338_fill_backcolor(device_t *device, bitmap_t *bitmap, int mode); // unified fill, 0=solid, 1=gradient (by using a k055555) int k054338_set_alpha_level(device_t *device, int pblend); // blend style 0-2 diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c index 2fd8b0dacef..5d359214c44 100644 --- a/src/mame/video/kopunch.c +++ b/src/mame/video/kopunch.c @@ -97,7 +97,7 @@ VIDEO_START( kopunch ) tilemap_set_scrolldx(state->bg_tilemap, 16, 16); } -VIDEO_UPDATE( kopunch ) +SCREEN_UPDATE( kopunch ) { kopunch_state *state = screen->machine->driver_data<kopunch_state>(); diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index 0ceafc00dec..f12ef2b7768 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -124,7 +124,7 @@ VIDEO_START(ksayakyu) tilemap_set_transparent_pen(state->textmap, 0); } -VIDEO_UPDATE(ksayakyu) +SCREEN_UPDATE(ksayakyu) { ksayakyu_state *state = screen->machine->driver_data<ksayakyu_state>(); diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index a6ee4f078e8..676d7f5dd00 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -220,7 +220,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( kyugo ) +SCREEN_UPDATE( kyugo ) { kyugo_state *state = screen->machine->driver_data<kyugo_state>(); diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c index ae71a50f4c8..51f037b6fd4 100644 --- a/src/mame/video/labyrunr.c +++ b/src/mame/video/labyrunr.c @@ -180,7 +180,7 @@ WRITE8_HANDLER( labyrunr_vram2_w ) ***************************************************************************/ -VIDEO_UPDATE( labyrunr ) +SCREEN_UPDATE( labyrunr ) { labyrunr_state *state = screen->machine->driver_data<labyrunr_state>(); UINT8 ctrl_0 = k007121_ctrlram_r(state->k007121, 0); diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c index 82ee0974f13..8e471581cf8 100644 --- a/src/mame/video/ladybug.c +++ b/src/mame/video/ladybug.c @@ -282,7 +282,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( ladybug ) +SCREEN_UPDATE( ladybug ) { ladybug_state *state = screen->machine->driver_data<ladybug_state>(); int offs; @@ -306,12 +306,12 @@ VIDEO_UPDATE( ladybug ) return 0; } -VIDEO_EOF( sraider ) /* update starfield position */ +SCREEN_EOF( sraider ) /* update starfield position */ { redclash_update_stars_state(machine); } -VIDEO_UPDATE( sraider ) +SCREEN_UPDATE( sraider ) { ladybug_state *state = screen->machine->driver_data<ladybug_state>(); diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index 48b8ceb3b57..691511b54d2 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -173,7 +173,7 @@ VIDEO_START( toucheme ) } -VIDEO_UPDATE( ladyfrog ) +SCREEN_UPDATE( ladyfrog ) { ladyfrog_state *state = screen->machine->driver_data<ladyfrog_state>(); diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index d6241a315e5..d149880e61f 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -365,7 +365,7 @@ static void draw_lasso( running_machine *machine, bitmap_t *bitmap, const rectan } -VIDEO_UPDATE( lasso ) +SCREEN_UPDATE( lasso ) { lasso_state *state = screen->machine->driver_data<lasso_state>(); palette_set_color(screen->machine, 0, get_color(*state->back_color)); @@ -378,7 +378,7 @@ VIDEO_UPDATE( lasso ) return 0; } -VIDEO_UPDATE( chameleo ) +SCREEN_UPDATE( chameleo ) { lasso_state *state = screen->machine->driver_data<lasso_state>(); palette_set_color(screen->machine, 0, get_color(*state->back_color)); @@ -391,7 +391,7 @@ VIDEO_UPDATE( chameleo ) } -VIDEO_UPDATE( wwjgtin ) +SCREEN_UPDATE( wwjgtin ) { lasso_state *state = screen->machine->driver_data<lasso_state>(); colortable_palette_set_color(screen->machine->colortable, 0, get_color(*state->back_color)); @@ -412,7 +412,7 @@ VIDEO_UPDATE( wwjgtin ) } -VIDEO_UPDATE( pinbo ) +SCREEN_UPDATE( pinbo ) { lasso_state *state = screen->machine->driver_data<lasso_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index d954c677e44..de95b0c14dd 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -269,7 +269,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( lastduel ) +SCREEN_UPDATE( lastduel ) { lastduel_state *state = screen->machine->driver_data<lastduel_state>(); @@ -282,7 +282,7 @@ VIDEO_UPDATE( lastduel ) return 0; } -VIDEO_UPDATE( madgear ) +SCREEN_UPDATE( madgear ) { lastduel_state *state = screen->machine->driver_data<lastduel_state>(); @@ -306,7 +306,7 @@ VIDEO_UPDATE( madgear ) return 0; } -VIDEO_EOF( lastduel ) +SCREEN_EOF( lastduel ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/lazercmd.c b/src/mame/video/lazercmd.c index 6e2f4749364..611d96e8cbb 100644 --- a/src/mame/video/lazercmd.c +++ b/src/mame/video/lazercmd.c @@ -50,7 +50,7 @@ static void plot_pattern( running_machine *machine, bitmap_t *bitmap, int x, int } -VIDEO_UPDATE( lazercmd ) +SCREEN_UPDATE( lazercmd ) { lazercmd_state *state = screen->machine->driver_data<lazercmd_state>(); int i, x, y; diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c index 281b3387685..f028de19254 100644 --- a/src/mame/video/legionna.c +++ b/src/mame/video/legionna.c @@ -406,7 +406,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan #define LAYER_DB 0 -VIDEO_UPDATE( legionna ) +SCREEN_UPDATE( legionna ) { /* Setup the tilemaps */ tilemap_set_scrollx( background_layer, 0, legionna_scrollram16[0] ); @@ -435,7 +435,7 @@ VIDEO_UPDATE( legionna ) } -VIDEO_UPDATE( godzilla ) +SCREEN_UPDATE( godzilla ) { // tilemap_set_scrollx( text_layer, 0, 0 ); // tilemap_set_scrolly( text_layer, 0, 112 ); @@ -463,7 +463,7 @@ VIDEO_UPDATE( godzilla ) return 0; } -VIDEO_UPDATE( grainbow ) +SCREEN_UPDATE( grainbow ) { /* Setup the tilemaps */ tilemap_set_scrollx( background_layer, 0, legionna_scrollram16[0] ); diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c index a18068f2290..c1713ab7597 100644 --- a/src/mame/video/leland.c +++ b/src/mame/video/leland.c @@ -402,7 +402,7 @@ READ8_HANDLER( ataxx_svram_port_r ) * *************************************/ -static VIDEO_UPDATE( leland ) +static SCREEN_UPDATE( leland ) { int y; @@ -470,7 +470,7 @@ static VIDEO_UPDATE( leland ) * *************************************/ -static VIDEO_UPDATE( ataxx ) +static SCREEN_UPDATE( ataxx ) { int y; @@ -539,7 +539,6 @@ MACHINE_CONFIG_FRAGMENT( leland_video ) MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_VIDEO_START(leland) - MCFG_VIDEO_UPDATE(leland) MCFG_PALETTE_LENGTH(1024) @@ -548,11 +547,12 @@ MACHINE_CONFIG_FRAGMENT( leland_video ) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_UPDATE(leland) MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED( ataxx_video, leland_video ) - MCFG_VIDEO_START(ataxx) - MCFG_VIDEO_UPDATE(ataxx) + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE(ataxx) MACHINE_CONFIG_END diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c index b23e191b6eb..3cdb0b6650b 100644 --- a/src/mame/video/lemmings.c +++ b/src/mame/video/lemmings.c @@ -105,7 +105,7 @@ VIDEO_START( lemmings ) state->save_pointer(NAME(state->sprite_triple_buffer_1), 0x800 / 2); } -VIDEO_EOF( lemmings ) +SCREEN_EOF( lemmings ) { lemmings_state *state = machine->driver_data<lemmings_state>(); @@ -166,7 +166,7 @@ WRITE16_HANDLER( lemmings_vram_w ) tilemap_mark_tile_dirty(state->vram_tilemap, offset); } -VIDEO_UPDATE( lemmings ) +SCREEN_UPDATE( lemmings ) { lemmings_state *state = screen->machine->driver_data<lemmings_state>(); int x1 = -state->control_data[0]; diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c index 20bd4052d39..c0ce3a545bc 100644 --- a/src/mame/video/lethal.c +++ b/src/mame/video/lethal.c @@ -102,7 +102,7 @@ WRITE8_HANDLER(lethalen_palette_control) } } -VIDEO_UPDATE(lethalen) +SCREEN_UPDATE(lethalen) { lethal_state *state = screen->machine->driver_data<lethal_state>(); diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index e7268ddfb68..c8221d20385 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -512,7 +512,7 @@ static void prosoccr_draw_sprites( running_machine *machine, bitmap_t *bitmap, c /***************************************************************************/ -VIDEO_UPDATE( prosoccr ) +SCREEN_UPDATE( prosoccr ) { liberate_state *state = screen->machine->driver_data<liberate_state>(); tilemap_set_scrolly(state->back_tilemap, 0, state->io_ram[1]); @@ -529,7 +529,7 @@ VIDEO_UPDATE( prosoccr ) return 0; } -VIDEO_UPDATE( prosport ) +SCREEN_UPDATE( prosport ) { liberate_state *state = screen->machine->driver_data<liberate_state>(); UINT8 *videoram = state->videoram; @@ -573,7 +573,7 @@ VIDEO_UPDATE( prosport ) return 0; } -VIDEO_UPDATE( boomrang ) +SCREEN_UPDATE( boomrang ) { liberate_state *state = screen->machine->driver_data<liberate_state>(); tilemap_set_scrolly(state->back_tilemap, 0, state->io_ram[1]); @@ -593,7 +593,7 @@ VIDEO_UPDATE( boomrang ) return 0; } -VIDEO_UPDATE( liberate ) +SCREEN_UPDATE( liberate ) { liberate_state *state = screen->machine->driver_data<liberate_state>(); tilemap_set_scrolly(state->back_tilemap, 0, state->io_ram[1]); diff --git a/src/mame/video/liberatr.c b/src/mame/video/liberatr.c index adedf7b4aac..11075694626 100644 --- a/src/mame/video/liberatr.c +++ b/src/mame/video/liberatr.c @@ -296,7 +296,7 @@ void liberatr_state::draw_bitmap(bitmap_t &bitmap, pen_t *pens) } -bool liberatr_state::video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) +bool liberatr_state::screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) { pen_t pens[NUM_PENS]; get_pens(pens); diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index 523d0f010a5..091fa4d6513 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -172,7 +172,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( lkage ) +SCREEN_UPDATE( lkage ) { lkage_state *state = screen->machine->driver_data<lkage_state>(); int bank; diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index 1d69da1572e..ef80d871a26 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -929,7 +929,7 @@ VIDEO_START( lockon ) state->save_pointer(NAME(state->obj_pal_ram), 2048); } -VIDEO_UPDATE( lockon ) +SCREEN_UPDATE( lockon ) { lockon_state *state = screen->machine->driver_data<lockon_state>(); @@ -952,7 +952,7 @@ VIDEO_UPDATE( lockon ) return 0; } -VIDEO_EOF( lockon ) +SCREEN_EOF( lockon ) { lockon_state *state = machine->driver_data<lockon_state>(); diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index 5c6a4dec7e7..f3150f05b3a 100644 --- a/src/mame/video/lordgun.c +++ b/src/mame/video/lordgun.c @@ -362,7 +362,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ***************************************************************************/ -VIDEO_UPDATE( lordgun ) +SCREEN_UPDATE( lordgun ) { lordgun_state *state = screen->machine->driver_data<lordgun_state>(); int layers_ctrl = -1; diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c index 24a092289bd..3e000f90e26 100644 --- a/src/mame/video/lsasquad.c +++ b/src/mame/video/lsasquad.c @@ -198,7 +198,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( lsasquad ) +SCREEN_UPDATE( lsasquad ) { lsasquad_state *state = screen->machine->driver_data<lsasquad_state>(); bitmap_fill(bitmap, cliprect, 511); @@ -211,7 +211,7 @@ VIDEO_UPDATE( lsasquad ) } -VIDEO_UPDATE( daikaiju ) +SCREEN_UPDATE( daikaiju ) { bitmap_fill(bitmap, cliprect, 511); drawbg(screen->machine, bitmap, cliprect, 0); // bottom diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c index 445b71a8881..fcbb65ea581 100644 --- a/src/mame/video/lucky74.c +++ b/src/mame/video/lucky74.c @@ -238,7 +238,7 @@ VIDEO_START( lucky74 ) tilemap_set_transparent_pen(fg_tilemap, 0); } -VIDEO_UPDATE( lucky74 ) +SCREEN_UPDATE( lucky74 ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); diff --git a/src/mame/video/lvcards.c b/src/mame/video/lvcards.c index 7a88719a458..51f1492a343 100644 --- a/src/mame/video/lvcards.c +++ b/src/mame/video/lvcards.c @@ -111,7 +111,7 @@ VIDEO_START( lvcards ) 8, 8, 32, 32); } -VIDEO_UPDATE( lvcards ) +SCREEN_UPDATE( lvcards ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index 1708ccf71ea..c391076e341 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -269,7 +269,7 @@ static void trojan_draw_sprites( running_machine *machine, bitmap_t *bitmap, con } } -VIDEO_UPDATE( lwings ) +SCREEN_UPDATE( lwings ) { lwings_state *state = screen->machine->driver_data<lwings_state>(); @@ -279,7 +279,7 @@ VIDEO_UPDATE( lwings ) return 0; } -VIDEO_UPDATE( trojan ) +SCREEN_UPDATE( trojan ) { lwings_state *state = screen->machine->driver_data<lwings_state>(); @@ -291,7 +291,7 @@ VIDEO_UPDATE( trojan ) return 0; } -VIDEO_EOF( lwings ) +SCREEN_EOF( lwings ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 50c6fadd43c..d1101b2783a 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -137,7 +137,7 @@ VIDEO_START( m15 ) ***************************************************************************/ -VIDEO_UPDATE( m10 ) +SCREEN_UPDATE( m10 ) { m10_state *state = screen->machine->driver_data<m10_state>(); int offs; @@ -177,7 +177,7 @@ VIDEO_UPDATE( m10 ) ***************************************************************************/ -VIDEO_UPDATE( m15 ) +SCREEN_UPDATE( m15 ) { m10_state *state = screen->machine->driver_data<m10_state>(); int offs; diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c index 13ef81b46d1..5e6bf5d0c50 100644 --- a/src/mame/video/m107.c +++ b/src/mame/video/m107.c @@ -387,7 +387,7 @@ WRITE16_HANDLER( m107_spritebuffer_w ) /*****************************************************************************/ -VIDEO_UPDATE( m107 ) +SCREEN_UPDATE( m107 ) { m107_update_scroll_positions(screen->machine); m107_screenrefresh(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index 979a40c9d0a..69c91c155b7 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -360,7 +360,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re * *************************************/ -VIDEO_UPDATE( m52 ) +SCREEN_UPDATE( m52 ) { m52_state *state = screen->machine->driver_data<m52_state>(); int offs; diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index 15da7d780ec..8425f31e301 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -267,7 +267,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta * *************************************/ -VIDEO_UPDATE( m57 ) +SCREEN_UPDATE( m57 ) { draw_background(screen->machine, bitmap, cliprect); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index 622e3cbede3..15bc4d68cd7 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -312,7 +312,7 @@ static void draw_panel( running_machine *machine, bitmap_t *bitmap, const rectan * *************************************/ -VIDEO_UPDATE( yard ) +SCREEN_UPDATE( yard ) { m58_state *state = screen->machine->driver_data<m58_state>(); diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index 06078bb6336..3b0ec6a15c9 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -452,7 +452,7 @@ VIDEO_START( kungfum ) m62_start(machine, get_kungfum_bg_tile_info, 32, 0, 8, 8, 64, 32); } -VIDEO_UPDATE( kungfum ) +SCREEN_UPDATE( kungfum ) { m62_state *state = screen->machine->driver_data<m62_state>(); int i; @@ -501,7 +501,7 @@ VIDEO_START( ldrun ) tilemap_set_transmask(state->bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } -VIDEO_UPDATE( ldrun ) +SCREEN_UPDATE( ldrun ) { m62_state *state = screen->machine->driver_data<m62_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); @@ -549,10 +549,10 @@ WRITE8_HANDLER( ldrun3_topbottom_mask_w ) state->ldrun3_topbottom_mask = data & 1; } -VIDEO_UPDATE( ldrun3 ) +SCREEN_UPDATE( ldrun3 ) { m62_state *state = screen->machine->driver_data<m62_state>(); - VIDEO_UPDATE_CALL(ldrun); + SCREEN_UPDATE_CALL(ldrun); if (state->ldrun3_topbottom_mask) { @@ -610,7 +610,7 @@ VIDEO_START( battroad ) tilemap_set_transmask(state->bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } -VIDEO_UPDATE( battroad ) +SCREEN_UPDATE( battroad ) { m62_state *state = screen->machine->driver_data<m62_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); @@ -645,7 +645,7 @@ VIDEO_START( ldrun4 ) m62_start(machine, get_ldrun4_bg_tile_info, 1, 0, 8, 8, 64, 32); } -VIDEO_UPDATE( ldrun4 ) +SCREEN_UPDATE( ldrun4 ) { m62_state *state = screen->machine->driver_data<m62_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll - 2); @@ -688,7 +688,7 @@ VIDEO_START( lotlot ) m62_textlayer(machine, get_lotlot_fg_tile_info, 1, 1, 12, 10, 32, 64); } -VIDEO_UPDATE( lotlot ) +SCREEN_UPDATE( lotlot ) { m62_state *state = screen->machine->driver_data<m62_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll - 64); @@ -760,7 +760,7 @@ VIDEO_START( kidniki ) m62_textlayer(machine, get_kidniki_fg_tile_info, 1, 1, 12, 8, 32, 64); } -VIDEO_UPDATE( kidniki ) +SCREEN_UPDATE( kidniki ) { m62_state *state = screen->machine->driver_data<m62_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); @@ -814,7 +814,7 @@ VIDEO_START( spelunkr ) m62_textlayer(machine, get_spelunkr_fg_tile_info, 1, 1, 12, 8, 32, 32); } -VIDEO_UPDATE( spelunkr ) +SCREEN_UPDATE( spelunkr ) { m62_state *state = screen->machine->driver_data<m62_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); @@ -859,7 +859,7 @@ VIDEO_START( spelunk2 ) m62_textlayer(machine, get_spelunkr_fg_tile_info, 1, 1, 12, 8, 32, 32); } -VIDEO_UPDATE( spelunk2 ) +SCREEN_UPDATE( spelunk2 ) { m62_state *state = screen->machine->driver_data<m62_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll - 1); @@ -908,7 +908,7 @@ VIDEO_START( youjyudn ) tilemap_set_transmask(state->bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } -VIDEO_UPDATE( youjyudn ) +SCREEN_UPDATE( youjyudn ) { m62_state *state = screen->machine->driver_data<m62_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); @@ -953,7 +953,7 @@ VIDEO_START( horizon ) tilemap_set_transmask(state->bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ } -VIDEO_UPDATE( horizon ) +SCREEN_UPDATE( horizon ) { m62_state *state = screen->machine->driver_data<m62_state>(); int i; diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c index 5a9d577feb4..540263d7bcf 100644 --- a/src/mame/video/m72.c +++ b/src/mame/video/m72.c @@ -521,7 +521,7 @@ static void majtitle_draw_sprites(running_machine *machine, bitmap_t *bitmap,con } } -VIDEO_UPDATE( m72 ) +SCREEN_UPDATE( m72 ) { m72_state *state = screen->machine->driver_data<m72_state>(); if (state->video_off) @@ -544,7 +544,7 @@ VIDEO_UPDATE( m72 ) return 0; } -VIDEO_UPDATE( majtitle ) +SCREEN_UPDATE( majtitle ) { m72_state *state = screen->machine->driver_data<m72_state>(); int i; diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c index 94947a5f9b5..76eca6521f2 100644 --- a/src/mame/video/m90.c +++ b/src/mame/video/m90.c @@ -287,7 +287,7 @@ WRITE16_HANDLER( m90_video_w ) markdirty(pf2_wide_layer,m90_video_control_data[6] & 0x2,offset); } -VIDEO_UPDATE( m90 ) +SCREEN_UPDATE( m90 ) { static int last_pf1,last_pf2; int pf1_base = m90_video_control_data[5] & 0x3; @@ -455,7 +455,7 @@ VIDEO_UPDATE( m90 ) return 0; } -VIDEO_UPDATE( bomblord ) +SCREEN_UPDATE( bomblord ) { int i; bitmap_fill(screen->machine->priority_bitmap,cliprect,0); @@ -507,7 +507,7 @@ VIDEO_UPDATE( bomblord ) return 0; } -VIDEO_UPDATE( dynablsb ) +SCREEN_UPDATE( dynablsb ) { bitmap_fill(screen->machine->priority_bitmap,cliprect,0); bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index 231d5782e15..352fe5ded0b 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -450,7 +450,7 @@ static void m92_screenrefresh(running_machine *machine, bitmap_t *bitmap,const r } -VIDEO_UPDATE( m92 ) +SCREEN_UPDATE( m92 ) { m92_update_scroll_positions(screen->machine); m92_screenrefresh(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index 02c284eba75..f5cedb10c21 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -387,7 +387,7 @@ static void sortlayers(int *layer,int *pri) SWAP(1,2) } -VIDEO_UPDATE( macrossp ) +SCREEN_UPDATE( macrossp ) { macrossp_state *state = screen->machine->driver_data<macrossp_state>(); int layers[3],layerpri[3]; @@ -429,7 +429,7 @@ state->scrc_videoregs[2]);// 08 - 0b return 0; } -VIDEO_EOF( macrossp ) +SCREEN_EOF( macrossp ) { macrossp_state *state = machine->driver_data<macrossp_state>(); diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index 818b4ab06bc..9231369e44c 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -251,7 +251,7 @@ WRITE8_HANDLER( madalien_charram_w ) } -static VIDEO_UPDATE( madalien ) +static SCREEN_UPDATE( madalien ) { madalien_state *state = screen->machine->driver_data<madalien_state>(); int flip = BIT(input_port_read(screen->machine, "DSW"), 6) && BIT(*state->video_control, 0); @@ -399,12 +399,12 @@ MACHINE_CONFIG_FRAGMENT( madalien_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 336, 0, 256, 288, 0, 256) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_UPDATE(madalien) MCFG_GFXDECODE(madalien) MCFG_PALETTE_LENGTH(0x30) MCFG_PALETTE_INIT(madalien) MCFG_VIDEO_START(madalien) - MCFG_VIDEO_UPDATE(madalien) MCFG_MC6845_ADD("crtc", MC6845, PIXEL_CLOCK / 8, mc6845_intf) MACHINE_CONFIG_END diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index 812503da211..2855bd7d499 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -222,7 +222,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /******************************************************************************/ -VIDEO_UPDATE( madmotor ) +SCREEN_UPDATE( madmotor ) { madmotor_state *state = screen->machine->driver_data<madmotor_state>(); int offs; diff --git a/src/mame/video/magmax.c b/src/mame/video/magmax.c index a3302ad421e..a723fe54704 100644 --- a/src/mame/video/magmax.c +++ b/src/mame/video/magmax.c @@ -90,7 +90,7 @@ VIDEO_START( magmax ) -VIDEO_UPDATE( magmax ) +SCREEN_UPDATE( magmax ) { magmax_state *state = screen->machine->driver_data<magmax_state>(); UINT16 *videoram = state->videoram; diff --git a/src/mame/video/mainevt.c b/src/mame/video/mainevt.c index ff8b6213e20..5cb53dc8b7a 100644 --- a/src/mame/video/mainevt.c +++ b/src/mame/video/mainevt.c @@ -93,7 +93,7 @@ VIDEO_START( dv ) /*****************************************************************************/ -VIDEO_UPDATE( mainevt ) +SCREEN_UPDATE( mainevt ) { mainevt_state *state = screen->machine->driver_data<mainevt_state>(); @@ -109,7 +109,7 @@ VIDEO_UPDATE( mainevt ) return 0; } -VIDEO_UPDATE( dv ) +SCREEN_UPDATE( dv ) { mainevt_state *state = screen->machine->driver_data<mainevt_state>(); diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c index dbab657f8f7..c140be2efcf 100644 --- a/src/mame/video/mainsnk.c +++ b/src/mame/video/mainsnk.c @@ -168,7 +168,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE(mainsnk) +SCREEN_UPDATE(mainsnk) { mainsnk_state *state = screen->machine->driver_data<mainsnk_state>(); diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c index 9f99b6fe59a..2dbb6c7b5cf 100644 --- a/src/mame/video/malzak.c +++ b/src/mame/video/malzak.c @@ -18,7 +18,7 @@ #include "includes/malzak.h" -VIDEO_UPDATE( malzak ) +SCREEN_UPDATE( malzak ) { malzak_state *state = screen->machine->driver_data<malzak_state>(); int sx, sy; diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c index 760d4991752..187dfea8e41 100644 --- a/src/mame/video/mappy.c +++ b/src/mame/video/mappy.c @@ -535,7 +535,7 @@ static void phozon_draw_sprites(running_machine *machine, bitmap_t *bitmap, cons } -VIDEO_UPDATE( superpac ) +SCREEN_UPDATE( superpac ) { mappy_state *state = screen->machine->driver_data<mappy_state>(); bitmap_t *sprite_bitmap = state->sprite_bitmap; @@ -565,7 +565,7 @@ VIDEO_UPDATE( superpac ) return 0; } -VIDEO_UPDATE( phozon ) +SCREEN_UPDATE( phozon ) { mappy_state *state = screen->machine->driver_data<mappy_state>(); @@ -584,7 +584,7 @@ VIDEO_UPDATE( phozon ) return 0; } -VIDEO_UPDATE( mappy ) +SCREEN_UPDATE( mappy ) { mappy_state *state = screen->machine->driver_data<mappy_state>(); int offs; diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c index a8faedcf910..df04877ddb9 100644 --- a/src/mame/video/marineb.c +++ b/src/mame/video/marineb.c @@ -177,7 +177,7 @@ static void set_tilemap_scrolly( running_machine *machine, int cols ) } -VIDEO_UPDATE( marineb ) +SCREEN_UPDATE( marineb ) { marineb_state *state = screen->machine->driver_data<marineb_state>(); int offs; @@ -239,7 +239,7 @@ VIDEO_UPDATE( marineb ) } -VIDEO_UPDATE( changes ) +SCREEN_UPDATE( changes ) { marineb_state *state = screen->machine->driver_data<marineb_state>(); int offs, sx, sy, code, col, flipx, flipy; @@ -318,7 +318,7 @@ VIDEO_UPDATE( changes ) } -VIDEO_UPDATE( springer ) +SCREEN_UPDATE( springer ) { marineb_state *state = screen->machine->driver_data<marineb_state>(); int offs; @@ -378,7 +378,7 @@ VIDEO_UPDATE( springer ) } -VIDEO_UPDATE( hoccer ) +SCREEN_UPDATE( hoccer ) { marineb_state *state = screen->machine->driver_data<marineb_state>(); int offs; @@ -422,7 +422,7 @@ VIDEO_UPDATE( hoccer ) } -VIDEO_UPDATE( hopprobo ) +SCREEN_UPDATE( hopprobo ) { marineb_state *state = screen->machine->driver_data<marineb_state>(); int offs; diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index 7b74c8c6963..003d9e0fdb4 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -208,7 +208,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( mario ) +SCREEN_UPDATE( mario ) { mario_state *state = screen->machine->driver_data<mario_state>(); int t; diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index 5b0c9922d16..29a74062014 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -117,7 +117,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( markham ) +SCREEN_UPDATE( markham ) { markham_state *state = screen->machine->driver_data<markham_state>(); int i; diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c index adc95cc787e..dcaf21ce900 100644 --- a/src/mame/video/matmania.c +++ b/src/mame/video/matmania.c @@ -127,7 +127,7 @@ VIDEO_START( matmania ) -VIDEO_UPDATE( matmania ) +SCREEN_UPDATE( matmania ) { matmania_state *state = screen->machine->driver_data<matmania_state>(); UINT8 *spriteram = state->spriteram; @@ -199,7 +199,7 @@ VIDEO_UPDATE( matmania ) return 0; } -VIDEO_UPDATE( maniach ) +SCREEN_UPDATE( maniach ) { matmania_state *state = screen->machine->driver_data<matmania_state>(); UINT8 *spriteram = state->spriteram; diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index ac147290769..8e01c9334aa 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -200,7 +200,7 @@ static void mcatadv_draw_tilemap_part( UINT16* current_scroll, UINT16* current_v } } -VIDEO_UPDATE( mcatadv ) +SCREEN_UPDATE( mcatadv ) { mcatadv_state *state = screen->machine->driver_data<mcatadv_state>(); int i; @@ -269,7 +269,7 @@ VIDEO_START( mcatadv ) state->save_pointer(NAME(state->vidregs_old), (0x0f + 1) / 2); } -VIDEO_EOF( mcatadv ) +SCREEN_EOF( mcatadv ) { mcatadv_state *state = machine->driver_data<mcatadv_state>(); memcpy(state->spriteram_old, state->spriteram, state->spriteram_size); diff --git a/src/mame/video/mcd212.c b/src/mame/video/mcd212.c index d7e297ed518..9b2ab9c552c 100644 --- a/src/mame/video/mcd212.c +++ b/src/mame/video/mcd212.c @@ -1661,20 +1661,15 @@ VIDEO_START( cdimono1 ) state->lcdbitmap = downcast<screen_device *>(machine->device("lcd"))->alloc_compatible_bitmap(); } -VIDEO_UPDATE( cdimono1 ) +SCREEN_UPDATE( cdimono1 ) { - cdi_state *state = screen->machine->driver_data<cdi_state>(); - device_t *main_screen = screen->machine->device("screen"); - device_t *lcd_screen = screen->machine->device("lcd"); - - if (screen == main_screen) - { - copybitmap(bitmap, screen->machine->generic.tmpbitmap, 0, 0, 0, 0, cliprect); - } - else if (screen == lcd_screen) - { - copybitmap(bitmap, state->lcdbitmap, 0, 0, 0, 0, cliprect); - } + copybitmap(bitmap, screen->machine->generic.tmpbitmap, 0, 0, 0, 0, cliprect); + return 0; +} +SCREEN_UPDATE( cdimono1_lcd ) +{ + cdi_state *state = screen->machine->driver_data<cdi_state>(); + copybitmap(bitmap, state->lcdbitmap, 0, 0, 0, 0, cliprect); return 0; } diff --git a/src/mame/video/mcd212.h b/src/mame/video/mcd212.h index 0bfd6e67052..d9bc80724e2 100644 --- a/src/mame/video/mcd212.h +++ b/src/mame/video/mcd212.h @@ -187,6 +187,7 @@ extern READ16_HANDLER( mcd212_r ); extern WRITE16_HANDLER( mcd212_w ); extern TIMER_CALLBACK( mcd212_perform_scan ); extern VIDEO_START( cdimono1 ); -extern VIDEO_UPDATE( cdimono1 ); +extern SCREEN_UPDATE( cdimono1 ); +extern SCREEN_UPDATE( cdimono1_lcd ); #endif // _VIDEO_MCD212_H_ diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c index e3b528bd2c9..1929856e656 100644 --- a/src/mame/video/mcr.c +++ b/src/mame/video/mcr.c @@ -401,7 +401,7 @@ static void render_sprites_91464(running_machine *machine, bitmap_t *bitmap, con * *************************************/ -VIDEO_UPDATE( mcr ) +SCREEN_UPDATE( mcr ) { /* update the flip state */ tilemap_set_flip(bg_tilemap, mcr_cocktail_flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c index 65c72f42f9b..dfab12649cb 100644 --- a/src/mame/video/mcr3.c +++ b/src/mame/video/mcr3.c @@ -276,7 +276,7 @@ static void mcr3_update_sprites(running_machine *machine, bitmap_t *bitmap, cons * *************************************/ -VIDEO_UPDATE( mcr3 ) +SCREEN_UPDATE( mcr3 ) { /* update the flip state */ tilemap_set_flip(bg_tilemap, mcr_cocktail_flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); @@ -290,7 +290,7 @@ VIDEO_UPDATE( mcr3 ) } -VIDEO_UPDATE( spyhunt ) +SCREEN_UPDATE( spyhunt ) { /* for every character in the Video RAM, check if it has been modified */ /* since last time and update it accordingly. */ diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index 790d742c2db..8e9d330996e 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -329,7 +329,7 @@ static void zwackery_update_sprites(running_machine *machine, bitmap_t *bitmap, * *************************************/ -VIDEO_UPDATE( mcr68 ) +SCREEN_UPDATE( mcr68 ) { mcr68_state *state = screen->machine->driver_data<mcr68_state>(); /* draw the background */ @@ -347,7 +347,7 @@ VIDEO_UPDATE( mcr68 ) } -VIDEO_UPDATE( zwackery ) +SCREEN_UPDATE( zwackery ) { mcr68_state *state = screen->machine->driver_data<mcr68_state>(); /* draw the background */ diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c index 4b650775a47..41ce2abb021 100644 --- a/src/mame/video/meadows.c +++ b/src/mame/video/meadows.c @@ -103,7 +103,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta * *************************************/ -VIDEO_UPDATE( meadows ) +SCREEN_UPDATE( meadows ) { meadows_state *state = screen->machine->driver_data<meadows_state>(); /* draw the background */ diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index eaaa9596ac5..06d5615e67b 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -937,7 +937,7 @@ PALETTE_INIT( megasys1 ) ***************************************************************************/ -VIDEO_UPDATE( megasys1 ) +SCREEN_UPDATE( megasys1 ) { int i,flag,pri,primask; int active_layers; @@ -1032,7 +1032,7 @@ VIDEO_UPDATE( megasys1 ) return 0; } -VIDEO_EOF( megasys1 ) +SCREEN_EOF( megasys1 ) { /* Sprite are TWO frames ahead, like NMK16 HW. */ //megasys1_objectram diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c index 46a1702318b..81470e91d5a 100644 --- a/src/mame/video/megazone.c +++ b/src/mame/video/megazone.c @@ -111,7 +111,7 @@ VIDEO_START( megazone ) } -VIDEO_UPDATE( megazone ) +SCREEN_UPDATE( megazone ) { megazone_state *state = screen->machine->driver_data<megazone_state>(); int offs; diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 67b88002a56..8fc8573e29c 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -239,7 +239,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( mermaid ) +SCREEN_UPDATE( mermaid ) { mermaid_state *state = screen->machine->driver_data<mermaid_state>(); @@ -271,7 +271,7 @@ static UINT8 collision_check( running_machine *machine, rectangle* rect ) return data; } -VIDEO_EOF( mermaid ) +SCREEN_EOF( mermaid ) { mermaid_state *state = machine->driver_data<mermaid_state>(); const rectangle &visarea = machine->primary_screen->visible_area(); diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 1e198eefe4c..45fa31ae3ba 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -242,7 +242,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect ***************************************************************************/ -VIDEO_UPDATE( metlclsh ) +SCREEN_UPDATE( metlclsh ) { metlclsh_state *state = screen->machine->driver_data<metlclsh_state>(); diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 75abbe7d961..3dd6e0094a1 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -720,7 +720,7 @@ static void draw_layers( running_machine *machine, bitmap_t *bitmap, const recta -VIDEO_UPDATE( metro ) +SCREEN_UPDATE( metro ) { metro_state *state = screen->machine->driver_data<metro_state>(); int pri, layers_ctrl = -1; diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c index acb3c0c4ae6..96165d7d408 100644 --- a/src/mame/video/mexico86.c +++ b/src/mame/video/mexico86.c @@ -16,7 +16,7 @@ WRITE8_HANDLER( mexico86_bankswitch_w ) -VIDEO_UPDATE( mexico86 ) +SCREEN_UPDATE( mexico86 ) { mexico86_state *state = screen->machine->driver_data<mexico86_state>(); int offs; @@ -99,7 +99,7 @@ VIDEO_UPDATE( mexico86 ) return 0; } -VIDEO_UPDATE( kikikai ) +SCREEN_UPDATE( kikikai ) { mexico86_state *state = screen->machine->driver_data<mexico86_state>(); int offs; diff --git a/src/mame/video/midvunit.c b/src/mame/video/midvunit.c index 6d2c2d39330..593b834b210 100644 --- a/src/mame/video/midvunit.c +++ b/src/mame/video/midvunit.c @@ -546,7 +546,7 @@ READ32_HANDLER( midvunit_textureram_r ) * *************************************/ -VIDEO_UPDATE( midvunit ) +SCREEN_UPDATE( midvunit ) { midvunit_state *state = screen->machine->driver_data<midvunit_state>(); int x, y, width, xoffs; diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c index f151cd602a6..df75f1a8f74 100644 --- a/src/mame/video/midzeus.c +++ b/src/mame/video/midzeus.c @@ -310,7 +310,7 @@ static void exit_handler(running_machine &machine) * *************************************/ -VIDEO_UPDATE( midzeus ) +SCREEN_UPDATE( midzeus ) { int x, y; diff --git a/src/mame/video/midzeus2.c b/src/mame/video/midzeus2.c index 25ea47846fc..b0fadc57944 100644 --- a/src/mame/video/midzeus2.c +++ b/src/mame/video/midzeus2.c @@ -358,7 +358,7 @@ static void exit_handler(running_machine &machine) * *************************************/ -VIDEO_UPDATE( midzeus2 ) +SCREEN_UPDATE( midzeus2 ) { int x, y; diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index b87cda692d8..56527202333 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -175,7 +175,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( mikie ) +SCREEN_UPDATE( mikie ) { mikie_state *state = screen->machine->driver_data<mikie_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_CATEGORY(0), 0); diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index 9e49298a13d..267951d0ecf 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -328,7 +328,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( pang ) +SCREEN_UPDATE( pang ) { mitchell_state *state = screen->machine->driver_data<mitchell_state>(); diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index 21c413f209f..2c24647b146 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -131,7 +131,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan -VIDEO_UPDATE( mjkjidai ) +SCREEN_UPDATE( mjkjidai ) { if (!display_enable) bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c index 057c5761f90..5eb5ca56f75 100644 --- a/src/mame/video/model1.c +++ b/src/mame/video/model1.c @@ -1470,7 +1470,7 @@ VIDEO_START(model1) state_save_register_global_array(machine, state->listctl); } -VIDEO_UPDATE(model1) +SCREEN_UPDATE(model1) { model1_state *state = screen->machine->driver_data<model1_state>(); struct view *view = state->view; @@ -1538,7 +1538,7 @@ VIDEO_UPDATE(model1) return 0; } -VIDEO_EOF(model1) +SCREEN_EOF(model1) { tgp_scan(machine); end_frame(machine); diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c index d7f01f982b3..500ac52c12f 100644 --- a/src/mame/video/model2.c +++ b/src/mame/video/model2.c @@ -2742,7 +2742,7 @@ static void convert_bitmap( running_machine *machine, bitmap_t *dst, bitmap_t *s } } -VIDEO_UPDATE(model2) +SCREEN_UPDATE(model2) { model2_state *state = screen->machine->driver_data<model2_state>(); logerror("--- frame ---\n"); diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c index 1968af4ebdc..bbebe504208 100644 --- a/src/mame/video/model3.c +++ b/src/mame/video/model3.c @@ -338,7 +338,7 @@ static void copy_screen(running_machine *machine, bitmap_t *bitmap, const rectan } #endif -VIDEO_UPDATE( model3 ) +SCREEN_UPDATE( model3 ) { model3_state *state = screen->machine->driver_data<model3_state>(); #if 0 diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c index 3090958ea3e..0d0975d84d0 100644 --- a/src/mame/video/momoko.c +++ b/src/mame/video/momoko.c @@ -111,7 +111,7 @@ static void momoko_draw_bg_pri( running_machine *machine, bitmap_t *bitmap, int /****************************************************************************/ -VIDEO_UPDATE( momoko ) +SCREEN_UPDATE( momoko ) { momoko_state *state = screen->machine->driver_data<momoko_state>(); int x, y, dx, dy, rx, ry, radr, chr, sy, fx, fy, px, py, offs, col, pri, flip ; diff --git a/src/mame/video/moo.c b/src/mame/video/moo.c index 808e6b3a987..4646f37c081 100644 --- a/src/mame/video/moo.c +++ b/src/mame/video/moo.c @@ -63,7 +63,7 @@ VIDEO_START(moo) } } -VIDEO_UPDATE(moo) +SCREEN_UPDATE(moo) { moo_state *state = screen->machine->driver_data<moo_state>(); static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 }; diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c index 7a6e7d27782..5d462e05a36 100644 --- a/src/mame/video/mosaic.c +++ b/src/mame/video/mosaic.c @@ -80,7 +80,7 @@ WRITE8_HANDLER( mosaic_bgvideoram_w ) -VIDEO_UPDATE( mosaic ) +SCREEN_UPDATE( mosaic ) { mosaic_state *state = screen->machine->driver_data<mosaic_state>(); diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c index 26e1cd1fb8b..c4c27e34227 100644 --- a/src/mame/video/mouser.c +++ b/src/mame/video/mouser.c @@ -54,7 +54,7 @@ WRITE8_HANDLER( mouser_flip_screen_y_w ) flip_screen_y_set(space->machine, ~data & 1); } -VIDEO_UPDATE( mouser ) +SCREEN_UPDATE( mouser ) { mouser_state *state = screen->machine->driver_data<mouser_state>(); UINT8 *spriteram = state->spriteram; diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 11b5bc6f6d0..986162acd7d 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -260,7 +260,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta } } -VIDEO_UPDATE( mrdo ) +SCREEN_UPDATE( mrdo ) { mrdo_state *state = screen->machine->driver_data<mrdo_state>(); diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c index b06be691b7b..c58628fead2 100644 --- a/src/mame/video/mrflea.c +++ b/src/mame/video/mrflea.c @@ -104,7 +104,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r } } -VIDEO_UPDATE( mrflea ) +SCREEN_UPDATE( mrflea ) { draw_background(screen->machine, bitmap, cliprect); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index 65bf0e84ae5..fe8f50aedaf 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -145,7 +145,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( mrjong ) +SCREEN_UPDATE( mrjong ) { mrjong_state *state = screen->machine->driver_data<mrjong_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c index 7ccc81df19b..27471e36693 100644 --- a/src/mame/video/ms32.c +++ b/src/mame/video/ms32.c @@ -322,7 +322,7 @@ static void draw_roz(bitmap_t *bitmap, const rectangle *cliprect,int priority) -VIDEO_UPDATE( ms32 ) +SCREEN_UPDATE( ms32 ) { int scrollx,scrolly; int asc_pri; diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c index 77ced44c1ae..80a9c8419d7 100644 --- a/src/mame/video/msisaac.c +++ b/src/mame/video/msisaac.c @@ -244,7 +244,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( msisaac ) +SCREEN_UPDATE( msisaac ) { msisaac_state *state = screen->machine->driver_data<msisaac_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index 44879a2060b..d713bed5726 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -151,7 +151,7 @@ VIDEO_START( mugsmash ) state->tilemap2 = tilemap_create(machine, get_mugsmash_tile_info2, tilemap_scan_rows, 16, 16, 32, 32); } -VIDEO_UPDATE( mugsmash ) +SCREEN_UPDATE( mugsmash ) { mugsmash_state *state = screen->machine->driver_data<mugsmash_state>(); diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c index 60782345f14..eeaf2541aba 100644 --- a/src/mame/video/munchmo.c +++ b/src/mame/video/munchmo.c @@ -150,7 +150,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( mnchmobl ) +SCREEN_UPDATE( mnchmobl ) { draw_background(screen->machine, bitmap, cliprect); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c index 0f4bd90f6a9..b14688a6bde 100644 --- a/src/mame/video/mustache.c +++ b/src/mame/video/mustache.c @@ -141,7 +141,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( mustache ) +SCREEN_UPDATE( mustache ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/mw8080bw.c b/src/mame/video/mw8080bw.c index 8b62723313d..2523b127cb1 100644 --- a/src/mame/video/mw8080bw.c +++ b/src/mame/video/mw8080bw.c @@ -8,7 +8,7 @@ #include "includes/mw8080bw.h" -VIDEO_UPDATE( mw8080bw ) +SCREEN_UPDATE( mw8080bw ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); UINT8 x = 0; @@ -75,7 +75,7 @@ VIDEO_UPDATE( mw8080bw ) #define PHANTOM2_SIDE_TRENCH_LIGHT_RGB32_PEN MAKE_RGB(0x72, 0x72, 0x72) -VIDEO_UPDATE( spcenctr ) +SCREEN_UPDATE( spcenctr ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); UINT8 line_buf[256]; /* 256x1 bit RAM */ @@ -219,7 +219,7 @@ VIDEO_UPDATE( spcenctr ) #define PHANTOM2_RGB32_CLOUD_PEN MAKE_RGB(0xc0, 0xc0, 0xc0) -VIDEO_UPDATE( phantom2 ) +SCREEN_UPDATE( phantom2 ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); UINT8 x = 0; @@ -311,7 +311,7 @@ VIDEO_UPDATE( phantom2 ) } -VIDEO_EOF( phantom2 ) +SCREEN_EOF( phantom2 ) { mw8080bw_state *state = machine->driver_data<mw8080bw_state>(); @@ -331,7 +331,7 @@ VIDEO_EOF( phantom2 ) /* the flip screen circuit is just a couple of relays on the monitor PCB */ -VIDEO_UPDATE( invaders ) +SCREEN_UPDATE( invaders ) { mw8080bw_state *state = screen->machine->driver_data<mw8080bw_state>(); UINT8 x = 0; diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index a0315b033fd..fbd3f415d6d 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -254,7 +254,7 @@ static VIDEO_RESET( mystston ) * *************************************/ -static VIDEO_UPDATE( mystston ) +static SCREEN_UPDATE( mystston ) { mystston_state *state = screen->machine->driver_data<mystston_state>(); @@ -322,10 +322,8 @@ GFXDECODE_END *************************************/ MACHINE_CONFIG_FRAGMENT( mystston_video ) - MCFG_VIDEO_START(mystston) MCFG_VIDEO_RESET(mystston) - MCFG_VIDEO_UPDATE(mystston) MCFG_GFXDECODE(mystston) MCFG_PALETTE_LENGTH(0x40) @@ -333,4 +331,5 @@ MACHINE_CONFIG_FRAGMENT( mystston_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) + MCFG_SCREEN_UPDATE(mystston) MACHINE_CONFIG_END diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c index 92de52fea53..c5b5b69296d 100644 --- a/src/mame/video/mystwarr.c +++ b/src/mame/video/mystwarr.c @@ -333,7 +333,7 @@ VIDEO_START(martchmp) -VIDEO_UPDATE(mystwarr) +SCREEN_UPDATE(mystwarr) { mystwarr_state *state = screen->machine->driver_data<mystwarr_state>(); int i, old, blendmode=0; @@ -353,7 +353,7 @@ VIDEO_UPDATE(mystwarr) return 0; } -VIDEO_UPDATE(metamrph) +SCREEN_UPDATE(metamrph) { mystwarr_state *state = screen->machine->driver_data<mystwarr_state>(); int i, old; @@ -371,7 +371,7 @@ VIDEO_UPDATE(metamrph) return 0; } -VIDEO_UPDATE(martchmp) +SCREEN_UPDATE(martchmp) { mystwarr_state *state = screen->machine->driver_data<mystwarr_state>(); int i, old, blendmode; @@ -503,7 +503,7 @@ READ16_HANDLER(ddd_053936_tilerom_2_r) return ROM[offset]<<8; } -VIDEO_UPDATE(dadandrn) /* and gaiapols */ +SCREEN_UPDATE(dadandrn) /* and gaiapols */ { mystwarr_state *state = screen->machine->driver_data<mystwarr_state>(); int i, newbase, dirty, rozmode; diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c index 748bfddf3f3..9dba8c1eb8d 100644 --- a/src/mame/video/n64.c +++ b/src/mame/video/n64.c @@ -3267,7 +3267,7 @@ VIDEO_START(n64) } } -VIDEO_UPDATE(n64) +SCREEN_UPDATE(n64) { _n64_state *state = screen->machine->driver_data<_n64_state>(); diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c index 622d05b10e9..d4adeaced32 100644 --- a/src/mame/video/n8080.c +++ b/src/mame/video/n8080.c @@ -139,7 +139,7 @@ VIDEO_START( helifire ) } -VIDEO_UPDATE( spacefev ) +SCREEN_UPDATE( spacefev ) { n8080_state *state = screen->machine->driver_data<n8080_state>(); UINT8 mask = flip_screen_get(screen->machine) ? 0xff : 0x00; @@ -209,7 +209,7 @@ VIDEO_UPDATE( spacefev ) } -VIDEO_UPDATE( sheriff ) +SCREEN_UPDATE( sheriff ) { n8080_state *state = screen->machine->driver_data<n8080_state>(); UINT8 mask = flip_screen_get(screen->machine) ? 0xff : 0x00; @@ -252,7 +252,7 @@ VIDEO_UPDATE( sheriff ) } -VIDEO_UPDATE( helifire ) +SCREEN_UPDATE( helifire ) { n8080_state *state = screen->machine->driver_data<n8080_state>(); int SUN_BRIGHTNESS = input_port_read(screen->machine, "POT0"); @@ -352,7 +352,7 @@ VIDEO_UPDATE( helifire ) } -VIDEO_EOF( helifire ) +SCREEN_EOF( helifire ) { n8080_state *state = machine->driver_data<n8080_state>(); int n = (machine->primary_screen->frame_number() >> 1) % sizeof state->helifire_LSFR; diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c index de65e54a4ab..1caf7e82276 100644 --- a/src/mame/video/namcofl.c +++ b/src/mame/video/namcofl.c @@ -85,7 +85,7 @@ static void TilemapCB(UINT16 code, int *tile, int *mask ) } -VIDEO_UPDATE( namcofl ) +SCREEN_UPDATE( namcofl ) { int pri; diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c index eac8bc189d3..295a7273ee6 100644 --- a/src/mame/video/namcona1.c +++ b/src/mame/video/namcona1.c @@ -649,7 +649,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re } } /* draw_background */ -VIDEO_UPDATE( namcona1 ) +SCREEN_UPDATE( namcona1 ) { int which; int priority; diff --git a/src/mame/video/namconb1.c b/src/mame/video/namconb1.c index 93580e7d389..3be4fcc2400 100644 --- a/src/mame/video/namconb1.c +++ b/src/mame/video/namconb1.c @@ -132,7 +132,7 @@ video_update_common(running_machine *machine, bitmap_t *bitmap, const rectangle /************************************************************************************************/ -VIDEO_UPDATE( namconb1 ) +SCREEN_UPDATE( namconb1 ) { /* compute window for custom screen blanking */ rectangle clip; @@ -171,7 +171,7 @@ VIDEO_START( namconb1 ) /****************************************************************************************************/ -VIDEO_UPDATE( namconb2 ) +SCREEN_UPDATE( namconb2 ) { /* compute window for custom screen blanking */ rectangle clip; diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c index 017396bab88..f45a45c4db3 100644 --- a/src/mame/video/namcos1.c +++ b/src/mame/video/namcos1.c @@ -346,7 +346,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta -VIDEO_UPDATE( namcos1 ) +SCREEN_UPDATE( namcos1 ) { int i, j, scrollx, scrolly, priority; rectangle new_clip = *cliprect; @@ -415,7 +415,7 @@ VIDEO_UPDATE( namcos1 ) } -VIDEO_EOF( namcos1 ) +SCREEN_EOF( namcos1 ) { if (copy_sprites) { diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c index e89925b5fd4..4a3f4b0c572 100644 --- a/src/mame/video/namcos2.c +++ b/src/mame/video/namcos2.c @@ -460,7 +460,7 @@ ApplyClip( rectangle *clip, const rectangle *cliprect ) sect_rect(clip, cliprect); } /* ApplyClip */ -VIDEO_UPDATE( namcos2_default ) +SCREEN_UPDATE( namcos2_default ) { rectangle clip; int pri; @@ -497,7 +497,7 @@ VIDEO_START( finallap ) namco_road_init(machine, 3); } -VIDEO_UPDATE( finallap ) +SCREEN_UPDATE( finallap ) { rectangle clip; int pri; @@ -534,7 +534,7 @@ VIDEO_START( luckywld ) } } /* luckywld */ -VIDEO_UPDATE( luckywld ) +SCREEN_UPDATE( luckywld ) { rectangle clip; int pri; @@ -567,7 +567,7 @@ VIDEO_START( sgunner ) namco_obj_init( machine, 0, 0x0, NULL ); } -VIDEO_UPDATE( sgunner ) +SCREEN_UPDATE( sgunner ) { rectangle clip; int pri; @@ -593,7 +593,7 @@ VIDEO_START( metlhawk ) namco_roz_init( machine, 1, "gfx5" ); } -VIDEO_UPDATE( metlhawk ) +SCREEN_UPDATE( metlhawk ) { rectangle clip; int pri; diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c index 8498b43ce2b..2e7ceeec193 100644 --- a/src/mame/video/namcos21.c +++ b/src/mame/video/namcos21.c @@ -181,7 +181,7 @@ update_palette( running_machine *machine ) } /* update_palette */ -VIDEO_UPDATE( namcos21 ) +SCREEN_UPDATE( namcos21 ) { namcos21_state *state = screen->machine->driver_data<namcos21_state>(); UINT8 *videoram = state->videoram; @@ -245,7 +245,7 @@ VIDEO_UPDATE( namcos21 ) } } /* winrun bitmap layer */ return 0; -} /* VIDEO_UPDATE( namcos21 ) */ +} /* SCREEN_UPDATE( namcos21 ) */ /*********************************************************************************************/ diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index c50f7fa099b..bcc28d3992c 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -2253,7 +2253,7 @@ VIDEO_START( namcos22s ) VIDEO_START_CALL(common); } -VIDEO_UPDATE( namcos22s ) +SCREEN_UPDATE( namcos22s ) { UINT32 bgColor; UpdateVideoMixer(); @@ -2306,7 +2306,7 @@ VIDEO_UPDATE( namcos22s ) return 0; } -VIDEO_UPDATE( namcos22 ) +SCREEN_UPDATE( namcos22 ) { UpdateVideoMixer(); bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine)); diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c index 491102476fd..ec66a62224b 100644 --- a/src/mame/video/namcos86.c +++ b/src/mame/video/namcos86.c @@ -341,7 +341,7 @@ static void set_scroll(running_machine *machine, int layer) } -VIDEO_UPDATE( namcos86 ) +SCREEN_UPDATE( namcos86 ) { int layer; @@ -374,7 +374,7 @@ VIDEO_UPDATE( namcos86 ) } -VIDEO_EOF( namcos86 ) +SCREEN_EOF( namcos86 ) { if (copy_sprites) { diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c index 89242a4ada6..71e2e3d769b 100644 --- a/src/mame/video/naughtyb.c +++ b/src/mame/video/naughtyb.c @@ -210,7 +210,7 @@ WRITE8_HANDLER( popflame_videoreg_w ) ***************************************************************************/ -VIDEO_UPDATE( naughtyb ) +SCREEN_UPDATE( naughtyb ) { naughtyb_state *state = screen->machine->driver_data<naughtyb_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c index 90baa34b241..a19d7a0e791 100644 --- a/src/mame/video/nbmj8688.c +++ b/src/mame/video/nbmj8688.c @@ -680,7 +680,7 @@ WRITE8_HANDLER( nbmj8688_HD61830B_both_data_w ) ******************************************************************************/ -VIDEO_UPDATE( mbmj8688 ) +SCREEN_UPDATE( mbmj8688 ) { int x, y; @@ -713,35 +713,32 @@ VIDEO_UPDATE( mbmj8688 ) -VIDEO_UPDATE( mbmj8688_LCD ) +SCREEN_UPDATE( mbmj8688_lcd0 ) { int x, y, b; - device_t *main_screen = screen->machine->device("screen"); - device_t *lcd0_screen = screen->machine->device("lcd0"); - device_t *lcd1_screen = screen->machine->device("lcd1"); - - if (screen == main_screen) VIDEO_UPDATE_CALL(mbmj8688); - - if (screen == lcd0_screen) - for (y = 0;y < 64;y++) - for (x = 0;x < 60;x++) - { - int data = HD61830B_ram[0][y * 60 + x]; + for (y = 0;y < 64;y++) + for (x = 0;x < 60;x++) + { + int data = HD61830B_ram[0][y * 60 + x]; - for (b = 0;b < 8;b++) - *BITMAP_ADDR16(bitmap, y, (8*x+b)) = (data & (1<<b)) ? 0x0000 : 0x18ff; - } + for (b = 0;b < 8;b++) + *BITMAP_ADDR16(bitmap, y, (8*x+b)) = (data & (1<<b)) ? 0x0000 : 0x18ff; + } + return 0; +} - if (screen == lcd1_screen) - for (y = 0;y < 64;y++) - for (x = 0;x < 60;x++) - { - int data = HD61830B_ram[1][y * 60 + x]; +SCREEN_UPDATE( mbmj8688_lcd1 ) +{ + int x, y, b; - for (b = 0;b < 8;b++) - *BITMAP_ADDR16(bitmap, y, (8*x+b)) = (data & (1<<b)) ? 0x0000 : 0x18ff; - } + for (y = 0;y < 64;y++) + for (x = 0;x < 60;x++) + { + int data = HD61830B_ram[1][y * 60 + x]; + for (b = 0;b < 8;b++) + *BITMAP_ADDR16(bitmap, y, (8*x+b)) = (data & (1<<b)) ? 0x0000 : 0x18ff; + } return 0; } diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c index 4e499b24b58..9169ab2dd90 100644 --- a/src/mame/video/nbmj8891.c +++ b/src/mame/video/nbmj8891.c @@ -531,7 +531,7 @@ VIDEO_START( nbmj8891_2layer ) ******************************************************************************/ -VIDEO_UPDATE( nbmj8891 ) +SCREEN_UPDATE( nbmj8891 ) { int x, y; diff --git a/src/mame/video/nbmj8900.c b/src/mame/video/nbmj8900.c index 9fd8d400dc0..13041c07bf1 100644 --- a/src/mame/video/nbmj8900.c +++ b/src/mame/video/nbmj8900.c @@ -404,7 +404,7 @@ VIDEO_START( nbmj8900_2layer ) ******************************************************************************/ -VIDEO_UPDATE( nbmj8900 ) +SCREEN_UPDATE( nbmj8900 ) { int x, y; diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c index f4277f2aa0d..e5012c2119d 100644 --- a/src/mame/video/nbmj8991.c +++ b/src/mame/video/nbmj8991.c @@ -312,7 +312,7 @@ VIDEO_START( nbmj8991 ) memset(nbmj8991_videoram, 0x00, (width * height * sizeof(UINT8))); } -VIDEO_UPDATE( nbmj8991_type1 ) +SCREEN_UPDATE( nbmj8991_type1 ) { int x, y; @@ -351,7 +351,7 @@ VIDEO_UPDATE( nbmj8991_type1 ) return 0; } -VIDEO_UPDATE( nbmj8991_type2 ) +SCREEN_UPDATE( nbmj8991_type2 ) { int x, y; diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c index 3efe3ff4fde..72ebb82b606 100644 --- a/src/mame/video/nbmj9195.c +++ b/src/mame/video/nbmj9195.c @@ -461,7 +461,7 @@ VIDEO_START( nbmj9195_nb22090 ) ******************************************************************************/ -VIDEO_UPDATE( nbmj9195 ) +SCREEN_UPDATE( nbmj9195 ) { int i; int x, y; diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index dea28829ece..eb67012be05 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -425,7 +425,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /******************************************************************************/ -VIDEO_UPDATE( nemesis ) +SCREEN_UPDATE( nemesis ) { nemesis_state *state = screen->machine->driver_data<nemesis_state>(); int offs; diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c index 7826e8dcc92..50ed96259f3 100644 --- a/src/mame/video/neogeo.c +++ b/src/mame/video/neogeo.c @@ -920,7 +920,7 @@ VIDEO_RESET( neogeo ) * *************************************/ -VIDEO_UPDATE( neogeo ) +SCREEN_UPDATE( neogeo ) { neogeo_state *state = screen->machine->driver_data<neogeo_state>(); diff --git a/src/mame/video/news.c b/src/mame/video/news.c index 7f00f4dedb4..489fede993d 100644 --- a/src/mame/video/news.c +++ b/src/mame/video/news.c @@ -97,7 +97,7 @@ WRITE8_HANDLER( news_bgpic_w ) ***************************************************************************/ -VIDEO_UPDATE( news ) +SCREEN_UPDATE( news ) { news_state *state = screen->machine->driver_data<news_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c index 24483285b95..fefdeaf9d5e 100644 --- a/src/mame/video/ninjakd2.c +++ b/src/mame/video/ninjakd2.c @@ -484,9 +484,9 @@ static void update_sprites(running_machine* machine) ////// The glitch is correct behavior. -VIDEO_UPDATE( ninjakd2 ) +SCREEN_UPDATE( ninjakd2 ) { - // updating sprites here instead than in video_eof avoids a palette glitch + // updating sprites here instead than in screen_eof avoids a palette glitch // at the end of the "rainbow sky" screens. update_sprites(screen->machine); sprites_updated = 1; @@ -502,7 +502,7 @@ VIDEO_UPDATE( ninjakd2 ) return 0; } -VIDEO_UPDATE( robokid ) +SCREEN_UPDATE( robokid ) { update_sprites(screen->machine); sprites_updated = 1; @@ -522,7 +522,7 @@ VIDEO_UPDATE( robokid ) return 0; } -VIDEO_UPDATE( omegaf ) +SCREEN_UPDATE( omegaf ) { update_sprites(screen->machine); sprites_updated = 1; @@ -543,7 +543,7 @@ VIDEO_UPDATE( omegaf ) } -VIDEO_EOF( ninjakd2 ) +SCREEN_EOF( ninjakd2 ) { if (!sprites_updated) update_sprites(machine); diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c index 5cf9b1c3100..a04578fa66d 100644 --- a/src/mame/video/ninjaw.c +++ b/src/mame/video/ninjaw.c @@ -97,7 +97,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( ninjaw ) +SCREEN_UPDATE( ninjaw ) { ninjaw_state *state = screen->machine->driver_data<ninjaw_state>(); int xoffs = 0; diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c index 0d39ac31eb6..3d904d527e2 100644 --- a/src/mame/video/nitedrvr.c +++ b/src/mame/video/nitedrvr.c @@ -73,7 +73,7 @@ static void draw_roadway( running_machine *machine, bitmap_t *bitmap ) } } -VIDEO_UPDATE( nitedrvr ) +SCREEN_UPDATE( nitedrvr ) { nitedrvr_state *state = screen->machine->driver_data<nitedrvr_state>(); diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c index 818e9191d21..9f106bbb693 100644 --- a/src/mame/video/niyanpai.c +++ b/src/mame/video/niyanpai.c @@ -399,7 +399,7 @@ VIDEO_START( niyanpai ) ******************************************************************************/ -VIDEO_UPDATE( niyanpai ) +SCREEN_UPDATE( niyanpai ) { int i; int x, y; diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c index 0d3f417f14a..4263d21bbed 100644 --- a/src/mame/video/nmk16.c +++ b/src/mame/video/nmk16.c @@ -498,7 +498,7 @@ static void nmk16_draw_sprites_flipsupported(running_machine *machine, bitmap_t } -VIDEO_UPDATE( macross ) +SCREEN_UPDATE( macross ) { tilemap_set_scrollx(tx_tilemap,0,-videoshift); @@ -513,7 +513,7 @@ VIDEO_UPDATE( macross ) return 0; } -VIDEO_UPDATE( tdragon ) +SCREEN_UPDATE( tdragon ) { // mcu_run(screen->machine, 1); @@ -530,7 +530,7 @@ VIDEO_UPDATE( tdragon ) return 0; } -VIDEO_UPDATE( hachamf ) +SCREEN_UPDATE( hachamf ) { // mcu_run(screen->machine, 0); @@ -547,7 +547,7 @@ VIDEO_UPDATE( hachamf ) return 0; } -VIDEO_UPDATE( manybloc ) +SCREEN_UPDATE( manybloc ) { tilemap_set_scrollx(tx_tilemap,0,-videoshift); @@ -562,7 +562,7 @@ VIDEO_UPDATE( manybloc ) return 0; } -VIDEO_UPDATE( tharrier ) +SCREEN_UPDATE( tharrier ) { /* I think the protection device probably copies this to the regs... */ UINT16 tharrier_scroll = nmk16_mainram[0x9f00/2]; @@ -580,7 +580,7 @@ VIDEO_UPDATE( tharrier ) return 0; } -VIDEO_UPDATE( gunnail ) +SCREEN_UPDATE( gunnail ) { int y1; int i=16; @@ -658,7 +658,7 @@ VIDEO_UPDATE( gunnail ) return 0; } -VIDEO_UPDATE( bioship ) +SCREEN_UPDATE( bioship ) { UINT16 *tilerom = (UINT16 *)screen->machine->region("gfx5")->base(); int scrollx=-(bioship_scroll[1] + bioship_scroll[0]*256); @@ -710,7 +710,7 @@ VIDEO_UPDATE( bioship ) return 0; } -VIDEO_UPDATE( strahl ) +SCREEN_UPDATE( strahl ) { tilemap_set_scrollx(tx_tilemap,0,-videoshift); @@ -726,7 +726,7 @@ VIDEO_UPDATE( strahl ) return 0; } -VIDEO_UPDATE( bjtwin ) +SCREEN_UPDATE( bjtwin ) { tilemap_set_scrollx(bg_tilemap0,0,-videoshift); @@ -740,7 +740,7 @@ VIDEO_UPDATE( bjtwin ) return 0; } -VIDEO_EOF( nmk ) +SCREEN_EOF( nmk ) { /* sprites are DMA'd from Main RAM to a private buffer automatically (or at least this is how I interpret the datasheet) */ @@ -752,7 +752,7 @@ VIDEO_EOF( nmk ) memcpy(spriteram_old2,nmk16_mainram+0x8000/2,0x1000); } -VIDEO_EOF( strahl ) +SCREEN_EOF( strahl ) { /* sprites are DMA'd from Main RAM to a private buffer automatically (or at least this is how I interpret the datasheet) */ @@ -891,12 +891,12 @@ static void redhawki_video_update(running_machine *machine, bitmap_t *bitmap, co nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,0); } -VIDEO_UPDATE( afega ) { video_update(screen->machine,bitmap,cliprect, 1, -0x100,+0x000, 0x0001); return 0; } -VIDEO_UPDATE( bubl2000 ) { video_update(screen->machine,bitmap,cliprect, 0, -0x100,+0x000, 0x0001); return 0; } // no flipscreen support, I really would confirmation from the schematics -VIDEO_UPDATE( redhawkb ) { video_update(screen->machine,bitmap,cliprect, 0, +0x000,+0x100, 0x0001); return 0; } -VIDEO_UPDATE( redhawki ) { redhawki_video_update(screen->machine,bitmap,cliprect); return 0;} // strange scroll regs +SCREEN_UPDATE( afega ) { video_update(screen->machine,bitmap,cliprect, 1, -0x100,+0x000, 0x0001); return 0; } +SCREEN_UPDATE( bubl2000 ) { video_update(screen->machine,bitmap,cliprect, 0, -0x100,+0x000, 0x0001); return 0; } // no flipscreen support, I really would confirmation from the schematics +SCREEN_UPDATE( redhawkb ) { video_update(screen->machine,bitmap,cliprect, 0, +0x000,+0x100, 0x0001); return 0; } +SCREEN_UPDATE( redhawki ) { redhawki_video_update(screen->machine,bitmap,cliprect); return 0;} // strange scroll regs -VIDEO_UPDATE( firehawk ) +SCREEN_UPDATE( firehawk ) { tilemap_set_scrolly(bg_tilemap0, 0, afega_scroll_1[1] + 0x100); tilemap_set_scrollx(bg_tilemap0, 0, afega_scroll_1[0]); diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index 5099b6f00cd..41bc2a88ecb 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -340,7 +340,7 @@ static void pkunwar_draw_sprites(running_machine *machine, bitmap_t *bitmap, con -VIDEO_UPDATE( nova2001 ) +SCREEN_UPDATE( nova2001 ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); @@ -354,7 +354,7 @@ VIDEO_UPDATE( nova2001 ) return 0; } -VIDEO_UPDATE( pkunwar ) +SCREEN_UPDATE( pkunwar ) { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); @@ -365,7 +365,7 @@ VIDEO_UPDATE( pkunwar ) return 0; } -VIDEO_UPDATE( ninjakun ) +SCREEN_UPDATE( ninjakun ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); @@ -378,7 +378,7 @@ VIDEO_UPDATE( ninjakun ) return 0; } -VIDEO_UPDATE( raiders5 ) +SCREEN_UPDATE( raiders5 ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index e40ecfd8065..4327651170a 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -249,7 +249,7 @@ static void nycaptor_setmask( running_machine *machine ) } #endif -VIDEO_UPDATE( nycaptor ) +SCREEN_UPDATE( nycaptor ) { nycaptor_state *state = screen->machine->driver_data<nycaptor_state>(); diff --git a/src/mame/video/offtwall.c b/src/mame/video/offtwall.c index ebde69e0627..a02fb9f7f14 100644 --- a/src/mame/video/offtwall.c +++ b/src/mame/video/offtwall.c @@ -88,7 +88,7 @@ VIDEO_START( offtwall ) * *************************************/ -VIDEO_UPDATE( offtwall ) +SCREEN_UPDATE( offtwall ) { offtwall_state *state = screen->machine->driver_data<offtwall_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index 937ed2cb5ff..095b6b402d0 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -105,7 +105,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( ohmygod ) +SCREEN_UPDATE( ohmygod ) { ohmygod_state *state = screen->machine->driver_data<ohmygod_state>(); diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index 9079b2e0e42..64aaf6d73e6 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -314,7 +314,7 @@ VIDEO_START( ojankoc ) ******************************************************************************/ -VIDEO_UPDATE( ojankohs ) +SCREEN_UPDATE( ojankohs ) { ojankohs_state *state = screen->machine->driver_data<ojankohs_state>(); @@ -325,7 +325,7 @@ VIDEO_UPDATE( ojankohs ) return 0; } -VIDEO_UPDATE( ojankoc ) +SCREEN_UPDATE( ojankoc ) { ojankohs_state *state = screen->machine->driver_data<ojankohs_state>(); int offs; diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 718b737978b..b1983dc730e 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -156,7 +156,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( oneshot ) +SCREEN_UPDATE( oneshot ) { oneshot_state *state = screen->machine->driver_data<oneshot_state>(); @@ -173,7 +173,7 @@ VIDEO_UPDATE( oneshot ) return 0; } -VIDEO_UPDATE( maddonna ) +SCREEN_UPDATE( maddonna ) { oneshot_state *state = screen->machine->driver_data<oneshot_state>(); diff --git a/src/mame/video/opwolf.c b/src/mame/video/opwolf.c index 754a9b2e257..c7241177150 100644 --- a/src/mame/video/opwolf.c +++ b/src/mame/video/opwolf.c @@ -36,7 +36,7 @@ WRITE16_HANDLER( opwolf_spritectrl_w ) /***************************************************************************/ -VIDEO_UPDATE( opwolf ) +SCREEN_UPDATE( opwolf ) { opwolf_state *state = screen->machine->driver_data<opwolf_state>(); int layer[2]; diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index b453d66639b..f5fcf6efd93 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -79,7 +79,7 @@ static void draw_sprites( running_machine *machine, bitmap_t* bitmap, const rect } -VIDEO_UPDATE( orbit ) +SCREEN_UPDATE( orbit ) { orbit_state *state = screen->machine->driver_data<orbit_state>(); diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c index 483fb72aa15..dc9949cbc22 100644 --- a/src/mame/video/othldrby.c +++ b/src/mame/video/othldrby.c @@ -180,7 +180,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( othldrby ) +SCREEN_UPDATE( othldrby ) { othldrby_state *state = screen->machine->driver_data<othldrby_state>(); int layer; @@ -224,7 +224,7 @@ VIDEO_UPDATE( othldrby ) return 0; } -VIDEO_EOF( othldrby ) +SCREEN_EOF( othldrby ) { othldrby_state *state = machine->driver_data<othldrby_state>(); diff --git a/src/mame/video/othunder.c b/src/mame/video/othunder.c index 37a7bc09c69..b482adbc241 100644 --- a/src/mame/video/othunder.c +++ b/src/mame/video/othunder.c @@ -200,7 +200,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( othunder ) +SCREEN_UPDATE( othunder ) { othunder_state *state = screen->machine->driver_data<othunder_state>(); int layer[3]; diff --git a/src/mame/video/overdriv.c b/src/mame/video/overdriv.c index 30854e54954..0ad7a6dbb78 100644 --- a/src/mame/video/overdriv.c +++ b/src/mame/video/overdriv.c @@ -50,7 +50,7 @@ void overdriv_zoom_callback_1( running_machine *machine, int *code, int *color, ***************************************************************************/ -VIDEO_UPDATE( overdriv ) +SCREEN_UPDATE( overdriv ) { overdriv_state *state = screen->machine->driver_data<overdriv_state>(); diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index 7493c45bb42..fbf843d0160 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -373,7 +373,7 @@ static void draw_fg(running_machine *machine, bitmap_t *bitmap, const rectangle } -VIDEO_UPDATE( pacland ) +SCREEN_UPDATE( pacland ) { pacland_state *state = screen->machine->driver_data<pacland_state>(); int row; diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index 3d3a710b32a..e8022cf9b2a 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -217,7 +217,7 @@ WRITE8_HANDLER( pacman_flipscreen_w ) } -VIDEO_UPDATE( pacman ) +SCREEN_UPDATE( pacman ) { if (bgpriority != 0) bitmap_fill(bitmap,cliprect,0); @@ -393,7 +393,7 @@ VIDEO_START( s2650games ) tilemap_set_scroll_cols(bg_tilemap, 32); } -VIDEO_UPDATE( s2650games ) +SCREEN_UPDATE( s2650games ) { UINT8 *spriteram = screen->machine->generic.spriteram.u8; UINT8 *spriteram_2 = screen->machine->generic.spriteram2.u8; diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index cd969a57727..3c2cebf5ee2 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -177,7 +177,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( pandoras ) +SCREEN_UPDATE( pandoras ) { pandoras_state *state = screen->machine->driver_data<pandoras_state>(); tilemap_draw(bitmap,cliprect, state->layer0, 1 ,0); diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index 59627e6abf5..8c866cd2052 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -230,7 +230,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect ***************************************************************************/ -VIDEO_UPDATE( paradise ) +SCREEN_UPDATE( paradise ) { paradise_state *state = screen->machine->driver_data<paradise_state>(); int layers_ctrl = -1; @@ -281,7 +281,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) } /* no pix layer, no tilemap_0, different priority bits */ -VIDEO_UPDATE( torus ) +SCREEN_UPDATE( torus ) { paradise_state *state = screen->machine->driver_data<paradise_state>(); @@ -313,7 +313,7 @@ VIDEO_UPDATE( torus ) } /* I don't know how the priority bits work on this one */ -VIDEO_UPDATE( madball ) +SCREEN_UPDATE( madball ) { paradise_state *state = screen->machine->driver_data<paradise_state>(); diff --git a/src/mame/video/parodius.c b/src/mame/video/parodius.c index d76246e968f..e30045a902e 100644 --- a/src/mame/video/parodius.c +++ b/src/mame/video/parodius.c @@ -45,7 +45,7 @@ void parodius_sprite_callback( running_machine *machine, int *code, int *color, ***************************************************************************/ -VIDEO_UPDATE( parodius ) +SCREEN_UPDATE( parodius ) { parodius_state *state = screen->machine->driver_data<parodius_state>(); int layer[3], bg_colorbase; diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c index ec3d85dd03a..aa3e69746b4 100644 --- a/src/mame/video/pass.c +++ b/src/mame/video/pass.c @@ -57,7 +57,7 @@ VIDEO_START( pass ) tilemap_set_transparent_pen(state->fg_tilemap, 255); } -VIDEO_UPDATE( pass ) +SCREEN_UPDATE( pass ) { pass_state *state = screen->machine->driver_data<pass_state>(); diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c index ccb52818252..5af0b2c987f 100644 --- a/src/mame/video/pastelg.c +++ b/src/mame/video/pastelg.c @@ -306,7 +306,7 @@ VIDEO_START( pastelg ) ******************************************************************************/ -VIDEO_UPDATE( pastelg ) +SCREEN_UPDATE( pastelg ) { if (pastelg_dispflag) { diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index 81069bc42cf..dd958bb7e87 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -132,7 +132,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( pbaction ) +SCREEN_UPDATE( pbaction ) { pbaction_state *state = screen->machine->driver_data<pbaction_state>(); diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c index da3d76691b6..e8a423227f0 100644 --- a/src/mame/video/pcktgal.c +++ b/src/mame/video/pcktgal.c @@ -97,7 +97,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( pcktgal ) +SCREEN_UPDATE( pcktgal ) { pcktgal_state *state = screen->machine->driver_data<pcktgal_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c index 141977ad5dd..85986a7cbf0 100644 --- a/src/mame/video/pgm.c +++ b/src/mame/video/pgm.c @@ -362,7 +362,7 @@ VIDEO_START( pgm ) state->save_item(NAME(*state->tmppgmbitmap)); } -VIDEO_UPDATE( pgm ) +SCREEN_UPDATE( pgm ) { pgm_state *state = screen->machine->driver_data<pgm_state>(); int y; @@ -418,7 +418,7 @@ VIDEO_UPDATE( pgm ) return 0; } -VIDEO_EOF( pgm ) +SCREEN_EOF( pgm ) { pgm_state *state = machine->driver_data<pgm_state>(); diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c index fb15aecca28..cb8aae6ba95 100644 --- a/src/mame/video/phoenix.c +++ b/src/mame/video/phoenix.c @@ -448,7 +448,7 @@ READ_LINE_DEVICE_HANDLER( survival_sid_callback ) ***************************************************************************/ -VIDEO_UPDATE( phoenix ) +SCREEN_UPDATE( phoenix ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c index b41ab1ce84b..1fe8ef161a6 100644 --- a/src/mame/video/pingpong.c +++ b/src/mame/video/pingpong.c @@ -150,7 +150,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( pingpong ) +SCREEN_UPDATE( pingpong ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c index cca91eaa0eb..41a76756bab 100644 --- a/src/mame/video/pirates.c +++ b/src/mame/video/pirates.c @@ -105,7 +105,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE(pirates) +SCREEN_UPDATE(pirates) { tilemap_set_scrollx(bg_tilemap,0,pirates_scroll[0]); tilemap_set_scrollx(fg_tilemap,0,pirates_scroll[0]); diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index 2bb1fe80974..0505345811b 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -216,7 +216,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( pitnrun ) +SCREEN_UPDATE( pitnrun ) { pitnrun_state *state = screen->machine->driver_data<pitnrun_state>(); int dx=0,dy=0; diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c index 2d0377bc1af..a02503465da 100644 --- a/src/mame/video/pktgaldx.c +++ b/src/mame/video/pktgaldx.c @@ -73,7 +73,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta /* Video on the orginal */ -VIDEO_UPDATE( pktgaldx ) +SCREEN_UPDATE( pktgaldx ) { pktgaldx_state *state = screen->machine->driver_data<pktgaldx_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); @@ -92,7 +92,7 @@ VIDEO_UPDATE( pktgaldx ) /* Video for the bootleg */ -VIDEO_UPDATE( pktgaldb ) +SCREEN_UPDATE( pktgaldb ) { pktgaldx_state *state = screen->machine->driver_data<pktgaldx_state>(); int x, y; diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index aee18f77f86..45c46be459b 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -120,7 +120,7 @@ VIDEO_START( playch10_hboard ) ***************************************************************************/ -VIDEO_UPDATE( playch10 ) +SCREEN_UPDATE( playch10 ) { device_t *ppu = screen->machine->device("ppu"); diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index b5f9ce07403..8e63cfc2635 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -448,7 +448,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( bigtwin ) +SCREEN_UPDATE( bigtwin ) { playmark_state *state = screen->machine->driver_data<playmark_state>(); @@ -462,7 +462,7 @@ VIDEO_UPDATE( bigtwin ) return 0; } -VIDEO_UPDATE( excelsr ) +SCREEN_UPDATE( excelsr ) { playmark_state *state = screen->machine->driver_data<playmark_state>(); @@ -476,7 +476,7 @@ VIDEO_UPDATE( excelsr ) return 0; } -VIDEO_UPDATE( wbeachvl ) +SCREEN_UPDATE( wbeachvl ) { playmark_state *state = screen->machine->driver_data<playmark_state>(); @@ -503,7 +503,7 @@ VIDEO_UPDATE( wbeachvl ) return 0; } -VIDEO_UPDATE( hrdtimes ) +SCREEN_UPDATE( hrdtimes ) { playmark_state *state = screen->machine->driver_data<playmark_state>(); diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c index f5ca83661b9..09db958e6bb 100644 --- a/src/mame/video/plygonet.c +++ b/src/mame/video/plygonet.c @@ -123,7 +123,7 @@ VIDEO_START( polygonet ) state->save_item(NAME(state->roz_vram)); } -VIDEO_UPDATE( polygonet ) +SCREEN_UPDATE( polygonet ) { polygonet_state *state = screen->machine->driver_data<polygonet_state>(); device_t *k053936 = screen->machine->device("k053936"); diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c index 9227e819210..c8f8429c057 100644 --- a/src/mame/video/pokechmp.c +++ b/src/mame/video/pokechmp.c @@ -71,7 +71,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( pokechmp ) +SCREEN_UPDATE( pokechmp ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c index bf33c968197..e3fd7d2ad45 100644 --- a/src/mame/video/polepos.c +++ b/src/mame/video/polepos.c @@ -520,7 +520,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( polepos ) +SCREEN_UPDATE( polepos ) { polepos_state *state = screen->machine->driver_data<polepos_state>(); rectangle clip = *cliprect; diff --git a/src/mame/video/policetr.c b/src/mame/video/policetr.c index ed765426163..5aa52ec5cb7 100644 --- a/src/mame/video/policetr.c +++ b/src/mame/video/policetr.c @@ -359,7 +359,7 @@ WRITE32_HANDLER( policetr_palette_data_w ) * *************************************/ -VIDEO_UPDATE( policetr ) +SCREEN_UPDATE( policetr ) { int width = cliprect->max_x - cliprect->min_x + 1; int y; diff --git a/src/mame/video/polyplay.c b/src/mame/video/polyplay.c index 0159e7db7a0..cd7d849bdcd 100644 --- a/src/mame/video/polyplay.c +++ b/src/mame/video/polyplay.c @@ -49,7 +49,7 @@ VIDEO_START( polyplay ) } -VIDEO_UPDATE( polyplay ) +SCREEN_UPDATE( polyplay ) { polyplay_state *state = screen->machine->driver_data<polyplay_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c index fe8043b2225..6a476311e2c 100644 --- a/src/mame/video/poolshrk.c +++ b/src/mame/video/poolshrk.c @@ -27,7 +27,7 @@ VIDEO_START( poolshrk ) } -VIDEO_UPDATE( poolshrk ) +SCREEN_UPDATE( poolshrk ) { poolshrk_state *state = screen->machine->driver_data<poolshrk_state>(); int i; diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c index 9565fa77e26..4596337a6e0 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -192,7 +192,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect * *************************************/ -VIDEO_UPDATE( pooyan ) +SCREEN_UPDATE( pooyan ) { pooyan_state *state = screen->machine->driver_data<pooyan_state>(); diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index 74773c2943f..5f9de745a01 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -369,7 +369,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( popeye ) +SCREEN_UPDATE( popeye ) { draw_background(screen->machine, bitmap, cliprect); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index d7793b8e9b5..b12c17b9263 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -246,7 +246,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta } } -VIDEO_UPDATE( popper ) +SCREEN_UPDATE( popper ) { popper_state *state = screen->machine->driver_data<popper_state>(); rectangle finalclip = state->tilemap_clip; diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c index 05b71b5e789..227e02b2adc 100644 --- a/src/mame/video/portrait.c +++ b/src/mame/video/portrait.c @@ -185,7 +185,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( portrait ) +SCREEN_UPDATE( portrait ) { rectangle cliprect_scroll, cliprect_no_scroll; diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index 8daf0673e6d..fa96d281172 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -339,7 +339,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan ***************************************************************************/ -VIDEO_UPDATE( powerins ) +SCREEN_UPDATE( powerins ) { powerins_state *state = screen->machine->driver_data<powerins_state>(); int layers_ctrl = -1; diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index b6111432ed0..3115c9125cf 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -164,7 +164,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( prehisle ) +SCREEN_UPDATE( prehisle ) { prehisle_state *state = screen->machine->driver_data<prehisle_state>(); diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index 8370bb8e0f4..4cc10de5219 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -524,7 +524,7 @@ static int tilemap_width( int size ) return 0x10 * 16; } -VIDEO_UPDATE( psikyo ) +SCREEN_UPDATE( psikyo ) { psikyo_state *state = screen->machine->driver_data<psikyo_state>(); int i, layers_ctrl = -1; @@ -698,7 +698,7 @@ VIDEO_UPDATE( psikyo ) */ -VIDEO_UPDATE( psikyo_bootleg ) +SCREEN_UPDATE( psikyo_bootleg ) { psikyo_state *state = screen->machine->driver_data<psikyo_state>(); int i, layers_ctrl = -1; @@ -865,7 +865,7 @@ VIDEO_UPDATE( psikyo_bootleg ) } -VIDEO_EOF( psikyo ) +SCREEN_EOF( psikyo ) { psikyo_state *state = machine->driver_data<psikyo_state>(); memcpy(state->spritebuf2, state->spritebuf1, 0x2000); diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c index 9c98d831090..e5d8a320742 100644 --- a/src/mame/video/psikyo4.c +++ b/src/mame/video/psikyo4.c @@ -127,7 +127,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( psikyo4 ) +SCREEN_UPDATE( psikyo4 ) { device_t *left_screen = screen->machine->device("lscreen"); device_t *right_screen = screen->machine->device("rscreen"); diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c index cb9298e8a7a..e993e7a02e4 100644 --- a/src/mame/video/psikyosh.c +++ b/src/mame/video/psikyosh.c @@ -1288,7 +1288,7 @@ VIDEO_START( psikyosh ) } -VIDEO_UPDATE( psikyosh ) /* Note the z-buffer on each sprite to get correct priority */ +SCREEN_UPDATE( psikyosh ) /* Note the z-buffer on each sprite to get correct priority */ { int i; psikyosh_state *state = screen->machine->driver_data<psikyosh_state>(); @@ -1340,7 +1340,7 @@ popmessage ("%08x %08x %08x %08x\n%08x %08x %08x %08x", return 0; } -VIDEO_EOF( psikyosh ) +SCREEN_EOF( psikyosh ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram32_w(space, 0, 0, 0xffffffff); diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c index b940c33417b..129d821a8df 100644 --- a/src/mame/video/psx.c +++ b/src/mame/video/psx.c @@ -797,7 +797,7 @@ VIDEO_START( psx_type2 ) psx_gpu_init(machine, 2); } -VIDEO_UPDATE( psx ) +SCREEN_UPDATE( psx ) { psx_gpu *p_psxgpu = screen->machine->driver_data<psx_state>()->p_psxgpu; UINT32 n_x; diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c index 23304b677ee..0c697c898f8 100644 --- a/src/mame/video/psychic5.c +++ b/src/mame/video/psychic5.c @@ -434,7 +434,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re tilemap_draw(bitmap, &clip, state->bg_tilemap, 0, 0); } -VIDEO_UPDATE( psychic5 ) +SCREEN_UPDATE( psychic5 ) { psychic5_state *state = screen->machine->driver_data<psychic5_state>(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -446,7 +446,7 @@ VIDEO_UPDATE( psychic5 ) return 0; } -VIDEO_UPDATE( bombsa ) +SCREEN_UPDATE( bombsa ) { psychic5_state *state = screen->machine->driver_data<psychic5_state>(); if (state->bg_status & 1) /* Backgound enable */ diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index 8d8126b1eaa..ecd72646608 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -369,7 +369,7 @@ static void punchout_copy_bot_palette(running_machine *machine, int bank) } -VIDEO_UPDATE( punchout ) +SCREEN_UPDATE( punchout ) { device_t *top_screen = screen->machine->device("top"); device_t *bottom_screen = screen->machine->device("bottom"); @@ -403,7 +403,7 @@ VIDEO_UPDATE( punchout ) } -VIDEO_UPDATE( armwrest ) +SCREEN_UPDATE( armwrest ) { device_t *top_screen = screen->machine->device("top"); device_t *bottom_screen = screen->machine->device("bottom"); diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index c85d85359dd..4235dafbbe4 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -120,7 +120,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( pushman ) +SCREEN_UPDATE( pushman ) { pushman_state *state = screen->machine->driver_data<pushman_state>(); diff --git a/src/mame/video/qdrmfgp.c b/src/mame/video/qdrmfgp.c index 835c28c88ff..bed8e74f9ea 100644 --- a/src/mame/video/qdrmfgp.c +++ b/src/mame/video/qdrmfgp.c @@ -57,7 +57,7 @@ VIDEO_START( qdrmfgp2 ) ***************************************************************************/ -VIDEO_UPDATE( qdrmfgp ) +SCREEN_UPDATE( qdrmfgp ) { device_t *k056832 = screen->machine->device("k056832"); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c index 8bf457c8977..55007618132 100644 --- a/src/mame/video/qix.c +++ b/src/mame/video/qix.c @@ -344,7 +344,7 @@ static MC6845_UPDATE_ROW( update_row ) * *************************************/ -static VIDEO_UPDATE( qix ) +static SCREEN_UPDATE( qix ) { device_t *mc6845 = screen->machine->device(MC6845_TAG); mc6845_update(mc6845, bitmap, cliprect); @@ -448,13 +448,13 @@ MACHINE_CONFIG_FRAGMENT( qix_video ) MCFG_CPU_CONFIG(encryption_config) // for kram3 MCFG_VIDEO_START(qix) - MCFG_VIDEO_UPDATE(qix) MCFG_MC6845_ADD(MC6845_TAG, MC6845, QIX_CHARACTER_CLOCK, mc6845_intf) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_RAW_PARAMS(QIX_CHARACTER_CLOCK*8, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */ + MCFG_SCREEN_UPDATE(qix) MACHINE_CONFIG_END diff --git a/src/mame/video/quasar.c b/src/mame/video/quasar.c index dbca976269a..84dba504b8f 100644 --- a/src/mame/video/quasar.c +++ b/src/mame/video/quasar.c @@ -103,7 +103,7 @@ VIDEO_START( quasar ) state->save_pointer(NAME(state->effectram), 0x400); } -VIDEO_UPDATE( quasar ) +SCREEN_UPDATE( quasar ) { cvs_state *state = screen->machine->driver_data<cvs_state>(); int offs; diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index 0c718094ff0..f3adea9ce05 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -194,7 +194,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( quizdna ) +SCREEN_UPDATE( quizdna ) { if (quizdna_video_enable) { diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c index 7474f906648..ce1f4b8e35d 100644 --- a/src/mame/video/quizpani.c +++ b/src/mame/video/quizpani.c @@ -79,7 +79,7 @@ VIDEO_START( quizpani ) tilemap_set_transparent_pen(txt_tilemap,15); } -VIDEO_UPDATE( quizpani ) +SCREEN_UPDATE( quizpani ) { tilemap_set_scrollx(bg_tilemap, 0, quizpani_scrollreg[0] - 64); tilemap_set_scrolly(bg_tilemap, 0, quizpani_scrollreg[1] + 16); diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index 671be4a0df1..297aed40eb7 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -148,7 +148,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( raiden ) +SCREEN_UPDATE( raiden ) { /* Setup the tilemaps, alternate version has different scroll positions */ if (!alternate) { diff --git a/src/mame/video/rainbow.c b/src/mame/video/rainbow.c index cc313cdd121..b29c7b85701 100644 --- a/src/mame/video/rainbow.c +++ b/src/mame/video/rainbow.c @@ -42,7 +42,7 @@ WRITE16_HANDLER( jumping_spritectrl_w ) /***************************************************************************/ -VIDEO_UPDATE( rainbow ) +SCREEN_UPDATE( rainbow ) { rainbow_state *state = screen->machine->driver_data<rainbow_state>(); int layer[2]; @@ -87,7 +87,7 @@ VIDEO_START( jumping ) } -VIDEO_UPDATE( jumping ) +SCREEN_UPDATE( jumping ) { rainbow_state *state = screen->machine->driver_data<rainbow_state>(); UINT16 *spriteram = state->spriteram; diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index c8528fb7d7d..274e95a5b73 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -627,7 +627,7 @@ static void locomotn_draw_bullets( running_machine *machine, bitmap_t *bitmap, c } -VIDEO_UPDATE( rallyx ) +SCREEN_UPDATE( rallyx ) { rallyx_state *state = screen->machine->driver_data<rallyx_state>(); /* the radar tilemap is just 8x32. We rely on the tilemap code to repeat it across @@ -661,7 +661,7 @@ VIDEO_UPDATE( rallyx ) } -VIDEO_UPDATE( jungler ) +SCREEN_UPDATE( jungler ) { rallyx_state *state = screen->machine->driver_data<rallyx_state>(); /* the radar tilemap is just 8x32. We rely on the tilemap code to repeat it across @@ -699,7 +699,7 @@ VIDEO_UPDATE( jungler ) } -VIDEO_UPDATE( locomotn ) +SCREEN_UPDATE( locomotn ) { rallyx_state *state = screen->machine->driver_data<rallyx_state>(); /* the radar tilemap is just 8x32. We rely on the tilemap code to repeat it across diff --git a/src/mame/video/rampart.c b/src/mame/video/rampart.c index 8a83ce0c40d..8e82145d06d 100644 --- a/src/mame/video/rampart.c +++ b/src/mame/video/rampart.c @@ -70,7 +70,7 @@ VIDEO_START( rampart ) * *************************************/ -VIDEO_UPDATE( rampart ) +SCREEN_UPDATE( rampart ) { atarimo_rect_list rectlist; bitmap_t *mobitmap; diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c index e61369bca70..402f6a9340d 100644 --- a/src/mame/video/rastan.c +++ b/src/mame/video/rastan.c @@ -31,7 +31,7 @@ WRITE16_HANDLER( rastan_spritectrl_w ) /***************************************************************************/ -VIDEO_UPDATE( rastan ) +SCREEN_UPDATE( rastan ) { rastan_state *state = screen->machine->driver_data<rastan_state>(); int layer[2]; diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index e316f981c08..9275996efff 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -496,7 +496,7 @@ WRITE16_HANDLER( realbrk_vregs_w ) } } -VIDEO_UPDATE(realbrk) +SCREEN_UPDATE(realbrk) { realbrk_state *state = screen->machine->driver_data<realbrk_state>(); int layers_ctrl = -1; @@ -539,7 +539,7 @@ if ( input_code_pressed(screen->machine, KEYCODE_Z) ) } /* DaiDaiKakumei */ -VIDEO_UPDATE(dai2kaku) +SCREEN_UPDATE(dai2kaku) { realbrk_state *state = screen->machine->driver_data<realbrk_state>(); int layers_ctrl = -1; diff --git a/src/mame/video/redalert.c b/src/mame/video/redalert.c index 5af48d79ff6..db0686603cb 100644 --- a/src/mame/video/redalert.c +++ b/src/mame/video/redalert.c @@ -186,7 +186,7 @@ static VIDEO_START( ww3 ) * *************************************/ -static VIDEO_UPDATE( redalert ) +static SCREEN_UPDATE( redalert ) { redalert_state *state = screen->machine->driver_data<redalert_state>(); pen_t pens[NUM_CHARMAP_PENS + NUM_BITMAP_PENS + 1]; @@ -259,7 +259,7 @@ static VIDEO_UPDATE( redalert ) * *************************************/ -static VIDEO_UPDATE( demoneye ) +static SCREEN_UPDATE( demoneye ) { redalert_state *state = screen->machine->driver_data<redalert_state>(); pen_t pens[NUM_CHARMAP_PENS + NUM_BITMAP_PENS + 1]; @@ -334,7 +334,7 @@ static VIDEO_UPDATE( demoneye ) * *************************************/ -static VIDEO_UPDATE( panther ) +static SCREEN_UPDATE( panther ) { redalert_state *state = screen->machine->driver_data<redalert_state>(); pen_t pens[NUM_CHARMAP_PENS + NUM_BITMAP_PENS + 1]; @@ -407,16 +407,13 @@ static VIDEO_UPDATE( panther ) *************************************/ static MACHINE_CONFIG_FRAGMENT( redalert_video_common ) - - MCFG_VIDEO_UPDATE(redalert) - MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) - + MCFG_SCREEN_UPDATE(redalert) MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( redalert_video ) @@ -441,31 +438,28 @@ MACHINE_CONFIG_END *************************************/ MACHINE_CONFIG_FRAGMENT( demoneye_video ) - MCFG_VIDEO_START(redalert) - MCFG_VIDEO_UPDATE(demoneye) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) - + MCFG_SCREEN_UPDATE(demoneye) MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( panther_video ) MCFG_VIDEO_START(ww3) - MCFG_VIDEO_UPDATE(panther) - + MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) - + MCFG_SCREEN_UPDATE(panther) MACHINE_CONFIG_END diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index 166adf7f528..31e6e588fe9 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -315,7 +315,7 @@ void redclash_set_stars_enable( running_machine *machine, UINT8 on ) } /* This sets up which starfield to draw and the offset, */ -/* To be called from VIDEO_EOF() */ +/* To be called from SCREEN_EOF() */ void redclash_update_stars_state( running_machine *machine ) { @@ -418,12 +418,12 @@ void redclash_draw_stars( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_EOF( redclash ) +SCREEN_EOF( redclash ) { redclash_update_stars_state(machine); } -VIDEO_UPDATE( redclash ) +SCREEN_UPDATE( redclash ) { ladybug_state *state = screen->machine->driver_data<ladybug_state>(); diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c index aaa6594e64c..1982ae51916 100644 --- a/src/mame/video/relief.c +++ b/src/mame/video/relief.c @@ -107,7 +107,7 @@ VIDEO_START( relief ) * *************************************/ -VIDEO_UPDATE( relief ) +SCREEN_UPDATE( relief ) { relief_state *state = screen->machine->driver_data<relief_state>(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c index 521fefb7ce1..8533df9b161 100644 --- a/src/mame/video/renegade.c +++ b/src/mame/video/renegade.c @@ -129,7 +129,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( renegade ) +SCREEN_UPDATE( renegade ) { tilemap_set_scrollx(bg_tilemap, 0, renegade_scrollx); tilemap_draw(bitmap, cliprect, bg_tilemap, 0 , 0); diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c index 969a0d20290..4a9078df7a8 100644 --- a/src/mame/video/retofinv.c +++ b/src/mame/video/retofinv.c @@ -229,7 +229,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap) -VIDEO_UPDATE( retofinv ) +SCREEN_UPDATE( retofinv ) { retofinv_state *state = screen->machine->driver_data<retofinv_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,0,0); diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c index 620445f2d53..c2e2bff8a7c 100644 --- a/src/mame/video/rockrage.c +++ b/src/mame/video/rockrage.c @@ -96,7 +96,7 @@ WRITE8_HANDLER( rockrage_vreg_w ) ***************************************************************************/ -VIDEO_UPDATE( rockrage ) +SCREEN_UPDATE( rockrage ) { rockrage_state *state = screen->machine->driver_data<rockrage_state>(); diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index ec904214756..d83621a24b1 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -142,7 +142,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( rocnrope ) +SCREEN_UPDATE( rocnrope ) { rocnrope_state *state = screen->machine->driver_data<rocnrope_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c index 66df1528156..8612adc3ac1 100644 --- a/src/mame/video/rohga.c +++ b/src/mame/video/rohga.c @@ -466,13 +466,13 @@ static void update_rohga( device_t *screen, bitmap_t *bitmap, const rectangle *c deco16ic_tilemap_1_draw(state->deco16ic, bitmap, cliprect, 0, 0); } -VIDEO_UPDATE( rohga ) +SCREEN_UPDATE( rohga ) { update_rohga(screen, bitmap, cliprect, 0); return 0; } -VIDEO_UPDATE( schmeisr ) +SCREEN_UPDATE( schmeisr ) { // The Schmeisr pcb has wire mods which seem to remap sprite palette indices. // Otherwise video update is the same as Rohga. @@ -480,7 +480,7 @@ VIDEO_UPDATE( schmeisr ) return 0; } -VIDEO_UPDATE( wizdfire ) +SCREEN_UPDATE( wizdfire ) { rohga_state *state = screen->machine->driver_data<rohga_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); @@ -513,7 +513,7 @@ VIDEO_UPDATE( wizdfire ) return 0; } -VIDEO_UPDATE( nitrobal ) +SCREEN_UPDATE( nitrobal ) { rohga_state *state = screen->machine->driver_data<rohga_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/rollerg.c b/src/mame/video/rollerg.c index 411711aabad..5e7225a5204 100644 --- a/src/mame/video/rollerg.c +++ b/src/mame/video/rollerg.c @@ -59,7 +59,7 @@ VIDEO_START( rollerg ) ***************************************************************************/ -VIDEO_UPDATE( rollerg ) +SCREEN_UPDATE( rollerg ) { rollerg_state *state = screen->machine->driver_data<rollerg_state>(); int bg_colorbase = 16; diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c index fdfa99e807a..21628935523 100644 --- a/src/mame/video/rollrace.c +++ b/src/mame/video/rollrace.c @@ -101,7 +101,7 @@ WRITE8_HANDLER( rollrace_flipx_w ) state->ra_flipx = data & 0x01; } -VIDEO_UPDATE( rollrace ) +SCREEN_UPDATE( rollrace ) { rollrace_state *state = screen->machine->driver_data<rollrace_state>(); UINT8 *spriteram = screen->machine->generic.spriteram.u8; diff --git a/src/mame/video/route16.c b/src/mame/video/route16.c index fe004dde378..1ecf8063f91 100644 --- a/src/mame/video/route16.c +++ b/src/mame/video/route16.c @@ -79,7 +79,7 @@ static pen_t ttmajng_make_pen(UINT8 color) * a black output. */ -VIDEO_UPDATE( route16 ) +SCREEN_UPDATE( route16 ) { offs_t offs; @@ -184,13 +184,13 @@ static int video_update_stratvox_ttmahjng(running_machine *machine, bitmap_t *bi } -VIDEO_UPDATE( stratvox ) +SCREEN_UPDATE( stratvox ) { return video_update_stratvox_ttmahjng(screen->machine, bitmap, cliprect, route16_make_pen); } -VIDEO_UPDATE( ttmahjng ) +SCREEN_UPDATE( ttmahjng ) { return video_update_stratvox_ttmahjng(screen->machine, bitmap, cliprect, ttmajng_make_pen); } diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index 306d3cb6900..9fef0927728 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -282,7 +282,7 @@ static void draw_bitmap(bitmap_t *bitmap, const rectangle *cliprect) * *************************************/ -VIDEO_UPDATE( rpunch ) +SCREEN_UPDATE( rpunch ) { int effbins; diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c index 7c7dcc62494..591dcc8a7c6 100644 --- a/src/mame/video/runaway.c +++ b/src/mame/video/runaway.c @@ -89,7 +89,7 @@ VIDEO_START( qwak ) -VIDEO_UPDATE( runaway ) +SCREEN_UPDATE( runaway ) { runaway_state *state = screen->machine->driver_data<runaway_state>(); int i; @@ -124,7 +124,7 @@ VIDEO_UPDATE( runaway ) } -VIDEO_UPDATE( qwak ) +SCREEN_UPDATE( qwak ) { runaway_state *state = screen->machine->driver_data<runaway_state>(); int i; diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index 5d02f71c0e1..e15a1f981f6 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -103,7 +103,7 @@ VIDEO_START( rng ) state->sprite_colorbase = 0x20; } -VIDEO_UPDATE(rng) +SCREEN_UPDATE(rng) { rungun_state *state = screen->machine->driver_data<rungun_state>(); diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index 610328e1702..dcd08210b0f 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -154,7 +154,7 @@ static void sauro_draw_sprites(running_machine *machine, bitmap_t *bitmap, const } } -VIDEO_UPDATE( sauro ) +SCREEN_UPDATE( sauro ) { sauro_state *state = screen->machine->driver_data<sauro_state>(); @@ -230,7 +230,7 @@ static void trckydoc_draw_sprites(running_machine *machine, bitmap_t *bitmap, co } } -VIDEO_UPDATE( trckydoc ) +SCREEN_UPDATE( trckydoc ) { sauro_state *state = screen->machine->driver_data<sauro_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index d9b6daaa110..125aa9001c5 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -171,7 +171,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( sbasketb ) +SCREEN_UPDATE( sbasketb ) { sbasketb_state *state = screen->machine->driver_data<sbasketb_state>(); int col; diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c index a09e88bccaa..23e1ffd0127 100644 --- a/src/mame/video/sbugger.c +++ b/src/mame/video/sbugger.c @@ -36,7 +36,7 @@ VIDEO_START(sbugger) state->tilemap = tilemap_create(machine, get_sbugger_tile_info, tilemap_scan_rows, 8, 16, 64, 16); } -VIDEO_UPDATE(sbugger) +SCREEN_UPDATE(sbugger) { sbugger_state *state = screen->machine->driver_data<sbugger_state>(); tilemap_draw(bitmap,cliprect,state->tilemap,0,0); diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index 7b505646756..ad6b49ccbb4 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -138,7 +138,7 @@ VIDEO_START( scotrsht ) tilemap_set_scroll_cols(state->bg_tilemap, 64); } -VIDEO_UPDATE( scotrsht ) +SCREEN_UPDATE( scotrsht ) { scotrsht_state *state = screen->machine->driver_data<scotrsht_state>(); int col; diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index 79b65e21a00..47504609a99 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -108,7 +108,7 @@ VIDEO_START( sderby ) tilemap_set_transparent_pen(state->fg_tilemap,0); } -VIDEO_UPDATE( sderby ) +SCREEN_UPDATE( sderby ) { sderby_state *state = screen->machine->driver_data<sderby_state>(); @@ -119,7 +119,7 @@ VIDEO_UPDATE( sderby ) return 0; } -VIDEO_UPDATE( pmroulet ) +SCREEN_UPDATE( pmroulet ) { sderby_state *state = screen->machine->driver_data<sderby_state>(); diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index 4268bb781d4..1520a796f11 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -811,7 +811,7 @@ static void draw_background_full_scroll(bitmap_t *bitmap, const rectangle *clipr * *************************************/ -VIDEO_UPDATE( segag80r ) +SCREEN_UPDATE( segag80r ) { UINT8 transparent_pens[16]; diff --git a/src/mame/video/segag80v.c b/src/mame/video/segag80v.c index 22d5d9990e7..7531a51efa7 100644 --- a/src/mame/video/segag80v.c +++ b/src/mame/video/segag80v.c @@ -335,9 +335,9 @@ VIDEO_START( segag80v ) } -VIDEO_UPDATE( segag80v ) +SCREEN_UPDATE( segag80v ) { sega_generate_vector_list(screen->machine); - VIDEO_UPDATE_CALL(vector); + SCREEN_UPDATE_CALL(vector); return 0; } diff --git a/src/mame/video/segahang.c b/src/mame/video/segahang.c index 8729c953807..344e2314840 100644 --- a/src/mame/video/segahang.c +++ b/src/mame/video/segahang.c @@ -49,7 +49,7 @@ VIDEO_START( sharrier ) * *************************************/ -VIDEO_UPDATE( hangon ) +SCREEN_UPDATE( hangon ) { /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) diff --git a/src/mame/video/segaorun.c b/src/mame/video/segaorun.c index 14d8bb7844c..6182004d772 100644 --- a/src/mame/video/segaorun.c +++ b/src/mame/video/segaorun.c @@ -49,7 +49,7 @@ VIDEO_START( outrun ) * *************************************/ -VIDEO_UPDATE( shangon ) +SCREEN_UPDATE( shangon ) { /* reset priorities */ bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -80,7 +80,7 @@ VIDEO_UPDATE( shangon ) } -VIDEO_UPDATE( outrun ) +SCREEN_UPDATE( outrun ) { /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) diff --git a/src/mame/video/segas16a.c b/src/mame/video/segas16a.c index e090e4039ee..205db3024d6 100644 --- a/src/mame/video/segas16a.c +++ b/src/mame/video/segas16a.c @@ -33,7 +33,7 @@ VIDEO_START( system16a ) * *************************************/ -VIDEO_UPDATE( system16a ) +SCREEN_UPDATE( system16a ) { /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) diff --git a/src/mame/video/segas16b.c b/src/mame/video/segas16b.c index 6cfaf59816a..1349fb6912e 100644 --- a/src/mame/video/segas16b.c +++ b/src/mame/video/segas16b.c @@ -45,7 +45,7 @@ VIDEO_START( timscanr ) * *************************************/ -VIDEO_UPDATE( system16b ) +SCREEN_UPDATE( system16b ) { /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c index 73b633f1d4c..6861f9e8c42 100644 --- a/src/mame/video/segas18.c +++ b/src/mame/video/segas18.c @@ -148,7 +148,7 @@ static void draw_vdp(device_t *screen, bitmap_t *bitmap, const rectangle *clipre * *************************************/ -VIDEO_UPDATE( system18 ) +SCREEN_UPDATE( system18 ) { segas1x_state *state = screen->machine->driver_data<segas1x_state>(); int vdppri, vdplayer; diff --git a/src/mame/video/segas24.c b/src/mame/video/segas24.c index 40a9eec5954..e2272e162d5 100644 --- a/src/mame/video/segas24.c +++ b/src/mame/video/segas24.c @@ -21,7 +21,7 @@ static int layer_cmp(const void *pl1, const void *pl2) return default_pri[l2] - default_pri[l1]; } -VIDEO_UPDATE(system24) +SCREEN_UPDATE(system24) { int i, level; int order[12], spri[4]; diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index 3d77a25c7c2..9293b8d9c23 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -2422,7 +2422,7 @@ static void print_mixer_data(segas32_state *state, int which) } } -VIDEO_UPDATE( system32 ) +SCREEN_UPDATE( system32 ) { segas32_state *state = screen->machine->driver_data<segas32_state>(); UINT8 enablemask; @@ -2601,7 +2601,7 @@ for (showclip = 0; showclip < 4; showclip++) } -VIDEO_UPDATE( multi32 ) +SCREEN_UPDATE( multi32 ) { segas32_state *state = screen->machine->driver_data<segas32_state>(); UINT8 enablemask; diff --git a/src/mame/video/segaxbd.c b/src/mame/video/segaxbd.c index e711c4cd9c4..837837ac983 100644 --- a/src/mame/video/segaxbd.c +++ b/src/mame/video/segaxbd.c @@ -34,7 +34,7 @@ VIDEO_START( xboard ) * *************************************/ -VIDEO_UPDATE( xboard ) +SCREEN_UPDATE( xboard ) { segas1x_state *state = screen->machine->driver_data<segas1x_state>(); diff --git a/src/mame/video/segaybd.c b/src/mame/video/segaybd.c index 142308bddc9..409cdc5b61a 100644 --- a/src/mame/video/segaybd.c +++ b/src/mame/video/segaybd.c @@ -39,7 +39,7 @@ VIDEO_START( yboard ) * *************************************/ -VIDEO_UPDATE( yboard ) +SCREEN_UPDATE( yboard ) { segas1x_state *state = screen->machine->driver_data<segas1x_state>(); rectangle yboard_clip; diff --git a/src/mame/video/sei_crtc.c b/src/mame/video/sei_crtc.c index 359fd20c32b..a7d7a720351 100644 --- a/src/mame/video/sei_crtc.c +++ b/src/mame/video/sei_crtc.c @@ -269,7 +269,7 @@ VIDEO_START( seibu_crtc ) seibucrtc_sc0bank = 0; } -VIDEO_UPDATE( seibu_crtc ) +SCREEN_UPDATE( seibu_crtc ) { bitmap_fill(bitmap, cliprect, screen->machine->pens[0x7ff]); //black pen diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c index 86c26645cf8..35860041874 100644 --- a/src/mame/video/seibuspi.c +++ b/src/mame/video/seibuspi.c @@ -613,7 +613,7 @@ static void combine_tilemap(running_machine *machine, bitmap_t *bitmap, const re -VIDEO_UPDATE( spi ) +SCREEN_UPDATE( spi ) { INT16 *back_rowscroll, *mid_rowscroll, *fore_rowscroll; if( layer_bank & 0x80000000 ) { @@ -674,7 +674,7 @@ VIDEO_START( sys386f2 ) memset(alpha_table, 0, 8192 * sizeof(UINT8)); } -VIDEO_UPDATE( sys386f2 ) +SCREEN_UPDATE( sys386f2 ) { bitmap_fill(bitmap, cliprect, 0); draw_sprites(screen->machine, bitmap, cliprect, 0); diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c index 76eef4c1311..ec6ed0df2c8 100644 --- a/src/mame/video/seicross.c +++ b/src/mame/video/seicross.c @@ -137,7 +137,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( seicross ) +SCREEN_UPDATE( seicross ) { seicross_state *state = screen->machine->driver_data<seicross_state>(); int col; diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c index ec6404fa67b..429c306bed9 100644 --- a/src/mame/video/senjyo.c +++ b/src/mame/video/senjyo.c @@ -289,7 +289,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( senjyo ) +SCREEN_UPDATE( senjyo ) { senjyo_state *state = screen->machine->driver_data<senjyo_state>(); int i; diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 94de43f5cdc..cf4d842793b 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -982,7 +982,7 @@ static void draw_tilemap_palette_effect(running_machine *machine, bitmap_t *bitm ***************************************************************************/ /* For games without tilemaps */ -VIDEO_UPDATE( seta_no_layers ) +SCREEN_UPDATE( seta_no_layers ) { set_pens(screen->machine); bitmap_fill(bitmap,cliprect,0x1f0); @@ -992,7 +992,7 @@ VIDEO_UPDATE( seta_no_layers ) /* For games with 1 or 2 tilemaps */ -static VIDEO_UPDATE( seta_layers ) +static SCREEN_UPDATE( seta_layers ) { seta_state *state = screen->machine->driver_data<seta_state>(); int layers_ctrl = -1; @@ -1200,22 +1200,22 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) } -VIDEO_UPDATE( seta ) +SCREEN_UPDATE( seta ) { set_pens(screen->machine); - return VIDEO_UPDATE_CALL(seta_layers); + return SCREEN_UPDATE_CALL(seta_layers); } -VIDEO_UPDATE( usclssic ) +SCREEN_UPDATE( usclssic ) { usclssic_set_pens(screen->machine); - return VIDEO_UPDATE_CALL(seta_layers); + return SCREEN_UPDATE_CALL(seta_layers); } -VIDEO_UPDATE( inttoote ) +SCREEN_UPDATE( inttoote ) { /* no palette to set */ - return VIDEO_UPDATE_CALL(seta_layers); + return SCREEN_UPDATE_CALL(seta_layers); } diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c index 45e16f21d42..5e32ff2961b 100644 --- a/src/mame/video/seta2.c +++ b/src/mame/video/seta2.c @@ -375,7 +375,7 @@ VIDEO_START( seta2_offset ) state->yoffset = 0x10; } -VIDEO_UPDATE( seta2 ) +SCREEN_UPDATE( seta2 ) { seta2_state *state = screen->machine->driver_data<seta2_state>(); @@ -388,7 +388,7 @@ VIDEO_UPDATE( seta2 ) return 0; } -VIDEO_EOF( seta2 ) +SCREEN_EOF( seta2 ) { seta2_state *state = machine->driver_data<seta2_state>(); diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index ef02657916c..426774031fa 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -218,7 +218,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta } -VIDEO_UPDATE( sf ) +SCREEN_UPDATE( sf ) { sf_state *state = screen->machine->driver_data<sf_state>(); diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index 3858bf31bd6..0556bdce699 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -162,7 +162,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( shadfrce ) +SCREEN_UPDATE( shadfrce ) { shadfrce_state *state = screen->machine->driver_data<shadfrce_state>(); bitmap_fill(screen->machine->priority_bitmap,cliprect,0); @@ -182,7 +182,7 @@ VIDEO_UPDATE( shadfrce ) return 0; } -VIDEO_EOF( shadfrce ) +SCREEN_EOF( shadfrce ) { shadfrce_state *state = machine->driver_data<shadfrce_state>(); diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c index aee41ed606c..3922db07b3c 100644 --- a/src/mame/video/shangha3.c +++ b/src/mame/video/shangha3.c @@ -261,7 +261,7 @@ else } -VIDEO_UPDATE( shangha3 ) +SCREEN_UPDATE( shangha3 ) { shangha3_state *state = screen->machine->driver_data<shangha3_state>(); diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index 2dac6f01351..f1e9df52208 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -187,7 +187,7 @@ static void shangkid_draw_sprites(running_machine *machine, bitmap_t *bitmap, co } } -VIDEO_UPDATE( shangkid ) +SCREEN_UPDATE( shangkid ) { int flipscreen = shangkid_videoreg[1]&0x80; tilemap_set_flip( background, flipscreen?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); @@ -322,7 +322,7 @@ static void dynamski_draw_sprites(running_machine *machine, bitmap_t *bitmap, co } } -VIDEO_UPDATE( dynamski ) +SCREEN_UPDATE( dynamski ) { dynamski_draw_background(screen->machine, bitmap,cliprect, 0 ); dynamski_draw_sprites(screen->machine, bitmap,cliprect ); diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index e4f8251433a..8903124e87f 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -192,7 +192,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( shaolins ) +SCREEN_UPDATE( shaolins ) { shaolins_state *state = screen->machine->driver_data<shaolins_state>(); diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index 58a75e4cdcb..57f647dbc68 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -62,7 +62,7 @@ VIDEO_START( sichuan2 ) 8, 8, 64, 32); } -VIDEO_UPDATE( sichuan2 ) +SCREEN_UPDATE( sichuan2 ) { shisen_state *state = screen->machine->driver_data<shisen_state>(); diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index db06d786fcb..e18be69b306 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -172,7 +172,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( shootout ) +SCREEN_UPDATE( shootout ) { shootout_state *state = screen->machine->driver_data<shootout_state>(); @@ -184,7 +184,7 @@ VIDEO_UPDATE( shootout ) return 0; } -VIDEO_UPDATE( shootouj ) +SCREEN_UPDATE( shootouj ) { shootout_state *state = screen->machine->driver_data<shootout_state>(); diff --git a/src/mame/video/shuuz.c b/src/mame/video/shuuz.c index 06f6e63a093..eebe0989f4f 100644 --- a/src/mame/video/shuuz.c +++ b/src/mame/video/shuuz.c @@ -88,7 +88,7 @@ VIDEO_START( shuuz ) * *************************************/ -VIDEO_UPDATE( shuuz ) +SCREEN_UPDATE( shuuz ) { shuuz_state *state = screen->machine->driver_data<shuuz_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 838c648a382..746712614be 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -346,7 +346,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( sidearms ) +SCREEN_UPDATE( sidearms ) { sidearms_state *state = screen->machine->driver_data<sidearms_state>(); @@ -366,7 +366,7 @@ VIDEO_UPDATE( sidearms ) return 0; } -VIDEO_EOF( sidearms ) +SCREEN_EOF( sidearms ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 1aa3bf9b812..dda94ce2bbf 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -141,7 +141,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } -VIDEO_UPDATE( sidepckt ) +SCREEN_UPDATE( sidepckt ) { sidepckt_state *state = screen->machine->driver_data<sidepckt_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,TILEMAP_DRAW_LAYER1,0); diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index 4da2e9d50e3..d7e146103e1 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -141,7 +141,7 @@ VIDEO_START(silkroad) tilemap_set_transparent_pen(state->fg3_tilemap, 0); } -VIDEO_UPDATE(silkroad) +SCREEN_UPDATE(silkroad) { silkroad_state *state = screen->machine->driver_data<silkroad_state>(); bitmap_fill(screen->machine->priority_bitmap,cliprect,0); diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c index c6ce0721944..99342a85905 100644 --- a/src/mame/video/simpl156.c +++ b/src/mame/video/simpl156.c @@ -132,7 +132,7 @@ VIDEO_START( simpl156 ) state_save_register_global_pointer(machine, machine->generic.paletteram.u16, 0x1000/2); } -VIDEO_UPDATE( simpl156 ) +SCREEN_UPDATE( simpl156 ) { simpl156_state *state = screen->machine->driver_data<simpl156_state>(); diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c index 550597d8884..f716b3bcbe9 100644 --- a/src/mame/video/simpsons.c +++ b/src/mame/video/simpsons.c @@ -122,7 +122,7 @@ void simpsons_video_banking( running_machine *machine, int bank ) ***************************************************************************/ -VIDEO_UPDATE( simpsons ) +SCREEN_UPDATE( simpsons ) { simpsons_state *state = screen->machine->driver_data<simpsons_state>(); int layer[3], bg_colorbase; diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c index 4bd16313fdd..f42dcf52eeb 100644 --- a/src/mame/video/skullxbo.c +++ b/src/mame/video/skullxbo.c @@ -242,7 +242,7 @@ void skullxbo_scanline_update(running_machine *machine, int scanline) * *************************************/ -VIDEO_UPDATE( skullxbo ) +SCREEN_UPDATE( skullxbo ) { skullxbo_state *state = screen->machine->driver_data<skullxbo_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c index 5b7c812f89c..d04b45e4be1 100644 --- a/src/mame/video/skydiver.c +++ b/src/mame/video/skydiver.c @@ -206,7 +206,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( skydiver ) +SCREEN_UPDATE( skydiver ) { skydiver_state *state = screen->machine->driver_data<skydiver_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,0,0); diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c index bcf879bb9e5..b09a5fe9533 100644 --- a/src/mame/video/skyfox.c +++ b/src/mame/video/skyfox.c @@ -281,7 +281,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re ***************************************************************************/ -VIDEO_UPDATE( skyfox ) +SCREEN_UPDATE( skyfox ) { bitmap_fill(bitmap, cliprect, 255); // the bg is black draw_background(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c index fb96281bc94..2202a265edd 100644 --- a/src/mame/video/skykid.c +++ b/src/mame/video/skykid.c @@ -236,7 +236,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } -VIDEO_UPDATE( skykid ) +SCREEN_UPDATE( skykid ) { skykid_state *state = screen->machine->driver_data<skykid_state>(); if (flip_screen_get(screen->machine)) diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c index ea9eb4b07f0..2ac7ec22ee9 100644 --- a/src/mame/video/skyraid.c +++ b/src/mame/video/skyraid.c @@ -138,7 +138,7 @@ static void draw_trapezoid(running_machine *machine, bitmap_t* dst, bitmap_t* sr } -VIDEO_UPDATE( skyraid ) +SCREEN_UPDATE( skyraid ) { skyraid_state *state = screen->machine->driver_data<skyraid_state>(); diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index 32ecf8e20db..7b322275dd9 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -185,7 +185,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( perfrman ) +SCREEN_UPDATE( perfrman ) { tilemap_set_flip( pf1_tilemap, flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); tilemap_set_scrolly( pf1_tilemap ,0 , 0 ); @@ -206,7 +206,7 @@ VIDEO_UPDATE( perfrman ) } -VIDEO_UPDATE( slapfight ) +SCREEN_UPDATE( slapfight ) { UINT8 *buffered_spriteram = screen->machine->generic.buffered_spriteram.u8; int offs; diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c index 8438fce1e9c..d1022638a08 100644 --- a/src/mame/video/slapshot.c +++ b/src/mame/video/slapshot.c @@ -428,7 +428,7 @@ static void taito_update_sprites_active_area( running_machine *machine ) } } -VIDEO_EOF( taito_no_buffer ) +SCREEN_EOF( taito_no_buffer ) { slapshot_state *state = machine->driver_data<slapshot_state>(); @@ -454,7 +454,7 @@ One exception is the "puck" in early attract which is a bg layer given priority over some sprites. ********************************************************************/ -VIDEO_UPDATE( slapshot ) +SCREEN_UPDATE( slapshot ) { slapshot_state *state = screen->machine->driver_data<slapshot_state>(); UINT8 layer[5]; diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c index 9116c1abfef..a4a4cee305c 100644 --- a/src/mame/video/snes.c +++ b/src/mame/video/snes.c @@ -1789,7 +1789,7 @@ VIDEO_START( snes ) state_save_register_global_pointer(machine, snes_oam, SNES_OAM_SIZE/2); } -VIDEO_UPDATE( snes ) +SCREEN_UPDATE( snes ) { int y; diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c index 6bee1b776cc..dacd05eaf73 100644 --- a/src/mame/video/snk.c +++ b/src/mame/video/snk.c @@ -990,7 +990,7 @@ static void tdfever_draw_sprites(running_machine *machine, bitmap_t *bitmap, con /**************************************************************/ -VIDEO_UPDATE( marvins ) +SCREEN_UPDATE( marvins ) { snk_state *state = screen->machine->driver_data<snk_state>(); @@ -1009,7 +1009,7 @@ VIDEO_UPDATE( marvins ) } -VIDEO_UPDATE( tnk3 ) +SCREEN_UPDATE( tnk3 ) { snk_state *state = screen->machine->driver_data<snk_state>(); @@ -1024,7 +1024,7 @@ VIDEO_UPDATE( tnk3 ) } -VIDEO_UPDATE( ikari ) +SCREEN_UPDATE( ikari ) { snk_state *state = screen->machine->driver_data<snk_state>(); @@ -1042,7 +1042,7 @@ VIDEO_UPDATE( ikari ) } -VIDEO_UPDATE( gwar ) +SCREEN_UPDATE( gwar ) { snk_state *state = screen->machine->driver_data<snk_state>(); @@ -1061,7 +1061,7 @@ VIDEO_UPDATE( gwar ) } -VIDEO_UPDATE( tdfever ) +SCREEN_UPDATE( tdfever ) { snk_state *state = screen->machine->driver_data<snk_state>(); diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c index d6bdeb07c15..ea351741258 100644 --- a/src/mame/video/snk6502.c +++ b/src/mame/video/snk6502.c @@ -203,7 +203,7 @@ VIDEO_START( pballoon ) } -VIDEO_UPDATE( snk6502 ) +SCREEN_UPDATE( snk6502 ) { snk6502_state *state = screen->machine->driver_data<snk6502_state>(); diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 0e2b7ddff7a..f931c923c10 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -288,7 +288,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( pow ) +SCREEN_UPDATE( pow ) { snk68_state *state = screen->machine->driver_data<snk68_state>(); diff --git a/src/mame/video/snookr10.c b/src/mame/video/snookr10.c index 9c113d22004..1b47f58ccef 100644 --- a/src/mame/video/snookr10.c +++ b/src/mame/video/snookr10.c @@ -185,7 +185,7 @@ VIDEO_START( apple10 ) bg_tilemap = tilemap_create(machine, apple10_get_bg_tile_info, tilemap_scan_rows, 4, 8, 128, 30); } -VIDEO_UPDATE( snookr10 ) +SCREEN_UPDATE( snookr10 ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index 6204e30bd9e..ce72c0036f9 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -107,7 +107,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( solomon ) +SCREEN_UPDATE( solomon ) { solomon_state *state = screen->machine->driver_data<solomon_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index be5b80855ca..82ef42679f5 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -175,7 +175,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( sonson ) +SCREEN_UPDATE( sonson ) { sonson_state *state = screen->machine->driver_data<sonson_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/spacefb.c b/src/mame/video/spacefb.c index 057703fd9f4..e3f964ec85a 100644 --- a/src/mame/video/spacefb.c +++ b/src/mame/video/spacefb.c @@ -401,7 +401,7 @@ static void draw_objects(running_machine *machine, bitmap_t *bitmap, const recta * *************************************/ -VIDEO_UPDATE( spacefb ) +SCREEN_UPDATE( spacefb ) { draw_objects(screen->machine, bitmap, cliprect); draw_starfield(*screen, bitmap, cliprect); diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c index 0737969b316..a6a72dc6a6e 100644 --- a/src/mame/video/spbactn.c +++ b/src/mame/video/spbactn.c @@ -118,7 +118,7 @@ VIDEO_START( spbactn ) state->tile_bitmap_fg = auto_bitmap_alloc(machine, width, height, BITMAP_FORMAT_INDEXED16); } -VIDEO_UPDATE( spbactn ) +SCREEN_UPDATE( spbactn ) { spbactn_state *state = screen->machine->driver_data<spbactn_state>(); int offs, sx, sy; diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c index f14c3fe54bd..54d219db47c 100644 --- a/src/mame/video/spcforce.c +++ b/src/mame/video/spcforce.c @@ -16,7 +16,7 @@ WRITE8_HANDLER( spcforce_flip_screen_w ) } -VIDEO_UPDATE( spcforce ) +SCREEN_UPDATE( spcforce ) { spcforce_state *state = screen->machine->driver_data<spcforce_state>(); int offs; diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index 7239dce48b8..461e1736253 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -213,7 +213,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta #undef DRAW_SPRITE -VIDEO_UPDATE( spdodgeb ) +SCREEN_UPDATE( spdodgeb ) { tilemap_set_scrollx(bg_tilemap,0,lastscroll+5); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); diff --git a/src/mame/video/speedatk.c b/src/mame/video/speedatk.c index c5d8a2c3f56..793a824058c 100644 --- a/src/mame/video/speedatk.c +++ b/src/mame/video/speedatk.c @@ -87,7 +87,7 @@ WRITE8_HANDLER( speedatk_6845_w ) } } -VIDEO_UPDATE( speedatk ) +SCREEN_UPDATE( speedatk ) { speedatk_state *state = screen->machine->driver_data<speedatk_state>(); int x,y; diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c index cd13283262f..d79ff7ea55a 100644 --- a/src/mame/video/speedbal.c +++ b/src/mame/video/speedbal.c @@ -125,7 +125,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta * * *************************************/ -VIDEO_UPDATE( speedbal ) +SCREEN_UPDATE( speedbal ) { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER1, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, TILEMAP_DRAW_LAYER1, 0); diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c index 0c01725cfcb..0f23520fb99 100644 --- a/src/mame/video/speedspn.c +++ b/src/mame/video/speedspn.c @@ -90,7 +90,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE(speedspn) +SCREEN_UPDATE(speedspn) { if (speedspn_display_disable) { diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c index ffcd8e70e89..cc4d9044e5c 100644 --- a/src/mame/video/splash.c +++ b/src/mame/video/splash.c @@ -256,7 +256,7 @@ static void funystrp_draw_sprites(running_machine *machine, bitmap_t *bitmap,con ***************************************************************************/ -VIDEO_UPDATE( splash ) +SCREEN_UPDATE( splash ) { splash_state *state = screen->machine->driver_data<splash_state>(); @@ -272,7 +272,7 @@ VIDEO_UPDATE( splash ) return 0; } -VIDEO_UPDATE( funystrp ) +SCREEN_UPDATE( funystrp ) { splash_state *state = screen->machine->driver_data<splash_state>(); diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c index 49d6d6e37f0..70390b547b3 100644 --- a/src/mame/video/sprcros2.c +++ b/src/mame/video/sprcros2.c @@ -194,7 +194,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( sprcros2 ) +SCREEN_UPDATE( sprcros2 ) { sprcros2_state *state = screen->machine->driver_data<sprcros2_state>(); diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c index ab23143b9fe..fedbc05527d 100644 --- a/src/mame/video/sprint2.c +++ b/src/mame/video/sprint2.c @@ -121,7 +121,7 @@ INLINE int get_sprite_y(UINT8 *video_ram, int n) } -VIDEO_UPDATE( sprint2 ) +SCREEN_UPDATE( sprint2 ) { sprint2_state *state = screen->machine->driver_data<sprint2_state>(); UINT8 *video_ram = state->video_ram; @@ -144,7 +144,7 @@ VIDEO_UPDATE( sprint2 ) } -VIDEO_EOF( sprint2 ) +SCREEN_EOF( sprint2 ) { sprint2_state *state = machine->driver_data<sprint2_state>(); UINT8 *video_ram = state->video_ram; diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c index 85aed50be56..a0c9898c0e9 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -57,7 +57,7 @@ VIDEO_START( sprint4 ) } -VIDEO_UPDATE( sprint4 ) +SCREEN_UPDATE( sprint4 ) { sprint4_state *state = screen->machine->driver_data<sprint4_state>(); UINT8 *videoram = state->videoram; @@ -88,7 +88,7 @@ VIDEO_UPDATE( sprint4 ) } -VIDEO_EOF( sprint4 ) +SCREEN_EOF( sprint4 ) { sprint4_state *state = machine->driver_data<sprint4_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c index 22384ad80e9..2886f94e8ed 100644 --- a/src/mame/video/sprint8.c +++ b/src/mame/video/sprint8.c @@ -158,7 +158,7 @@ static TIMER_CALLBACK( sprint8_collision_callback ) } -VIDEO_UPDATE( sprint8 ) +SCREEN_UPDATE( sprint8 ) { sprint8_state *state = screen->machine->driver_data<sprint8_state>(); set_pens(state, screen->machine->colortable); @@ -168,7 +168,7 @@ VIDEO_UPDATE( sprint8 ) } -VIDEO_EOF( sprint8 ) +SCREEN_EOF( sprint8 ) { sprint8_state *state = machine->driver_data<sprint8_state>(); int x; diff --git a/src/mame/video/spy.c b/src/mame/video/spy.c index 947085d5c01..fae44b625d7 100644 --- a/src/mame/video/spy.c +++ b/src/mame/video/spy.c @@ -62,7 +62,7 @@ VIDEO_START( spy ) ***************************************************************************/ -VIDEO_UPDATE( spy ) +SCREEN_UPDATE( spy ) { spy_state *state = screen->machine->driver_data<spy_state>(); diff --git a/src/mame/video/srmp2.c b/src/mame/video/srmp2.c index 82484cee7b0..6e3004be5b4 100644 --- a/src/mame/video/srmp2.c +++ b/src/mame/video/srmp2.c @@ -439,7 +439,7 @@ static void mjyuugi_draw_sprites(running_machine *machine, bitmap_t *bitmap, con } -VIDEO_UPDATE( srmp2 ) +SCREEN_UPDATE( srmp2 ) { bitmap_fill(bitmap, cliprect, 0x1ff); srmp2_draw_sprites(screen->machine, bitmap, cliprect); @@ -447,7 +447,7 @@ VIDEO_UPDATE( srmp2 ) } -VIDEO_UPDATE( srmp3 ) +SCREEN_UPDATE( srmp3 ) { bitmap_fill(bitmap, cliprect, 0x1f0); srmp3_draw_sprites(screen->machine, bitmap, cliprect); @@ -455,7 +455,7 @@ VIDEO_UPDATE( srmp3 ) } -VIDEO_UPDATE( mjyuugi ) +SCREEN_UPDATE( mjyuugi ) { bitmap_fill(bitmap, cliprect, 0x1f0); mjyuugi_draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index 02662b25b07..656d52a88f3 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -160,7 +160,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( srumbler ) +SCREEN_UPDATE( srumbler ) { srumbler_state *state = screen->machine->driver_data<srumbler_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,TILEMAP_DRAW_LAYER1,0); @@ -170,7 +170,7 @@ VIDEO_UPDATE( srumbler ) return 0; } -VIDEO_EOF( srumbler ) +SCREEN_EOF( srumbler ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index 12363ed125a..89f863487bf 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -172,7 +172,7 @@ VIDEO_START( sshangha ) /******************************************************************************/ -VIDEO_UPDATE( sshangha ) +SCREEN_UPDATE( sshangha ) { sshangha_state *state = screen->machine->driver_data<sshangha_state>(); int offs; diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index bba1634cf68..2f95a2f22bf 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -191,7 +191,7 @@ VIDEO_START(powerbls) state->save_item(NAME(state->sprites_x_offset)); } -VIDEO_UPDATE(sslam) +SCREEN_UPDATE(sslam) { sslam_state *state = screen->machine->driver_data<sslam_state>(); @@ -231,7 +231,7 @@ VIDEO_UPDATE(sslam) return 0; } -VIDEO_UPDATE(powerbls) +SCREEN_UPDATE(powerbls) { sslam_state *state = screen->machine->driver_data<sslam_state>(); diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index e0e83307911..b74468e73bd 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -184,7 +184,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( ssozumo ) +SCREEN_UPDATE( ssozumo ) { ssozumo_state *state = screen->machine->driver_data<ssozumo_state>(); diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c index b2af4c2a40d..b2279b254a0 100644 --- a/src/mame/video/sspeedr.c +++ b/src/mame/video/sspeedr.c @@ -258,7 +258,7 @@ VIDEO_START( sspeedr ) } -VIDEO_UPDATE( sspeedr ) +SCREEN_UPDATE( sspeedr ) { draw_track(screen->machine, bitmap); draw_drones(screen->machine, bitmap, cliprect); @@ -267,7 +267,7 @@ VIDEO_UPDATE( sspeedr ) } -VIDEO_EOF( sspeedr ) +SCREEN_EOF( sspeedr ) { sspeedr_state *state = machine->driver_data<sspeedr_state>(); state->toggle ^= 1; diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c index 557909b641d..dba538dbd53 100644 --- a/src/mame/video/ssrj.c +++ b/src/mame/video/ssrj.c @@ -273,7 +273,7 @@ PALETTE_INIT( ssrj ) palette_set_color_rgb(machine, i*8+j, fakecols[i][j][0], fakecols[i][j][1], fakecols[i][j][2]); } -VIDEO_UPDATE( ssrj ) +SCREEN_UPDATE( ssrj ) { ssrj_state *state = screen->machine->driver_data<ssrj_state>(); diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 0dd6d5572b9..75373440e90 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -984,9 +984,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ***************************************************************************/ -VIDEO_UPDATE( eaglshot ) +SCREEN_UPDATE( eaglshot ) { - return VIDEO_UPDATE_CALL(ssv); + return SCREEN_UPDATE_CALL(ssv); } /* @@ -1165,12 +1165,12 @@ static void gdfs_draw_zooming_sprites(running_machine *machine, bitmap_t *bitmap } /* sprites list */ } -VIDEO_UPDATE( gdfs ) +SCREEN_UPDATE( gdfs ) { ssv_state *state = screen->machine->driver_data<ssv_state>(); int pri; - VIDEO_UPDATE_CALL(ssv); + SCREEN_UPDATE_CALL(ssv); for (pri = 0; pri <= 0xf; pri++) gdfs_draw_zooming_sprites(screen->machine, bitmap, cliprect, pri); @@ -1189,7 +1189,7 @@ void ssv_enable_video(running_machine *machine, int enable) state->enable_video = enable; } -VIDEO_UPDATE( ssv ) +SCREEN_UPDATE( ssv ) { rectangle clip = { 0, 0, 0, 0 }; diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c index e039f9882fb..7d4432776ce 100644 --- a/src/mame/video/st0016.c +++ b/src/mame/video/st0016.c @@ -596,7 +596,7 @@ static void draw_bgmap(running_machine *machine, bitmap_t *bitmap,const rectangl *BITMAP_ADDR32(bitmap, y, x) = (b) | ((g)<<8) | ((r)<<16); \ } -VIDEO_UPDATE( st0016 ) +SCREEN_UPDATE( st0016 ) { #ifdef MAME_DEBUG diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c index 8366df3c329..dc281816e36 100644 --- a/src/mame/video/stactics.c +++ b/src/mame/video/stactics.c @@ -388,7 +388,7 @@ static VIDEO_START( stactics ) * *************************************/ -static VIDEO_UPDATE( stactics ) +static SCREEN_UPDATE( stactics ) { stactics_state *state = screen->machine->driver_data<stactics_state>(); @@ -419,10 +419,10 @@ MACHINE_CONFIG_FRAGMENT( stactics_video ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) + MCFG_SCREEN_UPDATE(stactics) MCFG_PALETTE_LENGTH(0x400) MCFG_PALETTE_INIT(stactics) MCFG_VIDEO_START(stactics) - MCFG_VIDEO_UPDATE(stactics) MACHINE_CONFIG_END diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index 16467d496d8..b5863d7f957 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -81,7 +81,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan /******************************************************************************/ -VIDEO_UPDATE( stadhero ) +SCREEN_UPDATE( stadhero ) { stadhero_state *state = screen->machine->driver_data<stadhero_state>(); state->flipscreen=state->pf2_control_0[0]&0x80; diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c index a213ef5ef67..e05022c9217 100644 --- a/src/mame/video/starcrus.c +++ b/src/mame/video/starcrus.c @@ -425,7 +425,7 @@ static int collision_check_s2p1p2(running_machine *machine) return 0; } -VIDEO_UPDATE( starcrus ) +SCREEN_UPDATE( starcrus ) { starcrus_state *state = screen->machine->driver_data<starcrus_state>(); diff --git a/src/mame/video/starfire.c b/src/mame/video/starfire.c index 6c14f8531f2..0f322269092 100644 --- a/src/mame/video/starfire.c +++ b/src/mame/video/starfire.c @@ -268,7 +268,7 @@ static TIMER_CALLBACK( starfire_scanline_callback ) state->scanline_timer->adjust(machine->primary_screen->time_until_pos(y), y); } -VIDEO_UPDATE( starfire ) +SCREEN_UPDATE( starfire ) { starfire_state *state = screen->machine->driver_data<starfire_state>(); copybitmap(bitmap, state->starfire_screen, 0, 0, 0, 0, cliprect); diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index 05361af95d0..3a31054cf20 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -356,7 +356,7 @@ static int circle_collision(starshp1_state *state, const rectangle *rect) } -VIDEO_UPDATE( starshp1 ) +SCREEN_UPDATE( starshp1 ) { starshp1_state *state = screen->machine->driver_data<starshp1_state>(); set_pens(state, screen->machine->colortable); @@ -386,7 +386,7 @@ VIDEO_UPDATE( starshp1 ) } -VIDEO_EOF( starshp1 ) +SCREEN_EOF( starshp1 ) { starshp1_state *state = machine->driver_data<starshp1_state>(); rectangle rect; diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c index 134b2f716d2..8e609406c0d 100644 --- a/src/mame/video/stfight.c +++ b/src/mame/video/stfight.c @@ -293,7 +293,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( stfight ) +SCREEN_UPDATE( stfight ) { set_pens(screen->machine); diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index 0d4500e0fe4..e8810f86176 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -131,7 +131,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( stlforce ) +SCREEN_UPDATE( stlforce ) { stlforce_state *state = screen->machine->driver_data<stlforce_state>(); int i; diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index ea7787ec90f..eb622046479 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -126,7 +126,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( strnskil ) +SCREEN_UPDATE( strnskil ) { int row; const UINT8 *usr1 = screen->machine->region("user1")->base(); diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index 8df85a4403c..95079bfa826 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -6309,7 +6309,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta stv_sprite_priorities_usage_valid = 1; } -VIDEO_UPDATE( stv_vdp2 ) +SCREEN_UPDATE( stv_vdp2 ) { static UINT8 pri; video_update_vdp1(screen->machine); diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c index 06ce9995362..3cee3321d6c 100644 --- a/src/mame/video/subs.c +++ b/src/mame/video/subs.c @@ -37,7 +37,7 @@ WRITE8_HANDLER( subs_invert2_w ) } -VIDEO_UPDATE( subs ) +SCREEN_UPDATE( subs ) { subs_state *state = screen->machine->driver_data<subs_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c index 17835502230..9b021b91991 100644 --- a/src/mame/video/suna16.c +++ b/src/mame/video/suna16.c @@ -221,7 +221,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ***************************************************************************/ -VIDEO_UPDATE( suna16 ) +SCREEN_UPDATE( suna16 ) { suna16_state *state = screen->machine->driver_data<suna16_state>(); @@ -231,7 +231,7 @@ VIDEO_UPDATE( suna16 ) return 0; } -VIDEO_UPDATE( bestbest ) +SCREEN_UPDATE( bestbest ) { suna16_state *state = screen->machine->driver_data<suna16_state>(); int layers_ctrl = -1; diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index 6c587715f7e..c35cc165029 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -412,7 +412,7 @@ static void draw_text_sprites(running_machine *machine, bitmap_t *bitmap,const r ***************************************************************************/ -VIDEO_UPDATE( suna8 ) +SCREEN_UPDATE( suna8 ) { /* see hardhead, hardhea2 test mode (press button 2 for both players) */ bitmap_fill(bitmap,cliprect,0xff); diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c index da0e8469b79..a59e1875ebd 100644 --- a/src/mame/video/supbtime.c +++ b/src/mame/video/supbtime.c @@ -88,7 +88,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /******************************************************************************/ -VIDEO_UPDATE(supbtime) +SCREEN_UPDATE(supbtime) { supbtime_state *state = screen->machine->driver_data<supbtime_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c index 61e97e8d045..2f9d3c34e8b 100644 --- a/src/mame/video/superchs.c +++ b/src/mame/video/superchs.c @@ -199,7 +199,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( superchs ) +SCREEN_UPDATE( superchs ) { device_t *tc0480scp = screen->machine->device("tc0480scp"); UINT8 layer[5]; diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index 0cf64971d5a..55612c92841 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -227,7 +227,7 @@ static void superqix_draw_sprites(running_machine *machine, bitmap_t *bitmap,con } } -VIDEO_UPDATE( pbillian ) +SCREEN_UPDATE( pbillian ) { superqix_state *state = screen->machine->driver_data<superqix_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -254,7 +254,7 @@ VIDEO_UPDATE( pbillian ) return 0; } -VIDEO_UPDATE( superqix ) +SCREEN_UPDATE( superqix ) { superqix_state *state = screen->machine->driver_data<superqix_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_LAYER1, 0); diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c index 9a765c35513..2d5716ca384 100644 --- a/src/mame/video/suprloco.c +++ b/src/mame/video/suprloco.c @@ -268,7 +268,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( suprloco ) +SCREEN_UPDATE( suprloco ) { suprloco_state *state = screen->machine->driver_data<suprloco_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,0,0); diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index f184507bf1b..e5315f7aab6 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -1007,7 +1007,7 @@ static void supernova_draw_b( bitmap_t *bitmap, bitmap_t* bitmap_flags, const re } } -VIDEO_UPDATE(skns) +SCREEN_UPDATE(skns) { palette_update(screen->machine); @@ -1187,7 +1187,7 @@ VIDEO_UPDATE(skns) return 0; } -VIDEO_EOF(skns) +SCREEN_EOF(skns) { } diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c index 953730b3868..f82dfe1645c 100644 --- a/src/mame/video/suprridr.c +++ b/src/mame/video/suprridr.c @@ -165,7 +165,7 @@ WRITE8_HANDLER( suprridr_fgram_w ) * *************************************/ -VIDEO_UPDATE( suprridr ) +SCREEN_UPDATE( suprridr ) { UINT8 *spriteram = screen->machine->generic.spriteram.u8; rectangle subclip; diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c index e04cff19b64..c45b71127e4 100644 --- a/src/mame/video/suprslam.c +++ b/src/mame/video/suprslam.c @@ -152,7 +152,7 @@ VIDEO_START( suprslam ) tilemap_set_transparent_pen(state->screen_tilemap, 15); } -VIDEO_UPDATE( suprslam ) +SCREEN_UPDATE( suprslam ) { suprslam_state *state = screen->machine->driver_data<suprslam_state>(); tilemap_set_scrollx( state->screen_tilemap,0, state->screen_vregs[0x04/2] ); diff --git a/src/mame/video/surpratk.c b/src/mame/video/surpratk.c index 329b4df50b9..2695d4d0483 100644 --- a/src/mame/video/surpratk.c +++ b/src/mame/video/surpratk.c @@ -46,7 +46,7 @@ void surpratk_sprite_callback( running_machine *machine, int *code, int *color, ***************************************************************************/ -VIDEO_UPDATE( surpratk ) +SCREEN_UPDATE( surpratk ) { surpratk_state *state = screen->machine->driver_data<surpratk_state>(); int layer[3], bg_colorbase; diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c index 3cf49f6008c..71fd04f9afc 100644 --- a/src/mame/video/system1.c +++ b/src/mame/video/system1.c @@ -553,7 +553,7 @@ static void video_update_common(device_t *screen, bitmap_t *bitmap, const rectan * *************************************/ -VIDEO_UPDATE( system1 ) +SCREEN_UPDATE( system1 ) { system1_state *state = screen->machine->driver_data<system1_state>(); UINT8 *videoram = state->videoram; @@ -589,7 +589,7 @@ VIDEO_UPDATE( system1 ) } -VIDEO_UPDATE( system2 ) +SCREEN_UPDATE( system2 ) { system1_state *state = screen->machine->driver_data<system1_state>(); UINT8 *videoram = state->videoram; @@ -632,7 +632,7 @@ VIDEO_UPDATE( system2 ) } -VIDEO_UPDATE( system2_rowscroll ) +SCREEN_UPDATE( system2_rowscroll ) { system1_state *state = screen->machine->driver_data<system1_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index 98e2ca4a11f..9a33dba1def 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -629,7 +629,7 @@ VIDEO_START( s16a_bootleg_passsht ) } // Passing Shot (2 player), Shinobi (Datsu), Wonderboy 3 -VIDEO_UPDATE( s16a_bootleg ) +SCREEN_UPDATE( s16a_bootleg ) { segas1x_bootleg_state *state = screen->machine->driver_data<segas1x_bootleg_state>(); @@ -687,7 +687,7 @@ VIDEO_UPDATE( s16a_bootleg ) } /* The Passing Shot 4 Player bootleg has weird scroll registers (different offsets, ^0x7 xor) */ -VIDEO_UPDATE( s16a_bootleg_passht4b ) +SCREEN_UPDATE( s16a_bootleg_passht4b ) { segas1x_bootleg_state *state = screen->machine->driver_data<segas1x_bootleg_state>(); @@ -730,7 +730,7 @@ VIDEO_UPDATE( s16a_bootleg_passht4b ) /***************************************************************************/ -VIDEO_UPDATE( system16 ) +SCREEN_UPDATE( system16 ) { segas1x_bootleg_state *state = screen->machine->driver_data<segas1x_bootleg_state>(); @@ -776,7 +776,7 @@ VIDEO_UPDATE( system16 ) } -VIDEO_UPDATE( system18old ) +SCREEN_UPDATE( system18old ) { segas1x_bootleg_state *state = screen->machine->driver_data<segas1x_bootleg_state>(); diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index 46d6b424acc..ad8bad97f8a 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -180,7 +180,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( tagteam ) +SCREEN_UPDATE( tagteam ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index 6c77ab5f6c7..4c9e6436af0 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -177,7 +177,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( tail2nos ) +SCREEN_UPDATE( tail2nos ) { tail2nos_state *state = screen->machine->driver_data<tail2nos_state>(); diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c index dd932e46bcd..063277205ef 100644 --- a/src/mame/video/taito_b.c +++ b/src/mame/video/taito_b.c @@ -359,7 +359,7 @@ g_profiler.start(PROFILER_USER1); g_profiler.stop(); } -VIDEO_UPDATE( taitob ) +SCREEN_UPDATE( taitob ) { taitob_state *state = screen->machine->driver_data<taitob_state>(); UINT8 video_control = tc0180vcu_get_videoctrl(state->tc0180vcu, 0); @@ -395,7 +395,7 @@ VIDEO_UPDATE( taitob ) -VIDEO_EOF( taitob ) +SCREEN_EOF( taitob ) { taitob_state *state = machine->driver_data<taitob_state>(); UINT8 video_control = tc0180vcu_get_videoctrl(state->tc0180vcu, 0); diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c index 0887dff6e3d..b9f26121a48 100644 --- a/src/mame/video/taito_f2.c +++ b/src/mame/video/taito_f2.c @@ -894,7 +894,7 @@ static void taitof2_update_sprites_active_area( running_machine *machine ) } -VIDEO_EOF( taitof2_no_buffer ) +SCREEN_EOF( taitof2_no_buffer ) { taitof2_state *state = machine->driver_data<taitof2_state>(); @@ -903,7 +903,7 @@ VIDEO_EOF( taitof2_no_buffer ) state->prepare_sprites = 1; } -VIDEO_EOF( taitof2_full_buffer_delayed ) +SCREEN_EOF( taitof2_full_buffer_delayed ) { taitof2_state *state = machine->driver_data<taitof2_state>(); UINT16 *spriteram = state->spriteram; @@ -918,7 +918,7 @@ VIDEO_EOF( taitof2_full_buffer_delayed ) memcpy(state->spriteram_delayed, spriteram, state->spriteram_size); } -VIDEO_EOF( taitof2_partial_buffer_delayed ) +SCREEN_EOF( taitof2_partial_buffer_delayed ) { taitof2_state *state = machine->driver_data<taitof2_state>(); UINT16 *spriteram = state->spriteram; @@ -933,7 +933,7 @@ VIDEO_EOF( taitof2_partial_buffer_delayed ) memcpy(state->spriteram_delayed, spriteram, state->spriteram_size); } -VIDEO_EOF( taitof2_partial_buffer_delayed_thundfox ) +SCREEN_EOF( taitof2_partial_buffer_delayed_thundfox ) { taitof2_state *state = machine->driver_data<taitof2_state>(); UINT16 *spriteram = state->spriteram; @@ -952,7 +952,7 @@ VIDEO_EOF( taitof2_partial_buffer_delayed_thundfox ) memcpy(state->spriteram_delayed, spriteram, state->spriteram_size); } -VIDEO_EOF( taitof2_partial_buffer_delayed_qzchikyu ) +SCREEN_EOF( taitof2_partial_buffer_delayed_qzchikyu ) { /* spriteram[2] and [3] are 1 frame behind... probably thundfox_eof_callback would work fine */ @@ -979,7 +979,7 @@ VIDEO_EOF( taitof2_partial_buffer_delayed_qzchikyu ) /* SSI */ -VIDEO_UPDATE( taitof2_ssi ) +SCREEN_UPDATE( taitof2_ssi ) { taitof2_handle_sprite_buffering(screen->machine); @@ -992,7 +992,7 @@ VIDEO_UPDATE( taitof2_ssi ) } -VIDEO_UPDATE( taitof2_yesnoj ) +SCREEN_UPDATE( taitof2_yesnoj ) { taitof2_state *state = screen->machine->driver_data<taitof2_state>(); @@ -1010,7 +1010,7 @@ VIDEO_UPDATE( taitof2_yesnoj ) } -VIDEO_UPDATE( taitof2 ) +SCREEN_UPDATE( taitof2 ) { taitof2_state *state = screen->machine->driver_data<taitof2_state>(); @@ -1028,7 +1028,7 @@ VIDEO_UPDATE( taitof2 ) } -VIDEO_UPDATE( taitof2_pri ) +SCREEN_UPDATE( taitof2_pri ) { taitof2_state *state = screen->machine->driver_data<taitof2_state>(); int layer[3]; @@ -1075,7 +1075,7 @@ static void draw_roz_layer( running_machine *machine, bitmap_t *bitmap, const re tc0430grw_zoom_draw(state->tc0430grw, bitmap, cliprect, state->pivot_xdisp, state->pivot_ydisp, priority); } -VIDEO_UPDATE( taitof2_pri_roz ) +SCREEN_UPDATE( taitof2_pri_roz ) { taitof2_state *state = screen->machine->driver_data<taitof2_state>(); int tilepri[3]; @@ -1144,7 +1144,7 @@ VIDEO_UPDATE( taitof2_pri_roz ) /* Thunderfox */ -VIDEO_UPDATE( taitof2_thundfox ) +SCREEN_UPDATE( taitof2_thundfox ) { taitof2_state *state = screen->machine->driver_data<taitof2_state>(); int tilepri[2][3]; @@ -1281,7 +1281,7 @@ and it changes these (and the sprite pri settings) a lot. ********************************************************************/ -VIDEO_UPDATE( taitof2_metalb ) +SCREEN_UPDATE( taitof2_metalb ) { taitof2_state *state = screen->machine->driver_data<taitof2_state>(); UINT8 layer[5], invlayer[4]; @@ -1332,7 +1332,7 @@ VIDEO_UPDATE( taitof2_metalb ) /* Deadconx, Footchmp */ -VIDEO_UPDATE( taitof2_deadconx ) +SCREEN_UPDATE( taitof2_deadconx ) { taitof2_state *state = screen->machine->driver_data<taitof2_state>(); UINT8 layer[5]; diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index d09bb85822a..8a9a5a720c2 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -577,7 +577,7 @@ static TILE_GET_INFO( get_tile_info_pixel ) /******************************************************************************/ -VIDEO_EOF( f3 ) +SCREEN_EOF( f3 ) { if (sprite_lag==2) { @@ -3231,7 +3231,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta /******************************************************************************/ -VIDEO_UPDATE( f3 ) +SCREEN_UPDATE( f3 ) { UINT32 sy_fix[5],sx_fix[5]; diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c index d0ae942be98..1e23ccf2fdf 100644 --- a/src/mame/video/taito_h.c +++ b/src/mame/video/taito_h.c @@ -391,7 +391,7 @@ static void taitoh_log_vram(running_machine *machine) /**************************************************************************/ -VIDEO_UPDATE( syvalion ) +SCREEN_UPDATE( syvalion ) { taitoh_state *state = screen->machine->driver_data<taitoh_state>(); @@ -410,7 +410,7 @@ VIDEO_UPDATE( syvalion ) } -VIDEO_UPDATE( recordbr ) +SCREEN_UPDATE( recordbr ) { taitoh_state *state = screen->machine->driver_data<taitoh_state>(); @@ -441,7 +441,7 @@ VIDEO_UPDATE( recordbr ) } -VIDEO_UPDATE( dleague ) +SCREEN_UPDATE( dleague ) { taitoh_state *state = screen->machine->driver_data<taitoh_state>(); diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index 07157055105..1e4173a9e37 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -284,7 +284,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( taitol ) +SCREEN_UPDATE( taitol ) { taitol_state *state = screen->machine->driver_data<taitol_state>(); int dx, dy; @@ -327,7 +327,7 @@ VIDEO_UPDATE( taitol ) -VIDEO_EOF( taitol ) +SCREEN_EOF( taitol ) { taitol_state *state = machine->driver_data<taitol_state>(); UINT8 *spriteram = state->rambanks + 0xb000; diff --git a/src/mame/video/taito_o.c b/src/mame/video/taito_o.c index 656f0c832ad..f8882c4b029 100644 --- a/src/mame/video/taito_o.c +++ b/src/mame/video/taito_o.c @@ -138,7 +138,7 @@ static void parentj_draw_sprites( running_machine *machine, bitmap_t *bitmap, co } -VIDEO_UPDATE( parentj ) +SCREEN_UPDATE( parentj ) { taitoo_state *state = screen->machine->driver_data<taitoo_state>(); diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c index 4878eaa8452..ce495035b56 100644 --- a/src/mame/video/taito_z.c +++ b/src/mame/video/taito_z.c @@ -842,7 +842,7 @@ WRITE16_HANDLER( contcirc_out_w ) } -VIDEO_UPDATE( contcirc ) +SCREEN_UPDATE( contcirc ) { taitoz_state *state = screen->machine->driver_data<taitoz_state>(); UINT8 layer[3]; @@ -869,7 +869,7 @@ VIDEO_UPDATE( contcirc ) /* Nightstr and ChaseHQ */ -VIDEO_UPDATE( chasehq ) +SCREEN_UPDATE( chasehq ) { taitoz_state *state = screen->machine->driver_data<taitoz_state>(); UINT8 layer[3]; @@ -895,7 +895,7 @@ VIDEO_UPDATE( chasehq ) } -VIDEO_UPDATE( bshark ) +SCREEN_UPDATE( bshark ) { taitoz_state *state = screen->machine->driver_data<taitoz_state>(); UINT8 layer[3]; @@ -921,7 +921,7 @@ VIDEO_UPDATE( bshark ) } -VIDEO_UPDATE( sci ) +SCREEN_UPDATE( sci ) { taitoz_state *state = screen->machine->driver_data<taitoz_state>(); UINT8 layer[3]; @@ -947,7 +947,7 @@ VIDEO_UPDATE( sci ) } -VIDEO_UPDATE( aquajack ) +SCREEN_UPDATE( aquajack ) { taitoz_state *state = screen->machine->driver_data<taitoz_state>(); UINT8 layer[3]; @@ -973,7 +973,7 @@ VIDEO_UPDATE( aquajack ) } -VIDEO_UPDATE( spacegun ) +SCREEN_UPDATE( spacegun ) { taitoz_state *state = screen->machine->driver_data<taitoz_state>(); UINT8 layer[3]; @@ -999,7 +999,7 @@ VIDEO_UPDATE( spacegun ) } -VIDEO_UPDATE( dblaxle ) +SCREEN_UPDATE( dblaxle ) { taitoz_state *state = screen->machine->driver_data<taitoz_state>(); UINT8 layer[5]; diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c index b1c9bbf1b1d..2f83eeb638c 100644 --- a/src/mame/video/taitoair.c +++ b/src/mame/video/taitoair.c @@ -341,7 +341,7 @@ static void fill_poly( bitmap_t *bitmap, const rectangle *cliprect, const struct } } -VIDEO_UPDATE( taitoair ) +SCREEN_UPDATE( taitoair ) { taitoair_state *state = screen->machine->driver_data<taitoair_state>(); diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index 79203fb2183..d68fb843c06 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -206,7 +206,7 @@ VIDEO_START( taitojc ) } //static int tick = 0; -VIDEO_UPDATE( taitojc ) +SCREEN_UPDATE( taitojc ) { taitojc_state *state = screen->machine->driver_data<taitojc_state>(); int i; diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c index 8635bdb5872..fb38d07a6dc 100644 --- a/src/mame/video/taitosj.c +++ b/src/mame/video/taitosj.c @@ -754,13 +754,13 @@ static int video_update_common(running_machine *machine, bitmap_t *bitmap, } -VIDEO_UPDATE( taitosj ) +SCREEN_UPDATE( taitosj ) { return video_update_common(screen->machine, bitmap, cliprect, taitosj_copy_layer); } -VIDEO_UPDATE( kikstart ) +SCREEN_UPDATE( kikstart ) { return video_update_common(screen->machine, bitmap, cliprect, kikstart_copy_layer); } diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c index a71dea990c7..321b372cb33 100644 --- a/src/mame/video/tank8.c +++ b/src/mame/video/tank8.c @@ -190,7 +190,7 @@ static TIMER_CALLBACK( tank8_collision_callback ) } -VIDEO_UPDATE( tank8 ) +SCREEN_UPDATE( tank8 ) { tank8_state *state = screen->machine->driver_data<tank8_state>(); set_pens(state, screen->machine->colortable); @@ -202,7 +202,7 @@ VIDEO_UPDATE( tank8 ) } -VIDEO_EOF( tank8 ) +SCREEN_EOF( tank8 ) { tank8_state *state = machine->driver_data<tank8_state>(); int x; diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c index 568c7177ae6..8977a7e2265 100644 --- a/src/mame/video/tankbatt.c +++ b/src/mame/video/tankbatt.c @@ -101,7 +101,7 @@ static void draw_bullets(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( tankbatt ) +SCREEN_UPDATE( tankbatt ) { tankbatt_state *state = screen->machine->driver_data<tankbatt_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 66aea8814a5..fe66b8a6ed5 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -232,7 +232,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( tankbust ) +SCREEN_UPDATE( tankbust ) { #if 0 int i; diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c index d9ba7332081..a3874323915 100644 --- a/src/mame/video/taotaido.c +++ b/src/mame/video/taotaido.c @@ -201,7 +201,7 @@ VIDEO_START(taotaido) } -VIDEO_UPDATE(taotaido) +SCREEN_UPDATE(taotaido) { // tilemap_set_scrollx(bg_tilemap,0,(taotaido_scrollram[0x380/2]>>4)); // the values put here end up being wrong every other frame // tilemap_set_scrolly(bg_tilemap,0,(taotaido_scrollram[0x382/2]>>4)); // the values put here end up being wrong every other frame @@ -230,7 +230,7 @@ VIDEO_UPDATE(taotaido) return 0; } -VIDEO_EOF( taotaido ) +SCREEN_EOF( taotaido ) { /* sprites need to be delayed by 2 frames? */ diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c index 0c263cd0411..2328c8f360e 100644 --- a/src/mame/video/targeth.c +++ b/src/mame/video/targeth.c @@ -133,7 +133,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ***************************************************************************/ -VIDEO_UPDATE( targeth ) +SCREEN_UPDATE( targeth ) { targeth_state *state = screen->machine->driver_data<targeth_state>(); /* set scroll registers */ diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index 5992cb9a64c..26121782114 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -1075,7 +1075,7 @@ static void draw_ground(running_machine *machine, bitmap_t *dst, const rectangle #endif /**********************************************************************/ -VIDEO_UPDATE( apache3 ) +SCREEN_UPDATE( apache3 ) { update_cluts(screen->machine, 1024, 0, 2048); @@ -1089,7 +1089,7 @@ VIDEO_UPDATE( apache3 ) return 0; } -VIDEO_UPDATE( roundup5 ) +SCREEN_UPDATE( roundup5 ) { // UINT16 bg_x_scroll=roundup5_unknown1[0]; // UINT16 bg_y_scroll=roundup5_unknown2[0]; @@ -1109,7 +1109,7 @@ VIDEO_UPDATE( roundup5 ) return 0; } -VIDEO_UPDATE( cyclwarr ) +SCREEN_UPDATE( cyclwarr ) { bigfight_bank=bigfight_a40000[0]; if (bigfight_bank!=bigfight_last_bank) @@ -1133,7 +1133,7 @@ VIDEO_UPDATE( cyclwarr ) return 0; } -VIDEO_UPDATE( bigfight ) +SCREEN_UPDATE( bigfight ) { bigfight_bank=bigfight_a40000[0]; if (bigfight_bank!=bigfight_last_bank) diff --git a/src/mame/video/taxidrvr.c b/src/mame/video/taxidrvr.c index 25e4d9fb925..e522813e7ab 100644 --- a/src/mame/video/taxidrvr.c +++ b/src/mame/video/taxidrvr.c @@ -16,7 +16,7 @@ WRITE8_DEVICE_HANDLER( taxidrvr_spritectrl_w ) -VIDEO_UPDATE( taxidrvr ) +SCREEN_UPDATE( taxidrvr ) { int offs; int sx,sy; diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index e26b1939d0e..59e84aee90b 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -211,7 +211,7 @@ VIDEO_START( tbowl ) } -VIDEO_UPDATE( tbowl ) +SCREEN_UPDATE( tbowl ) { device_t *left_screen = screen->machine->device("lscreen"); device_t *right_screen = screen->machine->device("rscreen"); diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index 747a3999a61..1c31da6b886 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -520,7 +520,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( tceptor ) +SCREEN_UPDATE( tceptor ) { tceptor_state *state = screen->machine->driver_data<tceptor_state>(); rectangle rect; @@ -567,7 +567,7 @@ VIDEO_UPDATE( tceptor ) } -VIDEO_EOF( tceptor ) +SCREEN_EOF( tceptor ) { tceptor_state *state = machine->driver_data<tceptor_state>(); memcpy(state->sprite_ram_buffered, state->sprite_ram, 0x200); diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c index 8a12c41c864..04649bf6206 100644 --- a/src/mame/video/tecmo.c +++ b/src/mame/video/tecmo.c @@ -241,7 +241,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } -VIDEO_UPDATE( tecmo ) +SCREEN_UPDATE( tecmo ) { bitmap_fill(screen->machine->priority_bitmap,cliprect,0); bitmap_fill(bitmap,cliprect,0x100); diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c index 4f121c269bb..5b80600f325 100644 --- a/src/mame/video/tecmo16.c +++ b/src/mame/video/tecmo16.c @@ -487,7 +487,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap_bg, bitmap_t /******************************************************************************/ -VIDEO_UPDATE( tecmo16 ) +SCREEN_UPDATE( tecmo16 ) { bitmap_fill(screen->machine->priority_bitmap,cliprect,0); diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c index abd877248ae..eaa0db338e6 100644 --- a/src/mame/video/tehkanwc.c +++ b/src/mame/video/tehkanwc.c @@ -160,7 +160,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( tehkanwc ) +SCREEN_UPDATE( tehkanwc ) { tilemap_set_scrollx(bg_tilemap, 0, scroll_x[0] + 256 * scroll_x[1]); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c index 3ae29da78bc..c2c2bd9f63d 100644 --- a/src/mame/video/terracre.c +++ b/src/mame/video/terracre.c @@ -201,7 +201,7 @@ VIDEO_START( amazon ) state_save_register_global(machine, yscroll); } -VIDEO_UPDATE( amazon ) +SCREEN_UPDATE( amazon ) { if( xscroll&0x2000 ) bitmap_fill( bitmap,cliprect ,get_black_pen(screen->machine)); diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index 3589705184a..1a4f4b0b743 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -499,7 +499,7 @@ void tetrisp2_draw_sprites(running_machine *machine, bitmap_t *bitmap, bitmap_t ***************************************************************************/ -VIDEO_UPDATE( tetrisp2 ) +SCREEN_UPDATE( tetrisp2 ) { int flipscreen; int asc_pri; @@ -583,7 +583,7 @@ VIDEO_UPDATE( tetrisp2 ) return 0; } -VIDEO_UPDATE( rockntread ) +SCREEN_UPDATE( rockntread ) { int flipscreen; int asc_pri; @@ -670,7 +670,7 @@ VIDEO_UPDATE( rockntread ) -VIDEO_UPDATE( rocknms ) +SCREEN_UPDATE( rocknms ) { int asc_pri; int scr_pri; diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c index b62e306c97e..4baa5ba0930 100644 --- a/src/mame/video/thedeep.c +++ b/src/mame/video/thedeep.c @@ -212,7 +212,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ***************************************************************************/ -VIDEO_UPDATE( thedeep ) +SCREEN_UPDATE( thedeep ) { int scrollx = thedeep_scroll[0] + (thedeep_scroll[1]<<8); int scrolly = thedeep_scroll[2] + (thedeep_scroll[3]<<8); diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index 0f445bb3614..27b79767b06 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -298,7 +298,7 @@ static void draw_sprites(running_machine *machine, } -VIDEO_UPDATE( thepit ) +SCREEN_UPDATE( thepit ) { offs_t offs; diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c index f7a63db06c2..90c9792ff1b 100644 --- a/src/mame/video/thief.c +++ b/src/mame/video/thief.c @@ -112,7 +112,7 @@ VIDEO_START( thief ){ thief_coprocessor.context_ram = auto_alloc_array(machine, UINT8, 0x400 ); } -VIDEO_UPDATE( thief ){ +SCREEN_UPDATE( thief ){ thief_state *state = screen->machine->driver_data<thief_state>(); UINT8 *videoram = state->videoram; UINT32 offs; diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c index 5d5087f16eb..5eedbdfb750 100644 --- a/src/mame/video/thoop2.c +++ b/src/mame/video/thoop2.c @@ -199,7 +199,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ***************************************************************************/ -VIDEO_UPDATE( thoop2 ) +SCREEN_UPDATE( thoop2 ) { thoop2_state *state = screen->machine->driver_data<thoop2_state>(); /* set scroll registers */ diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c index 283a30c3e79..c22c9a57326 100644 --- a/src/mame/video/thunderj.c +++ b/src/mame/video/thunderj.c @@ -121,7 +121,7 @@ VIDEO_START( thunderj ) * *************************************/ -VIDEO_UPDATE( thunderj ) +SCREEN_UPDATE( thunderj ) { thunderj_state *state = screen->machine->driver_data<thunderj_state>(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; diff --git a/src/mame/video/thunderx.c b/src/mame/video/thunderx.c index 389151e48fc..1ac39274377 100644 --- a/src/mame/video/thunderx.c +++ b/src/mame/video/thunderx.c @@ -66,7 +66,7 @@ VIDEO_START( scontra ) ***************************************************************************/ -VIDEO_UPDATE( scontra ) +SCREEN_UPDATE( scontra ) { thunderx_state *state = screen->machine->driver_data<thunderx_state>(); diff --git a/src/mame/video/tia.c b/src/mame/video/tia.c index 9257f52e138..b9c6e534014 100644 --- a/src/mame/video/tia.c +++ b/src/mame/video/tia.c @@ -280,7 +280,7 @@ VIDEO_START( tia ) } -VIDEO_UPDATE( tia ) +SCREEN_UPDATE( tia ) { screen_height = screen->height(); copybitmap(bitmap, helper[2], 0, 0, 0, 0, cliprect); diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h index c01f2abfc5c..0b274060e01 100644 --- a/src/mame/video/tia.h +++ b/src/mame/video/tia.h @@ -16,7 +16,7 @@ PALETTE_INIT( tia_NTSC ); PALETTE_INIT( tia_PAL ); VIDEO_START( tia ); -VIDEO_UPDATE( tia ); +SCREEN_UPDATE( tia ); READ8_HANDLER( tia_r ); WRITE8_HANDLER( tia_w ); diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 55ced9bcb08..89fc5f205c5 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -185,7 +185,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( tiamc1 ) +SCREEN_UPDATE( tiamc1 ) { #if 0 int i; diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index 6eb4b6bba50..84eb9d35d06 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -160,7 +160,7 @@ VIDEO_START( tigeroad ) tilemap_set_transparent_pen(state->fg_tilemap, 3); } -VIDEO_UPDATE( tigeroad ) +SCREEN_UPDATE( tigeroad ) { tigeroad_state *state = screen->machine->driver_data<tigeroad_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_LAYER1, 0); @@ -171,7 +171,7 @@ VIDEO_UPDATE( tigeroad ) return 0; } -VIDEO_EOF( tigeroad ) +SCREEN_EOF( tigeroad ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c index a94e304fa53..170cdbf1e3a 100644 --- a/src/mame/video/timelimt.c +++ b/src/mame/video/timelimt.c @@ -144,7 +144,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( timelimt ) +SCREEN_UPDATE( timelimt ) { tilemap_set_scrollx(bg_tilemap, 0, scrollx); tilemap_set_scrolly(bg_tilemap, 0, scrolly); diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c index 9138df49148..89cf5280114 100644 --- a/src/mame/video/timeplt.c +++ b/src/mame/video/timeplt.c @@ -209,7 +209,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect * *************************************/ -VIDEO_UPDATE( timeplt ) +SCREEN_UPDATE( timeplt ) { timeplt_state *state = screen->machine->driver_data<timeplt_state>(); diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 33adbd669b3..9d0705f72c5 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -576,7 +576,7 @@ WRITE16_HANDLER( tmnt_priority_w ) ***************************************************************************/ -VIDEO_UPDATE( mia ) +SCREEN_UPDATE( mia ) { tmnt_state *state = screen->machine->driver_data<tmnt_state>(); @@ -591,7 +591,7 @@ VIDEO_UPDATE( mia ) return 0; } -VIDEO_UPDATE( tmnt ) +SCREEN_UPDATE( tmnt ) { tmnt_state *state = screen->machine->driver_data<tmnt_state>(); @@ -607,7 +607,7 @@ VIDEO_UPDATE( tmnt ) } -VIDEO_UPDATE( punkshot ) +SCREEN_UPDATE( punkshot ) { tmnt_state *state = screen->machine->driver_data<tmnt_state>(); @@ -637,7 +637,7 @@ VIDEO_UPDATE( punkshot ) } -VIDEO_UPDATE( lgtnfght ) +SCREEN_UPDATE( lgtnfght ) { tmnt_state *state = screen->machine->driver_data<tmnt_state>(); int bg_colorbase; @@ -684,7 +684,7 @@ popmessage("%04x", state->glfgreat_pixel); return state->glfgreat_pixel & 0xff; } -VIDEO_UPDATE( glfgreat ) +SCREEN_UPDATE( glfgreat ) { tmnt_state *state = screen->machine->driver_data<tmnt_state>(); int bg_colorbase; @@ -738,7 +738,7 @@ VIDEO_UPDATE( glfgreat ) return 0; } -VIDEO_UPDATE( tmnt2 ) +SCREEN_UPDATE( tmnt2 ) { tmnt_state *state = screen->machine->driver_data<tmnt_state>(); double brt; @@ -786,12 +786,12 @@ VIDEO_UPDATE( tmnt2 ) palette_set_shadow_mode(screen->machine, 0); } - VIDEO_UPDATE_CALL(lgtnfght); + SCREEN_UPDATE_CALL(lgtnfght); return 0; } -VIDEO_UPDATE( thndrx2 ) +SCREEN_UPDATE( thndrx2 ) { tmnt_state *state = screen->machine->driver_data<tmnt_state>(); int bg_colorbase; @@ -831,7 +831,7 @@ VIDEO_UPDATE( thndrx2 ) ***************************************************************************/ -VIDEO_EOF( blswhstl ) +SCREEN_EOF( blswhstl ) { tmnt_state *state = machine->driver_data<tmnt_state>(); k053245_clear_buffer(state->k053245); diff --git a/src/mame/video/tnzs.c b/src/mame/video/tnzs.c index e639a21c248..2c08d024b4e 100644 --- a/src/mame/video/tnzs.c +++ b/src/mame/video/tnzs.c @@ -178,7 +178,7 @@ static void draw_foreground( running_machine *machine, bitmap_t *bitmap, const r } } -VIDEO_UPDATE( tnzs ) +SCREEN_UPDATE( tnzs ) { tnzs_state *state = screen->machine->driver_data<tnzs_state>(); /* If the byte at f300 has bit 6 set, flip the screen @@ -202,7 +202,7 @@ VIDEO_UPDATE( tnzs ) return 0; } -VIDEO_EOF( tnzs ) +SCREEN_EOF( tnzs ) { tnzs_state *state = machine->driver_data<tnzs_state>(); int ctrl2 = state->objctrl[1]; diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index df9d0510452..12cb1a62517 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -1164,7 +1164,7 @@ static void rallybik_draw_sprites(running_machine *machine, bitmap_t *bitmap, co Draw the game screen in the given bitmap_t. ***************************************************************************/ -VIDEO_UPDATE( rallybik ) +SCREEN_UPDATE( rallybik ) { toaplan1_state *state = screen->machine->driver_data<toaplan1_state>(); int priority; @@ -1188,7 +1188,7 @@ VIDEO_UPDATE( rallybik ) return 0; } -VIDEO_UPDATE( toaplan1 ) +SCREEN_UPDATE( toaplan1 ) { toaplan1_state *state = screen->machine->driver_data<toaplan1_state>(); int priority; @@ -1220,14 +1220,14 @@ VIDEO_UPDATE( toaplan1 ) assume it happens automatically every frame, at the end of vblank ****************************************************************************/ -VIDEO_EOF( rallybik ) +SCREEN_EOF( rallybik ) { toaplan1_state *state = machine->driver_data<toaplan1_state>(); memcpy(state->buffered_spriteram, state->spriteram, state->spriteram_size); } -VIDEO_EOF( toaplan1 ) +SCREEN_EOF( toaplan1 ) { toaplan1_state *state = machine->driver_data<toaplan1_state>(); @@ -1235,7 +1235,7 @@ VIDEO_EOF( toaplan1 ) memcpy(state->buffered_spritesizeram16, state->spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE); } -VIDEO_EOF( samesame ) +SCREEN_EOF( samesame ) { toaplan1_state *state = machine->driver_data<toaplan1_state>(); diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 0edc956cd95..d2e051a636f 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -330,7 +330,7 @@ WRITE16_HANDLER( batrider_objectbank_w ) } // Dogyuun doesn't appear to require fancy mixing? -VIDEO_UPDATE( toaplan2_dual ) +SCREEN_UPDATE( toaplan2_dual ) { toaplan2_state *state = screen->machine->driver_data<toaplan2_state>(); @@ -353,7 +353,7 @@ VIDEO_UPDATE( toaplan2_dual ) // renders to 2 bitmaps, and mixes output -VIDEO_UPDATE( toaplan2_mixed ) +SCREEN_UPDATE( toaplan2_mixed ) { toaplan2_state *state = screen->machine->driver_data<toaplan2_state>(); @@ -453,7 +453,7 @@ VIDEO_UPDATE( toaplan2_mixed ) return 0; } -VIDEO_UPDATE( toaplan2 ) +SCREEN_UPDATE( toaplan2 ) { toaplan2_state *state = screen->machine->driver_data<toaplan2_state>(); @@ -472,21 +472,21 @@ VIDEO_UPDATE( toaplan2 ) return 0; } -VIDEO_UPDATE( truxton2 ) +SCREEN_UPDATE( truxton2 ) { toaplan2_state *state = screen->machine->driver_data<toaplan2_state>(); - VIDEO_UPDATE_CALL(toaplan2); + SCREEN_UPDATE_CALL(toaplan2); tilemap_draw(bitmap, cliprect, state->tx_tilemap, 0, 0); return 0; } -VIDEO_UPDATE( batrider ) +SCREEN_UPDATE( batrider ) { toaplan2_state *state = screen->machine->driver_data<toaplan2_state>(); - VIDEO_UPDATE_CALL( toaplan2 ); + SCREEN_UPDATE_CALL( toaplan2 ); int line; rectangle clip; @@ -517,21 +517,21 @@ VIDEO_UPDATE( batrider ) -VIDEO_UPDATE( dogyuun ) +SCREEN_UPDATE( dogyuun ) { - VIDEO_UPDATE_CALL( toaplan2_dual ); + SCREEN_UPDATE_CALL( toaplan2_dual ); return 0; } -VIDEO_UPDATE( batsugun ) +SCREEN_UPDATE( batsugun ) { - VIDEO_UPDATE_CALL( toaplan2_mixed ); + SCREEN_UPDATE_CALL( toaplan2_mixed ); return 0; } -VIDEO_EOF( toaplan2 ) +SCREEN_EOF( toaplan2 ) { toaplan2_state *state = machine->driver_data<toaplan2_state>(); - if (state->vdp0) state->vdp0->gp9001_video_eof(); - if (state->vdp1) state->vdp1->gp9001_video_eof(); + if (state->vdp0) state->vdp0->gp9001_screen_eof(); + if (state->vdp1) state->vdp1->gp9001_screen_eof(); } diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index 8a487ff27c2..18e6c97e5c2 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -37,12 +37,12 @@ WRITE16_HANDLER( toki_control_w ) COMBINE_DATA(&toki_scrollram16[offset]); } -VIDEO_EOF( toki ) +SCREEN_EOF( toki ) { buffer_spriteram16_w(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0, 0, 0xffff); } -VIDEO_EOF( tokib ) +SCREEN_EOF( tokib ) { buffer_spriteram16_w(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0, 0, 0xffff); } @@ -266,7 +266,7 @@ static void tokib_draw_sprites(running_machine *machine, bitmap_t *bitmap,const * *************************************/ -VIDEO_UPDATE( toki ) +SCREEN_UPDATE( toki ) { int background_y_scroll,foreground_y_scroll,background_x_scroll,foreground_x_scroll; @@ -300,7 +300,7 @@ VIDEO_UPDATE( toki ) return 0; } -VIDEO_UPDATE( tokib ) +SCREEN_UPDATE( tokib ) { tilemap_set_scroll_rows(foreground_layer,1); tilemap_set_scroll_rows(background_layer,1); diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c index 2c23efb12ba..048a36c477b 100644 --- a/src/mame/video/toobin.c +++ b/src/mame/video/toobin.c @@ -227,7 +227,7 @@ WRITE16_HANDLER( toobin_slip_w ) * *************************************/ -VIDEO_UPDATE( toobin ) +SCREEN_UPDATE( toobin ) { toobin_state *state = screen->machine->driver_data<toobin_state>(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; diff --git a/src/mame/video/topspeed.c b/src/mame/video/topspeed.c index dd121493321..502695bb809 100644 --- a/src/mame/video/topspeed.c +++ b/src/mame/video/topspeed.c @@ -109,7 +109,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /***************************************************************************/ -VIDEO_UPDATE( topspeed ) +SCREEN_UPDATE( topspeed ) { topspeed_state *state = screen->machine->driver_data<topspeed_state>(); UINT8 layer[4]; diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index f96b75f8f1b..258eb174946 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -223,7 +223,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap) ***************************************************************************/ -VIDEO_UPDATE( toypop ) +SCREEN_UPDATE( toypop ) { toypop_state *state = screen->machine->driver_data<toypop_state>(); draw_background(screen->machine, bitmap); diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index 06c17c1ae97..c1e48186b46 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -175,7 +175,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } -VIDEO_UPDATE( tp84 ) +SCREEN_UPDATE( tp84 ) { tp84_state *state = screen->machine->driver_data<tp84_state>(); rectangle clip = *cliprect; diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index 8818620297d..b2f030690f6 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -248,7 +248,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect -VIDEO_UPDATE( trackfld ) +SCREEN_UPDATE( trackfld ) { trackfld_state *state = screen->machine->driver_data<trackfld_state>(); int row, scrollx; diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index 7192a88f6eb..168b134afc8 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -340,7 +340,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } -VIDEO_UPDATE( travrusa ) +SCREEN_UPDATE( travrusa ) { travrusa_state *state = screen->machine->driver_data<travrusa_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_LAYER1, 0); diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c index af0eadfd48a..937295841c0 100644 --- a/src/mame/video/triplhnt.c +++ b/src/mame/video/triplhnt.c @@ -128,7 +128,7 @@ static void draw_sprites(running_machine *machine, bitmap_t* bitmap, const recta } -VIDEO_UPDATE( triplhnt ) +SCREEN_UPDATE( triplhnt ) { device_t *discrete = screen->machine->device("discrete"); diff --git a/src/mame/video/truco.c b/src/mame/video/truco.c index 5113f9137ea..89aabd3e063 100644 --- a/src/mame/video/truco.c +++ b/src/mame/video/truco.c @@ -31,7 +31,7 @@ PALETTE_INIT( truco ) } } -VIDEO_UPDATE( truco ) +SCREEN_UPDATE( truco ) { truco_state *state = screen->machine->driver_data<truco_state>(); UINT8 *videoram = state->videoram; diff --git a/src/mame/video/trucocl.c b/src/mame/video/trucocl.c index 7092275397e..a3e10a36756 100644 --- a/src/mame/video/trucocl.c +++ b/src/mame/video/trucocl.c @@ -78,7 +78,7 @@ VIDEO_START( trucocl ) bg_tilemap = tilemap_create( machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32 ); } -VIDEO_UPDATE( trucocl ) +SCREEN_UPDATE( trucocl ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c index 33f0cccd60e..7c51c67ae71 100644 --- a/src/mame/video/tryout.c +++ b/src/mame/video/tryout.c @@ -232,7 +232,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( tryout ) +SCREEN_UPDATE( tryout ) { tryout_state *state = screen->machine->driver_data<tryout_state>(); int scrollx = 0; diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c index 807aabb9491..8a6a0a46985 100644 --- a/src/mame/video/tsamurai.c +++ b/src/mame/video/tsamurai.c @@ -203,7 +203,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( tsamurai ) +SCREEN_UPDATE( tsamurai ) { tsamurai_state *state = screen->machine->driver_data<tsamurai_state>(); int i; @@ -268,7 +268,7 @@ VIDEO_START( vsgongf ) state->foreground = tilemap_create(machine, get_vsgongf_tile_info,tilemap_scan_rows,8,8,32,32); } -VIDEO_UPDATE( vsgongf ) +SCREEN_UPDATE( vsgongf ) { tsamurai_state *state = screen->machine->driver_data<tsamurai_state>(); #ifdef MAME_DEBUG diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c index c84089e1c73..b6c2f89446f 100644 --- a/src/mame/video/tubep.c +++ b/src/mame/video/tubep.c @@ -608,7 +608,7 @@ void tubep_vblank_end(void) } -VIDEO_UPDATE( tubep ) +SCREEN_UPDATE( tubep ) { int DISP_ = DISP^1; @@ -763,7 +763,7 @@ WRITE8_HANDLER( rjammer_background_page_w ) } -VIDEO_UPDATE( rjammer ) +SCREEN_UPDATE( rjammer ) { int DISP_ = DISP^1; diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index c04986f25db..cb34126d024 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -603,7 +603,7 @@ VIDEO_START( suprtrio ) /******************************************************************************/ -VIDEO_UPDATE( tumblepb ) +SCREEN_UPDATE( tumblepb ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offs, offs2; @@ -639,7 +639,7 @@ VIDEO_UPDATE( tumblepb ) return 0; } -VIDEO_UPDATE( jumpkids ) +SCREEN_UPDATE( jumpkids ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offs, offs2; @@ -675,7 +675,7 @@ VIDEO_UPDATE( jumpkids ) return 0; } -VIDEO_UPDATE( semicom ) +SCREEN_UPDATE( semicom ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offs, offs2; @@ -711,7 +711,7 @@ VIDEO_UPDATE( semicom ) return 0; } -VIDEO_UPDATE( semicom_altoffsets ) +SCREEN_UPDATE( semicom_altoffsets ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offsx, offsy, offsx2; @@ -740,7 +740,7 @@ VIDEO_UPDATE( semicom_altoffsets ) return 0; } -VIDEO_UPDATE( bcstory ) +SCREEN_UPDATE( bcstory ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offs, offs2; @@ -778,7 +778,7 @@ VIDEO_UPDATE( bcstory ) return 0; } -VIDEO_UPDATE( semibase ) +SCREEN_UPDATE( semibase ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offs, offs2; @@ -807,7 +807,7 @@ VIDEO_UPDATE( semibase ) return 0; } -VIDEO_UPDATE( sdfight ) +SCREEN_UPDATE( sdfight ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offs, offs2; @@ -837,7 +837,7 @@ VIDEO_UPDATE( sdfight ) -VIDEO_UPDATE( fncywld ) +SCREEN_UPDATE( fncywld ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offs, offs2; @@ -874,7 +874,7 @@ VIDEO_UPDATE( fncywld ) } -VIDEO_UPDATE( jumppop ) +SCREEN_UPDATE( jumppop ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); @@ -906,7 +906,7 @@ VIDEO_UPDATE( jumppop ) } -VIDEO_UPDATE( suprtrio ) +SCREEN_UPDATE( suprtrio ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); @@ -934,7 +934,7 @@ popmessage("%04x %04x %04x %04x %04x %04x %04x %04x", return 0; } -VIDEO_UPDATE( pangpang ) +SCREEN_UPDATE( pangpang ) { tumbleb_state *state = screen->machine->driver_data<tumbleb_state>(); int offs, offs2; diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c index 96a0ec0e024..4bc6313568e 100644 --- a/src/mame/video/tumblep.c +++ b/src/mame/video/tumblep.c @@ -84,7 +84,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( tumblep ) +SCREEN_UPDATE( tumblep ) { tumblep_state *state = screen->machine->driver_data<tumblep_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index 553709f1d50..5915bc36bdf 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -376,7 +376,7 @@ static void draw_shell(running_machine *machine, 255-hposition-16,vstart-32,0 ); } -VIDEO_UPDATE( tunhunt ) +SCREEN_UPDATE( tunhunt ) { tunhunt_state *state = screen->machine->driver_data<tunhunt_state>(); set_pens(screen->machine); diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index a2edb890c2b..2dd8de4e9e2 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -404,7 +404,7 @@ static UINT32 turbo_get_sprite_bits(running_machine *machine, UINT8 road, sprite * *************************************/ -VIDEO_UPDATE( turbo ) +SCREEN_UPDATE( turbo ) { turbo_state *state = screen->machine->driver_data<turbo_state>(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); @@ -759,7 +759,7 @@ static UINT32 subroc3d_get_sprite_bits(running_machine *machine, sprite_info *sp * *************************************/ -VIDEO_UPDATE( subroc3d ) +SCREEN_UPDATE( subroc3d ) { turbo_state *state = screen->machine->driver_data<turbo_state>(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); @@ -979,7 +979,7 @@ static UINT32 buckrog_get_sprite_bits(running_machine *machine, sprite_info *spr * *************************************/ -VIDEO_UPDATE( buckrog ) +SCREEN_UPDATE( buckrog ) { turbo_state *state = screen->machine->driver_data<turbo_state>(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); diff --git a/src/mame/video/tutankhm.c b/src/mame/video/tutankhm.c index c5ba3ad16af..f92fc322288 100644 --- a/src/mame/video/tutankhm.c +++ b/src/mame/video/tutankhm.c @@ -59,7 +59,7 @@ static void get_pens( running_machine *machine, pen_t *pens ) * *************************************/ -VIDEO_UPDATE( tutankhm ) +SCREEN_UPDATE( tutankhm ) { tutankhm_state *state = screen->machine->driver_data<tutankhm_state>(); int xorx = state->flip_x ? 255 : 0; diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c index 3e669b630b5..9118a620a32 100644 --- a/src/mame/video/twin16.c +++ b/src/mame/video/twin16.c @@ -520,7 +520,7 @@ VIDEO_START( twin16 ) state_save_register_global(machine, state->sprite_busy); } -VIDEO_UPDATE( twin16 ) +SCREEN_UPDATE( twin16 ) { twin16_state *state = screen->machine->driver_data<twin16_state>(); int text_flip=0; @@ -537,7 +537,7 @@ VIDEO_UPDATE( twin16 ) return 0; } -VIDEO_EOF( twin16 ) +SCREEN_EOF( twin16 ) { twin16_state *state = machine->driver_data<twin16_state>(); twin16_set_sprite_timer(machine); diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index 2a6dc0715dc..0e0341ad0c0 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -485,7 +485,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta Draw the game screen in the given bitmap_t. ***************************************************************************/ -VIDEO_UPDATE( toaplan0 ) +SCREEN_UPDATE( toaplan0 ) { twincobr_log_vram(screen->machine); @@ -503,7 +503,7 @@ VIDEO_UPDATE( toaplan0 ) } -VIDEO_EOF( toaplan0 ) +SCREEN_EOF( toaplan0 ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c index 45128466ba6..79da6d23906 100644 --- a/src/mame/video/tx1.c +++ b/src/mame/video/tx1.c @@ -1134,7 +1134,7 @@ VIDEO_START( tx1 ) interrupt_timer->adjust(machine->primary_screen->time_until_pos(CURSOR_YPOS, CURSOR_XPOS)); } -VIDEO_EOF( tx1 ) +SCREEN_EOF( tx1 ) { /* /VSYNC: Update TZ113 */ tx1_vregs.slin_val += tx1_vregs.slin_inc; @@ -1190,7 +1190,7 @@ static void tx1_combine_layers(running_machine *machine, bitmap_t *bitmap, int s } } -VIDEO_UPDATE( tx1 ) +SCREEN_UPDATE( tx1 ) { device_t *left_screen = screen->machine->device("lscreen"); device_t *centre_screen = screen->machine->device("cscreen"); @@ -3067,7 +3067,7 @@ VIDEO_START( buggybjr ) interrupt_timer->adjust(machine->primary_screen->time_until_pos(CURSOR_YPOS, CURSOR_XPOS)); } -VIDEO_EOF( buggyboy ) +SCREEN_EOF( buggyboy ) { /* /VSYNC: Update TZ113 @ 219 */ vregs.slin += vregs.slin_inc; @@ -3077,7 +3077,7 @@ VIDEO_EOF( buggyboy ) } -VIDEO_UPDATE( buggyboy ) +SCREEN_UPDATE( buggyboy ) { device_t *left_screen = screen->machine->device("lscreen"); device_t *center_screen = screen->machine->device("cscreen"); @@ -3107,7 +3107,7 @@ VIDEO_UPDATE( buggyboy ) } -VIDEO_UPDATE( buggybjr ) +SCREEN_UPDATE( buggybjr ) { memset(bb_obj_bmp, 0, 256*240); diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c index ff9a99a0aab..05524758512 100644 --- a/src/mame/video/ultraman.c +++ b/src/mame/video/ultraman.c @@ -122,7 +122,7 @@ WRITE16_HANDLER( ultraman_gfxctrl_w ) ***************************************************************************/ -VIDEO_UPDATE( ultraman ) +SCREEN_UPDATE( ultraman ) { ultraman_state *state = screen->machine->driver_data<ultraman_state>(); diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index 07ba31a3ba0..e117acb3d39 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -55,7 +55,7 @@ VIDEO_START( ultratnk ) } -VIDEO_UPDATE( ultratnk ) +SCREEN_UPDATE( ultratnk ) { ultratnk_state *state = screen->machine->driver_data<ultratnk_state>(); UINT8 *videoram = state->videoram; @@ -90,7 +90,7 @@ VIDEO_UPDATE( ultratnk ) } -VIDEO_EOF( ultratnk ) +SCREEN_EOF( ultratnk ) { ultratnk_state *state = machine->driver_data<ultratnk_state>(); int i; diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c index 3b1def31279..0bbe1443356 100644 --- a/src/mame/video/undrfire.c +++ b/src/mame/video/undrfire.c @@ -347,7 +347,7 @@ static void draw_sprites_cbombers(running_machine *machine, bitmap_t *bitmap,con SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( undrfire ) +SCREEN_UPDATE( undrfire ) { device_t *tc0100scn = screen->machine->device("tc0100scn"); device_t *tc0480scp = screen->machine->device("tc0480scp"); @@ -490,7 +490,7 @@ VIDEO_UPDATE( undrfire ) } -VIDEO_UPDATE( cbombers ) +SCREEN_UPDATE( cbombers ) { device_t *tc0100scn = screen->machine->device("tc0100scn"); device_t *tc0480scp = screen->machine->device("tc0480scp"); diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c index 44e746983ba..dabbade1736 100644 --- a/src/mame/video/unico.c +++ b/src/mame/video/unico.c @@ -334,7 +334,7 @@ static void zeropnt2_draw_sprites(running_machine *machine, bitmap_t *bitmap,con ***************************************************************************/ -VIDEO_UPDATE( unico ) +SCREEN_UPDATE( unico ) { int layers_ctrl = -1; @@ -373,7 +373,7 @@ if ( input_code_pressed(screen->machine, KEYCODE_Z) || input_code_pressed(screen return 0; } -VIDEO_UPDATE( zeropnt2 ) +SCREEN_UPDATE( zeropnt2 ) { int layers_ctrl = -1; diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c index 7f91adac619..5123a98b077 100644 --- a/src/mame/video/usgames.c +++ b/src/mame/video/usgames.c @@ -67,7 +67,7 @@ WRITE8_HANDLER( usgames_charram_w ) } -VIDEO_UPDATE(usgames) +SCREEN_UPDATE(usgames) { tilemap_draw(bitmap,cliprect,usgames_tilemap,0,0); return 0; diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c index 08ea26d8554..32339211b6a 100644 --- a/src/mame/video/vaportra.c +++ b/src/mame/video/vaportra.c @@ -122,7 +122,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } -VIDEO_UPDATE( vaportra ) +SCREEN_UPDATE( vaportra ) { vaportra_state *state = screen->machine->driver_data<vaportra_state>(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c index 29a422fb70a..4d32139b3bf 100644 --- a/src/mame/video/vastar.c +++ b/src/mame/video/vastar.c @@ -196,7 +196,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( vastar ) +SCREEN_UPDATE( vastar ) { vastar_state *state = screen->machine->driver_data<vastar_state>(); int i; diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c index 224f4e5ff82..752fd5cbf15 100644 --- a/src/mame/video/vball.c +++ b/src/mame/video/vball.c @@ -163,7 +163,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta #undef DRAW_SPRITE -VIDEO_UPDATE( vb ) +SCREEN_UPDATE( vb ) { int i; diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c index 2834fabad71..bb298e2c0c9 100644 --- a/src/mame/video/vdc.c +++ b/src/mame/video/vdc.c @@ -432,7 +432,7 @@ VIDEO_START( pce ) } -VIDEO_UPDATE( pce ) +SCREEN_UPDATE( pce ) { /* copy our rendering buffer to the display */ copybitmap (bitmap,vce.bmp,0,0,0,0,cliprect); diff --git a/src/mame/video/vdc.h b/src/mame/video/vdc.h index 286911f05f3..241eb50d1ba 100644 --- a/src/mame/video/vdc.h +++ b/src/mame/video/vdc.h @@ -2,7 +2,7 @@ #include "video/generic.h" VIDEO_START( pce ); -VIDEO_UPDATE( pce ); +SCREEN_UPDATE( pce ); WRITE8_HANDLER ( vdc_0_w ); WRITE8_HANDLER ( vdc_1_w ); READ8_HANDLER ( vdc_0_r ); diff --git a/src/mame/video/vendetta.c b/src/mame/video/vendetta.c index 5812b1162aa..d49bdba3542 100644 --- a/src/mame/video/vendetta.c +++ b/src/mame/video/vendetta.c @@ -52,7 +52,7 @@ void vendetta_sprite_callback( running_machine *machine, int *code, int *color, ***************************************************************************/ -VIDEO_UPDATE( vendetta ) +SCREEN_UPDATE( vendetta ) { vendetta_state *state = screen->machine->driver_data<vendetta_state>(); int layer[3]; diff --git a/src/mame/video/vicdual.c b/src/mame/video/vicdual.c index 8ec9c573868..68893f8d137 100644 --- a/src/mame/video/vicdual.c +++ b/src/mame/video/vicdual.c @@ -31,7 +31,7 @@ WRITE8_HANDLER( vicdual_palette_bank_w ) } -VIDEO_UPDATE( vicdual_bw ) +SCREEN_UPDATE( vicdual_bw ) { UINT8 x = 0; UINT8 y = cliprect->min_y; @@ -81,7 +81,7 @@ VIDEO_UPDATE( vicdual_bw ) } -VIDEO_UPDATE( vicdual_color ) +SCREEN_UPDATE( vicdual_color ) { UINT8 *color_prom = (UINT8 *)screen->machine->region("proms")->base(); UINT8 x = 0; @@ -139,12 +139,12 @@ VIDEO_UPDATE( vicdual_color ) } -VIDEO_UPDATE( vicdual_bw_or_color ) +SCREEN_UPDATE( vicdual_bw_or_color ) { if (vicdual_is_cabinet_color(screen->machine)) - VIDEO_UPDATE_CALL(vicdual_color); + SCREEN_UPDATE_CALL(vicdual_color); else - VIDEO_UPDATE_CALL(vicdual_bw); + SCREEN_UPDATE_CALL(vicdual_bw); return 0; } diff --git a/src/mame/video/victory.c b/src/mame/video/victory.c index 1d193a1c265..90d21dd3d42 100644 --- a/src/mame/video/victory.c +++ b/src/mame/video/victory.c @@ -1097,7 +1097,7 @@ static TIMER_CALLBACK( bgcoll_irq_callback ) * *************************************/ -VIDEO_UPDATE( victory ) +SCREEN_UPDATE( victory ) { int bgcollmask = (video_control & 4) ? 4 : 7; int count = 0; diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c index 80a96492b1c..618d5008a81 100644 --- a/src/mame/video/videopin.c +++ b/src/mame/video/videopin.c @@ -33,7 +33,7 @@ VIDEO_START( videopin ) } -VIDEO_UPDATE( videopin ) +SCREEN_UPDATE( videopin ) { videopin_state *state = screen->machine->driver_data<videopin_state>(); int col; diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c index 206423eedac..dd303c43eca 100644 --- a/src/mame/video/vigilant.c +++ b/src/mame/video/vigilant.c @@ -280,7 +280,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( kikcubic ) +SCREEN_UPDATE( kikcubic ) { vigilant_state *state = screen->machine->driver_data<vigilant_state>(); UINT8 *videoram = state->videoram; @@ -305,7 +305,7 @@ VIDEO_UPDATE( kikcubic ) return 0; } -VIDEO_UPDATE( vigilant ) +SCREEN_UPDATE( vigilant ) { int i; diff --git a/src/mame/video/vindictr.c b/src/mame/video/vindictr.c index 4ba4cf726ad..7c00343279f 100644 --- a/src/mame/video/vindictr.c +++ b/src/mame/video/vindictr.c @@ -217,7 +217,7 @@ void vindictr_scanline_update(screen_device &screen, int scanline) * *************************************/ -VIDEO_UPDATE( vindictr ) +SCREEN_UPDATE( vindictr ) { vindictr_state *state = screen->machine->driver_data<vindictr_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c index 421f7536e0d..d7339a9daa7 100644 --- a/src/mame/video/volfied.c +++ b/src/mame/video/volfied.c @@ -128,7 +128,7 @@ static void refresh_pixel_layer( running_machine *machine, bitmap_t *bitmap ) } } -VIDEO_UPDATE( volfied ) +SCREEN_UPDATE( volfied ) { volfied_state *state = screen->machine->driver_data<volfied_state>(); diff --git a/src/mame/video/vsnes.c b/src/mame/video/vsnes.c index 0288d471168..7fd1b0ba924 100644 --- a/src/mame/video/vsnes.c +++ b/src/mame/video/vsnes.c @@ -55,7 +55,7 @@ VIDEO_START( vsdual ) Display refresh ***************************************************************************/ -VIDEO_UPDATE( vsnes ) +SCREEN_UPDATE( vsnes ) { /* render the ppu */ ppu2c0x_render( screen->machine->device("ppu1"), bitmap, 0, 0, 0, 0 ); @@ -63,16 +63,8 @@ VIDEO_UPDATE( vsnes ) } -VIDEO_UPDATE( vsdual ) +SCREEN_UPDATE( vsnes_bottom ) { - device_t *top_screen = screen->machine->device("top"); - device_t *bottom_screen = screen->machine->device("bottom"); - - /* render the ppu's */ - if (screen == top_screen) - ppu2c0x_render(screen->machine->device("ppu1"), bitmap, 0, 0, 0, 0); - else if (screen == bottom_screen) - ppu2c0x_render(screen->machine->device("ppu2"), bitmap, 0, 0, 0, 0); - + ppu2c0x_render(screen->machine->device("ppu2"), bitmap, 0, 0, 0, 0); return 0; } diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c index a7515d4a145..8c0a8050000 100644 --- a/src/mame/video/vulgus.c +++ b/src/mame/video/vulgus.c @@ -216,7 +216,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( vulgus ) +SCREEN_UPDATE( vulgus ) { vulgus_state *state = screen->machine->driver_data<vulgus_state>(); tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll_low[1] + 256 * state->scroll_high[1]); diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c index 5fe1d3041c0..f5b148eada9 100644 --- a/src/mame/video/warpwarp.c +++ b/src/mame/video/warpwarp.c @@ -237,7 +237,7 @@ static void draw_ball(bitmap_t *bitmap, const rectangle *cliprect,pen_t pen) } } -VIDEO_UPDATE( geebee ) +SCREEN_UPDATE( geebee ) { /* use an overlay only in upright mode */ if (geebee_handleoverlay) diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c index d49780cc94b..6dc615e93c9 100644 --- a/src/mame/video/warriorb.c +++ b/src/mame/video/warriorb.c @@ -84,7 +84,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( warriorb ) +SCREEN_UPDATE( warriorb ) { warriorb_state *state = screen->machine->driver_data<warriorb_state>(); int xoffs = 0; diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index cf50d6f0d93..bea3943806b 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -350,7 +350,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta #undef WC90_DRAW_SPRITE -VIDEO_UPDATE( wc90 ) +SCREEN_UPDATE( wc90 ) { tilemap_set_scrollx(bg_tilemap,0,wc90_scroll2xlo[0] + 256 * wc90_scroll2xhi[0]); tilemap_set_scrolly(bg_tilemap,0,wc90_scroll2ylo[0] + 256 * wc90_scroll2yhi[0]); diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c index d81a57f009a..3dce87344c6 100644 --- a/src/mame/video/wc90b.c +++ b/src/mame/video/wc90b.c @@ -139,7 +139,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( wc90b ) +SCREEN_UPDATE( wc90b ) { tilemap_set_scrollx(bg_tilemap,0,8 * (wc90b_scroll2x[0] & 0x7f) + 256 - 4 + (wc90b_scroll_x_lo[0] & 0x07)); tilemap_set_scrolly(bg_tilemap,0,wc90b_scroll2y[0] + 1 + ((wc90b_scroll2x[0] & 0x80) ? 256 : 0)); diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index 9751824fe1d..917757ac3b6 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -1022,7 +1022,7 @@ VIDEO_START( hotchase ) Video Updates ***************************************************************************/ -VIDEO_UPDATE ( wecleman ) +SCREEN_UPDATE( wecleman ) { wecleman_state *state = screen->machine->driver_data<wecleman_state>(); const pen_t *mrct; @@ -1116,7 +1116,7 @@ VIDEO_UPDATE ( wecleman ) Hot Chase ***************************************************************************/ -VIDEO_UPDATE( hotchase ) +SCREEN_UPDATE( hotchase ) { wecleman_state *state = screen->machine->driver_data<wecleman_state>(); device_t *k051316_1 = screen->machine->device("k051316_1"); diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c index af015782577..1f408fc6abf 100644 --- a/src/mame/video/welltris.c +++ b/src/mame/video/welltris.c @@ -240,7 +240,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re } } -VIDEO_UPDATE( welltris ) +SCREEN_UPDATE( welltris ) { welltris_state *state = screen->machine->driver_data<welltris_state>(); tilemap_set_scrollx(state->char_tilemap, 0, state->scrollx); diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index 3db620cb817..c2e1a3a640e 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -643,7 +643,7 @@ static void wgp_piv_layer_draw( running_machine *machine, bitmap_t *bitmap, cons SCREEN REFRESH **************************************************************/ -VIDEO_UPDATE( wgp ) +SCREEN_UPDATE( wgp ) { wgp_state *state = screen->machine->driver_data<wgp_state>(); int i; diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c index aeeed350b0f..dca670874c6 100644 --- a/src/mame/video/williams.c +++ b/src/mame/video/williams.c @@ -220,7 +220,7 @@ VIDEO_START( williams2 ) * *************************************/ -VIDEO_UPDATE( williams ) +SCREEN_UPDATE( williams ) { rgb_t pens[16]; int x, y; @@ -247,7 +247,7 @@ VIDEO_UPDATE( williams ) } -VIDEO_UPDATE( blaster ) +SCREEN_UPDATE( blaster ) { rgb_t pens[16]; int x, y; @@ -289,7 +289,7 @@ VIDEO_UPDATE( blaster ) } -VIDEO_UPDATE( williams2 ) +SCREEN_UPDATE( williams2 ) { rgb_t pens[16]; int x, y; diff --git a/src/mame/video/wiping.c b/src/mame/video/wiping.c index d318207e93a..54643d55d84 100644 --- a/src/mame/video/wiping.c +++ b/src/mame/video/wiping.c @@ -90,7 +90,7 @@ WRITE8_HANDLER( wiping_flipscreen_w ) } -VIDEO_UPDATE( wiping ) +SCREEN_UPDATE( wiping ) { UINT8 *spriteram = screen->machine->generic.spriteram.u8; int offs; diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c index 7fd409d621c..21f0824da9c 100644 --- a/src/mame/video/wiz.c +++ b/src/mame/video/wiz.c @@ -224,7 +224,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, } -VIDEO_UPDATE( kungfut ) +SCREEN_UPDATE( kungfut ) { bitmap_fill(bitmap,cliprect,bgpen); draw_background(screen->machine, bitmap, cliprect, 2 + char_bank[0] , 0); @@ -234,7 +234,7 @@ VIDEO_UPDATE( kungfut ) return 0; } -VIDEO_UPDATE( wiz ) +SCREEN_UPDATE( wiz ) { int bank; const rectangle* visible_area; @@ -253,7 +253,7 @@ VIDEO_UPDATE( wiz ) } -VIDEO_UPDATE( stinger ) +SCREEN_UPDATE( stinger ) { bitmap_fill(bitmap,cliprect,bgpen); draw_background(screen->machine, bitmap, cliprect, 2 + char_bank[0], 1); diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c index d8e288bc5a8..91f60af48d5 100644 --- a/src/mame/video/wolfpack.c +++ b/src/mame/video/wolfpack.c @@ -250,7 +250,7 @@ static void draw_water(colortable_t *colortable, bitmap_t* bitmap, const rectang } -VIDEO_UPDATE( wolfpack ) +SCREEN_UPDATE( wolfpack ) { wolfpack_state *state = screen->machine->driver_data<wolfpack_state>(); int i; @@ -291,7 +291,7 @@ VIDEO_UPDATE( wolfpack ) } -VIDEO_EOF( wolfpack ) +SCREEN_EOF( wolfpack ) { wolfpack_state *state = machine->driver_data<wolfpack_state>(); rectangle rect; diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c index 464f1a37281..17a5515ecab 100644 --- a/src/mame/video/wrally.c +++ b/src/mame/video/wrally.c @@ -176,7 +176,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ***************************************************************************/ -VIDEO_UPDATE( wrally ) +SCREEN_UPDATE( wrally ) { wrally_state *state = screen->machine->driver_data<wrally_state>(); /* set scroll registers */ diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index 3860522f499..58536074f2e 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -220,7 +220,7 @@ VIDEO_START( wwfsstar ) tilemap_set_transparent_pen(state->fg0_tilemap,0); } -VIDEO_UPDATE( wwfsstar ) +SCREEN_UPDATE( wwfsstar ) { wwfsstar_state *state = screen->machine->driver_data<wwfsstar_state>(); diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c index cba5d0aea16..6caba34a3b5 100644 --- a/src/mame/video/wwfwfest.c +++ b/src/mame/video/wwfwfest.c @@ -251,7 +251,7 @@ VIDEO_START( wwfwfstb ) bg1_dx[1] = -2; } -VIDEO_UPDATE( wwfwfest ) +SCREEN_UPDATE( wwfwfest ) { if (wwfwfest_pri == 0x0078) { tilemap_set_scrolly( bg0_tilemap, 0, wwfwfest_bg0_scrolly ); diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c index d6b826d5297..0ac0c90de98 100644 --- a/src/mame/video/xain.c +++ b/src/mame/video/xain.c @@ -219,7 +219,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( xain ) +SCREEN_UPDATE( xain ) { switch (xain_pri&0x7) { diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index 4f7daacb8db..590320a2a92 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -497,7 +497,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } -VIDEO_UPDATE( xevious ) +SCREEN_UPDATE( xevious ) { _galaga_state *state = screen->machine->driver_data<_galaga_state>(); diff --git a/src/mame/video/xexex.c b/src/mame/video/xexex.c index 11750bdeca6..3849d3901e6 100644 --- a/src/mame/video/xexex.c +++ b/src/mame/video/xexex.c @@ -46,7 +46,7 @@ VIDEO_START( xexex ) k056832_set_layer_offs(state->k056832, 3, 6, 16); } -VIDEO_UPDATE( xexex ) +SCREEN_UPDATE( xexex ) { static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 }; xexex_state *state = screen->machine->driver_data<xexex_state>(); diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c index 3c41f1b7762..7d3afb20e89 100644 --- a/src/mame/video/xmen.c +++ b/src/mame/video/xmen.c @@ -71,7 +71,7 @@ VIDEO_START( xmen6p ) ***************************************************************************/ -VIDEO_UPDATE( xmen ) +SCREEN_UPDATE( xmen ) { xmen_state *state = screen->machine->driver_data<xmen_state>(); int layer[3], bg_colorbase; @@ -107,7 +107,7 @@ VIDEO_UPDATE( xmen ) } -VIDEO_UPDATE( xmen6p ) +SCREEN_UPDATE( xmen6p ) { xmen_state *state = screen->machine->driver_data<xmen_state>(); int x, y; @@ -135,7 +135,7 @@ VIDEO_UPDATE( xmen6p ) } /* my lefts and rights are mixed up in several places.. */ -VIDEO_EOF( xmen6p ) +SCREEN_EOF( xmen6p ) { xmen_state *state = machine->driver_data<xmen_state>(); int layer[3], bg_colorbase; diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c index 62fc0a82643..d1f406402ef 100644 --- a/src/mame/video/xorworld.c +++ b/src/mame/video/xorworld.c @@ -112,7 +112,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE( xorworld ) +SCREEN_UPDATE( xorworld ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c index 3bea1be0d0a..f2f350cb2ab 100644 --- a/src/mame/video/xxmissio.c +++ b/src/mame/video/xxmissio.c @@ -137,7 +137,7 @@ static void draw_sprites(bitmap_t *bitmap, const rectangle *cliprect, const gfx_ } -VIDEO_UPDATE( xxmissio ) +SCREEN_UPDATE( xxmissio ) { tilemap_mark_all_tiles_dirty_all(screen->machine); tilemap_set_flip_all(screen->machine, flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); diff --git a/src/mame/video/xybots.c b/src/mame/video/xybots.c index b9a97420c11..fc9c4946fe9 100644 --- a/src/mame/video/xybots.c +++ b/src/mame/video/xybots.c @@ -103,7 +103,7 @@ VIDEO_START( xybots ) * *************************************/ -VIDEO_UPDATE( xybots ) +SCREEN_UPDATE( xybots ) { xybots_state *state = screen->machine->driver_data<xybots_state>(); atarimo_rect_list rectlist; diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c index 25592d26d1f..316860a48b1 100644 --- a/src/mame/video/xyonix.c +++ b/src/mame/video/xyonix.c @@ -56,7 +56,7 @@ VIDEO_START(xyonix) state->tilemap = tilemap_create(machine, get_xyonix_tile_info, tilemap_scan_rows, 4, 8, 80, 32); } -VIDEO_UPDATE(xyonix) +SCREEN_UPDATE(xyonix) { xyonix_state *state = screen->machine->driver_data<xyonix_state>(); diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 25f1dd17f0c..56197bce09c 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -718,7 +718,7 @@ static const char *const mode[] = { static const char *const psize[] = { "8x8", "16x16", "32x32", "64x64" }; #endif -VIDEO_UPDATE( ygv608 ) +SCREEN_UPDATE( ygv608 ) { #ifdef _SHOW_VIDEO_DEBUG char buffer[64]; diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h index 66f5ff80d0e..64f47c92e64 100644 --- a/src/mame/video/ygv608.h +++ b/src/mame/video/ygv608.h @@ -331,7 +331,7 @@ typedef struct _ygv608 { INTERRUPT_GEN( ygv608_timed_interrupt ); VIDEO_START( ygv608 ); -VIDEO_UPDATE( ygv608 ); +SCREEN_UPDATE( ygv608 ); READ16_HANDLER( ygv608_r ); WRITE16_HANDLER( ygv608_w ); diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index 12bfcb0b42b..ec23f35d560 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -141,7 +141,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( yiear ) +SCREEN_UPDATE( yiear ) { yiear_state *state = screen->machine->driver_data<yiear_state>(); diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c index 6657aece3f5..a9f4a46f308 100644 --- a/src/mame/video/yunsun16.c +++ b/src/mame/video/yunsun16.c @@ -200,7 +200,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect ***************************************************************************/ -VIDEO_UPDATE( yunsun16 ) +SCREEN_UPDATE( yunsun16 ) { yunsun16_state *state = screen->machine->driver_data<yunsun16_state>(); diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index c51673e3a12..2502a7c8102 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -194,7 +194,7 @@ VIDEO_START( yunsung8 ) ***************************************************************************/ -VIDEO_UPDATE( yunsung8 ) +SCREEN_UPDATE( yunsung8 ) { yunsung8_state *state = screen->machine->driver_data<yunsung8_state>(); int layers_ctrl = (~state->layers_ctrl) >> 4; diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c index 4421f106e6a..283c48559f1 100644 --- a/src/mame/video/zac2650.c +++ b/src/mame/video/zac2650.c @@ -230,7 +230,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap) // if(SpriteCollision(machine, 2,4)) CollisionSprite |= 0x01; /* Not Used */ } -VIDEO_UPDATE( tinvader ) +SCREEN_UPDATE( tinvader ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap); diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c index 86a9b76e72c..73544878f8d 100644 --- a/src/mame/video/zaccaria.c +++ b/src/mame/video/zaccaria.c @@ -246,7 +246,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } } -VIDEO_UPDATE( zaccaria ) +SCREEN_UPDATE( zaccaria ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index aae2e3cd931..0a9127b5430 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -475,7 +475,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta * *************************************/ -VIDEO_UPDATE( zaxxon ) +SCREEN_UPDATE( zaxxon ) { zaxxon_state *state = screen->machine->driver_data<zaxxon_state>(); @@ -486,7 +486,7 @@ VIDEO_UPDATE( zaxxon ) } -VIDEO_UPDATE( futspy ) +SCREEN_UPDATE( futspy ) { zaxxon_state *state = screen->machine->driver_data<zaxxon_state>(); @@ -497,7 +497,7 @@ VIDEO_UPDATE( futspy ) } -VIDEO_UPDATE( razmataz ) +SCREEN_UPDATE( razmataz ) { zaxxon_state *state = screen->machine->driver_data<zaxxon_state>(); @@ -508,7 +508,7 @@ VIDEO_UPDATE( razmataz ) } -VIDEO_UPDATE( congo ) +SCREEN_UPDATE( congo ) { zaxxon_state *state = screen->machine->driver_data<zaxxon_state>(); diff --git a/src/mame/video/zerozone.c b/src/mame/video/zerozone.c index 5b1041937dc..bfc008b8886 100644 --- a/src/mame/video/zerozone.c +++ b/src/mame/video/zerozone.c @@ -46,7 +46,7 @@ VIDEO_START( zerozone ) state->zz_tilemap = tilemap_create(machine, get_zerozone_tile_info, tilemap_scan_cols, 8, 8, 64, 32); } -VIDEO_UPDATE( zerozone ) +SCREEN_UPDATE( zerozone ) { zerozone_state *state = screen->machine->driver_data<zerozone_state>(); diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index 6eb3d3b100d..bdd2dbd3de0 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -195,7 +195,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } } -VIDEO_UPDATE( zodiack ) +SCREEN_UPDATE( zodiack ) { zodiack_state *state = screen->machine->driver_data<zodiack_state>(); int i; |