summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/srmp6.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/srmp6.cpp')
-rw-r--r--src/mame/drivers/srmp6.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp
index e09dfd951fe..901bc10c095 100644
--- a/src/mame/drivers/srmp6.cpp
+++ b/src/mame/drivers/srmp6.cpp
@@ -85,16 +85,16 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
- std::unique_ptr<UINT16[]> m_tileram;
- required_shared_ptr<UINT16> m_sprram;
- required_shared_ptr<UINT16> m_chrram;
- optional_shared_ptr<UINT16> m_dmaram;
- required_shared_ptr<UINT16> m_video_regs;
+ std::unique_ptr<uint16_t[]> m_tileram;
+ required_shared_ptr<uint16_t> m_sprram;
+ required_shared_ptr<uint16_t> m_chrram;
+ optional_shared_ptr<uint16_t> m_dmaram;
+ required_shared_ptr<uint16_t> m_video_regs;
- std::unique_ptr<UINT16[]> m_sprram_old;
+ std::unique_ptr<uint16_t[]> m_sprram_old;
int m_brightness;
- UINT16 m_input_select;
+ uint16_t m_input_select;
unsigned short m_lastb;
unsigned short m_lastb2;
@@ -111,9 +111,9 @@ public:
DECLARE_DRIVER_INIT(INIT);
virtual void machine_start() override;
virtual void video_start() override;
- UINT32 screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void update_palette();
- UINT32 process(UINT8 b,UINT32 dst_offset);
+ uint32_t process(uint8_t b,uint32_t dst_offset);
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -135,7 +135,7 @@ static const gfx_layout tiles8x8_layout =
void srmp6_state::update_palette()
{
- INT8 r, g ,b;
+ int8_t r, g ,b;
int brg = m_brightness - 0x60;
int i;
@@ -167,12 +167,12 @@ void srmp6_state::update_palette()
void srmp6_state::video_start()
{
- m_tileram = make_unique_clear<UINT16[]>(0x100000*16/2);
+ m_tileram = make_unique_clear<uint16_t[]>(0x100000*16/2);
m_dmaram.allocate(0x100/2);
- m_sprram_old = make_unique_clear<UINT16[]>(0x80000/2);
+ m_sprram_old = make_unique_clear<uint16_t[]>(0x80000/2);
/* create the char set (gfx will then be updated dynamically from RAM) */
- m_gfxdecode->set_gfx(0, std::make_unique<gfx_element>(*m_palette, tiles8x8_layout, (UINT8*)m_tileram.get(), 0, m_palette->entries() / 256, 0));
+ m_gfxdecode->set_gfx(0, std::make_unique<gfx_element>(*m_palette, tiles8x8_layout, (uint8_t*)m_tileram.get(), 0, m_palette->entries() / 256, 0));
m_gfxdecode->gfx(0)->set_granularity(256);
m_brightness = 0x60;
@@ -182,17 +182,17 @@ void srmp6_state::video_start()
static int xixi=0;
#endif
-UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
int alpha;
int x,y,tileno,height,width,xw,yw,sprite,xb,yb;
- UINT16 *sprite_list = m_sprram_old.get();
- UINT16 mainlist_offset = 0;
+ uint16_t *sprite_list = m_sprram_old.get();
+ uint16_t mainlist_offset = 0;
union
{
- INT16 a;
- UINT16 b;
+ int16_t a;
+ uint16_t b;
} temp;
bitmap.fill(0, cliprect);
@@ -215,10 +215,10 @@ UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bit
/* Main spritelist is 0x0000 - 0x1fff in spriteram, sublists follow */
while (mainlist_offset<0x2000/2)
{
- UINT16 *sprite_sublist = &m_sprram_old[sprite_list[mainlist_offset+1]<<3];
- UINT16 sublist_length=sprite_list[mainlist_offset+0]&0x7fff; //+1 ?
- INT16 global_x,global_y, flip_x, flip_y;
- UINT16 global_pal;
+ uint16_t *sprite_sublist = &m_sprram_old[sprite_list[mainlist_offset+1]<<3];
+ uint16_t sublist_length=sprite_list[mainlist_offset+0]&0x7fff; //+1 ?
+ int16_t global_x,global_y, flip_x, flip_y;
+ uint16_t global_pal;
/* end of list marker */
if (sprite_list[mainlist_offset+0] == 0x8000)
@@ -382,11 +382,11 @@ READ16_MEMBER(srmp6_state::video_regs_r)
/* DMA RLE stuff - the same as CPS3 */
-UINT32 srmp6_state::process(UINT8 b,UINT32 dst_offset)
+uint32_t srmp6_state::process(uint8_t b,uint32_t dst_offset)
{
int l=0;
- UINT8 *tram=(UINT8*)m_tileram.get();
+ uint8_t *tram=(uint8_t*)m_tileram.get();
if (m_lastb == m_lastb2) //rle
{
@@ -419,15 +419,15 @@ UINT32 srmp6_state::process(UINT8 b,UINT32 dst_offset)
WRITE16_MEMBER(srmp6_state::srmp6_dma_w)
{
- UINT16* dmaram = m_dmaram;
+ uint16_t* dmaram = m_dmaram;
COMBINE_DATA(&dmaram[offset]);
if (offset==13 && dmaram[offset]==0x40)
{
- const UINT8 *rom = memregion("nile")->base();
- UINT32 srctab=2*((((UINT32)dmaram[5])<<16)|dmaram[4]);
- UINT32 srcdata=2*((((UINT32)dmaram[11])<<16)|dmaram[10]);
- UINT32 len=4*(((((UINT32)dmaram[7]&3)<<16)|dmaram[6])+1); //??? WRONG!
+ const uint8_t *rom = memregion("nile")->base();
+ uint32_t srctab=2*((((uint32_t)dmaram[5])<<16)|dmaram[4]);
+ uint32_t srcdata=2*((((uint32_t)dmaram[11])<<16)|dmaram[10]);
+ uint32_t len=4*(((((uint32_t)dmaram[7]&3)<<16)|dmaram[6])+1); //??? WRONG!
int tempidx=0;
/* show params */
@@ -455,16 +455,16 @@ WRITE16_MEMBER(srmp6_state::srmp6_dma_w)
while(1)
{
int i;
- UINT8 ctrl=rom[srcdata];
+ uint8_t ctrl=rom[srcdata];
++srcdata;
for(i=0;i<8;++i)
{
- UINT8 p=rom[srcdata];
+ uint8_t p=rom[srcdata];
if(ctrl&0x80)
{
- UINT8 real_byte;
+ uint8_t real_byte;
real_byte = rom[srctab+p*2];
tempidx+=process(real_byte,tempidx);
real_byte = rom[srctab+p*2+1];//px[DMA_XOR((current_table_address+p*2+1))];
@@ -497,7 +497,7 @@ READ16_MEMBER(srmp6_state::tileram_r)
WRITE16_MEMBER(srmp6_state::tileram_w)
{
- //UINT16 tmp;
+ //uint16_t tmp;
COMBINE_DATA(&m_chrram[offset]);
/* are the DMA registers enabled some other way, or always mapped here, over RAM? */
@@ -510,7 +510,7 @@ WRITE16_MEMBER(srmp6_state::tileram_w)
WRITE16_MEMBER(srmp6_state::paletteram_w)
{
- INT8 r, g, b;
+ int8_t r, g, b;
int brg = m_brightness - 0x60;
m_palette->write(space, offset, data, mem_mask);