pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hopefully fixed BSD joystick code

Browse source
This commit is contained in:
Sam Lantinga 2012-11-26 23:41:50 -08:00
parent c9f59a287d
commit 27d81d93e4
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/joystick/bsd/SDL_sysjoystick.c
View file

@ -175,15 +175,14 @@ SDL_SYS_JoystickInit(void)
SDL_snprintf(s, SDL_arraysize(s), "/dev/uhid%d", i); SDL_snprintf(s, SDL_arraysize(s), "/dev/uhid%d", i);
nj.index = SDL_SYS_numjoysticks; joynames[SDL_SYS_numjoysticks] = strdup(s);
joynames[nj.index] = strdup(s);
if (SDL_SYS_JoystickOpen(&nj, nj.index) == 0) { if (SDL_SYS_JoystickOpen(&nj, SDL_SYS_numjoysticks) == 0) {
SDL_SYS_JoystickClose(&nj); SDL_SYS_JoystickClose(&nj);
SDL_SYS_numjoysticks++; SDL_SYS_numjoysticks++;
} else { } else {
SDL_free(joynames[nj.index]); SDL_free(joynames[SDL_SYS_numjoysticks]);
joynames[nj.index] = NULL; joynames[SDL_SYS_numjoysticks] = NULL;
} }
} }
for (i = 0; i < MAX_JOY_JOYS; i++) { for (i = 0; i < MAX_JOY_JOYS; i++) {
@ -295,7 +294,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy, int device_index)
joy->nbuttons = 2; joy->nbuttons = 2;
joy->nhats = 0; joy->nhats = 0;
joy->nballs = 0; joy->nballs = 0;
joydevnames[joy->index] = strdup("Gameport joystick"); joydevnames[device_index] = strdup("Gameport joystick");
goto usbend; goto usbend;
} else { } else {
hw->type = BSDJOY_UHID; hw->type = BSDJOY_UHID;
@ -359,8 +358,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy, int device_index)
s = hid_usage_in_page(hitem.usage); s = hid_usage_in_page(hitem.usage);
sp = SDL_malloc(SDL_strlen(s) + 5); sp = SDL_malloc(SDL_strlen(s) + 5);
SDL_snprintf(sp, SDL_strlen(s) + 5, "%s (%d)", SDL_snprintf(sp, SDL_strlen(s) + 5, "%s (%d)",
s, joy->index); s, device_index);
joydevnames[joy->index] = sp; joydevnames[device_index] = sp;
} }
} }
break; break;