From: notaz <notasas@gmail.com>
Date: Sun, 30 Oct 2011 19:15:08 +0000 (+0200)
Subject: frontend: input: don't configure unprobed devices
X-Git-Tag: r11~5
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90f1c767f07b95fe39a344eaa96f629cd7efe1ba;p=pcsx_rearmed.git

frontend: input: don't configure unprobed devices
---

diff --git a/frontend/common/input.c b/frontend/common/input.c
index bdeebbe6..c6243c94 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 65e088f8..e82ecaae 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,