aboutsummaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authornotaz2011-10-30 21:15:08 +0200
committernotaz2011-10-30 23:57:12 +0200
commit90f1c767f07b95fe39a344eaa96f629cd7efe1ba (patch)
tree34e7ceb1e585f2582ea86a863045bc79c4f67ead /frontend
parentd84e376741b37109597cb3a08d31def4de3fc598 (diff)
downloadpcsx_rearmed-90f1c767f07b95fe39a344eaa96f629cd7efe1ba.tar.gz
pcsx_rearmed-90f1c767f07b95fe39a344eaa96f629cd7efe1ba.tar.bz2
pcsx_rearmed-90f1c767f07b95fe39a344eaa96f629cd7efe1ba.zip
frontend: input: don't configure unprobed devices
Diffstat (limited to 'frontend')
-rw-r--r--frontend/common/input.c5
-rw-r--r--frontend/common/input.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/frontend/common/input.c b/frontend/common/input.c
index bdeebbe..c6243c9 100644
--- a/frontend/common/input.c
+++ b/frontend/common/input.c
@@ -541,7 +541,10 @@ int in_set_config(int dev_id, int what, const void *val, int size)
return 0;
}
- return DRV(dev->drv_id).set_config(dev->drv_data, what, *ival);
+ if (dev->probed)
+ return DRV(dev->drv_id).set_config(dev->drv_data, what, *ival);
+
+ return -1;
}
const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix)
diff --git a/frontend/common/input.h b/frontend/common/input.h
index 65e088f..e82ecaa 100644
--- a/frontend/common/input.h
+++ b/frontend/common/input.h
@@ -19,6 +19,9 @@
#define PBTN_MENU (1 << 10)
+// TODO: move to pico
+#if 0
+
/* ui events */
#define PEVB_VOL_DOWN 30
#define PEVB_VOL_UP 29
@@ -48,6 +51,7 @@
#define PEV_MASK 0x7ff80000
+#endif
enum {
IN_CFG_BIND_COUNT = 0,