mirror of
https://github.com/holub/mame
synced 2025-04-18 22:49:58 +03:00
m68hc05: Simplify handler signatures; add MC68HC705C4A type (nw)
This commit is contained in:
AJR
parent
5faf282e92
commit
0f58e63686
@ -89,6 +89,11 @@ std::pair<u16, char const *> const m68hc05l9_syms[] = {
|
||||
{ 0x001d, "HOUR" }, { 0x001e, "MIN" }, { 0x001f, "SEC" } };
|
||||
|
||||
|
||||
ROM_START( m68hc705c4a )
|
||||
ROM_REGION(0x00f0, "bootstrap", 0)
|
||||
ROM_LOAD("bootstrap.bin", 0x0000, 0x00f0, NO_DUMP)
|
||||
ROM_END
|
||||
|
||||
ROM_START( m68hc705c8a )
|
||||
ROM_REGION(0x00f0, "bootstrap", 0)
|
||||
ROM_LOAD("bootstrap.bin", 0x0000, 0x00f0, NO_DUMP)
|
||||
@ -117,6 +122,7 @@ constexpr u16 M68HC05_INT_MASK = M68HC05_INT_IRQ | M68HC05_INT_TIMER;
|
||||
|
||||
DEFINE_DEVICE_TYPE(M68HC05C4, m68hc05c4_device, "m68hc05c4", "Motorola MC68HC05C4")
|
||||
DEFINE_DEVICE_TYPE(M68HC05C8, m68hc05c8_device, "m68hc05c8", "Motorola MC68HC05C8")
|
||||
DEFINE_DEVICE_TYPE(M68HC705C4A, m68hc705c4a_device, "m68hc705c4a", "Motorola MC68HC705C4A")
|
||||
DEFINE_DEVICE_TYPE(M68HC705C8A, m68hc705c8a_device, "m68hc705c8a", "Motorola MC68HC705C8A")
|
||||
DEFINE_DEVICE_TYPE(M68HC705J1A, m68hc705j1a_device, "m68hc705j1a", "Motorola MC68HC705J1A")
|
||||
DEFINE_DEVICE_TYPE(M68HC05L9, m68hc05l9_device, "m68hc05l9", "Motorola MC68HC05L9")
|
||||
@ -195,7 +201,7 @@ void m68hc05_device::set_port_interrupt(std::array<u8, PORT_COUNT> const &interr
|
||||
if (diff) update_port_irq();
|
||||
}
|
||||
|
||||
READ8_MEMBER(m68hc05_device::port_read)
|
||||
u8 m68hc05_device::port_read(offs_t offset)
|
||||
{
|
||||
offset &= PORT_COUNT - 1;
|
||||
if (!machine().side_effects_disabled() && !m_port_cb_r[offset].isnull())
|
||||
@ -214,7 +220,7 @@ READ8_MEMBER(m68hc05_device::port_read)
|
||||
return port_value(offset);
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(m68hc05_device::port_latch_w)
|
||||
void m68hc05_device::port_latch_w(offs_t offset, u8 data)
|
||||
{
|
||||
offset &= PORT_COUNT - 1;
|
||||
data &= m_port_bits[offset];
|
||||
@ -229,12 +235,12 @@ WRITE8_MEMBER(m68hc05_device::port_latch_w)
|
||||
m_port_cb_w[offset](0, port_value(offset), m_port_ddr[offset]);
|
||||
}
|
||||
|
||||
READ8_MEMBER(m68hc05_device::port_ddr_r)
|
||||
u8 m68hc05_device::port_ddr_r(offs_t offset)
|
||||
{
|
||||
return m_port_ddr[offset & (PORT_COUNT - 1)];
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(m68hc05_device::port_ddr_w)
|
||||
void m68hc05_device::port_ddr_w(offs_t offset, u8 data)
|
||||
{
|
||||
offset &= PORT_COUNT - 1;
|
||||
data &= m_port_bits[offset];
|
||||
@ -263,12 +269,12 @@ WRITE8_MEMBER(m68hc05_device::port_ddr_w)
|
||||
}
|
||||
|
||||
|
||||
READ8_MEMBER(m68hc05_device::tcr_r)
|
||||
u8 m68hc05_device::tcr_r()
|
||||
{
|
||||
return m_tcr;
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(m68hc05_device::tcr_w)
|
||||
void m68hc05_device::tcr_w(u8 data)
|
||||
{
|
||||
data &= 0xe3;
|
||||
LOGTIMER("write TCR: ICIE=%u OCIE=%u TOIE=%u IEDG=%u OLVL=%u\n",
|
||||
@ -280,7 +286,7 @@ WRITE8_MEMBER(m68hc05_device::tcr_w)
|
||||
m_pending_interrupts &= ~M68HC05_INT_TIMER;
|
||||
}
|
||||
|
||||
READ8_MEMBER(m68hc05_device::tsr_r)
|
||||
u8 m68hc05_device::tsr_r()
|
||||
{
|
||||
if (!machine().side_effects_disabled())
|
||||
{
|
||||
@ -295,7 +301,7 @@ READ8_MEMBER(m68hc05_device::tsr_r)
|
||||
return m_tsr;
|
||||
}
|
||||
|
||||
READ8_MEMBER(m68hc05_device::icr_r)
|
||||
u8 m68hc05_device::icr_r(offs_t offset)
|
||||
{
|
||||
// reading IRCH inhibits capture until ICRL is read
|
||||
// reading ICRL after reading TCR with ICF set clears ICF
|
||||
@ -324,7 +330,7 @@ READ8_MEMBER(m68hc05_device::icr_r)
|
||||
return u8(m_icr >> (low ? 0 : 8));
|
||||
}
|
||||
|
||||
READ8_MEMBER(m68hc05_device::ocr_r)
|
||||
u8 m68hc05_device::ocr_r(offs_t offset)
|
||||
{
|
||||
// reading OCRL after reading TCR with OCF set clears OCF
|
||||
|
||||
@ -339,7 +345,7 @@ READ8_MEMBER(m68hc05_device::ocr_r)
|
||||
return u8(m_ocr >> (low ? 0 : 8));
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(m68hc05_device::ocr_w)
|
||||
void m68hc05_device::ocr_w(offs_t offset, u8 data)
|
||||
{
|
||||
// writing ORCH inhibits compare until OCRL is written
|
||||
// writing OCRL after reading TCR with OCF set clears OCF
|
||||
@ -368,7 +374,7 @@ WRITE8_MEMBER(m68hc05_device::ocr_w)
|
||||
m_ocr = (m_ocr & (low ? 0xff00 : 0x00ff)) | (u16(data) << (low ? 0 : 8));
|
||||
}
|
||||
|
||||
READ8_MEMBER(m68hc05_device::timer_r)
|
||||
u8 m68hc05_device::timer_r(offs_t offset)
|
||||
{
|
||||
// reading [A]TRH returns current counter MSB and latches [A]TRL buffer
|
||||
// reading [A]TRL returns current [A]TRL buffer and completes read sequence
|
||||
@ -406,7 +412,7 @@ READ8_MEMBER(m68hc05_device::timer_r)
|
||||
}
|
||||
|
||||
|
||||
WRITE8_MEMBER(m68hc05_device::coprst_w)
|
||||
void m68hc05_device::coprst_w(u8 data)
|
||||
{
|
||||
LOGCOP("write COPRST=%02x%s\n", data, ((0xaa == data) && (0x55 == m_coprst)) ? ", reset" : "");
|
||||
if (0x55 == data)
|
||||
@ -420,22 +426,25 @@ WRITE8_MEMBER(m68hc05_device::coprst_w)
|
||||
}
|
||||
}
|
||||
|
||||
READ8_MEMBER(m68hc05_device::copcr_r)
|
||||
u8 m68hc05_device::copcr_r()
|
||||
{
|
||||
if (copcr_copf()) LOGCOP("read COPCR, clear COPF\n");
|
||||
u8 const result(m_copcr);
|
||||
m_copcr &= 0xef;
|
||||
if (!machine().side_effects_disabled())
|
||||
{
|
||||
if (copcr_copf()) LOGCOP("read COPCR, clear COPF\n");
|
||||
m_copcr &= 0xef;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(m68hc05_device::copcr_w)
|
||||
void m68hc05_device::copcr_w(u8 data)
|
||||
{
|
||||
LOGCOP("write COPCR: CME=%u PCOPE=%u [%s] CM=%u\n",
|
||||
BIT(data, 3), BIT(data, 2), (!copcr_pcope() && BIT(data, 2)) ? "set" : "ignored", data & 0x03);
|
||||
m_copcr = (m_copcr & 0xf4) | (data & 0x0f); // PCOPE is set-only, hence the mask overlap
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(m68hc05_device::copr_w)
|
||||
void m68hc05_device::copr_w(u8 data)
|
||||
{
|
||||
LOGCOP("write COPR: COPC=%u\n", BIT(data, 0));
|
||||
if (!BIT(data, 0)) m_ncop_cnt = 0;
|
||||
@ -895,6 +904,100 @@ std::unique_ptr<util::disasm_interface> m68hc05c8_device::create_disassembler()
|
||||
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* MC68HC705C4A device
|
||||
****************************************************************************/
|
||||
|
||||
void m68hc705c4a_device::c4a_map(address_map &map)
|
||||
{
|
||||
map.global_mask(0x1fff);
|
||||
map.unmap_value_high();
|
||||
|
||||
map(0x0000, 0x0003).rw(FUNC(m68hc705c4a_device::port_read), FUNC(m68hc705c4a_device::port_latch_w));
|
||||
map(0x0004, 0x0006).rw(FUNC(m68hc705c4a_device::port_ddr_r), FUNC(m68hc705c4a_device::port_ddr_w));
|
||||
// 0x0007-0x0009 unused
|
||||
// 0x000a SPCR
|
||||
// 0x000b SPSR
|
||||
// 0x000c SPDR
|
||||
// 0x000d BAUD
|
||||
// 0x000e SCCR1
|
||||
// 0x000f SCCR2
|
||||
// 0x0010 SCSR
|
||||
// 0x0011 SCDR
|
||||
map(0x0012, 0x0012).rw(FUNC(m68hc705c4a_device::tcr_r), FUNC(m68hc705c4a_device::tcr_w));
|
||||
map(0x0013, 0x0013).r(FUNC(m68hc705c4a_device::tsr_r));
|
||||
map(0x0014, 0x0015).r(FUNC(m68hc705c4a_device::icr_r));
|
||||
map(0x0016, 0x0017).rw(FUNC(m68hc705c4a_device::ocr_r), FUNC(m68hc705c4a_device::ocr_w));
|
||||
map(0x0018, 0x001b).r(FUNC(m68hc705c4a_device::timer_r));
|
||||
// 0x001c PROG
|
||||
// 0x001d-0x001f unused
|
||||
map(0x0020, 0x004f).rom(); // user PROM
|
||||
map(0x0050, 0x00ff).ram(); // RAM/stack
|
||||
map(0x0100, 0x10ff).rom(); // user PROM
|
||||
// 0x1100-0x1eff unused
|
||||
map(0x1f00, 0x1fde).rom().region("bootstrap", 0x0000); // bootloader
|
||||
map(0x1fdf, 0x1fdf).lw8(NAME([this] (u8 data) { m_option = data; }));
|
||||
map(0x1fe0, 0x1fef).rom().region("bootstrap", 0x00e0); // boot ROM vectors
|
||||
map(0x1ff0, 0x1ff0).w(FUNC(m68hc705c4a_device::copr_w));
|
||||
map(0x1ff0, 0x1fff).rom(); // user vectors
|
||||
}
|
||||
|
||||
|
||||
m68hc705c4a_device::m68hc705c4a_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
|
||||
: m68hc705_device(
|
||||
mconfig,
|
||||
tag,
|
||||
owner,
|
||||
clock,
|
||||
M68HC705C4A,
|
||||
13,
|
||||
address_map_constructor(FUNC(m68hc705c4a_device::c4a_map), this))
|
||||
, m_rom(*this, DEVICE_SELF, 0x2000)
|
||||
{
|
||||
set_port_bits(std::array<u8, PORT_COUNT>{{ 0xff, 0xff, 0xff, 0xbf }});
|
||||
}
|
||||
|
||||
|
||||
tiny_rom_entry const *m68hc705c4a_device::device_rom_region() const
|
||||
{
|
||||
return ROM_NAME(m68hc705c4a);
|
||||
}
|
||||
|
||||
|
||||
void m68hc705c4a_device::device_start()
|
||||
{
|
||||
m68hc705_device::device_start();
|
||||
|
||||
add_port_state(std::array<bool, PORT_COUNT>{{ true, true, true, false }});
|
||||
add_timer_state();
|
||||
add_ncop_state();
|
||||
|
||||
state_add(M68HC705C8A_OPTION, "OPTION", m_option).mask(0xff);
|
||||
|
||||
save_item(NAME(m_option));
|
||||
}
|
||||
|
||||
void m68hc705c4a_device::device_reset()
|
||||
{
|
||||
m68hc705_device::device_reset();
|
||||
|
||||
// latch MOR registers on reset
|
||||
set_port_interrupt(std::array<u8, PORT_COUNT>{{ 0x00, u8(rdmem<false>(0xfff0)), 0x00, 0x00 }});
|
||||
set_ncope(BIT(rdmem<false>(0xfff1), 0));
|
||||
|
||||
// IRQ negative edge and level sensitive
|
||||
m_option = 0x02;
|
||||
}
|
||||
|
||||
|
||||
std::unique_ptr<util::disasm_interface> m68hc705c4a_device::create_disassembler()
|
||||
{
|
||||
return std::make_unique<m68hc05_disassembler>(m68hc705c8a_syms);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
* MC68HC705C8A device
|
||||
****************************************************************************/
|
||||
@ -994,7 +1097,7 @@ std::unique_ptr<util::disasm_interface> m68hc705c8a_device::create_disassembler(
|
||||
}
|
||||
|
||||
|
||||
READ8_MEMBER(m68hc705c8a_device::ram0_r)
|
||||
u8 m68hc705c8a_device::ram0_r(offs_t offset)
|
||||
{
|
||||
if (BIT(m_option, 7))
|
||||
return offset >= 0x10 ? m_ram[offset - 0x10] : 0x00; // 20-2f reserved
|
||||
@ -1002,13 +1105,13 @@ READ8_MEMBER(m68hc705c8a_device::ram0_r)
|
||||
return m_rom[0x20 + offset];
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(m68hc705c8a_device::ram0_w)
|
||||
void m68hc705c8a_device::ram0_w(offs_t offset, u8 data)
|
||||
{
|
||||
if (BIT(m_option, 7) && offset >= 0x10)
|
||||
m_ram[offset - 0x10] = data;
|
||||
}
|
||||
|
||||
READ8_MEMBER(m68hc705c8a_device::ram1_r)
|
||||
u8 m68hc705c8a_device::ram1_r(offs_t offset)
|
||||
{
|
||||
if (BIT(m_option, 6))
|
||||
return m_ram[0x20 + offset];
|
||||
@ -1016,7 +1119,7 @@ READ8_MEMBER(m68hc705c8a_device::ram1_r)
|
||||
return m_rom[0x100 + offset];
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(m68hc705c8a_device::ram1_w)
|
||||
void m68hc705c8a_device::ram1_w(offs_t offset, u8 data)
|
||||
{
|
||||
if (BIT(m_option, 6))
|
||||
m_ram[0x20 + offset] = data;
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
DECLARE_DEVICE_TYPE(M68HC05C4, m68hc05c4_device)
|
||||
DECLARE_DEVICE_TYPE(M68HC05C8, m68hc05c8_device)
|
||||
DECLARE_DEVICE_TYPE(M68HC705C4A, m68hc705c4a_device)
|
||||
DECLARE_DEVICE_TYPE(M68HC705C8A, m68hc705c8a_device)
|
||||
DECLARE_DEVICE_TYPE(M68HC705J1A, m68hc705j1a_device)
|
||||
DECLARE_DEVICE_TYPE(M68HC05L9, m68hc05l9_device)
|
||||
@ -94,24 +95,24 @@ protected:
|
||||
|
||||
void set_port_bits(std::array<u8, PORT_COUNT> const &bits);
|
||||
void set_port_interrupt(std::array<u8, PORT_COUNT> const &interrupt);
|
||||
DECLARE_READ8_MEMBER(port_read);
|
||||
DECLARE_WRITE8_MEMBER(port_latch_w);
|
||||
DECLARE_READ8_MEMBER(port_ddr_r);
|
||||
DECLARE_WRITE8_MEMBER(port_ddr_w);
|
||||
u8 port_read(offs_t offset);
|
||||
void port_latch_w(offs_t offset, u8 data);
|
||||
u8 port_ddr_r(offs_t offset);
|
||||
void port_ddr_w(offs_t offset, u8 data);
|
||||
|
||||
DECLARE_READ8_MEMBER(tcr_r);
|
||||
DECLARE_WRITE8_MEMBER(tcr_w);
|
||||
DECLARE_READ8_MEMBER(tsr_r);
|
||||
DECLARE_READ8_MEMBER(icr_r);
|
||||
DECLARE_READ8_MEMBER(ocr_r);
|
||||
DECLARE_WRITE8_MEMBER(ocr_w);
|
||||
DECLARE_READ8_MEMBER(timer_r);
|
||||
u8 tcr_r();
|
||||
void tcr_w(u8 data);
|
||||
u8 tsr_r();
|
||||
u8 icr_r(offs_t offset);
|
||||
u8 ocr_r(offs_t offset);
|
||||
void ocr_w(offs_t offset, u8 data);
|
||||
u8 timer_r(offs_t offset);
|
||||
|
||||
void set_ncope(bool state) { m_ncope = state ? 1 : 0; }
|
||||
DECLARE_WRITE8_MEMBER(coprst_w);
|
||||
DECLARE_READ8_MEMBER(copcr_r);
|
||||
DECLARE_WRITE8_MEMBER(copcr_w);
|
||||
DECLARE_WRITE8_MEMBER(copr_w);
|
||||
void coprst_w(u8 data);
|
||||
u8 copcr_r();
|
||||
void copcr_w(u8 data);
|
||||
void copr_w(u8 data);
|
||||
|
||||
virtual void device_start() override;
|
||||
virtual void device_reset() override;
|
||||
@ -227,6 +228,30 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
// ======================> m68hc705c4a_device
|
||||
|
||||
class m68hc705c4a_device : public m68hc705_device
|
||||
{
|
||||
public:
|
||||
m68hc705c4a_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
|
||||
|
||||
protected:
|
||||
void c4a_map(address_map &map);
|
||||
|
||||
virtual tiny_rom_entry const *device_rom_region() const override;
|
||||
|
||||
virtual void device_start() override;
|
||||
virtual void device_reset() override;
|
||||
|
||||
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
|
||||
|
||||
private:
|
||||
required_region_ptr<u8> m_rom;
|
||||
|
||||
u8 m_option;
|
||||
};
|
||||
|
||||
|
||||
// ======================> m68hc705c8a_device
|
||||
|
||||
class m68hc705c8a_device : public m68hc705_device
|
||||
@ -247,10 +272,10 @@ protected:
|
||||
private:
|
||||
required_region_ptr<u8> m_rom;
|
||||
|
||||
DECLARE_READ8_MEMBER(ram0_r);
|
||||
DECLARE_WRITE8_MEMBER(ram0_w);
|
||||
DECLARE_READ8_MEMBER(ram1_r);
|
||||
DECLARE_WRITE8_MEMBER(ram1_w);
|
||||
u8 ram0_r(offs_t offset);
|
||||
void ram0_w(offs_t offset, u8 data);
|
||||
u8 ram1_r(offs_t offset);
|
||||
void ram1_w(offs_t offset, u8 data);
|
||||
|
||||
u8 m_ram[0x80];
|
||||
u8 m_option;
|
||||
|
||||
@ -202,6 +202,7 @@
|
||||
#include "emu.h"
|
||||
#include "machine/esqvfd.h"
|
||||
|
||||
#include "cpu/m6805/m68hc05.h"
|
||||
#include "machine/68340.h"
|
||||
#include "machine/68340ser.h"
|
||||
#include "sound/es5506.h"
|
||||
@ -280,6 +281,8 @@ void esqmr_state::mr(machine_config &config)
|
||||
duart.a_tx_cb().set(FUNC(esqmr_state::duart_tx_a));
|
||||
duart.b_tx_cb().set(FUNC(esqmr_state::duart_tx_b));
|
||||
|
||||
M68HC705C4A(config, "mcu", 4'000'000);
|
||||
|
||||
//IDT7130(config, "dpram"); // present in PCB, but unknown purpose (mcu communication?)
|
||||
|
||||
ESQPANEL2X40_VFX(config, m_panel);
|
||||
@ -317,6 +320,8 @@ ROM_START( mr61 )
|
||||
ROM_LOAD16_WORD_SWAP( "mrw-osf-11af-2.10.bin", 0x000000, 0x080000, CRC(5854314e) SHA1(8fb2e2ee2f5fb12eae8ea33cb18f757efaec6780) )
|
||||
ROM_LOAD16_WORD_SWAP( "mrw-romc-32ef-1.20.bin", 0x080000, 0x080000, CRC(68321347) SHA1(56cb96943ba42c35ba2787a49b5f4adf7c8dffb8) )
|
||||
|
||||
ROM_REGION(0x2000, "mcu", ROMREGION_ERASE00)
|
||||
|
||||
ROM_REGION(0x400000, "waverom", ROMREGION_ERASE00)
|
||||
|
||||
ROM_REGION(0x400000, "waverom2", ROMREGION_ERASE00)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user