summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-10-25 16:08:49 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-10-26 06:34:20 +1000
commitf3f405db5603ecca5bc14dba23628ea56a0f5202 (patch)
tree78e4711b7a566eff2305906c6806c3c56d6a26f4
parent23308a251e16c4a6ab3c89c0505b0d8900c9cdff (diff)
Remove write-only field mouseFlags.
The flags were used to store ClearDTS and ClearRTR, but those options only resulted in log messages. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/mouse.c23
-rw-r--r--src/mouse.h2
2 files changed, 1 insertions, 24 deletions
diff --git a/src/mouse.c b/src/mouse.c
index 19ad8bc..fb9ccc8 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -660,29 +660,8 @@ static void
MouseSerialOptions(InputInfoPtr pInfo)
{
MouseDevPtr pMse = pInfo->private;
- Bool clearDTR, clearRTS;
-
-
+
pMse->baudRate = xf86SetIntOption(pInfo->options, "BaudRate", 0);
- if ((clearDTR = xf86SetBoolOption(pInfo->options, "ClearDTR",FALSE)))
- pMse->mouseFlags |= MF_CLEAR_DTR;
-
-
- if ((clearRTS = xf86SetBoolOption(pInfo->options, "ClearRTS",FALSE)))
- pMse->mouseFlags |= MF_CLEAR_RTS;
-
- if (clearDTR || clearRTS) {
- xf86Msg(X_CONFIG, "%s: ", pInfo->name);
- if (clearDTR) {
- xf86ErrorF("ClearDTR");
- if (clearRTS)
- xf86ErrorF(", ");
- }
- if (clearRTS) {
- xf86ErrorF("ClearRTS");
- }
- xf86ErrorF("\n");
- }
}
static MouseProtocolID
diff --git a/src/mouse.h b/src/mouse.h
index 51741fc..8c02ba1 100644
--- a/src/mouse.h
+++ b/src/mouse.h
@@ -211,8 +211,6 @@ typedef struct _MouseDevRec {
Bool flipXY;
int invX;
int invY;
- int mouseFlags; /* Flags to Clear after opening
- * mouse dev */
int resolution;
int negativeZ; /* button mask */
int positiveZ; /* button mask */