diff options
author | MooglyGuy <MooglyGuy@users.noreply.github.com> | 2022-06-26 13:27:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-26 21:27:53 +1000 |
commit | 4cb331700faa47ccc3e3587ea0fc51849d7c30e6 (patch) | |
tree | f5eca3c78cb9ce28dba1e6ae22003b178c7f4c61 /src/devices/machine | |
parent | 3e0d0d31a83e0973e97a353232140aac2963bba0 (diff) |
plygonet.cpp: Polygonet Warriors goes in-game. (#9987) [Ryan Holtz, Phil Bennett, Hydreigon]
More PSAC2 fixes, some K056230 fixes, plus some screen size fixes.
Diffstat (limited to 'src/devices/machine')
-rw-r--r-- | src/devices/machine/k056230.cpp | 110 | ||||
-rw-r--r-- | src/devices/machine/k056230.h | 26 |
2 files changed, 74 insertions, 62 deletions
diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp index c14458c99f5..c2f1c8c0eea 100644 --- a/src/devices/machine/k056230.cpp +++ b/src/devices/machine/k056230.cpp @@ -17,95 +17,111 @@ TODO: nearly everything ***************************************************************************/ #include "emu.h" + #include "k056230.h" +#define LOG_REG_READS (1 << 1U) +#define LOG_REG_WRITES (1 << 2U) +#define LOG_RAM_READS (1 << 3U) +#define LOG_RAM_WRITES (1 << 4U) +#define LOG_UNKNOWNS (1 << 5U) +#define LOG_ALL (LOG_REG_READS | LOG_REG_WRITES | LOG_RAM_READS | LOG_RAM_WRITES | LOG_UNKNOWNS) -//************************************************************************** -// LIVE DEVICE -//************************************************************************** +#define VERBOSE (0) +#include "logmacro.h" -// device type definition DEFINE_DEVICE_TYPE(K056230, k056230_device, "k056230", "K056230 LANC") -//------------------------------------------------- -// k056230_device - constructor -//------------------------------------------------- -k056230_device::k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +k056230_device::k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : device_t(mconfig, K056230, tag, owner, clock) - , m_cpu(*this, finder_base::DUMMY_TAG) + , m_ram(*this, "lanc_ram", 0x800U * 4, ENDIANNESS_BIG) + , m_irq_cb(*this) { } - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - void k056230_device::device_start() { - save_item(NAME(m_ram)); -} + m_irq_cb.resolve_safe(); + m_irq_state = CLEAR_LINE; + save_item(NAME(m_irq_state)); +} -uint8_t k056230_device::read(offs_t offset) +u8 k056230_device::regs_r(offs_t offset) { + u8 data = 0; + switch (offset) { case 0: // Status register - { - return 0x08; - } + data = 0x08; + LOGMASKED(LOG_REG_READS, "%s: regs_r: Status Register: %02x\n", machine().describe_context(), data); + break; + case 1: // CRC Error register - { - return 0x00; - } - } + data = 0x00; + LOGMASKED(LOG_REG_READS, "%s: regs_r: CRC Error Register: %02x\n", machine().describe_context(), data); + break; -// logerror("k056230_r: %d %s\n", offset, machine().describe_context()); + default: + LOGMASKED(LOG_REG_READS, "%s: regs_r: Unknown Register [%02x]: %02x\n", machine().describe_context(), offset, data); + break; + } - return 0; + return data; } -void k056230_device::write(offs_t offset, uint8_t data) +void k056230_device::regs_w(offs_t offset, u8 data) { - switch(offset) + switch (offset) { case 0: // Mode register - { + LOGMASKED(LOG_REG_WRITES, "%s: regs_w: Mode Register = %02x\n", machine().describe_context(), data); break; - } + case 1: // Control register { - if(data & 0x20) + LOGMASKED(LOG_REG_WRITES, "%s: regs_w: Control Register = %02x\n", machine().describe_context(), data); + // TODO: This is a literal translation of the previous device behaviour, and seems pretty likely to be incorrect. + const int old_state = m_irq_state; + if (BIT(data, 5)) { - if (m_cpu) - m_cpu->set_input_line(INPUT_LINE_IRQ2, ASSERT_LINE); + LOGMASKED(LOG_REG_WRITES, "%s: regs_w: Asserting IRQ\n", machine().describe_context()); + m_irq_state = ASSERT_LINE; } - if ((data & 1) == 0) + if (!BIT(data, 0)) { - if (m_cpu) - m_cpu->set_input_line(INPUT_LINE_IRQ2, CLEAR_LINE); + LOGMASKED(LOG_REG_WRITES, "%s: regs_w: Clearing IRQ\n", machine().describe_context()); + m_irq_state = CLEAR_LINE; } + if (old_state != m_irq_state) + { + m_irq_cb(m_irq_state); + } + } break; - break; - } case 2: // Sub ID register - { + LOGMASKED(LOG_REG_WRITES, "%s: regs_w: Sub ID Register = %02x\n", machine().describe_context(), data); + break; + + default: + LOGMASKED(LOG_REG_WRITES | LOG_UNKNOWNS, "%s: regs_w: Unknown Register [%02x] = %02x\n", machine().describe_context(), offset, data); break; - } } -// logerror("k056230_w: %d, %02X at %08X\n", offset, data, machine().describe_context()); } -uint32_t k056230_device::lanc_ram_r(offs_t offset, uint32_t mem_mask) +u32 k056230_device::ram_r(offs_t offset, u32 mem_mask) { - //logerror("LANC_RAM_r: %08X, %08X %s\n", offset, mem_mask, machine().describe_context()); - return m_ram[offset & 0x7ff]; + const auto lanc_ram = util::big_endian_cast<const u32>(m_ram.target()); + u32 data = lanc_ram[offset & 0x7ff]; + LOGMASKED(LOG_RAM_READS, "%s: Network RAM read [%04x (%03x)]: %08x & %08x\n", machine().describe_context(), offset << 2, (offset & 0x7ff) << 2, data, mem_mask); + return data; } -void k056230_device::lanc_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask) +void k056230_device::ram_w(offs_t offset, u32 data, u32 mem_mask) { - //logerror("LANC_RAM_w: %08X, %08X, %08X %s\n", data, offset, mem_mask, machine().describe_context()); - COMBINE_DATA(m_ram + (offset & 0x7ff)); + const auto lanc_ram = util::big_endian_cast<u32>(m_ram.target()); + LOGMASKED(LOG_RAM_WRITES, "%s: Network RAM write [%04x (%03x)] = %08x & %08x\n", machine().describe_context(), offset << 2, (offset & 0x7ff) << 2, data, mem_mask); + COMBINE_DATA(&lanc_ram[offset & 0x7ff]); } diff --git a/src/devices/machine/k056230.h b/src/devices/machine/k056230.h index 55643632b38..7df76c26e53 100644 --- a/src/devices/machine/k056230.h +++ b/src/devices/machine/k056230.h @@ -2,7 +2,7 @@ // copyright-holders:Fabio Priuli /*************************************************************************** - Konami 056230 + Konami 056230 LAN controller skeleton device ***************************************************************************/ @@ -15,29 +15,25 @@ class k056230_device : public device_t { public: // construction/destruction - template <typename T> - k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&cpu_tag) - : k056230_device(mconfig, tag, owner, (uint32_t)0) - { - m_cpu.set_tag(std::forward<T>(cpu_tag)); - } + k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + auto irq_cb() { return m_irq_cb.bind(); } - uint32_t lanc_ram_r(offs_t offset, uint32_t mem_mask = ~0); - void lanc_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + u32 ram_r(offs_t offset, u32 mem_mask = ~0); + void ram_w(offs_t offset, u32 data, u32 mem_mask = ~0); - uint8_t read(offs_t offset); - void write(offs_t offset, uint8_t data); + u8 regs_r(offs_t offset); + void regs_w(offs_t offset, u8 data); protected: // device-level overrides virtual void device_start() override; -private: + memory_share_creator<u32> m_ram; - required_device<cpu_device> m_cpu; - uint32_t m_ram[0x2000]; + devcb_write_line m_irq_cb; + int m_irq_state; + u8 m_ctrl_reg; }; |