summaryrefslogtreecommitdiffstats
path: root/src/mame/includes/harddriv.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/harddriv.h')
-rw-r--r--src/mame/includes/harddriv.h252
1 files changed, 126 insertions, 126 deletions
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index 1e0394d6e17..24797461b21 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -44,7 +44,7 @@ class harddriv_state : public device_t
/* public device_video_interface */
{
public:
- harddriv_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ harddriv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void init_strtdriv(void);
@@ -264,55 +264,55 @@ protected:
optional_device<screen_device> m_screen;
optional_device<mc68681_device> m_duartn68681;
- UINT8 m_hd34010_host_access;
+ uint8_t m_hd34010_host_access;
- optional_shared_ptr<UINT16> m_msp_ram;
+ optional_shared_ptr<uint16_t> m_msp_ram;
- UINT16 * m_dsk_ram;
- UINT16 * m_dsk_rom;
+ uint16_t * m_dsk_ram;
+ uint16_t * m_dsk_rom;
optional_device<eeprom_parallel_28xx_device> m_dsk_10c;
optional_device<eeprom_parallel_28xx_device> m_dsk_30c;
- UINT8 m_dsk_pio_access;
+ uint8_t m_dsk_pio_access;
- UINT16 * m_m68k_slapstic_base;
- UINT16 * m_m68k_sloop_alt_base;
+ uint16_t * m_m68k_slapstic_base;
+ uint16_t * m_m68k_sloop_alt_base;
required_device<timekeeper_device> m_200e;
required_device<eeprom_parallel_28xx_device> m_210e;
- optional_shared_ptr<UINT16> m_adsp_data_memory;
- optional_shared_ptr<UINT32> m_adsp_pgm_memory;
+ optional_shared_ptr<uint16_t> m_adsp_data_memory;
+ optional_shared_ptr<uint32_t> m_adsp_pgm_memory;
- optional_shared_ptr<UINT16> m_ds3sdsp_data_memory;
- optional_shared_ptr<UINT32> m_ds3sdsp_pgm_memory;
- optional_shared_ptr<UINT32> m_ds3xdsp_pgm_memory;
+ optional_shared_ptr<uint16_t> m_ds3sdsp_data_memory;
+ optional_shared_ptr<uint32_t> m_ds3sdsp_pgm_memory;
+ optional_shared_ptr<uint32_t> m_ds3xdsp_pgm_memory;
- optional_shared_ptr<UINT32> m_dsp32_ram;
+ optional_shared_ptr<uint32_t> m_dsp32_ram;
- UINT16 * m_gsp_protection;
+ uint16_t * m_gsp_protection;
- UINT16 * m_gsp_speedup_addr[2];
+ uint16_t * m_gsp_speedup_addr[2];
offs_t m_gsp_speedup_pc;
- UINT16 * m_msp_speedup_addr;
+ uint16_t * m_msp_speedup_addr;
offs_t m_msp_speedup_pc;
- UINT16 * m_ds3_speedup_addr;
+ uint16_t * m_ds3_speedup_addr;
offs_t m_ds3_speedup_pc;
offs_t m_ds3_transfer_pc;
- UINT32 * m_rddsp32_sync[2];
+ uint32_t * m_rddsp32_sync[2];
- UINT32 m_gsp_speedup_count[4];
- UINT32 m_msp_speedup_count[4];
- UINT32 m_adsp_speedup_count[4];
+ uint32_t m_gsp_speedup_count[4];
+ uint32_t m_msp_speedup_count[4];
+ uint32_t m_adsp_speedup_count[4];
- UINT8 m_gsp_multisync;
- optional_shared_ptr<UINT8> m_gsp_vram;
- optional_shared_ptr<UINT16> m_gsp_control_lo;
- optional_shared_ptr<UINT16> m_gsp_control_hi;
- optional_shared_ptr<UINT16> m_gsp_paletteram_lo;
- optional_shared_ptr<UINT16> m_gsp_paletteram_hi;
+ uint8_t m_gsp_multisync;
+ optional_shared_ptr<uint8_t> m_gsp_vram;
+ optional_shared_ptr<uint16_t> m_gsp_control_lo;
+ optional_shared_ptr<uint16_t> m_gsp_control_hi;
+ optional_shared_ptr<uint16_t> m_gsp_paletteram_lo;
+ optional_shared_ptr<uint16_t> m_gsp_paletteram_hi;
required_ioport m_in0;
optional_ioport m_sw1;
@@ -321,93 +321,93 @@ protected:
optional_ioport_array<4> m_12badc;
/* machine state */
- UINT8 m_irq_state;
- UINT8 m_gsp_irq_state;
- UINT8 m_msp_irq_state;
- UINT8 m_adsp_irq_state;
- UINT8 m_ds3sdsp_irq_state;
- UINT8 m_duart_irq_state;
-
- UINT8 m_last_gsp_shiftreg;
-
- UINT8 m_m68k_zp1;
- UINT8 m_m68k_zp2;
- UINT8 m_m68k_adsp_buffer_bank;
-
- UINT8 m_adsp_halt;
- UINT8 m_adsp_br;
- UINT8 m_adsp_xflag;
- UINT16 m_adsp_sim_address;
- UINT16 m_adsp_som_address;
- UINT32 m_adsp_eprom_base;
-
- required_region_ptr<UINT16> m_sim_memory;
- UINT16 m_som_memory[0x8000/2];
- UINT16 * m_adsp_pgm_memory_word;
-
- optional_region_ptr<UINT16> m_ds3_sdata_memory;
- UINT32 m_ds3_sdata_memory_size;
-
- UINT8 m_ds3_gcmd;
- UINT8 m_ds3_gflag;
- UINT8 m_ds3_g68irqs;
- UINT8 m_ds3_gfirqs;
- UINT8 m_ds3_g68flag;
- UINT8 m_ds3_send;
- UINT8 m_ds3_reset;
- UINT16 m_ds3_gdata;
- UINT16 m_ds3_g68data;
- UINT32 m_ds3_sim_address;
-
- UINT8 m_ds3_scmd;
- UINT8 m_ds3_sflag;
- UINT8 m_ds3_s68irqs;
- UINT8 m_ds3_sfirqs;
- UINT8 m_ds3_s68flag;
- UINT8 m_ds3_sreset;
- UINT16 m_ds3_sdata;
- UINT16 m_ds3_s68data;
- UINT32 m_ds3_sdata_address;
- UINT16 m_ds3sdsp_regs[32];
- UINT16 m_ds3sdsp_timer_en;
- UINT16 m_ds3sdsp_sdata;
+ uint8_t m_irq_state;
+ uint8_t m_gsp_irq_state;
+ uint8_t m_msp_irq_state;
+ uint8_t m_adsp_irq_state;
+ uint8_t m_ds3sdsp_irq_state;
+ uint8_t m_duart_irq_state;
+
+ uint8_t m_last_gsp_shiftreg;
+
+ uint8_t m_m68k_zp1;
+ uint8_t m_m68k_zp2;
+ uint8_t m_m68k_adsp_buffer_bank;
+
+ uint8_t m_adsp_halt;
+ uint8_t m_adsp_br;
+ uint8_t m_adsp_xflag;
+ uint16_t m_adsp_sim_address;
+ uint16_t m_adsp_som_address;
+ uint32_t m_adsp_eprom_base;
+
+ required_region_ptr<uint16_t> m_sim_memory;
+ uint16_t m_som_memory[0x8000/2];
+ uint16_t * m_adsp_pgm_memory_word;
+
+ optional_region_ptr<uint16_t> m_ds3_sdata_memory;
+ uint32_t m_ds3_sdata_memory_size;
+
+ uint8_t m_ds3_gcmd;
+ uint8_t m_ds3_gflag;
+ uint8_t m_ds3_g68irqs;
+ uint8_t m_ds3_gfirqs;
+ uint8_t m_ds3_g68flag;
+ uint8_t m_ds3_send;
+ uint8_t m_ds3_reset;
+ uint16_t m_ds3_gdata;
+ uint16_t m_ds3_g68data;
+ uint32_t m_ds3_sim_address;
+
+ uint8_t m_ds3_scmd;
+ uint8_t m_ds3_sflag;
+ uint8_t m_ds3_s68irqs;
+ uint8_t m_ds3_sfirqs;
+ uint8_t m_ds3_s68flag;
+ uint8_t m_ds3_sreset;
+ uint16_t m_ds3_sdata;
+ uint16_t m_ds3_s68data;
+ uint32_t m_ds3_sdata_address;
+ uint16_t m_ds3sdsp_regs[32];
+ uint16_t m_ds3sdsp_timer_en;
+ uint16_t m_ds3sdsp_sdata;
optional_device<timer_device> m_ds3sdsp_internal_timer;
- UINT16 m_ds3xdsp_regs[32];
- UINT16 m_ds3xdsp_timer_en;
- UINT16 m_ds3xdsp_sdata;
+ uint16_t m_ds3xdsp_regs[32];
+ uint16_t m_ds3xdsp_timer_en;
+ uint16_t m_ds3xdsp_sdata;
optional_device<timer_device> m_ds3xdsp_internal_timer;
- UINT16 m_adc_control;
- UINT8 m_adc8_select;
- UINT8 m_adc8_data;
- UINT8 m_adc12_select;
- UINT8 m_adc12_byte;
- UINT16 m_adc12_data;
+ uint16_t m_adc_control;
+ uint8_t m_adc8_select;
+ uint8_t m_adc8_data;
+ uint8_t m_adc12_select;
+ uint8_t m_adc12_byte;
+ uint16_t m_adc12_data;
- UINT16 m_hdc68k_last_wheel;
- UINT16 m_hdc68k_last_port1;
- UINT8 m_hdc68k_wheel_edge;
- UINT8 m_hdc68k_shifter_state;
+ uint16_t m_hdc68k_last_wheel;
+ uint16_t m_hdc68k_last_port1;
+ uint8_t m_hdc68k_wheel_edge;
+ uint8_t m_hdc68k_shifter_state;
- UINT8 m_st68k_sloop_bank;
+ uint8_t m_st68k_sloop_bank;
offs_t m_st68k_last_alt_sloop_offset;
#define MAX_MSP_SYNC 16
- UINT32 * m_dataptr[MAX_MSP_SYNC];
- UINT32 m_dataval[MAX_MSP_SYNC];
+ uint32_t * m_dataptr[MAX_MSP_SYNC];
+ uint32_t m_dataval[MAX_MSP_SYNC];
int m_next_msp_sync;
/* video state */
offs_t m_vram_mask;
- UINT8 m_shiftreg_enable;
+ uint8_t m_shiftreg_enable;
- UINT32 m_mask_table[65536 * 4];
- UINT8 * m_gsp_shiftreg_source;
+ uint32_t m_mask_table[65536 * 4];
+ uint8_t * m_gsp_shiftreg_source;
- INT8 m_gfx_finescroll;
- UINT8 m_gfx_palettebank;
+ int8_t m_gfx_finescroll;
+ uint8_t m_gfx_palettebank;
virtual void update_interrupts();
void init_driver();
void init_multisync(int compact_inputs);
@@ -440,8 +440,8 @@ protected:
inline void gsp_palette_change(int offset);
- UINT8 m_sound_int_state;
- UINT8 m_video_int_state;
+ uint8_t m_sound_int_state;
+ uint8_t m_video_int_state;
optional_device<palette_device> m_palette;
int get_hblank(screen_device &screen) const { return (screen.hpos() > (screen.width() * 9 / 10)); }
@@ -457,7 +457,7 @@ class harddriv_sound_board_device : public device_t
{
public:
// construction/destruction
- harddriv_sound_board_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ harddriv_sound_board_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
~harddriv_sound_board_device() {}
DECLARE_READ16_MEMBER(hd68k_snd_data_r);
@@ -499,21 +499,21 @@ private:
required_device<cpu_device> m_soundcpu;
required_device<dac_word_interface> m_dac;
required_device<cpu_device> m_sounddsp;
- required_shared_ptr<UINT16> m_sounddsp_ram;
- required_region_ptr<UINT8> m_sound_rom;
+ required_shared_ptr<uint16_t> m_sounddsp_ram;
+ required_region_ptr<uint8_t> m_sound_rom;
- UINT8 m_soundflag;
- UINT8 m_mainflag;
- UINT16 m_sounddata;
- UINT16 m_maindata;
+ uint8_t m_soundflag;
+ uint8_t m_mainflag;
+ uint16_t m_sounddata;
+ uint16_t m_maindata;
- UINT8 m_cramen;
- UINT8 m_irq68k;
+ uint8_t m_cramen;
+ uint8_t m_irq68k;
offs_t m_sound_rom_offs;
- UINT16 m_comram[0x400/2];
- UINT64 m_last_bio_cycles;
+ uint16_t m_comram[0x400/2];
+ uint64_t m_last_bio_cycles;
void update_68k_interrupts();
TIMER_CALLBACK_MEMBER( delayed_68k_w );
@@ -524,7 +524,7 @@ private:
class harddriv_board_device_state : public harddriv_state
{
public:
- harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -537,7 +537,7 @@ protected:
class harddrivc_board_device_state : public harddriv_state
{
public:
- harddrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ harddrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -550,7 +550,7 @@ protected:
class racedriv_board_device_state : public harddriv_state
{
public:
- racedriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ racedriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -561,7 +561,7 @@ protected:
class racedrivb1_board_device_state : public racedriv_board_device_state
{
public:
- racedrivb1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ racedrivb1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
racedriv_board_device_state(mconfig, tag, owner, clock)
{};
@@ -574,7 +574,7 @@ protected:
class racedrivc_board_device_state : public harddriv_state
{
public:
- racedrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ racedrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -585,7 +585,7 @@ protected:
class racedrivc1_board_device_state : public racedrivc_board_device_state
{
public:
- racedrivc1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ racedrivc1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
racedrivc_board_device_state(mconfig, tag, owner, clock)
{};
protected:
@@ -595,7 +595,7 @@ protected:
class racedrivc_panorama_side_board_device_state : public racedrivc_board_device_state
{
public:
- racedrivc_panorama_side_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ racedrivc_panorama_side_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
racedrivc_board_device_state(mconfig, tag, owner, clock)
{};
protected:
@@ -609,7 +609,7 @@ protected:
class stunrun_board_device_state : public harddriv_state
{
public:
- stunrun_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ stunrun_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -622,7 +622,7 @@ protected:
class steeltal_board_device_state : public harddriv_state
{
public:
- steeltal_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ steeltal_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -633,7 +633,7 @@ protected:
class steeltal1_board_device_state : public steeltal_board_device_state
{
public:
- steeltal1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ steeltal1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
steeltal_board_device_state(mconfig, tag, owner, clock)
{};
@@ -644,7 +644,7 @@ protected:
class steeltalp_board_device_state : public steeltal_board_device_state
{
public:
- steeltalp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ steeltalp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
steeltal_board_device_state(mconfig, tag, owner, clock)
{};
@@ -659,7 +659,7 @@ protected:
class strtdriv_board_device_state : public harddriv_state
{
public:
- strtdriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ strtdriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -672,7 +672,7 @@ protected:
class hdrivair_board_device_state : public harddriv_state
{
public:
- hdrivair_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hdrivair_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -683,7 +683,7 @@ protected:
class hdrivairp_board_device_state : public hdrivair_board_device_state
{
public:
- hdrivairp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ hdrivairp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
hdrivair_board_device_state(mconfig, tag, owner, clock)
{};