summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/mac.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/mac.h')
-rw-r--r--src/mame/includes/mac.h88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h
index 4d727427d2e..4ea560a6c10 100644
--- a/src/mame/includes/mac.h
+++ b/src/mame/includes/mac.h
@@ -206,13 +206,13 @@ public:
model_t m_model;
- UINT32 m_overlay;
+ uint32_t m_overlay;
int m_drive_select;
int m_scsiirq_enable;
- UINT32 m_via2_vbl;
- UINT32 m_se30_vbl_enable;
- UINT8 m_nubus_irq_state;
+ uint32_t m_via2_vbl;
+ uint32_t m_se30_vbl_enable;
+ uint8_t m_nubus_irq_state;
emu_timer *m_overlay_timeout;
TIMER_CALLBACK_MEMBER(overlay_timeout_func);
@@ -254,40 +254,40 @@ public:
int irq_count, ca1_data, ca2_data;
// Mac ADB state
- INT32 m_adb_irq_pending, m_adb_waiting_cmd, m_adb_datasize, m_adb_buffer[257];
- INT32 m_adb_state, m_adb_command, m_adb_send, m_adb_timer_ticks, m_adb_extclock, m_adb_direction;
- INT32 m_adb_listenreg, m_adb_listenaddr, m_adb_last_talk, m_adb_srq_switch;
- INT32 m_adb_streaming, m_adb_stream_ptr;
- INT32 m_adb_linestate;
+ int32_t m_adb_irq_pending, m_adb_waiting_cmd, m_adb_datasize, m_adb_buffer[257];
+ int32_t m_adb_state, m_adb_command, m_adb_send, m_adb_timer_ticks, m_adb_extclock, m_adb_direction;
+ int32_t m_adb_listenreg, m_adb_listenaddr, m_adb_last_talk, m_adb_srq_switch;
+ int32_t m_adb_streaming, m_adb_stream_ptr;
+ int32_t m_adb_linestate;
bool m_adb_srqflag;
#define kADBKeyBufSize 32
- UINT8 m_adb_keybuf[kADBKeyBufSize];
- UINT8 m_adb_keybuf_start;
- UINT8 m_adb_keybuf_end;
+ uint8_t m_adb_keybuf[kADBKeyBufSize];
+ uint8_t m_adb_keybuf_start;
+ uint8_t m_adb_keybuf_end;
// Portable/PB100 Power Manager IC comms (chapter 4, "Guide to the Macintosh Family Hardware", second edition)
- UINT8 m_pm_data_send, m_pm_data_recv, m_pm_ack, m_pm_req, m_pm_cmd[32], m_pm_out[32], m_pm_dptr, m_pm_sptr, m_pm_slen, m_pm_state;
- UINT8 m_pmu_int_status, m_pmu_last_adb_command, m_pmu_poll;
+ uint8_t m_pm_data_send, m_pm_data_recv, m_pm_ack, m_pm_req, m_pm_cmd[32], m_pm_out[32], m_pm_dptr, m_pm_sptr, m_pm_slen, m_pm_state;
+ uint8_t m_pmu_int_status, m_pmu_last_adb_command, m_pmu_poll;
emu_timer *m_pmu_send_timer;
// 60.15 Hz timer for RBV/V8/Sonora/Eagle/VASP/etc.
emu_timer *m_6015_timer;
// RBV and friends (V8, etc)
- UINT8 m_rbv_regs[256], m_rbv_ier, m_rbv_ifr, m_rbv_type, m_rbv_montype, m_rbv_vbltime;
- UINT32 m_rbv_colors[3], m_rbv_count, m_rbv_clutoffs, m_rbv_immed10wr;
- UINT32 m_rbv_palette[256];
- UINT8 m_sonora_vctl[8];
+ uint8_t m_rbv_regs[256], m_rbv_ier, m_rbv_ifr, m_rbv_type, m_rbv_montype, m_rbv_vbltime;
+ uint32_t m_rbv_colors[3], m_rbv_count, m_rbv_clutoffs, m_rbv_immed10wr;
+ uint32_t m_rbv_palette[256];
+ uint8_t m_sonora_vctl[8];
emu_timer *m_vbl_timer, *m_cursor_timer;
- UINT16 m_cursor_line;
- UINT16 m_dafb_int_status;
+ uint16_t m_cursor_line;
+ uint16_t m_dafb_int_status;
int m_dafb_scsi1_drq, m_dafb_scsi2_drq;
- UINT8 m_dafb_mode;
- UINT32 m_dafb_base, m_dafb_stride;
+ uint8_t m_dafb_mode;
+ uint32_t m_dafb_base, m_dafb_stride;
// this is shared among all video setups with vram
- optional_shared_ptr<UINT32> m_vram;
- optional_shared_ptr<UINT16> m_vram16;
+ optional_shared_ptr<uint32_t> m_vram;
+ optional_shared_ptr<uint16_t> m_vram16;
// interrupts
int m_scc_interrupt, m_via_interrupt, m_via2_interrupt, m_scsi_interrupt, m_asc_interrupt, m_last_taken_interrupt;
@@ -296,7 +296,7 @@ public:
void v8_resize();
void set_memory_overlay(int overlay);
void scc_mouse_irq( int x, int y );
- void nubus_slot_interrupt(UINT8 slot, UINT32 state);
+ void nubus_slot_interrupt(uint8_t slot, uint32_t state);
DECLARE_WRITE_LINE_MEMBER(set_scc_interrupt);
void set_via_interrupt(int value);
void set_via2_interrupt(int value);
@@ -391,9 +391,9 @@ private:
void adb_vblank();
int adb_pollkbd(int update);
int adb_pollmouse();
- void adb_accummouse( UINT8 *MouseX, UINT8 *MouseY );
- void pmu_one_byte_reply(UINT8 result);
- void pmu_three_byte_reply(UINT8 result1, UINT8 result2, UINT8 result3);
+ void adb_accummouse( uint8_t *MouseX, uint8_t *MouseY );
+ void pmu_one_byte_reply(uint8_t result);
+ void pmu_three_byte_reply(uint8_t result1, uint8_t result2, uint8_t result3);
// wait states for accessing the VIA
int m_via_cycles;
@@ -407,15 +407,15 @@ private:
int m_adb_keybinitialized, m_adb_currentkeys[2], m_adb_modifiers;
// PRAM for ADB MCU HLEs (mostly unused now)
- UINT8 m_adb_pram[256];
+ uint8_t m_adb_pram[256];
- UINT8 m_oss_regs[0x400];
+ uint8_t m_oss_regs[0x400];
// AMIC for x100 PowerMacs
- UINT8 m_amic_regs[0x200];
+ uint8_t m_amic_regs[0x200];
// HMC for x100 PowerMacs
- UINT64 m_hmc_reg, m_hmc_shiftout;
+ uint64_t m_hmc_reg, m_hmc_shiftout;
int m_via2_ca1_hack;
optional_device<screen_device> m_screen;
@@ -467,17 +467,17 @@ public:
DECLARE_VIDEO_RESET(macsonora);
DECLARE_VIDEO_RESET(maceagle);
DECLARE_VIDEO_START(macrbv);
- UINT32 screen_update_mac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macprtb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macse30(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macpb140(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macpb160(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macrbv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macdafb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macrbvvram(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macv8(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macsonora(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_macpbwd(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_mac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macprtb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macse30(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macpb140(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macpb160(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macrbv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macdafb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macrbvvram(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macv8(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macsonora(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_macpbwd(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(mac_rbv_vbl);
#ifndef MAC_USE_EMULATED_KBD
TIMER_CALLBACK_MEMBER(kbd_clock);
@@ -524,7 +524,7 @@ public:
void mac_driver_init(model_t model);
void mac_install_memory(offs_t memory_begin, offs_t memory_end,
offs_t memory_size, void *memory_data, int is_rom, const char *bank);
- offs_t mac_dasm_override(device_t &device, char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, int options);
+ offs_t mac_dasm_override(device_t &device, char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options);
};
#endif /* MAC_H_ */