summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-04-23 16:25:09 -0500
committerJordan Woyak <jordan.woyak@gmail.com>2019-04-23 16:25:09 -0500
commitd97349af0d9727e58a6be65653bbd3c2f19f5dab (patch)
tree107646da4785be50cf08fe7213a092bcc0511f34 /Source
parent127b4e77ec79ab065fe7d6f256ad26274b47800d (diff)
SI: Replace some unnamed enums with constexpr.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/HW/SI/SI_Device.h25
1 files changed, 8 insertions, 17 deletions
diff --git a/Source/Core/Core/HW/SI/SI_Device.h b/Source/Core/Core/HW/SI/SI_Device.h
index 7ddaf455d1..eaf4f0486b 100644
--- a/Source/Core/Core/HW/SI/SI_Device.h
+++ b/Source/Core/Core/HW/SI/SI_Device.h
@@ -12,29 +12,20 @@ class PointerWrap;
namespace SerialInterface
{
// Devices can reply with these
-enum
-{
- SI_ERROR_NO_RESPONSE = 0x0008, // Nothing is attached
- SI_ERROR_UNKNOWN = 0x0040, // Unknown device is attached
- SI_ERROR_BUSY = 0x0080 // Still detecting
-};
+constexpr u32 SI_ERROR_NO_RESPONSE = 0x0008; // Nothing is attached
+constexpr u32 SI_ERROR_UNKNOWN = 0x0040; // Unknown device is attached
+constexpr u32 SI_ERROR_BUSY = 0x0080; // Still detecting
// Device types
-enum
-{
- SI_TYPE_MASK = 0x18000000, // ???
- SI_TYPE_GC = 0x08000000
-};
+constexpr u32 SI_TYPE_MASK = 0x18000000; // ???
+constexpr u32 SI_TYPE_GC = 0x08000000;
// GC Controller types
-enum
-{
- SI_GC_NOMOTOR = 0x20000000, // No rumble motor
- SI_GC_STANDARD = 0x01000000
-};
+constexpr u32 SI_GC_NOMOTOR = 0x20000000; // No rumble motor
+constexpr u32 SI_GC_STANDARD = 0x01000000;
// SI Device IDs for emulator use
-enum TSIDevices
+enum TSIDevices : u32
{
SI_NONE = SI_ERROR_NO_RESPONSE,
SI_N64_MIC = 0x00010000,