diff options
Diffstat (limited to 'src/devices/bus/isa/isa.cpp')
-rw-r--r-- | src/devices/bus/isa/isa.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 94f6b7bf9b9..86c6a4f9687 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -23,7 +23,7 @@ const device_type ISA8_SLOT = &device_creator<isa8_slot_device>; //------------------------------------------------- // isa8_slot_device - constructor //------------------------------------------------- -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ISA8_SLOT, "ISA8_SLOT", tag, owner, clock, "isa8_slot", __FILE__), device_slot_interface(mconfig, *this), m_owner(nullptr), @@ -31,7 +31,7 @@ isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *ta { } -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_interface(mconfig, *this), m_owner(nullptr), m_isa_tag(nullptr) { @@ -73,7 +73,7 @@ const device_type ISA16_SLOT = &device_creator<isa16_slot_device>; //------------------------------------------------- // isa16_slot_device - constructor //------------------------------------------------- -isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_slot_device(mconfig, ISA16_SLOT, "ISA16_SLOT", tag, owner, clock, "isa16_slot", __FILE__) { } @@ -134,7 +134,7 @@ void isa8_device::device_config_complete() // isa8_device - constructor //------------------------------------------------- -isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ISA8, "ISA8", tag, owner, clock, "isa8", __FILE__), device_memory_interface(mconfig, *this), m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), @@ -162,7 +162,7 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_ m_allocspaces = false; } -isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr), @@ -210,7 +210,7 @@ WRITE8_MEMBER(isa8_device::io_w) m_iospace->write_byte(offset, data); } -void isa8_device::set_dma_channel(UINT8 channel, device_isa8_card_interface *dev, bool do_eop) +void isa8_device::set_dma_channel(uint8_t channel, device_isa8_card_interface *dev, bool do_eop) { m_dma_device[channel] = dev; m_dma_eop[channel] = do_eop; @@ -319,7 +319,7 @@ void isa8_device::install_device(offs_t start, offs_t end, read8_delegate rhandl } -void isa8_device::install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data) +void isa8_device::install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data) { m_prgspace->install_readwrite_bank(start, end, 0, tag ); machine().root_device().membank(m_prgspace->device().siblingtag(tag).c_str())->set_base(data); @@ -333,8 +333,8 @@ void isa8_device::unmap_bank(offs_t start, offs_t end) void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, const char *tag, const char *region) { if (machine().root_device().memregion("isa")) { - UINT8 *src = dev->memregion(region)->base(); - UINT8 *dest = machine().root_device().memregion("isa")->base() + start - 0xc0000; + uint8_t *src = dev->memregion(region)->base(); + uint8_t *dest = machine().root_device().memregion("isa")->base() + start - 0xc0000; memcpy(dest,src, end - start + 1); } else { m_prgspace->install_read_bank(start, end, 0, tag); @@ -369,14 +369,14 @@ WRITE_LINE_MEMBER( isa8_device::drq1_w ) { m_out_drq1_cb(state); } WRITE_LINE_MEMBER( isa8_device::drq2_w ) { m_out_drq2_cb(state); } WRITE_LINE_MEMBER( isa8_device::drq3_w ) { m_out_drq3_cb(state); } -UINT8 isa8_device::dack_r(int line) +uint8_t isa8_device::dack_r(int line) { if (m_dma_device[line]) return m_dma_device[line]->dack_r(line); return 0xff; } -void isa8_device::dack_w(int line,UINT8 data) +void isa8_device::dack_w(int line,uint8_t data) { if (m_dma_device[line]) return m_dma_device[line]->dack_w(line,data); @@ -432,11 +432,11 @@ device_isa8_card_interface::~device_isa8_card_interface() { } -UINT8 device_isa8_card_interface::dack_r(int line) +uint8_t device_isa8_card_interface::dack_r(int line) { return 0; } -void device_isa8_card_interface::dack_w(int line,UINT8 data) +void device_isa8_card_interface::dack_w(int line,uint8_t data) { } void device_isa8_card_interface::eop_w(int state) @@ -461,7 +461,7 @@ const device_type ISA16 = &device_creator<isa16_device>; // isa16_device - constructor //------------------------------------------------- -isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_device(mconfig, ISA16, "ISA16", tag, owner, clock, "isa16", __FILE__), m_out_irq10_cb(*this), m_out_irq11_cb(*this), @@ -556,7 +556,7 @@ WRITE16_MEMBER(isa16_device::io16_w) READ16_MEMBER(isa16_device::prog16_swap_r) { - UINT16 rv; + uint16_t rv; mem_mask = (mem_mask<<8) | (mem_mask>>8); rv = m_prgspace->read_word(offset<<1, mem_mask); @@ -573,7 +573,7 @@ WRITE16_MEMBER(isa16_device::prog16_swap_w) READ16_MEMBER(isa16_device::io16_swap_r) { - UINT16 rv; + uint16_t rv; mem_mask = (mem_mask<<8) | (mem_mask>>8); rv = m_iospace->read_word(offset<<1, mem_mask); @@ -601,14 +601,14 @@ WRITE_LINE_MEMBER( isa16_device::drq5_w ) { m_out_drq5_cb(state); } WRITE_LINE_MEMBER( isa16_device::drq6_w ) { m_out_drq6_cb(state); } WRITE_LINE_MEMBER( isa16_device::drq7_w ) { m_out_drq7_cb(state); } -UINT16 isa16_device::dack16_r(int line) +uint16_t isa16_device::dack16_r(int line) { if (m_dma_device[line]) return dynamic_cast<device_isa16_card_interface *>(m_dma_device[line])->dack16_r(line); return 0xffff; } -void isa16_device::dack16_w(int line,UINT16 data) +void isa16_device::dack16_w(int line,uint16_t data) { if (m_dma_device[line]) return dynamic_cast<device_isa16_card_interface *>(m_dma_device[line])->dack16_w(line,data); @@ -637,11 +637,11 @@ void device_isa16_card_interface::set_isa_device() m_isa = dynamic_cast<isa16_device *>(m_isa_dev); } -UINT16 device_isa16_card_interface::dack16_r(int line) +uint16_t device_isa16_card_interface::dack16_r(int line) { return 0; } -void device_isa16_card_interface::dack16_w(int line,UINT16 data) +void device_isa16_card_interface::dack16_w(int line,uint16_t data) { } |