Gerold55
/
mame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(nw) more small tidyups of some of my drivers

master
Robbbert 2017-11-10 03:55:18 +11:00
parent be0729de3e
commit 95232ad440
9 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mame/drivers/altair.cpp
View File

@ -51,14 +51,14 @@ private:
static ADDRESS_MAP_START(altair_mem, AS_PROGRAM, 8, altair_state)
static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, altair_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE( 0x0000, 0xfcff ) AM_RAM AM_SHARE("ram")
AM_RANGE( 0xfd00, 0xfdff ) AM_ROM
AM_RANGE( 0xff00, 0xffff ) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START(altair_io, AS_IO, 8, altair_state)
static ADDRESS_MAP_START(io_map, AS_IO, 8, altair_state)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
// TODO: Remove AM_MIRROR() and use SIO address S0-S7
@ -94,8 +94,8 @@ void altair_state::machine_reset()
static MACHINE_CONFIG_START( altair )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(altair_mem)
MCFG_CPU_IO_MAP(altair_io)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
/* video hardware */
MCFG_DEVICE_ADD("acia", ACIA6850, 0)

8
src/mame/drivers/altos5.cpp
View File

@ -66,7 +66,7 @@ private:
required_device<floppy_connector> m_floppy1;
};
static ADDRESS_MAP_START(altos5_mem, AS_PROGRAM, 8, altos5_state)
static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, altos5_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE( 0x0000, 0x0fff ) AM_READ_BANK("bankr0") AM_WRITE_BANK("bankw0")
AM_RANGE( 0x1000, 0x1fff ) AM_READ_BANK("bankr1") AM_WRITE_BANK("bankw1")
@ -86,7 +86,7 @@ static ADDRESS_MAP_START(altos5_mem, AS_PROGRAM, 8, altos5_state)
AM_RANGE( 0xf000, 0xffff ) AM_READ_BANK("bankrf") AM_WRITE_BANK("bankwf")
ADDRESS_MAP_END
static ADDRESS_MAP_START(altos5_io, AS_IO, 8, altos5_state)
static ADDRESS_MAP_START(io_map, AS_IO, 8, altos5_state)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("dma", z80dma_device, read, write)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("fdc", fd1797_device, read, write)
@ -347,8 +347,8 @@ DRIVER_INIT_MEMBER( altos5_state, altos5 )
static MACHINE_CONFIG_START( altos5 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(altos5_mem)
MCFG_CPU_IO_MAP(altos5_io)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_8MHz / 4) // 2MHz

13
src/mame/drivers/codata.cpp
View File

@ -21,11 +21,10 @@ class codata_state : public driver_device
{
public:
codata_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_p_base(*this, "rambase"),
m_maincpu(*this, "maincpu")
{
}
: driver_device(mconfig, type, tag)
, m_p_base(*this, "rambase")
, m_maincpu(*this, "maincpu")
{ }
private:
virtual void machine_reset() override;
@ -33,7 +32,7 @@ private:
required_device<cpu_device> m_maincpu;
};
static ADDRESS_MAP_START(codata_mem, AS_PROGRAM, 16, codata_state)
static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 16, codata_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x1fffff) AM_RAM AM_SHARE("rambase")
AM_RANGE(0x200000, 0x203fff) AM_ROM AM_REGION("user1", 0);
@ -63,7 +62,7 @@ void codata_state::machine_reset()
static MACHINE_CONFIG_START( codata )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(codata_mem)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("uart", UPD7201_NEW, XTAL_16MHz / 4)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs423a", rs232_port_device, write_txd))

30
src/mame/drivers/d6809.cpp
View File

