diff options
Diffstat (limited to 'src/devices/cpu/mcs40/mcs40.h')
-rw-r--r-- | src/devices/cpu/mcs40/mcs40.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/devices/cpu/mcs40/mcs40.h b/src/devices/cpu/mcs40/mcs40.h index 88ba0d81194..d8ca4059631 100644 --- a/src/devices/cpu/mcs40/mcs40.h +++ b/src/devices/cpu/mcs40/mcs40.h @@ -248,7 +248,7 @@ class i4004_cpu_device : public mcs40_cpu_device_base { public: // configuration helpers - auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); } + using mcs40_cpu_device_base::sync_cb; auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<0>(); } template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); } @@ -269,11 +269,6 @@ protected: virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override; virtual void do_cycle2(u8 opr, u8 opa, u8 arg) override; virtual u8 do_io(u8 opr, u8 opa) override; - - // configuration helpers - using mcs40_cpu_device_base::sync_cb; - using mcs40_cpu_device_base::cm_rom_cb; - using mcs40_cpu_device_base::cm_ram_cb; }; @@ -281,11 +276,10 @@ class i4040_cpu_device : public i4004_cpu_device { public: // configuration helpers - auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); } template <unsigned N> auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<N>(); } template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); } auto cy_cb() { return i4004_cpu_device::cy_cb(); } - auto stp_ack_cb() { return i4004_cpu_device::stp_ack_cb(); } + using mcs40_cpu_device_base::stp_ack_cb; i4040_cpu_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); @@ -299,13 +293,6 @@ protected: // mcs40_cpu_device_base implementation virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override; - - // configuration helpers - using mcs40_cpu_device_base::sync_cb; - using mcs40_cpu_device_base::cm_rom_cb; - using mcs40_cpu_device_base::cm_ram_cb; - using mcs40_cpu_device_base::cy_cb; - using mcs40_cpu_device_base::stp_ack_cb; }; |