 @@ -51,49 +51,49 @@
 #define USB_NEW_HID
 #endif
 #define HUP_GENERIC_DESKTOP     0x0001
 #define HUP_BUTTON              0x0009
 #define HUG_X                   0x0030
 #define HUG_Y                   0x0031
 #define HUG_Z                   0x0032
 #define HUG_WHEEL               0x0038
 #define HID_USAGE2(p,u) (((p) << 16) | u)
-/* The UMS mices have middle button as number 3 */
+/* The UMS mice have middle button as number 3 */
 #define UMS_BUT(i) ((i) == 0 ? 2 : (i) == 1 ? 0 : (i) == 2 ? 1 : (i))
 #endif /* USBMOUSE_SUPPORT */
 #ifdef USBMOUSE_SUPPORT
 static void usbSigioReadInput (int fd, void *closure);
 #endif
 static const char *FindDevice(InputInfoPtr, const char *, int);
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 /* These are for FreeBSD and DragonFly */
 #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 #define DEFAULT_PS2_DEV                 "/dev/psm0"
 static const char *mouseDevs[] = {
         DEFAULT_MOUSE_DEV,
         DEFAULT_SYSMOUSE_DEV,
         DEFAULT_PS2_DEV,
         NULL
 };
 #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
-/* Only wsmouse mices are autoconfigured for now on OpenBSD */
+/* Only wsmouse mice are autoconfigured for now on OpenBSD */
 #define DEFAULT_WSMOUSE_DEV             "/dev/wsmouse"
 #define DEFAULT_WSMOUSE0_DEV            "/dev/wsmouse0"
 static const char *mouseDevs[] = {
         DEFAULT_WSMOUSE_DEV,
         DEFAULT_WSMOUSE0_DEV,
         NULL
 };
 #endif
 static int
 SupportedInterfaces(void)
