diff options
| author | Sunguk Lee | 2017-12-21 16:38:01 +0900 |
|---|---|---|
| committer | GitHub | 2017-12-21 16:38:01 +0900 |
| commit | 2a897c614438dcc2b6cb8e13295d4c2a3a832d0b (patch) | |
| tree | bdee0b16585e63611de975a42557ab8c058064e9 /include | |
| parent | Added SCE_DISPLAY_ERROR_NO_OUTPUT_SIGNAL reference (diff) | |
| parent | Update ctrl.h (diff) | |
| download | vds-libraries-2a897c614438dcc2b6cb8e13295d4c2a3a832d0b.tar.gz | |
Merge pull request #264 from Rinnegatamante/patch-16
Added some missing stuffs in sceCtrl header.
Diffstat (limited to 'include')
| -rw-r--r-- | include/user/ctrl.h | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/include/user/ctrl.h b/include/user/ctrl.h index 1261dd3..7bca5b9 100644 --- a/include/user/ctrl.h +++ b/include/user/ctrl.h @@ -11,6 +11,9 @@ extern "C" { typedef enum SceCtrlErrorCode { SCE_CTRL_ERROR_INVALID_ARG = 0x80340001, SCE_CTRL_ERROR_PRIV_REQUIRED = 0x80340002, + SCE_CTRL_ERROR_NO_DEVICE = 0x80340020, + SCE_CTRL_ERROR_NOT_SUPPORTED = 0x80340021, + SCE_CTRL_ERROR_INVALID_MODE = 0x80340022, SCE_CTRL_ERROR_FATAL = 0x803400FF } SceCtrlErrorCode; @@ -28,7 +31,9 @@ typedef enum SceCtrlButtons { SCE_CTRL_DOWN = 0x00000040, //!< Down D-Pad button. SCE_CTRL_LEFT = 0x00000080, //!< Left D-Pad button. SCE_CTRL_LTRIGGER = 0x00000100, //!< Left trigger. + SCE_CTRL_L2 = SCE_CTRL_LTRIGGER, //!< L2 button. SCE_CTRL_RTRIGGER = 0x00000200, //!< Right trigger. + SCE_CTRL_R2 = SCE_CTRL_RTRIGGER, //!< R2 button. SCE_CTRL_L1 = 0x00000400, //!< L1 button. SCE_CTRL_R1 = 0x00000800, //!< R1 button. SCE_CTRL_TRIANGLE = 0x00001000, //!< Triangle button. @@ -76,14 +81,32 @@ typedef struct SceCtrlData { unsigned char rx; /** Right analogue stick, Y axis. */ unsigned char ry; - /** Reserved. */ - uint8_t reserved0[4]; + /** Up button */ + uint8_t up; + /** Right button */ + uint8_t right; + /** Down button */ + uint8_t down; + /** Left button */ + uint8_t left; /** Left trigger (L2) */ - unsigned char lt; + uint8_t lt; /** Right trigger (R2) */ - unsigned char rt; + uint8_t rt; + /** Left button (L1) */ + uint8_t l1; + /** Right button (R1) */ + uint8_t r1; + /** Triangle button */ + uint8_t triangle; + /** Circle button */ + uint8_t circle; + /** Cross button */ + uint8_t cross; + /** Square button */ + uint8_t square; /** Reserved. */ - uint8_t reserved1[10]; + uint8_t reserved[4]; } SceCtrlData; /** Structure to pass as argument to ::sceCtrlSetRapidFire */ |