summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2021-03-03 17:02:56 +0700
committer Patrick Mackinlay <pmackinlay@hotmail.com>2021-03-03 17:02:56 +0700
commit7a9e85c6270f0aeeabeaceb62560b4a3220a7c54 (patch)
treece27d88e5dbe4e39a62d563362550b289d8f652e
parent5f4c4708ca67695468c114597e7e3408375dd098 (diff)
3c505: remove duplicate reset logic
-rw-r--r--src/devices/bus/isa/3c505.cpp33
1 files changed, 8 insertions, 25 deletions
diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp
index 55f853acc42..a50c28b2c1b 100644
--- a/src/devices/bus/isa/3c505.cpp
+++ b/src/devices/bus/isa/3c505.cpp
@@ -318,6 +318,9 @@ void isa16_3c505_device::map_main(address_map &map)
// i82586 upper 4 address lines are ignored
map.global_mask(0x0fffff);
+ // suppress logging when sizing RAM
+ map(0x00000, 0x7ffff).noprw();
+
map(0xfc000, 0xfffff).rom().region("system", 0);
}
@@ -397,10 +400,10 @@ void isa16_3c505_device::acr_w(u8 data)
m_hsr = (m_hsr & ~HSR_ASF) | (data & ACR_ASF);
if ((data ^ m_acr) & ACR_LED1)
- m_led[0] = !!(data & ACR_LED1);
+ m_led[0] = bool(data & ACR_LED1);
if ((data ^ m_acr) & ACR_LED2)
- m_led[1] = !!(data & ACR_LED2);
+ m_led[1] = bool(data & ACR_LED2);
m_net->reset_w((data & ACR_R586) ? 1 : 0);
@@ -492,7 +495,7 @@ void isa16_3c505_device::hcr_w(u8 data)
{
if (!(data & HCR_FLSH))
{
- LOGMASKED(LOG_REG, "### soft reset\n");
+ LOGMASKED(LOG_REG, "soft reset\n");
// soft reset
m_cpu->set_input_line(INPUT_LINE_NMI, 1);
@@ -500,7 +503,7 @@ void isa16_3c505_device::hcr_w(u8 data)
}
else
{
- LOGMASKED(LOG_REG, "### hard reset\n");
+ LOGMASKED(LOG_REG, "hard reset\n");
// hard reset
reset();
@@ -550,26 +553,6 @@ void isa16_3c505_device::hcr_w(u8 data)
update_rdy(m_acr, data);
}
- // attention condition
- if (!(m_hcr & HCR_ATTN) && (data & HCR_ATTN))
- {
- if (!(data & HCR_FLSH))
- {
- LOGMASKED(LOG_REG, "soft reset\n");
-
- // soft reset
- m_cpu->set_input_line(INPUT_LINE_NMI, 1);
- m_cpu->set_input_line(INPUT_LINE_NMI, 0);
- }
- else
- {
- LOGMASKED(LOG_REG, "hard reset\n");
-
- // hard reset
- reset();
- }
- }
-
m_hcr = data;
}
@@ -655,7 +638,7 @@ void isa16_3c505_device::update_rdy(u8 const acr, u8 const hcr)
m_hsr &= ~HSR_HRDY;
}
- update_cpu_drq(!!(m_asr & ASR_ARDY));
+ update_cpu_drq(bool(m_asr & ASR_ARDY));
update_isa_drq((m_hsr & HSR_HRDY) && (hcr & HCR_DMAE));
}