 @@ -41,27 +41,31 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/hw/sun/sunKbd.c,v 1.9 2003/11/17 22:20:36 dawes Exp $ */
 #define NEED_EVENTS
 #include "sun.h"
 #include <X11/keysym.h>
 #include <X11/Sunkeysym.h>
 #include "mi.h"
 #include <X11/extensions/XKB.h>
 #include "xkbsrv.h"
 #include "xkbstr.h"
 #ifdef __sun
 #define SUN_LED_MASK	0x0f
 #else
 #define SUN_LED_MASK	0x07
 #endif
 #define MIN_KEYCODE	7	/* necessary to avoid the mouse buttons */
 #define MAX_KEYCODE	255	/* limited by the protocol */
 #ifndef KB_SUN4
 #define KB_SUN4		4
 #endif
 #define tvminus(tv, tv1, tv2)   /* tv = tv1 - tv2 */ \
 		if ((tv1).tv_usec < (tv2).tv_usec) { \
 		    (tv1).tv_usec += 1000000; \
 		    (tv1).tv_sec -= 1; \
 		} \
 		(tv).tv_usec = (tv1).tv_usec - (tv2).tv_usec; \
 		(tv).tv_sec = (tv1).tv_sec - (tv2).tv_sec;
 @@ -134,43 +138,61 @@ void SwapLKeys(KeySymsRec* keysyms)
 	    /* yes, I could have done a clever two line swap! */
 	    k = keysyms->map[i - 2];
 	    keysyms->map[i - 2] = keysyms->map[i];
 	    keysyms->map[i] = k;
+	}
+}
 static void
 SetLights(KeybdCtrl* ctrl, int fd)
