summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/upd7725/upd7725.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/cpu/upd7725/upd7725.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/cpu/upd7725/upd7725.h')
-rwxr-xr-xsrc/emu/cpu/upd7725/upd7725.h114
1 files changed, 29 insertions, 85 deletions
diff --git a/src/emu/cpu/upd7725/upd7725.h b/src/emu/cpu/upd7725/upd7725.h
index bfefed13049..62c005d42e5 100755
--- a/src/emu/cpu/upd7725/upd7725.h
+++ b/src/emu/cpu/upd7725/upd7725.h
@@ -34,92 +34,29 @@ class upd96050_device;
struct necdsp_interface
{
- devcb_read_line m_in_int_func;
- //devcb_read8 m_in_si_func;
- //devcb_read_line m_in_sck_func;
- //devcb_read_line m_in_sien_func;
- //devcb_read_line m_in_soen_func;
- //devcb_read_line m_in_dack_func;
- devcb_write_line m_out_p0_func;
- devcb_write_line m_out_p1_func;
- //devcb_write8 m_out_so_func;
- //devcb_write_line m_out_sorq_func;
- //devcb_write_line m_out_drq_func;
+ devcb_read_line m_in_int_cb;
+ //devcb_read8 m_in_si_cb;
+ //devcb_read_line m_in_sck_cb;
+ //devcb_read_line m_in_sien_cb;
+ //devcb_read_line m_in_soen_cb;
+ //devcb_read_line m_in_dack_cb;
+ devcb_write_line m_out_p0_cb;
+ devcb_write_line m_out_p1_cb;
+ //devcb_write8 m_out_so_cb;
+ //devcb_write_line m_out_sorq_cb;
+ //devcb_write_line m_out_drq_cb;
};
#define NECDSP_INTERFACE(name) \
const necdsp_interface (name) =
-// ======================> necdsp_device_config
-
-class necdsp_device_config : public cpu_device_config, public necdsp_interface
-{
- friend class necdsp_device;
-
-protected:
- // construction/destruction
- necdsp_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name);
-
-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;
-
-protected:
- // device_config overrides
- virtual void device_config_complete();
-
- // device_config_execute_interface overrides
- virtual UINT32 execute_min_cycles() const;
- virtual UINT32 execute_max_cycles() const;
- virtual UINT32 execute_input_lines() const;
-
- // device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
-
- // device_config_disasm_interface overrides
- virtual UINT32 disasm_min_opcode_bytes() const;
- virtual UINT32 disasm_max_opcode_bytes() const;
-
- // inline data
- const address_space_config m_program_config, m_data_config;
-};
-
-class upd7725_device_config : public necdsp_device_config
-{
- friend class upd7725_device;
-
- // construction/destruction
- upd7725_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;
-};
-
-class upd96050_device_config : public necdsp_device_config
-{
- friend class upd96050_device;
-
- // construction/destruction
- upd96050_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;
-};
-
// ======================> necdsp_device
-class necdsp_device : public cpu_device
+class necdsp_device : public cpu_device, public necdsp_interface
{
- friend class necdsp_device_config;
-
protected:
// construction/destruction
- necdsp_device(running_machine &_machine, const necdsp_device_config &config);
+ necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name);
public:
UINT8 snesdsp_read(bool mode);
@@ -127,21 +64,33 @@ public:
protected:
// device-level overrides
+ virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
// device_execute_interface overrides
+ virtual UINT32 execute_min_cycles() const;
+ virtual UINT32 execute_max_cycles() const;
+ virtual UINT32 execute_input_lines() const;
virtual void execute_run();
virtual void execute_set_input(int inputnum, int state);
+ // device_memory_interface overrides
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
+
// device_state_interface overrides
virtual void state_import(const device_state_entry &entry);
virtual void state_export(const device_state_entry &entry);
virtual void state_string_export(const device_state_entry &entry, astring &string);
// device_disasm_interface overrides
+ virtual UINT32 disasm_min_opcode_bytes() const;
+ virtual UINT32 disasm_max_opcode_bytes() const;
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
+ // inline data
+ const address_space_config m_program_config, m_data_config;
+
UINT16 dataRAM[2048];
private:
@@ -232,26 +181,21 @@ protected:
//devcb_resolved_write8 m_out_so_func;
//devcb_resolved_write_line m_out_sorq_func;
//devcb_resolved_write_line m_out_drq_func;
-
- const necdsp_device_config &m_config;
};
class upd7725_device : public necdsp_device
{
- friend class upd7725_device_config;
-
+public:
// construction/destruction
- upd7725_device(running_machine &_machine, const upd7725_device_config &config);
+ upd7725_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class upd96050_device : public necdsp_device
{
- friend class upd96050_device_config;
-
+public:
// construction/destruction
- upd96050_device(running_machine &_machine, const upd96050_device_config &config);
+ upd96050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-public:
UINT16 dataram_r(UINT16 addr) { return dataRAM[addr]; }
void dataram_w(UINT16 addr, UINT16 data) { dataRAM[addr] = data; }
};