@ -87,25 +87,25 @@ devices.
#include "machine/mos6551.h"
#include "machine/terminal.h"
#define TERMINAL_TAG "terminal"
class d6809_state : public driver_device
{
public:
d6809_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_terminal(*this, TERMINAL_TAG)
{
}
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_terminal(*this, "terminal")
{ }
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
void kbd_put(u8 data);
DECLARE_READ8_MEMBER( term_r );
DECLARE_WRITE8_MEMBER( term_w );
void kbd_put(u8 data);
private:
uint8_t m_term_data;
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
};
READ8_MEMBER( d6809_state::term_r )
@ -121,14 +121,14 @@ WRITE8_MEMBER( d6809_state::term_w )
m_terminal->write(space, 0, data);
}
static ADDRESS_MAP_START( d6809_mem, AS_PROGRAM, 8, d6809_state )
static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, d6809_state )
ADDRESS_MAP_UNMAP_HIGH
// 00-FF is for various devices.
AM_RANGE(0x0000, 0x0003) AM_DEVREADWRITE("acia1", mos6551_device, read, write)
AM_RANGE(0x0004, 0x0007) AM_DEVREADWRITE("acia2", mos6551_device, read, write)
AM_RANGE(0x00ff, 0x00ff) AM_READWRITE(term_r,term_w)
AM_RANGE(0x1000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_ROM
AM_RANGE(0xe000, 0xffff) AM_ROM AM_REGION("roms", 0)
ADDRESS_MAP_END
@ -150,20 +150,20 @@ void d6809_state::machine_reset()
static MACHINE_CONFIG_START( d6809 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_14_7456MHz / 8) // MC68B09EP
MCFG_CPU_PROGRAM_MAP(d6809_mem)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("acia1", MOS6551, XTAL_14_7456MHz / 8) // uses Q clock
MCFG_DEVICE_ADD("acia2", MOS6551, XTAL_14_7456MHz / 8) // uses Q clock
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(d6809_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
ROM_START( d6809 )
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "d6809.rom", 0xe000, 0x2000, CRC(2ceb40b8) SHA1(780111541234b4f0f781a118d955df61daa56e7e))
ROM_REGION( 0x2000, "roms", 0 )
ROM_LOAD( "d6809.rom", 0x0000, 0x2000, CRC(2ceb40b8) SHA1(780111541234b4f0f781a118d955df61daa56e7e))
ROM_END
/* Driver */

20
src/mame/drivers/dual68.cpp
View File

@ -12,6 +12,7 @@
#include "cpu/m68000/m68000.h"
#include "cpu/i8085/i8085.h"
//#include "bus/s100/s100.h"
#include "machine/i8251.h"
#include "machine/terminal.h"
@ -26,7 +27,7 @@ public:
{ }
void kbd_put(u8 data);
DECLARE_WRITE16_MEMBER(dual68_terminal_w);
DECLARE_WRITE16_MEMBER(terminal_w);
private:
virtual void machine_reset() override;
@ -38,7 +39,7 @@ private:
WRITE16_MEMBER( dual68_state::dual68_terminal_w )
WRITE16_MEMBER( dual68_state::terminal_w )
{
m_terminal->write(space, 0, data >> 8);
}
@ -47,7 +48,7 @@ static ADDRESS_MAP_START(dual68_mem, AS_PROGRAM, 16, dual68_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x0000ffff) AM_RAM AM_SHARE("ram")
AM_RANGE(0x00080000, 0x00081fff) AM_ROM AM_REGION("user1",0)
AM_RANGE(0x007f0000, 0x007f0001) AM_WRITE(dual68_terminal_w)
AM_RANGE(0x007f0000, 0x007f0001) AM_WRITE(terminal_w)
AM_RANGE(0x00800000, 0x00801fff) AM_ROM AM_REGION("user1",0)
ADDRESS_MAP_END
@ -59,6 +60,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(sio4_io, AS_IO, 8, dual68_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x22, 0x22) AM_DEVREADWRITE("uart1", i8251_device, status_r, control_w)
AM_RANGE(0x23, 0x23) AM_DEVREADWRITE("uart1", i8251_device, data_r, data_w)
AM_RANGE(0x2a, 0x2a) AM_DEVREADWRITE("uart2", i8251_device, status_r, control_w)
AM_RANGE(0x2b, 0x2b) AM_DEVREADWRITE("uart2", i8251_device, data_r, data_w)
AM_RANGE(0x32, 0x32) AM_DEVREADWRITE("uart3", i8251_device, status_r, control_w)
AM_RANGE(0x33, 0x33) AM_DEVREADWRITE("uart3", i8251_device, data_r, data_w)
AM_RANGE(0x3a, 0x3a) AM_DEVREADWRITE("uart4", i8251_device, status_r, control_w)
AM_RANGE(0x3b, 0x3b) AM_DEVREADWRITE("uart4", i8251_device, data_r, data_w)
ADDRESS_MAP_END
/* Input ports */
@ -92,6 +101,11 @@ static MACHINE_CONFIG_START( dual68 )
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(dual68_state, kbd_put))
MCFG_DEVICE_ADD("uart1", I8251, 0)
MCFG_DEVICE_ADD("uart2", I8251, 0)
MCFG_DEVICE_ADD("uart3", I8251, 0)
MCFG_DEVICE_ADD("uart4", I8251, 0)
MACHINE_CONFIG_END
/* ROM definition */

4
src/mame/drivers/ft68m.cpp
View File

