Merge pull request #5598 from lioncash/vertical-alignments

Fix up some vertical alignments in misc Core source files.

Core/Dialog/PSPOskDialog.h

@@ -46,11 +46,11 @@ enum SceUtilityOskInputLanguage
 enum SceUtilityOskState
 {
 	PSP_UTILITY_OSK_DIALOG_NONE     = 0, /**< No OSK is currently active */
-	PSP_UTILITY_OSK_DIALOG_INITING,		/**< The OSK is currently being initialized */
-	PSP_UTILITY_OSK_DIALOG_INITED,		/**< The OSK is initialised */
-	PSP_UTILITY_OSK_DIALOG_VISIBLE,		/**< The OSK is visible and ready for use */
-	PSP_UTILITY_OSK_DIALOG_QUIT,		/**< The OSK has been cancelled and should be shut down */
-	PSP_UTILITY_OSK_DIALOG_FINISHED		/**< The OSK has successfully shut down */	
+	PSP_UTILITY_OSK_DIALOG_INITING  = 1, /**< The OSK is currently being initialized */
+	PSP_UTILITY_OSK_DIALOG_INITED   = 2, /**< The OSK is initialised */
+	PSP_UTILITY_OSK_DIALOG_VISIBLE  = 3, /**< The OSK is visible and ready for use */
+	PSP_UTILITY_OSK_DIALOG_QUIT     = 4, /**< The OSK has been cancelled and should be shut down */
+	PSP_UTILITY_OSK_DIALOG_FINISHED = 5  /**< The OSK has successfully shut down */	
 };
 
 /**
@@ -59,8 +59,8 @@ enum SceUtilityOskState
 enum SceUtilityOskResult
 {
 	PSP_UTILITY_OSK_RESULT_UNCHANGED = 0,
-	PSP_UTILITY_OSK_RESULT_CANCELLED,
-	PSP_UTILITY_OSK_RESULT_CHANGED
+	PSP_UTILITY_OSK_RESULT_CANCELLED = 1,
+	PSP_UTILITY_OSK_RESULT_CHANGED   = 2
 };
 
 /**

Core/ELF/ElfTypes.h

@@ -25,27 +25,27 @@
 // File type
 enum ElfType
 {
-	ET_NONE        =0,
-	ET_REL         =1,
-	ET_EXEC        =2,
-	ET_DYN         =3,
-	ET_CORE        =4,
-	ET_LOPROC =0xFF00,
-	ET_HIPROC =0xFFFF,
-	ET_PSP_PRX=0xFFA0,
+    ET_NONE    = 0,
+    ET_REL     = 1,
+    ET_EXEC    = 2,
+    ET_DYN     = 3,
+    ET_CORE    = 4,
+    ET_LOPROC  = 0xFF00,
+    ET_HIPROC  = 0xFFFF,
+    ET_PSP_PRX = 0xFFA0,
 };
 
 // Machine/Architecture
 enum ElfMachine
 {
-	EM_NONE  =0,
-	EM_M32   =1,
-	EM_SPARC =2,
-	EM_386   =3,
-	EM_68K   =4,
-	EM_88K   =5,
-	EM_860   =7,
-	EM_MIPS  =8
+	EM_NONE  = 0,
+	EM_M32   = 1,
+	EM_SPARC = 2,
+	EM_386   = 3,
+	EM_68K   = 4,
+	EM_88K   = 5,
+	EM_860   = 7,
+	EM_MIPS  = 8
 };
 
 // File version

Core/FileSystems/FileSystem.h

@@ -22,25 +22,25 @@
 
 enum FileAccess
 {
-	FILEACCESS_NONE=0,
-	FILEACCESS_READ=1,
-	FILEACCESS_WRITE=2,
-	FILEACCESS_APPEND=4,
-	FILEACCESS_CREATE=8,
-	FILEACCESS_TRUNCATE=16,
+	FILEACCESS_NONE     = 0,
+	FILEACCESS_READ     = 1,
+	FILEACCESS_WRITE    = 2,
+	FILEACCESS_APPEND   = 4,
+	FILEACCESS_CREATE   = 8,
+	FILEACCESS_TRUNCATE = 16,
 };
 
 enum FileMove
 {
-	FILEMOVE_BEGIN=0,
-	FILEMOVE_CURRENT=1,
-	FILEMOVE_END=2
+	FILEMOVE_BEGIN   = 0,
+	FILEMOVE_CURRENT = 1,
+	FILEMOVE_END     = 2
 };
 
 enum FileType
 {
-	FILETYPE_NORMAL=1,
-	FILETYPE_DIRECTORY=2
+	FILETYPE_NORMAL    = 1,
+	FILETYPE_DIRECTORY = 2
 };
 
 enum DevType

Core/HLE/sceIo.cpp

@@ -128,8 +128,8 @@ const int IO_THREAD_MIN_DATA_SIZE = 0;
 #define SCE_STM_FLNK 0x4000
 
 enum {
-	TYPE_DIR=0x10,
-	TYPE_FILE=0x20
+	TYPE_DIR  = 0x10,
+	TYPE_FILE = 0x20
 };
 
 #ifdef __SYMBIAN32__

Core/HLE/sceKernelInterrupt.cpp

@@ -540,7 +540,7 @@ struct PspIntrHandlerOptionParam {
 	u32 min_clock_hi;      //+2C
 	u32 max_clock_lo;      //+30
 	u32 max_clock_hi;      //+34
-} ;		//=38
+};  //=38
 
 void QueryIntrHandlerInfo()
 {

Core/HLE/sceKernelThread.cpp

@@ -88,7 +88,7 @@ const char *getWaitTypeName(WaitType type)
 	return "Unknown";
 }
 
-enum {
+	enum {
 	PSP_THREAD_ATTR_KERNEL       = 0x00001000,
 	PSP_THREAD_ATTR_VFPU         = 0x00004000,
 	PSP_THREAD_ATTR_SCRATCH_SRAM = 0x00008000, // Save/restore scratch as part of context???

Core/MIPS/MIPSDis.cpp

@@ -30,7 +30,7 @@
 #define _FT   ((op>>16) & 0x1F)
 #define _FD   ((op>>6 ) & 0x1F)
 #define _POS  ((op>>6 ) & 0x1F)
-#define _SIZE ((op>>11 ) & 0x1F)
+#define _SIZE ((op>>11) & 0x1F)
 
 #define RN(i) currentDebugMIPS->GetRegName(0,i)
 #define FN(i) currentDebugMIPS->GetRegName(1,i)

Core/MIPS/MIPSDisVFPU.cpp

@@ -31,7 +31,7 @@
 #define _FT   ((op>>16) & 0x1F)
 #define _FD   ((op>>6 ) & 0x1F)
 #define _POS  ((op>>6 ) & 0x1F)
-#define _SIZE ((op>>11 ) & 0x1F)
+#define _SIZE ((op>>11) & 0x1F)
 
 
 #define RN(i) currentDebugMIPS->GetRegName(0,i)

Core/MIPS/MIPSInt.cpp

@@ -48,7 +48,7 @@
 #define _FT   ((op>>16) & 0x1F)
 #define _FD   ((op>>6 ) & 0x1F)
 #define _POS  ((op>>6 ) & 0x1F)
-#define _SIZE ((op>>11 ) & 0x1F)
+#define _SIZE ((op>>11) & 0x1F)
 
 #define HI currentMIPS->hi
 #define LO currentMIPS->lo

Core/MIPS/MIPSIntVFPU.cpp

@@ -38,14 +38,14 @@
 #define FsI(i) (currentMIPS->fs[i])
 #define PC     (currentMIPS->pc)
 
-#define _RS   ((op >> 21) & 0x1F)
-#define _RT   ((op >> 16) & 0x1F)
+#define _RS   ((op>>21) & 0x1F)
+#define _RT   ((op>>16) & 0x1F)
 #define _RD   ((op>>11) & 0x1F)
 #define _FS   ((op>>11) & 0x1F)
-#define _FT   ((op >> 16) & 0x1F)
+#define _FT   ((op>>16) & 0x1F)
 #define _FD   ((op>>6 ) & 0x1F)
 #define _POS  ((op>>6 ) & 0x1F)
-#define _SIZE ((op>>11 ) & 0x1F)
+#define _SIZE ((op>>11) & 0x1F)
 
 #define HI currentMIPS->hi
 #define LO currentMIPS->lo

Core/MIPS/PPC/PpcCompLoadStore.cpp

@@ -19,7 +19,7 @@
 #define _FT   ((op>>16) & 0x1F)
 #define _FD   ((op>>6 ) & 0x1F)
 #define _POS  ((op>>6 ) & 0x1F)
-#define _SIZE ((op>>11 ) & 0x1F)
+#define _SIZE ((op>>11) & 0x1F)
 
 // All functions should have CONDITIONAL_DISABLE, so we can narrow things down to a file quickly.
 // Currently known non working ones should have DISABLE.