Merge pull request #6 from SMOKE5/master

Fixed the inconsistency in the headers

5 files changed, 101 insertions, 101 deletions

diff --git a/include/user/ctrl.h b/include/user/ctrl.h
index ca95dd4..e250093 100644
--- a/include/user/ctrl.h
+++ b/include/user/ctrl.h
@@ -15,29 +15,29 @@ enum {
 
 /** Enumeration for the digital controller buttons. */
 enum {
-	PSP2_CTRL_SELECT	= 0x000001,	//!< Select button.
-	PSP2_CTRL_START		= 0x000008,	//!< Start button.
-	PSP2_CTRL_UP		= 0x000010,	//!< Up D-Pad button.
-	PSP2_CTRL_RIGHT		= 0x000020,	//!< Right D-Pad button.
-	PSP2_CTRL_DOWN		= 0x000040,	//!< Down D-Pad button.
-	PSP2_CTRL_LEFT		= 0x000080,	//!< Left D-Pad button.
-	PSP2_CTRL_LTRIGGER	= 0x000100,	//!< Left trigger.
-	PSP2_CTRL_RTRIGGER	= 0x000200,	//!< Right trigger.
-	PSP2_CTRL_TRIANGLE	= 0x001000,	//!< Triangle button.
-	PSP2_CTRL_CIRCLE	= 0x002000,	//!< Circle button.
-	PSP2_CTRL_CROSS		= 0x004000,	//!< Cross button.
-	PSP2_CTRL_SQUARE	= 0x008000,	//!< Square button.
-	PSP2_CTRL_ANY		= 0x010000	//!< Any input intercepted.
+	SCE_CTRL_SELECT     = 0x000001,	//!< Select button.
+	SCE_CTRL_START      = 0x000008,	//!< Start button.
+	SCE_CTRL_UP         = 0x000010,	//!< Up D-Pad button.
+	SCE_CTRL_RIGHT      = 0x000020,	//!< Right D-Pad button.
+	SCE_CTRL_DOWN       = 0x000040,	//!< Down D-Pad button.
+	SCE_CTRL_LEFT       = 0x000080,	//!< Left D-Pad button.
+	SCE_CTRL_LTRIGGER   = 0x000100,	//!< Left trigger.
+	SCE_CTRL_RTRIGGER   = 0x000200,	//!< Right trigger.
+	SCE_CTRL_TRIANGLE   = 0x001000,	//!< Triangle button.
+	SCE_CTRL_CIRCLE     = 0x002000,	//!< Circle button.
+	SCE_CTRL_CROSS      = 0x004000,	//!< Cross button.
+	SCE_CTRL_SQUARE     = 0x008000,	//!< Square button.
+	SCE_CTRL_ANY        = 0x010000	//!< Any input intercepted.
 };
 
 /** Controller mode. */
 enum {
 	/** Digitial buttons only. */
-	PSP2_CTRL_MODE_DIGITAL = 0,
+	SCE_CTRL_MODE_DIGITAL = 0,
 	/** Digital buttons + Analog support. */
-	PSP2_CTRL_MODE_ANALOG,
+	SCE_CTRL_MODE_ANALOG = 1,
 	/** Same as ::PSP2_CTRL_MODE_ANALOG, but with larger range for analog sticks. */
-	PSP2_CTRL_MODE_ANALOG_WIDE
+	SCE_CTRL_MODE_ANALOG_WIDE = 2
 };
 
 /** Returned controller data */
diff --git a/include/user/display.h b/include/user/display.h
index a0aa1e5..783c172 100644
--- a/include/user/display.h
+++ b/include/user/display.h
@@ -20,13 +20,13 @@ enum {
 	SCE_DISPLAY_ERROR_NO_PIXEL_DATA		= 0x80290008
 };
 
-#define PSP2_DISPLAY_PIXELFORMAT_A8B8G8R8 0x00000000U
+#define SCE_DISPLAY_PIXELFORMAT_A8B8G8R8 0x00000000U
 
 enum {
 	/** Buffer change effective immediately */
-	PSP2_DISPLAY_SETBUF_IMMEDIATE = 0,
+	SCE_DISPLAY_SETBUF_IMMEDIATE = 0,
 	/** Buffer change effective next frame */
-	PSP2_DISPLAY_SETBUF_NEXTFRAME = 1
+	SCE_DISPLAY_SETBUF_NEXTFRAME = 1
 };
 
 /**
diff --git a/include/user/kernel/processmgr.h b/include/user/kernel/processmgr.h
index e5e2a12..68008c0 100644
--- a/include/user/kernel/processmgr.h
+++ b/include/user/kernel/processmgr.h
@@ -9,26 +9,26 @@ extern "C" {
 #endif
 
 enum {
-	PSP2_KERNEL_PROCESS_PRIORITY_SYSTEM_HIGH	= 32,
-	PSP2_KERNEL_PROCESS_PRIORITY_SYSTEM_DEFAULT	= 96,
-	PSP2_KERNEL_PROCESS_PRIORITY_SYSTEM_LOW		= 159
+	SCE_KERNEL_PROCESS_PRIORITY_SYSTEM_HIGH	= 32,
+	SCE_KERNEL_PROCESS_PRIORITY_SYSTEM_DEFAULT	= 96,
+	SCE_KERNEL_PROCESS_PRIORITY_SYSTEM_LOW		= 159
 };
 
 enum {
-	PSP2_KERNEL_PROCESS_PRIORITY_USER_HIGH		= 64,
-	PSP2_KERNEL_PROCESS_PRIORITY_USER_DEFAULT	= 96,
-	PSP2_KERNEL_PROCESS_PRIORITY_USER_LOW		= 127
+	SCE_KERNEL_PROCESS_PRIORITY_USER_HIGH		= 64,
+	SCE_KERNEL_PROCESS_PRIORITY_USER_DEFAULT	= 96,
+	SCE_KERNEL_PROCESS_PRIORITY_USER_LOW		= 127
 };
 
 enum {
 	/** Cancel all timers */
-	PSP2_KERNEL_POWER_TICK_DEFAULT				= 0,
+	SCE_KERNEL_POWER_TICK_DEFAULT				= 0,
 	/** Cancel automatic suspension timer */
-	PSP2_KERNEL_POWER_TICK_DISABLE_AUTO_SUSPEND	= 1,
+	SCE_KERNEL_POWER_TICK_DISABLE_AUTO_SUSPEND	= 1,
 	/** Cancel OLED-off timer */
-	PSP2_KERNEL_POWER_TICK_DISABLE_OLED_OFF		= 4,
+	SCE_KERNEL_POWER_TICK_DISABLE_OLED_OFF		= 4,
 	/** Cancel OLED dimming timer */
-	PSP2_KERNEL_POWER_TICK_DISABLE_OLED_DIMMING	= 6
+	SCE_KERNEL_POWER_TICK_DISABLE_OLED_DIMMING	= 6
 };
 
 /***
diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h
index ea2513a..a21d3d6 100644
--- a/include/user/kernel/threadmgr.h
+++ b/include/user/kernel/threadmgr.h
@@ -87,15 +87,15 @@ typedef struct SceKernelThreadRunStatus {
 } SceKernelThreadRunStatus;
 
 /* Sure there must be more than this, but haven't seen them */
