summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/dp8390.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/dp8390.cpp')
-rw-r--r--src/devices/machine/dp8390.cpp73
1 files changed, 33 insertions, 40 deletions
diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp
index c898332d1f4..c238801122b 100644
--- a/src/devices/machine/dp8390.cpp
+++ b/src/devices/machine/dp8390.cpp
@@ -28,7 +28,6 @@ dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, co
, m_mem_read_cb(*this)
, m_mem_write_cb(*this)
, m_reset(0)
- , m_cs(false)
, m_rdma_active(0)
{
}
@@ -172,33 +171,29 @@ void dp8390_device::recv_cb(uint8_t *buf, int len) {
if(!LOOPBACK) recv(buf, len);
}
-WRITE_LINE_MEMBER(dp8390_device::dp8390_cs) {
- m_cs = state;
-}
-
WRITE_LINE_MEMBER(dp8390_device::dp8390_reset) {
if(!state) device_reset();
}
-uint16_t dp8390_device::dp8390_r(offs_t offset) {
- uint16_t data;
- if(m_cs) {
- uint32_t high16 = (m_regs.dcr & 4)?m_regs.rsar<<16:0;
- if(m_regs.dcr & 1) {
- m_regs.crda &= ~1;
- data = m_mem_read_cb(high16 + m_regs.crda++);
- data |= m_mem_read_cb(high16 + m_regs.crda++) << 8;
- m_regs.rbcr -= (m_regs.rbcr < 2)?m_regs.rbcr:2;
- check_dma_complete();
- return DP8390_BYTE_ORDER(data);
- } else {
- m_regs.rbcr -= (m_regs.rbcr)?1:0;
- data = m_mem_read_cb(high16 + m_regs.crda++);
- check_dma_complete();
- return data;
- }
+uint16_t dp8390_device::remote_read() {
+ uint32_t high16 = (m_regs.dcr & 4)?m_regs.rsar<<16:0;
+ if(m_regs.dcr & 1) {
+ m_regs.crda &= ~1;
+ uint16_t data = m_mem_read_cb(high16 + m_regs.crda++);
+ data |= m_mem_read_cb(high16 + m_regs.crda++) << 8;
+ m_regs.rbcr -= (m_regs.rbcr < 2)?m_regs.rbcr:2;
+ check_dma_complete();
+ return DP8390_BYTE_ORDER(data);
+ } else {
+ m_regs.rbcr -= (m_regs.rbcr)?1:0;
+ uint16_t data = m_mem_read_cb(high16 + m_regs.crda++);
+ check_dma_complete();
+ return data;
}
+}
+uint8_t dp8390_device::cs_read(offs_t offset) {
+ uint8_t data;
switch((offset & 0x0f)|(m_regs.cr & 0xc0)) {
case 0x00:
case 0x40:
@@ -350,26 +345,24 @@ uint16_t dp8390_device::dp8390_r(offs_t offset) {
return data;
}
-void dp8390_device::dp8390_w(offs_t offset, uint16_t data) {
- if(m_cs) {
- uint32_t high16 = (m_regs.dcr & 4)?m_regs.rsar<<16:0;
- if(m_regs.dcr & 1) {
- data = DP8390_BYTE_ORDER(data);
- m_regs.crda &= ~1;
- m_mem_write_cb(high16 + m_regs.crda++, data & 0xff);
- m_mem_write_cb(high16 + m_regs.crda++, data >> 8);
- m_regs.rbcr -= (m_regs.rbcr < 2)?m_regs.rbcr:2;
- check_dma_complete();
- } else {
- data &= 0xff;
- m_mem_write_cb(high16 + m_regs.crda++, data);
- m_regs.rbcr -= (m_regs.rbcr)?1:0;
- check_dma_complete();
- }
- return;
+void dp8390_device::remote_write(uint16_t data) {
+ uint32_t high16 = (m_regs.dcr & 4)?m_regs.rsar<<16:0;
+ if(m_regs.dcr & 1) {
+ data = DP8390_BYTE_ORDER(data);
+ m_regs.crda &= ~1;
+ m_mem_write_cb(high16 + m_regs.crda++, data & 0xff);
+ m_mem_write_cb(high16 + m_regs.crda++, data >> 8);
+ m_regs.rbcr -= (m_regs.rbcr < 2)?m_regs.rbcr:2;
+ check_dma_complete();
+ } else {
+ data &= 0xff;
+ m_mem_write_cb(high16 + m_regs.crda++, data);
+ m_regs.rbcr -= (m_regs.rbcr)?1:0;
+ check_dma_complete();
}
+}
- data &= 0xff;
+void dp8390_device::cs_write(offs_t offset, uint8_t data) {
switch((offset & 0x0f)|(m_regs.cr & 0xc0)) {
case 0x00:
case 0x40: