summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/z80ne.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/z80ne.cpp')
-rw-r--r--src/mame/machine/z80ne.cpp87
1 files changed, 28 insertions, 59 deletions
diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index c9e1677e667..aefb0b7dc44 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -66,7 +66,7 @@ TIMER_CALLBACK_MEMBER(z80ne_state::z80ne_cassette_tc)
}
-void z80ne_state::init_z80ne()
+void z80ne_state::driver_init()
{
/* first two entries point to rom on reset */
uint8_t *RAM = m_region_z80ne->base();
@@ -75,16 +75,12 @@ void z80ne_state::init_z80ne()
m_bank2->configure_entry(0, &RAM[0x14000]); /* ep382 at 0x8000 */
}
-void z80ne_state::init_z80net()
+void z80net_state::driver_init()
{
- init_z80ne();
+ z80ne_state::driver_init();
}
-void z80ne_state::init_z80netb()
-{
-}
-
-void z80netf_state::init_z80netf()
+void z80netf_state::driver_init()
{
/* first two entries point to rom on reset */
uint8_t *RAM = m_region_z80ne->base();
@@ -162,7 +158,7 @@ void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param,
}
}
-void z80ne_state::reset_lx387()
+void z80net_state::reset_lx387()
{
m_lx387_kr2376->set_input_pin( kr2376_device::KR2376_DSII, 0);
m_lx387_kr2376->set_input_pin( kr2376_device::KR2376_PII, 0);
@@ -231,13 +227,9 @@ void z80netf_state::reset_lx390_banking()
*/
}
-MACHINE_RESET_MEMBER(z80ne_state,z80ne_base)
+void z80ne_state::base_reset()
{
- int i;
-
- LOG("In machine_reset z80ne_base\n");
-
- for ( i=0; i<LX383_KEYS; i++)
+ for (int i = 0; i < LX383_KEYS; i++)
m_lx383_key[i] = 0xf0 | i;
m_lx383_scan_counter = 0x0f;
m_lx383_downsampler = LX383_DOWNSAMPLING;
@@ -282,32 +274,28 @@ MACHINE_RESET_MEMBER(z80ne_state,z80ne_base)
}
-MACHINE_RESET_MEMBER(z80ne_state,z80ne)
+void z80ne_state::machine_reset()
{
- LOG("In machine_reset z80ne\n");
reset_lx382_banking();
- MACHINE_RESET_CALL_MEMBER( z80ne_base );
+ base_reset();
}
-MACHINE_RESET_MEMBER(z80ne_state,z80net)
+void z80net_state::machine_reset()
{
- LOG("In machine_reset z80net\n");
- MACHINE_RESET_CALL_MEMBER( z80ne );
+ z80ne_state::machine_reset();
reset_lx387();
}
-MACHINE_RESET_MEMBER(z80ne_state,z80netb)
+void z80netb_state::machine_reset()
{
- LOG("In machine_reset z80netb\n");
- MACHINE_RESET_CALL_MEMBER( z80ne_base );
+ base_reset();
reset_lx387();
}
-MACHINE_RESET_MEMBER(z80netf_state,z80netf)
+void z80netf_state::machine_reset()
{
- LOG("In machine_reset z80netf\n");
reset_lx390_banking();
- MACHINE_RESET_CALL_MEMBER( z80ne_base );
+ base_reset();
reset_lx387();
}
@@ -322,7 +310,7 @@ INPUT_CHANGED_MEMBER(z80ne_state::z80ne_reset)
}
}
-INPUT_CHANGED_MEMBER(z80ne_state::z80ne_nmi)
+INPUT_CHANGED_MEMBER(z80net_state::z80net_nmi)
{
uint8_t nmi;
nmi = m_io_lx387_brk->read();
@@ -333,10 +321,8 @@ INPUT_CHANGED_MEMBER(z80ne_state::z80ne_nmi)
}
}
-MACHINE_START_MEMBER(z80ne_state,z80ne)
+void z80ne_state::machine_start()
{
- LOG("In MACHINE_START z80ne\n");
-
m_timer_nmi = timer_alloc(0);
m_timer_reset = timer_alloc(1);
@@ -351,23 +337,9 @@ MACHINE_START_MEMBER(z80ne_state,z80ne)
m_kbd_timer->adjust(attotime::from_hz(1000), 0, attotime::from_hz(1000));
}
-MACHINE_START_MEMBER(z80ne_state,z80net)
-{
- MACHINE_START_CALL_MEMBER( z80ne );
- LOG("In MACHINE_START z80net\n");
-}
-
-MACHINE_START_MEMBER(z80ne_state,z80netb)
+void z80netf_state::machine_start()
{
- MACHINE_START_CALL_MEMBER( z80net );
- LOG("In MACHINE_START z80netb\n");
-}
-
-MACHINE_START_MEMBER(z80netf_state,z80netf)
-{
- MACHINE_START_CALL_MEMBER( z80net );
- LOG("In MACHINE_START z80netf\n");
-
+ z80ne_state::machine_start();
m_drv_led.resolve();
}
@@ -557,41 +529,38 @@ WRITE_LINE_MEMBER(z80ne_state::lx385_uart_tx_clock_w)
m_uart->write_tcp(state);
}
-READ_LINE_MEMBER(z80ne_state::lx387_shift_r)
+READ_LINE_MEMBER(z80net_state::lx387_shift_r)
{
return BIT(m_io_modifiers->read(), 0) || BIT(m_io_modifiers->read(), 2);
}
-READ_LINE_MEMBER(z80ne_state::lx387_control_r)
+READ_LINE_MEMBER(z80net_state::lx387_control_r)
{
return BIT(m_io_modifiers->read(), 1);
}
-READ8_MEMBER(z80ne_state::lx388_mc6847_videoram_r)
+READ8_MEMBER(z80net_state::lx388_mc6847_videoram_r)
{
if (offset == ~0) return 0xff;
- uint8_t *videoram = m_videoram;
- int d6 = BIT(videoram[offset], 6);
- int d7 = BIT(videoram[offset], 7);
+ int d6 = BIT(m_videoram[offset], 6);
+ int d7 = BIT(m_videoram[offset], 7);
m_vdg->inv_w(d6 && d7);
m_vdg->as_w(!d6 && d7);
m_vdg->intext_w(!d6 && d7);
- return videoram[offset];
+ return m_videoram[offset];
}
-READ8_MEMBER(z80ne_state::lx387_data_r)
+READ8_MEMBER(z80net_state::lx387_data_r)
{
- uint8_t data;
-
- data = m_lx387_kr2376->data_r(space, 0) & 0x7f;
+ uint8_t data = m_lx387_kr2376->data_r(space, 0) & 0x7f;
data |= m_lx387_kr2376->get_output_pin(kr2376_device::KR2376_SO) << 7;
return data;
}
-READ8_MEMBER(z80ne_state::lx388_read_field_sync)
+READ8_MEMBER(z80net_state::lx388_read_field_sync)
{
return m_vdg->fs_r() << 7;
}