summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/trs/dgnalpha.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/trs/dgnalpha.cpp')
-rw-r--r--src/mame/trs/dgnalpha.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/trs/dgnalpha.cpp b/src/mame/trs/dgnalpha.cpp
index a7add5e0f87..e0a7ddeb2d2 100644
--- a/src/mame/trs/dgnalpha.cpp
+++ b/src/mame/trs/dgnalpha.cpp
@@ -122,7 +122,7 @@ private:
void fdc_intrq_w(int state);
void fdc_drq_w(int state);
- void dgnalpha_io1(address_map &map);
+ void dgnalpha_io1(address_map &map) ATTR_COLD;
required_device<pia6821_device> m_pia_2;
required_device<ay8912_device> m_ay8912;
@@ -144,7 +144,7 @@ private:
void dragon_alpha_state::dgnalpha_io1(address_map &map)
{
// $FF20-$FF3F
- map(0x00, 0x03).mirror(0x10).r(PIA1_TAG, FUNC(pia6821_device::read)).w(FUNC(coco12_state::ff20_write));
+ map(0x00, 0x03).mirror(0x10).r(m_pia_1, FUNC(pia6821_device::read)).w(FUNC(coco12_state::ff20_write));
map(0x04, 0x07).mirror(0x10).rw(m_pia_2, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x08, 0x0b).mirror(0x10).rw(FUNC(dragon_alpha_state::modem_r), FUNC(dragon_alpha_state::modem_w));
map(0x0c, 0x0c).mirror(0x10).rw(m_fdc, FUNC(wd2797_device::data_r), FUNC(wd2797_device::data_w));
@@ -335,10 +335,10 @@ void dragon_alpha_state::dgnalpha(machine_config &config)
INPUT_MERGER_ANY_HIGH(config, m_nmis).output_handler().set_inputline(m_maincpu, INPUT_LINE_NMI);
// cartridge
- cococart_slot_device &cartslot(COCOCART_SLOT(config, CARTRIDGE_TAG, DERIVED_CLOCK(1, 1), &dragon_alpha_state::dragon_cart, nullptr));
- cartslot.cart_callback().set([this] (int state) { cart_w(state != 0); }); // lambda because name is overloaded
- cartslot.nmi_callback().set(m_nmis, FUNC(input_merger_device::in_w<0>));
- cartslot.halt_callback().set_inputline(m_maincpu, INPUT_LINE_HALT);
+ COCOCART_SLOT(config, m_cococart, DERIVED_CLOCK(1, 1), &dragon_alpha_state::dragon_cart, nullptr);
+ m_cococart->cart_callback().set([this] (int state) { cart_w(state != 0); }); // lambda because name is overloaded
+ m_cococart->nmi_callback().set(m_nmis, FUNC(input_merger_device::in_w<0>));
+ m_cococart->halt_callback().set_inputline(m_maincpu, INPUT_LINE_HALT);
// acia
mos6551_device &acia(MOS6551(config, "acia", 0));