summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/video
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/video')
-rw-r--r--src/emu/video/315_5124.h14
-rw-r--r--src/emu/video/315_5313.c12
-rw-r--r--src/emu/video/315_5313.h18
-rw-r--r--src/emu/video/crt9007.h4
-rw-r--r--src/emu/video/crt9021.h4
-rw-r--r--src/emu/video/crt9212.h4
-rw-r--r--src/emu/video/dl1416.h2
-rw-r--r--src/emu/video/ef9345.h6
-rw-r--r--src/emu/video/epic12.c70
-rw-r--r--src/emu/video/epic12.h47
-rw-r--r--src/emu/video/epic12_blit2.c2
-rw-r--r--src/emu/video/epic12_blit3.c2
-rw-r--r--src/emu/video/epic12_blit4.c2
-rw-r--r--src/emu/video/epic12_blit6.c2
-rw-r--r--src/emu/video/epic12_blit7.c2
-rw-r--r--src/emu/video/epic12_blit8.c3
-rw-r--r--src/emu/video/epic12in.inc10
-rw-r--r--src/emu/video/epic12pixel.inc9
-rw-r--r--src/emu/video/fixfreq.c2
-rw-r--r--src/emu/video/hd44352.h2
-rw-r--r--src/emu/video/hd44780.h2
-rw-r--r--src/emu/video/hd61830.h2
-rw-r--r--src/emu/video/huc6260.h10
-rw-r--r--src/emu/video/huc6270.h6
-rw-r--r--src/emu/video/mb_vcu.h2
-rw-r--r--src/emu/video/mc6845.c2
-rw-r--r--src/emu/video/mc6847.c39
-rw-r--r--src/emu/video/mc6847.h6
-rw-r--r--src/emu/video/pc_vga.c6
-rw-r--r--src/emu/video/ramdac.h6
-rw-r--r--src/emu/video/tms34061.c2
-rw-r--r--src/emu/video/tms34061.h12
-rw-r--r--src/emu/video/upd3301.c1
-rw-r--r--src/emu/video/upd7220.h4
-rw-r--r--src/emu/video/v9938.h2
-rw-r--r--src/emu/video/vic4567.h2
36 files changed, 148 insertions, 173 deletions
diff --git a/src/emu/video/315_5124.h b/src/emu/video/315_5124.h
index 02d5531dee4..0603c9ba0ff 100644
--- a/src/emu/video/315_5124.h
+++ b/src/emu/video/315_5124.h
@@ -64,7 +64,7 @@ public:
static void set_signal_type(device_t &device, bool is_pal) { downcast<sega315_5124_device &>(device).m_is_pal = is_pal; }
template<class _Object> static devcb2_base &set_int_callback(device_t &device, _Object object) { return downcast<sega315_5124_device &>(device).m_int_cb.set_callback(object); }
template<class _Object> static devcb2_base &set_pause_callback(device_t &device, _Object object) { return downcast<sega315_5124_device &>(device).m_pause_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( vram_read );
DECLARE_WRITE8_MEMBER( vram_write );
DECLARE_READ8_MEMBER( register_read );
@@ -164,7 +164,7 @@ protected:
static const device_timer_id TIMER_DRAW = 1;
static const device_timer_id TIMER_CHECK_HINT = 2;
static const device_timer_id TIMER_CHECK_VINT = 3;
-
+
required_device<palette_device> m_palette;
};
@@ -209,31 +209,31 @@ protected:
#define MCFG_SEGA315_5124_INT_CB(_devcb) \
devcb = &sega315_5124_device::set_int_callback(*device, DEVCB2_##_devcb);
-
+
#define MCFG_SEGA315_5124_PAUSE_CB(_devcb) \
devcb = &sega315_5124_device::set_pause_callback(*device, DEVCB2_##_devcb);
#define MCFG_SEGA315_5246_SET_SCREEN MCFG_VIDEO_SET_SCREEN
-
+
#define MCFG_SEGA315_5246_IS_PAL(_bool) \
sega315_5246_device::set_signal_type(*device, _bool);
#define MCFG_SEGA315_5246_INT_CB(_devcb) \
devcb = &sega315_5246_device::set_int_callback(*device, DEVCB2_##_devcb);
-
+
#define MCFG_SEGA315_5246_PAUSE_CB(_devcb) \
devcb = &sega315_5246_device::set_pause_callback(*device, DEVCB2_##_devcb);
#define MCFG_SEGA315_5378_SET_SCREEN MCFG_VIDEO_SET_SCREEN
-
+
#define MCFG_SEGA315_5378_IS_PAL(_bool) \
sega315_5378_device::set_signal_type(*device, _bool);
#define MCFG_SEGA315_5378_INT_CB(_devcb) \
devcb = &sega315_5378_device::set_int_callback(*device, DEVCB2_##_devcb);
-
+
#define MCFG_SEGA315_5378_PAUSE_CB(_devcb) \
devcb = &sega315_5378_device::set_pause_callback(*device, DEVCB2_##_devcb);
diff --git a/src/emu/video/315_5313.c b/src/emu/video/315_5313.c
index 662792377e5..86ad88c8509 100644
--- a/src/emu/video/315_5313.c
+++ b/src/emu/video/315_5313.c
@@ -2530,7 +2530,7 @@ void sega315_5313_device::render_videobuffer_to_screenbuffer(int scanline)
lineptr[x] = m_palette_lookup[(dat & 0x3f)];
m_render_line_raw[x] |= (dat & 0x3f) | 0x040;
}
-
+
}
else
{
@@ -2546,26 +2546,26 @@ void sega315_5313_device::render_videobuffer_to_screenbuffer(int scanline)
lineptr[x] = m_palette_lookup_shadow[(dat & 0x3f)];
m_render_line_raw[x] |= (dat & 0x3f) | 0x000;
break;
-
+
case 0x4000: // normal pri, no shadow sprite, no highlight = normal;
case 0x8000: // low pri, highlight sprite = normal;
lineptr[x] = m_palette_lookup[(dat & 0x3f)];
m_render_line_raw[x] |= (dat & 0x3f) | 0x040;
break;
-
+
case 0x14000: // (sprite) normal pri, no shadow sprite, no highlight = normal;
case 0x18000: // (sprite) low pri, highlight sprite = normal;
lineptr[x] = m_palette_lookup_sprite[(dat & 0x3f)];
m_render_line_raw[x] |= (dat & 0x3f) | 0x080;
break;
-
-
+
+
case 0x0c000: // normal pri, highlight set = highlight?
case 0x1c000: // (sprite) normal pri, highlight set = highlight?
lineptr[x] = m_palette_lookup_highlight[(dat & 0x3f)];
m_render_line_raw[x] |= (dat & 0x3f) | 0x0c0;
break;
-
+
case 0x0a000: // shadow set, highlight set - not possible
case 0x0e000: // shadow set, highlight set, normal set, not possible
case 0x1a000: // (sprite)shadow set, highlight set - not possible
diff --git a/src/emu/video/315_5313.h b/src/emu/video/315_5313.h
index 94694cfe1f4..9292a339df6 100644
--- a/src/emu/video/315_5313.h
+++ b/src/emu/video/315_5313.h
@@ -149,25 +149,25 @@
#define MCFG_SEGA315_5313_INT_CB(_devcb) \
devcb = &sega315_5313_device::set_int_callback(*device, DEVCB2_##_devcb);
-
+
#define MCFG_SEGA315_5313_PAUSE_CB(_devcb) \
devcb = &sega315_5313_device::set_pause_callback(*device, DEVCB2_##_devcb);
#define MCFG_SEGA315_5313_SND_IRQ_CALLBACK(_write) \
devcb = &sega315_5313_device::set_sndirqline_callback(*device, DEVCB2_##_write);
-
+
#define MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(_write) \
devcb = &sega315_5313_device::set_lv6irqline_callback(*device, DEVCB2_##_write);
-
+
#define MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(_write) \
devcb = &sega315_5313_device::set_lv4irqline_callback(*device, DEVCB2_##_write);
-
+
#define MCFG_SEGA315_5313_ALT_TIMING(_data) \
sega315_5313_device::set_alt_timing(*device, _data);
-
+
#define MCFG_SEGA315_5313_PAL_WRITE_BASE(_data) \
sega315_5313_device::set_palwrite_base(*device, _data);
-
+
#define MCFG_SEGA315_5313_PALETTE(_palette_tag) \
sega315_5313_device::static_set_palette_tag(*device, "^" _palette_tag);
@@ -257,11 +257,11 @@ protected:
devcb2_write_line m_sndirqline_callback;
devcb2_write_line m_lv6irqline_callback;
devcb2_write_line m_lv4irqline_callback;
-
+
md_32x_scanline_delegate m_32x_scanline_func;
md_32x_interrupt_delegate m_32x_interrupt_func;
md_32x_scanline_helper_delegate m_32x_scanline_helper_func;
-
+
private:
int m_command_pending; // 2nd half of command pending..
@@ -291,7 +291,7 @@ private:
int m_framerate;
int m_vdp_pal;
int m_use_cram; // c2 uses it's own palette ram, so it sets this to 0
- int m_dma_delay; // SVP and SegaCD have some 'lag' in DMA transfers
+ int m_dma_delay; // SVP and SegaCD have some 'lag' in DMA transfers
UINT16* m_regs;
UINT16* m_vram;
diff --git a/src/emu/video/crt9007.h b/src/emu/video/crt9007.h
index ada3f8bccde..8ca81f06890 100644
--- a/src/emu/video/crt9007.h
+++ b/src/emu/video/crt9007.h
@@ -97,8 +97,8 @@
// ======================> crt9007_t
class crt9007_t : public device_t,
- public device_memory_interface,
- public device_video_interface
+ public device_memory_interface,
+ public device_video_interface
{
public:
// construction/destruction
diff --git a/src/emu/video/crt9021.h b/src/emu/video/crt9021.h
index c72c5d850e1..856e9718d45 100644
--- a/src/emu/video/crt9021.h
+++ b/src/emu/video/crt9021.h
@@ -56,12 +56,12 @@ typedef device_delegate<void (bitmap_rgb32 &bitmap, int y, int x, UINT8 video, i
// ======================> crt9021_t
class crt9021_t : public device_t,
- public device_video_interface
+ public device_video_interface
{
public:
// construction/destruction
crt9021_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
static void static_set_display_callback(device_t &device, crt9021_draw_character_delegate callback) { downcast<crt9021_t &>(device).m_display_cb = callback; }
void write(UINT8 data) { m_data = data; }
diff --git a/src/emu/video/crt9212.h b/src/emu/video/crt9212.h
index eb17158c4eb..078429f4fd4 100644
--- a/src/emu/video/crt9212.h
+++ b/src/emu/video/crt9212.h
@@ -72,7 +72,7 @@ class crt9212_t : public device_t
public:
// construction/destruction
crt9212_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
static void static_set_wen2(device_t &device, int state) { downcast<crt9212_t &>(device).m_wen2 = state; }
template<class _Object> static devcb2_base &set_dout_wr_callback(device_t &device, _Object object) { return downcast<crt9212_t &>(device).m_write_dout.set_callback(object); }
@@ -94,7 +94,7 @@ protected:
virtual void device_start();
private:
- devcb2_write8 m_write_dout;
+ devcb2_write8 m_write_dout;
devcb2_write_line m_write_rof;
devcb2_write_line m_write_wof;
diff --git a/src/emu/video/dl1416.h b/src/emu/video/dl1416.h
index 6cc0db13899..80d0192e6f0 100644
--- a/src/emu/video/dl1416.h
+++ b/src/emu/video/dl1416.h
@@ -34,7 +34,7 @@ class dl1416_device : public device_t
public:
dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~dl1416_device() {}
-
+
template<class _Object> static devcb2_base &set_update_handler(device_t &device, _Object object) { return downcast<dl1416_device &>(device).m_update.set_callback(object); }
/* inputs */
diff --git a/src/emu/video/ef9345.h b/src/emu/video/ef9345.h
index 540d3e13c3b..e41dcbc6fe4 100644
--- a/src/emu/video/ef9345.h
+++ b/src/emu/video/ef9345.h
@@ -21,7 +21,7 @@
#define MCFG_EF9345_PALETTE(_palette_tag) \
ef9345_device::static_set_palette_tag(*device, "^" _palette_tag);
-
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -38,7 +38,7 @@ public:
// static configuration
static void static_set_palette_tag(device_t &device, const char *tag);
-
+
// device interface
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
@@ -112,7 +112,7 @@ private:
// timers
emu_timer *m_busy_timer;
emu_timer *m_blink_timer;
-
+
required_device<palette_device> m_palette;
};
diff --git a/src/emu/video/epic12.c b/src/emu/video/epic12.c
index 8e927e1ade5..2c55e3655cf 100644
--- a/src/emu/video/epic12.c
+++ b/src/emu/video/epic12.c
@@ -42,7 +42,7 @@ TIMER_CALLBACK_MEMBER( epic12_device::epic12_device_blitter_delay_callback )
}
// static
- void epic12_device::set_rambase(device_t &device, UINT16* rambase)
+ void epic12_device::set_rambase(device_t &device, UINT16* rambase)
{
epic12_device &dev = downcast<epic12_device &>(device);
dev.epic12_device_ram16 = rambase;
@@ -87,7 +87,6 @@ void epic12_device::device_start()
void epic12_device::device_reset()
{
-
if (m_is_unsafe)
{
use_ram = epic12_device_ram16;
@@ -138,7 +137,7 @@ inline UINT16 epic12_device::READ_NEXT_WORD(offs_t *addr)
{
// UINT16 data = space.read_word(*addr); // going through the memory system is 'more correct' but noticably slower
UINT16 data = use_ram[((*addr & m_main_rammask) >> 1) ^ NATIVE_ENDIAN_VALUE_LE_BE(3, 0)];
-
+
*addr += 2;
// printf("data %04x\n", data);
@@ -229,7 +228,6 @@ inline void epic12_device::epic12_device_gfx_upload(offs_t *addr)
epic12_device_blitfunction epic12_device_f0_ti1_tr1_blit_funcs[] =
{
-
epic12_device::draw_sprite_f0_ti1_tr1_s0_d0, epic12_device::draw_sprite_f0_ti1_tr1_s1_d0, epic12_device::draw_sprite_f0_ti1_tr1_s2_d0, epic12_device::draw_sprite_f0_ti1_tr1_s3_d0, epic12_device::draw_sprite_f0_ti1_tr1_s4_d0, epic12_device::draw_sprite_f0_ti1_tr1_s5_d0, epic12_device::draw_sprite_f0_ti1_tr1_s6_d0, epic12_device::draw_sprite_f0_ti1_tr1_s7_d0,
epic12_device::draw_sprite_f0_ti1_tr1_s0_d1, epic12_device::draw_sprite_f0_ti1_tr1_s1_d1, epic12_device::draw_sprite_f0_ti1_tr1_s2_d1, epic12_device::draw_sprite_f0_ti1_tr1_s3_d1, epic12_device::draw_sprite_f0_ti1_tr1_s4_d1, epic12_device::draw_sprite_f0_ti1_tr1_s5_d1, epic12_device::draw_sprite_f0_ti1_tr1_s6_d1, epic12_device::draw_sprite_f0_ti1_tr1_s7_d1,
epic12_device::draw_sprite_f0_ti1_tr1_s0_d2, epic12_device::draw_sprite_f0_ti1_tr1_s1_d2, epic12_device::draw_sprite_f0_ti1_tr1_s2_d2, epic12_device::draw_sprite_f0_ti1_tr1_s3_d2, epic12_device::draw_sprite_f0_ti1_tr1_s4_d2, epic12_device::draw_sprite_f0_ti1_tr1_s5_d2, epic12_device::draw_sprite_f0_ti1_tr1_s6_d2, epic12_device::draw_sprite_f0_ti1_tr1_s7_d2,
@@ -242,7 +240,6 @@ epic12_device_blitfunction epic12_device_f0_ti1_tr1_blit_funcs[] =
epic12_device_blitfunction epic12_device_f0_ti1_tr0_blit_funcs[] =
{
-
epic12_device::draw_sprite_f0_ti1_tr0_s0_d0, epic12_device::draw_sprite_f0_ti1_tr0_s1_d0, epic12_device::draw_sprite_f0_ti1_tr0_s2_d0, epic12_device::draw_sprite_f0_ti1_tr0_s3_d0, epic12_device::draw_sprite_f0_ti1_tr0_s4_d0, epic12_device::draw_sprite_f0_ti1_tr0_s5_d0, epic12_device::draw_sprite_f0_ti1_tr0_s6_d0, epic12_device::draw_sprite_f0_ti1_tr0_s7_d0,
epic12_device::draw_sprite_f0_ti1_tr0_s0_d1, epic12_device::draw_sprite_f0_ti1_tr0_s1_d1, epic12_device::draw_sprite_f0_ti1_tr0_s2_d1, epic12_device::draw_sprite_f0_ti1_tr0_s3_d1, epic12_device::draw_sprite_f0_ti1_tr0_s4_d1, epic12_device::draw_sprite_f0_ti1_tr0_s5_d1, epic12_device::draw_sprite_f0_ti1_tr0_s6_d1, epic12_device::draw_sprite_f0_ti1_tr0_s7_d1,
epic12_device::draw_sprite_f0_ti1_tr0_s0_d2, epic12_device::draw_sprite_f0_ti1_tr0_s1_d2, epic12_device::draw_sprite_f0_ti1_tr0_s2_d2, epic12_device::draw_sprite_f0_ti1_tr0_s3_d2, epic12_device::draw_sprite_f0_ti1_tr0_s4_d2, epic12_device::draw_sprite_f0_ti1_tr0_s5_d2, epic12_device::draw_sprite_f0_ti1_tr0_s6_d2, epic12_device::draw_sprite_f0_ti1_tr0_s7_d2,
@@ -255,7 +252,6 @@ epic12_device_blitfunction epic12_device_f0_ti1_tr0_blit_funcs[] =
epic12_device_blitfunction epic12_device_f1_ti1_tr1_blit_funcs[] =
{
-
epic12_device::draw_sprite_f1_ti1_tr1_s0_d0, epic12_device::draw_sprite_f1_ti1_tr1_s1_d0, epic12_device::draw_sprite_f1_ti1_tr1_s2_d0, epic12_device::draw_sprite_f1_ti1_tr1_s3_d0, epic12_device::draw_sprite_f1_ti1_tr1_s4_d0, epic12_device::draw_sprite_f1_ti1_tr1_s5_d0, epic12_device::draw_sprite_f1_ti1_tr1_s6_d0, epic12_device::draw_sprite_f1_ti1_tr1_s7_d0,
epic12_device::draw_sprite_f1_ti1_tr1_s0_d1, epic12_device::draw_sprite_f1_ti1_tr1_s1_d1, epic12_device::draw_sprite_f1_ti1_tr1_s2_d1, epic12_device::draw_sprite_f1_ti1_tr1_s3_d1, epic12_device::draw_sprite_f1_ti1_tr1_s4_d1, epic12_device::draw_sprite_f1_ti1_tr1_s5_d1, epic12_device::draw_sprite_f1_ti1_tr1_s6_d1, epic12_device::draw_sprite_f1_ti1_tr1_s7_d1,
epic12_device::draw_sprite_f1_ti1_tr1_s0_d2, epic12_device::draw_sprite_f1_ti1_tr1_s1_d2, epic12_device::draw_sprite_f1_ti1_tr1_s2_d2, epic12_device::draw_sprite_f1_ti1_tr1_s3_d2, epic12_device::draw_sprite_f1_ti1_tr1_s4_d2, epic12_device::draw_sprite_f1_ti1_tr1_s5_d2, epic12_device::draw_sprite_f1_ti1_tr1_s6_d2, epic12_device::draw_sprite_f1_ti1_tr1_s7_d2,
@@ -268,7 +264,6 @@ epic12_device_blitfunction epic12_device_f1_ti1_tr1_blit_funcs[] =
epic12_device_blitfunction epic12_device_f1_ti1_tr0_blit_funcs[] =
{
-
epic12_device::draw_sprite_f1_ti1_tr0_s0_d0, epic12_device::draw_sprite_f1_ti1_tr0_s1_d0, epic12_device::draw_sprite_f1_ti1_tr0_s2_d0, epic12_device::draw_sprite_f1_ti1_tr0_s3_d0, epic12_device::draw_sprite_f1_ti1_tr0_s4_d0, epic12_device::draw_sprite_f1_ti1_tr0_s5_d0, epic12_device::draw_sprite_f1_ti1_tr0_s6_d0, epic12_device::draw_sprite_f1_ti1_tr0_s7_d0,
epic12_device::draw_sprite_f1_ti1_tr0_s0_d1, epic12_device::draw_sprite_f1_ti1_tr0_s1_d1, epic12_device::draw_sprite_f1_ti1_tr0_s2_d1, epic12_device::draw_sprite_f1_ti1_tr0_s3_d1, epic12_device::draw_sprite_f1_ti1_tr0_s4_d1, epic12_device::draw_sprite_f1_ti1_tr0_s5_d1, epic12_device::draw_sprite_f1_ti1_tr0_s6_d1, epic12_device::draw_sprite_f1_ti1_tr0_s7_d1,
epic12_device::draw_sprite_f1_ti1_tr0_s0_d2, epic12_device::draw_sprite_f1_ti1_tr0_s1_d2, epic12_device::draw_sprite_f1_ti1_tr0_s2_d2, epic12_device::draw_sprite_f1_ti1_tr0_s3_d2, epic12_device::draw_sprite_f1_ti1_tr0_s4_d2, epic12_device::draw_sprite_f1_ti1_tr0_s5_d2, epic12_device::draw_sprite_f1_ti1_tr0_s6_d2, epic12_device::draw_sprite_f1_ti1_tr0_s7_d2,
@@ -283,7 +278,6 @@ epic12_device_blitfunction epic12_device_f1_ti1_tr0_blit_funcs[] =
epic12_device_blitfunction epic12_device_f0_ti0_tr1_blit_funcs[] =
{
-
epic12_device::draw_sprite_f0_ti0_tr1_s0_d0, epic12_device::draw_sprite_f0_ti0_tr1_s1_d0, epic12_device::draw_sprite_f0_ti0_tr1_s2_d0, epic12_device::draw_sprite_f0_ti0_tr1_s3_d0, epic12_device::draw_sprite_f0_ti0_tr1_s4_d0, epic12_device::draw_sprite_f0_ti0_tr1_s5_d0, epic12_device::draw_sprite_f0_ti0_tr1_s6_d0, epic12_device::draw_sprite_f0_ti0_tr1_s7_d0,
epic12_device::draw_sprite_f0_ti0_tr1_s0_d1, epic12_device::draw_sprite_f0_ti0_tr1_s1_d1, epic12_device::draw_sprite_f0_ti0_tr1_s2_d1, epic12_device::draw_sprite_f0_ti0_tr1_s3_d1, epic12_device::draw_sprite_f0_ti0_tr1_s4_d1, epic12_device::draw_sprite_f0_ti0_tr1_s5_d1, epic12_device::draw_sprite_f0_ti0_tr1_s6_d1, epic12_device::draw_sprite_f0_ti0_tr1_s7_d1,
epic12_device::draw_sprite_f0_ti0_tr1_s0_d2, epic12_device::draw_sprite_f0_ti0_tr1_s1_d2, epic12_device::draw_sprite_f0_ti0_tr1_s2_d2, epic12_device::draw_sprite_f0_ti0_tr1_s3_d2, epic12_device::draw_sprite_f0_ti0_tr1_s4_d2, epic12_device::draw_sprite_f0_ti0_tr1_s5_d2, epic12_device::draw_sprite_f0_ti0_tr1_s6_d2, epic12_device::draw_sprite_f0_ti0_tr1_s7_d2,
@@ -296,7 +290,6 @@ epic12_device_blitfunction epic12_device_f0_ti0_tr1_blit_funcs[] =
epic12_device_blitfunction epic12_device_f0_ti0_tr0_blit_funcs[] =
{
-
epic12_device::draw_sprite_f0_ti0_tr0_s0_d0, epic12_device::draw_sprite_f0_ti0_tr0_s1_d0, epic12_device::draw_sprite_f0_ti0_tr0_s2_d0, epic12_device::draw_sprite_f0_ti0_tr0_s3_d0, epic12_device::draw_sprite_f0_ti0_tr0_s4_d0, epic12_device::draw_sprite_f0_ti0_tr0_s5_d0, epic12_device::draw_sprite_f0_ti0_tr0_s6_d0, epic12_device::draw_sprite_f0_ti0_tr0_s7_d0,
epic12_device::draw_sprite_f0_ti0_tr0_s0_d1, epic12_device::draw_sprite_f0_ti0_tr0_s1_d1, epic12_device::draw_sprite_f0_ti0_tr0_s2_d1, epic12_device::draw_sprite_f0_ti0_tr0_s3_d1, epic12_device::draw_sprite_f0_ti0_tr0_s4_d1, epic12_device::draw_sprite_f0_ti0_tr0_s5_d1, epic12_device::draw_sprite_f0_ti0_tr0_s6_d1, epic12_device::draw_sprite_f0_ti0_tr0_s7_d1,
epic12_device::draw_sprite_f0_ti0_tr0_s0_d2, epic12_device::draw_sprite_f0_ti0_tr0_s1_d2, epic12_device::draw_sprite_f0_ti0_tr0_s2_d2, epic12_device::draw_sprite_f0_ti0_tr0_s3_d2, epic12_device::draw_sprite_f0_ti0_tr0_s4_d2, epic12_device::draw_sprite_f0_ti0_tr0_s5_d2, epic12_device::draw_sprite_f0_ti0_tr0_s6_d2, epic12_device::draw_sprite_f0_ti0_tr0_s7_d2,
@@ -309,7 +302,6 @@ epic12_device_blitfunction epic12_device_f0_ti0_tr0_blit_funcs[] =
epic12_device_blitfunction epic12_device_f1_ti0_tr1_blit_funcs[] =
{
-
epic12_device::draw_sprite_f1_ti0_tr1_s0_d0, epic12_device::draw_sprite_f1_ti0_tr1_s1_d0, epic12_device::draw_sprite_f1_ti0_tr1_s2_d0, epic12_device::draw_sprite_f1_ti0_tr1_s3_d0, epic12_device::draw_sprite_f1_ti0_tr1_s4_d0, epic12_device::draw_sprite_f1_ti0_tr1_s5_d0, epic12_device::draw_sprite_f1_ti0_tr1_s6_d0, epic12_device::draw_sprite_f1_ti0_tr1_s7_d0,
epic12_device::draw_sprite_f1_ti0_tr1_s0_d1, epic12_device::draw_sprite_f1_ti0_tr1_s1_d1, epic12_device::draw_sprite_f1_ti0_tr1_s2_d1, epic12_device::draw_sprite_f1_ti0_tr1_s3_d1, epic12_device::draw_sprite_f1_ti0_tr1_s4_d1, epic12_device::draw_sprite_f1_ti0_tr1_s5_d1, epic12_device::draw_sprite_f1_ti0_tr1_s6_d1, epic12_device::draw_sprite_f1_ti0_tr1_s7_d1,
epic12_device::draw_sprite_f1_ti0_tr1_s0_d2, epic12_device::draw_sprite_f1_ti0_tr1_s1_d2, epic12_device::draw_sprite_f1_ti0_tr1_s2_d2, epic12_device::draw_sprite_f1_ti0_tr1_s3_d2, epic12_device::draw_sprite_f1_ti0_tr1_s4_d2, epic12_device::draw_sprite_f1_ti0_tr1_s5_d2, epic12_device::draw_sprite_f1_ti0_tr1_s6_d2, epic12_device::draw_sprite_f1_ti0_tr1_s7_d2,
@@ -322,7 +314,6 @@ epic12_device_blitfunction epic12_device_f1_ti0_tr1_blit_funcs[] =
epic12_device_blitfunction epic12_device_f1_ti0_tr0_blit_funcs[] =
{
-
epic12_device::draw_sprite_f1_ti0_tr0_s0_d0, epic12_device::draw_sprite_f1_ti0_tr0_s1_d0, epic12_device::draw_sprite_f1_ti0_tr0_s2_d0, epic12_device::draw_sprite_f1_ti0_tr0_s3_d0, epic12_device::draw_sprite_f1_ti0_tr0_s4_d0, epic12_device::draw_sprite_f1_ti0_tr0_s5_d0, epic12_device::draw_sprite_f1_ti0_tr0_s6_d0, epic12_device::draw_sprite_f1_ti0_tr0_s7_d0,
epic12_device::draw_sprite_f1_ti0_tr0_s0_d1, epic12_device::draw_sprite_f1_ti0_tr0_s1_d1, epic12_device::draw_sprite_f1_ti0_tr0_s2_d1, epic12_device::draw_sprite_f1_ti0_tr0_s3_d1, epic12_device::draw_sprite_f1_ti0_tr0_s4_d1, epic12_device::draw_sprite_f1_ti0_tr0_s5_d1, epic12_device::draw_sprite_f1_ti0_tr0_s6_d1, epic12_device::draw_sprite_f1_ti0_tr0_s7_d1,
epic12_device::draw_sprite_f1_ti0_tr0_s0_d2, epic12_device::draw_sprite_f1_ti0_tr0_s1_d2, epic12_device::draw_sprite_f1_ti0_tr0_s2_d2, epic12_device::draw_sprite_f1_ti0_tr0_s3_d2, epic12_device::draw_sprite_f1_ti0_tr0_s4_d2, epic12_device::draw_sprite_f1_ti0_tr0_s5_d2, epic12_device::draw_sprite_f1_ti0_tr0_s6_d2, epic12_device::draw_sprite_f1_ti0_tr0_s7_d2,
@@ -343,8 +334,8 @@ inline void epic12_device::epic12_device_gfx_draw_shadow_copy(address_space &spa
COPY_NEXT_WORD(space, addr);
COPY_NEXT_WORD(space, addr); // UINT16 dst_x_start = COPY_NEXT_WORD(space, addr);
COPY_NEXT_WORD(space, addr); // UINT16 dst_y_start = COPY_NEXT_WORD(space, addr);
- UINT16 w = COPY_NEXT_WORD(space, addr);
- UINT16 h = COPY_NEXT_WORD(space, addr);
+ UINT16 w = COPY_NEXT_WORD(space, addr);
+ UINT16 h = COPY_NEXT_WORD(space, addr);
COPY_NEXT_WORD(space, addr);
COPY_NEXT_WORD(space, addr);
@@ -359,21 +350,21 @@ inline void epic12_device::epic12_device_gfx_draw_shadow_copy(address_space &spa
inline void epic12_device::epic12_device_gfx_draw(offs_t *addr)
{
- int x,y, dimx,dimy, flipx,flipy;//, src_p;
+ int x,y, dimx,dimy, flipx,flipy;//, src_p;
int trans,blend, s_mode, d_mode;
clr_t tint_clr;
int tinted = 0;
- UINT16 attr = READ_NEXT_WORD(addr);
- UINT16 alpha = READ_NEXT_WORD(addr);
- UINT16 src_x = READ_NEXT_WORD(addr);
- UINT16 src_y = READ_NEXT_WORD(addr);
- UINT16 dst_x_start = READ_NEXT_WORD(addr);
- UINT16 dst_y_start = READ_NEXT_WORD(addr);
- UINT16 w = READ_NEXT_WORD(addr);
- UINT16 h = READ_NEXT_WORD(addr);
- UINT16 tint_r = READ_NEXT_WORD(addr);
- UINT16 tint_gb = READ_NEXT_WORD(addr);
+ UINT16 attr = READ_NEXT_WORD(addr);
+ UINT16 alpha = READ_NEXT_WORD(addr);
+ UINT16 src_x = READ_NEXT_WORD(addr);
+ UINT16 src_y = READ_NEXT_WORD(addr);
+ UINT16 dst_x_start = READ_NEXT_WORD(addr);
+ UINT16 dst_y_start = READ_NEXT_WORD(addr);
+ UINT16 w = READ_NEXT_WORD(addr);
+ UINT16 h = READ_NEXT_WORD(addr);
+ UINT16 tint_r = READ_NEXT_WORD(addr);
+ UINT16 tint_gb = READ_NEXT_WORD(addr);
// 0: +alpha
// 1: +source
@@ -384,28 +375,28 @@ inline void epic12_device::epic12_device_gfx_draw(offs_t *addr)
// 6: -dest
// 7: *
- d_mode = attr & 0x0007;
- s_mode = (attr & 0x0070) >> 4;
+ d_mode = attr & 0x0007;
+ s_mode = (attr & 0x0070) >> 4;
- trans = attr & 0x0100;
- blend = attr & 0x0200;
+ trans = attr & 0x0100;
+ blend = attr & 0x0200;
- flipy = attr & 0x0400;
- flipx = attr & 0x0800;
+ flipy = attr & 0x0400;
+ flipx = attr & 0x0800;
- const UINT8 d_alpha = ((alpha & 0x00ff) )>>3;
- const UINT8 s_alpha = ((alpha & 0xff00) >> 8 )>>3;
+ const UINT8 d_alpha = ((alpha & 0x00ff) )>>3;
+ const UINT8 s_alpha = ((alpha & 0xff00) >> 8 )>>3;
// src_p = 0;
- src_x = src_x & 0x1fff;
- src_y = src_y & 0x0fff;
+ src_x = src_x & 0x1fff;
+ src_y = src_y & 0x0fff;
- x = (dst_x_start & 0x7fff) - (dst_x_start & 0x8000);
- y = (dst_y_start & 0x7fff) - (dst_y_start & 0x8000);
+ x = (dst_x_start & 0x7fff) - (dst_x_start & 0x8000);
+ y = (dst_y_start & 0x7fff) - (dst_y_start & 0x8000);
- dimx = (w & 0x1fff) + 1;
- dimy = (h & 0x0fff) + 1;
+ dimx = (w & 0x1fff) + 1;
+ dimy = (h & 0x0fff) + 1;
// convert parameters to clr
@@ -483,7 +474,6 @@ inline void epic12_device::epic12_device_gfx_draw(offs_t *addr)
}
else
{
-
if (blend==0 && tinted==0)
{
if (!flipx)
@@ -903,7 +893,7 @@ void epic12_device::draw_screen(bitmap_rgb32 &bitmap, const rectangle &cliprect
-
+
READ32_MEMBER( epic12_device::epic12_device_blitter_r )
{
switch (offset*4)
diff --git a/src/emu/video/epic12.h b/src/emu/video/epic12.h
index 8ce6ef13b5e..0e341cae213 100644
--- a/src/emu/video/epic12.h
+++ b/src/emu/video/epic12.h
@@ -3,8 +3,8 @@
MCFG_DEVICE_ADD(_tag, EPIC12, 0)
//#define MCFG_EP1C12_ADD(_tag,_config,_map)
-// MCFG_DEVICE_CONFIG(_config)
-// MCFG_DEVICE_ADDRESS_MAP(AS_0, _map)
+// MCFG_DEVICE_CONFIG(_config)
+// MCFG_DEVICE_ADDRESS_MAP(AS_0, _map)
#define MCFG_EPIC12_SET_MAINRAMSIZE( _rgn ) \
epic12_device::set_mainramsize(*device, _rgn);
@@ -29,19 +29,19 @@ union colour_t
};
typedef const void (*epic12_device_blitfunction)(bitmap_rgb32 *,
- const rectangle *,
- UINT32 *, /* gfx */
- int , /* src_x */
- int , /* src_y */
- const int , /* dst_x_start */
- const int , /* dst_y_start */
- int , /* dimx */
- int , /* dimy */
- const int , /* flipy */
- const UINT8 , /* s_alpha */
- const UINT8 , /* d_alpha */
- //int , /* tint */
- const clr_t * );
+ const rectangle *,
+ UINT32 *, /* gfx */
+ int , /* src_x */
+ int , /* src_y */
+ const int , /* dst_x_start */
+ const int , /* dst_y_start */
+ int , /* dimx */
+ int , /* dimy */
+ const int , /* flipy */
+ const UINT8 , /* s_alpha */
+ const UINT8 , /* d_alpha */
+ //int , /* tint */
+ const clr_t * );
class epic12_device : public device_t,
@@ -79,7 +79,7 @@ public:
bitmap_rgb32 *epic12_device_bitmaps;
rectangle epic12_device_clip;
-
+
UINT16* use_ram;
int m_main_ramsize; // type D has double the main ram
int m_main_rammask;
@@ -676,15 +676,14 @@ public:
// convert separate r,g,b biases (0..80..ff) to clr_t (-1f..0..1f)
static inline void tint_to_clr(UINT8 r, UINT8 g, UINT8 b, clr_t *clr)
{
- clr->r = r>>2;
- clr->g = g>>2;
- clr->b = b>>2;
+ clr->r = r>>2;
+ clr->g = g>>2;
+ clr->b = b>>2;
};
// clr_t to r5g5b5
static inline UINT32 clr_to_pen(const clr_t *clr)
{
-
// --t- ---- rrrr r--- gggg g--- bbbb b--- format
return (clr->r << (16+3)) | (clr->g << (8+3)) | (clr->b << 3);
@@ -739,9 +738,9 @@ public:
static inline void clr_add(clr_t *clr, const clr_t *clr0, const clr_t *clr1)
{
/*
- clr->r = clr0->r + clr1->r;
- clr->g = clr0->g + clr1->g;
- clr->b = clr0->b + clr1->b;
+ clr->r = clr0->r + clr1->r;
+ clr->g = clr0->g + clr1->g;
+ clr->b = clr0->b + clr1->b;
*/
// use pre-clamped lookup table
clr->r = epic12_device_colrtable_add[clr0->r][clr1->r];
@@ -834,7 +833,7 @@ protected:
- osd_work_queue * queue; /* work queue */
+ osd_work_queue * queue; /* work queue */
osd_work_item * blitter_request;
// blit timing
diff --git a/src/emu/video/epic12_blit2.c b/src/emu/video/epic12_blit2.c
index cff04448ff6..897dcad4db7 100644
--- a/src/emu/video/epic12_blit2.c
+++ b/src/emu/video/epic12_blit2.c
@@ -553,4 +553,4 @@
#undef FLIPX
#undef TINT
#undef TRANSPARENT
-#undef REALLY_SIMPLE \ No newline at end of file
+#undef REALLY_SIMPLE
diff --git a/src/emu/video/epic12_blit3.c b/src/emu/video/epic12_blit3.c
index 5729949ca50..32e7bdaf469 100644
--- a/src/emu/video/epic12_blit3.c
+++ b/src/emu/video/epic12_blit3.c
@@ -553,4 +553,4 @@
#undef FLIPX
#undef TINT
#undef TRANSPARENT
-#undef REALLY_SIMPLE \ No newline at end of file
+#undef REALLY_SIMPLE
diff --git a/src/emu/video/epic12_blit4.c b/src/emu/video/epic12_blit4.c
index 4d4bcc0853b..c431a401666 100644
--- a/src/emu/video/epic12_blit4.c
+++ b/src/emu/video/epic12_blit4.c
@@ -553,4 +553,4 @@
#undef FLIPX
#undef TINT
#undef TRANSPARENT
-#undef REALLY_SIMPLE \ No newline at end of file
+#undef REALLY_SIMPLE
diff --git a/src/emu/video/epic12_blit6.c b/src/emu/video/epic12_blit6.c
index 963d6f14ca5..7427c67f0c6 100644
--- a/src/emu/video/epic12_blit6.c
+++ b/src/emu/video/epic12_blit6.c
@@ -554,5 +554,3 @@
#undef TINT
#undef TRANSPARENT
#undef REALLY_SIMPLE
-
-
diff --git a/src/emu/video/epic12_blit7.c b/src/emu/video/epic12_blit7.c
index a7203492f10..a01fd84a5ff 100644
--- a/src/emu/video/epic12_blit7.c
+++ b/src/emu/video/epic12_blit7.c
@@ -554,5 +554,3 @@
#undef TINT
#undef TRANSPARENT
#undef REALLY_SIMPLE
-
-
diff --git a/src/emu/video/epic12_blit8.c b/src/emu/video/epic12_blit8.c
index 29bb6794e12..ed9de7c15ec 100644
--- a/src/emu/video/epic12_blit8.c
+++ b/src/emu/video/epic12_blit8.c
@@ -38,6 +38,3 @@
#undef BLENDED
#undef REALLY_SIMPLE
-
-
-
diff --git a/src/emu/video/epic12in.inc b/src/emu/video/epic12in.inc
index 7972485f2ed..d21eeac1b9c 100644
--- a/src/emu/video/epic12in.inc
+++ b/src/emu/video/epic12in.inc
@@ -3,8 +3,6 @@
const void epic12_device::FUNCNAME(BLIT_PARAMS)
{
-
-
UINT32* gfx2;
int y, yf;
@@ -47,8 +45,8 @@ const void epic12_device::FUNCNAME(BLIT_PARAMS)
src_x += (dimx-1);
#endif
- if (flipy) { yf = -1; src_y += (dimy-1); }
- else { yf = +1; }
+ if (flipy) { yf = -1; src_y += (dimy-1); }
+ else { yf = +1; }
int starty = 0;
const int dst_y_end = dst_y_start+dimy;
@@ -64,13 +62,13 @@ const void epic12_device::FUNCNAME(BLIT_PARAMS)
#if FLIPX == 1
if ((src_x &0x1fff) < ((src_x-(dimx-1))&0x1fff))
{
- // popmessage("sprite gets clipped off src_x %04x dimx %04x\n", src_x, dimx);
+ // popmessage("sprite gets clipped off src_x %04x dimx %04x\n", src_x, dimx);
return;
}
#else
if ((src_x &0x1fff) > ((src_x+(dimx-1))&0x1fff))
{
- // popmessage("sprite gets clipped off src_x %04x dimx %04x\n", src_x, dimx);
+ // popmessage("sprite gets clipped off src_x %04x dimx %04x\n", src_x, dimx);
return;
}
#endif
diff --git a/src/emu/video/epic12pixel.inc b/src/emu/video/epic12pixel.inc
index 8dbc1046c28..3cb01cebbf4 100644
--- a/src/emu/video/epic12pixel.inc
+++ b/src/emu/video/epic12pixel.inc
@@ -3,14 +3,12 @@
#if FLIPX == 1
#define LOOP_INCREMENTS \
bmp++; \
- gfx2--; \
-
+ gfx2--;
#else
#define LOOP_INCREMENTS \
bmp++; \
- gfx2++; \
-
+ gfx2++;
#endif
@@ -49,7 +47,7 @@
// convert destination to clr
pen_to_clr(*bmp, &d_clr.trgb);
- //d_clr.u32 = *bmp >> 3; // using the union is actually significantly slower than our pen_to_clr to function!
+ //d_clr.u32 = *bmp >> 3; // using the union is actually significantly slower than our pen_to_clr to function!
#if _SMODE == 0
//g_profiler.start(PROFILER_USER7);
@@ -193,4 +191,3 @@
}
#endif
LOOP_INCREMENTS
-
diff --git a/src/emu/video/fixfreq.c b/src/emu/video/fixfreq.c
index fcc9247ad66..dabc7c17524 100644
--- a/src/emu/video/fixfreq.c
+++ b/src/emu/video/fixfreq.c
@@ -268,7 +268,7 @@ NETDEV_ANALOG_CALLBACK_MEMBER(fixedfreq_device::update_vid)
{
int colv = (int) ((m_vid - m_sync_threshold) / 3.7 * 255.0);
if (colv > 255)
- colv = 255;
+ colv = 255;
col = rgb_t(colv, colv, colv);
}
diff --git a/src/emu/video/hd44352.h b/src/emu/video/hd44352.h
index 2ace6c258e0..195a74db1ed 100644
--- a/src/emu/video/hd44352.h
+++ b/src/emu/video/hd44352.h
@@ -30,7 +30,7 @@ public:
hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb2_base &set_on_callback(device_t &device, _Object object) { return downcast<hd44352_device &>(device).m_on_cb.set_callback(object); }
-
+
// device interface
UINT8 data_read();
void data_write(UINT8 data);
diff --git a/src/emu/video/hd44780.h b/src/emu/video/hd44780.h
index aaa34fcf7e9..f59f456f00b 100644
--- a/src/emu/video/hd44780.h
+++ b/src/emu/video/hd44780.h
@@ -125,7 +125,7 @@ private:
int m_rw_state;
bool m_nibble;
int m_charset_type;
- UINT8 m_render_buf[80*16];
+ UINT8 m_render_buf[80*16];
enum { DDRAM, CGRAM };
};
diff --git a/src/emu/video/hd61830.h b/src/emu/video/hd61830.h
index 01e6aaa5036..24de36df2c9 100644
--- a/src/emu/video/hd61830.h
+++ b/src/emu/video/hd61830.h
@@ -93,7 +93,7 @@ private:
emu_timer *m_busy_timer;
//address_space *m_data;
-
+
bool m_bf; // busy flag
UINT8 m_ir; // instruction register
diff --git a/src/emu/video/huc6260.h b/src/emu/video/huc6260.h
index 3527eb65407..89932fea284 100644
--- a/src/emu/video/huc6260.h
+++ b/src/emu/video/huc6260.h
@@ -20,16 +20,16 @@
#define MCFG_HUC6260_NEXT_PIXEL_DATA_CB(_devcb) \
devcb = &huc6260_device::set_next_pixel_data_callback(*device, DEVCB2_##_devcb);
-
+
#define MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(_devcb) \
devcb = &huc6260_device::set_time_til_next_event_callback(*device, DEVCB2_##_devcb);
-
+
#define MCFG_HUC6260_VSYNC_CHANGED_CB(_devcb) \
devcb = &huc6260_device::set_vsync_changed_callback(*device, DEVCB2_##_devcb);
-
+
#define MCFG_HUC6260_HSYNC_CHANGED_CB(_devcb) \
devcb = &huc6260_device::set_hsync_changed_callback(*device, DEVCB2_##_devcb);
-
+
class huc6260_device : public device_t,
public device_video_interface
@@ -42,7 +42,7 @@ public:
template<class _Object> static devcb2_base &set_time_til_next_event_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_time_til_next_event_cb.set_callback(object); }
template<class _Object> static devcb2_base &set_vsync_changed_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_vsync_changed_cb.set_callback(object); }
template<class _Object> static devcb2_base &set_hsync_changed_callback(device_t &device, _Object object) { return downcast<huc6260_device &>(device).m_hsync_changed_cb.set_callback(object); }
-
+
void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/video/huc6270.h b/src/emu/video/huc6270.h
index 7cf6cb42857..99e370c5af5 100644
--- a/src/emu/video/huc6270.h
+++ b/src/emu/video/huc6270.h
@@ -20,7 +20,7 @@ class huc6270_device : public device_t
public:
// construction/destruction
huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
static void set_vram_size(device_t &device, UINT32 vram_size) { downcast<huc6270_device &>(device).m_vram_size = vram_size; }
template<class _Object> static devcb2_base &set_irq_changed_callback(device_t &device, _Object object) { return downcast<huc6270_device &>(device).m_irq_changed_cb.set_callback(object); }
@@ -66,10 +66,10 @@ private:
HUC6270_HSW
};
-
+
/* Size of Video ram (mandatory) */
UINT32 m_vram_size;
-
+
/* Callback for when the irq line may have changed (mandatory) */
devcb2_write_line m_irq_changed_cb;
diff --git a/src/emu/video/mb_vcu.h b/src/emu/video/mb_vcu.h
index 7c83689af13..6c079c2ff45 100644
--- a/src/emu/video/mb_vcu.h
+++ b/src/emu/video/mb_vcu.h
@@ -19,7 +19,7 @@ Template for skeleton device
#define MCFG_MB_VCU_ADD(_tag,_freq,_config, _palette_tag) \
MCFG_DEVICE_ADD(_tag, MB_VCU, _freq) \
- MCFG_DEVICE_CONFIG(_config) \
+ MCFG_DEVICE_CONFIG(_config) \
mb_vcu_device::static_set_palette_tag(*device, "^" _palette_tag);
//**************************************************************************
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index eb553dd8157..20a31ff9ba4 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -1472,7 +1472,7 @@ MACHINE_CONFIG_END
machine_config_constructor mos8563_device::device_mconfig_additions() const
{
- return MACHINE_CONFIG_NAME( mos8563 );
+ return MACHINE_CONFIG_NAME( mos8563 );
}
diff --git a/src/emu/video/mc6847.c b/src/emu/video/mc6847.c
index b1810cc3446..78a74c9f474 100644
--- a/src/emu/video/mc6847.c
+++ b/src/emu/video/mc6847.c
@@ -1858,7 +1858,7 @@ mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, const ch
//-------------------------------------------------
s68047_device::s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : mc6847_base_device(mconfig, S68047, "S68047", tag, owner, clock, s68047_fontdata8x12, 262.0, "s68047", __FILE__)
+ : mc6847_base_device(mconfig, S68047, "S68047", tag, owner, clock, s68047_fontdata8x12, 262.0, "s68047", __FILE__)
{
}
@@ -1879,23 +1879,22 @@ void s68047_device::hack_black_becomes_blue(bool flag)
const UINT32 s68047_device::s_s68047_hack_palette[16] =
{
- rgb_t(0x07, 0xff, 0x00), /* GREEN */
- rgb_t(0xff, 0xff, 0x00), /* YELLOW */
- rgb_t(0x3b, 0x08, 0xff), /* BLUE */
- rgb_t(0xcc, 0x00, 0x3b), /* RED */
- rgb_t(0xff, 0xff, 0xff), /* BUFF */
- rgb_t(0x07, 0xe3, 0x99), /* CYAN */
- rgb_t(0xff, 0x1c, 0xff), /* MAGENTA */
- rgb_t(0xff, 0x81, 0x00), /* ORANGE */
-
- rgb_t(0x00, 0x00, 0x00), /* BLACK */
- rgb_t(0x07, 0xff, 0x00), /* GREEN */
- rgb_t(0x3b, 0x08, 0xff), /* BLUE */
- rgb_t(0xff, 0xff, 0xff), /* BUFF */
-
- rgb_t(0x00, 0x7c, 0x00), /* ALPHANUMERIC DARK GREEN */
- rgb_t(0x07, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */
- rgb_t(0x91, 0x00, 0x00), /* ALPHANUMERIC DARK ORANGE */
- rgb_t(0xff, 0x81, 0x00) /* ALPHANUMERIC BRIGHT ORANGE */
-};
+ rgb_t(0x07, 0xff, 0x00), /* GREEN */
+ rgb_t(0xff, 0xff, 0x00), /* YELLOW */
+ rgb_t(0x3b, 0x08, 0xff), /* BLUE */
+ rgb_t(0xcc, 0x00, 0x3b), /* RED */
+ rgb_t(0xff, 0xff, 0xff), /* BUFF */
+ rgb_t(0x07, 0xe3, 0x99), /* CYAN */
+ rgb_t(0xff, 0x1c, 0xff), /* MAGENTA */
+ rgb_t(0xff, 0x81, 0x00), /* ORANGE */
+ rgb_t(0x00, 0x00, 0x00), /* BLACK */
+ rgb_t(0x07, 0xff, 0x00), /* GREEN */
+ rgb_t(0x3b, 0x08, 0xff), /* BLUE */
+ rgb_t(0xff, 0xff, 0xff), /* BUFF */
+
+ rgb_t(0x00, 0x7c, 0x00), /* ALPHANUMERIC DARK GREEN */
+ rgb_t(0x07, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */
+ rgb_t(0x91, 0x00, 0x00), /* ALPHANUMERIC DARK ORANGE */
+ rgb_t(0xff, 0x81, 0x00) /* ALPHANUMERIC BRIGHT ORANGE */
+};
diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h
index f93ca8dd338..372bc193131 100644
--- a/src/emu/video/mc6847.h
+++ b/src/emu/video/mc6847.h
@@ -44,7 +44,7 @@
#define MCFG_MC6847_FSYNC_CALLBACK(_write) \
devcb = &mc6847_friend_device::set_fsync_wr_callback(*device, DEVCB2_##_write);
-
+
/* interface */
struct mc6847_interface
{
@@ -668,12 +668,12 @@ public:
class s68047_device : public mc6847_base_device
{
public:
- s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void hack_black_becomes_blue(bool flag);
private:
- static const UINT32 s_s68047_hack_palette[16];
+ static const UINT32 s_s68047_hack_palette[16];
};
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index cdd6e19a185..b61637b13ec 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -128,13 +128,13 @@ const device_type MACH8 = &device_creator<mach8_device>;
vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_palette(*this, "^palette")
+ m_palette(*this, "^palette")
{
}
vga_device::vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__),
- m_palette(*this, "^palette")
+ m_palette(*this, "^palette")
{
}
@@ -2873,7 +2873,7 @@ void s3_vga_device::s3_define_video_mode()
// DCLK calculation
freq = ((double)(s3.clk_pll_m+2) / (double)((s3.clk_pll_n+2)*(pow(2.0,s3.clk_pll_r)))) * 14.318f; // clock between XIN and XOUT
xtal = freq * 1000000;
- }
+ }
if((s3.ext_misc_ctrl_2) >> 4)
{
diff --git a/src/emu/video/ramdac.h b/src/emu/video/ramdac.h
index 523b4ab64b3..b1630dc5658 100644
--- a/src/emu/video/ramdac.h
+++ b/src/emu/video/ramdac.h
@@ -19,8 +19,8 @@
#define MCFG_RAMDAC_ADD(_tag,_config,_map,_palette_tag) \
MCFG_DEVICE_ADD(_tag, RAMDAC, 0) \
MCFG_DEVICE_CONFIG(_config) \
- MCFG_DEVICE_ADDRESS_MAP(AS_0, _map) \
- ramdac_device::static_set_palette_tag(*device, "^" _palette_tag);
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, _map) \
+ ramdac_device::static_set_palette_tag(*device, "^" _palette_tag);
#define RAMDAC_INTERFACE(name) \
const ramdac_interface (name) =
@@ -79,7 +79,7 @@ private:
UINT8 m_int_index[2];
UINT8 *m_palram;
- const address_space_config m_space_config;
+ const address_space_config m_space_config;
required_device<palette_device> m_palette;
};
diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c
index 27e75ff67f2..c2b3a324ecf 100644
--- a/src/emu/video/tms34061.c
+++ b/src/emu/video/tms34061.c
@@ -54,7 +54,7 @@ void tms34061_device::device_start()
{
/* resolve callbak */
m_interrupt_cb.resolve();
-
+
/* reset the data */
m_vrammask = m_vramsize - 1;
diff --git a/src/emu/video/tms34061.h b/src/emu/video/tms34061.h
index dfaf9e286f5..402a9e9de98 100644
--- a/src/emu/video/tms34061.h
+++ b/src/emu/video/tms34061.h
@@ -20,7 +20,7 @@
#define MCFG_TMS34061_INTERRUPT_CB(_devcb) \
devcb = &tms34061_device::set_interrupt_callback(*device, DEVCB2_##_devcb);
-
+
/* register constants */
enum
@@ -67,7 +67,7 @@ class tms34061_device : public device_t,
public:
// construction/destruction
tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
static void set_rowshift(device_t &device, UINT8 rowshift) { downcast<tms34061_device &>(device).m_rowshift = rowshift; }
static void set_vram_size(device_t &device, UINT32 vramsize) { downcast<tms34061_device &>(device).m_vramsize = vramsize; }
template<class _Object> static devcb2_base &set_interrupt_callback(device_t &device, _Object object) { return downcast<tms34061_device &>(device).m_interrupt_cb.set_callback(object); }
@@ -91,10 +91,10 @@ protected:
virtual void device_reset();
private:
- UINT8 m_rowshift; /* VRAM address is (row << rowshift) | col */
- UINT32 m_vramsize; /* size of video RAM */
- devcb2_write_line m_interrupt_cb; /* interrupt gen callback */
-
+ UINT8 m_rowshift; /* VRAM address is (row << rowshift) | col */
+ UINT32 m_vramsize; /* size of video RAM */
+ devcb2_write_line m_interrupt_cb; /* interrupt gen callback */
+
UINT16 m_regs[TMS34061_REGCOUNT];
UINT16 m_xmask;
UINT8 m_yshift;
diff --git a/src/emu/video/upd3301.c b/src/emu/video/upd3301.c
index f59438a6e50..15885cc6896 100644
--- a/src/emu/video/upd3301.c
+++ b/src/emu/video/upd3301.c
@@ -636,4 +636,3 @@ void upd3301_device::recompute_parameters()
update_hrtc_timer(0);
update_vrtc_timer(0);
}
-
diff --git a/src/emu/video/upd7220.h b/src/emu/video/upd7220.h
index bb7a086542d..adeadaef495 100644
--- a/src/emu/video/upd7220.h
+++ b/src/emu/video/upd7220.h
@@ -153,8 +153,8 @@ private:
void draw_graphics_line(bitmap_rgb32 &bitmap, UINT32 addr, int y, int wd);
void update_graphics(bitmap_rgb32 &bitmap, const rectangle &cliprect, int force_bitmap);
- upd7220_display_pixels_delegate m_display_cb;
- upd7220_draw_text_delegate m_draw_text_cb;
+ upd7220_display_pixels_delegate m_display_cb;
+ upd7220_draw_text_delegate m_draw_text_cb;
devcb2_write_line m_write_drq;
devcb2_write_line m_write_hsync;
diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h
index 6f39a5d0eaf..665a8900c48 100644
--- a/src/emu/video/v9938.h
+++ b/src/emu/video/v9938.h
@@ -233,7 +233,7 @@ private:
void (v99x8_device::*draw_sprite_16)(const pen_t *, UINT16*, UINT8*);
void (v99x8_device::*draw_sprite_16s)(const pen_t *, UINT16*, UINT8*);
} ;
- static const v99x8_mode s_modes[];
+ static const v99x8_mode s_modes[];
required_device<palette_device> m_palette;
protected:
static UINT16 s_pal_indYJK[0x20000];
diff --git a/src/emu/video/vic4567.h b/src/emu/video/vic4567.h
index f065463e1ed..3dff4b41392 100644
--- a/src/emu/video/vic4567.h
+++ b/src/emu/video/vic4567.h
@@ -241,7 +241,7 @@ private:
UINT8 m_palette_green[0x100];
UINT8 m_palette_blue[0x100];
int m_palette_dirty;
-
+
required_device<palette_device> m_palette;
};