+{
 #ifdef KIOCSLED
     static unsigned char led_tab[16] = {
 ,
 #ifdef __sun
 	LED_NUM_LOCK,
 	LED_SCROLL_LOCK,
 	LED_SCROLL_LOCK | LED_NUM_LOCK,
 	LED_COMPOSE,
 	LED_COMPOSE | LED_NUM_LOCK,
 	LED_COMPOSE | LED_SCROLL_LOCK,
 	LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK,
 	LED_CAPS_LOCK,
 	LED_CAPS_LOCK | LED_NUM_LOCK,
 	LED_CAPS_LOCK | LED_SCROLL_LOCK,
 	LED_CAPS_LOCK | LED_SCROLL_LOCK | LED_NUM_LOCK,
 	LED_CAPS_LOCK | LED_COMPOSE,
 	LED_CAPS_LOCK | LED_COMPOSE | LED_NUM_LOCK,
 	LED_CAPS_LOCK | LED_COMPOSE | LED_SCROLL_LOCK,
 	LED_CAPS_LOCK | LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK
 #else
 	LED_CAPS_LOCK,
 	LED_NUM_LOCK,
 	LED_NUM_LOCK | LED_CAPS_LOCK,
 	LED_SCROLL_LOCK,
 	LED_SCROLL_LOCK | LED_CAPS_LOCK,
 	LED_SCROLL_LOCK | LED_NUM_LOCK,
 	LED_SCROLL_LOCK | LED_NUM_LOCK | LED_CAPS_LOCK,
 	LED_COMPOSE,
 	LED_COMPOSE | LED_CAPS_LOCK,
 	LED_COMPOSE | LED_NUM_LOCK,
 	LED_COMPOSE | LED_NUM_LOCK | LED_CAPS_LOCK,
 	LED_COMPOSE | LED_SCROLL_LOCK,
 	LED_COMPOSE | LED_SCROLL_LOCK | LED_CAPS_LOCK,
 	LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK,
 	LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK | LED_CAPS_LOCK,
 #endif
     };
-    if (ioctl (fd, KIOCSLED, (caddr_t)&led_tab[ctrl->leds & 0x0f]) == -1)
+    if (ioctl (fd, KIOCSLED, (caddr_t)&led_tab[ctrl->leds & SUN_LED_MASK]) == -1)
 	ErrorF("Failed to set keyboard lights");
 #endif
+}
 /*-
  *-----------------------------------------------------------------------
  * sunBell --
  *	Ring the terminal/keyboard bell
+ *
  * Results:
  *	Ring the keyboard bell for an amount of time proportional to
  *	"loudness."
 @@ -213,30 +235,37 @@ void
 DDXRingBell(int volume, int pitch, int duration)
+{
     DeviceIntPtr pKeyboard;
     sunKbdPrivPtr pPriv;
     pKeyboard = sunKeyboardDevice;
     if (pKeyboard != NULL) {
 	pPriv = (sunKbdPrivPtr)pKeyboard->public.devicePrivate;
 	bell(pPriv->fd, duration * 1000);
+    }
+}
 #ifdef __sun
 #define XLED_NUM_LOCK    0x1
 #define XLED_COMPOSE     0x4
 #define XLED_SCROLL_LOCK 0x2
 #define XLED_CAPS_LOCK   0x8
 #else
 #define XLED_NUM_LOCK    0x2
 #define XLED_COMPOSE     0x8
 #define XLED_SCROLL_LOCK 0x4
 #define XLED_CAPS_LOCK   0x1
 #endif
 static KeyCode
 LookupKeyCode(KeySym keysym, XkbDescPtr xkb, KeySymsPtr syms)
+{
     KeyCode i;
     int ii, index = 0;
     for (i = xkb->min_key_code; i < xkb->max_key_code; i++)
 	for (ii = 0; ii < syms->mapWidth; ii++)
 	    if (syms->map[index++] == keysym)
 		return i;
     return 0;
+}
 @@ -314,27 +343,27 @@ DoLEDs(
     if (!(ctrl->leds & XLED_SCROLL_LOCK) && (pPriv->leds & XLED_SCROLL_LOCK))
 	    pseudoKey(device, FALSE,
 		LookupKeyCode(XK_Scroll_Lock, xkb, syms));
     if ((ctrl->leds & XLED_COMPOSE) && !(pPriv->leds & XLED_COMPOSE))
 	    pseudoKey(device, TRUE,
 		LookupKeyCode(SunXK_Compose, xkb, syms));
     if (!(ctrl->leds & XLED_COMPOSE) && (pPriv->leds & XLED_COMPOSE))
 	    pseudoKey(device, FALSE,
 		LookupKeyCode(SunXK_Compose, xkb, syms));
-    pPriv->leds = ctrl->leds & 0x0f;
+    pPriv->leds = ctrl->leds & SUN_LED_MASK;
     SetLights (ctrl, pPriv->fd);
     free(syms->map);
     free(syms);
+}
 /*-
  *-----------------------------------------------------------------------
  * sunKbdCtrl --
  *	Alter some of the keyboard control parameters
+ *
  * Results:
  *	None.
+ *
 @@ -349,27 +378,27 @@ sunKbdCtrl(DeviceIntPtr device, KeybdCtr
+{
     sunKbdPrivPtr pPriv = (sunKbdPrivPtr) device->public.devicePrivate;
     if (pPriv->fd < 0) return;
     if (ctrl->click != pPriv->click) {
     	int kbdClickCmd;
 	pPriv->click = ctrl->click;
 	kbdClickCmd = pPriv->click ? KBD_CMD_CLICK : KBD_CMD_NOCLICK;
     	if (ioctl (pPriv->fd, KIOCCMD, &kbdClickCmd) == -1)
  	    ErrorF("Failed to set keyclick");
+    }
-    if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & 0x0f)))
+    if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & SUN_LED_MASK)))
 	DoLEDs(device, ctrl, pPriv);
+}
 /*-
  *-----------------------------------------------------------------------
  * sunInitKbdNames --
  *	Handle the XKB initialization
+ *
  * Results:
  *	None.
+ *
  * Comments:
  *     This function needs considerable work, in conjunctions with