cleanups after hidapi input and FFB support for Logitech G29 patch:

- add new files to Makefile.os2 and Makefile.w32
- fix negative return check from SDL_hid_read()
- fix SDL_HIDAPI_HapticDestroyEffect() as it returns void
- fix C89 build issues
- change an sprintf() call to SDL_snprintf()
- fix a -Wuninitialized warning
- add casts Sint32 and float casts to avoid warnings
- add missing newlines to new files

Author: sezero

Makefile.os2

@@ -94,7 +94,8 @@ SRCS+= SDL_systimer.c
 SRCS+= SDL_sysloadso.c
 SRCS+= SDL_sysfilesystem.c
 SRCS+= SDL_os2joystick.c SDL_syshaptic.c SDL_sysjoystick.c SDL_virtualjoystick.c
-SRCS+= SDL_hidapijoystick.c SDL_hidapi_rumble.c SDL_hidapi_combined.c SDL_hidapi_gamecube.c SDL_hidapi_luna.c SDL_hidapi_ps3.c SDL_hidapi_ps4.c SDL_hidapi_ps5.c SDL_hidapi_shield.c SDL_hidapi_stadia.c SDL_hidapi_switch.c SDL_hidapi_wii.c SDL_hidapi_xbox360.c SDL_hidapi_xbox360w.c SDL_hidapi_xboxone.c SDL_hidapi_steam.c SDL_hidapi_steamdeck.c SDL_steam_virtual_gamepad.c
+SRCS+= SDL_hidapihaptic.c SDL_hidapihaptic_lg4ff.c
+SRCS+= SDL_hidapijoystick.c SDL_hidapi_rumble.c SDL_hidapi_combined.c SDL_hidapi_gamecube.c SDL_hidapi_luna.c SDL_hidapi_ps3.c SDL_hidapi_ps4.c SDL_hidapi_ps5.c SDL_hidapi_shield.c SDL_hidapi_stadia.c SDL_hidapi_switch.c SDL_hidapi_wii.c SDL_hidapi_xbox360.c SDL_hidapi_xbox360w.c SDL_hidapi_xboxone.c SDL_hidapi_steam.c SDL_hidapi_steamdeck.c SDL_hidapi_lg4ff.c SDL_steam_virtual_gamepad.c
 SRCS+= SDL_dummyaudio.c SDL_diskaudio.c
 SRCS+= SDL_nullvideo.c SDL_nullframebuffer.c SDL_nullevents.c
 SRCS+= SDL_dummysensor.c
@@ -116,7 +117,7 @@ OBJS = $(SRCS:.c=.obj)
 .extensions:
 .extensions: .lib .dll .obj .c .asm
 
-.c: ./src;./src/dynapi;./src/audio;./src/cpuinfo;./src/events;./src/file;./src/haptic;./src/joystick;./src/power;./src/render;./src/render/software;./src/sensor;./src/stdlib;./src/thread;./src/timer;./src/video;./src/video/yuv2rgb;./src/atomic;./src/audio/disk;
+.c: ./src;./src/dynapi;./src/audio;./src/cpuinfo;./src/events;./src/file;./src/haptic;./src/haptic/hidapi;./src/joystick;./src/power;./src/render;./src/render/software;./src/sensor;./src/stdlib;./src/thread;./src/timer;./src/video;./src/video/yuv2rgb;./src/atomic;./src/audio/disk;
 .c: ./src/haptic/dummy;./src/joystick/dummy;./src/joystick/virtual;./src/audio/dummy;./src/video/dummy;./src/sensor/dummy;
 .c: ./src/core/os2;./src/audio/os2;./src/loadso/os2;./src/filesystem/os2;./src/joystick/os2;./src/thread/os2;./src/timer/os2;./src/video/os2;
 .c: ./src/core/os2/geniconv;

Makefile.w32

@@ -73,7 +73,8 @@ SRCS+= SDL_systimer.c
 SRCS+= SDL_sysloadso.c
 SRCS+= SDL_sysfilesystem.c
 SRCS+= SDL_syshaptic.c SDL_sysjoystick.c SDL_virtualjoystick.c
