summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/metro.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/metro.h')
-rw-r--r--src/mame/includes/metro.h52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index 62d93568718..0cf865a564b 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -68,22 +68,22 @@ public:
optional_device<generic_latch_8_device> m_soundlatch;
/* memory pointers */
- optional_shared_ptr<UINT16> m_vram_0;
- optional_shared_ptr<UINT16> m_vram_1;
- optional_shared_ptr<UINT16> m_vram_2;
- required_shared_ptr<UINT16> m_spriteram;
- optional_shared_ptr<UINT16> m_tiletable;
- optional_shared_ptr<UINT16> m_blitter_regs;
- optional_shared_ptr<UINT16> m_scroll;
- optional_shared_ptr<UINT16> m_window;
- optional_shared_ptr<UINT16> m_irq_enable;
- optional_shared_ptr<UINT16> m_irq_levels;
- optional_shared_ptr<UINT16> m_irq_vectors;
- optional_shared_ptr<UINT16> m_rombank;
- required_shared_ptr<UINT16> m_videoregs;
- optional_shared_ptr<UINT16> m_screenctrl;
- optional_shared_ptr<UINT16> m_input_sel;
- optional_shared_ptr<UINT16> m_k053936_ram;
+ optional_shared_ptr<uint16_t> m_vram_0;
+ optional_shared_ptr<uint16_t> m_vram_1;
+ optional_shared_ptr<uint16_t> m_vram_2;
+ required_shared_ptr<uint16_t> m_spriteram;
+ optional_shared_ptr<uint16_t> m_tiletable;
+ optional_shared_ptr<uint16_t> m_blitter_regs;
+ optional_shared_ptr<uint16_t> m_scroll;
+ optional_shared_ptr<uint16_t> m_window;
+ optional_shared_ptr<uint16_t> m_irq_enable;
+ optional_shared_ptr<uint16_t> m_irq_levels;
+ optional_shared_ptr<uint16_t> m_irq_vectors;
+ optional_shared_ptr<uint16_t> m_rombank;
+ required_shared_ptr<uint16_t> m_videoregs;
+ optional_shared_ptr<uint16_t> m_screenctrl;
+ optional_shared_ptr<uint16_t> m_input_sel;
+ optional_shared_ptr<uint16_t> m_k053936_ram;
int m_flip_screen;
@@ -98,17 +98,17 @@ public:
int m_sprite_yoffs;
int m_sprite_xoffs_dx;
- std::unique_ptr<UINT8[]> m_expanded_gfx1;
+ std::unique_ptr<uint8_t[]> m_expanded_gfx1;
/* irq_related */
int m_vblank_bit;
int m_blitter_bit;
int m_irq_line;
- UINT8 m_requested_int[8];
+ uint8_t m_requested_int[8];
emu_timer *m_mouja_irq_timer;
/* sound related */
- UINT16 m_soundstatus;
+ uint16_t m_soundstatus;
int m_porta;
int m_portb;
int m_busy_sndcpu;
@@ -154,7 +154,7 @@ public:
DECLARE_WRITE16_MEMBER(metro_vram_1_w);
DECLARE_WRITE16_MEMBER(metro_vram_2_w);
DECLARE_WRITE16_MEMBER(metro_window_w);
- void blt_write( address_space &space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask );
+ void blt_write( address_space &space, const int tmap, const offs_t offs, const uint16_t data, const uint16_t mask );
DECLARE_CUSTOM_INPUT_MEMBER(custom_soundstatus_r);
DECLARE_WRITE16_MEMBER(gakusai_oki_bank_hi_w);
DECLARE_WRITE16_MEMBER(gakusai_oki_bank_lo_w);
@@ -190,7 +190,7 @@ public:
DECLARE_VIDEO_START(metro_i4300);
DECLARE_VIDEO_START(blzntrnd);
DECLARE_VIDEO_START(gstrik2);
- UINT32 screen_update_metro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_metro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(metro_vblank_interrupt);
INTERRUPT_GEN_MEMBER(metro_periodic_interrupt);
INTERRUPT_GEN_MEMBER(karatour_interrupt);
@@ -198,14 +198,14 @@ public:
TIMER_CALLBACK_MEMBER(metro_blit_done);
void update_irq_state();
IRQ_CALLBACK_MEMBER(metro_irq_callback);
- inline UINT8 get_tile_pix( UINT16 code, UINT8 x, UINT8 y, int big, UINT16 *pix );
- inline void metro_vram_w( offs_t offset, UINT16 data, UINT16 mem_mask, int layer, UINT16 *vram );
+ inline uint8_t get_tile_pix( uint16_t code, uint8_t x, uint8_t y, int big, uint16_t *pix );
+ inline void metro_vram_w( offs_t offset, uint16_t data, uint16_t mem_mask, int layer, uint16_t *vram );
void metro_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect );
void draw_layers( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri, int layers_ctrl );
- inline int blt_read( const UINT8 *ROM, const int offs );
+ inline int blt_read( const uint8_t *ROM, const int offs );
void metro_common( );
- void draw_tilemap( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 flags, UINT32 pcode,
- int sx, int sy, int wx, int wy, int big, UINT16 *tilemapram, int layer );
+ void draw_tilemap( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint32_t flags, uint32_t pcode,
+ int sx, int sy, int wx, int wy, int big, uint16_t *tilemapram, int layer );
DECLARE_READ_LINE_MEMBER(metro_rxd_r);
protected: