diff options
author | Alexandr Shadchin <alexandr.shadchin@gmail.com> | 2011-02-28 16:38:26 +0500 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-01 11:55:35 +1000 |
commit | 00abf2c63cf1613c3a65d561582e9fd8abc2f34a (patch) | |
tree | 4c7e6b7c14f820afee102478e2f280997bc8dc84 /src/ps2comm.c | |
parent | 8e6d67243375539f417f7a19e349c6546ce3be64 (diff) |
Remove arg proto_ops in ReadHwState()
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/ps2comm.c')
-rw-r--r-- | src/ps2comm.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/ps2comm.c b/src/ps2comm.c index 6991d22..a6e052c 100644 --- a/src/ps2comm.c +++ b/src/ps2comm.c @@ -37,10 +37,10 @@ #endif #include <xorg-server.h> -#include "ps2comm.h" #include "synproto.h" #include "synaptics.h" #include "synapticsstr.h" +#include "ps2comm.h" #include <xf86.h> #define MAX_UNSYNC_PACKETS 10 /* i.e. 10 to 60 bytes */ @@ -513,8 +513,8 @@ ps2_synaptics_get_packet(InputInfoPtr pInfo, struct PS2SynapticsHwInfo *synhw, return FALSE; } -static Bool -PS2ReadHwState(InputInfoPtr pInfo, +Bool +PS2ReadHwStateProto(InputInfoPtr pInfo, struct SynapticsProtocolOperations *proto_ops, struct CommData *comm, struct SynapticsHwState *hwRet) { @@ -654,6 +654,13 @@ PS2ReadHwState(InputInfoPtr pInfo, } static Bool +PS2ReadHwState(InputInfoPtr pInfo, + struct CommData *comm, struct SynapticsHwState *hwRet) +{ + return PS2ReadHwStateProto(pInfo, &psaux_proto_operations, comm, hwRet); +} + +static Bool PS2AutoDevProbe(InputInfoPtr pInfo) { return FALSE; |