+{
 @@ -222,27 +222,27 @@ SetSysMouseRes(InputInfoPtr pInfo, const
     mousemode_t mode;
     MouseDevPtr pMse;
     pMse = pInfo->private;
     mode.rate = rate > 0 ? rate : -1;
     mode.resolution = res > 0 ? res : -1;
     mode.accelfactor = -1;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     if (pMse->autoProbe ||
         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
         /*
          * As the FreeBSD sysmouse driver defaults to protocol level 0
-         * everytime it is opened we enforce protocol level 1 again at
+         * every time it is opened we enforce protocol level 1 again at
          * this point.
          */
         mode.level = 1;
     } else
         mode.level = -1;
 #else
     mode.level = -1;
 #endif
     ioctl(pInfo->fd, MOUSE_SETMODE, &mode);
+}
 #endif
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 @@ -594,28 +594,30 @@ usbMouseProc(DeviceIntPtr pPointer, int
     case DEVICE_ON:
         pInfo->fd = xf86OpenSerial(pInfo->options);
         if (pInfo->fd == -1)
             xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
         else {
             pMse->buffer = XisbNew(pInfo->fd, pUsbMse->packetSize);
             if (!pMse->buffer) {
                 free(pMse);
                 xf86CloseSerial(pInfo->fd);
                 pInfo->fd = -1;
             } else {
                 xf86FlushInput(pInfo->fd);
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 23
                 if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
                                               pInfo))
 #endif
                     AddEnabledDevice(pInfo->fd);
+            }
+        }
         pMse->lastButtons = 0;
         pMse->lastMappedButtons = 0;
         pMse->emulateState = 0;
         pPointer->public.on = TRUE;
         break;
     case DEVICE_OFF:
     case DEVICE_CLOSE:
         if (pInfo->fd != -1) {
             RemoveEnabledDevice(pInfo->fd);
 @@ -716,27 +718,27 @@ usbPreInit(InputInfoPtr pInfo, const cha
     /* Check if the device can be opened. */
     pInfo->fd = xf86OpenSerial(pInfo->options);
     if (pInfo->fd == -1) {
         if (xf86GetAllowMouseOpenFail())
             xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
         else {
             xf86Msg(X_ERROR, "%s: cannot open input device\n", pInfo->name);
             free(pUsbMse);
             free(pMse);
             return FALSE;
+        }
+    }
-    /* Get USB informations */
+    /* Get USB information */
     reportDesc = hid_get_report_desc(pInfo->fd);
     /* Get packet size & iid */
 #ifdef USB_NEW_HID
     if (ioctl(pInfo->fd, USB_GET_REPORT_ID, &pUsbMse->iid) == -1) {
             xf86Msg(X_ERROR, "Error ioctl USB_GET_REPORT_ID on %s : %s\n",
                     pInfo->name, strerror(errno));
             return FALSE;
+    }
     pUsbMse->packetSize = hid_report_size(reportDesc, hid_input,
                                               pUsbMse->iid);
 #else
     pUsbMse->packetSize = hid_report_size(reportDesc, hid_input,
                                               &pUsbMse->iid);

 @@ -28,27 +28,27 @@
  */
 /* Patch for PS/2 Intellimouse - Tim Goodwin 1997-11-06. */
 /*
  * [JCH-96/01/21] Added fourth button support for PROT_GLIDEPOINT mouse
  * protocol.
  */
 /*
  * [TVO-97/03/05] Added microsoft IntelliMouse support
  */
 /*
- * [PME-02/08/11] Added suport for drag lock buttons
+ * [PME-02/08/11] Added support for drag lock buttons
  * for use with 4 button trackballs for convenience
  * and to help limited dexterity persons
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <xorg-server.h>
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 @@ -166,32 +166,38 @@ static void ps2BlockHandler(pointer data
 #endif
 static void Emulate3ButtonsSetEnabled(InputInfoPtr pInfo, Bool enable);
 /* mouse autoprobe stuff */
 static const char *autoOSProtocol(InputInfoPtr pInfo, int *protoPara);
 static void autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool lostSync);
 static void checkForErraticMovements(InputInfoPtr pInfo, int dx, int dy);
 static Bool collectData(MouseDevPtr pMse, unsigned char u);
 static void SetMouseProto(MouseDevPtr pMse, MouseProtocolID protocolID);
 static Bool autoGood(MouseDevPtr pMse);
 #undef MOUSE
 _X_EXPORT InputDriverRec MOUSE = {
-,
+	.driverVersion		= 1,
-        "mouse",
+	.driverName		= "mouse",
-        NULL,
+	.Identify		= NULL,
-        MousePreInit,
+	.PreInit		= MousePreInit,
-        NULL,
+	.UnInit			= NULL,
-        NULL,
+	.module			= NULL,
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
 	.default_options	= NULL,
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 21
 	.capabilities		= 0
 #endif
 #endif
 };
 #define RETRY_COUNT 4
 /* Properties that can be set at runtime via xinput */
 static Atom prop_mbemu     = 0; /* Middle button emulation on/off property */
 static Atom prop_mbtimeout = 0; /* Middle button timeout property */
 /*
  * Microsoft (all serial models), Logitech MouseMan, First Mouse, etc,
  * ALPS GlidePoint, Thinking Mouse.
  */
 static const char *msDefaults[] = {
 @@ -809,28 +815,28 @@ InitProtocols(void)
         return FALSE;
     /* Mark unsupported interface classes. */
     for (i = 0; mouseProtocols[i].name; i++)
         if (!(mouseProtocols[i].class & classes))
             mouseProtocols[i].id = PROT_UNSUP;
     for (i = 0; mouseProtocols[i].name; i++)
         if (mouseProtocols[i].class & MSE_MISC)
             if (!osInfo->CheckProtocol ||
                 !osInfo->CheckProtocol(mouseProtocols[i].name))
                 mouseProtocols[i].id = PROT_UNSUP;
 #ifdef __NetBSD__
     /* NetBSD uses PROT_BM for "PS/2". */
 #if defined(__NetBSD__)
     for (i = 0; mouseProtocols[i].name; i++)
         if (mouseProtocols[i].id == PROT_PS2)
             mouseProtocols[i].id = PROT_BM;
 #endif
     return TRUE;
+}
 static const char*
 MouseFindDevice(InputInfoPtr pInfo, const char* protocol)
+{
     const char *device;
 @@ -1185,27 +1191,27 @@ MouseReadInput(InputInfoPtr pInfo)
     unsigned char *pBuf, u;
     pMse = pInfo->private;
     pBufP = pMse->protoBufTail;
     pBuf = pMse->protoBuf;
     if (pInfo->fd == -1)
         return;
     /*
      * Set blocking to -1 on the first call because we know there is data to
      * read. Xisb automatically clears it after one successful read so that
-     * succeeding reads are preceeded by a select with a 0 timeout to prevent
+     * succeeding reads are preceded by a select with a 0 timeout to prevent
      * read from blocking indefinitely.
      */
     XisbBlockDuration(pMse->buffer, -1);
     while ((c = XisbRead(pMse->buffer)) >= 0) {
         u = (unsigned char)c;
 #if defined (EXTMOUSEDEBUG) || defined (MOUSEDATADEBUG)
         LogMessageVerbSigSafe(X_INFO, -1, "mouse byte: %x\n",u);
 #endif
         /* if we do autoprobing collect the data */
         if (pMse->collectData && pMse->autoProbe)
 @@ -1245,31 +1251,31 @@ MouseReadInput(InputInfoPtr pInfo)
                  * even 0x02/0x22, so I have to strip off the lower bits.
                  * [CHRIS-211092]
+                 *
                  * [JCH-96/01/21]
                  * HACK for ALPS "fourth button".  (It's bit 0x10 of the
                  * "fourth byte" and it is activated by tapping the glidepad
                  * with the finger! 8^) We map it to bit bit3, and the
                  * reverse map in xf86Events just has to be extended so that
                  * it is identified as Button 4.  The lower half of the
                  * reverse-map may remain unchanged.
                  */
                 /*
                  * [KAZU-030897]
-                 * Receive the fourth byte only when preceeding three bytes
+                 * Receive the fourth byte only when preceding three bytes
                  * have been detected (pBufP >= pMse->protoPara[4]).  In the
                  * previous versions, the test was pBufP == 0; we may have
                  * mistakingly received a byte even if we didn't see anything
-                 * preceeding the byte.
+                 * preceding the byte.
                  */
 #ifdef EXTMOUSEDEBUG
                 LogMessageVerbSigSafe(X_INFO, -1, "mouse 4th byte %x\n",u);
 #endif
                 dx = dy = dz = dw = 0;
                 buttons = 0;
                 switch (pMse->protocolID) {
                 /*
                  * [KAZU-221197]
                  * IntelliMouse, NetMouse (including NetMouse Pro) and Mie
                  * Mouse always send the fourth byte, whereas the fourth byte
                  * is optional for GlidePoint and ThinkingMouse.  The fourth
 @@ -1898,27 +1904,27 @@ FlushButtons(MouseDevPtr pMse)
  * pressed now.  It's possible (ie, mouse hardware does it) to go from (eg)
  * left down to right down without anything in between, so all cases must be
  * handled.
+ *
  * a handler consists of three values:
  *   0: action1
  *   1: action2
  *   2: new emulation state
+ *
  * action > 0: ButtonPress
  * action = 0: nothing
  * action < 0: ButtonRelease
+ *
- * The comment preceeding each section is the current emulation state.
+ * The comment preceding each section is the current emulation state.
  * The comments to the right are of the form
  *      <button state> (<events>) -> <new emulation state>
  * which should be read as
  *      If the buttons are in <button state>, generate <events> then go to
  *      <new emulation state>.
  */
 static signed char stateTab[11][5][3] = {
 /* 0 ground */
+  {
     {  0,  0,  0 },   /* nothing -> ground (no change) */
     {  0,  0,  1 },   /* left -> delayed left */
     {  0,  0,  2 },   /* right -> delayed right */
     {  2,  0,  3 },   /* left & right (middle press) -> pressed middle */
 @@ -2576,58 +2582,57 @@ static unsigned char proto[PROT_NUMPROTO
   {  0xf8, 0x80, 0x00, 0x00,  5,   0x00, 0xff, MPF_NONE },  /* Auto (dummy) */
   {  0xf8, 0x80, 0x00, 0x00,  8,   0x00, 0xff, MPF_NONE },  /* SysMouse */
 };
 /*
  * SetupMouse --
  *      Sets up the mouse parameters
  */
 static Bool
 SetupMouse(InputInfoPtr pInfo)
+{
     MouseDevPtr pMse;
     int i;
     int protoPara[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
     const char *name = NULL;
     Bool automatic = FALSE;
     pMse = pInfo->private;
     /* Handle the "Auto" protocol. */
     if (pMse->protocolID == PROT_AUTO) {
         /*
          * We come here when user specifies protocol "auto" in
-         * the configuration file or thru the xf86misc extensions.
+         * the configuration file or through the xf86misc extensions.
          * So we initialize autoprobing here.
          * Probe for PnP/OS mouse first. If unsuccessful
          * try to guess protocol from incoming data.
          */
         automatic = TRUE;
         pMse->autoProbe = TRUE;
         name = autoOSProtocol(pInfo,protoPara);
         if (name)  {
 #ifdef EXTMOUSEDEBUG
             ErrorF("PnP/OS Mouse detected: %s\n",name);
 #endif
+        }
+    }
     SetMouseProto(pMse, pMse->protocolID);
     if (automatic) {
         if (name) {
             /* Possible protoPara overrides from SetupAuto. */
-            for (i = 0; i < sizeof(pMse->protoPara); i++)
+            for (size_t i = 0; i < sizeof(pMse->protoPara); i++)
                 if (protoPara[i] != -1)
                     pMse->protoPara[i] = protoPara[i];
             /* if we come here PnP/OS mouse probing was successful */
         } else {
             /* PnP/OS mouse probing wasn't successful; we look at data */
+        }
+    }
     /*
      * If protocol has changed fetch the default options
      * for the new protocol.
      */
     if (pMse->oldProtocolID != pMse->protocolID) {
 @@ -3233,27 +3238,27 @@ autoOSProtocol(InputInfoPtr pInfo, int *
     const char *name = NULL;
     MouseProtocolID protocolID = PROT_UNKNOWN;
     /* Check if the OS has a detection mechanism. */
     if (osInfo->SetupAuto) {
         name = osInfo->SetupAuto(pInfo, protoPara);
         if (name) {
             protocolID = ProtocolNameToID(name);
             switch (protocolID) {
                 case PROT_UNKNOWN:
                     /* Check for a builtin OS-specific protocol. */
                     if (osInfo->CheckProtocol && osInfo->CheckProtocol(name)) {
                         /* We can only come here if the protocol has been
-                         * changed to auto thru the xf86misc extension
+                         * changed to auto through the xf86misc extension
                          * and we have detected an OS specific builtin
                          * protocol. Currently we cannot handle this */
                         name = NULL;
                     } else
                         name = NULL;
                     break;
                 case PROT_UNSUP:
                     name = NULL;
                     break;
                 default:
                     break;
+            }
+        }
 @@ -3712,26 +3717,27 @@ autoGood(MouseDevPtr pMse)
     if (!pMse->autoProbe)
         return TRUE;
     switch (mPriv->autoState) {
     case AUTOPROBE_GOOD:
     case AUTOPROBE_H_GOOD:
         return TRUE;
     case AUTOPROBE_VALIDATE1: /* @@@ */
     case AUTOPROBE_H_VALIDATE1: /* @@@ */
     case AUTOPROBE_VALIDATE2:
     case AUTOPROBE_H_VALIDATE2:
         if (mPriv->goodCount < PROBE_UNCERTAINTY/2)
             return TRUE;
         /* FALLTHROUGH */
     default:
         return FALSE;
+    }
+}
 #define TOT_THRESHOLD 3000
 #define VAL_THRESHOLD 40
 /*
  * checkForErraticMovements() -- check if mouse 'jumps around'.
  */
 static void
 @@ -3745,41 +3751,43 @@ checkForErraticMovements(InputInfoPtr pI
 #if 0
     if (abs(dx - mPriv->prevDx) > 300
         || abs(dy - mPriv->prevDy) > 300)
         AP_DBG(("erratic1 behaviour\n"));
 #endif
     if (abs(dx) > VAL_THRESHOLD) {
         if (sign(dx) == sign(mPriv->prevDx)) {
             mPriv->accDx += dx;
             if (abs(mPriv->accDx) > mPriv->acc) {
                 mPriv->acc = abs(mPriv->accDx);
                 AP_DBG(("acc=%i\n",mPriv->acc));
+            }
-            else
+            else {
                 AP_DBG(("accDx=%i\n",mPriv->accDx));
+            }
         } else {
             mPriv->accDx = 0;
+        }
+    }
     if (abs(dy) > VAL_THRESHOLD) {
         if (sign(dy) == sign(mPriv->prevDy)) {
             mPriv->accDy += dy;
             if (abs(mPriv->accDy) > mPriv->acc) {
                 mPriv->acc = abs(mPriv->accDy);
                 AP_DBG(("acc: %i\n",mPriv->acc));
-            } else
+            } else {
                 AP_DBG(("accDy=%i\n",mPriv->accDy));
+            }
         } else {
             mPriv->accDy = 0;
+        }
+    }
     mPriv->prevDx = dx;
     mPriv->prevDy = dy;
     if (mPriv->acc > TOT_THRESHOLD) {
         mPriv->goodCount = PROBE_UNCERTAINTY;
         mPriv->prevDx = 0;
         mPriv->prevDy = 0;
         mPriv->accDx = 0;
         mPriv->accDy = 0;
         mPriv->acc = 0;

 @@ -401,27 +401,27 @@ pnpparse(InputInfoPtr pInfo, pnpid_t *id
     sum += buf[len - 1];
     for (; i < len; ++i)
         buf[i] += offset;
     xf86MsgVerb(X_INFO, 2, "%s: PnP ID string: `%*.*s'\n", pInfo->name,
                 len, len, buf);
     /* revision */
     buf[1] -= offset;
     buf[2] -= offset;
     id->revision = ((buf[1] & 0x3f) << 6) | (buf[2] & 0x3f);
     xf86MsgVerb(X_INFO, 2, "%s: PnP rev %d.%02d\n", pInfo->name,
                 id->revision / 100, id->revision % 100);
-    /* EISA vender and product ID */
+    /* EISA vendor and product ID */
     id->eisaid = &buf[3];
     id->neisaid = 7;
     /* option strings */
     i = 10;
     if (buf[i] == '\\') {
         /* device serial # */
         for (j = ++i; i < len; ++i) {
             if (buf[i] == '\\')
                 break;
+        }
         if (i >= len)
             i -= 3;
 @@ -591,39 +591,39 @@ ps2SendPacket(InputInfoPtr pInfo, unsign
 #endif
     for (i = 0; i < len; i++) {
         for (j = 0; j < 10; j++) {
             xf86WriteSerial(pInfo->fd, bytes + i, 1);
             usleep(10000);
             if (!readMouse(pInfo,&c)) {
 #ifdef DEBUG
                 xf86ErrorF("sending 0x%x to PS/2 unsuccessful\n",*(bytes + i));
 #endif
                 return FALSE;
+            }
 #ifdef DEBUG
-            xf86ErrorF("Recieved: 0x%x\n",c);
+            xf86ErrorF("Received: 0x%x\n",c);
 #endif
             if (c == 0xFA) /* ACK */
                 break;
             if (c == 0xFE) /* resend */
                 continue;
             if (c == 0xFC) /* error */
                 return FALSE;
-            /* Some mice accidently enter wrap mode during init */
+            /* Some mice accidentally enter wrap mode during init */
             if (c == *(bytes + i)    /* wrap mode */
                 && (*(bytes + i) != 0xEC)) /* avoid recursion */
                 ps2DisableWrapMode(pInfo);
             return FALSE;
+        }
         if (j == 10)
             return FALSE;
+    }
     return TRUE;
+}