diff options
Diffstat (limited to 'src/mess/video')
| -rw-r--r-- | src/mess/video/advision.c | 2 | ||||
| -rw-r--r-- | src/mess/video/apple2.c | 14 | ||||
| -rw-r--r-- | src/mess/video/apple3.c | 2 | ||||
| -rw-r--r-- | src/mess/video/maria.c | 28 | ||||
| -rw-r--r-- | src/mess/video/maria.h | 10 | ||||
| -rw-r--r-- | src/mess/video/nes.c | 4 | ||||
| -rw-r--r-- | src/mess/video/thomson.c | 44 |
7 files changed, 52 insertions, 52 deletions
diff --git a/src/mess/video/advision.c b/src/mess/video/advision.c index cd4d11ee377..d55fb7ed137 100644 --- a/src/mess/video/advision.c +++ b/src/mess/video/advision.c @@ -65,7 +65,7 @@ void advision_state::vh_update(int x) for (int i = 0; i < 8; i++) { - if (!BIT(data, 7 - i)) + if (!BIT(data, 7 - i)) dst[i * 256] = 8; } diff --git a/src/mess/video/apple2.c b/src/mess/video/apple2.c index f12e9828f5e..67c94abdfda 100644 --- a/src/mess/video/apple2.c +++ b/src/mess/video/apple2.c @@ -102,7 +102,7 @@ inline void apple2_state::apple2_plot_text_character(bitmap_ind16 &bitmap, int x switch (m_sysconfig->read() & 0x03) { case 0: - break; // leave alone + break; // leave alone case 1: if ((m_machinetype == APPLE_II) || (m_machinetype == LABA2P) || (m_machinetype == SPACE84)) @@ -182,7 +182,7 @@ inline void apple2_state::apple2_plot_text_character(bitmap_ind16 &bitmap, int x for (i = 0; i < xscale; i++) { - bitmap.pix16(ypos + y, xpos + (x * xscale) + i) = color; + bitmap.pix16(ypos + y, xpos + (x * xscale) + i) = color; } } } @@ -352,7 +352,7 @@ void apple2_state::apple2_hires_draw(bitmap_ind16 &bitmap, const rectangle &clip { case 0: artifact_map_ptr = &m_hires_artifact_map[((vram_row[col+1] & 0x80) >> 7) * 16]; - for (b = 0; b < 7; b++) + for (b = 0; b < 7; b++) { v = artifact_map_ptr[((w >> (b + 7-1)) & 0x07) | (((b ^ col) & 0x01) << 3)]; *(p++) = v; @@ -362,7 +362,7 @@ void apple2_state::apple2_hires_draw(bitmap_ind16 &bitmap, const rectangle &clip case 1: w >>= 7; - for (b = 0; b < 7; b++) + for (b = 0; b < 7; b++) { v = (w & 1); w >>= 1; @@ -373,7 +373,7 @@ void apple2_state::apple2_hires_draw(bitmap_ind16 &bitmap, const rectangle &clip case 2: w >>= 7; - for (b = 0; b < 7; b++) + for (b = 0; b < 7; b++) { v = (w & 1); w >>= 1; @@ -384,7 +384,7 @@ void apple2_state::apple2_hires_draw(bitmap_ind16 &bitmap, const rectangle &clip case 3: w >>= 7; - for (b = 0; b < 7; b++) + for (b = 0; b < 7; b++) { v = (w & 1); w >>= 1; @@ -411,7 +411,7 @@ void apple2_state::apple2_hires_draw(bitmap_ind16 &bitmap, const rectangle &clip switch (mon_type) { case 0: - for (b = 0; b < 7; b++) + for (b = 0; b < 7; b++) { v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F]; *(p++) = v; diff --git a/src/mess/video/apple3.c b/src/mess/video/apple3.c index 57bd636d98a..17ff125ccd4 100644 --- a/src/mess/video/apple3.c +++ b/src/mess/video/apple3.c @@ -412,7 +412,7 @@ void apple3_state::apple3_video_graphics_chires(bitmap_ind16 &bitmap) UINT32 apple3_state::screen_update_apple3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { -// printf("gfx mode %x\n", m_flags & (VAR_VM3|VAR_VM1|VAR_VM0)); +// printf("gfx mode %x\n", m_flags & (VAR_VM3|VAR_VM1|VAR_VM0)); switch(m_flags & (VAR_VM3|VAR_VM1|VAR_VM0)) { diff --git a/src/mess/video/maria.c b/src/mess/video/maria.c index 5f285e4b2bf..62af22ba947 100644 --- a/src/mess/video/maria.c +++ b/src/mess/video/maria.c @@ -2,22 +2,22 @@ Atari MARIA video emulation - + - some history: - 2014-10-05 Mike Saarna, Robert Tuccitto Last Line DMA value corrected - to 6. GCC and Atari docs both show a difference between - Other Line and Last Line as +6 at the lowest part of the + 2014-10-05 Mike Saarna, Robert Tuccitto Last Line DMA value corrected + to 6. GCC and Atari docs both show a difference between + Other Line and Last Line as +6 at the lowest part of the range. - Blank scanlines are drawn when DMA is off, like real + Blank scanlines are drawn when DMA is off, like real hardware. - If MARIA hits the DMA limit, the CPU doesn't run until + If MARIA hits the DMA limit, the CPU doesn't run until the next scanline. - 2014-09-03 Mike Saarna, Robert Tuccitto reorganized DMA penalties to + 2014-09-03 Mike Saarna, Robert Tuccitto reorganized DMA penalties to support new rendering timeout code. 2014-08-29 Mike Saarna Timeout rendering added. - + 2014-08-26 Fabio Priuli Converted to device 2014-05-06 Mike Saarna Added interrupts to DMA cycle eating. Updates to @@ -61,7 +61,7 @@ atari_maria_device::atari_maria_device(const machine_config &mconfig, const char void atari_maria_device::device_start() -{ +{ m_cpu = machine().device<cpu_device>(m_cpu_tag); m_screen = machine().first_screen(); m_screen->register_screen_bitmap(m_bitmap); @@ -181,7 +181,7 @@ void atari_maria_device::draw_scanline() // All lines in a zone have the same initial DMA startup time. We'll adjust // cycles for the special last zone line later, as those penalties happen after // MARIA is done rendering, or after its hit the maximum rendering time. - maria_cycles = 16; + maria_cycles = 16; /* Process this DLL entry */ @@ -232,7 +232,7 @@ void atari_maria_device::draw_scanline() data_addr = (m_charbase | c) + (m_offset << 8); if (is_holey(data_addr)) continue; - + maria_cycles += 3; if (m_cwidth) // two data bytes per map byte { @@ -260,9 +260,9 @@ void atari_maria_device::draw_scanline() } } } - + // Last Line post-render DMA cycle penalties... - if (m_offset == 0) + if (m_offset == 0) { maria_cycles += 6; // extra shutdown time if (READ_MEM(m_dll + 3) & 0x80) @@ -443,7 +443,7 @@ WRITE8_MEMBER(atari_maria_device::write) m_color_kill = data & 0x80; switch ((data >> 5) & 3) { - case 0x00: + case 0x00: case 01: logerror("dma test mode, do not use.\n"); break; diff --git a/src/mess/video/maria.h b/src/mess/video/maria.h index e1b70baf4a8..b776ee5ae26 100644 --- a/src/mess/video/maria.h +++ b/src/mess/video/maria.h @@ -12,22 +12,22 @@ public: atari_maria_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_cpu_tag(device_t &device, const char *tag) { downcast<atari_maria_device &>(device).m_cpu_tag = tag; } - + void interrupt(int lines); void startdma(int lines); - + DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - + protected: // device-level overrides virtual void device_start(); virtual void device_reset(); private: - + int m_maria_palette[32]; int m_line_ram[2][160]; int m_active_buffer; @@ -54,7 +54,7 @@ private: int write_line_ram(int addr, UINT8 offset, int pal); const char *m_cpu_tag; - cpu_device *m_cpu; // CPU whose space(AS_PROGRAM) serves as DMA source + cpu_device *m_cpu; // CPU whose space(AS_PROGRAM) serves as DMA source screen_device *m_screen; }; diff --git a/src/mess/video/nes.c b/src/mess/video/nes.c index 91ec1f2d18a..64cb116df1e 100644 --- a/src/mess/video/nes.c +++ b/src/mess/video/nes.c @@ -37,8 +37,8 @@ UINT32 nes_state::screen_update_nes(screen_device &screen, bitmap_ind16 &bitmap, m_ppu->render(bitmap, 0, 0, 0, 0); // if this is a disk system game, check for the flip-disk key - if ((m_cartslot && m_cartslot->exists() && (m_cartslot->get_pcb_id() == STD_DISKSYS)) // first scenario = disksys in m_cartslot (= famicom) - || m_disk) // second scenario = disk via fixed internal disk option (fds & famitwin) + if ((m_cartslot && m_cartslot->exists() && (m_cartslot->get_pcb_id() == STD_DISKSYS)) // first scenario = disksys in m_cartslot (= famicom) + || m_disk) // second scenario = disk via fixed internal disk option (fds & famitwin) { // latch this input so it doesn't go at warp speed if ((m_io_disksel->read_safe(0) & 0x01) && (!m_last_frame_flip)) diff --git a/src/mess/video/thomson.c b/src/mess/video/thomson.c index 3687bb2dc7f..6b7bb72e221 100644 --- a/src/mess/video/thomson.c +++ b/src/mess/video/thomson.c @@ -412,7 +412,7 @@ UPDATE_HI( mo5alt ) int i; pen_t c[2]; c[0] = pal[ (ramb & 15) ^ 8 ]; - c[1] = pal[ (ramb >> 4) ^ 8 ]; + c[1] = pal[ (ramb >> 4) ^ 8 ]; for ( i = 0; i < 16; i += 2, rama >>= 1 ) dst[ 15 - i ] = dst[ 14 - i ] = c[ rama & 1 ]; } @@ -715,11 +715,11 @@ UPDATE_HI( overlayhalf ) c[0][0] = pal[ 0 ]; c[0][1] = c[1][1] = pal[ 1 ]; c[1][0] = pal[ 2 ]; - rama >>= 4; - ramb >>= 4; + rama >>= 4; + ramb >>= 4; for ( i = 0; i < 16; i += 4, rama >>= 1, ramb >>= 1 ) - dst[ 15 - i ] = dst[ 14 - i ] = dst[ 13 - i ] = dst[ 12 - i ] = - c[ ramb & 1 ] [ rama & 1 ]; + dst[ 15 - i ] = dst[ 14 - i ] = dst[ 13 - i ] = dst[ 12 - i ] = + c[ ramb & 1 ] [ rama & 1 ]; } END_UPDATE @@ -730,8 +730,8 @@ UPDATE_LOW( overlayhalf ) c[0][0] = pal[ 0 ]; c[0][1] = c[1][1] = pal[ 1 ]; c[1][0] = pal[ 2 ]; - rama >>= 4; - ramb >>= 4; + rama >>= 4; + ramb >>= 4; for ( i = 0; i < 8; i += 2, rama >>= 1, ramb >>= 1 ) dst[ 7 - i ] = dst[ 6 - i ] = c[ ramb & 1 ] [ rama & 1 ]; } @@ -782,7 +782,7 @@ static const thom_scandraw thom_scandraw_funcs[THOM_VMODE_NB][2] = FUN(to770), FUN(mo5), FUN(bitmap4), FUN(bitmap4alt), FUN(mode80), FUN(bitmap16), FUN(page1), FUN(page2), FUN(overlay), FUN(overlay3), FUN(to9), FUN(mode80_to9), - FUN(bitmap4althalf), FUN(mo5alt), FUN(overlayhalf), + FUN(bitmap4althalf), FUN(mo5alt), FUN(overlayhalf), }; @@ -1199,27 +1199,27 @@ PALETTE_INIT_MEMBER(thomson_state, thom) { LOG (( "thom: palette init called\n" )); - /* TO8 and later use an EF9369 color palette chip - The spec shows a built-in gamma correction for gamma=2.8 - i.e., output is out = in ^ (1/2.8) + /* TO8 and later use an EF9369 color palette chip + The spec shows a built-in gamma correction for gamma=2.8 + i.e., output is out = in ^ (1/2.8) - For the TO7, the gamma correction is irrelevant. - - For the TO7/70, we use the same palette and gamma has the TO8, - which gives good results (but is not verified). - */ - thom_configure_palette(1.0 / 2.8, thom_pal_init, palette); + For the TO7, the gamma correction is irrelevant. + + For the TO7/70, we use the same palette and gamma has the TO8, + which gives good results (but is not verified). + */ + thom_configure_palette(1.0 / 2.8, thom_pal_init, palette); } PALETTE_INIT_MEMBER(thomson_state, mo5) { LOG (( "thom: MO5 palette init called\n" )); - /* The MO5 has a different fixed palette than the TO7/70. - We use a smaller gamma correction which gives intutively better - results (but is not verified). - */ - thom_configure_palette(1.0, mo5_pal_init, palette); + /* The MO5 has a different fixed palette than the TO7/70. + We use a smaller gamma correction which gives intutively better + results (but is not verified). + */ + thom_configure_palette(1.0, mo5_pal_init, palette); } |
