From 828734e0075b78a59cff4c39ef33fd6dd3148e58 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 11 Aug 2015 17:13:25 -0500 Subject: [PATCH] don't try to autoconfigure GPIO devices --- audio/drivers/gx_audio.c | 0 audio/drivers/ps3_audio.c | 0 defines/gx_defines.h | 0 defines/ps3_defines.h | 0 defines/psp_defines.h | 0 frontend/drivers/platform_darwin.m | 0 frontend/drivers/platform_gx.c | 0 frontend/drivers/platform_ps3.c | 0 frontend/drivers/platform_psp.c | 0 gfx/drivers/gx_gfx.c | 0 gfx/drivers/psp1_gfx.c | 0 gfx/drivers_context/ps3_ctx.c | 0 gfx/image/image.c | 0 griffin/griffin.c | 0 input/drivers/android_input.c | 5 ++++- input/drivers/ps3_input.c | 0 input/drivers/psp_input.c | 0 input/drivers_joypad/psp_joypad.c | 0 input/input_driver.c | 0 input/input_joypad_driver.c | 0 libretro-common/include/retro_miscellaneous.h | 0 libretro-common/include/rthreads/rthreads.h | 0 logger/netlogger/logger.c | 0 23 files changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 audio/drivers/gx_audio.c mode change 100644 => 100755 audio/drivers/ps3_audio.c mode change 100644 => 100755 defines/gx_defines.h mode change 100644 => 100755 defines/ps3_defines.h mode change 100644 => 100755 defines/psp_defines.h mode change 100644 => 100755 frontend/drivers/platform_darwin.m mode change 100644 => 100755 frontend/drivers/platform_gx.c mode change 100644 => 100755 frontend/drivers/platform_ps3.c mode change 100644 => 100755 frontend/drivers/platform_psp.c mode change 100644 => 100755 gfx/drivers/gx_gfx.c mode change 100644 => 100755 gfx/drivers/psp1_gfx.c mode change 100644 => 100755 gfx/drivers_context/ps3_ctx.c mode change 100644 => 100755 gfx/image/image.c mode change 100644 => 100755 griffin/griffin.c mode change 100644 => 100755 input/drivers/ps3_input.c mode change 100644 => 100755 input/drivers/psp_input.c mode change 100644 => 100755 input/drivers_joypad/psp_joypad.c mode change 100644 => 100755 input/input_driver.c mode change 100644 => 100755 input/input_joypad_driver.c mode change 100644 => 100755 libretro-common/include/retro_miscellaneous.h mode change 100644 => 100755 libretro-common/include/rthreads/rthreads.h mode change 100644 => 100755 logger/netlogger/logger.c diff --git a/audio/drivers/gx_audio.c b/audio/drivers/gx_audio.c old mode 100644 new mode 100755 diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c old mode 100644 new mode 100755 diff --git a/defines/gx_defines.h b/defines/gx_defines.h old mode 100644 new mode 100755 diff --git a/defines/ps3_defines.h b/defines/ps3_defines.h old mode 100644 new mode 100755 diff --git a/defines/psp_defines.h b/defines/psp_defines.h old mode 100644 new mode 100755 diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m old mode 100644 new mode 100755 diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c old mode 100644 new mode 100755 diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c old mode 100644 new mode 100755 diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c old mode 100644 new mode 100755 diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c old mode 100644 new mode 100755 diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c old mode 100644 new mode 100755 diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c old mode 100644 new mode 100755 diff --git a/gfx/image/image.c b/gfx/image/image.c old mode 100644 new mode 100755 diff --git a/griffin/griffin.c b/griffin/griffin.c old mode 100644 new mode 100755 diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 1438619eea..d1143a20d5 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -700,7 +700,10 @@ static void handle_hotplug(android_input_t *android, settings->input.vid[*port] = params.vid; strlcpy(params.driver, android_joypad.ident, sizeof(params.driver)); - autoconfigured = input_config_autoconfigure_joypad(¶ms); + + // Don't try to autoconfigure GPIO devices + if (!strstr(android->pad_states[0].name,"Generic I/O Device")) + autoconfigured = input_config_autoconfigure_joypad(¶ms); if (autoconfigured) { diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c old mode 100644 new mode 100755 diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c old mode 100644 new mode 100755 diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c old mode 100644 new mode 100755 diff --git a/input/input_driver.c b/input/input_driver.c old mode 100644 new mode 100755 diff --git a/input/input_joypad_driver.c b/input/input_joypad_driver.c old mode 100644 new mode 100755 diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h old mode 100644 new mode 100755 diff --git a/libretro-common/include/rthreads/rthreads.h b/libretro-common/include/rthreads/rthreads.h old mode 100644 new mode 100755 diff --git a/logger/netlogger/logger.c b/logger/netlogger/logger.c old mode 100644 new mode 100755