diff options
Diffstat (limited to 'src/mame/includes/neogeo.h')
-rw-r--r-- | src/mame/includes/neogeo.h | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index 77f692d2740..cc64d8105d1 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -90,7 +90,7 @@ public: DECLARE_WRITE16_MEMBER(save_ram_w); DECLARE_CUSTOM_INPUT_MEMBER(kizuna4p_start_r); - UINT32 screen_update_neogeo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update_neogeo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(io_control_w); DECLARE_WRITE8_MEMBER(system_control_w); @@ -123,7 +123,7 @@ protected: optional_device<upd4990a_device> m_upd4990a; optional_device<ym2610_device> m_ym; required_device<neosprite_optimized_device> m_sprgen; - optional_shared_ptr<UINT16> m_save_ram; + optional_shared_ptr<uint16_t> m_save_ram; required_device<screen_device> m_screen; optional_device<palette_device> m_palette; @@ -159,8 +159,8 @@ protected: virtual void video_reset() override; const pen_t *m_bg_pen; - UINT8 m_vblank_level; - UINT8 m_raster_level; + uint8_t m_vblank_level; + uint8_t m_raster_level; int m_use_cart_vectors; int m_use_cart_audio; @@ -173,7 +173,7 @@ protected: void init_ym(); void init_sprites(); // temporary helper to restore memory banking while bankswitch is handled in the driver... - UINT32 m_bank_base; + uint32_t m_bank_base; optional_device<neogeo_cart_slot_device> m_slot1; optional_device<neogeo_cart_slot_device> m_slot2; @@ -189,13 +189,13 @@ private: void update_interrupts(); void create_interrupt_timers(); void start_interrupt_timers(); - void acknowledge_interrupt(UINT16 data); + void acknowledge_interrupt(uint16_t data); void adjust_display_position_interrupt_timer(); - void set_display_position_interrupt_control(UINT16 data); - void set_display_counter_msb(UINT16 data); - void set_display_counter_lsb(UINT16 data); - void set_video_control(UINT16 data); + void set_display_position_interrupt_control(uint16_t data); + void set_display_counter_msb(uint16_t data); + void set_display_counter_lsb(uint16_t data); + void set_video_control(uint16_t data); void create_rgb_lookups(); void set_pens(); @@ -203,9 +203,9 @@ private: void set_palette_bank(int data); void audio_cpu_check_nmi(); - void set_save_ram_unlock(UINT8 data); - void set_output_latch(UINT8 data); - void set_output_data(UINT8 data); + void set_save_ram_unlock(uint8_t data); + void set_output_latch(uint8_t data); + void set_output_data(uint8_t data); // internal state bool m_recurse; @@ -213,27 +213,27 @@ private: bool m_audio_cpu_nmi_pending; // MVS-specific state - UINT8 m_save_ram_unlocked; - UINT8 m_output_data; - UINT8 m_output_latch; - UINT8 m_el_value; - UINT8 m_led1_value; - UINT8 m_led2_value; + uint8_t m_save_ram_unlocked; + uint8_t m_output_data; + uint8_t m_output_latch; + uint8_t m_el_value; + uint8_t m_led1_value; + uint8_t m_led2_value; emu_timer *m_display_position_interrupt_timer; emu_timer *m_display_position_vblank_timer; emu_timer *m_vblank_interrupt_timer; - UINT32 m_display_counter; - UINT8 m_vblank_interrupt_pending; - UINT8 m_display_position_interrupt_pending; - UINT8 m_irq3_pending; - UINT8 m_display_position_interrupt_control; + uint32_t m_display_counter; + uint8_t m_vblank_interrupt_pending; + uint8_t m_display_position_interrupt_pending; + uint8_t m_irq3_pending; + uint8_t m_display_position_interrupt_control; - UINT16 get_video_control(); + uint16_t get_video_control(); // color/palette related - std::vector<UINT16> m_paletteram; - UINT8 m_palette_lookup[32][4]; + std::vector<uint16_t> m_paletteram; + uint8_t m_palette_lookup[32][4]; int m_screen_shadow; int m_palette_bank; }; |