mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix nits

Browse Source
This commit is contained in:
radius 2015-07-09 11:31:05 -05:00
parent 141dbabe3d
commit af978297e2
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
input/drivers_joypad/dinput_joypad.c
View File

@ -163,7 +163,7 @@ static bool guid_is_xinput_device(const GUID* product_guid)
return true; return true;
} }
} }
free(raw_devs); free(raw_devs);
raw_devs = NULL; raw_devs = NULL;
return false; return false;
@ -207,31 +207,31 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
g_dinput_ctx, &inst->guidInstance, pad, NULL))) g_dinput_ctx, &inst->guidInstance, pad, NULL)))
#endif #endif
return DIENUM_CONTINUE; return DIENUM_CONTINUE;
g_pads[g_joypad_cnt].joy_name = strdup(inst->tszProductName); g_pads[g_joypad_cnt].joy_name = strdup(inst->tszProductName);
g_pads[g_joypad_cnt].joy_friendly_name = strdup(inst->tszInstanceName); g_pads[g_joypad_cnt].joy_friendly_name = strdup(inst->tszInstanceName);
/* there may be more useful info in the GUID so leave this here for a while /* there may be more useful info in the GUID so leave this here for a while
printf("Guid = {%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}\n", printf("Guid = {%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}\n",
inst->guidProduct.Data1, inst->guidProduct.Data2, inst->guidProduct.Data3, inst->guidProduct.Data1, inst->guidProduct.Data2, inst->guidProduct.Data3,
inst->guidProduct.Data4[0], inst->guidProduct.Data4[1], inst->guidProduct.Data4[2], inst->guidProduct.Data4[3], inst->guidProduct.Data4[0], inst->guidProduct.Data4[1], inst->guidProduct.Data4[2], inst->guidProduct.Data4[3],
inst->guidProduct.Data4[4], inst->guidProduct.Data4[5], inst->guidProduct.Data4[6], inst->guidProduct.Data4[7]); inst->guidProduct.Data4[4], inst->guidProduct.Data4[5], inst->guidProduct.Data4[6], inst->guidProduct.Data4[7]);
printf("Guid = {%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}\n",*/ */
g_pads[g_joypad_cnt].vid = inst->guidProduct.Data1/0x10000; g_pads[g_joypad_cnt].vid = inst->guidProduct.Data1/0x10000;
g_pads[g_joypad_cnt].pid = inst->guidProduct.Data1%0x10000; g_pads[g_joypad_cnt].pid = inst->guidProduct.Data1%0x10000;
RARCH_LOG("PID: {%04lX} VID:{%04lX}\n", g_pads[g_joypad_cnt].pid, g_pads[g_joypad_cnt].vid); RARCH_LOG("PID: {%04lX} VID:{%04lX}\n", g_pads[g_joypad_cnt].pid, g_pads[g_joypad_cnt].vid);
#ifdef HAVE_XINPUT #ifdef HAVE_XINPUT
#if 0 #if 0
is_xinput_pad = g_xinput_block_pads is_xinput_pad = g_xinput_block_pads
&& name_is_xinput_pad(inst->tszProductName); && name_is_xinput_pad(inst->tszProductName);
#endif #endif
is_xinput_pad = g_xinput_block_pads is_xinput_pad = g_xinput_block_pads
&& guid_is_xinput_device(&inst->guidProduct); && guid_is_xinput_device(&inst->guidProduct);
if (is_xinput_pad) if (is_xinput_pad)
{ {
if (g_last_xinput_pad_idx < 4) if (g_last_xinput_pad_idx < 4)
@ -244,9 +244,9 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
IDirectInputDevice8_SetCooperativeLevel(*pad, (HWND)driver->video_window, IDirectInputDevice8_SetCooperativeLevel(*pad, (HWND)driver->video_window,
DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); DISCL_NONEXCLUSIVE | DISCL_BACKGROUND);
IDirectInputDevice8_EnumObjects(*pad, enum_axes_cb, IDirectInputDevice8_EnumObjects(*pad, enum_axes_cb,
*pad, DIDFT_ABSAXIS); *pad, DIDFT_ABSAXIS);
#ifdef HAVE_XINPUT #ifdef HAVE_XINPUT
if (!is_xinput_pad) if (!is_xinput_pad)
#endif #endif
@ -268,7 +268,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
enum_iteration_done: enum_iteration_done:
g_joypad_cnt++; g_joypad_cnt++;
return DIENUM_CONTINUE; return DIENUM_CONTINUE;
} }
static bool dinput_joypad_init(void *data) static bool dinput_joypad_init(void *data)
@ -279,9 +279,9 @@ static bool dinput_joypad_init(void *data)
if (!dinput_init_context()) if (!dinput_init_context())
return false; return false;
g_last_xinput_pad_idx = 0; g_last_xinput_pad_idx = 0;
for (i = 0; i < MAX_USERS; ++i) for (i = 0; i < MAX_USERS; ++i)
{ {
g_xinput_pad_indexes[i] = -1; g_xinput_pad_indexes[i] = -1;
@ -312,7 +312,7 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey)
{ {
unsigned pov; unsigned pov;
unsigned hat = GET_HAT(joykey); unsigned hat = GET_HAT(joykey);
unsigned elems = sizeof(pad->joy_state.rgdwPOV) / unsigned elems = sizeof(pad->joy_state.rgdwPOV) /
sizeof(pad->joy_state.rgdwPOV[0]); sizeof(pad->joy_state.rgdwPOV[0]);
if (hat >= elems) if (hat >= elems)
@ -340,7 +340,7 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey)
} }
else else
{ {
unsigned elems = sizeof(pad->joy_state.rgbButtons) / unsigned elems = sizeof(pad->joy_state.rgbButtons) /
sizeof(pad->joy_state.rgbButtons[0]); sizeof(pad->joy_state.rgbButtons[0]);
if (joykey < elems) if (joykey < elems)