-typedef enum Psp2ThreadStatus
+typedef enum SceThreadStatus
 {
-	PSP2_THREAD_RUNNING = 1,
-	PSP2_THREAD_READY   = 2,
-	PSP2_THREAD_WAITING = 4,
-	PSP2_THREAD_SUSPEND = 8,
-	PSP2_THREAD_STOPPED = 16,
-	PSP2_THREAD_KILLED  = 32, /* Thread manager has killed the thread (stack overflow) */
-} Psp2ThreadStatus;
+	SCE_THREAD_RUNNING = 1,
+	SCE_THREAD_READY   = 2,
+	SCE_THREAD_WAITING = 4,
+	SCE_THREAD_SUSPEND = 8,
+	SCE_THREAD_STOPPED = 16,
+	SCE_THREAD_KILLED  = 32, /* Thread manager has killed the thread (stack overflow) */
+} SceThreadStatus;
 
 /**
  * Create a thread
@@ -110,7 +110,7 @@ typedef enum Psp2ThreadStatus
  * @param entry - The thread function to run when started.
  * @param initPriority - The initial priority of the thread. Less if higher priority.
  * @param stackSize - The size of the initial stack.
- * @param attr - The thread attributes, zero or more of ::Psp2ThreadAttributes.
+ * @param attr - The thread attributes, zero or more of ::SceThreadAttributes.
  * @param cpuAffinityMask - The CPU affinity mask
  * @param option - Additional options specified by ::SceKernelThreadOptParam.
 
@@ -202,7 +202,7 @@ int sceKernelDelayThreadCB(SceUInt delay);
  * Modify the attributes of the current thread.
  *
  * @param unknown - Set to 0.
- * @param attr - The thread attributes to modify.  One of ::Psp2ThreadAttributes.
+ * @param attr - The thread attributes to modify.  One of ::SceThreadAttributes.
  *
  * @return < 0 on error.
  */
