diff options
author | 2017-06-09 12:48:45 +0200 | |
---|---|---|
committer | 2017-06-09 12:48:45 +0200 | |
commit | e844b01154f1d57c9736b37c085ea0b9bbb15acb (patch) | |
tree | 272d3ad1d7c9562f8c01809ab3daaafc9442435a /src/devices/bus/isa/mda.h | |
parent | 0b546073e758e33abb12e738ab12aaf1377f2a3e (diff) |
device_add_mconfig up to devices/bus/l* (nw)
Diffstat (limited to 'src/devices/bus/isa/mda.h')
-rw-r--r-- | src/devices/bus/isa/mda.h | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index effbf2b59e5..f786f22b84b 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -23,22 +23,15 @@ public: // construction/destruction isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; - virtual const tiny_rom_entry *device_rom_region() const override; - - DECLARE_WRITE_LINE_MEMBER(hsync_changed); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); virtual DECLARE_READ8_MEMBER(io_read); virtual DECLARE_WRITE8_MEMBER(io_write); virtual DECLARE_READ8_MEMBER(status_r); virtual DECLARE_WRITE8_MEMBER(mode_control_w); - WRITE_LINE_MEMBER(pc_cpu_line); - + DECLARE_WRITE_LINE_MEMBER(hsync_changed); + DECLARE_WRITE_LINE_MEMBER(vsync_changed); + virtual MC6845_UPDATE_ROW( crtc_update_row ); - MC6845_UPDATE_ROW( mda_text_inten_update_row ); - MC6845_UPDATE_ROW( mda_text_blink_update_row ); protected: isa8_mda_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -47,6 +40,16 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; + +private: + WRITE_LINE_MEMBER(pc_cpu_line); + + MC6845_UPDATE_ROW( mda_text_inten_update_row ); + MC6845_UPDATE_ROW( mda_text_blink_update_row ); + public: int m_framecnt; @@ -73,24 +76,25 @@ class isa8_hercules_device : public: // construction/destruction isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; - virtual const tiny_rom_entry *device_rom_region() const override; virtual DECLARE_READ8_MEMBER(io_read) override; virtual DECLARE_WRITE8_MEMBER(io_write) override; virtual DECLARE_READ8_MEMBER(status_r) override; virtual DECLARE_WRITE8_MEMBER(mode_control_w) override; - virtual MC6845_UPDATE_ROW( crtc_update_row ) override; - MC6845_UPDATE_ROW( hercules_gfx_update_row ); - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; -public: + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; + +private: + virtual MC6845_UPDATE_ROW( crtc_update_row ) override; + MC6845_UPDATE_ROW( hercules_gfx_update_row ); + uint8_t m_configuration_switch; //hercules }; @@ -106,23 +110,23 @@ class isa8_ec1840_0002_device : public: // construction/destruction isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; +private: virtual DECLARE_WRITE8_MEMBER(mode_control_w) override; virtual MC6845_UPDATE_ROW( crtc_update_row ) override; MC6845_UPDATE_ROW( mda_lowres_text_inten_update_row ); MC6845_UPDATE_ROW( mda_lowres_text_blink_update_row ); -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - -public: std::unique_ptr<uint8_t[]> m_soft_chr_gen; - }; // device type definition |