diff options
author | 2016-01-20 21:42:13 +0100 | |
---|---|---|
committer | 2016-01-20 21:42:13 +0100 | |
commit | 4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch) | |
tree | 25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/devices/cpu/e0c6200 | |
parent | 3a8ccb89b426509be06089a19c51ecf55567ed1b (diff) |
reverting:
SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa
* tags are now strings (nw)
fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/cpu/e0c6200')
-rw-r--r-- | src/devices/cpu/e0c6200/e0c6200.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/e0c6200/e0c6200.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/e0c6200/e0c6s46.cpp | 12 | ||||
-rw-r--r-- | src/devices/cpu/e0c6200/e0c6s46.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/cpu/e0c6200/e0c6200.cpp b/src/devices/cpu/e0c6200/e0c6200.cpp index 398b384596e..0b87b9eaa7d 100644 --- a/src/devices/cpu/e0c6200/e0c6200.cpp +++ b/src/devices/cpu/e0c6200/e0c6200.cpp @@ -824,7 +824,7 @@ void e0c6200_cpu_device::execute_one() // illegal opcode default: - logerror("%s unknown opcode $%03X at $%04X\n", tag().c_str(), m_op, m_prev_pc); + logerror("%s unknown opcode $%03X at $%04X\n", tag(), m_op, m_prev_pc); break; } // 0xff0 diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h index 62c2f8dced7..7e47f817380 100644 --- a/src/devices/cpu/e0c6200/e0c6200.h +++ b/src/devices/cpu/e0c6200/e0c6200.h @@ -16,7 +16,7 @@ class e0c6200_cpu_device : public cpu_device { public: // construction/destruction - e0c6200_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, address_map_constructor program, address_map_constructor data, const char *shortname, const char *source) + e0c6200_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor program, address_map_constructor data, const char *shortname, const char *source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 16, 13, -1, program) , m_data_config("data", ENDIANNESS_BIG, 8, 12, 0, data), m_program(nullptr), m_data(nullptr), m_op(0), m_prev_op(0), m_irq_vector(0), m_irq_id(0), m_possible_irq(false), m_halt(false), diff --git a/src/devices/cpu/e0c6200/e0c6s46.cpp b/src/devices/cpu/e0c6200/e0c6s46.cpp index 0834c34bf3a..4dc37fa11fe 100644 --- a/src/devices/cpu/e0c6200/e0c6s46.cpp +++ b/src/devices/cpu/e0c6200/e0c6s46.cpp @@ -45,7 +45,7 @@ ADDRESS_MAP_END // device definitions -e0c6s46_device::e0c6s46_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e0c6s46_device::e0c6s46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : e0c6200_cpu_device(mconfig, E0C6S46, "E0C6S46", tag, owner, clock, ADDRESS_MAP_NAME(e0c6s46_program), ADDRESS_MAP_NAME(e0c6s46_data), "e0c6s46", __FILE__) , m_vram1(*this, "vram1") , m_vram2(*this, "vram2"), m_osc(0), m_svd(0), m_lcd_control(0), m_lcd_contrast(0) @@ -405,7 +405,7 @@ void e0c6s46_device::clock_watchdog() // initial reset after 3 to 4 seconds if (++m_watchdog_count == 4) { - logerror("%s watchdog reset\n", tag().c_str()); + logerror("%s watchdog reset\n", tag()); m_watchdog_count = 0; device_reset(); } @@ -705,7 +705,7 @@ READ8_MEMBER(e0c6s46_device::io_r) default: if (!space.debugger_access()) - logerror("%s unknown io_r from $0F%02X at $%04X\n", tag().c_str(), offset, m_prev_pc); + logerror("%s unknown io_r from $0F%02X at $%04X\n", tag(), offset, m_prev_pc); break; } @@ -773,7 +773,7 @@ WRITE8_MEMBER(e0c6s46_device::io_w) // d2: OSC3 on (high freq) // d3: clock source OSC1 or OSC3 if (data & 8) - logerror("%s io_w selected OSC3! PC=$%04X\n", tag().c_str(), m_prev_pc); + logerror("%s io_w selected OSC3! PC=$%04X\n", tag(), m_prev_pc); m_osc = data; break; @@ -876,7 +876,7 @@ WRITE8_MEMBER(e0c6s46_device::io_w) // d2: reset envelope // d3: trigger one-shot buzzer if (data & 1) - logerror("%s io_w enabled envelope, PC=$%04X\n", tag().c_str(), m_prev_pc); + logerror("%s io_w enabled envelope, PC=$%04X\n", tag(), m_prev_pc); m_bz_envelope = data & 3; m_bz_1shot_on |= data & 8; break; @@ -889,7 +889,7 @@ WRITE8_MEMBER(e0c6s46_device::io_w) default: if (machine().phase() > MACHINE_PHASE_RESET) - logerror("%s unknown io_w $%X to $0F%02X at $%04X\n", tag().c_str(), data, offset, m_prev_pc); + logerror("%s unknown io_w $%X to $0F%02X at $%04X\n", tag(), data, offset, m_prev_pc); break; } } diff --git a/src/devices/cpu/e0c6200/e0c6s46.h b/src/devices/cpu/e0c6200/e0c6s46.h index 56c5b736649..692f2332cd5 100644 --- a/src/devices/cpu/e0c6200/e0c6s46.h +++ b/src/devices/cpu/e0c6200/e0c6s46.h @@ -66,7 +66,7 @@ typedef void (*e0c6s46_pixel_update_func)(device_t &device, bitmap_ind16 &bitmap class e0c6s46_device : public e0c6200_cpu_device { public: - e0c6s46_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + e0c6s46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_write_r0_callback(device_t &device, _Object object) { return downcast<e0c6s46_device &>(device).m_write_r0.set_callback(object); } |