@@ -599,26 +599,26 @@ typedef struct SceKernelEventFlagOptParam {
 typedef struct SceKernelEventFlagOptParam SceKernelEventFlagOptParam;
 
 /** Event flag creation attributes */
-typedef enum Psp2EventFlagAttributes {
+typedef enum SceEventFlagAttributes {
 	/** Allow the event flag to be waited upon by multiple threads */
-	PSP2_EVENT_WAITMULTIPLE = 0x200
-} Psp2EventFlagAttributes;
+	SCE_EVENT_WAITMULTIPLE = 0x200
+} SceEventFlagAttributes;
 
 /** Event flag wait types */
-typedef enum Psp2EventFlagWaitTypes {
+typedef enum SceEventFlagWaitTypes {
 	/** Wait for all bits in the pattern to be set */
-	PSP2_EVENT_WAITAND = 0,
+	SCE_EVENT_WAITAND = 0,
 	/** Wait for one or more bits in the pattern to be set */
-	PSP2_EVENT_WAITOR  = 1,
+	SCE_EVENT_WAITOR  = 1,
 	/** Clear the wait pattern when it matches */
-	PSP2_EVENT_WAITCLEAR = 0x20
-} Psp2EventFlagWaitTypes;
+	SCE_EVENT_WAITCLEAR = 0x20
+} SceEventFlagWaitTypes;
 
 /**
   * Create an event flag.
   *
   * @param name - The name of the event flag.
-  * @param attr - Attributes from ::Psp2EventFlagAttributes
+  * @param attr - Attributes from ::SceEventFlagAttributes
   * @param bits - Initial bit pattern.
   * @param opt  - Options, set to NULL
   * @return < 0 on error. >= 0 event flag id.
@@ -656,7 +656,7 @@ int sceKernelClearEventFlag(SceUID evid, unsigned int bits);
   *
   * @param evid - The event id returned by sceKernelCreateEventFlag.
   * @param bits - The bit pattern to poll for.
-  * @param wait - Wait type, one or more of ::Psp2EventFlagWaitTypes or'ed together
+  * @param wait - Wait type, one or more of ::SceEventFlagWaitTypes or'ed together
   * @param outBits - The bit pattern that was matched.
   * @return < 0 On error
   */
@@ -667,7 +667,7 @@ int sceKernelPollEventFlag(int evid, unsigned int bits, unsigned int wait, unsig
   *
   * @param evid - The event id returned by sceKernelCreateEventFlag.
   * @param bits - The bit pattern to poll for.
-  * @param wait - Wait type, one or more of ::Psp2EventFlagWaitTypes or'ed together
+  * @param wait - Wait type, one or more of ::SceEventFlagWaitTypes or'ed together
   * @param outBits - The bit pattern that was matched.
   * @param timeout  - Timeout in microseconds
   * @return < 0 On error
@@ -679,7 +679,7 @@ int sceKernelWaitEventFlag(int evid, unsigned int bits, unsigned int wait, unsig
   *
   * @param evid - The event id returned by sceKernelCreateEventFlag.
   * @param bits - The bit pattern to poll for.
-  * @param wait - Wait type, one or more of ::Psp2EventFlagWaitTypes or'ed together
+  * @param wait - Wait type, one or more of ::SceEventFlagWaitTypes or'ed together
   * @param outBits - The bit pattern that was matched.
   * @param timeout  - Timeout in microseconds
   * @return < 0 On error
diff --git a/include/user/sysmodule.h b/include/user/sysmodule.h
index 109983d..163db4d 100644
--- a/include/user/sysmodule.h
+++ b/include/user/sysmodule.h
@@ -16,56 +16,56 @@ enum {
 
 /* module IDs */
 enum {
-	PSP2_SYSMODULE_INVALID					= 0x0000,
-	PSP2_SYSMODULE_NET						= 0x0001,
-	PSP2_SYSMODULE_HTTP						= 0x0002,
-	PSP2_SYSMODULE_SSL						= 0x0003,
-	PSP2_SYSMODULE_HTTPS					= 0x0004,
-	PSP2_SYSMODULE_PERF						= 0x0005,
-	PSP2_SYSMODULE_FIBER					= 0x0006,
-	PSP2_SYSMODULE_ULT						= 0x0007,
-	PSP2_SYSMODULE_DBG						= 0x0008,
-	PSP2_SYSMODULE_RAZOR_CAPTURE			= 0x0009,
-	PSP2_SYSMODULE_RAZOR_HUD				= 0x000a,
-	PSP2_SYSMODULE_NGS						= 0x000b,
-	PSP2_SYSMODULE_SULPHA					= 0x000c,
-	PSP2_SYSMODULE_SAS						= 0x000d,
-	PSP2_SYSMODULE_PGF						= 0x000e,
-	PSP2_SYSMODULE_APPUTIL					= 0x000f,
-	PSP2_SYSMODULE_FIOS2					= 0x0010,
-	PSP2_SYSMODULE_IME						= 0x0011,
-	PSP2_SYSMODULE_NP_BASIC					= 0x0012,
-	PSP2_SYSMODULE_SYSTEM_GESTURE			= 0x0013,
-	PSP2_SYSMODULE_LOCATION					= 0x0014,
-	PSP2_SYSMODULE_NP						= 0x0015,
-	PSP2_SYSMODULE_PHOTO_EXPORT				= 0x0016,
-	PSP2_SYSMODULE_XML						= 0x0017,
-	PSP2_SYSMODULE_NP_COMMERCE2				= 0x0018,
-	PSP2_SYSMODULE_NP_UTILITY				= 0x0019,
-	PSP2_SYSMODULE_VOICE					= 0x001a,
-	PSP2_SYSMODULE_VOICEQOS					= 0x001b,
-	PSP2_SYSMODULE_NP_MATCHING2				= 0x001c,
-	PSP2_SYSMODULE_SCREEN_SHOT				= 0x001d,
-	PSP2_SYSMODULE_NP_SCORE_RANKING			= 0x001e,
-	PSP2_SYSMODULE_SQLITE					= 0x001f,
-	PSP2_SYSMODULE_RUDP						= 0x0021,
-	PSP2_SYSMODULE_CODECENGINE_PERF			= 0x0022,
-	PSP2_SYSMODULE_LIVEAREA					= 0x0023,
-	PSP2_SYSMODULE_NP_ACTIVITY				= 0x0024,
-	PSP2_SYSMODULE_NP_TROPHY				= 0x0025,
-	PSP2_SYSMODULE_NP_MESSAGE				= 0x0026,
-	PSP2_SYSMODULE_SHUTTER_SOUND			= 0x0027,
-	PSP2_SYSMODULE_CLIPBOARD				= 0x0028,
-	PSP2_SYSMODULE_NP_PARTY					= 0x0029,
-	PSP2_SYSMODULE_NET_ADHOC_MATCHING		= 0x002a,
-	PSP2_SYSMODULE_NEAR_UTIL				= 0x002b,
-	PSP2_SYSMODULE_NP_TUS					= 0x002c,
-	PSP2_SYSMODULE_MP4						= 0x002d,
-	PSP2_SYSMODULE_HANDWRITING				= 0x002f,
-	PSP2_SYSMODULE_ATRAC					= 0x0030,
-	PSP2_SYSMODULE_NP_SNS_FACEBOOK			= 0x0031,
-	PSP2_SYSMODULE_FACE						= 0x0038,
-	PSP2_SYSMODULE_SMART					= 0x0039
+	SCE_SYSMODULE_INVALID               = 0x0000,
+	SCE_SYSMODULE_NET                   = 0x0001,
+	SCE_SYSMODULE_HTTP                  = 0x0002,
+	SCE_SYSMODULE_SSL                   = 0x0003,
+	SCE_SYSMODULE_HTTPS                 = 0x0004,
+	SCE_SYSMODULE_PERF                  = 0x0005,
+	SCE_SYSMODULE_FIBER                 = 0x0006,
+	SCE_SYSMODULE_ULT                   = 0x0007,
+	SCE_SYSMODULE_DBG                   = 0x0008,
+	SCE_SYSMODULE_RAZOR_CAPTURE         = 0x0009,
+	SCE_SYSMODULE_RAZOR_HUD             = 0x000a,
+	SCE_SYSMODULE_NGS                   = 0x000b,
+	SCE_SYSMODULE_SULPHA                = 0x000c,
+	SCE_SYSMODULE_SAS                   = 0x000d,
+	SCE_SYSMODULE_PGF                   = 0x000e,
+	SCE_SYSMODULE_APPUTIL               = 0x000f,
+	SCE_SYSMODULE_FIOS2                 = 0x0010,
+	SCE_SYSMODULE_IME                   = 0x0011,
+	SCE_SYSMODULE_NP_BASIC              = 0x0012,
+	SCE_SYSMODULE_SYSTEM_GESTURE        = 0x0013,
+	SCE_SYSMODULE_LOCATION              = 0x0014,
+	SCE_SYSMODULE_NP                    = 0x0015,
+	SCE_SYSMODULE_PHOTO_EXPORT          = 0x0016,
+	SCE_SYSMODULE_XML                   = 0x0017,
+	SCE_SYSMODULE_NP_COMMERCE2          = 0x0018,
+	SCE_SYSMODULE_NP_UTILITY            = 0x0019,
+	SCE_SYSMODULE_VOICE                 = 0x001a,
+	SCE_SYSMODULE_VOICEQOS              = 0x001b,
+	SCE_SYSMODULE_NP_MATCHING2          = 0x001c,
+	SCE_SYSMODULE_SCREEN_SHOT           = 0x001d,
+	SCE_SYSMODULE_NP_SCORE_RANKING      = 0x001e,
+	SCE_SYSMODULE_SQLITE                = 0x001f,
+	SCE_SYSMODULE_RUDP                  = 0x0021,
+	SCE_SYSMODULE_CODECENGINE_PERF      = 0x0022,
+	SCE_SYSMODULE_LIVEAREA              = 0x0023,
+	SCE_SYSMODULE_NP_ACTIVITY           = 0x0024,
+	SCE_SYSMODULE_NP_TROPHY             = 0x0025,
+	SCE_SYSMODULE_NP_MESSAGE            = 0x0026,
+	SCE_SYSMODULE_SHUTTER_SOUND         = 0x0027,
+	SCE_SYSMODULE_CLIPBOARD             = 0x0028,
+	SCE_SYSMODULE_NP_PARTY              = 0x0029,
+	SCE_SYSMODULE_NET_ADHOC_MATCHING    = 0x002a,
+	SCE_SYSMODULE_NEAR_UTIL             = 0x002b,
+	SCE_SYSMODULE_NP_TUS                = 0x002c,
+	SCE_SYSMODULE_MP4                   = 0x002d,
+	SCE_SYSMODULE_HANDWRITING           = 0x002f,
+	SCE_SYSMODULE_ATRAC                 = 0x0030,
+	SCE_SYSMODULE_NP_SNS_FACEBOOK       = 0x0031,
+	SCE_SYSMODULE_FACE                  = 0x0038,
+	SCE_SYSMODULE_SMART                 = 0x0039
 };
 
 int sceSysmoduleLoadModule(SceUInt16 id);