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

It helps to actually stage the latest changes first... (nw)

Browse Source
This commit is contained in:
Lord-Nightmare 2020-06-29 03:07:51 -04:00
parent 1b46ed9db8
commit f43cda7adb
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mame/drivers/s11.cpp
View File

@ -152,10 +152,10 @@ void s11_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
{
#ifndef S11_W15
// W14 jumper present (Q7), W15 absent (Q10)
m_timer_irq_active = (BIT(m_timer_count, 7) && BIT(m_timer_count, 8) && BIT(m_timer_count, 9));
m_timer_irq_active = (BIT(m_timer_count, 7) && BIT(m_timer_count, 8) && BIT(m_timer_count, 9));
#else
// W14 jumper absent (Q7), W15 present (Q10)
m_timer_irq_active = (BIT(m_timer_count, 10) && BIT(m_timer_count, 8) && BIT(m_timer_count, 9));
m_timer_irq_active = (BIT(m_timer_count, 10) && BIT(m_timer_count, 8) && BIT(m_timer_count, 9));
#endif
}
@ -419,7 +419,7 @@ void s11_state::s11(machine_config &config)
m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
m_pia21->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<1>));
m_pia21->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<1>));
m_pia21->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<2>));
PIA6821(config, m_pia24, 0);

24
src/mame/drivers/s11a.cpp
View File

@ -193,15 +193,15 @@ void s11a_state::s11a(machine_config &config)
m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
m_pia21->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<1>));
m_pia21->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<2>));
m_pia21->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<1>));
m_pia21->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<2>));
PIA6821(config, m_pia24, 0);
m_pia24->writepa_handler().set(FUNC(s11_state::lamp0_w));
m_pia24->writepb_handler().set(FUNC(s11_state::lamp1_w));
m_pia24->cb2_handler().set(FUNC(s11_state::pia24_cb2_w));
m_pia24->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<3>));
m_pia24->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<4>));
m_pia24->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<3>));
m_pia24->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<4>));
PIA6821(config, m_pia28, 0);
m_pia28->readpa_handler().set(FUNC(s11_state::pia28_w7_r));
@ -210,29 +210,29 @@ void s11a_state::s11a(machine_config &config)
m_pia28->writepb_handler().set(FUNC(s11_state::dig1_w));
m_pia28->ca2_handler().set(FUNC(s11_state::pia28_ca2_w));
m_pia28->cb2_handler().set(FUNC(s11_state::pia28_cb2_w));
m_pia28->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<5>));
m_pia28->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<6>));
m_pia28->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<5>));
m_pia28->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<6>));
PIA6821(config, m_pia2c, 0);
m_pia2c->writepa_handler().set(FUNC(s11_state::pia2c_pa_w));
m_pia2c->writepb_handler().set(FUNC(s11_state::pia2c_pb_w));
m_pia2c->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<7>));
m_pia2c->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<8>));
m_pia2c->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<7>));
m_pia2c->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<8>));
PIA6821(config, m_pia30, 0);
m_pia30->readpa_handler().set(FUNC(s11_state::switch_r));
m_pia30->set_port_a_input_overrides_output_mask(0xff);
m_pia30->writepb_handler().set(FUNC(s11_state::switch_w));
m_pia30->cb2_handler().set(FUNC(s11_state::pia30_cb2_w));
m_pia30->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<9>));
m_pia30->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<10>));
m_pia30->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<9>));
m_pia30->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<10>));
PIA6821(config, m_pia34, 0);
m_pia34->writepa_handler().set(FUNC(s11_state::pia34_pa_w));
m_pia34->writepb_handler().set(FUNC(s11_state::pia34_pb_w));
m_pia34->cb2_handler().set(FUNC(s11_state::pia34_cb2_w));
m_pia34->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<11>));
m_pia34->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<12>));
m_pia34->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<11>));
m_pia34->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<12>));
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);

24
src/mame/drivers/s11b.cpp
View File

