diff options
Diffstat (limited to 'src/mame/includes/astrocde.h')
-rw-r--r-- | src/mame/includes/astrocde.h | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index f2eb4d0a750..25b4861b32a 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -66,8 +66,8 @@ public: optional_device<samples_device> m_samples; optional_device<votrax_sc01_device> m_votrax; optional_device<astrocade_device> m_astrocade_sound1; - optional_shared_ptr<UINT8> m_videoram; - optional_shared_ptr<UINT8> m_protected_ram; + optional_shared_ptr<uint8_t> m_videoram; + optional_shared_ptr<uint8_t> m_protected_ram; required_device<screen_device> m_screen; optional_device<generic_latch_8_device> m_soundlatch; optional_device<address_map_bank_device> m_bank4000; @@ -87,53 +87,53 @@ public: optional_ioport_array<4> m_trackball; optional_ioport_array<2> m_joystick; - UINT8 m_video_config; - UINT8 m_sparkle[4]; + uint8_t m_video_config; + uint8_t m_sparkle[4]; char m_totalword[256]; char *m_totalword_ptr; char m_oldword[256]; int m_plural; - UINT8 m_port_1_last; - UINT8 m_port_2_last; - UINT8 m_ram_write_enable; - UINT8 m_input_select; - std::unique_ptr<UINT8[]> m_sparklestar; - UINT8 m_interrupt_enabl; - UINT8 m_interrupt_vector; - UINT8 m_interrupt_scanline; - UINT8 m_vertical_feedback; - UINT8 m_horizontal_feedback; + uint8_t m_port_1_last; + uint8_t m_port_2_last; + uint8_t m_ram_write_enable; + uint8_t m_input_select; + std::unique_ptr<uint8_t[]> m_sparklestar; + uint8_t m_interrupt_enabl; + uint8_t m_interrupt_vector; + uint8_t m_interrupt_scanline; + uint8_t m_vertical_feedback; + uint8_t m_horizontal_feedback; emu_timer *m_scanline_timer; emu_timer *m_intoff_timer; - UINT8 m_colors[8]; - UINT8 m_colorsplit; - UINT8 m_bgdata; - UINT8 m_vblank; - UINT8 m_video_mode; - UINT8 m_funcgen_expand_color[2]; - UINT8 m_funcgen_control; - UINT8 m_funcgen_expand_count; - UINT8 m_funcgen_rotate_count; - UINT8 m_funcgen_rotate_data[4]; - UINT8 m_funcgen_shift_prev_data; - UINT8 m_funcgen_intercept; - UINT16 m_pattern_source; - UINT8 m_pattern_mode; - UINT16 m_pattern_dest; - UINT8 m_pattern_skip; - UINT8 m_pattern_width; - UINT8 m_pattern_height; - std::unique_ptr<UINT16[]> m_profpac_videoram; - UINT16 m_profpac_palette[16]; - UINT8 m_profpac_colormap[4]; - UINT8 m_profpac_intercept; - UINT8 m_profpac_vispage; - UINT8 m_profpac_readpage; - UINT8 m_profpac_readshift; - UINT8 m_profpac_writepage; - UINT8 m_profpac_writemode; - UINT16 m_profpac_writemask; - UINT8 m_profpac_vw; + uint8_t m_colors[8]; + uint8_t m_colorsplit; + uint8_t m_bgdata; + uint8_t m_vblank; + uint8_t m_video_mode; + uint8_t m_funcgen_expand_color[2]; + uint8_t m_funcgen_control; + uint8_t m_funcgen_expand_count; + uint8_t m_funcgen_rotate_count; + uint8_t m_funcgen_rotate_data[4]; + uint8_t m_funcgen_shift_prev_data; + uint8_t m_funcgen_intercept; + uint16_t m_pattern_source; + uint8_t m_pattern_mode; + uint16_t m_pattern_dest; + uint8_t m_pattern_skip; + uint8_t m_pattern_width; + uint8_t m_pattern_height; + std::unique_ptr<uint16_t[]> m_profpac_videoram; + uint16_t m_profpac_palette[16]; + uint8_t m_profpac_colormap[4]; + uint8_t m_profpac_intercept; + uint8_t m_profpac_vispage; + uint8_t m_profpac_readpage; + uint8_t m_profpac_readshift; + uint8_t m_profpac_writepage; + uint8_t m_profpac_writemode; + uint16_t m_profpac_writemask; + uint8_t m_profpac_vw; DECLARE_WRITE8_MEMBER(protected_ram_enable_w); DECLARE_READ8_MEMBER(protected_ram_r); DECLARE_WRITE8_MEMBER(protected_ram_w); @@ -183,14 +183,14 @@ public: DECLARE_PALETTE_INIT(astrocde); DECLARE_VIDEO_START(profpac); DECLARE_PALETTE_INIT(profpac); - UINT32 screen_update_astrocde(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - UINT32 screen_update_profpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_astrocde(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_profpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(scanline_callback); inline int mame_vpos_to_astrocade_vpos(int scanline); void init_savestate(); - void astrocade_trigger_lightpen(UINT8 vfeedback, UINT8 hfeedback); - inline void increment_source(UINT8 curwidth, UINT8 *u13ff); - inline void increment_dest(UINT8 curwidth); + void astrocade_trigger_lightpen(uint8_t vfeedback, uint8_t hfeedback); + inline void increment_source(uint8_t curwidth, uint8_t *u13ff); + inline void increment_dest(uint8_t curwidth); void execute_blit(address_space &space); void init_sparklestar(); virtual void machine_start() override; |