From 405fac1dd34bbbfa8a2dd1a0ac2664871d914e1f Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Sun, 29 Apr 2007 05:02:03 +0200 Subject: [PATCH] Simplify flag setup. --- src/acecad.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/acecad.c b/src/acecad.c index c401f80..1c0b4f7 100644 --- a/src/acecad.c +++ b/src/acecad.c @@ -367,7 +367,6 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) xf86OptionListReport(local->options); priv->acecadInc = xf86SetIntOption(local->options, "Increment", 0 ); - priv->flags &= ~AUTODEV_FLAG; s = xf86FindOptionValue(local->options, "Device"); if (!s || (s && (xf86NameCmp(s, "auto-dev") == 0))) { @@ -406,8 +405,6 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) } else #endif { - priv->flags &= ~USB_FLAG; - local->read_input = ReadInput; msgtype = X_DEFAULT; @@ -455,13 +452,9 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) s = xf86FindOptionValue(local->options, "Mode"); msgtype = s ? X_CONFIG : X_DEFAULT; - if (s && (xf86NameCmp(s, "Relative") == 0)) - { - priv->flags = priv->flags & ~ABSOLUTE_FLAG; - } - else + if (!(s && (xf86NameCmp(s, "relative") == 0))) { - priv->flags = priv->flags | ABSOLUTE_FLAG; + priv->flags |= ABSOLUTE_FLAG; } xf86Msg(msgtype, "%s is in %s mode\n", local->name, (priv->flags & ABSOLUTE_FLAG) ? "absolute" : "relative"); -- 2.32.0.93.g670b81a890