diff options
Diffstat (limited to 'src/mame/includes/apple2gs.h')
-rw-r--r-- | src/mame/includes/apple2gs.h | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/src/mame/includes/apple2gs.h b/src/mame/includes/apple2gs.h index 6812cc2b466..b72dc4b08e6 100644 --- a/src/mame/includes/apple2gs.h +++ b/src/mame/includes/apple2gs.h @@ -84,8 +84,8 @@ enum adbstate_t #define IRQ_DOC 0x80 #define IRQ_SLOT 0x100 -void apple2gs_add_irq(running_machine &machine, UINT16 irq_mask); -void apple2gs_remove_irq(running_machine &machine, UINT16 irq_mask); +void apple2gs_add_irq(running_machine &machine, uint16_t irq_mask); +void apple2gs_remove_irq(running_machine &machine, uint16_t irq_mask); class apple2gs_state : public apple2_state { @@ -113,59 +113,59 @@ public: required_ioport m_adb_mousex, m_adb_mousey; required_device<palette_device> m_palette; - std::unique_ptr<UINT8[]> m_slowmem; - UINT8 m_newvideo; - UINT16 m_bordercolor; - UINT8 m_vgcint; - UINT8 m_langsel; - UINT8 m_sltromsel; - UINT8 m_cyareg; - UINT8 m_inten; - UINT8 m_intflag; - UINT8 m_shadow; - UINT16 m_pending_irqs; - UINT8 m_mouse_x; - UINT8 m_mouse_y; - INT8 m_mouse_dx; - INT8 m_mouse_dy; + std::unique_ptr<uint8_t[]> m_slowmem; + uint8_t m_newvideo; + uint16_t m_bordercolor; + uint8_t m_vgcint; + uint8_t m_langsel; + uint8_t m_sltromsel; + uint8_t m_cyareg; + uint8_t m_inten; + uint8_t m_intflag; + uint8_t m_shadow; + uint16_t m_pending_irqs; + uint8_t m_mouse_x; + uint8_t m_mouse_y; + int8_t m_mouse_dx; + int8_t m_mouse_dy; device_t *m_cur_slot6_image; emu_timer *m_scanline_timer; emu_timer *m_clock_timer; emu_timer *m_qsecond_timer; - UINT8 m_clock_data; - UINT8 m_clock_control; - UINT8 m_clock_read; - UINT8 m_clock_reg1; + uint8_t m_clock_data; + uint8_t m_clock_control; + uint8_t m_clock_read; + uint8_t m_clock_reg1; apple2gs_clock_mode m_clock_mode; - UINT32 m_clock_curtime; + uint32_t m_clock_curtime; seconds_t m_clock_curtime_interval; - UINT8 m_clock_bram[256]; + uint8_t m_clock_bram[256]; #if !RUN_ADB_MICRO adbstate_t m_adb_state; - UINT8 m_adb_command; - UINT8 m_adb_mode; - UINT8 m_adb_kmstatus; - UINT8 m_adb_latent_result; - INT32 m_adb_command_length; - INT32 m_adb_command_pos; - UINT8 m_adb_command_bytes[8]; - UINT8 m_adb_response_bytes[8]; - UINT8 m_adb_response_length; - INT32 m_adb_response_pos; - UINT8 m_adb_memory[0x100]; + uint8_t m_adb_command; + uint8_t m_adb_mode; + uint8_t m_adb_kmstatus; + uint8_t m_adb_latent_result; + int32_t m_adb_command_length; + int32_t m_adb_command_pos; + uint8_t m_adb_command_bytes[8]; + uint8_t m_adb_response_bytes[8]; + uint8_t m_adb_response_length; + int32_t m_adb_response_pos; + uint8_t m_adb_memory[0x100]; int m_adb_address_keyboard; int m_adb_address_mouse; #endif - UINT8 m_sndglu_ctrl; + uint8_t m_sndglu_ctrl; int m_sndglu_addr; int m_sndglu_dummy_read; std::unique_ptr<bitmap_ind16> m_legacy_gfx; bool m_is_rom3; - UINT8 m_echo_bank; - UINT64 m_last_adb_time; + uint8_t m_echo_bank; + uint64_t m_last_adb_time; int m_adb_dtime; - UINT32 m_a2_palette[16]; - UINT32 m_shr_palette[256]; + uint32_t m_a2_palette[16]; + uint32_t m_shr_palette[256]; READ8_MEMBER( apple2gs_c0xx_r ); WRITE8_MEMBER( apple2gs_c0xx_w ); @@ -176,8 +176,8 @@ public: WRITE8_MEMBER( apple2gs_main4000_w ); WRITE8_MEMBER( apple2gs_aux4000_w ); - UINT8 adb_read_datareg(); - UINT8 adb_read_kmstatus(); + uint8_t adb_read_datareg(); + uint8_t adb_read_kmstatus(); void apple2gs_refresh_delegates(); @@ -190,7 +190,7 @@ public: DECLARE_PALETTE_INIT(apple2gs); DECLARE_MACHINE_START(apple2gsr1); DECLARE_MACHINE_START(apple2gscommon); - UINT32 screen_update_apple2gs(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update_apple2gs(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(apple2gs_clock_tick); TIMER_CALLBACK_MEMBER(apple2gs_qsecond_tick); TIMER_CALLBACK_MEMBER(apple2gs_scanline_tick); @@ -201,13 +201,13 @@ public: // ADB MCU and ADB GLU stuff #if RUN_ADB_MICRO - UINT8 m_glu_regs[8], m_glu_bus, m_glu_sysstat; + uint8_t m_glu_regs[8], m_glu_bus, m_glu_sysstat; bool m_glu_mcu_read_kgs, m_glu_816_read_dstat, m_glu_mouse_read_stat, m_adb_line; - UINT8 keyglu_mcu_read(UINT8 offset); - void keyglu_mcu_write(UINT8 offset, UINT8 data); - UINT8 keyglu_816_read(UINT8 offset); - void keyglu_816_write(UINT8 offset, UINT8 data); + uint8_t keyglu_mcu_read(uint8_t offset); + void keyglu_mcu_write(uint8_t offset, uint8_t data); + uint8_t keyglu_816_read(uint8_t offset); + void keyglu_816_write(uint8_t offset, uint8_t data); DECLARE_READ8_MEMBER(adbmicro_p0_in); DECLARE_READ8_MEMBER(adbmicro_p1_in); @@ -219,27 +219,27 @@ public: DECLARE_WRITE8_MEMBER(adbmicro_p3_out); #endif void process_clock(); - const char *apple2gs_irq_name(UINT16 irq_mask); - void apple2gs_add_irq(UINT16 irq_mask); - void apple2gs_remove_irq(UINT16 irq_mask); - UINT8 adb_read_memory(UINT32 address); - void adb_write_memory(UINT32 address, UINT8 data); - void adb_set_mode(UINT8 mode); - void adb_set_config(UINT8 b1, UINT8 b2, UINT8 b3); - void adb_post_response(const UINT8 *bytes, size_t length); - void adb_post_response_1(UINT8 b); - void adb_post_response_2(UINT8 b1, UINT8 b2); + const char *apple2gs_irq_name(uint16_t irq_mask); + void apple2gs_add_irq(uint16_t irq_mask); + void apple2gs_remove_irq(uint16_t irq_mask); + uint8_t adb_read_memory(uint32_t address); + void adb_write_memory(uint32_t address, uint8_t data); + void adb_set_mode(uint8_t mode); + void adb_set_config(uint8_t b1, uint8_t b2, uint8_t b3); + void adb_post_response(const uint8_t *bytes, size_t length); + void adb_post_response_1(uint8_t b); + void adb_post_response_2(uint8_t b1, uint8_t b2); void adb_do_command(); - void adb_write_datareg(UINT8 data); - void adb_write_kmstatus(UINT8 data); - UINT8 adb_read_mousedata(); - INT8 seven_bit_diff(UINT8 v1, UINT8 v2); + void adb_write_datareg(uint8_t data); + void adb_write_kmstatus(uint8_t data); + uint8_t adb_read_mousedata(); + int8_t seven_bit_diff(uint8_t v1, uint8_t v2); void adb_check_mouse(); - void apple2gs_set_scanint(UINT8 data); + void apple2gs_set_scanint(uint8_t data); int apple2gs_get_vpos(); - UINT8 *apple2gs_getslotmem(offs_t address); - UINT8 apple2gs_xxCxxx_r(address_space &space, offs_t address); - void apple2gs_xxCxxx_w(address_space &space, offs_t address, UINT8 data); + uint8_t *apple2gs_getslotmem(offs_t address); + uint8_t apple2gs_xxCxxx_r(address_space &space, offs_t address); + void apple2gs_xxCxxx_w(address_space &space, offs_t address, uint8_t data); void apple2gs_setup_memory(); DECLARE_READ8_MEMBER( gssnd_r ); |