diff options
Diffstat (limited to 'src/mame/drivers/r9751.cpp')
-rw-r--r-- | src/mame/drivers/r9751.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp index dbb2efa2bb6..1133dc90ca5 100644 --- a/src/mame/drivers/r9751.cpp +++ b/src/mame/drivers/r9751.cpp @@ -100,50 +100,50 @@ private: required_device<pdc_device> m_pdc; required_device<wd33c93_device> m_wd33c93; required_device<generic_terminal_device> m_terminal; - required_shared_ptr<UINT32> m_main_ram; + required_shared_ptr<uint32_t> m_main_ram; m68000_base_device* ptr_m68000; // Begin registers - UINT32 reg_ff050004; - UINT32 reg_fff80040; - UINT32 fdd_dest_address; // 5FF080B0 - UINT32 fdd_cmd_complete; - UINT32 smioc_out_addr; - UINT32 smioc_dma_bank; - UINT32 fdd_dma_bank; + uint32_t reg_ff050004; + uint32_t reg_fff80040; + uint32_t fdd_dest_address; // 5FF080B0 + uint32_t fdd_cmd_complete; + uint32_t smioc_out_addr; + uint32_t smioc_dma_bank; + uint32_t fdd_dma_bank; attotime timer_32khz_last; // End registers address_space *m_mem; // functions - UINT32 swap_uint32( UINT32 val ); - UINT32 debug_a6(); - UINT32 debug_a5(); - UINT32 debug_a5_20(); + uint32_t swap_uint32( uint32_t val ); + uint32_t debug_a6(); + uint32_t debug_a5(); + uint32_t debug_a5_20(); virtual void machine_reset() override; }; -UINT32 r9751_state::swap_uint32( UINT32 val ) +uint32_t r9751_state::swap_uint32( uint32_t val ) { val = ((val << 8) & 0xFF00FF00 ) | ((val >> 8) & 0xFF00FF ); return (val << 16) | (val >> 16); } -UINT32 r9751_state::debug_a6() +uint32_t r9751_state::debug_a6() { return m_maincpu->space(AS_PROGRAM).read_dword(ptr_m68000->dar[14] + 4); } -UINT32 r9751_state::debug_a5() +uint32_t r9751_state::debug_a5() { return m_maincpu->space(AS_PROGRAM).read_dword(ptr_m68000->dar[13]); } -UINT32 r9751_state::debug_a5_20() +uint32_t r9751_state::debug_a5_20() { return m_maincpu->space(AS_PROGRAM).read_dword(ptr_m68000->dar[13] + 0x20); } @@ -151,7 +151,7 @@ UINT32 r9751_state::debug_a5_20() READ8_MEMBER(r9751_state::pdc_dma_r) { /* This callback function takes the value written to 0xFF01000C as the bank offset */ - UINT32 address = (fdd_dma_bank & 0x7FFFF800) + (offset&0x3FFFF); + uint32_t address = (fdd_dma_bank & 0x7FFFF800) + (offset&0x3FFFF); if(TRACE_DMA) logerror("DMA READ: %08X DATA: %08X\n", address, m_maincpu->space(AS_PROGRAM).read_byte(address)); return m_maincpu->space(AS_PROGRAM).read_byte(address); } @@ -159,7 +159,7 @@ READ8_MEMBER(r9751_state::pdc_dma_r) WRITE8_MEMBER(r9751_state::pdc_dma_w) { /* This callback function takes the value written to 0xFF01000C as the bank offset */ - UINT32 address = (fdd_dma_bank & 0x7FFFF800) + (m_pdc->fdd_68k_dma_address&0x3FFFF); + uint32_t address = (fdd_dma_bank & 0x7FFFF800) + (m_pdc->fdd_68k_dma_address&0x3FFFF); m_maincpu->space(AS_PROGRAM).write_byte(address,data); if(TRACE_DMA) logerror("DMA WRITE: %08X DATA: %08X\n", address,data); } @@ -191,8 +191,8 @@ DRIVER_INIT_MEMBER(r9751_state,r9751) void r9751_state::machine_reset() { - UINT8 *rom = memregion("prom")->base(); - UINT32 *ram = m_main_ram; + uint8_t *rom = memregion("prom")->base(); + uint32_t *ram = m_main_ram; memcpy(ram, rom, 8); @@ -205,7 +205,7 @@ void r9751_state::machine_reset() ******************************************************************************/ READ32_MEMBER( r9751_state::r9751_mmio_5ff_r ) { - UINT32 data; + uint32_t data; switch(offset << 2) { @@ -237,7 +237,7 @@ READ32_MEMBER( r9751_state::r9751_mmio_5ff_r ) WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w ) { - UINT8 data_b0, data_b1; + uint8_t data_b0, data_b1; /* Unknown mask */ if (mem_mask != 0xFFFFFFFF) logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0x5FF00000, space.machine().firstcpu->pc()); @@ -311,8 +311,8 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w ) if(TRACE_FDC)logerror("--- FDD SET PDC Port 38: %X\n",m_pdc->reg_p38); break; case 0x80B0: /* FDD command address register */ - UINT32 fdd_scsi_command; - UINT32 fdd_scsi_command2; + uint32_t fdd_scsi_command; + uint32_t fdd_scsi_command2; unsigned char c_fdd_scsi_command[8]; // Array for SCSI command int scsi_lba; // FDD LBA location here, extracted from command @@ -356,7 +356,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w ) ******************************************************************************/ READ32_MEMBER( r9751_state::r9751_mmio_ff01_r ) { - //UINT32 data; + //uint32_t data; switch(offset << 2) { @@ -390,7 +390,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_ff01_w ) READ32_MEMBER( r9751_state::r9751_mmio_ff05_r ) { - UINT32 data; + uint32_t data; switch(offset << 2) { @@ -438,7 +438,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_ff05_w ) READ32_MEMBER( r9751_state::r9751_mmio_fff8_r ) { - UINT32 data; + uint32_t data; switch(offset << 2) { |