Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4918 from cam900/tc0280grd_args

Browse Source 
tc0280grd.cpp : Updates
This commit is contained in:
R. Belmont 2019-04-25 09:39:54 -04:00 committed by GitHub
commit ec0ac6b9ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/mame/video/tc0280grd.cpp
View File

@ -23,17 +23,19 @@ control registers:
#include "emu.h" #include "emu.h"
#include "tc0280grd.h" #include "tc0280grd.h"
#include <algorithm>
#define TC0280GRD_RAM_SIZE 0x2000 #define TC0280GRD_RAM_SIZE 0x2000
DEFINE_DEVICE_TYPE(TC0280GRD, tc0280grd_device, "tc0280grd", "Taito TC0280GRD / TC0430GRW") DEFINE_DEVICE_TYPE(TC0280GRD, tc0280grd_device, "tc0280grd", "Taito TC0280GRD / TC0430GRW")
tc0280grd_device::tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) tc0280grd_device::tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, TC0280GRD, tag, owner, clock), : device_t(mconfig, TC0280GRD, tag, owner, clock)
m_ram(nullptr), , m_ram(nullptr)
//m_ctrl[8](0), , m_base_color(0)
m_base_color(0), , m_gfxdecode(*this, finder_base::DUMMY_TAG)
m_gfxdecode(*this, finder_base::DUMMY_TAG)
{ {
std::fill(std::begin(m_ctrl), std::end(m_ctrl), 0);
} }
//------------------------------------------------- //-------------------------------------------------
@ -45,10 +47,10 @@ void tc0280grd_device::device_start()
if(!m_gfxdecode->started()) if(!m_gfxdecode->started())
throw device_missing_dependencies(); throw device_missing_dependencies();
m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0280grd_device::tc0280grd_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tc0280grd_device::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
m_tilemap->set_transparent_pen(0); m_tilemap->set_transparent_pen(0);
m_ram = make_unique_clear<uint16_t[]>(TC0280GRD_RAM_SIZE / 2); m_ram = make_unique_clear<u16[]>(TC0280GRD_RAM_SIZE / 2);
save_pointer(NAME(m_ram), TC0280GRD_RAM_SIZE / 2); save_pointer(NAME(m_ram), TC0280GRD_RAM_SIZE / 2);
save_item(NAME(m_ctrl)); save_item(NAME(m_ctrl));
@ -60,9 +62,7 @@ void tc0280grd_device::device_start()
void tc0280grd_device::device_reset() void tc0280grd_device::device_reset()
{ {
int i; for (int i = 0; i < 8; i++)
for (i = 0; i < 8; i++)
m_ctrl[i] = 0; m_ctrl[i] = 0;
} }
@ -70,7 +70,7 @@ void tc0280grd_device::device_reset()
DEVICE HANDLERS DEVICE HANDLERS
*****************************************************************************/ *****************************************************************************/
TILE_GET_INFO_MEMBER(tc0280grd_device::tc0280grd_get_tile_info) TILE_GET_INFO_MEMBER(tc0280grd_device::get_tile_info)
{ {
int attr = m_ram[tile_index]; int attr = m_ram[tile_index];
SET_TILE_INFO_MEMBER(m_gfxnum, SET_TILE_INFO_MEMBER(m_gfxnum,
@ -79,38 +79,38 @@ TILE_GET_INFO_MEMBER(tc0280grd_device::tc0280grd_get_tile_info)
0); 0);
} }
READ16_MEMBER( tc0280grd_device::tc0280grd_word_r ) u16 tc0280grd_device::tc0280grd_word_r(offs_t offset)
{ {
return m_ram[offset]; return m_ram[offset];
} }
WRITE16_MEMBER( tc0280grd_device::tc0280grd_word_w ) void tc0280grd_device::tc0280grd_word_w(offs_t offset, u16 data, u16 mem_mask)
{ {
COMBINE_DATA(&m_ram[offset]); COMBINE_DATA(&m_ram[offset]);
m_tilemap->mark_tile_dirty(offset); m_tilemap->mark_tile_dirty(offset);
} }
WRITE16_MEMBER( tc0280grd_device::tc0280grd_ctrl_word_w ) void tc0280grd_device::tc0280grd_ctrl_word_w(offs_t offset, u16 data, u16 mem_mask)
{ {
COMBINE_DATA(&m_ctrl[offset]); COMBINE_DATA(&m_ctrl[offset]);
} }
READ16_MEMBER( tc0280grd_device::tc0430grw_word_r ) u16 tc0280grd_device::tc0430grw_word_r(offs_t offset)
{ {
return tc0280grd_word_r(space, offset, mem_mask); return tc0280grd_word_r(offset);
} }
WRITE16_MEMBER( tc0280grd_device::tc0430grw_word_w ) void tc0280grd_device::tc0430grw_word_w(offs_t offset, u16 data, u16 mem_mask)
{ {
tc0280grd_word_w(space, offset, data, mem_mask); tc0280grd_word_w(offset, data, mem_mask);
} }
WRITE16_MEMBER( tc0280grd_device::tc0430grw_ctrl_word_w ) void tc0280grd_device::tc0430grw_ctrl_word_w(offs_t offset, u16 data, u16 mem_mask)
{ {
tc0280grd_ctrl_word_w(space, offset, data, mem_mask); tc0280grd_ctrl_word_w(offset, data, mem_mask);
} }
void tc0280grd_device::tc0280grd_tilemap_update( int base_color ) void tc0280grd_device::tc0280grd_tilemap_update(int base_color)
{ {
if (m_base_color != base_color) if (m_base_color != base_color)
{ {
@ -119,35 +119,32 @@ void tc0280grd_device::tc0280grd_tilemap_update( int base_color )
} }
} }
void tc0280grd_device::tc0430grw_tilemap_update( int base_color ) void tc0280grd_device::tc0430grw_tilemap_update(int base_color)
{ {
tc0280grd_tilemap_update(base_color); tc0280grd_tilemap_update(base_color);
} }
void tc0280grd_device::zoom_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, uint32_t priority, int xmultiply ) void tc0280grd_device::zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, u32 priority, int xmultiply)
{ {
uint32_t startx, starty;
int incxx, incxy, incyx, incyy;
/* 24-bit signed */ /* 24-bit signed */
startx = ((m_ctrl[0] & 0xff) << 16) + m_ctrl[1]; u32 startx = ((m_ctrl[0] & 0xff) << 16) + m_ctrl[1];
if (startx & 0x800000) if (startx & 0x800000)
startx -= 0x1000000; startx -= 0x1000000;
incxx = (int16_t)m_ctrl[2]; int incxx = (s16)m_ctrl[2];
incxx *= xmultiply; incxx *= xmultiply;
incyx = (int16_t)m_ctrl[3]; int incyx = (s16)m_ctrl[3];
/* 24-bit signed */ /* 24-bit signed */
starty = ((m_ctrl[4] & 0xff) << 16) + m_ctrl[5]; u32 starty = ((m_ctrl[4] & 0xff) << 16) + m_ctrl[5];
if (starty & 0x800000) if (starty & 0x800000)
starty -= 0x1000000; starty -= 0x1000000;
incxy = (int16_t)m_ctrl[6]; int incxy = (s16)m_ctrl[6];
incxy *= xmultiply; incxy *= xmultiply;
incyy = (int16_t)m_ctrl[7]; int incyy = (s16)m_ctrl[7];
startx -= xoffset * incxx + yoffset * incyx; startx -= xoffset * incxx + yoffset * incyx;
starty -= xoffset * incxy + yoffset * incyy; starty -= xoffset * incxy + yoffset * incyy;
@ -158,12 +155,12 @@ void tc0280grd_device::zoom_draw( screen_device &screen, bitmap_ind16 &bitmap, c
0, priority); 0, priority);
} }
void tc0280grd_device::tc0280grd_zoom_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, uint32_t priority ) void tc0280grd_device::tc0280grd_zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, u32 priority)
{ {
zoom_draw(screen, bitmap, cliprect, xoffset, yoffset, priority, 2); zoom_draw(screen, bitmap, cliprect, xoffset, yoffset, priority, 2);
} }
void tc0280grd_device::tc0430grw_zoom_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, uint32_t priority ) void tc0280grd_device::tc0430grw_zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, u32 priority)
{ {
zoom_draw(screen, bitmap, cliprect, xoffset, yoffset, priority, 1); zoom_draw(screen, bitmap, cliprect, xoffset, yoffset, priority, 1);
} }