@ -268,15 +268,15 @@ void s11b_state::s11b(machine_config &config)
m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
m_pia21->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<1>));
m_pia21->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<2>));
m_pia21->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<1>));
m_pia21->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<2>));
PIA6821(config, m_pia24, 0);
m_pia24->writepa_handler().set(FUNC(s11_state::lamp0_w));
m_pia24->writepb_handler().set(FUNC(s11_state::lamp1_w));
m_pia24->cb2_handler().set(FUNC(s11_state::pia24_cb2_w));
m_pia24->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<3>));
m_pia24->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<4>));
m_pia24->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<3>));
m_pia24->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<4>));
PIA6821(config, m_pia28, 0);
m_pia28->readpa_handler().set(FUNC(s11_state::pia28_w7_r));
@ -285,29 +285,29 @@ void s11b_state::s11b(machine_config &config)
m_pia28->writepb_handler().set(FUNC(s11b_state::dig1_w));
m_pia28->ca2_handler().set(FUNC(s11_state::pia28_ca2_w));
m_pia28->cb2_handler().set(FUNC(s11_state::pia28_cb2_w));
m_pia28->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<5>));
m_pia28->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<6>));
m_pia28->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<5>));
m_pia28->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<6>));
PIA6821(config, m_pia2c, 0);
m_pia2c->writepa_handler().set(FUNC(s11b_state::pia2c_pa_w));
m_pia2c->writepb_handler().set(FUNC(s11b_state::pia2c_pb_w));
m_pia2c->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<7>));
m_pia2c->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<8>));
m_pia2c->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<7>));
m_pia2c->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<8>));
PIA6821(config, m_pia30, 0);
m_pia30->readpa_handler().set(FUNC(s11_state::switch_r));
m_pia30->set_port_a_input_overrides_output_mask(0xff);
m_pia30->writepb_handler().set(FUNC(s11_state::switch_w));
m_pia30->cb2_handler().set(FUNC(s11_state::pia30_cb2_w));
m_pia30->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<9>));
m_pia30->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<10>));
m_pia30->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<9>));
m_pia30->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<10>));
PIA6821(config, m_pia34, 0);
m_pia34->writepa_handler().set(FUNC(s11b_state::pia34_pa_w));
m_pia34->writepb_handler().set(FUNC(s11_state::pia34_pb_w));
m_pia34->cb2_handler().set(FUNC(s11_state::pia34_cb2_w));
m_pia34->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<11>));
m_pia34->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<12>));
m_pia34->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<11>));
m_pia34->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<12>));
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);

24
src/mame/drivers/s11c.cpp
View File

@ -171,15 +171,15 @@ void s11c_state::s11c(machine_config &config)
m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
m_pia21->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<1>));
m_pia21->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<2>));
m_pia21->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<1>));
m_pia21->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<2>));
PIA6821(config, m_pia24, 0);
m_pia24->writepa_handler().set(FUNC(s11_state::lamp0_w));
m_pia24->writepb_handler().set(FUNC(s11_state::lamp1_w));
m_pia24->cb2_handler().set(FUNC(s11_state::pia24_cb2_w));
m_pia24->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<3>));
m_pia24->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<4>));
m_pia24->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<3>));
m_pia24->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<4>));
PIA6821(config, m_pia28, 0);
m_pia28->readpa_handler().set(FUNC(s11_state::pia28_w7_r));
@ -188,29 +188,29 @@ void s11c_state::s11c(machine_config &config)
m_pia28->writepb_handler().set(FUNC(s11b_state::dig1_w));
m_pia28->ca2_handler().set(FUNC(s11_state::pia28_ca2_w));
m_pia28->cb2_handler().set(FUNC(s11_state::pia28_cb2_w));
m_pia28->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<5>));
m_pia28->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<6>));
m_pia28->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<5>));
m_pia28->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<6>));
PIA6821(config, m_pia2c, 0);
m_pia2c->writepa_handler().set(FUNC(s11b_state::pia2c_pa_w));
m_pia2c->writepb_handler().set(FUNC(s11b_state::pia2c_pb_w));
m_pia2c->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<7>));
m_pia2c->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<8>));
m_pia2c->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<7>));
m_pia2c->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<8>));
PIA6821(config, m_pia30, 0);
m_pia30->readpa_handler().set(FUNC(s11_state::switch_r));
m_pia30->set_port_a_input_overrides_output_mask(0xff);
m_pia30->writepb_handler().set(FUNC(s11_state::switch_w));
m_pia30->cb2_handler().set(FUNC(s11_state::pia30_cb2_w));
m_pia30->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<9>));
m_pia30->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<10>));
m_pia30->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<9>));
m_pia30->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<10>));
PIA6821(config, m_pia34, 0);
m_pia34->writepa_handler().set(FUNC(s11b_state::pia34_pa_w));
m_pia34->writepb_handler().set(FUNC(s11b_state::pia34_pb_w));
m_pia34->cb2_handler().set(FUNC(s11b_state::pia34_cb2_w));
m_pia34->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<11>));
m_pia34->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<12>));
m_pia34->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<11>));
m_pia34->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<12>));
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);