Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Commit stuff that should have been in dc620097c5 (nw)

Browse Source
This commit is contained in:
AJR 2019-11-07 17:10:07 -05:00
parent dc620097c5
commit b438b1210f
5 changed files with 78 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/devices/cpu/m6502/st2204.cpp
View File

@ -44,6 +44,8 @@ st2204_device::st2204_device(const machine_config &mconfig, device_type type, co
: st2xxx_device(mconfig, type, tag, owner, clock, map, 26, false) // logical; only 23 address lines are brought out
, m_tmode{0}
, m_tcntr{0}
, m_tload{0}
, m_t0_timer(nullptr)
, m_psg{0}
, m_psgc(0)
, m_dms(0)
@ -76,8 +78,11 @@ void st2204_device::device_start()
init_base_timer(0x0020);
m_t0_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st2204_device::t0_interrupt), this));
save_item(NAME(m_tmode));
save_item(NAME(m_tcntr));
save_item(NAME(m_tload));
save_item(NAME(m_psg));
save_item(NAME(m_psgc));
save_item(NAME(m_dms));
@ -105,12 +110,13 @@ void st2204_device::device_start()
state_add(ST_PDL, "PDL", m_pdata[6]);
state_add(ST_PCL, "PCL", m_pctrl[6]);
state_add(ST_PMCR, "PMCR", m_pmcr);
state_add<u8>(ST_PRS, "PRS", [this]() { return m_prs; }, [this](u8 data) { prs_w(data); }).mask(0x60);
state_add<u8>(ST_BTEN, "BTEN", [this]() { return m_bten; }, [this](u8 data) { bten_w(data); }).mask(0x1f);
state_add(ST_BTSR, "BTSR", m_btsr).mask(0x1f);
state_add(ST_T0M, "T0M", m_tmode[0]).mask(0x37);
state_add(ST_T0C, "T0C", m_tcntr[0]);
state_add(ST_T0C, "T0C", m_tload[0]);
state_add(ST_T1M, "T1M", m_tmode[1]).mask(0x1f);
state_add(ST_T1C, "T1C", m_tcntr[1]);
state_add(ST_T1C, "T1C", m_tload[1]);
state_add(ST_PSG0, "PSG0", m_psg[0]).mask(0xfff);
state_add(ST_PSG1, "PSG1", m_psg[1]).mask(0xfff);
state_add(ST_PSGC, "PSGC", m_psgc).mask(0x7f);
@ -137,6 +143,9 @@ void st2204_device::device_reset()
m_tmode[0] = m_tmode[1] = 0;
m_tcntr[0] = m_tcntr[1] = 0;
m_tload[0] = m_tload[1] = 0;
m_t0_timer->adjust(attotime::never);
m_psg[0] = m_psg[1] = 0;
m_psgc = 0;
}
@ -245,6 +254,16 @@ unsigned st2204_device::st2xxx_bt_divider(int n) const
return 0;
}
TIMER_CALLBACK_MEMBER(st2204_device::t0_interrupt)
{
m_ireq |= 0x004;
update_irq_state();
// Bit 4 allows auto-reload
m_tcntr[0] = BIT(m_tmode[0], 4) ? m_tload[0] : 0;
m_t0_timer->adjust(cycles_to_attotime((256 - m_tcntr[0]) * tclk_pres_div(m_tmode[0] & 0x07)));
}
u8 st2204_device::t0m_r()
{
return m_tmode[0];
@ -252,17 +271,38 @@ u8 st2204_device::t0m_r()
void st2204_device::t0m_w(u8 data)
{
if ((data & 0x27) != (m_tmode[0] & 0x27) && (m_prs & 0x60) == 0x40)
{
// forced update
m_tcntr[0] = t0c_r();
if (BIT(data, 5))
{
u32 div = tclk_pres_div(data & 0x07);
m_t0_timer->adjust(cycles_to_attotime((255 - m_tcntr[0]) * div) + cycles_to_attotime(div - (m_pres_base & (div - 1))));
}
else if (BIT(m_tmode[0], 5))
m_t0_timer->adjust(attotime::never);
}
m_tmode[0] = data & 0x37;
}
u8 st2204_device::t0c_r()
{
return m_tcntr[0];
if ((m_prs & 0x60) != 0x40 || !BIT(m_tmode[0], 5))
return m_tcntr[0];
else
{
u32 div = tclk_pres_div(m_tmode[0] & 0x07);
return 256 - std::max((attotime_to_cycles(m_t0_timer->remaining()) + div - 1) / div, u64(1));
}
}
void st2204_device::t0c_w(u8 data)
{
m_tcntr[0] = data;
m_tcntr[0] = m_tload[0] = data;
if ((m_prs & 0x60) == 0x40 && BIT(m_tmode[0], 5))
m_t0_timer->adjust(cycles_to_attotime((256 - data) * tclk_pres_div(m_tmode[0] & 0x07)));
}
u8 st2204_device::t1m_r()
@ -282,7 +322,19 @@ u8 st2204_device::t1c_r()
void st2204_device::t1c_w(u8 data)
{
m_tcntr[1] = data;
m_tcntr[1] = m_tload[1] = data;
}
void st2204_device::st2xxx_tclk_start()
{
u32 div = tclk_pres_div(m_tmode[0] & 0x07);
m_t0_timer->adjust(cycles_to_attotime((255 - m_tcntr[0]) * div) + cycles_to_attotime(div - (m_pres_base & (div - 1))));
}
void st2204_device::st2xxx_tclk_stop()
{
m_tcntr[0] = t0c_r();
m_t0_timer->adjust(attotime::never);
}
void st2204_device::psg_w(offs_t offset, u8 data)
@ -406,6 +458,7 @@ void st2204_device::common_map(address_map &map)
map(0x0016, 0x0016).w(FUNC(st2204_device::psgc_w));
map(0x0020, 0x0020).rw(FUNC(st2204_device::bten_r), FUNC(st2204_device::bten_w));
map(0x0021, 0x0021).rw(FUNC(st2204_device::btsr_r), FUNC(st2204_device::btclr_all_w));
map(0x0023, 0x0023).rw(FUNC(st2204_device::prs_r), FUNC(st2204_device::prs_w));
map(0x0024, 0x0024).rw(FUNC(st2204_device::t0m_r), FUNC(st2204_device::t0m_w));
map(0x0025, 0x0025).rw(FUNC(st2204_device::t0c_r), FUNC(st2204_device::t0c_w));
map(0x0026, 0x0026).rw(FUNC(st2204_device::t1m_r), FUNC(st2204_device::t1m_w));

6
src/devices/cpu/m6502/st2204.h
View File

@ -39,6 +39,9 @@ protected:
virtual u16 st2xxx_ireq_mask() const override { return 0x0f7f; }
virtual const char *st2xxx_irq_name(int i) const override;
virtual unsigned st2xxx_bt_divider(int n) const override;
virtual u8 st2xxx_prs_mask() const override { return 0xe0; }
virtual void st2xxx_tclk_start() override;
virtual void st2xxx_tclk_stop() override;
virtual u8 st2xxx_sys_mask() const override { return 0xff; }
virtual u8 st2xxx_misc_mask() const override { return 0x1f; }
virtual bool st2xxx_has_dma() const override { return true; }
@ -69,6 +72,7 @@ private:
u8 pmcr_r();
void pmcr_w(u8 data);
TIMER_CALLBACK_MEMBER(t0_interrupt);
u8 t0m_r();
void t0m_w(u8 data);
u8 t0c_r();
@ -100,6 +104,8 @@ private:
u8 m_tmode[2];
u8 m_tcntr[2];
u8 m_tload[2];
emu_timer *m_t0_timer;
u16 m_psg[2];
u8 m_psgc;
u16 m_dms;

10
src/devices/cpu/m6502/st2205u.cpp
View File

@ -95,6 +95,7 @@ void st2205u_device::device_start()
state_add(ST_PMCR, "PMCR", m_pmcr);
state_add(ST_MISC, "MISC", m_misc).mask(st2xxx_misc_mask());
state_add<u8>(ST_SYS, "SYS", [this]() { return m_sys; }, [this](u8 data) { sys_w(data); }).mask(0xfe);
state_add<u8>(ST_PRS, "PRS", [this]() { return m_prs; }, [this](u8 data) { prs_w(data); }).mask(0x40);
state_add<u8>(ST_BTEN, "BTEN", [this]() { return m_bten; }, [this](u8 data) { bten_w(data); });
state_add(ST_BTSR, "BTREQ", m_btsr);
state_add(ST_BTC, "BTC", m_btc);
@ -347,6 +348,14 @@ void st2205u_device::tien_w(u8 data)
m_tien = data;
}
void st2205u_device::st2xxx_tclk_start()
{
}
void st2205u_device::st2xxx_tclk_stop()
{
}
u8 st2205u_device::lvctr_r()
{
return m_lvctr | 0x01;
@ -407,6 +416,7 @@ void st2205u_device::int_map(address_map &map)
map(0x000f, 0x000f).rw(FUNC(st2205u_device::pfd_r), FUNC(st2205u_device::pfd_w));
map(0x0020, 0x0027).rw(FUNC(st2205u_device::tc_12bit_r), FUNC(st2205u_device::tc_12bit_w));
map(0x0028, 0x0028).rw(FUNC(st2205u_device::tien_r), FUNC(st2205u_device::tien_w));
map(0x0029, 0x0029).rw(FUNC(st2205u_device::prs_r), FUNC(st2205u_device::prs_w));
map(0x002a, 0x002a).rw(FUNC(st2205u_device::bten_r), FUNC(st2205u_device::bten_w));
map(0x002b, 0x002b).rw(FUNC(st2205u_device::btsr_r), FUNC(st2205u_device::btclr_w));
map(0x002c, 0x002c).rw(FUNC(st2205u_device::btc_r), FUNC(st2205u_device::btc_w));

3
src/devices/cpu/m6502/st2205u.h
View File

@ -37,6 +37,9 @@ protected:
virtual u16 st2xxx_ireq_mask() const override { return 0xdfff; }
virtual const char *st2xxx_irq_name(int i) const override;
virtual unsigned st2xxx_bt_divider(int n) const override;
virtual u8 st2xxx_prs_mask() const override { return 0xc0; }
virtual void st2xxx_tclk_start() override;
virtual void st2xxx_tclk_stop() override;
virtual u8 st2xxx_sys_mask() const override { return 0xfe; }
virtual u8 st2xxx_misc_mask() const override { return 0x0f; }
virtual bool st2xxx_wdten_on_reset() const override { return true; }

2
src/mame/drivers/gameking.cpp
View File

@ -239,7 +239,7 @@ void gameking_state::init_gameking()
TIMER_CALLBACK_MEMBER(gameking_state::gameking_timer)
{
m_maincpu->set_state_int(st2xxx_device::ST_IREQ,
m_maincpu->state_int(st2xxx_device::ST_IREQ) | (0x016 & m_maincpu->state_int(st2xxx_device::ST_IENA)));
m_maincpu->state_int(st2xxx_device::ST_IREQ) | (0x052 & m_maincpu->state_int(st2xxx_device::ST_IENA)));
timer1->enable(false);
timer2->enable(true);
timer2->reset(m_maincpu->cycles_to_attotime(10/*?*/));