-SRCS+= SDL_hidapijoystick.c SDL_hidapi_rumble.c SDL_hidapi_combined.c SDL_hidapi_gamecube.c SDL_hidapi_luna.c SDL_hidapi_ps3.c SDL_hidapi_ps4.c SDL_hidapi_ps5.c SDL_hidapi_shield.c SDL_hidapi_stadia.c SDL_hidapi_switch.c SDL_hidapi_wii.c SDL_hidapi_xbox360.c SDL_hidapi_xbox360w.c SDL_hidapi_xboxone.c SDL_hidapi_steam.c SDL_hidapi_steamdeck.c
+SRCS+= SDL_hidapihaptic.c SDL_hidapihaptic_lg4ff.c
+SRCS+= SDL_hidapijoystick.c SDL_hidapi_rumble.c SDL_hidapi_combined.c SDL_hidapi_gamecube.c SDL_hidapi_luna.c SDL_hidapi_ps3.c SDL_hidapi_ps4.c SDL_hidapi_ps5.c SDL_hidapi_shield.c SDL_hidapi_stadia.c SDL_hidapi_switch.c SDL_hidapi_wii.c SDL_hidapi_xbox360.c SDL_hidapi_xbox360w.c SDL_hidapi_xboxone.c SDL_hidapi_steam.c SDL_hidapi_steamdeck.c SDL_hidapi_lg4ff.c
 SRCS+= SDL_dummyaudio.c SDL_diskaudio.c
 SRCS+= SDL_nullvideo.c SDL_nullframebuffer.c SDL_nullevents.c
 SRCS+= SDL_dummysensor.c
@@ -105,7 +106,7 @@ RCOBJS= $(RCSRCS:.rc=.res)
 .extensions:
 .extensions: .lib .dll .obj .res .c .rc .asm
 
-.c: ./src;./src/dynapi;./src/audio;./src/cpuinfo;./src/events;./src/file;./src/haptic;./src/joystick;./src/power;./src/render;./src/render/software;./src/sensor;./src/stdlib;./src/thread;./src/timer;./src/video;./src/video/yuv2rgb;./src/atomic;./src/audio/disk;
+.c: ./src;./src/dynapi;./src/audio;./src/cpuinfo;./src/events;./src/file;./src/haptic;./src/haptic/hidapi;./src/joystick;./src/power;./src/render;./src/render/software;./src/sensor;./src/stdlib;./src/thread;./src/timer;./src/video;./src/video/yuv2rgb;./src/atomic;./src/audio/disk;
 .c: ./src/haptic/dummy;./src/joystick/dummy;./src/joystick/virtual;./src/audio/dummy;./src/video/dummy;./src/sensor/dummy;
 .c: ./src/core/windows;./src/audio/winmm;./src/audio/directsound;./src/audio/wasapi;./src/loadso/windows;./src/filesystem/windows;./src/haptic/windows;./src/joystick/windows;./src/sensor/windows;./src/thread/windows;./src/timer/windows;./src/video/windows;
 .c: ./src/locale/;./src/locale/windows;./src/misc;./src/misc/windows;./src/power/windows;./src/joystick/hidapi;./src/hidapi;./src/render/direct3d;./src/render/direct3d11;./src/render/direct3d12;./src/render/opengl;./src/render/opengles2

src/haptic/SDL_haptic.c

@@ -644,7 +644,8 @@ void SDL_HapticDestroyEffect(SDL_Haptic *haptic, int effect)
 
     #ifdef SDL_JOYSTICK_HIDAPI
     if (SDL_HIDAPI_HapticIsHidapi(haptic)) {
-        return SDL_HIDAPI_HapticDestroyEffect(haptic, effect);
+        SDL_HIDAPI_HapticDestroyEffect(haptic, effect);
+        return;
     }
     #endif //SDL_JOYSTICK_HIDAPI
 

src/haptic/SDL_hidapihaptic.h

