summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/cidelsa.h
diff options
context:
space:
mode:
author wilbertpol <wilbertpol@users.noreply.github.com>2018-05-20 19:27:20 +0200
committer R. Belmont <rb6502@users.noreply.github.com>2018-05-20 13:27:20 -0400
commit2beba4ce73fad917c7159a39939bace54f76494b (patch)
treee9d33c059bc5045f13d0c1748f0a044650370b8d /src/mame/includes/cidelsa.h
parentacf93837ac21b2b0bb003d1649b893200c269812 (diff)
Replace set_led_value and set_lamp_value with output_finders. [Wilbe… (#3592)
* Replace set_led_value and set_lamp_value with output_finders. [Wilbert Pol] * segaufo: keep the 2 bit lamp outputs
Diffstat (limited to 'src/mame/includes/cidelsa.h')
-rw-r--r--src/mame/includes/cidelsa.h55
1 files changed, 29 insertions, 26 deletions
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index ac5468c86e5..e9c4f81c6f3 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -49,16 +49,9 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, CDP1802_TAG)
, m_vis(*this, CDP1869_TAG)
+ , m_led(*this, "led%u", 0U)
{ }
- required_device<cosmac_device> m_maincpu;
- required_device<cdp1869_device> m_vis;
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
- virtual void video_start() override;
-
DECLARE_WRITE8_MEMBER( cdp1869_w );
DECLARE_WRITE8_MEMBER( destryer_out1_w );
DECLARE_WRITE8_MEMBER( altair_out1_w );
@@ -73,17 +66,6 @@ public:
CDP1869_CHAR_RAM_WRITE_MEMBER(cidelsa_charram_w);
CDP1869_PCB_READ_MEMBER(cidelsa_pcb_r);
- // cpu state
- int m_reset;
-
- // video state
- int m_cdp1802_q;
- int m_cdp1869_pcb;
-
- uint8_t *m_pageram;
- std::unique_ptr<uint8_t[]> m_pcbram;
- std::unique_ptr<uint8_t[]> m_charram;
-
void destryera(machine_config &config);
void altair(machine_config &config);
void destryer(machine_config &config);
@@ -95,8 +77,28 @@ public:
void destryer_io_map(address_map &map);
void destryer_map(address_map &map);
void destryera_map(address_map &map);
+
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+ virtual void video_start() override;
+
+ required_device<cosmac_device> m_maincpu;
+ required_device<cdp1869_device> m_vis;
+ output_finder<3> m_led;
+
+ // cpu state
+ int m_reset;
+
+ // video state
+ int m_cdp1802_q;
+ int m_cdp1869_pcb;
+
+ uint8_t *m_pageram;
+ std::unique_ptr<uint8_t[]> m_pcbram;
+ std::unique_ptr<uint8_t[]> m_charram;
};
class draco_state : public cidelsa_state
@@ -107,10 +109,6 @@ public:
m_psg(*this, AY8910_TAG)
{ }
- required_device<ay8910_device> m_psg;
-
- virtual void machine_start() override;
-
DECLARE_READ8_MEMBER( sound_in_r );
DECLARE_READ8_MEMBER( psg_r );
DECLARE_WRITE8_MEMBER( sound_bankswitch_w );
@@ -123,15 +121,20 @@ public:
CDP1869_CHAR_RAM_WRITE_MEMBER(draco_charram_w);
CDP1869_PCB_READ_MEMBER(draco_pcb_r);
- // sound state
- int m_sound;
- int m_psg_latch;
void draco(machine_config &config);
void draco_video(machine_config &config);
void draco_io_map(address_map &map);
void draco_map(address_map &map);
void draco_page_ram(address_map &map);
void draco_sound_map(address_map &map);
+
+protected:
+ virtual void machine_start() override;
+
+ required_device<ay8910_device> m_psg;
+ // sound state
+ int m_sound;
+ int m_psg_latch;
};
#endif // MAME_INCLUDES_CIDELSA_H