encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some compiler warnings

This commit is contained in:
Sam Lantinga 2020-11-18 21:33:11 -08:00
parent 45f1437549
commit 8c3196da60
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/joystick/hidapi/SDL_hidapi_ps5.c
View File

@ -103,22 +103,22 @@ typedef struct
typedef struct typedef struct
{ {
Uint8 ucEnableBits1; Uint8 ucEnableBits1; /* 0 */
Uint8 ucEnableBits2; Uint8 ucEnableBits2; /* 1 */
Uint8 ucRumbleRight; Uint8 ucRumbleRight; /* 2 */
Uint8 ucRumbleLeft; Uint8 ucRumbleLeft; /* 3 */
Uint8 rgucUnknown1[6]; Uint8 rgucUnknown1[6]; /* 4 */
Uint8 rgucRightTriggerEffect[11]; Uint8 rgucRightTriggerEffect[11]; /* 10 */
Uint8 rgucLeftTriggerEffect[11]; Uint8 rgucLeftTriggerEffect[11]; /* 21 */
Uint8 rgucUnknown2[6]; Uint8 rgucUnknown2[6]; /* 32 */
Uint8 ucLedFlags; Uint8 ucLedFlags; /* 38 */
Uint8 rgucUnknown3[2]; Uint8 rgucUnknown3[2]; /* 39 */
Uint8 ucLedAnim; Uint8 ucLedAnim; /* 41 */
Uint8 ucLedBrightness; Uint8 ucLedBrightness; /* 42 */
Uint8 ucPadLights; Uint8 ucPadLights; /* 43 */
Uint8 ucLedRed; Uint8 ucLedRed; /* 44 */
Uint8 ucLedGreen; Uint8 ucLedGreen; /* 45 */
Uint8 ucLedBlue; Uint8 ucLedBlue; /* 46 */
} DS5EffectsState_t; } DS5EffectsState_t;
typedef struct { typedef struct {
@ -132,8 +132,8 @@ typedef struct {
SDL_bool hardware_calibration; SDL_bool hardware_calibration;
IMUCalibrationData calibration[6]; IMUCalibrationData calibration[6];
int player_index; int player_index;
Uint16 rumble_left; Uint8 rumble_left;
Uint16 rumble_right; Uint8 rumble_right;
SDL_bool color_set; SDL_bool color_set;
Uint8 led_red; Uint8 led_red;
Uint8 led_green; Uint8 led_green;
@ -315,7 +315,7 @@ HIDAPI_DriverPS5_ApplyCalibrationData(SDL_DriverPS5_Context *ctx, int index, Sin
/* Convert the raw data to the units expected by SDL */ /* Convert the raw data to the units expected by SDL */
if (index < 3) { if (index < 3) {
result = (result / GYRO_RES_PER_DEGREE) * M_PI / 180.0f; result = (result / GYRO_RES_PER_DEGREE) * (float)M_PI / 180.0f;
} else { } else {
result = (result / ACCEL_RES_PER_G) * SDL_STANDARD_GRAVITY; result = (result / ACCEL_RES_PER_G) * SDL_STANDARD_GRAVITY;
} }