 @@ -1,14 +1,14 @@
-/* $NetBSD: x68kKbd.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.5 2020/07/18 15:37:02 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -77,33 +77,39 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
 #include <X11/extensions/XKB.h>
 #include "xkbsrv.h"
 #define MIN_KEYCODE     7       /* necessary to avoid the mouse buttons */
 #define MAX_KEYCODE     255     /* limited by the protocol */
 X68kKbdPriv x68kKbdPriv;
 DeviceIntPtr x68kKeyboardDevice = NULL;
 static void x68kKbdHandlerNotify(int, int, void *);
 static void x68kInitModMap(KeySymsRec *, CARD8 *);
 static void x68kInitKbdNames(XkbRMLVOSet *, X68kKbdPrivPtr);
 static void x68kKbdRingBell(DeviceIntPtr, int, int);
 static void x68kKbdBell(int, DeviceIntPtr, pointer, int);
 static void x68kKbdCtrl(DeviceIntPtr, KeybdCtrl *);
 static void x68kSetLeds(X68kKbdPrivPtr, u_char);
 static void
 x68kKbdHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
 /*------------------------------------------------------------------------
  * x68kKbdProc --
  *	Handle the initialization, etc. of a keyboard.
+ *
  * Results:
  *	None.
+ *
  *----------------------------------------------------------------------*/
 int
 x68kKbdProc(DeviceIntPtr pDev, 	/* Keyboard to manipulate */
             int what)	    	/* What to do to it */
+{
     DevicePtr pKeyboard = &pDev->public;
 @@ -134,33 +140,34 @@ x68kKbdProc(DeviceIntPtr pDev, 	/* Keybo
 		x68kModMap, serverClient);
 #endif
             break;
         case DEVICE_ON:
             mode = 1;
             if ( fcntl(x68kKbdPriv.fd, F_SETOWN, getpid()) == -1 ||
                  fcntl(x68kKbdPriv.fd, F_SETFL, O_NONBLOCK|O_ASYNC) == -1 ||
                  ioctl(x68kKbdPriv.fd, KIOCSDIRECT, &mode) == -1 ) {
                 ErrorF("Async keyboard I/O failed");
                 return !Success;
+            }
 	    x68kSetLeds(&x68kKbdPriv, (u_char)x68kKbdPriv.leds);
-            (void) AddEnabledDevice(x68kKbdPriv.fd);
+            SetNotifyFd(x68kKbdPriv.fd, x68kKbdHandlerNotify,
 		X_NOTIFY_READ, NULL);
             pKeyboard->on = TRUE;
             break;
         case DEVICE_CLOSE:
         case DEVICE_OFF:
-            RemoveEnabledDevice(x68kKbdPriv.fd);
+            RemoveNotifyFd(x68kKbdPriv.fd);
             pKeyboard->on = FALSE;
             break;
         default:
             FatalError("Unknown keyboard operation\n");
+    }
     return Success;
+}
 /*-------------------------------------------------------------------------
  * function "x68kInitModMap"
+ *
  *  purpose:  initialize modmap with keysym table
  *  argument: (KeySymsRec *)x68kKeySyms : keysym table

 @@ -1,14 +1,14 @@
-/* $NetBSD: x68kMouse.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.5 2020/07/18 15:37:02 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -77,41 +77,47 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "x68k.h"
 #include "mi.h"
 #include "input.h"
 #include "inpututils.h"
 #include "exevents.h"
 #include "events.h"
 #include "eventstr.h"
 #include <X11/Xatom.h>
 #include "xserver-properties.h"
 static void x68kMouseHandlerNotify(int, int, void *);
 static Bool x68kCursorOffScreen(ScreenPtr *, int *, int *);
 static void x68kCrossScreen(ScreenPtr, int);
 static void x68kWarpCursor(DeviceIntPtr, ScreenPtr, int, int);
 static void x68kMouseCtrl(DeviceIntPtr, PtrCtrl*);
 miPointerScreenFuncRec x68kPointerScreenFuncs = {
     x68kCursorOffScreen,
     x68kCrossScreen,
     x68kWarpCursor,
 };
 DeviceIntPtr x68kPointerDevice = NULL;
 static X68kMousePriv x68kMousePriv;
 static void
 x68kMouseHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
 /*-
  *-----------------------------------------------------------------------
  * x68kMouseProc --
  *	Handle the initialization, etc. of a mouse
+ *
  * Results:
  *	none.
+ *
  * Side Effects:
  *-----------------------------------------------------------------------
  */
 int
 x68kMouseProc(DeviceIntPtr device, int what)
 @@ -152,33 +158,34 @@ x68kMouseProc(DeviceIntPtr device, int w
+	    }
 	    format = VUID_FIRM_EVENT;
 	    if (ioctl (x68kMousePriv.fd, VUIDSFORMAT, &format) == -1) {
 		ErrorF("x68kMouseProc ioctl VUIDSFORMAT");
 		return !Success;
+	    }
             if ( fcntl(x68kMousePriv.fd, F_SETOWN, getpid()) == -1 ||
                  fcntl(x68kMousePriv.fd, F_SETFL, O_NONBLOCK | O_ASYNC) == -1
                  ) {
                 ErrorF("Async mouse I/O failed");
                 return !Success;
+            }
 	    x68kMousePriv.bmask = 0;
-	    AddEnabledDevice(x68kMousePriv.fd);
+	    SetNotifyFd(x68kMousePriv.fd, x68kMouseHandlerNotify,
 		X_NOTIFY_READ, NULL);
 	    pMouse->on = TRUE;
 	    break;
 	case DEVICE_OFF:
 	    pMouse->on = FALSE;
-	    RemoveEnabledDevice(x68kMousePriv.fd);
+	    RemoveNotifyFd(x68kMousePriv.fd);
 	    break;
 	case DEVICE_CLOSE:
 	    if (ioctl (x68kMousePriv.fd, VUIDSFORMAT, &oformat) == -1)
 		ErrorF("x68kMouseProc ioctl VUIDSFORMAT");
 	    break;
+    }
     return Success;
+}
 /*-
  *-----------------------------------------------------------------------