Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 00:29:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for class derivation issues brought about by pain meds. No whatsnew.

Browse Source
This commit is contained in:
Ryan Holtz 2010-08-28 17:14:12 +00:00
parent 821814658f
commit c675ce7df5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/machine/6526cia.c
View File

@ -43,7 +43,7 @@
#define MOS6526_DEV_DERIVED_CTOR(devtype) \ #define MOS6526_DEV_DERIVED_CTOR(devtype) \
devtype##_device::devtype##_device(running_machine &_machine, const devtype##_device_config &config) \ devtype##_device::devtype##_device(running_machine &_machine, const devtype##_device_config &config) \
: timekeeper_device(_machine, config) \ : mos6526_device(_machine, config) \
{ } { }
#define MOS6526_DEVCFG_DERIVED_CTOR(devtype, name) \ #define MOS6526_DEVCFG_DERIVED_CTOR(devtype, name) \

9
src/emu/machine/6526cia.h
View File

@ -36,7 +36,7 @@
#define __6526CIA_H__ #define __6526CIA_H__
#include "emu.h" #include "emu.h"
#include "devhelpr.h"
//************************************************************************** //**************************************************************************
@ -93,8 +93,9 @@ class mos6526_device_config : public device_config,
{ {
friend class mos6526_device; friend class mos6526_device;
protected:
// construction/destruction // construction/destruction
mos6526_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); mos6526_device_config(const machine_config &mconfig, const char *type, const char *tag, const device_config *owner, UINT32 clock);
public: public:
// allocators // allocators
@ -115,6 +116,7 @@ class mos6526_device : public device_t
friend class mos6526_device_config; friend class mos6526_device_config;
friend class dart_channel; friend class dart_channel;
protected:
// construction/destruction // construction/destruction
mos6526_device(running_machine &_machine, const mos6526_device_config &_config); mos6526_device(running_machine &_machine, const mos6526_device_config &_config);
@ -225,6 +227,9 @@ private:
const mos6526_device_config &m_config; const mos6526_device_config &m_config;
}; };
GENERIC_DEVICE_DERIVED_CONFIG(mos6526, mos6526r1)
GENERIC_DEVICE_DERIVED_CONFIG(mos6526, mos6526r2)
GENERIC_DEVICE_DERIVED_CONFIG(mos6526, mos8520)
// device type definition // device type definition
extern const device_type MOS6526R1; extern const device_type MOS6526R1;