@@ -45,4 +45,5 @@ int SDL_HIDAPI_HapticPause(SDL_Haptic *haptic);
 int SDL_HIDAPI_HapticUnpause(SDL_Haptic *haptic);
 int SDL_HIDAPI_HapticStopAll(SDL_Haptic *haptic);
 
-#endif //SDL_hidapihaptic_h_
+#endif /* SDL_hidapihaptic_h_ */
+

src/haptic/hidapi/SDL_hidapihaptic.c

@@ -192,6 +192,7 @@ void SDL_HIDAPI_HapticClose(SDL_Haptic *haptic)
     SDL_LockMutex(haptic_list_mutex);
 
     cur = haptic_list_head;
+    last = NULL;
     while (cur != NULL) {
         if (cur->haptic == haptic) {
             SDL_HIDAPI_HapticDevice *device = (SDL_HIDAPI_HapticDevice *)haptic->hwdata;
@@ -256,7 +257,7 @@ int SDL_HIDAPI_HapticStopEffect(SDL_Haptic *haptic, int id)
 void SDL_HIDAPI_HapticDestroyEffect(SDL_Haptic *haptic, int id)
 {
     SDL_HIDAPI_HapticDevice *device = (SDL_HIDAPI_HapticDevice *)haptic->hwdata;
-    return device->driver->DestroyEffect(device, id);
+    device->driver->DestroyEffect(device, id);
 }
 
 int SDL_HIDAPI_HapticGetEffectStatus(SDL_Haptic *haptic, int id)
@@ -295,4 +296,4 @@ int SDL_HIDAPI_HapticStopAll(SDL_Haptic *haptic)
     return device->driver->StopAll(device);
 }
 
-#endif //SDL_JOYSTICK_HIDAPI
+#endif /* SDL_JOYSTICK_HIDAPI */

src/haptic/hidapi/SDL_hidapihaptic_c.h

@@ -70,4 +70,4 @@ struct SDL_HIDAPI_HapticDriver
 
 extern SDL_HIDAPI_HapticDriver SDL_HIDAPI_HapticDriverLg4ff;
 
-#endif //SDL_joystick_c_h_
+#endif /* SDL_joystick_c_h_ */

src/haptic/hidapi/SDL_hidapihaptic_lg4ff.c

@@ -191,7 +191,7 @@ static Uint16 to_linux_direction(SDL_HapticDirection *src)
         } else if (!src->dir[0]) {
             return (Uint16) (src->dir[1] >= 0 ? 0x8000 : 0);
         } else {
-            float f = SDL_atan2(src->dir[1], src->dir[0]);    /* Ideally we'd use fixed point math instead of floats... */
+            float f = (float) SDL_atan2(src->dir[1], src->dir[0]);    /* Ideally we'd use fixed point math instead of floats... */
                     /*
                     SDL_atan2 takes the parameters: Y-axis-value and X-axis-value (in that order)
                     - Y-axis-value is the second coordinate (from center to SOUTH)
@@ -405,9 +405,9 @@ static Sint32 lg4ff_calculate_constant(struct lg4ff_effect_state *state)
     if (state->time_playing < constant->attack_length) {
         level_sign = level < 0 ? -1 : 1;
         d = level - level_sign * constant->attack_level;
-        level = level_sign * constant->attack_level + d * state->time_playing / constant->attack_length;
+        level = (Sint32) (level_sign * constant->attack_level + d * state->time_playing / constant->attack_length);
     } else if (constant->length && constant->fade_length) {
-        t = state->time_playing - constant->length + constant->fade_length;
+        t = (Sint32) (state->time_playing - constant->length + constant->fade_length);
         if (t > 0) {
             level_sign = level < 0 ? -1 : 1;
             d = level - level_sign * constant->fade_level;
@@ -428,17 +428,17 @@ static Sint32 lg4ff_calculate_ramp(struct lg4ff_effect_state *state)
     if (state->time_playing < ramp->attack_length) {
         level = ramp->start;
         level_sign =  level < 0 ? -1 : 1;
-        t = ramp->attack_length - state->time_playing;
+        t = (Sint32) (ramp->attack_length - state->time_playing);
         d = level - level_sign * ramp->attack_level;
         level = level_sign * ramp->attack_level + d * t / ramp->attack_length;
     } else if (ramp->length && state->time_playing >= ramp->length - ramp->fade_length && ramp->fade_length) {
         level = ramp->end;
         level_sign = level < 0 ? -1 : 1;
-        t = state->time_playing - ramp->length + ramp->fade_length;
+        t = (Sint32) (state->time_playing - ramp->length + ramp->fade_length);
         d = level_sign * ramp->fade_level - level;
         level = level - d * t / ramp->fade_length;
     } else {
-        t = state->time_playing - ramp->attack_length;
+        t = (Sint32) (state->time_playing - ramp->attack_length);
         level = ramp->start + ((t * state->slope) >> 16);
     }
 
@@ -455,9 +455,9 @@ static Sint32 lg4ff_calculate_periodic(struct lg4ff_effect_state *state)
 
     if (state->time_playing < periodic->attack_length) {
         d = magnitude - magnitude_sign * periodic->attack_level;
-        magnitude = magnitude_sign * periodic->attack_level + d * state->time_playing / periodic->attack_length;
+        magnitude = (Sint32) (magnitude_sign * periodic->attack_level + d * state->time_playing / periodic->attack_length);
     } else if (periodic->length && periodic->fade_length) {
-        t = state->time_playing - get_effect_replay_length(&state->effect) + periodic->fade_length;
+        t = (Sint32) (state->time_playing - get_effect_replay_length(&state->effect) + periodic->fade_length);
         if (t > 0) {
             d = magnitude - magnitude_sign * periodic->fade_level;
             magnitude = magnitude - d * t / periodic->fade_length;
@@ -474,7 +474,7 @@ static Sint32 lg4ff_calculate_periodic(struct lg4ff_effect_state *state)
             break;
         */
         case SDL_HAPTIC_TRIANGLE:
-            level += llabs((Sint64)state->phase * magnitude * 2 / 360 - magnitude) * 2 - magnitude;
+            level += (Sint32) (llabs((Sint64)state->phase * magnitude * 2 / 360 - magnitude) * 2 - magnitude);
             break;
         case SDL_HAPTIC_SAWTOOTHUP:
             level += state->phase * magnitude * 2 / 360 - magnitude;
@@ -762,10 +762,11 @@ static SDL_bool SDL_HIDAPI_HapticDriverLg4ff_JoystickSupported(SDL_Joystick *joy
 {
     Uint16 vendor_id = SDL_JoystickGetVendor(joystick);
     Uint16 product_id = SDL_JoystickGetProduct(joystick);
+    int i;
     if (vendor_id != USB_VENDOR_ID_LOGITECH) {
         return SDL_FALSE;
     }
-    for (int i = 0;i < sizeof(supported_device_ids) / sizeof(Uint32);i++) {
+    for (i = 0; i < sizeof(supported_device_ids) / sizeof(Uint32); i++) {
         if (supported_device_ids[i] == product_id) {
             return SDL_TRUE;
         }
@@ -840,7 +841,7 @@ static void *SDL_HIDAPI_HapticDriverLg4ff_Open(SDL_Joystick *joystick)
 
     ctx->product_id = SDL_JoystickGetProduct(joystick);
 
-    sprintf(ctx->thread_name_buf, "SDL_hidapihaptic_lg4ff 0x%16llx %04x:%04x", (Uint64)joystick, USB_VENDOR_ID_LOGITECH, ctx->product_id);
+    SDL_snprintf(ctx->thread_name_buf, sizeof(ctx->thread_name_buf), "SDL_hidapihaptic_lg4ff %d %04x:%04x", SDL_JoystickInstanceID(joystick), USB_VENDOR_ID_LOGITECH, ctx->product_id);
     ctx->stop_thread = SDL_FALSE;
     ctx->thread = SDL_CreateThread(SDL_HIDAPI_HapticDriverLg4ff_ThreadFunction, ctx->thread_name_buf, ctx);
 
@@ -1179,5 +1180,5 @@ SDL_HIDAPI_HapticDriver SDL_HIDAPI_HapticDriverLg4ff = {
     SDL_HIDAPI_HapticDriverLg4ff_StopAll,
 };
 
-#endif //SDL_HAPTIC_HIDAPI_LG4FF
-#endif //SDL_JOYSTICK_HIDAPI
+#endif /* SDL_HAPTIC_HIDAPI_LG4FF */
+#endif /* SDL_JOYSTICK_HIDAPI */

src/joystick/hidapi/SDL_hidapi_lg4ff.c

@@ -62,7 +62,8 @@ static const char *supported_device_names[] = {
 
 static const char *HIDAPI_DriverLg4ff_GetDeviceName(Uint32 device_id)
 {
-    for (int i = 0;i < (sizeof supported_device_ids) / sizeof(Uint32);i++) {
+    int i;
+    for (i = 0; i < (sizeof supported_device_ids) / sizeof(Uint32); i++) {
         if (supported_device_ids[i] == device_id) {
             return supported_device_names[i];
         }
@@ -139,10 +140,11 @@ static SDL_bool HIDAPI_DriverLg4ff_IsSupportedDevice(
       should trigger mode switch, then return false, so the next probe cycle
       would take the device on a supported mode
     */
+    int i;
     if (vendor_id != USB_VENDOR_ID_LOGITECH) {
         return SDL_FALSE;
     }
-    for (int i = 0;i < sizeof(supported_device_ids) / sizeof(Uint32);i++) {
+    for (i = 0; i < sizeof(supported_device_ids) / sizeof(Uint32); i++) {
         if (supported_device_ids[i] == product_id) {
             return SDL_TRUE;
         }
@@ -382,6 +384,7 @@ static SDL_bool HIDAPI_DriverLg4ff_HandleState(SDL_HIDAPI_Device *device,
     Uint8 last_hat = 0;
     int num_buttons = HIDAPI_DriverLg4ff_GetNumberOfButtons(device->product_id);
     int bit_offset = 0;
+    int i;
 
     SDL_bool state_changed;
 
@@ -458,7 +461,7 @@ static SDL_bool HIDAPI_DriverLg4ff_HandleState(SDL_HIDAPI_Device *device,
             SDL_assert(0);
     }
 
-    for (int i = 0;i < num_buttons;i++) {
+    for (i = 0;i < num_buttons;i++) {
         int bit_num = bit_offset + i;
         SDL_bool button_on = HIDAPI_DriverLg4ff_GetBit(report_buf, bit_num, report_size);
         SDL_bool button_was_on = HIDAPI_DriverLg4ff_GetBit(ctx->last_report_buf, bit_num, report_size);
@@ -599,8 +602,8 @@ static int SDL_HIDAPI_DriverLg4ff_GetEnvInt(const char *env_name, int min, int m
 static SDL_bool HIDAPI_DriverLg4ff_UpdateDevice(SDL_HIDAPI_Device *device)
 {
     SDL_Joystick *joystick = NULL;
-    size_t r;
     Uint8 report_buf[32] = {0};
+    int r;
     size_t report_size = 0;
     SDL_DriverLg4ff_Context *ctx = (SDL_DriverLg4ff_Context *)device->context;
 
@@ -639,7 +642,7 @@ static SDL_bool HIDAPI_DriverLg4ff_UpdateDevice(SDL_HIDAPI_Device *device)
             /* Failed to read from controller */
             HIDAPI_JoystickDisconnected(device, device->joysticks[0]);
             return SDL_FALSE;
-        } else if (r == report_size) {
+        } else if ((size_t)r == report_size) {
             SDL_bool state_changed = HIDAPI_DriverLg4ff_HandleState(device, joystick, report_buf, report_size);
             if(state_changed && !ctx->initialized) {
                 ctx->initialized = SDL_TRUE;
@@ -799,7 +802,6 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverLg4ff = {
     HIDAPI_DriverLg4ff_FreeDevice,
 };
 
-
 #endif /* SDL_JOYSTICK_HIDAPI_LG4FF */
 
-#endif /* SDL_JOYSTICK_HIDAPI */
+#endif /* SDL_JOYSTICK_HIDAPI */