diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/machine/cs4031.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/devices/machine/cs4031.cpp')
-rw-r--r-- | src/devices/machine/cs4031.cpp | 80 |
1 files changed, 41 insertions, 39 deletions
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp index fb1ac37b698..13ec9b90a6d 100644 --- a/src/devices/machine/cs4031.cpp +++ b/src/devices/machine/cs4031.cpp @@ -263,19 +263,19 @@ void cs4031_device::device_start() m_space->install_rom(0xffff0000, 0xffffffff, m_bios + 0xf0000); // install i/o accesses - m_space_io->install_readwrite_handler(0x0000, 0x000f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffffffff); + m_space_io->install_readwrite_handler(0x0000, 0x000f, read8sm_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8sm_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffffffff); m_space_io->install_readwrite_handler(0x0020, 0x0023, read8sm_delegate(FUNC(pic8259_device::read), &(*m_intc1)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_intc1)), 0x0000ffff); - m_space_io->install_write_handler(0x0020, 0x0023, write8_delegate(FUNC(cs4031_device::config_address_w), this), 0x00ff0000); - m_space_io->install_readwrite_handler(0x0020, 0x0023, read8_delegate(FUNC(cs4031_device::config_data_r), this), write8_delegate(FUNC(cs4031_device::config_data_w), this), 0xff000000); + m_space_io->install_write_handler(0x0020, 0x0023, write8smo_delegate(FUNC(cs4031_device::config_address_w), this), 0x00ff0000); + m_space_io->install_readwrite_handler(0x0020, 0x0023, read8smo_delegate(FUNC(cs4031_device::config_data_r), this), write8smo_delegate(FUNC(cs4031_device::config_data_w), this), 0xff000000); m_space_io->install_readwrite_handler(0x0040, 0x0043, read8sm_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffffffff); - m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(cs4031_device::keyb_data_r), this), write8_delegate(FUNC(cs4031_device::keyb_data_w), this), 0x000000ff); - m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(cs4031_device::portb_r), this), write8_delegate(FUNC(cs4031_device::portb_w), this), 0x0000ff00); - m_space_io->install_readwrite_handler(0x0064, 0x0067, read8_delegate(FUNC(cs4031_device::keyb_status_r), this), write8_delegate(FUNC(cs4031_device::keyb_command_w), this), 0x000000ff); - m_space_io->install_readwrite_handler(0x0070, 0x0073, read8_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8_delegate(FUNC(cs4031_device::rtc_w), this), 0x0000ffff); - m_space_io->install_readwrite_handler(0x0080, 0x008f, read8_delegate(FUNC(cs4031_device::dma_page_r), this), write8_delegate(FUNC(cs4031_device::dma_page_w), this), 0xffffffff); - m_space_io->install_readwrite_handler(0x0090, 0x0093, read8_delegate(FUNC(cs4031_device::sysctrl_r), this), write8_delegate(FUNC(cs4031_device::sysctrl_w), this), 0x00ff0000); + m_space_io->install_readwrite_handler(0x0060, 0x0063, read8smo_delegate(FUNC(cs4031_device::keyb_data_r), this), write8smo_delegate(FUNC(cs4031_device::keyb_data_w), this), 0x000000ff); + m_space_io->install_readwrite_handler(0x0060, 0x0063, read8smo_delegate(FUNC(cs4031_device::portb_r), this), write8smo_delegate(FUNC(cs4031_device::portb_w), this), 0x0000ff00); + m_space_io->install_readwrite_handler(0x0064, 0x0067, read8smo_delegate(FUNC(cs4031_device::keyb_status_r), this), write8smo_delegate(FUNC(cs4031_device::keyb_command_w), this), 0x000000ff); + m_space_io->install_readwrite_handler(0x0070, 0x0073, read8sm_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8sm_delegate(FUNC(cs4031_device::rtc_w), this), 0x0000ffff); + m_space_io->install_readwrite_handler(0x0080, 0x008f, read8sm_delegate(FUNC(cs4031_device::dma_page_r), this), write8sm_delegate(FUNC(cs4031_device::dma_page_w), this), 0xffffffff); + m_space_io->install_readwrite_handler(0x0090, 0x0093, read8smo_delegate(FUNC(cs4031_device::sysctrl_r), this), write8smo_delegate(FUNC(cs4031_device::sysctrl_w), this), 0x00ff0000); m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8sm_delegate(FUNC(pic8259_device::read), &(*m_intc2)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_intc2)), 0x0000ffff); - m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(cs4031_device::dma2_r),this), write8_delegate(FUNC(cs4031_device::dma2_w),this), 0xffffffff); + m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8sm_delegate(FUNC(cs4031_device::dma2_r),this), write8sm_delegate(FUNC(cs4031_device::dma2_w),this), 0xffffffff); } //------------------------------------------------- @@ -328,7 +328,7 @@ offs_t cs4031_device::page_offset() return 0xff0000; } -READ8_MEMBER( cs4031_device::dma_read_byte ) +uint8_t cs4031_device::dma_read_byte(offs_t offset) { if (m_dma_channel == -1) return 0xff; @@ -336,7 +336,7 @@ READ8_MEMBER( cs4031_device::dma_read_byte ) return m_space->read_byte(page_offset() + offset); } -WRITE8_MEMBER( cs4031_device::dma_write_byte ) +void cs4031_device::dma_write_byte(offs_t offset, uint8_t data) { if (m_dma_channel == -1) return; @@ -344,7 +344,7 @@ WRITE8_MEMBER( cs4031_device::dma_write_byte ) m_space->write_byte(page_offset() + offset, data); } -READ8_MEMBER( cs4031_device::dma_read_word ) +uint8_t cs4031_device::dma_read_word(offs_t offset) { if (m_dma_channel == -1) return 0xff; @@ -355,7 +355,7 @@ READ8_MEMBER( cs4031_device::dma_read_word ) return result; } -WRITE8_MEMBER( cs4031_device::dma_write_word ) +void cs4031_device::dma_write_word(offs_t offset, uint8_t data) { if (m_dma_channel == -1) return; @@ -377,6 +377,8 @@ WRITE_LINE_MEMBER( cs4031_device::dma1_eop_w ) void cs4031_device::set_dma_channel(int channel, bool state) { + //m_write_dack(channel, state); + if (!state) { m_dma_channel = channel; @@ -429,7 +431,7 @@ void cs4031_device::trigger_nmi() } } -READ8_MEMBER( cs4031_device::intc1_slave_ack_r ) +uint8_t cs4031_device::intc1_slave_ack_r(offs_t offset) { if (offset == 2) // IRQ 2 return m_intc2->acknowledge(); @@ -476,13 +478,13 @@ WRITE_LINE_MEMBER( cs4031_device::ctc_out2_w ) // CHIPSET CONFIGURATION //************************************************************************** -WRITE8_MEMBER( cs4031_device::config_address_w ) +void cs4031_device::config_address_w(uint8_t data) { m_address = data; m_address_valid = (m_address < 0x20) ? true : false; } -READ8_MEMBER( cs4031_device::config_data_r ) +uint8_t cs4031_device::config_data_r() { uint8_t result = 0xff; @@ -499,7 +501,7 @@ READ8_MEMBER( cs4031_device::config_data_r ) return result; } -WRITE8_MEMBER( cs4031_device::config_data_w ) +void cs4031_device::config_data_w(uint8_t data) { if (m_address_valid) { @@ -692,21 +694,21 @@ void cs4031_device::keyboard_gatea20(int state) update_a20m(); } -READ8_MEMBER( cs4031_device::keyb_status_r ) +uint8_t cs4031_device::keyb_status_r() { LOGKEYBOARD("cs4031_device::keyb_status_r\n"); - return m_keybc->status_r(space, 0); + return m_keybc->status_r(); } -WRITE8_MEMBER( cs4031_device::keyb_command_blocked_w ) +void cs4031_device::keyb_command_blocked_w(uint8_t data) { // command is optionally blocked if (!BIT(m_registers[SOFT_RESET_AND_GATEA20], 7)) - m_keybc->command_w(space, 0, data); + m_keybc->command_w(data); } -WRITE8_MEMBER( cs4031_device::keyb_command_w ) +void cs4031_device::keyb_command_w(uint8_t data) { LOGKEYBOARD("cs4031_device::keyb_command_w: %02x\n", data); @@ -720,12 +722,12 @@ WRITE8_MEMBER( cs4031_device::keyb_command_w ) emulated_gatea20(1); // self-test is never blocked - m_keybc->command_w(space, 0, data); + m_keybc->command_w(data); break; case 0xd1: m_keybc_d1_written = true; - keyb_command_blocked_w(space, 0, data); + keyb_command_blocked_w(data); break; case 0xf0: @@ -754,7 +756,7 @@ WRITE8_MEMBER( cs4031_device::keyb_command_w ) emulated_gatea20(1); } - keyb_command_blocked_w(space, 0, data); + keyb_command_blocked_w(data); break; @@ -763,28 +765,28 @@ WRITE8_MEMBER( cs4031_device::keyb_command_w ) if (m_keybc_data_blocked) { m_keybc_data_blocked = false; - keyb_command_blocked_w(space, 0, data); + keyb_command_blocked_w(data); } else - m_keybc->command_w(space, 0, data); + m_keybc->command_w(data); break; // everything else goes directly to the keyboard controller default: - m_keybc->command_w(space, 0, data); + m_keybc->command_w(data); break; } } -READ8_MEMBER( cs4031_device::keyb_data_r ) +uint8_t cs4031_device::keyb_data_r() { LOGKEYBOARD("cs4031_device::keyb_data_r\n"); - return m_keybc->data_r(space, 0); + return m_keybc->data_r(); } -WRITE8_MEMBER( cs4031_device::keyb_data_w ) +void cs4031_device::keyb_data_w(uint8_t data) { LOGKEYBOARD("cs4031_device::keyb_data_w: %02x\n", data); @@ -798,7 +800,7 @@ WRITE8_MEMBER( cs4031_device::keyb_data_w ) else { m_keybc_data_blocked = false; - m_keybc->data_w(space, 0, data); + m_keybc->data_w(data); } } @@ -837,7 +839,7 @@ WRITE_LINE_MEMBER( cs4031_device::kbrst_w ) 1 - Fast Gate A20 */ -WRITE8_MEMBER( cs4031_device::sysctrl_w ) +void cs4031_device::sysctrl_w(uint8_t data) { LOGIO("cs4031_device::sysctrl_w: %u\n", data); @@ -853,7 +855,7 @@ WRITE8_MEMBER( cs4031_device::sysctrl_w ) m_cpureset = BIT(data, 0); } -READ8_MEMBER( cs4031_device::sysctrl_r ) +uint8_t cs4031_device::sysctrl_r() { uint8_t result = 0; // reserved bits read as 0? @@ -883,7 +885,7 @@ READ8_MEMBER( cs4031_device::sysctrl_r ) 7 - Parity check latch (r) [not emulated] */ -READ8_MEMBER( cs4031_device::portb_r ) +uint8_t cs4031_device::portb_r() { if (0) logerror("cs4031_device::portb_r: %02x\n", m_portb); @@ -891,7 +893,7 @@ READ8_MEMBER( cs4031_device::portb_r ) return m_portb; } -WRITE8_MEMBER( cs4031_device::portb_w ) +void cs4031_device::portb_w(uint8_t data) { if (0) logerror("cs4031_device::portb_w: %02x\n", data); @@ -917,7 +919,7 @@ WRITE8_MEMBER( cs4031_device::portb_w ) 7 - NMI mask 6:0 - RTC address */ -WRITE8_MEMBER( cs4031_device::rtc_w ) +void cs4031_device::rtc_w(offs_t offset, uint8_t data) { if (0) logerror("cs4031_device::rtc_w: %02x\n", data); @@ -928,5 +930,5 @@ WRITE8_MEMBER( cs4031_device::rtc_w ) data &= 0x7f; } - m_rtc->write(space, offset, data); + m_rtc->write(offset, data); } |