summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/cedar_magnet_sprite.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/cedar_magnet_sprite.h')
-rw-r--r--src/mame/machine/cedar_magnet_sprite.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/machine/cedar_magnet_sprite.h b/src/mame/machine/cedar_magnet_sprite.h
index f6882e50923..3bdf55ed0f0 100644
--- a/src/mame/machine/cedar_magnet_sprite.h
+++ b/src/mame/machine/cedar_magnet_sprite.h
@@ -1,18 +1,18 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_CEDAR_MAGNET_SPRITE_H
+#define MAME_MACHINE_CEDAR_MAGNET_SPRITE_H
#pragma once
-#ifndef CEDAR_MAGNET_SPRITE_DEF
-#define CEDAR_MAGNET_SPRITE_DEF
+#include "machine/cedar_magnet_board.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
#include "machine/bankdev.h"
-#include "machine/cedar_magnet_board.h"
-extern const device_type CEDAR_MAGNET_SPRITE;
+DECLARE_DEVICE_TYPE(CEDAR_MAGNET_SPRITE, cedar_magnet_sprite_device)
#define MCFG_CEDAR_MAGNET_SPRITE_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, CEDAR_MAGNET_SPRITE, 0)
@@ -24,11 +24,6 @@ public:
// construction/destruction
cedar_magnet_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- uint8_t m_framebuffer[0x10000];
- uint8_t pio2_pb_data;
-
- required_device<address_map_bank_device> m_sprite_ram_bankdev;
-
DECLARE_READ8_MEMBER(pio0_pa_r);
DECLARE_WRITE8_MEMBER(pio0_pa_w);
// DECLARE_READ8_MEMBER(pio0_pb_r);
@@ -52,11 +47,26 @@ public:
DECLARE_READ8_MEMBER(exzisus_hack_r);
- uint8_t m_upperaddr;
- uint8_t m_loweraddr;
+ INTERRUPT_GEN_MEMBER(irq);
+
+ uint32_t draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int palbase);
+protected:
+ virtual machine_config_constructor device_mconfig_additions() const override;
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+private:
void do_blit();
+ uint8_t m_framebuffer[0x10000];
+ uint8_t pio2_pb_data;
+
+ required_device<address_map_bank_device> m_sprite_ram_bankdev;
+
+ uint8_t m_upperaddr;
+ uint8_t m_loweraddr;
+
uint8_t m_spritesize;
uint8_t pio0_pb_data;
uint8_t m_spritecodelow;
@@ -65,19 +75,9 @@ public:
int m_high_write;
uint8_t m_uppersprite;
- INTERRUPT_GEN_MEMBER(irq);
-
required_device<z80pio_device> m_pio0;
required_device<z80pio_device> m_pio1;
required_device<z80pio_device> m_pio2;
-
- uint32_t draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int palbase);
-protected:
- virtual machine_config_constructor device_mconfig_additions() const override;
- virtual void device_start() override;
- virtual void device_reset() override;
-
-private:
};
-#endif
+#endif // MAME_MACHINE_CEDAR_MAGNET_SPRITE_H