ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3081 from lioncash/si-enum 

SI_Device: Convert define constants over to enums
This commit is contained in:
flacs 2015-09-23 18:55:10 +02:00
parent 9ac7e13d17 c7148c9660
commit 40da69d5a2
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/Core/HW/SI_Device.h
View File

@ -9,17 +9,26 @@
class PointerWrap; class PointerWrap;
// Devices can reply with these // Devices can reply with these
#define SI_ERROR_NO_RESPONSE 0x0008 // Nothing is attached enum
#define SI_ERROR_UNKNOWN 0x0040 // Unknown device is attached {
#define SI_ERROR_BUSY 0x0080 // Still detecting SI_ERROR_NO_RESPONSE = 0x0008, // Nothing is attached
SI_ERROR_UNKNOWN = 0x0040, // Unknown device is attached
SI_ERROR_BUSY = 0x0080 // Still detecting
};
// Device types // Device types
#define SI_TYPE_MASK 0x18000000u // ??? enum
#define SI_TYPE_GC 0x08000000u {
SI_TYPE_MASK = 0x18000000, // ???
SI_TYPE_GC = 0x08000000
};
// GC Controller types // GC Controller types
#define SI_GC_NOMOTOR 0x20000000u // No rumble motor enum
#define SI_GC_STANDARD 0x01000000u {
SI_GC_NOMOTOR = 0x20000000, // No rumble motor
SI_GC_STANDARD = 0x01000000
};
// SI Device IDs for emulator use // SI Device IDs for emulator use
enum TSIDevices enum TSIDevices