summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/video
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-09-17 06:49:13 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-09-17 06:49:13 +0000
commite25c13f2532730ebf50d0cffa0147393fd8e0228 (patch)
treea6c25d1de7041f26afed559dbc6670fa550e6b41 /src/emu/video
parentf97e8f00818bd8d898facc206ed33ab72cf10a75 (diff)
Clean-ups and version bumpmame0147
note: hoarded dump removed too from coco_cart.xml, this will not be tolerated
Diffstat (limited to 'src/emu/video')
-rw-r--r--src/emu/video/cdp1862.c2
-rw-r--r--src/emu/video/huc6272.c48
-rw-r--r--src/emu/video/m50458.c22
-rw-r--r--src/emu/video/m50458.h2
-rw-r--r--src/emu/video/mb90082.c12
-rw-r--r--src/emu/video/mc6845.c40
-rw-r--r--src/emu/video/pc_vga.c12
-rw-r--r--src/emu/video/saa5050.c10
-rw-r--r--src/emu/video/saa5050.h2
-rw-r--r--src/emu/video/tlc34076.c2
-rw-r--r--src/emu/video/vector.c2
11 files changed, 77 insertions, 77 deletions
diff --git a/src/emu/video/cdp1862.c b/src/emu/video/cdp1862.c
index 773db369cd5..51c922f5f6e 100644
--- a/src/emu/video/cdp1862.c
+++ b/src/emu/video/cdp1862.c
@@ -218,6 +218,6 @@ UINT32 cdp1862_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
copybitmap(bitmap, m_bitmap, 0, 0, 0, 0, cliprect);
m_bitmap.fill(m_palette[CDP1862_BACKGROUND_COLOR_SEQUENCE[m_bgcolor] + 8], cliprect);
-
+
return 0;
}
diff --git a/src/emu/video/huc6272.c b/src/emu/video/huc6272.c
index 740f34d931e..b72c20b9ef8 100644
--- a/src/emu/video/huc6272.c
+++ b/src/emu/video/huc6272.c
@@ -112,21 +112,21 @@ READ32_MEMBER( huc6272_device::read )
if((offset & 1) == 0)
{
/*
- xxxx xxxx ---- ---- ---- ---- ---- ---- Sub Channel Buffer
- ---- ---- x--- ---- ---- ---- ---- ---- SCSI RST flag
- ---- ---- -x-- ---- ---- ---- ---- ---- SCSI BUSY flag
- ---- ---- --x- ---- ---- ---- ---- ---- SCSI REQ flag
- ---- ---- ---x ---- ---- ---- ---- ---- SCSI MSG flag
- ---- ---- ---- x--- ---- ---- ---- ---- SCSI CD flag
- ---- ---- ---- -x-- ---- ---- ---- ---- SCSI IO flag
- ---- ---- ---- --x- ---- ---- ---- ---- SCSI SEL flag
- ---- ---- ---- ---- -x-- ---- ---- ---- SCSI IRQ pending
- ---- ---- ---- ---- --x- ---- ---- ---- DMA IRQ pending
- ---- ---- ---- ---- ---x ---- ---- ---- CD Sub Channel IRQ pending
- ---- ---- ---- ---- ---- x--- ---- ---- Raster IRQ pending
- ---- ---- ---- ---- ---- -x-- ---- ---- ADPCM IRQ pending
- ---- ---- ---- ---- ---- ---- -xxx xxxx register read-back
- */
+ xxxx xxxx ---- ---- ---- ---- ---- ---- Sub Channel Buffer
+ ---- ---- x--- ---- ---- ---- ---- ---- SCSI RST flag
+ ---- ---- -x-- ---- ---- ---- ---- ---- SCSI BUSY flag
+ ---- ---- --x- ---- ---- ---- ---- ---- SCSI REQ flag
+ ---- ---- ---x ---- ---- ---- ---- ---- SCSI MSG flag
+ ---- ---- ---- x--- ---- ---- ---- ---- SCSI CD flag
+ ---- ---- ---- -x-- ---- ---- ---- ---- SCSI IO flag
+ ---- ---- ---- --x- ---- ---- ---- ---- SCSI SEL flag
+ ---- ---- ---- ---- -x-- ---- ---- ---- SCSI IRQ pending
+ ---- ---- ---- ---- --x- ---- ---- ---- DMA IRQ pending
+ ---- ---- ---- ---- ---x ---- ---- ---- CD Sub Channel IRQ pending
+ ---- ---- ---- ---- ---- x--- ---- ---- Raster IRQ pending
+ ---- ---- ---- ---- ---- -x-- ---- ---- ADPCM IRQ pending
+ ---- ---- ---- ---- ---- ---- -xxx xxxx register read-back
+ */
res = m_register & 0x7f;
res |= (0) << 16;
}
@@ -135,8 +135,8 @@ READ32_MEMBER( huc6272_device::read )
switch(m_register)
{
/*
- x--- ---- ---- ---- ----
- */
+ x--- ---- ---- ---- ----
+ */
case 0x0c: // KRAM load address
res = (m_kram_addr_r & 0x3ffff) | ((m_kram_inc_r & 0x1ff) << 18) | ((m_kram_page_r & 1) << 31);
break;
@@ -179,8 +179,8 @@ WRITE32_MEMBER( huc6272_device::write )
//printf("%08x DMA STATUS\n",data);
break;
/*
- ---- ---- ---- ---- ----
- */
+ ---- ---- ---- ---- ----
+ */
case 0x0c: // KRAM load address
m_kram_addr_r = (data & 0x0003ffff);
m_kram_inc_r = (data & 0x07fc0000) >> 18;
@@ -199,11 +199,11 @@ WRITE32_MEMBER( huc6272_device::write )
break;
/*
- ---x ---- ---- ---- ADPCM page setting
- ---- ---x ---- ---- RAINBOW page setting
- ---- ---- ---x ---- BG page setting
- ---- ---- ---- ---x SCSI page setting
- */
+ ---x ---- ---- ---- ADPCM page setting
+ ---- ---x ---- ---- RAINBOW page setting
+ ---- ---- ---x ---- BG page setting
+ ---- ---- ---- ---x SCSI page setting
+ */
case 0x0f:
m_page_setting = data;
break;
diff --git a/src/emu/video/m50458.c b/src/emu/video/m50458.c
index 4880d5f9734..2f0b66e2f00 100644
--- a/src/emu/video/m50458.c
+++ b/src/emu/video/m50458.c
@@ -1,16 +1,16 @@
/***************************************************************************
- Mitsubishi M50458 OSD chip
+ Mitsubishi M50458 OSD chip
- device by Angelo Salese
+ device by Angelo Salese
- TODO:
- - vertical scrolling needs references (might work differently and/or in
- "worse" ways, the one currently implemented guesses that the screen is
- masked at the top and the end when in scrolling mode).
- - Understand what the "vertical start position" really does (vblank?)
- - Check if the ROM source is actually 2bpp once that a redump is made
- (the shadow ROM copy doesn't convince me 100%);
+ TODO:
+ - vertical scrolling needs references (might work differently and/or in
+ "worse" ways, the one currently implemented guesses that the screen is
+ masked at the top and the end when in scrolling mode).
+ - Understand what the "vertical start position" really does (vblank?)
+ - Check if the ROM source is actually 2bpp once that a redump is made
+ (the shadow ROM copy doesn't convince me 100%);
***************************************************************************/
@@ -46,7 +46,7 @@ ROM_END
WRITE16_MEMBER( m50458_device::vreg_120_w)
{
-// printf("%04x\n",data);
+// printf("%04x\n",data);
}
WRITE16_MEMBER( m50458_device::vreg_121_w)
@@ -85,7 +85,7 @@ WRITE16_MEMBER( m50458_device::vreg_123_w)
/* char part of vertical scrolling */
m_scrr = (data & 0x0f00) >> 8;
-// printf("%02x %02x %02x\n",m_scrr,m_scrf,m_space);
+// printf("%02x %02x %02x\n",m_scrr,m_scrf,m_space);
}
WRITE16_MEMBER( m50458_device::vreg_124_w)
diff --git a/src/emu/video/m50458.h b/src/emu/video/m50458.h
index bce73ccd5c0..0699c777222 100644
--- a/src/emu/video/m50458.h
+++ b/src/emu/video/m50458.h
@@ -28,7 +28,7 @@ Mitsubishi M50458 OSD chip
// TYPE DEFINITIONS
//**************************************************************************
-enum m50458_state_t
+enum m50458_state_t
{
OSD_SET_ADDRESS = 0,
OSD_SET_DATA
diff --git a/src/emu/video/mb90082.c b/src/emu/video/mb90082.c
index 19bedfc3371..491e3111ebf 100644
--- a/src/emu/video/mb90082.c
+++ b/src/emu/video/mb90082.c
@@ -1,11 +1,11 @@
/***************************************************************************
- Fujitsu MB90082 OSD
+ Fujitsu MB90082 OSD
- preliminary device by Angelo Salese
+ preliminary device by Angelo Salese
- TODO:
- - get a real charset ROM;
+ TODO:
+ - get a real charset ROM;
***************************************************************************/
@@ -24,8 +24,8 @@ const device_type MB90082 = &device_creator<mb90082_device>;
static ADDRESS_MAP_START( mb90082_vram, AS_0, 16, mb90082_device )
AM_RANGE(0x0000, 0x023f) AM_RAM // main screen vram
AM_RANGE(0x0400, 0x063f) AM_RAM // main screen attr
-// AM_RANGE(0x0800, 0x0a3f) AM_RAM // sub screen vram
-// AM_RANGE(0x0c00, 0x0e3f) AM_RAM // sub screen attr
+// AM_RANGE(0x0800, 0x0a3f) AM_RAM // sub screen vram
+// AM_RANGE(0x0c00, 0x0e3f) AM_RAM // sub screen attr
ADDRESS_MAP_END
/* charset is undumped, but apparently a normal ASCII one is enough for the time being (for example "fnt0808.x1" in Sharp X1) */
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 2e2c5e35dab..1a05a77aa5b 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -24,15 +24,15 @@
/*
- TODO:
+ TODO:
- - mos8563
+ - mos8563
- - horizontal scroll
- - vertical scroll
- - pixel double width
- - bitmap modes
- - display enable begin/end
+ - horizontal scroll
+ - vertical scroll
+ - pixel double width
+ - bitmap modes
+ - display enable begin/end
*/
@@ -77,10 +77,10 @@ const device_type MOS8568 = &device_creator<mos8568_device>;
#define HSS_ATTR BIT(m_horiz_scroll, 6)
#define HSS_TEXT BIT(m_horiz_scroll, 7)
-#define ATTR_COLOR (attr & 0x0f)
-#define ATTR_BLINK BIT(attr, 4)
-#define ATTR_UNDERLINE BIT(attr, 5)
-#define ATTR_REVERSE BIT(attr, 6)
+#define ATTR_COLOR (attr & 0x0f)
+#define ATTR_BLINK BIT(attr, 4)
+#define ATTR_UNDERLINE BIT(attr, 5)
+#define ATTR_REVERSE BIT(attr, 6)
#define ATTR_ALTERNATE_CHARSET BIT(attr, 7)
@@ -377,21 +377,21 @@ WRITE8_MEMBER( mos8563_device::register_w )
case 0x0f: m_cursor_addr = ((data & 0xff) << 0) | (m_cursor_addr & 0xff00); break;
case 0x10: /* read-only */ break;
case 0x11: /* read-only */ break;
- case 0x12: m_update_addr = ((data & 0xff) << 8) | (m_update_addr & 0x00ff); break;
- case 0x13: m_update_addr = ((data & 0xff) << 0) | (m_update_addr & 0xff00); break;
+ case 0x12: m_update_addr = ((data & 0xff) << 8) | (m_update_addr & 0x00ff); break;
+ case 0x13: m_update_addr = ((data & 0xff) << 0) | (m_update_addr & 0xff00); break;
case 0x14: m_attribute_addr = ((data & 0xff) << 8) | (m_attribute_addr & 0x00ff); break;
case 0x15: m_attribute_addr = ((data & 0xff) << 0) | (m_attribute_addr & 0xff00); break;
- case 0x16: m_horiz_char = data & 0xff; break;
+ case 0x16: m_horiz_char = data & 0xff; break;
case 0x17: m_vert_char_disp = data & 0x1f; break;
case 0x18: m_vert_scroll = data & 0xff; break;
case 0x19: m_horiz_scroll = data & 0xff; break;
- case 0x1a: m_color = data & 0xff; break;
+ case 0x1a: m_color = data & 0xff; break;
case 0x1b: m_row_addr_incr = data & 0xff; break;
case 0x1c: m_char_base_addr = data & 0xf0; break;
case 0x1d: m_underline_ras = data & 0x1f; break;
case 0x1e:
m_word_count = data & 0xff;
-
+
do
{
UINT8 byte = VSS_COPY ? read_videoram(m_block_addr++) : m_data;
@@ -404,10 +404,10 @@ WRITE8_MEMBER( mos8563_device::register_w )
write_videoram(m_update_addr++, m_data);
break;
- case 0x20: m_block_addr = ((data & 0xff) << 8) | (m_block_addr & 0x00ff); break;
- case 0x21: m_block_addr = ((data & 0xff) << 0) | (m_block_addr & 0xff00); break;
- case 0x22: m_de_begin = ((data & 0xff) << 8) | (m_de_begin & 0x00ff); break;
- case 0x23: m_de_begin = ((data & 0xff) << 0) | (m_de_begin & 0xff00); break;
+ case 0x20: m_block_addr = ((data & 0xff) << 8) | (m_block_addr & 0x00ff); break;
+ case 0x21: m_block_addr = ((data & 0xff) << 0) | (m_block_addr & 0xff00); break;
+ case 0x22: m_de_begin = ((data & 0xff) << 8) | (m_de_begin & 0x00ff); break;
+ case 0x23: m_de_begin = ((data & 0xff) << 0) | (m_de_begin & 0xff00); break;
case 0x24: m_dram_refresh = data & 0x0f; break;
case 0x25: m_sync_polarity = data & 0xc0; break;
}
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index d6ce4d68033..5da7d50ce85 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -992,8 +992,8 @@ SCREEN_UPDATE_RGB32( pc_video_s3 )
return 0; // cursor only works in VGA or SVGA modes
src = s3.cursor_start_addr * 1024; // start address is in units of 1024 bytes
-// for(x=0;x<64;x++)
-// printf("%08x: %02x %02x %02x %02x\n",src+x*4,vga.memory[src+x*4],vga.memory[src+x*4+1],vga.memory[src+x*4+2],vga.memory[src+x*4+3]);
+// for(x=0;x<64;x++)
+// printf("%08x: %02x %02x %02x %02x\n",src+x*4,vga.memory[src+x*4],vga.memory[src+x*4+1],vga.memory[src+x*4+2],vga.memory[src+x*4+3]);
for(y=0;y<64;y++)
{
dst = &bitmap.pix32(cy + y, cx);
@@ -4940,7 +4940,7 @@ static void ati_define_video_mode(running_machine &machine)
clock = XTAL_42_9545MHz;
logerror("Invalid dot clock %i selected.\n",clock_type);
}
-// logerror("ATI: Clock select type %i (%iHz / %i)\n",clock_type,clock,div);
+// logerror("ATI: Clock select type %i (%iHz / %i)\n",clock_type,clock,div);
recompute_params_clock(machine,divisor,clock / div);
}
@@ -5138,7 +5138,7 @@ WRITE16_HANDLER(mach8_subcontrol_w)
{
ibm8514.subctrl = data;
ibm8514.substatus &= ~(data & 0x0f); // reset interrupts
-// logerror("8514/A: Subsystem control write %04x\n",data);
+// logerror("8514/A: Subsystem control write %04x\n",data);
}
READ16_HANDLER(mach8_subcontrol_r)
@@ -5159,7 +5159,7 @@ READ16_HANDLER(mach8_vtotal_r)
WRITE16_HANDLER(mach8_vtotal_w)
{
ibm8514.vtotal = data;
-// vga.crtc.vert_total = data;
+// vga.crtc.vert_total = data;
logerror("8514/A: Vertical total write %04x\n",data);
}
@@ -5171,7 +5171,7 @@ READ16_HANDLER(mach8_vdisp_r)
WRITE16_HANDLER(mach8_vdisp_w)
{
ibm8514.vdisp = data;
-// vga.crtc.vert_disp_end = data >> 3;
+// vga.crtc.vert_disp_end = data >> 3;
logerror("8514/A: Vertical Displayed write %04x\n",data);
}
diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c
index aae31597654..b5265b04649 100644
--- a/src/emu/video/saa5050.c
+++ b/src/emu/video/saa5050.c
@@ -13,9 +13,9 @@
TODO:
- - character rounding
- - remote controller input
- - boxing
+ - character rounding
+ - remote controller input
+ - boxing
*/
@@ -237,7 +237,7 @@ void saa5050_device::process_control_character(UINT8 data)
case STEADY:
m_flash = false;
break;
-
+
case END_BOX:
case START_BOX:
// TODO
@@ -336,7 +336,7 @@ WRITE_LINE_MEMBER( saa5050_device::dew_w )
{
m_ra = 19;
m_double_height_top_row = false;
-
+
m_frame_count++;
if (m_frame_count > 50) m_frame_count = 0;
}
diff --git a/src/emu/video/saa5050.h b/src/emu/video/saa5050.h
index ce992a4145a..92cafbc26ec 100644
--- a/src/emu/video/saa5050.h
+++ b/src/emu/video/saa5050.h
@@ -89,7 +89,7 @@ public:
// NOTE: the following are provided for convenience only, SAA5050 is not a display controller
// this emulates the common setup where bit 7 of data inverts the display, and the
- // bottom half of a double height row gets the same character data as the top half
+ // bottom half of a double height row gets the same character data as the top half
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c
index 6593cae8cf4..00799fcbe74 100644
--- a/src/emu/video/tlc34076.c
+++ b/src/emu/video/tlc34076.c
@@ -34,7 +34,7 @@ struct tlc34076_state
rgb_t pens[0x100];
};
-const tlc34076_config tlc34076_6_bit_intf =
+const tlc34076_config tlc34076_6_bit_intf =
{
TLC34076_6_BIT
};
diff --git a/src/emu/video/vector.c b/src/emu/video/vector.c
index af3e2e5b0a8..2d36386fa93 100644
--- a/src/emu/video/vector.c
+++ b/src/emu/video/vector.c
@@ -127,7 +127,7 @@ static render_texture *get_vector_texture(float dx, float dy, float intensity)
#define VCLIP 2
/* The vertices are buffered here */
-struct point
+struct point
{
int x; int y;
rgb_t col;