summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/a2bus/a2videoterm.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/a2bus/a2videoterm.h')
-rw-r--r--src/devices/bus/a2bus/a2videoterm.h41
1 files changed, 22 insertions, 19 deletions
diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h
index 5f78b7fe91f..f9d407f785a 100644
--- a/src/devices/bus/a2bus/a2videoterm.h
+++ b/src/devices/bus/a2bus/a2videoterm.h
@@ -8,8 +8,10 @@
*********************************************************************/
-#ifndef __A2BUS_VIDEOTERM__
-#define __A2BUS_VIDEOTERM__
+#ifndef MAME_BUS_A2BUS_A2VIDEOTERM_H
+#define MAME_BUS_A2BUS_A2VIDEOTERM_H
+
+#pragma once
#include "a2bus.h"
#include "video/mc6845.h"
@@ -23,20 +25,16 @@ class a2bus_videx80_device:
public device_a2bus_card_interface
{
public:
- // construction/destruction
- a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
MC6845_UPDATE_ROW(crtc_update_row);
- uint8_t *m_rom, *m_chrrom;
- uint8_t m_ram[512*4];
- int m_framecnt;
-
protected:
+ // construction/destruction
+ a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,12 +46,15 @@ protected:
virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
+ uint8_t *m_rom, *m_chrrom;
+ uint8_t m_ram[512*4];
+ int m_framecnt;
+
required_device<mc6845_device> m_crtc;
+ required_device<palette_device> m_palette;
private:
int m_rambank;
-public:
- required_device<palette_device> m_palette;
};
class a2bus_videoterm_device : public a2bus_videx80_device
@@ -71,6 +72,7 @@ public:
virtual const tiny_rom_entry *device_rom_region() const override;
+protected:
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
};
@@ -82,6 +84,7 @@ public:
virtual const tiny_rom_entry *device_rom_region() const override;
+protected:
virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
};
@@ -110,11 +113,11 @@ public:
};
// device type definition
-extern const device_type A2BUS_VIDEOTERM;
-extern const device_type A2BUS_IBSAP16;
-extern const device_type A2BUS_IBSAP16ALT;
-extern const device_type A2BUS_VTC1;
-extern const device_type A2BUS_VTC2;
-extern const device_type A2BUS_AEVIEWMASTER80;
-
-#endif /* __A2BUS_VIDEOTERM__ */
+DECLARE_DEVICE_TYPE(A2BUS_VIDEOTERM, a2bus_videoterm_device)
+DECLARE_DEVICE_TYPE(A2BUS_IBSAP16, a2bus_ap16_device)
+DECLARE_DEVICE_TYPE(A2BUS_IBSAP16ALT, a2bus_ap16alt_device)
+DECLARE_DEVICE_TYPE(A2BUS_VTC1, a2bus_vtc1_device)
+DECLARE_DEVICE_TYPE(A2BUS_VTC2, a2bus_vtc2_device)
+DECLARE_DEVICE_TYPE(A2BUS_AEVIEWMASTER80, a2bus_aevm80_device)
+
+#endif // MAME_BUS_A2BUS_A2VIDEOTERM_H