From cb55d347d007aa5dfba01ef42d2971c0db697795 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 26 Jan 2019 18:49:07 +1100 Subject: housekeeping (nw) --- src/devices/cpu/m6502/xavix.h | 3 ++- src/devices/cpu/m6502/xavix2000.h | 4 +++- src/mame/drivers/xavix.cpp | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/devices/cpu/m6502/xavix.h b/src/devices/cpu/m6502/xavix.h index 9b28a429dad..ddd62e05c98 100644 --- a/src/devices/cpu/m6502/xavix.h +++ b/src/devices/cpu/m6502/xavix.h @@ -15,7 +15,6 @@ class xavix_device : public m6502_device { public: xavix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - xavix_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); virtual std::unique_ptr create_disassembler() override; virtual void do_exec_full() override; @@ -101,6 +100,8 @@ protected: uint8_t m_codebank; uint32_t XPC; + xavix_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + uint32_t adr_with_codebank(uint16_t adr) { return adr | (get_codebank() << 16); } virtual void device_start() override; diff --git a/src/devices/cpu/m6502/xavix2000.h b/src/devices/cpu/m6502/xavix2000.h index 2275e762938..5897aca6194 100644 --- a/src/devices/cpu/m6502/xavix2000.h +++ b/src/devices/cpu/m6502/xavix2000.h @@ -15,9 +15,11 @@ class xavix2000_device : public xavix_device { public: xavix2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - xavix2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); virtual std::unique_ptr create_disassembler() override; + +protected: + xavix2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); virtual void do_exec_full() override; virtual void do_exec_partial() override; diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index 2ccebda3afc..708ce014c41 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -120,7 +120,7 @@ 2002 1 Accessory cartridge for Slot machine "Gin-gin maru TV" /TAKARA/Japan - - - - - - - 2 Wildest computer robot "Daigander" (Korean version) /TAKARA/Korea - - - - - - - 3 Hamutaro's circus /EPOCH/Japan - - - - - - - - 4 Doraemon ,computer megaphone /EPOCH/Japan - - - - - - - + 4 Doraemon Wakuwaku Kuukihou /EPOCH/Japan - - - - - - - 5 Strike! Exciting bowling /EPOCH/Japan - - - - - - - 6 e-kara /Hasbro/Spain - - - - - - - 7 Starter set for e-kara H.S," Morning sisters" /TAKARA/Japan - - - - - - - @@ -1571,7 +1571,7 @@ CONS( 200?, epo_efdx, 0, 0, xavix_i2c_24c08, epo_efdx, xavix_i2c_sta CONS( 2005, epo_guru, 0, 0, xavix, xavix, xavix_state, init_xavix, "Epoch / SSD Company LTD", "Gururin World (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -CONS( 2002, epo_dmon, 0, 0, xavix_i2c_24c02, xavix_i2c,xavix_i2c_state, init_xavix, "Epoch / SSD Company LTD", "Doraemon Computer Megaphone (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // full / proper title? +CONS( 2002, epo_dmon, 0, 0, xavix_i2c_24c02, xavix_i2c,xavix_i2c_state, init_xavix, "Epoch / SSD Company LTD", "Doraemon Wakuwaku Kuukihou (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // full / proper title? CONS( 200?, has_wamg, 0, 0, xavix, has_wamg, xavix_state, init_xavix, "Hasbro / Milton Bradley / SSD Company LTD", "TV Wild Adventure Mini Golf (NTSC)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -- cgit v1.2.3