Rewrite mechanisn to detect Protocol and Device

Made SetDeviceAndProtocol() does not depend on the protocols,
it will make it easier to add new backend.

New behavior SetDeviceAndProtocol:
1) If not set Device or Protocol, then try AutoDevProbe
2) Otherwise, look for the appropriate protocol (Device and Protocol must be set)

Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 1 insertions, 7 deletions

diff --git a/src/alpscomm.c b/src/alpscomm.c
index 3872f5c..dc76655 100644
--- a/src/alpscomm.c
+++ b/src/alpscomm.c
@@ -220,17 +220,11 @@ ALPSReadHwState(InputInfoPtr pInfo,
     return TRUE;
 }
 
-static Bool
-ALPSAutoDevProbe(InputInfoPtr pInfo)
-{
-    return FALSE;
-}
-
 struct SynapticsProtocolOperations alps_proto_operations = {
     NULL,
     NULL,
     ALPSQueryHardware,
     ALPSReadHwState,
-    ALPSAutoDevProbe,
+    NULL,
     NULL
 };