diff options
author | 2017-02-21 11:17:47 +1100 | |
---|---|---|
committer | 2017-02-21 11:17:47 +1100 | |
commit | 089afda59e0ccccf0b96992b4dfd71d6bc82f170 (patch) | |
tree | 09e6def46f77a3c1568149ec0d71156ca95485b2 | |
parent | ed04bdd86519ae5c372f235a19cd5993e2a2077c (diff) |
better naming (nw)
-rw-r--r-- | src/devices/cpu/patinhofeio/patinho_feio.cpp | 20 | ||||
-rw-r--r-- | src/devices/cpu/patinhofeio/patinhofeio_cpu.h | 8 | ||||
-rw-r--r-- | src/mame/drivers/patinho_feio.cpp | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/cpu/patinhofeio/patinho_feio.cpp b/src/devices/cpu/patinhofeio/patinho_feio.cpp index 6aa770af3a6..25538e62002 100644 --- a/src/devices/cpu/patinhofeio/patinho_feio.cpp +++ b/src/devices/cpu/patinhofeio/patinho_feio.cpp @@ -49,7 +49,7 @@ void patinho_feio_cpu_device::compute_effective_address(unsigned int addr){ } } -const device_type PATINHO_FEIO = &device_creator<patinho_feio_cpu_device>; +const device_type PATO_FEIO_CPU = &device_creator<patinho_feio_cpu_device>; //Internal 4kbytes of RAM static ADDRESS_MAP_START(prog_8bit, AS_PROGRAM, 8, patinho_feio_cpu_device) @@ -57,15 +57,15 @@ static ADDRESS_MAP_START(prog_8bit, AS_PROGRAM, 8, patinho_feio_cpu_device) ADDRESS_MAP_END patinho_feio_cpu_device::patinho_feio_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : cpu_device(mconfig, PATINHO_FEIO, "PATINHO FEIO", tag, owner, clock, "patinho_feio_cpu", __FILE__), - m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0, ADDRESS_MAP_NAME(prog_8bit)), - m_icount(0), - m_rc_read_cb(*this), - m_buttons_read_cb(*this), - /* These arrays of *this are very ugly. I wonder if there's a better way of coding this... */ - m_iodev_read_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this}, - m_iodev_write_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this}, - m_iodev_status_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this} + : cpu_device(mconfig, PATO_FEIO_CPU, "Patinho Feio CPU", tag, owner, clock, "pato_feio_cpu", __FILE__) + , m_program_config("program", ENDIANNESS_LITTLE, 8, 12, 0, ADDRESS_MAP_NAME(prog_8bit)) + , m_icount(0) + , m_rc_read_cb(*this) + , m_buttons_read_cb(*this) + // These arrays of *this are very ugly. I wonder if there's a better way of coding this... + , m_iodev_read_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this} + , m_iodev_write_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this} + , m_iodev_status_cb{*this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this, *this} { } diff --git a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h index 13d27aec613..9460e49908d 100644 --- a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h +++ b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h @@ -2,8 +2,8 @@ // copyright-holders:Felipe Sanches #pragma once -#ifndef __PATINHOFEIO_H__ -#define __PATINHOFEIO_H__ +#ifndef MAME_DEVICES_CPU_PATINHOFEIO_CPU_H +#define MAME_DEVICES_CPU_PATINHOFEIO_CPU_H #define MCFG_PATINHO_RC_READ_CB(_devcb) \ devcb = &patinho_feio_cpu_device::set_rc_read_callback(*device, DEVCB_##_devcb); @@ -139,6 +139,6 @@ private: uint8_t m_mode; }; -extern const device_type PATINHO_FEIO; +extern const device_type PATO_FEIO_CPU; -#endif /* __PATINHOFEIO_H__ */ +#endif // MAME_DEVICES_CPU_PATINHOFEIO_CPU_H diff --git a/src/mame/drivers/patinho_feio.cpp b/src/mame/drivers/patinho_feio.cpp index 446057398ac..52b0b67c17d 100644 --- a/src/mame/drivers/patinho_feio.cpp +++ b/src/mame/drivers/patinho_feio.cpp @@ -253,7 +253,7 @@ INPUT_PORTS_END static MACHINE_CONFIG_START( patinho_feio, patinho_feio_state ) /* basic machine hardware */ /* CPU @ approx. 500 kHz (memory cycle time is 2usec) */ - MCFG_CPU_ADD("maincpu", PATINHO_FEIO, 500000) + MCFG_CPU_ADD("maincpu", PATO_FEIO_CPU, 500000) MCFG_PATINHO_RC_READ_CB(READ16(patinho_feio_state, rc_r)) MCFG_PATINHO_BUTTONS_READ_CB(READ16(patinho_feio_state, buttons_r)) |