diff options
-rw-r--r-- | src/devices/bus/saitek_osa/expansion.h | 5 | ||||
-rw-r--r-- | src/devices/bus/saitek_osa/maestro.h | 9 | ||||
-rw-r--r-- | src/devices/bus/saitek_osa/maestroa.h | 4 | ||||
-rw-r--r-- | src/devices/bus/saitek_osa/sparc.h | 5 | ||||
-rw-r--r-- | src/devices/video/i8244.h | 9 |
5 files changed, 11 insertions, 21 deletions
diff --git a/src/devices/bus/saitek_osa/expansion.h b/src/devices/bus/saitek_osa/expansion.h index cb513bf2f4e..f155754cea4 100644 --- a/src/devices/bus/saitek_osa/expansion.h +++ b/src/devices/bus/saitek_osa/expansion.h @@ -31,6 +31,8 @@ #include "screen.h" +DECLARE_DEVICE_TYPE(SAITEKOSA_EXPANSION, saitekosa_expansion_device) + //************************************************************************** // TYPE DEFINITIONS @@ -122,7 +124,4 @@ protected: void saitekosa_expansion_modules(device_slot_interface &device); -// device type definition -DECLARE_DEVICE_TYPE(SAITEKOSA_EXPANSION, saitekosa_expansion_device) - #endif // MAME_BUS_SAITEKOSA_EXPANSION_H diff --git a/src/devices/bus/saitek_osa/maestro.h b/src/devices/bus/saitek_osa/maestro.h index fee4b497d03..89c580c9ef5 100644 --- a/src/devices/bus/saitek_osa/maestro.h +++ b/src/devices/bus/saitek_osa/maestro.h @@ -16,6 +16,9 @@ #include "bus/generic/slot.h" #include "video/hd44780.h" +DECLARE_DEVICE_TYPE(OSA_MAESTRO, saitekosa_maestro_device) +DECLARE_DEVICE_TYPE(OSA_ANALYST, saitekosa_analyst_device) + class saitekosa_maestro_device : public device_t, public device_saitekosa_expansion_interface { @@ -69,6 +72,8 @@ public: virtual u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; + static auto parent_rom_device_type() { return &OSA_MAESTRO; } + protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; @@ -80,8 +85,4 @@ private: virtual void main_map(address_map &map) override; }; - -DECLARE_DEVICE_TYPE(OSA_MAESTRO, saitekosa_maestro_device) -DECLARE_DEVICE_TYPE(OSA_ANALYST, saitekosa_analyst_device) - #endif // MAME_BUS_SAITEKOSA_MAESTRO_H diff --git a/src/devices/bus/saitek_osa/maestroa.h b/src/devices/bus/saitek_osa/maestroa.h index 11bb1a26711..35b5744f07d 100644 --- a/src/devices/bus/saitek_osa/maestroa.h +++ b/src/devices/bus/saitek_osa/maestroa.h @@ -13,6 +13,8 @@ #include "expansion.h" +DECLARE_DEVICE_TYPE(OSA_MAESTROA, saitekosa_maestroa_device) + class saitekosa_maestroa_device : public device_t, public device_saitekosa_expansion_interface { @@ -52,6 +54,4 @@ private: }; -DECLARE_DEVICE_TYPE(OSA_MAESTROA, saitekosa_maestroa_device) - #endif // MAME_BUS_SAITEKOSA_MAESTROA_H diff --git a/src/devices/bus/saitek_osa/sparc.h b/src/devices/bus/saitek_osa/sparc.h index 6cc3fcea950..63855ff0a63 100644 --- a/src/devices/bus/saitek_osa/sparc.h +++ b/src/devices/bus/saitek_osa/sparc.h @@ -15,6 +15,8 @@ #include "cpu/sparc/sparc.h" +DECLARE_DEVICE_TYPE(OSA_SPARC, saitekosa_sparc_device) + class saitekosa_sparc_device : public device_t, public device_saitekosa_expansion_interface { @@ -39,7 +41,4 @@ private: void main_map(address_map &map); }; - -DECLARE_DEVICE_TYPE(OSA_SPARC, saitekosa_sparc_device) - #endif // MAME_BUS_SAITEKOSA_SPARC_H diff --git a/src/devices/video/i8244.h b/src/devices/video/i8244.h index 5d05760ee26..245907fd604 100644 --- a/src/devices/video/i8244.h +++ b/src/devices/video/i8244.h @@ -35,19 +35,10 @@ */ - -//************************************************************************** -// DEVICE TYPE DECLARATION -//************************************************************************** - DECLARE_DEVICE_TYPE(I8244, i8244_device) DECLARE_DEVICE_TYPE(I8245, i8245_device) -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - class i8244_device : public device_t , public device_sound_interface , public device_video_interface |