From aff7a9310618ced944f3eb98539e8c13ae3eda7b Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 4 Dec 2021 08:26:28 -0500 Subject: [PATCH] Move DMAFlags to Flags.hpp. --- Machines/Amiga/Chipset.hpp | 16 ---------------- Machines/Amiga/Flags.hpp | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Machines/Amiga/Chipset.hpp b/Machines/Amiga/Chipset.hpp index d198f4cb1..555855902 100644 --- a/Machines/Amiga/Chipset.hpp +++ b/Machines/Amiga/Chipset.hpp @@ -37,22 +37,6 @@ namespace Amiga { -enum class DMAFlag: uint16_t { - AudioChannel0 = 1 << 0, - AudioChannel1 = 1 << 1, - AudioChannel2 = 1 << 2, - AudioChannel3 = 1 << 3, - Disk = 1 << 4, - Sprites = 1 << 5, - Blitter = 1 << 6, - Copper = 1 << 7, - Bitplane = 1 << 8, - AllBelow = 1 << 9, - BlitterPriority = 1 << 10, - BlitterZero = 1 << 13, - BlitterBusy = 1 << 14, -}; - class Chipset: private ClockingHint::Observer { public: Chipset(MemoryMap &memory_map, int input_clock_rate); diff --git a/Machines/Amiga/Flags.hpp b/Machines/Amiga/Flags.hpp index 301a47186..7fed0a7e1 100644 --- a/Machines/Amiga/Flags.hpp +++ b/Machines/Amiga/Flags.hpp @@ -28,6 +28,22 @@ enum class InterruptFlag: uint16_t { External = 1 << 13, // i.e. CIA B. }; +enum class DMAFlag: uint16_t { + AudioChannel0 = 1 << 0, + AudioChannel1 = 1 << 1, + AudioChannel2 = 1 << 2, + AudioChannel3 = 1 << 3, + Disk = 1 << 4, + Sprites = 1 << 5, + Blitter = 1 << 6, + Copper = 1 << 7, + Bitplane = 1 << 8, + AllBelow = 1 << 9, + BlitterPriority = 1 << 10, + BlitterZero = 1 << 13, + BlitterBusy = 1 << 14, +}; + }; #endif /* Flags_hpp */