From 03f8528315fa46c95991a34f3325d7b33ae5538c Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Sat, 02 May 2020 21:48:36 +0000
Subject: [PATCH] Update source to SDL2 2.0.12
---
source/src/joystick/android/SDL_sysjoystick.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/source/src/joystick/android/SDL_sysjoystick.c b/source/src/joystick/android/SDL_sysjoystick.c
index 69b657f..d0c6262 100644
--- a/source/src/joystick/android/SDL_sysjoystick.c
+++ b/source/src/joystick/android/SDL_sysjoystick.c
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -83,7 +83,7 @@
return r ^ (Uint32)0xFF000000L;
}
-static Uint32 crc32(const void *data, int count)
+static Uint32 crc32(const void *data, size_t count)
{
Uint32 crc = 0;
int i;
@@ -344,7 +344,7 @@
}
#ifdef SDL_JOYSTICK_HIDAPI
- if (HIDAPI_IsDevicePresent(vendor_id, product_id, 0)) {
+ if (HIDAPI_IsDevicePresent(vendor_id, product_id, 0, name)) {
/* The HIDAPI driver is taking care of this device */
return -1;
}
@@ -497,7 +497,7 @@
}
-static void ANDROID_JoystickDetect();
+static void ANDROID_JoystickDetect(void);
static int
ANDROID_JoystickInit(void)
@@ -587,6 +587,11 @@
return -1;
}
+static void
+ANDROID_JoystickSetDevicePlayerIndex(int device_index, int player_index)
+{
+}
+
static SDL_JoystickGUID
ANDROID_JoystickGetDeviceGUID(int device_index)
{
@@ -624,7 +629,7 @@
}
static int
-ANDROID_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms)
+ANDROID_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble)
{
return SDL_Unsupported();
}
@@ -696,6 +701,7 @@
ANDROID_JoystickDetect,
ANDROID_JoystickGetDeviceName,
ANDROID_JoystickGetDevicePlayerIndex,
+ ANDROID_JoystickSetDevicePlayerIndex,
ANDROID_JoystickGetDeviceGUID,
ANDROID_JoystickGetDeviceInstanceID,
ANDROID_JoystickOpen,
--
Gitblit v1.9.3