diff options
Diffstat (limited to 'src/mame/video')
-rw-r--r-- | src/mame/video/k053246_k053247_k055673.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/k053250_ps.cpp | 64 | ||||
-rw-r--r-- | src/mame/video/k053250_ps.h | 6 | ||||
-rw-r--r-- | src/mame/video/vicdual-97269pb.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/vicdual-97269pb.h | 2 | ||||
-rw-r--r-- | src/mame/video/wolfpack.cpp | 2 |
6 files changed, 39 insertions, 39 deletions
diff --git a/src/mame/video/k053246_k053247_k055673.cpp b/src/mame/video/k053246_k053247_k055673.cpp index 394a1e7c445..1ffa4dc6acd 100644 --- a/src/mame/video/k053246_k053247_k055673.cpp +++ b/src/mame/video/k053246_k053247_k055673.cpp @@ -194,7 +194,7 @@ READ16_MEMBER( k053247_device::k055673_ps_rom_word_r ) romofs = m_kx46_regs[6] << 16 | m_kx46_regs[7] << 8 | m_kx46_regs[4]; offset = ((offset & 4) >> 1); - + int finoffs = (romofs * 2) + (offset * 2) + magic; return ROM[finoffs+2] | (ROM[finoffs]<<8); diff --git a/src/mame/video/k053250_ps.cpp b/src/mame/video/k053250_ps.cpp index ead047ec380..72e841b55f2 100644 --- a/src/mame/video/k053250_ps.cpp +++ b/src/mame/video/k053250_ps.cpp @@ -7,19 +7,19 @@ /* Registers - + 0 xxxx xxxx X-Scroll [7:0] 1 xxxx xxxx X-Scroll [15:8] - + 2 xxxx xxxx Y-Scroll [7:0] - + 3 xxxx xxxx Y-Scroll [15:8] - + 4 Control .... ...x 0:Swap XY 1:Normal .... ..x. Interrupt related? @@ -27,13 +27,13 @@ .... x... Flip X ...x .... Flip Y xxx. .... Wrap control - + 5 .... .... Unknown - + 6 xxxx xxxx ROM access address [7:0] - + 7 xxxx xxxx ROM access address [15:8] */ @@ -72,9 +72,9 @@ void k053250ps_device::device_start() m_ram.resize(0x6000/2); m_buffer[0] = &m_ram[0x0000]; m_buffer[1] = &m_ram[0x0800]; - -// m_buffer[0] = &m_ram[0x2000]; -// m_buffer[1] = &m_ram[0x2800]; + +// m_buffer[0] = &m_ram[0x2000]; +// m_buffer[1] = &m_ram[0x2800]; unpack_nibbles(); @@ -82,7 +82,7 @@ void k053250ps_device::device_start() save_item(NAME(m_regs)); save_item(NAME(m_page)); save_item(NAME(m_dmairq_on)); - + m_dmairq_cb.resolve_safe(); m_timer_lvcdma = timer_alloc(0); } @@ -91,10 +91,10 @@ void k053250ps_device::device_reset() { m_page = 0; memset(m_regs, 0, sizeof(m_regs)); - + m_timer_lvcdma_state = OD_IDLE; m_timer_lvcdma->adjust(attotime::never); - + m_dmairq_on = false; } @@ -263,19 +263,19 @@ inline void k053250ps_device::pdraw_scanline32(bitmap_rgb32 &bitmap, const pen_t void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, int colorbase, int flags, bitmap_ind8 &priority_bitmap, int priority ) { static int16_t scroll_x; - + if (machine().input().code_pressed(KEYCODE_A)) { scroll_x--; popmessage("SCROLL: %d\n", scroll_x); } - + else if (machine().input().code_pressed(KEYCODE_S)) { scroll_x++; popmessage("SCROLL: %d\n", scroll_x); } - + uint8_t *pix_ptr; const pen_t *pal_base, *pal_ptr; uint32_t src_clipmask, src_wrapmask; //, dst_wrapmask; @@ -308,11 +308,11 @@ void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, in if (ctrl & 0x10) orientation |= ORIENTATION_FLIP_Y; //printf("CTRL: %x\n", ctrl); - + // 00 // 0x12 // 0x10 - + switch (ctrl >> 5) // the upper four bits of the control register select source and target dimensions { case 0 : @@ -371,7 +371,7 @@ void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, in linedata_offs += bitmap.height() - 1; // and get info for the first line from the bottom } -// dst_wrapmask = ~0; // scanlines don't seem to wrap horizontally in normal orientation +// dst_wrapmask = ~0; // scanlines don't seem to wrap horizontally in normal orientation passes = 1; // draw scanline in a single pass } else // orientaion with X and Y parameters switched @@ -401,13 +401,13 @@ void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, in if (src_clipmask) { // determine target wrap boundary and draw scanline in two passes if the source is clipped -// dst_wrapmask = dst_height - 1; +// dst_wrapmask = dst_height - 1; passes = 2; } else { // otherwise disable target wraparound and draw scanline in a single pass -// dst_wrapmask = ~0; +// dst_wrapmask = ~0; passes = 1; } } @@ -421,7 +421,7 @@ void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, in // load physical palette base pal_base = palette().pens() + (colorbase << 4) % palette().entries(); - + //printf("Line Start: %u Line End: %u Advance: %u\n", line_start, line_end, linedata_adv); @@ -429,7 +429,7 @@ void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, in for (line_pos=line_start; line_pos <= line_end; linedata_offs += linedata_adv, line_pos++) { linedata_offs &= 0x7ff; // line info data wraps at the four-kilobyte boundary - + color = line_ram[linedata_offs]; // get scanline color code if (color == 0xffff) continue; // reject scanline if color code equals minus one @@ -451,10 +451,10 @@ void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, in zoom = line_ram[linedata_offs + 2]; scroll = ((short)line_ram[linedata_offs + 3]); // get signed local scroll value for the current scanline - + // scavenged from old code; improves Xexex' first level sky if (wrap500 && scroll >= 0x500) scroll -= 0x800; - + if (1 && scroll >= 0x500) scroll -= 0x800; scroll += scroll_corr; // apply final scroll correction @@ -465,8 +465,8 @@ void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, in { printf("%u: [%x] COLR:%x OFFS:%x ZOOM:%x SCRL:%d (%.4x)\n", line_pos, linedata_offs, color, offset, zoom, scroll, line_ram[linedata_offs + 3]); } - - + + // draw scanlines wrapped at virtual bitmap boundary in two passes // this should not impose too much overhead due to clipping performed by the render code i = passes; @@ -513,17 +513,17 @@ void k053250ps_device::device_timer(emu_timer &timer, device_timer_id id, int pa m_timer_lvcdma_state = OD_WAIT_END; m_timer_lvcdma->adjust(attotime::from_ticks(4096, clock())); m_dmairq_cb(ASSERT_LINE); - -// memcpy(m_buffer[m_page], &m_ram[0], 0x1000); -// m_page ^= 1; + +// memcpy(m_buffer[m_page], &m_ram[0], 0x1000); +// m_page ^= 1; break; - + case OD_WAIT_END: m_timer_lvcdma_state = OD_IDLE; m_timer_lvcdma->adjust(attotime::never); m_dmairq_cb(CLEAR_LINE); - + if(/*(m_regs[4] & 0x02) &&*/ !m_dmairq_on) { m_dmairq_on = true; diff --git a/src/mame/video/k053250_ps.h b/src/mame/video/k053250_ps.h index 0d5d714b844..f0835e37568 100644 --- a/src/mame/video/k053250_ps.h +++ b/src/mame/video/k053250_ps.h @@ -26,7 +26,7 @@ public: static void static_set_offsets(device_t &device, int offx, int offy); template<class _cb> static devcb_base &set_dmairq_cb(device_t &device, _cb cb) { return downcast<k053250ps_device &>(device).m_dmairq_cb.set_callback(cb); } - + DECLARE_READ16_MEMBER(reg_r); DECLARE_WRITE16_MEMBER(reg_w); DECLARE_READ16_MEMBER(ram_r); @@ -44,7 +44,7 @@ protected: virtual void device_reset() override; private: - + enum { OD_IDLE, OD_WAIT_START, @@ -54,7 +54,7 @@ private: devcb_write_line m_dmairq_cb; int m_timer_lvcdma_state; bool m_dmairq_on; - + // configuration int m_offx, m_offy; diff --git a/src/mame/video/vicdual-97269pb.cpp b/src/mame/video/vicdual-97269pb.cpp index acdb8e8badd..5e993516b29 100644 --- a/src/mame/video/vicdual-97269pb.cpp +++ b/src/mame/video/vicdual-97269pb.cpp @@ -154,4 +154,4 @@ pen_t s97269pb_device::choose_pen(uint8_t x, uint8_t y, pen_t back_pen) } } return back_pen; -}
\ No newline at end of file +} diff --git a/src/mame/video/vicdual-97269pb.h b/src/mame/video/vicdual-97269pb.h index 46859a267e0..3897efac93a 100644 --- a/src/mame/video/vicdual-97269pb.h +++ b/src/mame/video/vicdual-97269pb.h @@ -31,7 +31,7 @@ protected: private: required_region_ptr<uint8_t> m_prom_ptr; - // bit 2 enables gradient and starfield + // bit 2 enables gradient and starfield // bit 3 seems to be used to flip for cocktail uint8_t m_palette_bank; }; diff --git a/src/mame/video/wolfpack.cpp b/src/mame/video/wolfpack.cpp index 11bf2c4e782..871c3dd01be 100644 --- a/src/mame/video/wolfpack.cpp +++ b/src/mame/video/wolfpack.cpp @@ -103,7 +103,7 @@ void wolfpack_state::video_start() for (int i = 0; i < 0x8000; i++) { uint16_t val = 0; - + int bit = (val >> 0x0) ^ (val >> 0xe) ^ 1; val = (val << 1) | (bit & 1); |