From 88301a04eac3eb86339a433c966e4aef2efd95e0 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Thu, 9 Nov 2017 17:01:05 +1100 Subject: [PATCH] (nw) minor tidyup of some of my drivers --- src/mame/drivers/amust.cpp | 8 ++++---- src/mame/drivers/argo.cpp | 34 +++++++++++++++++----------------- src/mame/drivers/chaos.cpp | 16 ++++++++-------- src/mame/drivers/cortex.cpp | 7 ++++--- src/mame/drivers/ec65.cpp | 10 +++++----- src/mame/drivers/elekscmp.cpp | 29 ++++++++++++++--------------- src/mame/drivers/et3400.cpp | 34 +++++++++++++++++----------------- src/mame/drivers/eti660.cpp | 8 ++++---- src/mame/drivers/evmbug.cpp | 20 +++++++++----------- src/mame/drivers/excali64.cpp | 8 ++++---- src/mame/drivers/g627.cpp | 8 ++++---- src/mame/drivers/grfd2301.cpp | 8 ++++---- src/mame/drivers/h19.cpp | 8 ++++---- src/mame/drivers/ibm3153.cpp | 8 ++++---- src/mame/drivers/instruct.cpp | 12 ++++++------ src/mame/drivers/m6805evs.cpp | 4 ++-- src/mame/drivers/mits680b.cpp | 4 ++-- src/mame/drivers/mk14.cpp | 4 ++-- src/mame/drivers/modellot.cpp | 8 ++++---- src/mame/drivers/ms9540.cpp | 18 ++++++++---------- src/mame/drivers/pencil2.cpp | 8 ++++---- src/mame/drivers/pimps.cpp | 8 ++++---- src/mame/drivers/savia84.cpp | 8 ++++---- src/mame/drivers/tvgame.cpp | 8 ++++---- src/mame/drivers/z80dev.cpp | 21 +++++++++++---------- src/mame/drivers/zrt80.cpp | 8 ++++---- 26 files changed, 157 insertions(+), 160 deletions(-) diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index 356d465ccb3..8fce7406fb8 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -172,13 +172,13 @@ void amust_state::device_timer(emu_timer &timer, device_timer_id id, int param, // floppy->ss_w(BIT(data, 4)); //} -static ADDRESS_MAP_START(amust_mem, AS_PROGRAM, 8, amust_state) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, amust_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xffff) AM_READ_BANK("bankr0") AM_WRITE_BANK("bankw0") ADDRESS_MAP_END -static ADDRESS_MAP_START(amust_io, AS_IO, 8, amust_state) +static ADDRESS_MAP_START( io_map, AS_IO, 8, amust_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) //AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("uart1", i8251_device, data_r, data_w) @@ -393,8 +393,8 @@ DRIVER_INIT_MEMBER( amust_state, amust ) static MACHINE_CONFIG_START( amust ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4) - MCFG_CPU_PROGRAM_MAP(amust_mem) - MCFG_CPU_IO_MAP(amust_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", amust_state, irq_vs) MCFG_MACHINE_RESET_OVERRIDE(amust_state, amust) diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp index 8288c247d1c..11fbeda0fcd 100644 --- a/src/mame/drivers/argo.cpp +++ b/src/mame/drivers/argo.cpp @@ -2,24 +2,24 @@ // copyright-holders:Robbbert /*************************************************************************** - Argo +Argo - 16/03/2011 Skeleton driver. +2011-03-16 Skeleton driver. - Some info obtained from EMU-80. - There are no manuals, diagrams, or anything else available afaik. - The entire driver is guesswork. +Some info obtained from EMU-80. +There are no manuals, diagrams, or anything else available afaik. +The entire driver is guesswork. - The monitor will only allow certain characters to be typed, thus the - modifier keys appear to do nothing. There is no need to use the enter - key; using spacebar and the correct parameters is enough. +The monitor will only allow certain characters to be typed, thus the +modifier keys appear to do nothing. There is no need to use the enter +key; using spacebar and the correct parameters is enough. - Commands: same as UNIOR +Commands: same as UNIOR - ToDo: - - Add devices - - There is no obvious evidence of sound. - - Cassette UART on ports C1 and C3. +ToDo: +- Add devices +- There is no obvious evidence of sound. +- Cassette UART on ports C1 and C3. ****************************************************************************/ @@ -141,7 +141,7 @@ WRITE8_MEMBER(argo_state::argo_io_w) -static ADDRESS_MAP_START(argo_mem, AS_PROGRAM, 8, argo_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, argo_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("boot") AM_RANGE(0x0800, 0xf7af) AM_RAM @@ -149,7 +149,7 @@ static ADDRESS_MAP_START(argo_mem, AS_PROGRAM, 8, argo_state) AM_RANGE(0xf800, 0xffff) AM_ROM AM_WRITE(argo_videoram_w) ADDRESS_MAP_END -static ADDRESS_MAP_START(argo_io, AS_IO, 8, argo_state) +static ADDRESS_MAP_START(io_map, AS_IO, 8, argo_state) AM_RANGE(0x0000, 0xFFFF) AM_READWRITE(argo_io_r,argo_io_w) ADDRESS_MAP_END @@ -345,8 +345,8 @@ uint32_t argo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, static MACHINE_CONFIG_START( argo ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3500000) - MCFG_CPU_PROGRAM_MAP(argo_mem) - MCFG_CPU_IO_MAP(argo_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/chaos.cpp b/src/mame/drivers/chaos.cpp index a7057551c45..72a19e5558f 100644 --- a/src/mame/drivers/chaos.cpp +++ b/src/mame/drivers/chaos.cpp @@ -4,8 +4,8 @@ Chaos2 - 08/04/2010 Skeleton driver. - 19/05/2012 Connected to a terminal, system is usable [Robbbert] + 2010-04-08 Skeleton driver. + 2012-05-19 Connected to a terminal, system is usable [Robbbert] This is a homebrew system: http://koo.corpus.cam.ac.uk/chaos/ @@ -60,12 +60,12 @@ private: }; -static ADDRESS_MAP_START( chaos_mem, AS_PROGRAM, 8, chaos_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, chaos_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x7fff) AM_RAM AM_SHARE("ram") ADDRESS_MAP_END -static ADDRESS_MAP_START( chaos_io, AS_IO, 8, chaos_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, chaos_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x1e, 0x1e) AM_READ(port1e_r) AM_RANGE(0x1f, 0x1f) AM_READWRITE(port90_r, port1f_w) @@ -74,7 +74,7 @@ static ADDRESS_MAP_START( chaos_io, AS_IO, 8, chaos_state ) AM_RANGE(0x92, 0x92) AM_DEVWRITE("terminal", generic_terminal_device, write) ADDRESS_MAP_END -static ADDRESS_MAP_START( chaos_data, AS_DATA, 8, chaos_state ) +static ADDRESS_MAP_START( data_map, AS_DATA, 8, chaos_state ) AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_NOP // stops error log filling up while using debug ADDRESS_MAP_END @@ -144,9 +144,9 @@ void chaos_state::machine_reset() static MACHINE_CONFIG_START( chaos ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, XTAL_1MHz) - MCFG_CPU_PROGRAM_MAP(chaos_mem) - MCFG_CPU_IO_MAP(chaos_io) - MCFG_CPU_DATA_MAP(chaos_data) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) + MCFG_CPU_DATA_MAP(data_map) /* video hardware */ MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) diff --git a/src/mame/drivers/cortex.cpp b/src/mame/drivers/cortex.cpp index a92bb5ddf7b..fa58541dee1 100644 --- a/src/mame/drivers/cortex.cpp +++ b/src/mame/drivers/cortex.cpp @@ -37,12 +37,13 @@ public: , m_p_ram(*this, "ram") { } +private: virtual void machine_reset() override; required_device m_maincpu; required_shared_ptr m_p_ram; }; -static ADDRESS_MAP_START( cortex_mem, AS_PROGRAM, 8, cortex_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, cortex_state ) AM_RANGE(0x0000, 0xefff) AM_RAM AM_SHARE("ram") AM_RANGE(0xf100, 0xf11f) AM_RAM // memory mapping unit AM_RANGE(0xf120, 0xf120) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) @@ -50,7 +51,7 @@ static ADDRESS_MAP_START( cortex_mem, AS_PROGRAM, 8, cortex_state ) //AM_RANGE(0xf140, 0xf147) // fdc tms9909 ADDRESS_MAP_END -static ADDRESS_MAP_START( cortex_io, AS_IO, 8, cortex_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, cortex_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x000f) AM_MIRROR(0x0030) AM_DEVWRITE("control", ls259_device, write_a0) //AM_RANGE(0x0000, 0x000f) AM_MIRROR(0x0020) AM_READ(pio_r) @@ -81,7 +82,7 @@ static MACHINE_CONFIG_START( cortex ) /* TMS9995 CPU @ 12.0 MHz */ // Standard variant, no overflow int // No lines connected yet - MCFG_TMS99xx_ADD("maincpu", TMS9995, 12000000, cortex_mem, cortex_io) + MCFG_TMS99xx_ADD("maincpu", TMS9995, 12000000, mem_map, io_map) MCFG_DEVICE_ADD("control", LS259, 0) // IC64 //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cortex_state, basic_led_w)) diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp index 49d04fa7788..2fcafbf67fe 100644 --- a/src/mame/drivers/ec65.cpp +++ b/src/mame/drivers/ec65.cpp @@ -2,9 +2,9 @@ // copyright-holders:Miodrag Milanovic, Robbbert /*************************************************************************** - EC-65 +EC-65 (also known as Octopus) - 16/07/2009 Initial driver. +2009-07-16 Initial driver. ****************************************************************************/ @@ -239,10 +239,10 @@ ROM_START( ec65k ) ROM_LOAD( "ec65k.ic19", 0xf000, 0x1000, CRC(5e5a890a) SHA1(daa006f2179fd156833e11c73b37881cafe5dede)) ROM_REGION( 0x1000, "chargen", 0 ) - ROM_LOAD( "chargen.ic19", 0x0000, 0x1000, CRC(9b56a28d) SHA1(41c04fd9fb542c50287bc0e366358a61fc4b0cd4)) // Located on VDU card + ROM_LOAD( "chargen.ic19", 0x0000, 0x1000, CRC(9b56a28d) SHA1(41c04fd9fb542c50287bc0e366358a61fc4b0cd4)) // Located on VDU card, suspect bad dump ROM_END /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ -COMP( 1985, ec65, 0, 0, ec65, ec65, ec65_state, 0, "Elektor Electronics", "EC-65", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) -COMP( 1985, ec65k, ec65, 0, ec65k, ec65, ec65k_state, 0, "Elektor Electronics", "EC-65K", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) +COMP( 1985, ec65, 0, 0, ec65, ec65, ec65_state, 0, "Elektor Electronics", "EC-65", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW) +COMP( 1985, ec65k, ec65, 0, ec65k, ec65, ec65k_state, 0, "Elektor Electronics", "EC-65K", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW) diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp index bf5b9882a55..7813e4d8d6f 100644 --- a/src/mame/drivers/elekscmp.cpp +++ b/src/mame/drivers/elekscmp.cpp @@ -2,11 +2,10 @@ // copyright-holders:Miodrag Milanovic, Robbbert /*************************************************************************** - Elektor SC/MP +Elektor SC/MP - 22/11/2009 Skeleton driver. - - 10/MAY/2012 Added keyboard [Robbbert] +2009-11-22 Skeleton driver. +2012-05-10 Added keyboard [Robbbert] To Use: - Press MINUS to enter data input mode @@ -33,18 +32,19 @@ class elekscmp_state : public driver_device { public: elekscmp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_x0(*this, "X0"), - m_x1(*this, "X1"), - m_x2(*this, "X2"), - m_x3(*this, "X3") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_x0(*this, "X0") + , m_x1(*this, "X1") + , m_x2(*this, "X2") + , m_x3(*this, "X3") + { } DECLARE_READ8_MEMBER(keyboard_r); DECLARE_WRITE8_MEMBER(hex_display_w); uint8_t convert_key(uint8_t data); -protected: +private: required_device m_maincpu; required_ioport m_x0; required_ioport m_x1; @@ -60,8 +60,7 @@ WRITE8_MEMBER(elekscmp_state::hex_display_w) uint8_t elekscmp_state::convert_key(uint8_t data) { - uint8_t i; - for (i = 0; i < 8; i++) + for (u8 i = 0; i < 8; i++) if (BIT(data, i)) return i; @@ -95,7 +94,7 @@ READ8_MEMBER(elekscmp_state::keyboard_r) return 0; } -static ADDRESS_MAP_START(elekscmp_mem, AS_PROGRAM, 8, elekscmp_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, elekscmp_state) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x0fff) AM_RANGE(0x000, 0x5ff) AM_ROM // ROM @@ -144,7 +143,7 @@ INPUT_PORTS_END static MACHINE_CONFIG_START( elekscmp ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",INS8060, XTAL_4MHz) - MCFG_CPU_PROGRAM_MAP(elekscmp_mem) + MCFG_CPU_PROGRAM_MAP(mem_map) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_elekscmp) diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index ba098e30954..4481aed35dd 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -2,23 +2,23 @@ // copyright-holders:Robbbert /*************************************************************************** - ET-3400 +ET-3400 - 2009-05-12 Skeleton driver. - 2016-04-29 Added Accessory. +2009-05-12 Skeleton driver. +2016-04-29 Added Accessory. - ETA-3400 Memory I/O Accessory - - Provides Tiny Basic, a Terminal, a Serial Interface, a Cassette - interface, and 1k to 4k of expansion RAM. All parts are working. - - The roms are U105 (Monitor), U106 (Tiny Basic), both type NMOS2316E, - and U108 (address decoder PROM). - - Navigating: - LED to Monitor: D1400 - Monitor to Basic: G 1C00 - Monitor to LED: G FC00 - Basic to Monitor: BYE - - All commands in Basic and Monitor are UPPERCASE only. - - Terminal is defaulted to 9600 baud, 7 bits, 2 stop bits. +ETA-3400 Memory I/O Accessory +- Provides Tiny Basic, a Terminal, a Serial Interface, a Cassette + interface, and 1k to 4k of expansion RAM. All parts are working. +- The roms are U105 (Monitor), U106 (Tiny Basic), both type NMOS2316E, + and U108 (address decoder PROM). +- Navigating: + LED to Monitor: D1400 + Monitor to Basic: G 1C00 + Monitor to LED: G FC00 + Basic to Monitor: BYE +- All commands in Basic and Monitor are UPPERCASE only. +- Terminal is defaulted to 9600 baud, 7 bits, 2 stop bits. ****************************************************************************/ @@ -118,7 +118,7 @@ WRITE8_MEMBER( et3400_state::pia_bw ) } -static ADDRESS_MAP_START(et3400_mem, AS_PROGRAM, 8, et3400_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, et3400_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x0fff ) AM_RAM AM_RANGE( 0x1000, 0x1003 ) AM_MIRROR(0x03fc) AM_DEVREADWRITE("pia", pia6821_device, read, write) @@ -180,7 +180,7 @@ DEVICE_INPUT_DEFAULTS_END static MACHINE_CONFIG_START( et3400 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_4MHz / 4 ) // 1MHz with memory i/o accessory, or 500khz without it - MCFG_CPU_PROGRAM_MAP(et3400_mem) + MCFG_CPU_PROGRAM_MAP(mem_map) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_et3400) diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index 62b13eed4be..82781b86bd2 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -80,7 +80,7 @@ WRITE8_MEMBER( eti660_state::colorram_w ) /* Memory Maps */ -static ADDRESS_MAP_START( eti660_map, AS_PROGRAM, 8, eti660_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, eti660_state ) ADDRESS_MAP_GLOBAL_MASK(0xfff) AM_RANGE(0x0000, 0x03ff) AM_ROM AM_RANGE(0x0400, 0x047f) AM_RAM @@ -88,7 +88,7 @@ static ADDRESS_MAP_START( eti660_map, AS_PROGRAM, 8, eti660_state ) AM_RANGE(0x0600, 0x0fff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( eti660_io_map, AS_IO, 8, eti660_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, eti660_state ) AM_RANGE(0x01, 0x01) AM_DEVREADWRITE(CDP1864_TAG, cdp1864_device, dispon_r, step_bgcolor_w) AM_RANGE(0x02, 0x02) AM_READWRITE(pia_r, pia_w) AM_RANGE(0x03, 0x03) AM_WRITE(colorram_w) @@ -305,8 +305,8 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 ) static MACHINE_CONFIG_START( eti660 ) /* basic machine hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_8_867238MHz/5) - MCFG_CPU_PROGRAM_MAP(eti660_map) - MCFG_CPU_IO_MAP(eti660_io_map) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) MCFG_COSMAC_WAIT_CALLBACK(VCC) MCFG_COSMAC_CLEAR_CALLBACK(READLINE(eti660_state, clear_r)) MCFG_COSMAC_EF2_CALLBACK(READLINE(eti660_state, ef2_r)) diff --git a/src/mame/drivers/evmbug.cpp b/src/mame/drivers/evmbug.cpp index 92949083e06..f93e2da9e2d 100644 --- a/src/mame/drivers/evmbug.cpp +++ b/src/mame/drivers/evmbug.cpp @@ -15,23 +15,21 @@ #include "cpu/tms9900/tms9995.h" #include "machine/terminal.h" -#define TERMINAL_TAG "terminal" class evmbug_state : public driver_device { public: evmbug_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") + { } DECLARE_READ8_MEMBER(rs232_r); DECLARE_WRITE8_MEMBER(rs232_w); void kbd_put(u8 data); -protected: +private: virtual void machine_reset() override; uint8_t m_term_data; uint8_t m_term_out; @@ -39,12 +37,12 @@ protected: required_device m_terminal; }; -static ADDRESS_MAP_START( evmbug_mem, AS_PROGRAM, 8, evmbug_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, evmbug_state ) AM_RANGE(0x0000, 0x17ff) AM_ROM AM_RANGE(0xec00, 0xefff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( evmbug_io, AS_IO, 8, evmbug_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, evmbug_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0007) AM_WRITE(rs232_w) AM_RANGE(0x0000, 0x0002) AM_READ(rs232_r) @@ -98,10 +96,10 @@ static MACHINE_CONFIG_START( evmbug ) // basic machine hardware // TMS9995 CPU @ 12.0 MHz // We have no lines connected yet - MCFG_TMS99xx_ADD("maincpu", TMS9995, 12000000, evmbug_mem, evmbug_io ) + MCFG_TMS99xx_ADD("maincpu", TMS9995, 12000000, mem_map, io_map ) /* video hardware */ - MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) + MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(evmbug_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index 1a55acf3d5a..4d9da654a2c 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -117,7 +117,7 @@ private: required_device m_floppy1; }; -static ADDRESS_MAP_START(excali64_mem, AS_PROGRAM, 8, excali64_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, excali64_state) AM_RANGE(0x0000, 0x1FFF) AM_READ_BANK("bankr1") AM_WRITE_BANK("bankw1") AM_RANGE(0x2000, 0x2FFF) AM_READ_BANK("bankr2") AM_WRITE_BANK("bankw2") AM_RANGE(0x3000, 0x3FFF) AM_READ_BANK("bankr3") AM_WRITE_BANK("bankw3") @@ -125,7 +125,7 @@ static ADDRESS_MAP_START(excali64_mem, AS_PROGRAM, 8, excali64_state) AM_RANGE(0xC000, 0xFFFF) AM_RAM AM_REGION("rambank", 0xC000) ADDRESS_MAP_END -static ADDRESS_MAP_START(excali64_io, AS_IO, 8, excali64_state) +static ADDRESS_MAP_START(io_map, AS_IO, 8, excali64_state) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x0f) AM_READ(port00_r) AM_RANGE(0x10, 0x10) AM_MIRROR(0x0e) AM_DEVREADWRITE("uart",i8251_device, data_r, data_w) @@ -546,8 +546,8 @@ MC6845_UPDATE_ROW( excali64_state::update_row ) static MACHINE_CONFIG_START( excali64 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) - MCFG_CPU_PROGRAM_MAP(excali64_mem) - MCFG_CPU_IO_MAP(excali64_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) MCFG_MACHINE_RESET_OVERRIDE(excali64_state, excali64) diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp index 069c750b811..3c6576f272f 100644 --- a/src/mame/drivers/g627.cpp +++ b/src/mame/drivers/g627.cpp @@ -78,13 +78,13 @@ private: }; -static ADDRESS_MAP_START( g627_map, AS_PROGRAM, 8, g627_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, g627_state ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0xc000, 0xc0ff) AM_DEVREADWRITE("i8156", i8155_device, memory_r, memory_w) AM_RANGE(0xe000, 0xe0ff) AM_RAM AM_SHARE("nvram") // battery backed ADDRESS_MAP_END -static ADDRESS_MAP_START( g627_io, AS_IO, 8, g627_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, g627_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x02) AM_WRITE(disp_w) AM_RANGE(0x03, 0x07) AM_WRITE(lamp_w) @@ -289,8 +289,8 @@ WRITE8_MEMBER( g627_state::lamp_w ) static MACHINE_CONFIG_START( g627 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 14138000/8) - MCFG_CPU_PROGRAM_MAP(g627_map) - MCFG_CPU_IO_MAP(g627_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) MCFG_DEVICE_ADD("i8156", I8156, 14138000/8) MCFG_I8155_IN_PORTA_CB(READ8(g627_state, porta_r)) diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp index 09fcb7b1f2d..a4b48dbcc6c 100644 --- a/src/mame/drivers/grfd2301.cpp +++ b/src/mame/drivers/grfd2301.cpp @@ -54,13 +54,13 @@ private: required_region_ptr m_p_chargen; }; -static ADDRESS_MAP_START( grfd2301_mem, AS_PROGRAM, 8, grfd2301_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, grfd2301_state ) AM_RANGE(0xe000, 0xefff) AM_ROM AM_REGION("maincpu", 0) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("videoram") ADDRESS_MAP_END -static ADDRESS_MAP_START( grfd2301_io, AS_IO, 8, grfd2301_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, grfd2301_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_END @@ -111,8 +111,8 @@ uint32_t grfd2301_state::screen_update(screen_device &screen, bitmap_ind16 &bitm static MACHINE_CONFIG_START( grfd2301 ) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, 4000000) - MCFG_CPU_PROGRAM_MAP(grfd2301_mem) - MCFG_CPU_IO_MAP(grfd2301_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index b97cb753f85..882313b8354 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -153,14 +153,14 @@ void h19_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo -static ADDRESS_MAP_START(h19_mem, AS_PROGRAM, 8, h19_state) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, h19_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x2000) AM_ROM AM_RANGE(0x4000, 0x4100) AM_MIRROR(0x3e00) AM_RAM AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x3800) AM_RAM AM_SHARE("videoram") ADDRESS_MAP_END -static ADDRESS_MAP_START( h19_io, AS_IO, 8, h19_state) +static ADDRESS_MAP_START( io_map, AS_IO, 8, h19_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_MIRROR(0x1f) AM_READ_PORT("SW401") @@ -515,8 +515,8 @@ GFXDECODE_END static MACHINE_CONFIG_START( h19 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, H19_CLOCK) // From schematics - MCFG_CPU_PROGRAM_MAP(h19_mem) - MCFG_CPU_IO_MAP(h19_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ // TODO: make configurable, Heath offered 3 different CRTs - White, Green, Amber. diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp index 92d66ff8fea..19542cf5e7b 100644 --- a/src/mame/drivers/ibm3153.cpp +++ b/src/mame/drivers/ibm3153.cpp @@ -61,12 +61,12 @@ private: }; -static ADDRESS_MAP_START(ibm3153_mem, AS_PROGRAM, 8, ibm3153_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, ibm3153_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00000,0x0ffff) AM_ROM AM_REGION("user1", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START(ibm3153_io, AS_IO, 8, ibm3153_state) +static ADDRESS_MAP_START(io_map, AS_IO, 8, ibm3153_state) AM_RANGE(0x0000,0xffff) AM_RAM //ADDRESS_MAP_UNMAP_HIGH //ADDRESS_MAP_GLOBAL_MASK(0xff) @@ -96,8 +96,8 @@ void ibm3153_state::machine_reset() static MACHINE_CONFIG_START( ibm3153 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C32, XTAL_16MHz) // no idea of clock - MCFG_CPU_PROGRAM_MAP(ibm3153_mem) - MCFG_CPU_IO_MAP(ibm3153_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index b59b2faab31..dee933173c9 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -214,7 +214,7 @@ INTERRUPT_GEN_MEMBER( instruct_state::t2l_int ) } } -static ADDRESS_MAP_START( instruct_mem, AS_PROGRAM, 8, instruct_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, instruct_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0ffe) AM_RAM AM_SHARE("mainram") AM_RANGE(0x0fff, 0x0fff) AM_READWRITE(port_r,port_w) @@ -223,7 +223,7 @@ static ADDRESS_MAP_START( instruct_mem, AS_PROGRAM, 8, instruct_state ) AM_RANGE(0x2000, 0x7fff) AM_RAM AM_SHARE("extram") ADDRESS_MAP_END -static ADDRESS_MAP_START( instruct_io, AS_IO, 8, instruct_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, instruct_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x07, 0x07) AM_READWRITE(port_r,port_w) AM_RANGE(0xf8, 0xf8) AM_WRITE(portf8_w) @@ -234,7 +234,7 @@ static ADDRESS_MAP_START( instruct_io, AS_IO, 8, instruct_state ) AM_RANGE(0xfe, 0xfe) AM_READ(portfe_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( instruct_data, AS_DATA, 8, instruct_state ) +static ADDRESS_MAP_START( data_map, AS_DATA, 8, instruct_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE(port_r,port_w) ADDRESS_MAP_END @@ -411,9 +411,9 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct ) static MACHINE_CONFIG_START( instruct ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",S2650, XTAL_3_579545MHz / 4) - MCFG_CPU_PROGRAM_MAP(instruct_mem) - MCFG_CPU_IO_MAP(instruct_io) - MCFG_CPU_DATA_MAP(instruct_data) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) + MCFG_CPU_DATA_MAP(data_map) MCFG_CPU_PERIODIC_INT_DRIVER(instruct_state, t2l_int, 120) MCFG_S2650_SENSE_INPUT(READLINE(instruct_state, sense_r)) MCFG_S2650_FLAG_OUTPUT(WRITELINE(instruct_state, flag_w)) diff --git a/src/mame/drivers/m6805evs.cpp b/src/mame/drivers/m6805evs.cpp index ca262cc0301..24cb5fb33d9 100644 --- a/src/mame/drivers/m6805evs.cpp +++ b/src/mame/drivers/m6805evs.cpp @@ -79,7 +79,7 @@ private: }; -static ADDRESS_MAP_START( m6805evs_mem, AS_PROGRAM, 8, m6805evs_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, m6805evs_state ) ADDRESS_MAP_GLOBAL_MASK(0x1fff) ADDRESS_MAP_UNMAP_HIGH @@ -101,7 +101,7 @@ void m6805evs_state::machine_reset() static MACHINE_CONFIG_START( m6805evs ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6805, XTAL_4MHz) - MCFG_CPU_PROGRAM_MAP(m6805evs_mem) + MCFG_CPU_PROGRAM_MAP(mem_map) MACHINE_CONFIG_END ROM_START(m6805evs) diff --git a/src/mame/drivers/mits680b.cpp b/src/mame/drivers/mits680b.cpp index a05ed4fdd42..5a340b98864 100644 --- a/src/mame/drivers/mits680b.cpp +++ b/src/mame/drivers/mits680b.cpp @@ -47,7 +47,7 @@ READ8_MEMBER( mits680b_state::status_check_r ) } -static ADDRESS_MAP_START(mits680b_mem, AS_PROGRAM, 8, mits680b_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, mits680b_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x03ff) AM_RAM // 1024 bytes RAM AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("acia", acia6850_device, status_r, control_w) @@ -64,7 +64,7 @@ INPUT_PORTS_END static MACHINE_CONFIG_START( mits680b ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_1MHz / 2) - MCFG_CPU_PROGRAM_MAP(mits680b_mem) + MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc)) diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp index bf7e7692b27..66b9d32920f 100644 --- a/src/mame/drivers/mk14.cpp +++ b/src/mame/drivers/mk14.cpp @@ -105,7 +105,7 @@ WRITE8_MEMBER( mk14_state::display_w ) } } -static ADDRESS_MAP_START(mk14_mem, AS_PROGRAM, 8, mk14_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, mk14_state) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x0fff) AM_RANGE(0x000, 0x1ff) AM_MIRROR(0x600) AM_ROM // ROM @@ -193,7 +193,7 @@ static MACHINE_CONFIG_START( mk14 ) // IC1 1SP-8A/600 (8060) SC/MP Microprocessor MCFG_CPU_ADD("maincpu", INS8060, XTAL_4_433619MHz) MCFG_SCMP_CONFIG(WRITELINE(mk14_state, cass_w), NOOP, READLINE(mk14_state, cass_r), NOOP, READLINE(mk14_state, cass_r), NOOP) - MCFG_CPU_PROGRAM_MAP(mk14_mem) + MCFG_CPU_PROGRAM_MAP(mem_map) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_mk14) diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index c7f08e01522..1c9f348acf5 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -46,14 +46,14 @@ private: required_region_ptr m_p_chargen; }; -static ADDRESS_MAP_START(modellot_mem, AS_PROGRAM, 8, modellot_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, modellot_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xbfff) AM_RAM // 48k ram AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_SHARE("videoram") AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START(modellot_io, AS_IO, 8, modellot_state) +static ADDRESS_MAP_START(io_map, AS_IO, 8, modellot_state) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x77, 0x77) AM_READ(port77_r) @@ -152,8 +152,8 @@ uint32_t modellot_state::screen_update_modellot(screen_device &screen, bitmap_in static MACHINE_CONFIG_START( modellot ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) - MCFG_CPU_PROGRAM_MAP(modellot_mem) - MCFG_CPU_IO_MAP(modellot_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) diff --git a/src/mame/drivers/ms9540.cpp b/src/mame/drivers/ms9540.cpp index 1f15b290f81..c9cf9871bf0 100644 --- a/src/mame/drivers/ms9540.cpp +++ b/src/mame/drivers/ms9540.cpp @@ -27,18 +27,16 @@ Chips: #include "cpu/m68000/m68000.h" #include "machine/terminal.h" -#define TERMINAL_TAG "terminal" class ms9540_state : public driver_device { public: ms9540_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"), - m_terminal(*this, TERMINAL_TAG) - { - } + : driver_device(mconfig, type, tag) + , m_p_base(*this, "rambase") + , m_maincpu(*this, "maincpu") + , m_terminal(*this, "terminal") + { } void kbd_put(u8 data); @@ -51,7 +49,7 @@ private: }; -static ADDRESS_MAP_START(ms9540_mem, AS_PROGRAM, 16, ms9540_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 16, ms9540_state) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xffffff) AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_SHARE("rambase") @@ -80,10 +78,10 @@ void ms9540_state::kbd_put(u8 data) static MACHINE_CONFIG_START( ms9540 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) // unknown clock - MCFG_CPU_PROGRAM_MAP(ms9540_mem) + MCFG_CPU_PROGRAM_MAP(mem_map) /* video hardware */ - MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) + MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ms9540_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp index 27ec9d2f41a..a189f8ef50a 100644 --- a/src/mame/drivers/pencil2.cpp +++ b/src/mame/drivers/pencil2.cpp @@ -126,7 +126,7 @@ private: required_device m_cart; }; -static ADDRESS_MAP_START(pencil2_mem, AS_PROGRAM, 8, pencil2_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, pencil2_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x5fff) AM_WRITENOP // stop error log filling up @@ -134,7 +134,7 @@ static ADDRESS_MAP_START(pencil2_mem, AS_PROGRAM, 8, pencil2_state) //AM_RANGE(0x8000, 0xffff) // mapped by the cartslot ADDRESS_MAP_END -static ADDRESS_MAP_START(pencil2_io, AS_IO, 8, pencil2_state) +static ADDRESS_MAP_START(io_map, AS_IO, 8, pencil2_state) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x0f) AM_DEVWRITE("cent_data_out", output_latch_device, write) @@ -306,8 +306,8 @@ void pencil2_state::machine_start() static MACHINE_CONFIG_START( pencil2 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) - MCFG_CPU_PROGRAM_MAP(pencil2_mem) - MCFG_CPU_IO_MAP(pencil2_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 ) diff --git a/src/mame/drivers/pimps.cpp b/src/mame/drivers/pimps.cpp index 3476dacec8c..97f424b1dff 100644 --- a/src/mame/drivers/pimps.cpp +++ b/src/mame/drivers/pimps.cpp @@ -88,13 +88,13 @@ private: }; -static ADDRESS_MAP_START(pimps_mem, AS_PROGRAM, 8, pimps_state) +static ADDRESS_MAP_START(mem_map, AS_PROGRAM, 8, pimps_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xefff) AM_RAM AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION("roms", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START(pimps_io, AS_IO, 8, pimps_state) +static ADDRESS_MAP_START(io_map, AS_IO, 8, pimps_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("uart1", i8251_device, data_r, data_w) AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("uart1", i8251_device, status_r, control_w) @@ -125,8 +125,8 @@ DEVICE_INPUT_DEFAULTS_END static MACHINE_CONFIG_START( pimps ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz) - MCFG_CPU_PROGRAM_MAP(pimps_mem) - MCFG_CPU_IO_MAP(pimps_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc)) diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp index ad3e76c7685..35c0b53b071 100644 --- a/src/mame/drivers/savia84.cpp +++ b/src/mame/drivers/savia84.cpp @@ -58,14 +58,14 @@ private: required_device m_ppi8255; }; -static ADDRESS_MAP_START( savia84_mem, AS_PROGRAM, 8, savia84_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, savia84_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x7fff) // A15 not connected at the CPU AM_RANGE(0x0000, 0x07ff) AM_ROM AM_RANGE(0x1800, 0x1fff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( savia84_io, AS_IO, 8, savia84_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, savia84_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x07) AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) // ports F8-FB @@ -173,8 +173,8 @@ READ8_MEMBER( savia84_state::savia84_8255_portc_r ) // IN FA - read keyboard static MACHINE_CONFIG_START( savia84 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz / 2) - MCFG_CPU_PROGRAM_MAP(savia84_mem) - MCFG_CPU_IO_MAP(savia84_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_savia84) diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp index 1ad716e471d..77bad6bcefe 100644 --- a/src/mame/drivers/tvgame.cpp +++ b/src/mame/drivers/tvgame.cpp @@ -36,14 +36,14 @@ private: required_shared_ptr m_p_videoram; }; -static ADDRESS_MAP_START( tvgame_mem, AS_PROGRAM, 8, tvgame_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, tvgame_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x7fff ) AM_ROM AM_RANGE( 0x8000, 0xbfff ) AM_RAM AM_RANGE( 0xc000, 0xdfff ) AM_RAM AM_SHARE("videoram") ADDRESS_MAP_END -static ADDRESS_MAP_START( tvgame_io, AS_IO, 8, tvgame_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, tvgame_state ) ADDRESS_MAP_GLOBAL_MASK(3) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x0003) AM_DEVREADWRITE("ppi", i8255_device, read, write) @@ -96,8 +96,8 @@ uint32_t tvgame_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap static MACHINE_CONFIG_START( tvgame ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) - MCFG_CPU_PROGRAM_MAP(tvgame_mem) - MCFG_CPU_IO_MAP(tvgame_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp index a88275e75ed..f51237299ac 100644 --- a/src/mame/drivers/z80dev.cpp +++ b/src/mame/drivers/z80dev.cpp @@ -2,11 +2,11 @@ // copyright-holders:Robbbert /*************************************************************************** - Z80 dev board (unknown) +Z80 dev board (unknown) - http://retro.hansotten.nl/index.php?page=z80-dev-kit +http://retro.hansotten.nl/index.php?page=z80-dev-kit - 23/04/2010 Skeleton driver. +2010-04-23 Skeleton driver. Pasting: 0-F : as is @@ -29,13 +29,14 @@ class z80dev_state : public driver_device { public: z80dev_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") { } - required_device m_maincpu; DECLARE_WRITE8_MEMBER( display_w ); DECLARE_READ8_MEMBER( test_r ); +private: + required_device m_maincpu; }; WRITE8_MEMBER( z80dev_state::display_w ) @@ -52,13 +53,13 @@ READ8_MEMBER( z80dev_state::test_r ) return space.machine().rand(); } -static ADDRESS_MAP_START(z80dev_mem, AS_PROGRAM, 8, z80dev_state) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, z80dev_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x07ff) AM_ROM AM_RANGE(0x1000, 0x10ff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( z80dev_io , AS_IO, 8, z80dev_state) +static ADDRESS_MAP_START( io_map , AS_IO, 8, z80dev_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK (0xff) AM_RANGE(0x20, 0x20) AM_READ_PORT("LINE0") @@ -108,8 +109,8 @@ INPUT_PORTS_END static MACHINE_CONFIG_START( z80dev ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) - MCFG_CPU_PROGRAM_MAP(z80dev_mem) - MCFG_CPU_IO_MAP(z80dev_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_z80dev) diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index 2b980acc2ce..f1c8752b64b 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -97,7 +97,7 @@ WRITE8_MEMBER(zrt80_state::zrt80_38_w) m_beep->set_state(1); } -static ADDRESS_MAP_START(zrt80_mem, AS_PROGRAM, 8, zrt80_state) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, zrt80_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0fff) AM_ROM // Z25 - Main firmware AM_RANGE(0x1000, 0x1fff) AM_ROM // Z24 - Expansion @@ -107,7 +107,7 @@ static ADDRESS_MAP_START(zrt80_mem, AS_PROGRAM, 8, zrt80_state) ADDRESS_MAP_END -static ADDRESS_MAP_START( zrt80_io, AS_IO, 8, zrt80_state) +static ADDRESS_MAP_START( io_map, AS_IO, 8, zrt80_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x07) AM_DEVREADWRITE("ins8250", ins8250_device, ins8250_r, ins8250_w ) @@ -270,8 +270,8 @@ GFXDECODE_END static MACHINE_CONFIG_START( zrt80 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz) - MCFG_CPU_PROGRAM_MAP(zrt80_mem) - MCFG_CPU_IO_MAP(zrt80_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())