diff options
author | 2013-04-11 14:53:07 +0000 | |
---|---|---|
committer | 2013-04-11 14:53:07 +0000 | |
commit | 63d27773a9e74bcd2247de30e955cddb24cf401b (patch) | |
tree | 33391ebed5519c84ea9c73ebea08f2b6233bca8f /src | |
parent | 567f503aacb5c910238d304a234e07a0dea04e8d (diff) |
was laying, one more cleanup, now really done for today (nw)
Diffstat (limited to 'src')
-rw-r--r-- | src/mame/drivers/esd16.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/fromanc2.c | 1 | ||||
-rw-r--r-- | src/mame/drivers/othunder.c | 1 | ||||
-rw-r--r-- | src/mame/drivers/playmark.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/taito_z.c | 1 | ||||
-rw-r--r-- | src/mame/includes/esd16.h | 3 | ||||
-rw-r--r-- | src/mame/includes/fromanc2.h | 6 | ||||
-rw-r--r-- | src/mame/includes/othunder.h | 5 | ||||
-rw-r--r-- | src/mame/includes/playmark.h | 3 | ||||
-rw-r--r-- | src/mame/includes/taito_z.h | 5 |
10 files changed, 14 insertions, 15 deletions
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 1ee897aa40e..f95a22b1cd1 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -584,8 +584,6 @@ void esd16_state::machine_start() membank("bank1")->configure_entries(0, 16, &AUDIO[0x0000], 0x4000); - m_eeprom = machine().device<eeprom_device>("eeprom"); - save_item(NAME(m_tilemap0_color)); } diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index f0bf72899c0..aa36fcbe4c4 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -501,7 +501,6 @@ static const ym2610_interface ym2610_config = MACHINE_START_MEMBER(fromanc2_state,fromanc4) { - m_eeprom = machine().device("eeprom"); m_left_screen = machine().device("lscreen"); m_right_screen = machine().device("rscreen"); diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index d67f2525beb..2db5858f4e3 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -664,7 +664,6 @@ void othunder_state::machine_start() { membank("bank10")->configure_entries(0, 4, memregion("audiocpu")->base() + 0xc000, 0x4000); - m_eeprom = machine().device<eeprom_device>("eeprom"); m_tc0220ioc = machine().device("tc0220ioc"); m_tc0100scn = machine().device("tc0100scn"); m_tc0110pcr = machine().device("tc0110pcr"); diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index 1964d186a78..c00acb3817b 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -1022,8 +1022,6 @@ GFXDECODE_END MACHINE_START_MEMBER(playmark_state,playmark) { - m_eeprom = machine().device<eeprom_device>("eeprom"); - save_item(NAME(m_bgscrollx)); save_item(NAME(m_bgscrolly)); save_item(NAME(m_bg_enable)); diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index 5af15229d32..5f9eadd3b17 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -3029,7 +3029,6 @@ void taitoz_state::taitoz_postload() MACHINE_START_MEMBER(taitoz_state,bshark) { - m_eeprom = machine().device<eeprom_device>("eeprom"); m_tc0100scn = machine().device("tc0100scn"); m_tc0150rod = machine().device("tc0150rod"); m_tc0480scp = machine().device("tc0480scp"); diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 7d7fe9408c2..d60320892d2 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -21,6 +21,7 @@ public: m_headpanic_platform_x(*this, "platform_x"), m_headpanic_platform_y(*this, "platform_y"), m_sprgen(*this, "spritegen"), + m_eeprom(*this, "eeprom"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu") { m_tilemap0_color = 0; @@ -48,7 +49,7 @@ public: int m_tilemap1_color; /* devices */ - eeprom_device *m_eeprom; + optional_device<eeprom_device> m_eeprom; DECLARE_WRITE16_MEMBER(esd16_sound_command_w); DECLARE_WRITE16_MEMBER(hedpanic_platform_w); DECLARE_READ16_MEMBER(esd_eeprom_r); diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 994833831dd..1f907e04e77 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -1,3 +1,4 @@ +#include "machine/eeprom.h" class fromanc2_state : public driver_device { @@ -5,7 +6,8 @@ public: fromanc2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), - m_subcpu(*this, "sub") , + m_subcpu(*this, "sub"), + m_eeprom(*this, "eeprom"), m_maincpu(*this, "maincpu") { } /* memory pointers */ @@ -31,7 +33,7 @@ public: /* devices */ required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_subcpu; - device_t *m_eeprom; + optional_device<eeprom_device> m_eeprom; device_t *m_left_screen; device_t *m_right_screen; DECLARE_WRITE16_MEMBER(fromanc2_sndcmd_w); diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 432a5a3bb9b..7acf0d013fd 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -26,7 +26,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this,"spriteram"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu"), + m_eeprom(*this, "eeprom") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -43,7 +44,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; - eeprom_device *m_eeprom; + optional_device<eeprom_device> m_eeprom; device_t *m_tc0220ioc; device_t *m_tc0100scn; device_t *m_tc0110pcr; diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 83102d37e7a..3445532bfa1 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -13,6 +13,7 @@ public: m_spriteram(*this, "spriteram"), m_rowscroll(*this, "rowscroll"), m_oki(*this, "oki"), + m_eeprom(*this, "eeprom"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu") { } @@ -52,7 +53,7 @@ public: /* devices */ required_device<okim6295_device> m_oki; - eeprom_device *m_eeprom; + optional_device<eeprom_device> m_eeprom; DECLARE_WRITE16_MEMBER(coinctrl_w); DECLARE_WRITE16_MEMBER(wbeachvl_coin_eeprom_w); DECLARE_WRITE16_MEMBER(hotmind_coin_eeprom_w); diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 7652d2b10b1..8596d5f82c3 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_subcpu(*this, "sub") + m_subcpu(*this, "sub"), + m_eeprom(*this, "eeprom") { } /* memory pointers */ @@ -37,7 +38,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; - eeprom_device *m_eeprom; + optional_device<eeprom_device> m_eeprom; device_t *m_tc0480scp; device_t *m_tc0150rod; device_t *m_tc0100scn; |