mirror of
https://github.com/holub/mame
synced 2025-10-05 08:41:31 +03:00
z80ne.cpp: Separate z80netf base class; use output finders (nw)
This commit is contained in:
AJR
parent
2f72738fd5
commit
afbd3121c7
@ -157,7 +157,7 @@ void z80ne_state::z80net_io(address_map &map)
|
||||
map(0xf0, 0xff).rw(this, FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w));
|
||||
}
|
||||
|
||||
void z80ne_state::z80netf_mem(address_map &map)
|
||||
void z80netf_state::z80netf_mem(address_map &map)
|
||||
{
|
||||
map(0x0000, 0x03ff).bankrw("bank1");
|
||||
map(0x0400, 0x3fff).bankrw("bank2");
|
||||
@ -171,15 +171,15 @@ void z80ne_state::z80netf_mem(address_map &map)
|
||||
map(0xf400, 0xffff).nopr().nopw();
|
||||
}
|
||||
|
||||
void z80ne_state::z80netf_io(address_map &map)
|
||||
void z80netf_state::z80netf_io(address_map &map)
|
||||
{
|
||||
map.global_mask(0xff);
|
||||
map(0xd0, 0xd7).rw(this, FUNC(z80ne_state::lx390_fdc_r), FUNC(z80ne_state::lx390_fdc_w));
|
||||
map(0xea, 0xea).r(this, FUNC(z80ne_state::lx387_data_r));
|
||||
map(0xeb, 0xeb).r(this, FUNC(z80ne_state::lx388_read_field_sync));
|
||||
map(0xd0, 0xd7).rw(this, FUNC(z80netf_state::lx390_fdc_r), FUNC(z80netf_state::lx390_fdc_w));
|
||||
map(0xea, 0xea).r(this, FUNC(z80netf_state::lx387_data_r));
|
||||
map(0xeb, 0xeb).r(this, FUNC(z80netf_state::lx388_read_field_sync));
|
||||
map(0xee, 0xee).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit));
|
||||
map(0xef, 0xef).rw(this, FUNC(z80ne_state::lx385_ctrl_r), FUNC(z80ne_state::lx385_ctrl_w));
|
||||
map(0xf0, 0xff).rw(this, FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w));
|
||||
map(0xef, 0xef).rw(this, FUNC(z80netf_state::lx385_ctrl_r), FUNC(z80netf_state::lx385_ctrl_w));
|
||||
map(0xf0, 0xff).rw(this, FUNC(z80netf_state::lx383_r), FUNC(z80netf_state::lx383_w));
|
||||
}
|
||||
|
||||
|
||||
@ -536,14 +536,14 @@ MACHINE_CONFIG_START(z80ne_state::z80netb)
|
||||
MCFG_SOFTWARE_LIST_ADD("cass_list","z80ne_cass")
|
||||
MACHINE_CONFIG_END
|
||||
|
||||
MACHINE_CONFIG_START(z80ne_state::z80netf)
|
||||
MACHINE_CONFIG_START(z80netf_state::z80netf)
|
||||
/* basic machine hardware */
|
||||
MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
|
||||
MCFG_CPU_PROGRAM_MAP(z80netf_mem)
|
||||
MCFG_CPU_IO_MAP(z80netf_io)
|
||||
|
||||
MCFG_MACHINE_START_OVERRIDE(z80ne_state,z80netf)
|
||||
MCFG_MACHINE_RESET_OVERRIDE(z80ne_state,z80netf)
|
||||
MCFG_MACHINE_START_OVERRIDE(z80netf_state,z80netf)
|
||||
MCFG_MACHINE_RESET_OVERRIDE(z80netf_state,z80netf)
|
||||
|
||||
MCFG_DEVICE_ADD( "uart", AY31015, 0 )
|
||||
MCFG_AY31015_TX_CLOCK(4800.0)
|
||||
@ -636,8 +636,8 @@ ROM_START( z80netf )
|
||||
ROM_LOAD( "ep2390.ic6", 0x14C00, 0x0400, CRC(28d28eee) SHA1(b80f75c1ac4905ae369ecbc9b9ce120cc85502ed) )
|
||||
ROM_END
|
||||
|
||||
// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
|
||||
COMP( 1980, z80ne, 0, 0, z80ne, z80ne, z80ne_state, z80ne, "Nuova Elettronica", "Z80NE", MACHINE_NO_SOUND_HW)
|
||||
COMP( 1980, z80net, z80ne, 0, z80net, z80net, z80ne_state, z80net, "Nuova Elettronica", "Z80NE + LX.388", MACHINE_NO_SOUND_HW)
|
||||
COMP( 1980, z80netb, z80ne, 0, z80netb, z80net, z80ne_state, z80netb, "Nuova Elettronica", "Z80NE + LX.388 + Basic 16k", MACHINE_NO_SOUND_HW)
|
||||
COMP( 1980, z80netf, z80ne, 0, z80netf, z80netf, z80ne_state, z80netf, "Nuova Elettronica", "Z80NE + LX.388 + LX.390", MACHINE_NO_SOUND_HW)
|
||||
// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
|
||||
COMP( 1980, z80ne, 0, 0, z80ne, z80ne, z80ne_state, z80ne, "Nuova Elettronica", "Z80NE", MACHINE_NO_SOUND_HW)
|
||||
COMP( 1980, z80net, z80ne, 0, z80net, z80net, z80ne_state, z80net, "Nuova Elettronica", "Z80NE + LX.388", MACHINE_NO_SOUND_HW)
|
||||
COMP( 1980, z80netb, z80ne, 0, z80netb, z80net, z80ne_state, z80netb, "Nuova Elettronica", "Z80NE + LX.388 + Basic 16k", MACHINE_NO_SOUND_HW)
|
||||
COMP( 1980, z80netf, z80ne, 0, z80netf, z80netf, z80netf_state, z80netf, "Nuova Elettronica", "Z80NE + LX.388 + LX.390", MACHINE_NO_SOUND_HW)
|
||||
|
||||
@ -58,13 +58,6 @@ struct z80ne_cass_data_t {
|
||||
int wave_long;
|
||||
};
|
||||
|
||||
struct wd17xx_state_t {
|
||||
int drq;
|
||||
int intrq;
|
||||
uint8_t drive; /* current drive */
|
||||
uint8_t head; /* current head */
|
||||
};
|
||||
|
||||
|
||||
class z80ne_state : public driver_device
|
||||
{
|
||||
@ -76,13 +69,8 @@ public:
|
||||
m_uart(*this, "uart"),
|
||||
m_lx387_kr2376(*this, "lx387_kr2376"),
|
||||
m_maincpu(*this, "z80ne"),
|
||||
m_floppy0(*this, "wd1771:0"),
|
||||
m_floppy1(*this, "wd1771:1"),
|
||||
m_floppy2(*this, "wd1771:2"),
|
||||
m_floppy3(*this, "wd1771:3"),
|
||||
m_cassette1(*this, "cassette"),
|
||||
m_cassette2(*this, "cassette2"),
|
||||
m_wd1771(*this, "wd1771"),
|
||||
m_region_z80ne(*this, "z80ne"),
|
||||
m_bank1(*this, "bank1"),
|
||||
m_bank2(*this, "bank2"),
|
||||
@ -94,16 +82,11 @@ public:
|
||||
m_io_rst(*this, "RST"),
|
||||
m_io_lx_385(*this, "LX.385"),
|
||||
m_io_lx387_brk(*this, "LX387_BRK"),
|
||||
m_io_x0(*this, "X0"),
|
||||
m_io_x1(*this, "X1"),
|
||||
m_io_x2(*this, "X2"),
|
||||
m_io_x3(*this, "X3"),
|
||||
m_io_x4(*this, "X4"),
|
||||
m_io_x5(*this, "X5"),
|
||||
m_io_x6(*this, "X6"),
|
||||
m_io_x7(*this, "X7"),
|
||||
m_io_modifiers(*this, "MODIFIERS"),
|
||||
m_io_config(*this, "CONFIG") { }
|
||||
m_io_config(*this, "CONFIG"),
|
||||
m_lx383_digits(*this, "digit%u", 0U)
|
||||
{
|
||||
}
|
||||
|
||||
DECLARE_FLOPPY_FORMATS(floppy_formats);
|
||||
|
||||
@ -118,7 +101,6 @@ public:
|
||||
emu_timer *m_cassette_timer;
|
||||
emu_timer *m_kbd_timer;
|
||||
z80ne_cass_data_t m_cass_data;
|
||||
wd17xx_state_t m_wd17xx_state;
|
||||
DECLARE_READ8_MEMBER(lx383_r);
|
||||
DECLARE_WRITE8_MEMBER(lx383_w);
|
||||
DECLARE_READ8_MEMBER(lx385_ctrl_r);
|
||||
@ -127,7 +109,6 @@ public:
|
||||
DECLARE_READ_LINE_MEMBER(lx387_control_r);
|
||||
DECLARE_READ8_MEMBER(lx387_data_r);
|
||||
DECLARE_READ8_MEMBER(lx388_read_field_sync);
|
||||
DECLARE_DRIVER_INIT(z80netf);
|
||||
DECLARE_DRIVER_INIT(z80net);
|
||||
DECLARE_DRIVER_INIT(z80netb);
|
||||
DECLARE_DRIVER_INIT(z80ne);
|
||||
@ -135,8 +116,6 @@ public:
|
||||
DECLARE_MACHINE_RESET(z80ne);
|
||||
DECLARE_MACHINE_START(z80netb);
|
||||
DECLARE_MACHINE_RESET(z80netb);
|
||||
DECLARE_MACHINE_START(z80netf);
|
||||
DECLARE_MACHINE_RESET(z80netf);
|
||||
DECLARE_MACHINE_START(z80net);
|
||||
DECLARE_MACHINE_RESET(z80net);
|
||||
DECLARE_MACHINE_RESET(z80ne_base);
|
||||
@ -145,13 +124,8 @@ public:
|
||||
TIMER_CALLBACK_MEMBER(z80ne_cassette_tc);
|
||||
TIMER_CALLBACK_MEMBER(z80ne_kbd_scan);
|
||||
DECLARE_READ8_MEMBER(lx388_mc6847_videoram_r);
|
||||
DECLARE_WRITE8_MEMBER(lx390_motor_w);
|
||||
DECLARE_READ8_MEMBER(lx390_reset_bank);
|
||||
DECLARE_READ8_MEMBER(lx390_fdc_r);
|
||||
DECLARE_WRITE8_MEMBER(lx390_fdc_w);
|
||||
|
||||
void z80net(machine_config &config);
|
||||
void z80netf(machine_config &config);
|
||||
void z80ne(machine_config &config);
|
||||
void z80netb(machine_config &config);
|
||||
void z80ne_io(address_map &map);
|
||||
@ -159,19 +133,12 @@ public:
|
||||
void z80net_io(address_map &map);
|
||||
void z80net_mem(address_map &map);
|
||||
void z80netb_mem(address_map &map);
|
||||
void z80netf_io(address_map &map);
|
||||
void z80netf_mem(address_map &map);
|
||||
protected:
|
||||
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
|
||||
|
||||
required_device<cpu_device> m_maincpu;
|
||||
optional_device<floppy_connector> m_floppy0;
|
||||
optional_device<floppy_connector> m_floppy1;
|
||||
optional_device<floppy_connector> m_floppy2;
|
||||
optional_device<floppy_connector> m_floppy3;
|
||||
required_device<cassette_image_device> m_cassette1;
|
||||
required_device<cassette_image_device> m_cassette2;
|
||||
optional_device<fd1771_device> m_wd1771;
|
||||
required_memory_region m_region_z80ne;
|
||||
optional_memory_bank m_bank1;
|
||||
optional_memory_bank m_bank2;
|
||||
@ -183,16 +150,9 @@ protected:
|
||||
required_ioport m_io_rst;
|
||||
required_ioport m_io_lx_385;
|
||||
optional_ioport m_io_lx387_brk;
|
||||
optional_ioport m_io_x0;
|
||||
optional_ioport m_io_x1;
|
||||
optional_ioport m_io_x2;
|
||||
optional_ioport m_io_x3;
|
||||
optional_ioport m_io_x4;
|
||||
optional_ioport m_io_x5;
|
||||
optional_ioport m_io_x6;
|
||||
optional_ioport m_io_x7;
|
||||
optional_ioport m_io_modifiers;
|
||||
optional_ioport m_io_config;
|
||||
output_finder<8> m_lx383_digits;
|
||||
|
||||
emu_timer *m_timer_nmi;
|
||||
emu_timer *m_timer_reset;
|
||||
@ -200,7 +160,47 @@ protected:
|
||||
cassette_image_device *cassette_device_image();
|
||||
void reset_lx387();
|
||||
void reset_lx382_banking();
|
||||
};
|
||||
|
||||
class z80netf_state : public z80ne_state
|
||||
{
|
||||
struct wd17xx_state_t
|
||||
{
|
||||
int drq;
|
||||
int intrq;
|
||||
uint8_t drive; /* current drive */
|
||||
uint8_t head; /* current head */
|
||||
};
|
||||
|
||||
public:
|
||||
z80netf_state(const machine_config &mconfig, device_type type, const char *tag)
|
||||
: z80ne_state(mconfig, type, tag),
|
||||
m_floppy(*this, "wd1771:%u", 0U),
|
||||
m_wd1771(*this, "wd1771"),
|
||||
m_drv_led(*this, "drv%u", 0U)
|
||||
{
|
||||
}
|
||||
|
||||
DECLARE_DRIVER_INIT(z80netf);
|
||||
void z80netf(machine_config &config);
|
||||
private:
|
||||
void z80netf_io(address_map &map);
|
||||
void z80netf_mem(address_map &map);
|
||||
|
||||
DECLARE_MACHINE_START(z80netf);
|
||||
DECLARE_MACHINE_RESET(z80netf);
|
||||
|
||||
DECLARE_WRITE8_MEMBER(lx390_motor_w);
|
||||
DECLARE_READ8_MEMBER(lx390_reset_bank);
|
||||
DECLARE_READ8_MEMBER(lx390_fdc_r);
|
||||
DECLARE_WRITE8_MEMBER(lx390_fdc_w);
|
||||
|
||||
void reset_lx390_banking();
|
||||
|
||||
required_device_array<floppy_connector, 4> m_floppy;
|
||||
required_device<fd1771_device> m_wd1771;
|
||||
wd17xx_state_t m_wd17xx_state;
|
||||
output_finder<2> m_drv_led;
|
||||
};
|
||||
|
||||
#endif // MAME_INCLUDES_Z80NE_H
|
||||
|
||||
@ -87,7 +87,7 @@ DRIVER_INIT_MEMBER(z80ne_state,z80netb)
|
||||
{
|
||||
}
|
||||
|
||||
DRIVER_INIT_MEMBER(z80ne_state,z80netf)
|
||||
DRIVER_INIT_MEMBER(z80netf_state,z80netf)
|
||||
{
|
||||
/* first two entries point to rom on reset */
|
||||
uint8_t *RAM = m_region_z80ne->base();
|
||||
@ -181,7 +181,7 @@ void z80ne_state::reset_lx382_banking()
|
||||
m_timer_reset->adjust(m_maincpu->cycles_to_attotime(2));
|
||||
}
|
||||
|
||||
void z80ne_state::reset_lx390_banking()
|
||||
void z80netf_state::reset_lx390_banking()
|
||||
{
|
||||
switch (m_io_config->read() & 0x07)
|
||||
{
|
||||
@ -307,7 +307,7 @@ MACHINE_RESET_MEMBER(z80ne_state,z80netb)
|
||||
reset_lx387();
|
||||
}
|
||||
|
||||
MACHINE_RESET_MEMBER(z80ne_state,z80netf)
|
||||
MACHINE_RESET_MEMBER(z80netf_state,z80netf)
|
||||
{
|
||||
LOG("In machine_reset z80netf\n");
|
||||
reset_lx390_banking();
|
||||
@ -344,6 +344,8 @@ MACHINE_START_MEMBER(z80ne_state,z80ne)
|
||||
m_timer_nmi = timer_alloc(0);
|
||||
m_timer_reset = timer_alloc(1);
|
||||
|
||||
m_lx383_digits.resolve();
|
||||
|
||||
m_lx385_ctrl = 0x1f;
|
||||
save_item(NAME(m_lx383_scan_counter));
|
||||
save_item(NAME(m_lx383_downsampler));
|
||||
@ -365,10 +367,12 @@ MACHINE_START_MEMBER(z80ne_state,z80netb)
|
||||
LOG("In MACHINE_START z80netb\n");
|
||||
}
|
||||
|
||||
MACHINE_START_MEMBER(z80ne_state,z80netf)
|
||||
MACHINE_START_MEMBER(z80netf_state,z80netf)
|
||||
{
|
||||
MACHINE_START_CALL_MEMBER( z80net );
|
||||
LOG("In MACHINE_START z80netf\n");
|
||||
|
||||
m_drv_led.resolve();
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
@ -426,7 +430,7 @@ WRITE8_MEMBER(z80ne_state::lx383_w)
|
||||
*/
|
||||
|
||||
if ( offset < 8 )
|
||||
output().set_digit_value( offset, data ^ 0xff );
|
||||
m_lx383_digits[offset] = data ^ 0xff;
|
||||
else
|
||||
{
|
||||
// after writing to port 0xF8 and the first ~M1 cycles strike a NMI for single step execution
|
||||
@ -604,7 +608,7 @@ READ8_MEMBER(z80ne_state::lx388_read_field_sync)
|
||||
*
|
||||
*/
|
||||
|
||||
WRITE8_MEMBER(z80ne_state::lx390_motor_w)
|
||||
WRITE8_MEMBER(z80netf_state::lx390_motor_w)
|
||||
{
|
||||
/* Selection of drive and parameters
|
||||
A write also causes the selected drive motor to turn on for about 3 seconds.
|
||||
@ -620,10 +624,9 @@ WRITE8_MEMBER(z80ne_state::lx390_motor_w)
|
||||
|
||||
floppy_image_device *floppy = nullptr;
|
||||
|
||||
if (BIT(data, 0)) floppy = m_floppy0->get_device();
|
||||
if (BIT(data, 1)) floppy = m_floppy1->get_device();
|
||||
if (BIT(data, 2)) floppy = m_floppy2->get_device();
|
||||
if (BIT(data, 3)) floppy = m_floppy3->get_device();
|
||||
for (int f = 0; f < 4; f++)
|
||||
if (BIT(data, f))
|
||||
floppy = m_floppy[f]->get_device();
|
||||
|
||||
m_wd1771->set_floppy(floppy);
|
||||
|
||||
@ -639,12 +642,12 @@ WRITE8_MEMBER(z80ne_state::lx390_motor_w)
|
||||
/* no drive selected, turn off all leds */
|
||||
if (!m_wd17xx_state.drive)
|
||||
{
|
||||
output().set_value("drv0", 0);
|
||||
output().set_value("drv1", 0);
|
||||
m_drv_led[0] = 0;
|
||||
m_drv_led[1] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
READ8_MEMBER(z80ne_state::lx390_reset_bank)
|
||||
READ8_MEMBER(z80netf_state::lx390_reset_bank)
|
||||
{
|
||||
offs_t pc;
|
||||
|
||||
@ -662,7 +665,7 @@ READ8_MEMBER(z80ne_state::lx390_reset_bank)
|
||||
return 0xff;
|
||||
}
|
||||
|
||||
READ8_MEMBER(z80ne_state::lx390_fdc_r)
|
||||
READ8_MEMBER(z80netf_state::lx390_fdc_r)
|
||||
{
|
||||
uint8_t d;
|
||||
|
||||
@ -698,7 +701,7 @@ READ8_MEMBER(z80ne_state::lx390_fdc_r)
|
||||
return d;
|
||||
}
|
||||
|
||||
WRITE8_MEMBER(z80ne_state::lx390_fdc_w)
|
||||
WRITE8_MEMBER(z80netf_state::lx390_fdc_w)
|
||||
{
|
||||
uint8_t d;
|
||||
|
||||
@ -709,9 +712,9 @@ WRITE8_MEMBER(z80ne_state::lx390_fdc_w)
|
||||
LOG("lx390_fdc_w, WD17xx command: %02x\n", d);
|
||||
m_wd1771->cmd_w(space, offset, d ^ 0xff);
|
||||
if (m_wd17xx_state.drive & 1)
|
||||
output().set_value("drv0", 2);
|
||||
m_drv_led[0] = 2;
|
||||
else if (m_wd17xx_state.drive & 2)
|
||||
output().set_value("drv1", 2);
|
||||
m_drv_led[1] = 2;
|
||||
break;
|
||||
case 1:
|
||||
LOG("lx390_fdc_w, WD17xx track: %02x\n", d);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user