32
src/mame/video/tc0280grd.h
View File

@ -8,23 +8,23 @@
class tc0280grd_device : public device_t class tc0280grd_device : public device_t
{ {
public: public:
tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
// configuration // configuration
template <typename T> void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward<T>(tag)); } template <typename T> void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward<T>(tag)); }
void set_gfx_region(int gfxregion) { m_gfxnum = gfxregion; } void set_gfx_region(int gfxregion) { m_gfxnum = gfxregion; }
DECLARE_READ16_MEMBER( tc0280grd_word_r ); u16 tc0280grd_word_r(offs_t offset);
DECLARE_WRITE16_MEMBER( tc0280grd_word_w ); void tc0280grd_word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
DECLARE_WRITE16_MEMBER( tc0280grd_ctrl_word_w ); void tc0280grd_ctrl_word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void tc0280grd_tilemap_update(int base_color); void tc0280grd_tilemap_update(int base_color);
void tc0280grd_zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, uint32_t priority); void tc0280grd_zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, u32 priority);
DECLARE_READ16_MEMBER( tc0430grw_word_r ); u16 tc0430grw_word_r(offs_t offset);
DECLARE_WRITE16_MEMBER( tc0430grw_word_w ); void tc0430grw_word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
DECLARE_WRITE16_MEMBER( tc0430grw_ctrl_word_w ); void tc0430grw_ctrl_word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void tc0430grw_tilemap_update(int base_color); void tc0430grw_tilemap_update(int base_color);
void tc0430grw_zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, uint32_t priority); void tc0430grw_zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, u32 priority);
protected: protected:
// device-level overrides // device-level overrides
@ -33,17 +33,17 @@ protected:
private: private:
// internal state // internal state
std::unique_ptr<uint16_t[]> m_ram; std::unique_ptr<u16[]> m_ram;
tilemap_t *m_tilemap; tilemap_t *m_tilemap;
uint16_t m_ctrl[8]; u16 m_ctrl[8];
int m_base_color; int m_base_color;
int m_gfxnum; int m_gfxnum;
required_device<gfxdecode_device> m_gfxdecode; required_device<gfxdecode_device> m_gfxdecode;
TILE_GET_INFO_MEMBER(tc0280grd_get_tile_info); TILE_GET_INFO_MEMBER(get_tile_info);
void zoom_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, uint32_t priority, int xmultiply ); void zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, u32 priority, int xmultiply);
}; };
DECLARE_DEVICE_TYPE(TC0280GRD, tc0280grd_device) DECLARE_DEVICE_TYPE(TC0280GRD, tc0280grd_device)