diff options
author | mooglyguy <therealmogminer@gmail.com> | 2018-12-16 14:49:12 +0100 |
---|---|---|
committer | mooglyguy <therealmogminer@gmail.com> | 2018-12-16 14:51:43 +0100 |
commit | 97f2889f320293e81eb9e495034d5cd92edb96d0 (patch) | |
tree | 90a4e90a2642bf8c7958c72a0cae89142f733396 /src/devices/cpu/i386/i386.h | |
parent | d87615d0f1f608d25d6bd0dcd13e613b3b1eccf5 (diff) |
Fixed regressions reported by Tafoid, nw
-cpu/i386, lc8670: Removed MCFG macros. [Ryan Holtz]
-drivers/at, atpci, nforcepc, pcipc, svmu: Removed MACHINE_CONFIG macros. [Ryan Holtz]
Diffstat (limited to 'src/devices/cpu/i386/i386.h')
-rw-r--r-- | src/devices/cpu/i386/i386.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index ed65129571b..e7a460488c0 100644 --- a/src/devices/cpu/i386/i386.h +++ b/src/devices/cpu/i386/i386.h @@ -24,13 +24,6 @@ // mingw has this defined for 32-bit compiles #undef i386 - -#define MCFG_I386_SMIACT(_devcb) \ - downcast<i386_device &>(*device).set_smiact(DEVCB_##_devcb); - -#define MCFG_I486_FERR_HANDLER(_devcb) \ - downcast<i386_device &>(*device).set_ferr(DEVCB_##_devcb); - #define X86_NUM_CPUS 4 class i386_device : public cpu_device, public device_vtlb_interface, public i386_disassembler::config @@ -40,8 +33,8 @@ public: i386_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // configuration helpers - template <class Object> devcb_base &set_smiact(Object &&cb) { return m_smiact.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_ferr(Object &&cb) { return m_ferr_handler.set_callback(std::forward<Object>(cb)); } + auto smiact() { return m_smiact.bind(); } + auto ferr() { return m_ferr_handler.bind(); } uint64_t debug_segbase(symbol_table &table, int params, const uint64_t *param); uint64_t debug_seglimit(symbol_table &table, int params, const uint64_t *param); |