From af9a5e817d3eefdda79e801056b29167ecbcdef9 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 13 Sep 2012 07:50:33 +0000 Subject: moved constructor of state classes into .h file (no whatsnew) --- src/mess/includes/coco.h | 16 +++++++++++++++- src/mess/includes/coco12.h | 8 +++++++- src/mess/includes/coco3.h | 4 +++- src/mess/includes/dgnalpha.h | 8 +++++++- src/mess/includes/dragon.h | 12 ++++++++++-- src/mess/includes/rm380z.h | 3 ++- src/mess/machine/coco.c | 22 ---------------------- src/mess/machine/coco12.c | 13 ------------- src/mess/machine/coco3.c | 14 -------------- src/mess/machine/dgnalpha.c | 14 -------------- src/mess/machine/dragon.c | 24 ------------------------ 11 files changed, 44 insertions(+), 94 deletions(-) (limited to 'src') diff --git a/src/mess/includes/coco.h b/src/mess/includes/coco.h index 3b44f435314..6e8ff9f80b2 100644 --- a/src/mess/includes/coco.h +++ b/src/mess/includes/coco.h @@ -81,7 +81,21 @@ MACHINE_CONFIG_EXTERN( coco_sound ); class coco_state : public driver_device { public: - coco_state(const machine_config &mconfig, device_type type, const char *tag); + coco_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), + m_maincpu(*this, MAINCPU_TAG), + m_pia_0(*this, PIA0_TAG), + m_pia_1(*this, PIA1_TAG), + m_dac(*this, DAC_TAG), + m_wave(*this, WAVE_TAG), + m_cococart(*this, CARTRIDGE_TAG), + m_ram(*this, RAM_TAG), + m_cassette(*this, CASSETTE_TAG), + m_bitbanger(*this, BITBANGER_TAG), + m_vhd_0(*this, VHD0_TAG), + m_vhd_1(*this, VHD1_TAG) + { + } required_device m_maincpu; required_device m_pia_0; diff --git a/src/mess/includes/coco12.h b/src/mess/includes/coco12.h index 3b02ac5f03d..6c5a59efcde 100644 --- a/src/mess/includes/coco12.h +++ b/src/mess/includes/coco12.h @@ -34,7 +34,13 @@ class coco12_state : public coco_state { public: - coco12_state(const machine_config &mconfig, device_type type, const char *tag); + coco12_state(const machine_config &mconfig, device_type type, const char *tag) + : coco_state(mconfig, type, tag), + m_sam(*this, SAM_TAG), + m_vdg(*this, VDG_TAG) + { + } + required_device m_sam; required_device m_vdg; diff --git a/src/mess/includes/coco3.h b/src/mess/includes/coco3.h index beeae2cc990..4ebf789aaf8 100644 --- a/src/mess/includes/coco3.h +++ b/src/mess/includes/coco3.h @@ -35,7 +35,9 @@ class coco3_state : public coco_state { public: - coco3_state(const machine_config &mconfig, device_type type, const char *tag); + coco3_state(const machine_config &mconfig, device_type type, const char *tag) + : coco_state(mconfig, type, tag), + m_gime(*this, GIME_TAG) { } required_device m_gime; diff --git a/src/mess/includes/dgnalpha.h b/src/mess/includes/dgnalpha.h index 4c044c9646a..637ba0a6e0f 100644 --- a/src/mess/includes/dgnalpha.h +++ b/src/mess/includes/dgnalpha.h @@ -36,7 +36,13 @@ class dragon_alpha_state : public dragon64_state { public: - dragon_alpha_state(const machine_config &mconfig, device_type type, const char *tag); + dragon_alpha_state(const machine_config &mconfig, device_type type, const char *tag) + : dragon64_state(mconfig, type, tag), + m_pia_2(*this, PIA2_TAG), + m_ay8912(*this, AY8912_TAG), + m_fdc(*this, WD2797_TAG) + { + } required_device m_pia_2; required_device m_ay8912; diff --git a/src/mess/includes/dragon.h b/src/mess/includes/dragon.h index 849bf87dbeb..fda08caebb8 100644 --- a/src/mess/includes/dragon.h +++ b/src/mess/includes/dragon.h @@ -34,7 +34,11 @@ class dragon_state : public coco12_state { public: - dragon_state(const machine_config &mconfig, device_type type, const char *tag); + dragon_state(const machine_config &mconfig, device_type type, const char *tag) + : coco12_state(mconfig, type, tag), + m_printer(*this, PRINTER_TAG) + { + } required_device m_printer; @@ -47,7 +51,11 @@ protected: class dragon64_state : public dragon_state { public: - dragon64_state(const machine_config &mconfig, device_type type, const char *tag); + dragon64_state(const machine_config &mconfig, device_type type, const char *tag) + : dragon_state(mconfig, type, tag), + m_acia(*this, ACIA_TAG) + { + } required_device m_acia; diff --git a/src/mess/includes/rm380z.h b/src/mess/includes/rm380z.h index aed486ec141..add77a280a0 100644 --- a/src/mess/includes/rm380z.h +++ b/src/mess/includes/rm380z.h @@ -89,7 +89,8 @@ public: required_device m_messram; optional_device m_fdc; - rm380z_state(const machine_config &mconfig, device_type type, const char *tag): driver_device(mconfig, type, tag), + rm380z_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), m_maincpu(*this, RM380Z_MAINCPU_TAG), m_messram(*this, RAM_TAG), m_fdc(*this, "wd1771") diff --git a/src/mess/machine/coco.c b/src/mess/machine/coco.c index db34c10a889..78be844099e 100644 --- a/src/mess/machine/coco.c +++ b/src/mess/machine/coco.c @@ -74,28 +74,6 @@ DAC and bitbanger values written should be reflected in the read. // BODY //************************************************************************** -//------------------------------------------------- -// ctor -//------------------------------------------------- - -coco_state::coco_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, MAINCPU_TAG), - m_pia_0(*this, PIA0_TAG), - m_pia_1(*this, PIA1_TAG), - m_dac(*this, DAC_TAG), - m_wave(*this, WAVE_TAG), - m_cococart(*this, CARTRIDGE_TAG), - m_ram(*this, RAM_TAG), - m_cassette(*this, CASSETTE_TAG), - m_bitbanger(*this, BITBANGER_TAG), - m_vhd_0(*this, VHD0_TAG), - m_vhd_1(*this, VHD1_TAG) -{ -} - - - //------------------------------------------------- // analog_port_start //------------------------------------------------- diff --git a/src/mess/machine/coco12.c b/src/mess/machine/coco12.c index d24db9899d8..c7239288d5e 100644 --- a/src/mess/machine/coco12.c +++ b/src/mess/machine/coco12.c @@ -8,19 +8,6 @@ #include "includes/coco12.h" -//------------------------------------------------- -// ctor -//------------------------------------------------- - -coco12_state::coco12_state(const machine_config &mconfig, device_type type, const char *tag) - : coco_state(mconfig, type, tag), - m_sam(*this, SAM_TAG), - m_vdg(*this, VDG_TAG) -{ -} - - - //------------------------------------------------- // device_start //------------------------------------------------- diff --git a/src/mess/machine/coco3.c b/src/mess/machine/coco3.c index 72159e30da7..ba3103ced05 100644 --- a/src/mess/machine/coco3.c +++ b/src/mess/machine/coco3.c @@ -43,20 +43,6 @@ #include "includes/coco3.h" - - -//------------------------------------------------- -// ctor -//------------------------------------------------- - -coco3_state::coco3_state(const machine_config &mconfig, device_type type, const char *tag) - : coco_state(mconfig, type, tag), - m_gime(*this, GIME_TAG) -{ -} - - - //------------------------------------------------- // ff20_write //------------------------------------------------- diff --git a/src/mess/machine/dgnalpha.c b/src/mess/machine/dgnalpha.c index 19f12c30aa1..d37a6246aa7 100644 --- a/src/mess/machine/dgnalpha.c +++ b/src/mess/machine/dgnalpha.c @@ -68,20 +68,6 @@ keeping track of it in a variable in the driver. #include "sound/ay8910.h" #include "imagedev/flopdrv.h" - -//------------------------------------------------- -// ctor -//------------------------------------------------- - -dragon_alpha_state::dragon_alpha_state(const machine_config &mconfig, device_type type, const char *tag) - : dragon64_state(mconfig, type, tag), - m_pia_2(*this, PIA2_TAG), - m_ay8912(*this, AY8912_TAG), - m_fdc(*this, WD2797_TAG) -{ -} - - //------------------------------------------------- // device_start //------------------------------------------------- diff --git a/src/mess/machine/dragon.c b/src/mess/machine/dragon.c index f66ae22854b..79d811ddc8a 100644 --- a/src/mess/machine/dragon.c +++ b/src/mess/machine/dragon.c @@ -42,18 +42,6 @@ easier to manage. DRAGON32 ***************************************************************************/ -//------------------------------------------------- -// ctor -//------------------------------------------------- - -dragon_state::dragon_state(const machine_config &mconfig, device_type type, const char *tag) - : coco12_state(mconfig, type, tag), - m_printer(*this, PRINTER_TAG) -{ -} - - - //------------------------------------------------- // pia1_pa_changed - called when PIA1 PA changes //------------------------------------------------- @@ -76,18 +64,6 @@ void dragon_state::pia1_pa_changed(void) DRAGON64 ***************************************************************************/ -//------------------------------------------------- -// ctor -//------------------------------------------------- - -dragon64_state::dragon64_state(const machine_config &mconfig, device_type type, const char *tag) - : dragon_state(mconfig, type, tag), - m_acia(*this, ACIA_TAG) -{ -} - - - //------------------------------------------------- // ff00_read //------------------------------------------------- -- cgit v1.2.3