mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-28 14:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor joystick GUID creation

Browse Source
This commit is contained in:
Sam Lantinga
2022-08-22 19:28:21 -07:00
parent aae566e196
commit 277b033e78
19 changed files with 78 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/joystick/android/SDL_sysjoystick.c
View File

@@ -303,7 +303,6 @@ Android_AddJoystick(int device_id, const char *name, const char *desc, int vendo
{
SDL_joylist_item *item;
SDL_JoystickGUID guid;
Uint16 *guid16 = (Uint16 *)guid.data;
int i;
int axis_mask;
@@ -355,26 +354,15 @@ Android_AddJoystick(int device_id, const char *name, const char *desc, int vendo
nhats = 0;
}
SDL_memset(guid.data, 0, sizeof(guid.data));
guid = SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_BLUETOOTH, vendor_id, product_id, 0, desc, 0, 0);
/* We only need 16 bits for each of these; space them out to fill 128. */
/* Byteswap so devices get same GUID on little/big endian platforms. */
*guid16++ = SDL_SwapLE16(SDL_HARDWARE_BUS_BLUETOOTH);
*guid16++ = SDL_SwapLE16(SDL_crc16(0, desc, SDL_strlen(desc)));
if (vendor_id && product_id) {
*guid16++ = SDL_SwapLE16(vendor_id);
*guid16++ = 0;
*guid16++ = SDL_SwapLE16(product_id);
*guid16++ = 0;
} else {
SDL_strlcpy((char*)guid16, name, 4*sizeof(Uint16));
guid16 += 4;
/* Update the GUID with capability bits */
{
Uint16 *guid16 = (Uint16 *)guid.data;
guid16[6] = SDL_SwapLE16(button_mask);
guid16[7] = SDL_SwapLE16(axis_mask);
}
*guid16++ = SDL_SwapLE16(button_mask);
*guid16++ = SDL_SwapLE16(axis_mask);
item = (SDL_joylist_item *) SDL_malloc(sizeof (SDL_joylist_item));
if (item == NULL) {
return -1;