diff options
author | 2021-11-15 20:50:40 +0000 | |
---|---|---|
committer | 2021-11-15 21:05:02 +0000 | |
commit | 554b042b64d32e08acd2055fba383a2910666ea9 (patch) | |
tree | 1f6187727df1a3a5c017298e1b592755177db32d | |
parent | c9a3da805f12a2d5176944264be33bb37674cda0 (diff) |
upc82c710/upc82c711: Use unscoped enum for device id's.
-rw-r--r-- | src/devices/machine/upc82c710.cpp | 62 | ||||
-rw-r--r-- | src/devices/machine/upc82c710.h | 19 | ||||
-rw-r--r-- | src/devices/machine/upc82c711.cpp | 66 | ||||
-rw-r--r-- | src/devices/machine/upc82c711.h | 19 |
4 files changed, 82 insertions, 84 deletions
diff --git a/src/devices/machine/upc82c710.cpp b/src/devices/machine/upc82c710.cpp index b2812291a1d..bf6352a69c7 100644 --- a/src/devices/machine/upc82c710.cpp +++ b/src/devices/machine/upc82c710.cpp @@ -84,11 +84,11 @@ void upc82c710_device::device_start() m_rts_callback.resolve_safe(); // default addresses - device_address[LogicalDevice::CFG] = 0x390; - device_address[LogicalDevice::IDE] = 0x1f0; - device_address[LogicalDevice::FDC] = 0x3f0; - device_address[LogicalDevice::LPT] = 0x278; - device_address[LogicalDevice::SER] = 0x3f8; + device_address[DEVICE_CFG] = 0x390; + device_address[DEVICE_IDE] = 0x1f0; + device_address[DEVICE_FDC] = 0x3f0; + device_address[DEVICE_LPT] = 0x278; + device_address[DEVICE_SER] = 0x3f8; const u8 cfg_regs_defaults[] = { 0x0e, 0x00, 0x08, 0x00, 0xfe, 0xbe, 0x9e, 0x00, 0xec, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -123,19 +123,19 @@ u16 upc82c710_device::io_r(offs_t offset, u16 mem_mask) } // ide - if (device_enabled[LogicalDevice::IDE] && (offset & ~7) == 0x1f0) + if (device_enabled[DEVICE_IDE] && (offset & ~7) == 0x1f0) { data = m_ide->cs0_r(offset & 7); LOGMASKED(LOG_IDE, "IDE read %04x -> %04x\n", offset, data); } - if (device_enabled[LogicalDevice::IDE] && offset == 0x3f6) + if (device_enabled[DEVICE_IDE] && offset == 0x3f6) { data = m_ide->cs1_r(offset & 7); LOGMASKED(LOG_IDE, "IDE read %04x -> %04x\n", offset, data); } // fdc - if (device_enabled[LogicalDevice::FDC] && (offset & ~7) == 0x3f0 && offset != 0x3f0 && offset != 0x3f1 && offset != 0x3f6) + if (device_enabled[DEVICE_FDC] && (offset & ~7) == 0x3f0 && offset != 0x3f0 && offset != 0x3f1 && offset != 0x3f6) { switch (offset & 7) { @@ -156,14 +156,14 @@ u16 upc82c710_device::io_r(offs_t offset, u16 mem_mask) } // parallel - if (device_enabled[LogicalDevice::LPT] && (offset & ~3) == device_address[LogicalDevice::LPT]) + if (device_enabled[DEVICE_LPT] && (offset & ~3) == device_address[DEVICE_LPT]) { data = m_lpt->read(offset & 3); LOGMASKED(LOG_LPT, "LPT read %04x -> %02x\n", offset, data); } // serial - if (device_enabled[LogicalDevice::SER] && (offset & ~7) == device_address[LogicalDevice::SER]) + if (device_enabled[DEVICE_SER] && (offset & ~7) == device_address[DEVICE_SER]) { data = m_serial->ins8250_r(offset & 7); LOGMASKED(LOG_SER, "SER read %04x -> %02x\n", offset, data); @@ -203,8 +203,8 @@ void upc82c710_device::io_w(offs_t offset, u16 data, u16 mem_mask) m_cfg_mode++; LOGMASKED(LOG_CFG, "CFG step %d write %04x <- %02x\n", m_cfg_mode, offset, data); m_cfg_regs[0x0f] = data; - device_address[LogicalDevice::CFG] = data << 2; - LOGMASKED(LOG_CFG, "CFG address %04x\n", device_address[LogicalDevice::CFG]); + device_address[DEVICE_CFG] = data << 2; + LOGMASKED(LOG_CFG, "CFG address %04x\n", device_address[DEVICE_CFG]); } break; case 4: @@ -219,7 +219,7 @@ void upc82c710_device::io_w(offs_t offset, u16 data, u16 mem_mask) } // configuration - if (offset == device_address[LogicalDevice::CFG]) + if (offset == device_address[DEVICE_CFG]) { LOGMASKED(LOG_CFG, "CFG write %04x <- %02x\n", offset, data); if (m_cfg_mode == 5) @@ -231,7 +231,7 @@ void upc82c710_device::io_w(offs_t offset, u16 data, u16 mem_mask) m_cfg_mode = 0; } } - else if (offset == device_address[LogicalDevice::CFG] + 1) + else if (offset == device_address[DEVICE_CFG] + 1) { LOGMASKED(LOG_CFG, "CFG write %04x <- %02x\n", offset, data); if (m_cfg_mode == 5) @@ -245,19 +245,19 @@ void upc82c710_device::io_w(offs_t offset, u16 data, u16 mem_mask) } // ide - if (device_enabled[LogicalDevice::IDE] && (offset & ~7) == 0x1f0) + if (device_enabled[DEVICE_IDE] && (offset & ~7) == 0x1f0) { m_ide->cs0_w(offset & 7, data); LOGMASKED(LOG_IDE, "IDE write %04x <- %04x\n", offset, data); } - if (device_enabled[LogicalDevice::IDE] && offset == 0x3f6) + if (device_enabled[DEVICE_IDE] && offset == 0x3f6) { m_ide->cs1_w(offset & 7, data); LOGMASKED(LOG_IDE, "IDE write %04x <- %04x\n", offset, data); } // fdc - if (device_enabled[LogicalDevice::FDC] && (offset & ~7) == 0x3f0 && offset != 0x3f0 && offset != 0x3f1 && offset != 0x3f6) + if (device_enabled[DEVICE_FDC] && (offset & ~7) == 0x3f0 && offset != 0x3f0 && offset != 0x3f1 && offset != 0x3f6) { switch (offset & 7) { @@ -275,14 +275,14 @@ void upc82c710_device::io_w(offs_t offset, u16 data, u16 mem_mask) } // parallel - if (device_enabled[LogicalDevice::LPT] && (offset & ~3) == device_address[LogicalDevice::LPT]) + if (device_enabled[DEVICE_LPT] && (offset & ~3) == device_address[DEVICE_LPT]) { m_lpt->write(offset & 3, data); LOGMASKED(LOG_LPT, "LPT write %04x <- %02x\n", offset, data); } // serial - if (device_enabled[LogicalDevice::SER] && (offset & ~7) == device_address[LogicalDevice::SER]) + if (device_enabled[DEVICE_SER] && (offset & ~7) == device_address[DEVICE_SER]) { m_serial->ins8250_w(offset & 7, data); LOGMASKED(LOG_SER, "SER write %04x <- %02x\n", offset, data); @@ -362,27 +362,27 @@ void upc82c710_device::write_cfg(int index, u8 data) switch (index) { case 0x00: // Chip Selects and Enable - device_enabled[LogicalDevice::LPT]= BIT(m_cfg_regs[index], 3); - device_enabled[LogicalDevice::SER]= BIT(m_cfg_regs[index], 2); - LOGMASKED(LOG_CFG, "LPT %s\n", device_enabled[LogicalDevice::LPT] ? "enabled" : "disabled"); - LOGMASKED(LOG_CFG, "SER %s\n", device_enabled[LogicalDevice::SER] ? "enabled" : "disabled"); + device_enabled[DEVICE_LPT]= BIT(m_cfg_regs[index], 3); + device_enabled[DEVICE_SER]= BIT(m_cfg_regs[index], 2); + LOGMASKED(LOG_CFG, "LPT %s\n", device_enabled[DEVICE_LPT] ? "enabled" : "disabled"); + LOGMASKED(LOG_CFG, "SER %s\n", device_enabled[DEVICE_SER] ? "enabled" : "disabled"); break; case 0x04: // Serial Port Address - device_address[LogicalDevice::SER] = (data & 0xfe) << 2; - LOGMASKED(LOG_CFG, "SER address %04x\n", device_address[LogicalDevice::SER]); + device_address[DEVICE_SER] = (data & 0xfe) << 2; + LOGMASKED(LOG_CFG, "SER address %04x\n", device_address[DEVICE_SER]); break; case 0x06: // Parallel Port Address - device_address[LogicalDevice::LPT] = data << 2; - LOGMASKED(LOG_CFG, "LPT address %04x\n", device_address[LogicalDevice::LPT]); + device_address[DEVICE_LPT] = data << 2; + LOGMASKED(LOG_CFG, "LPT address %04x\n", device_address[DEVICE_LPT]); break; case 0x0c: - device_enabled[LogicalDevice::IDE] = BIT(m_cfg_regs[index], 7); - device_enabled[LogicalDevice::FDC] = BIT(m_cfg_regs[index], 5); - LOGMASKED(LOG_CFG, "IDE %s\n", device_enabled[LogicalDevice::IDE] ? "enabled" : "disabled"); - LOGMASKED(LOG_CFG, "FDC %s\n", device_enabled[LogicalDevice::FDC] ? "enabled" : "disabled"); + device_enabled[DEVICE_IDE] = BIT(m_cfg_regs[index], 7); + device_enabled[DEVICE_FDC] = BIT(m_cfg_regs[index], 5); + LOGMASKED(LOG_CFG, "IDE %s\n", device_enabled[DEVICE_IDE] ? "enabled" : "disabled"); + LOGMASKED(LOG_CFG, "FDC %s\n", device_enabled[DEVICE_FDC] ? "enabled" : "disabled"); break; case 0x0f: diff --git a/src/devices/machine/upc82c710.h b/src/devices/machine/upc82c710.h index 7fa9b44a687..7868fec6b2f 100644 --- a/src/devices/machine/upc82c710.h +++ b/src/devices/machine/upc82c710.h @@ -85,19 +85,18 @@ private: void write_cfg(int index, u8 data); - enum LogicalDevice + enum { - CFG = 0, - FDC, - IDE, - LPT, - SER, - - LogicalDeviceEnd + DEVICE_CFG = 0, + DEVICE_FDC, + DEVICE_IDE, + DEVICE_LPT, + DEVICE_SER, + DEVICE_TOTAL }; - bool device_enabled[LogicalDevice::LogicalDeviceEnd]; - u16 device_address[LogicalDevice::LogicalDeviceEnd]; + bool device_enabled[DEVICE_TOTAL]; + u16 device_address[DEVICE_TOTAL]; int m_cfg_mode; u8 m_cfg_regs[16]; diff --git a/src/devices/machine/upc82c711.cpp b/src/devices/machine/upc82c711.cpp index 34d58cd6001..b162029daa0 100644 --- a/src/devices/machine/upc82c711.cpp +++ b/src/devices/machine/upc82c711.cpp @@ -103,11 +103,11 @@ void upc82c711_device::device_start() com_address[2] = 0x338; com_address[3] = 0x238; - device_address[LogicalDevice::IDE] = 0x1f0; - device_address[LogicalDevice::FDC] = 0x3f0; - device_address[LogicalDevice::LPT] = 0x278; - device_address[LogicalDevice::SER1] = com_address[0]; - device_address[LogicalDevice::SER2] = com_address[1]; + device_address[DEVICE_IDE] = 0x1f0; + device_address[DEVICE_FDC] = 0x3f0; + device_address[DEVICE_LPT] = 0x278; + device_address[DEVICE_SER1] = com_address[0]; + device_address[DEVICE_SER2] = com_address[1]; const u8 cfg_regs_defaults[] = { 0x3f, 0x9f, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -142,19 +142,19 @@ u16 upc82c711_device::io_r(offs_t offset, u16 mem_mask) } // ide - if (device_enabled[LogicalDevice::IDE] && (offset & ~7) == 0x1f0) + if (device_enabled[DEVICE_IDE] && (offset & ~7) == 0x1f0) { data = m_ide->cs0_r(offset & 7); LOGMASKED(LOG_IDE, "IDE read %04x -> %04x\n", offset, data); } - if (device_enabled[LogicalDevice::IDE] && offset == 0x3f6) + if (device_enabled[DEVICE_IDE] && offset == 0x3f6) { data = m_ide->cs1_r(offset & 7); LOGMASKED(LOG_IDE, "IDE read %04x -> %04x\n", offset, data); } // fdc - if (device_enabled[LogicalDevice::FDC] && (offset & ~7) == 0x3f0 && offset != 0x3f0 && offset != 0x3f1 && offset != 0x3f6) + if (device_enabled[DEVICE_FDC] && (offset & ~7) == 0x3f0 && offset != 0x3f0 && offset != 0x3f1 && offset != 0x3f6) { switch (offset & 7) { @@ -175,21 +175,21 @@ u16 upc82c711_device::io_r(offs_t offset, u16 mem_mask) } // parallel - if (device_enabled[LogicalDevice::LPT] && (offset & ~3) == device_address[LogicalDevice::LPT]) + if (device_enabled[DEVICE_LPT] && (offset & ~3) == device_address[DEVICE_LPT]) { data = m_lpt->read(offset & 3); LOGMASKED(LOG_LPT, "LPT read %04x -> %02x\n", offset, data); } // serial 1 - if (device_enabled[LogicalDevice::SER1] && (offset & ~7) == device_address[LogicalDevice::SER1]) + if (device_enabled[DEVICE_SER1] && (offset & ~7) == device_address[DEVICE_SER1]) { data = m_serial[0]->ins8250_r(offset & 7); LOGMASKED(LOG_SER, "SER1 read %04x -> %02x\n", offset, data); } // serial 2 - if (device_enabled[LogicalDevice::SER2] && (offset & ~7) == device_address[LogicalDevice::SER2]) + if (device_enabled[DEVICE_SER2] && (offset & ~7) == device_address[DEVICE_SER2]) { data = m_serial[1]->ins8250_r(offset & 7); LOGMASKED(LOG_SER, "SER2 read %04x -> %02x\n", offset, data); @@ -240,19 +240,19 @@ void upc82c711_device::io_w(offs_t offset, u16 data, u16 mem_mask) } // ide - if (device_enabled[LogicalDevice::IDE] && (offset & ~7) == 0x1f0) + if (device_enabled[DEVICE_IDE] && (offset & ~7) == 0x1f0) { m_ide->cs0_w(offset & 7, data); LOGMASKED(LOG_IDE, "IDE write %04x <- %04x\n", offset, data); } - if (device_enabled[LogicalDevice::IDE] && offset == 0x3f6) + if (device_enabled[DEVICE_IDE] && offset == 0x3f6) { m_ide->cs1_w(offset & 7, data); LOGMASKED(LOG_IDE, "IDE write %04x <- %04x\n", offset, data); } // fdc - if (device_enabled[LogicalDevice::FDC] && (offset & ~7) == 0x3f0 && offset != 0x3f0 && offset != 0x3f1 && offset != 0x3f6) + if (device_enabled[DEVICE_FDC] && (offset & ~7) == 0x3f0 && offset != 0x3f0 && offset != 0x3f1 && offset != 0x3f6) { switch (offset & 7) { @@ -270,21 +270,21 @@ void upc82c711_device::io_w(offs_t offset, u16 data, u16 mem_mask) } // parallel - if (device_enabled[LogicalDevice::LPT] && (offset & ~3) == device_address[LogicalDevice::LPT]) + if (device_enabled[DEVICE_LPT] && (offset & ~3) == device_address[DEVICE_LPT]) { m_lpt->write(offset & 3, data); LOGMASKED(LOG_LPT, "LPT write %04x <- %02x\n", offset, data); } // serial 1 - if (device_enabled[LogicalDevice::SER1] && (offset & ~7) == device_address[LogicalDevice::SER1]) + if (device_enabled[DEVICE_SER1] && (offset & ~7) == device_address[DEVICE_SER1]) { m_serial[0]->ins8250_w(offset & 7, data); LOGMASKED(LOG_SER, "SER1 write %04x <- %02x\n", offset, data); } // serial 2 - if (device_enabled[LogicalDevice::SER2] && (offset & ~7) == device_address[LogicalDevice::SER2]) + if (device_enabled[DEVICE_SER2] && (offset & ~7) == device_address[DEVICE_SER2]) { m_serial[1]->ins8250_w(offset & 7, data); LOGMASKED(LOG_SER, "SER2 write %04x <- %02x\n", offset, data); @@ -364,33 +364,33 @@ void upc82c711_device::write_cfg(int index, u8 data) switch (index) { case 0x00: - device_enabled[LogicalDevice::IDE] = BIT(m_cfg_regs[index], 0); - device_enabled[LogicalDevice::FDC] = BIT(m_cfg_regs[index], 3) && BIT(m_cfg_regs[index], 4); - LOGMASKED(LOG_CFG, "IDE %s\n", device_enabled[LogicalDevice::IDE] ? "enabled" : "disabled"); - LOGMASKED(LOG_CFG, "FDC %s\n", device_enabled[LogicalDevice::FDC] ? "enabled" : "disabled"); + device_enabled[DEVICE_IDE] = BIT(m_cfg_regs[index], 0); + device_enabled[DEVICE_FDC] = BIT(m_cfg_regs[index], 3) && BIT(m_cfg_regs[index], 4); + LOGMASKED(LOG_CFG, "IDE %s\n", device_enabled[DEVICE_IDE] ? "enabled" : "disabled"); + LOGMASKED(LOG_CFG, "FDC %s\n", device_enabled[DEVICE_FDC] ? "enabled" : "disabled"); break; case 0x01: { - device_enabled[LogicalDevice::LPT] = BIT(m_cfg_regs[index], 2); + device_enabled[DEVICE_LPT] = BIT(m_cfg_regs[index], 2); auto lpt_port = BIT(m_cfg_regs[index], 0, 2); switch (lpt_port) { case 0: // Disabled - device_enabled[LogicalDevice::LPT] = false; + device_enabled[DEVICE_LPT] = false; break; case 1: - device_address[LogicalDevice::LPT] = 0x3bc; + device_address[DEVICE_LPT] = 0x3bc; break; case 2: - device_address[LogicalDevice::LPT] = 0x378; + device_address[DEVICE_LPT] = 0x378; break; case 3: // Default - device_address[LogicalDevice::LPT] = 0x278; + device_address[DEVICE_LPT] = 0x278; break; } - LOGMASKED(LOG_CFG, "LPT %04x %s\n", device_address[LogicalDevice::LPT], device_enabled[LogicalDevice::LPT] ? "enabled" : "disabled"); + LOGMASKED(LOG_CFG, "LPT %04x %s\n", device_address[DEVICE_LPT], device_enabled[DEVICE_LPT] ? "enabled" : "disabled"); auto com34 = BIT(m_cfg_regs[index], 5, 2); switch (com34) { @@ -414,14 +414,14 @@ void upc82c711_device::write_cfg(int index, u8 data) break; } case 0x02: - device_enabled[LogicalDevice::SER1] = BIT(m_cfg_regs[index], 2) && BIT(m_cfg_regs[index], 3); - device_address[LogicalDevice::SER1] = com_address[BIT(m_cfg_regs[index], 0, 2)]; + device_enabled[DEVICE_SER1] = BIT(m_cfg_regs[index], 2) && BIT(m_cfg_regs[index], 3); + device_address[DEVICE_SER1] = com_address[BIT(m_cfg_regs[index], 0, 2)]; - device_enabled[LogicalDevice::SER2] = BIT(m_cfg_regs[index], 6) && BIT(m_cfg_regs[index], 7); - device_address[LogicalDevice::SER2] = com_address[BIT(m_cfg_regs[index], 4, 2)]; + device_enabled[DEVICE_SER2] = BIT(m_cfg_regs[index], 6) && BIT(m_cfg_regs[index], 7); + device_address[DEVICE_SER2] = com_address[BIT(m_cfg_regs[index], 4, 2)]; - LOGMASKED(LOG_CFG, "SER1 %04x %s\n", device_address[LogicalDevice::SER1], device_enabled[LogicalDevice::SER1] ? "enabled" : "disabled"); - LOGMASKED(LOG_CFG, "SER2 %04x %s\n", device_address[LogicalDevice::SER2], device_enabled[LogicalDevice::SER2] ? "enabled" : "disabled"); + LOGMASKED(LOG_CFG, "SER1 %04x %s\n", device_address[DEVICE_SER1], device_enabled[DEVICE_SER1] ? "enabled" : "disabled"); + LOGMASKED(LOG_CFG, "SER2 %04x %s\n", device_address[DEVICE_SER2], device_enabled[DEVICE_SER2] ? "enabled" : "disabled"); break; } } diff --git a/src/devices/machine/upc82c711.h b/src/devices/machine/upc82c711.h index dfaa243be0b..543bb594337 100644 --- a/src/devices/machine/upc82c711.h +++ b/src/devices/machine/upc82c711.h @@ -101,19 +101,18 @@ private: void write_cfg(int index, u8 data); - enum LogicalDevice + enum { - FDC = 0, - IDE, - LPT, - SER1, - SER2, - - LogicalDeviceEnd + DEVICE_FDC = 0, + DEVICE_IDE, + DEVICE_LPT, + DEVICE_SER1, + DEVICE_SER2, + DEVICE_TOTAL }; - bool device_enabled[LogicalDevice::LogicalDeviceEnd]; - u16 device_address[LogicalDevice::LogicalDeviceEnd]; + bool device_enabled[DEVICE_TOTAL]; + u16 device_address[DEVICE_TOTAL]; u16 com_address[4]; |