diff options
Diffstat (limited to 'src/mame/includes/osi.h')
-rw-r--r-- | src/mame/includes/osi.h | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h index 62357dcdd9a..2e50c0d585d 100644 --- a/src/mame/includes/osi.h +++ b/src/mame/includes/osi.h @@ -45,6 +45,12 @@ public: , m_io_reset(*this, "Reset") { } + void osi600(machine_config &config); + +protected: + virtual void machine_start() override; + virtual void video_start() override; + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER( keyboard_r ); DECLARE_WRITE8_MEMBER( keyboard_w ); @@ -54,15 +60,11 @@ public: void floppy_index_callback(floppy_image_device *floppy, int state); - DECLARE_PALETTE_INIT(osi630); + void osi630_palette(palette_device &palette) const; - void osi600(machine_config &config); void osi600_video(machine_config &config); void osi630_video(machine_config &config); void osi600_mem(address_map &map); -protected: - virtual void machine_start() override; - virtual void video_start() override; required_device<cpu_device> m_maincpu; required_device<acia6850_device> m_acia_0; @@ -90,26 +92,28 @@ protected: class c1p_state : public sb2m600_state { public: - enum - { - TIMER_SETUP_BEEP - }; - c1p_state(const machine_config &mconfig, device_type type, const char *tag) : sb2m600_state(mconfig, type, tag) , m_beeper(*this, "beeper") { } + void init_c1p(); + void c1p(machine_config &config); + +protected: + enum + { + TIMER_SETUP_BEEP + }; + virtual void machine_start() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - required_device<beep_device> m_beeper; - DECLARE_WRITE8_MEMBER( osi630_ctrl_w ); DECLARE_WRITE8_MEMBER( osi630_sound_w ); - void init_c1p(); - void c1p(machine_config &config); void c1p_mem(address_map &map); + + required_device<beep_device> m_beeper; }; class c1pmf_state : public c1p_state @@ -119,17 +123,19 @@ public: : c1p_state(mconfig, type, tag) , m_floppy0(*this, "floppy0") , m_floppy1(*this, "floppy1") - { } + { } + + void c1pmf(machine_config &config); + +protected: + virtual void machine_start() override; DECLARE_READ8_MEMBER( osi470_pia_pa_r ); DECLARE_WRITE8_MEMBER( osi470_pia_pa_w ); DECLARE_WRITE8_MEMBER( osi470_pia_pb_w ); DECLARE_WRITE_LINE_MEMBER( osi470_pia_cb2_w ); - void c1pmf(machine_config &config); void c1pmf_mem(address_map &map); -protected: - virtual void machine_start() override; private: required_device<floppy_connector> m_floppy0; @@ -141,14 +147,16 @@ class uk101_state : public sb2m600_state public: uk101_state(const machine_config &mconfig, device_type type, const char *tag) : sb2m600_state(mconfig, type, tag) - { } + { } + + void uk101(machine_config &config); +protected: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER( keyboard_w ); - void uk101(machine_config &config); void uk101_video(machine_config &config); void uk101_mem(address_map &map); }; -#endif +#endif // MAME_INCLUDES_OSI_H |