@ -46,7 +46,7 @@ READ16_MEMBER( ft68m_state::switches_r )
}
static ADDRESS_MAP_START(ft68m_mem, AS_PROGRAM, 16, ft68m_state)
static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 16, ft68m_state)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xffffff)
AM_RANGE(0x000000, 0x1fffff) AM_RAM AM_SHARE("rambase")
@ -82,7 +82,7 @@ static MACHINE_CONFIG_START( ft68m )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_19_6608MHz / 2)
MCFG_CPU_PROGRAM_MAP(ft68m_mem)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, 0)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))

14
src/mame/drivers/jade.cpp
View File

@ -38,13 +38,13 @@ private:
};
static ADDRESS_MAP_START(jade_mem, AS_PROGRAM, 8, jade_state)
static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, jade_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x07ff) AM_ROM AM_REGION("roms", 0)
AM_RANGE(0x0800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START(jade_io, AS_IO, 8, jade_state)
static ADDRESS_MAP_START(io_map, AS_IO, 8, jade_state)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x28, 0x2b) AM_DEVREADWRITE("ctc2", z80ctc_device, read, write)
@ -60,8 +60,8 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( jade )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(jade_mem)
MCFG_CPU_IO_MAP(jade_io)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_4MHz)
@ -85,12 +85,12 @@ static MACHINE_CONFIG_START( jade )
MACHINE_CONFIG_END
/* ROM definition */
ROM_START( jade )
ROM_START( jgz80 )
ROM_REGION( 0x800, "roms", 0 )
ROM_LOAD( "jgz80.rom", 0x0000, 0x0800, CRC(90c4a1ef) SHA1(8a93a11051cc27f3edca24f0f4297ebe0099964e) )
ROM_END
/* Driver */
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1983, jade, 0, 0, jade, jade, jade_state, 0, "Jade Computer Products", "JGZ80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1983, jgz80, 0, 0, jade, jade, jade_state, 0, "Jade Computer Products", "JGZ80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )

12
src/mame/drivers/seattlecmp.cpp
View File

@ -64,13 +64,13 @@ READ8_MEMBER(seattle_comp_state::pic_slave_ack)
}
static ADDRESS_MAP_START(seattle_mem, AS_PROGRAM, 16, seattle_comp_state)
static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 16, seattle_comp_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000,0xff7ff) AM_RAM
AM_RANGE(0xff800,0xfffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
static ADDRESS_MAP_START(seattle_io, AS_IO, 16, seattle_comp_state)
static ADDRESS_MAP_START(io_map, AS_IO, 16, seattle_comp_state)
//ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf1) AM_DEVREADWRITE8("pic1", pic8259_device, read, write, 0xffff)
@ -100,8 +100,8 @@ DEVICE_INPUT_DEFAULTS_END
static MACHINE_CONFIG_START( seattle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, XTAL_24MHz / 3) // 8 MHz or 4 MHz selectable
MCFG_CPU_PROGRAM_MAP(seattle_mem)
MCFG_CPU_IO_MAP(seattle_io)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic1", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic1", PIC8259, 0)
@ -135,7 +135,7 @@ static MACHINE_CONFIG_START( seattle )
MACHINE_CONFIG_END
/* ROM definition */
ROM_START( seattle )
ROM_START( scp300f )
ROM_REGION( 0x800, "user1", 0 )
ROM_LOAD( "mon86 v1.5tdd", 0x0000, 0x0800, CRC(7db23169) SHA1(c791b02ca33a4e1f8e95eb541624a59738f378c4))
ROM_END
@ -143,4 +143,4 @@ ROM_END
/* Driver */
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1986, seattle, 0, 0, seattle, seattle, seattle_comp_state, 0, "Seattle Computer", "SCP-300F", MACHINE_NO_SOUND_HW )
COMP( 1986, scp300f, 0, 0, seattle, seattle, seattle_comp_state, 0, "Seattle Computer", "SCP-300F", MACHINE_NO_SOUND_HW )

4
src/mame/mame.lst
View File

@ -15514,7 +15514,7 @@ jackie // (c) 1993 IGS
jackpool // (c) 1997 Electronic Projects
@source:jade.cpp
jade //
jgz80 // Jade JGZ-80
@source:jaguar.cpp
a51mxr3k // ?? (c) 1998
@ -33244,7 +33244,7 @@ vaportrxp // (c) 1998 Atari Games
wg3dh // (c) 1996 Atari Games
@source:seattlecmp.cpp
seattle //
scp300f // Seattle SCP-300F
@source:sega_sawatte.cpp
sawatte //