summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/vic20/vic1010.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/vic20/vic1010.h')
-rw-r--r--src/devices/bus/vic20/vic1010.h31
1 files changed, 8 insertions, 23 deletions
diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h
index 3c02789b436..77082de99bb 100644
--- a/src/devices/bus/vic20/vic1010.h
+++ b/src/devices/bus/vic20/vic1010.h
@@ -6,24 +6,16 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_BUS_VIC20_VIC1010_H
+#define MAME_BUS_VIC20_VIC1010_H
-#ifndef __VIC1010__
-#define __VIC1010__
+#pragma once
#include "exp.h"
//**************************************************************************
-// MACROS/CONSTANTS
-//**************************************************************************
-
-#define MAX_SLOTS 6
-
-
-
-//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -49,20 +41,13 @@ protected:
virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
- required_device<vic20_expansion_slot_device> m_slot1;
- required_device<vic20_expansion_slot_device> m_slot2;
- required_device<vic20_expansion_slot_device> m_slot3;
- required_device<vic20_expansion_slot_device> m_slot4;
- required_device<vic20_expansion_slot_device> m_slot5;
- required_device<vic20_expansion_slot_device> m_slot6;
-
- vic20_expansion_slot_device *m_expansion_slot[MAX_SLOTS];
+ static constexpr unsigned MAX_SLOTS = 6;
+
+ required_device_array<vic20_expansion_slot_device, MAX_SLOTS> m_expansion_slot;
};
// device type definition
-extern const device_type VIC1010;
-
-
+DECLARE_DEVICE_TYPE(VIC1010, vic1010_device)
-#endif
+#endif // MAME_BUS_VIC20_VIC1010_H