From 0e19f641d3186cdbf51f8ca857e2b07ab95779c2 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 11 Jan 2013 07:32:46 +0000 Subject: Cleanups and version bump --- src/emu/video/cdp1861.h | 86 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'src/emu/video/cdp1861.h') diff --git a/src/emu/video/cdp1861.h b/src/emu/video/cdp1861.h index dfc9c341597..2379cb561c3 100644 --- a/src/emu/video/cdp1861.h +++ b/src/emu/video/cdp1861.h @@ -35,29 +35,29 @@ // MACROS / CONSTANTS //************************************************************************** -#define CDP1861_VISIBLE_COLUMNS 64 -#define CDP1861_VISIBLE_LINES 128 +#define CDP1861_VISIBLE_COLUMNS 64 +#define CDP1861_VISIBLE_LINES 128 -#define CDP1861_HBLANK_START 14 * 8 -#define CDP1861_HBLANK_END 12 -#define CDP1861_HSYNC_START 0 -#define CDP1861_HSYNC_END 12 -#define CDP1861_SCREEN_WIDTH 14 * 8 +#define CDP1861_HBLANK_START 14 * 8 +#define CDP1861_HBLANK_END 12 +#define CDP1861_HSYNC_START 0 +#define CDP1861_HSYNC_END 12 +#define CDP1861_SCREEN_WIDTH 14 * 8 -#define CDP1861_TOTAL_SCANLINES 262 +#define CDP1861_TOTAL_SCANLINES 262 -#define CDP1861_SCANLINE_DISPLAY_START 80 -#define CDP1861_SCANLINE_DISPLAY_END 208 -#define CDP1861_SCANLINE_VBLANK_START 262 -#define CDP1861_SCANLINE_VBLANK_END 16 -#define CDP1861_SCANLINE_VSYNC_START 16 -#define CDP1861_SCANLINE_VSYNC_END 0 -#define CDP1861_SCANLINE_INT_START CDP1861_SCANLINE_DISPLAY_START - 2 -#define CDP1861_SCANLINE_INT_END CDP1861_SCANLINE_DISPLAY_START -#define CDP1861_SCANLINE_EFX_TOP_START CDP1861_SCANLINE_DISPLAY_START - 4 -#define CDP1861_SCANLINE_EFX_TOP_END CDP1861_SCANLINE_DISPLAY_START -#define CDP1861_SCANLINE_EFX_BOTTOM_START CDP1861_SCANLINE_DISPLAY_END - 4 -#define CDP1861_SCANLINE_EFX_BOTTOM_END CDP1861_SCANLINE_DISPLAY_END +#define CDP1861_SCANLINE_DISPLAY_START 80 +#define CDP1861_SCANLINE_DISPLAY_END 208 +#define CDP1861_SCANLINE_VBLANK_START 262 +#define CDP1861_SCANLINE_VBLANK_END 16 +#define CDP1861_SCANLINE_VSYNC_START 16 +#define CDP1861_SCANLINE_VSYNC_END 0 +#define CDP1861_SCANLINE_INT_START CDP1861_SCANLINE_DISPLAY_START - 2 +#define CDP1861_SCANLINE_INT_END CDP1861_SCANLINE_DISPLAY_START +#define CDP1861_SCANLINE_EFX_TOP_START CDP1861_SCANLINE_DISPLAY_START - 4 +#define CDP1861_SCANLINE_EFX_TOP_END CDP1861_SCANLINE_DISPLAY_START +#define CDP1861_SCANLINE_EFX_BOTTOM_START CDP1861_SCANLINE_DISPLAY_END - 4 +#define CDP1861_SCANLINE_EFX_BOTTOM_END CDP1861_SCANLINE_DISPLAY_END @@ -93,33 +93,33 @@ struct cdp1861_interface const char *m_cpu_tag; const char *m_screen_tag; - devcb_write_line m_out_int_cb; - devcb_write_line m_out_dmao_cb; - devcb_write_line m_out_efx_cb; + devcb_write_line m_out_int_cb; + devcb_write_line m_out_dmao_cb; + devcb_write_line m_out_efx_cb; }; // ======================> cdp1861_device -class cdp1861_device : public device_t, - public cdp1861_interface +class cdp1861_device : public device_t, + public cdp1861_interface { public: - // construction/destruction - cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + // construction/destruction + cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - DECLARE_WRITE8_MEMBER( dma_w ); + DECLARE_WRITE8_MEMBER( dma_w ); DECLARE_WRITE_LINE_MEMBER( disp_on_w ); DECLARE_WRITE_LINE_MEMBER( disp_off_w ); UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: - // device-level overrides + // device-level overrides virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start(); + virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: @@ -127,22 +127,22 @@ private: static const device_timer_id TIMER_EFX = 1; static const device_timer_id TIMER_DMA = 2; - devcb_resolved_write_line m_out_int_func; - devcb_resolved_write_line m_out_dmao_func; - devcb_resolved_write_line m_out_efx_func; + devcb_resolved_write_line m_out_int_func; + devcb_resolved_write_line m_out_dmao_func; + devcb_resolved_write_line m_out_efx_func; - screen_device *m_screen; // screen - bitmap_rgb32 m_bitmap; // bitmap + screen_device *m_screen; // screen + bitmap_rgb32 m_bitmap; // bitmap - int m_disp; // display enabled - int m_dispon; // display on latch - int m_dispoff; // display off latch - int m_dmaout; // DMA request active + int m_disp; // display enabled + int m_dispon; // display on latch + int m_dispoff; // display off latch + int m_dmaout; // DMA request active // timers - emu_timer *m_int_timer; // interrupt timer - emu_timer *m_efx_timer; // EFx timer - emu_timer *m_dma_timer; // DMA timer + emu_timer *m_int_timer; // interrupt timer + emu_timer *m_efx_timer; // EFx timer + emu_timer *m_dma_timer; // DMA timer cpu_device *m_cpu; }; -- cgit v1.2.3-70-g09d2