summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound/cdp1863.h
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-04-27 05:11:18 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-04-27 05:11:18 +0000
commit919913f118760c0ca41ab63512bd5c106f6fd840 (patch)
treecd6c115c8e9c5280ac4bd16eabfe69c7341151c2 /src/emu/sound/cdp1863.h
parent84f2c31f7d6f6c667427b1d60c83e6dc9f420d60 (diff)
Collapsed device_config and device_t into one class. Updated all
existing modern devices and the legacy wrappers to work in this environment. This in general greatly simplifies writing a modern device. [Aaron Giles] General notes: * some more cleanup probably needs to happen behind this change, but I needed to get it in before the next device modernization or import from MESS :) * new template function device_creator which automatically defines the static function that creates the device; use this instead of creating a static_alloc_device_config function * added device_stop() method which is called at around the time the previous device_t's destructor was called; if you auto_free anything, do it here because the machine is gone when the destructor is called * changed the static_set_* calls to pass a device_t & instead of a device_config * * for many devices, the static config structure member names over- lapped the device's names for devcb_* functions; in these cases the members in the interface were renamed to have a _cb suffix * changed the driver_enumerator to only cache 100 machine_configs because caching them all took a ton of memory; fortunately this implementation detail is completely hidden behind the driver_enumerator interface * got rid of the macros for creating derived classes; doing it manually is now clean enough that it isn't worth hiding the details in a macro
Diffstat (limited to 'src/emu/sound/cdp1863.h')
-rw-r--r--src/emu/sound/cdp1863.h36
1 files changed, 6 insertions, 30 deletions
diff --git a/src/emu/sound/cdp1863.h b/src/emu/sound/cdp1863.h
index aa77586fedc..91d996664bb 100644
--- a/src/emu/sound/cdp1863.h
+++ b/src/emu/sound/cdp1863.h
@@ -33,7 +33,7 @@
#define MCFG_CDP1863_ADD(_tag, _clock, _clock2) \
MCFG_DEVICE_ADD(_tag, CDP1863, _clock) \
- cdp1863_device_config::static_set_config(device, _clock2);
+ cdp1863_device_config::static_set_config(*device, _clock2);
@@ -41,40 +41,18 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> cdp1863_device_config
-
-class cdp1863_device_config : public device_config,
- public device_config_sound_interface
-{
- friend class cdp1863_device;
-
- // construction/destruction
- cdp1863_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock);
-
-public:
- // allocators
- static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock);
- virtual device_t *alloc_device(running_machine &machine) const;
-
- // inline configuration helpers
- static void static_set_config(device_config *device, int clock2);
-
-private:
- int m_clock2;
-};
-
-
// ======================> cdp1863_device
class cdp1863_device : public device_t,
public device_sound_interface
{
- friend class cdp1863_device_config;
-
+public:
// construction/destruction
- cdp1863_device(running_machine &_machine, const cdp1863_device_config &_config);
+ cdp1863_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ // inline configuration helpers
+ static void static_set_config(device_t &device, int clock2);
-public:
DECLARE_WRITE8_MEMBER( str_w );
void str_w(UINT8 data);
@@ -101,8 +79,6 @@ private:
int m_latch; // sound latch
INT16 m_signal; // current signal
int m_incr; // initial wave state
-
- const cdp1863_device_config &m_config;
};