summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/osborne1.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/osborne1.h')
-rw-r--r--src/mame/includes/osborne1.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h
index 27bf0bf0d77..68691cb27ce 100644
--- a/src/mame/includes/osborne1.h
+++ b/src/mame/includes/osborne1.h
@@ -33,6 +33,7 @@ class osborne1_state : public driver_device
public:
osborne1_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
+ m_ram(*this, RAM_TAG),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
@@ -41,7 +42,6 @@ public:
m_pia1(*this, "pia_1"),
m_acia(*this, "acia"),
m_fdc(*this, "mb8877"),
- m_ram(*this, RAM_TAG),
m_ieee(*this, IEEE488_TAG),
m_floppy0(*this, "mb8877:0"),
m_floppy1(*this, "mb8877:1"),
@@ -59,7 +59,16 @@ public:
{
}
+ void osborne1(machine_config &config);
+
+ void init_osborne1();
+ DECLARE_INPUT_CHANGED_MEMBER(reset_key);
+
+ void osborne1nv_io(address_map &map);
+ required_device<ram_device> m_ram;
+
+private:
DECLARE_WRITE8_MEMBER(bank_0xxx_w);
DECLARE_WRITE8_MEMBER(bank_1xxx_w);
DECLARE_READ8_MEMBER(bank_2xxx_3xxx_r);
@@ -80,9 +89,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(serial_acia_irq_func);
- DECLARE_INPUT_CHANGED_MEMBER(reset_key);
- void init_osborne1();
virtual void machine_reset() override;
virtual void video_start() override;
u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -95,17 +102,14 @@ public:
required_device<pia6821_device> m_pia1;
required_device<acia6850_device> m_acia;
required_device<mb8877_device> m_fdc;
- required_device<ram_device> m_ram;
required_device<ieee488_device> m_ieee;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
- void osborne1(machine_config &config);
void osborne1_io(address_map &map);
void osborne1_mem(address_map &map);
void osborne1_op(address_map &map);
- void osborne1nv_io(address_map &map);
-protected:
+
TIMER_CALLBACK_MEMBER(video_callback);
TIMER_CALLBACK_MEMBER(acia_rxc_txc_callback);