[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k Update for re...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/65ffb6db9460
branches:  trunk
changeset: 10499:65ffb6db9460
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 18 15:37:02 2020 +0000

description:
Update for removal of AddEnabledDevice and RemoveEnabledDevice.

Use the NotifyFd API instead as per upstream commits:
 https://cgit.freedesktop.org/xorg/xserver/commit/?id=55c2e1a3aa587c58a74066724e11e30b3df267b8
 https://cgit.freedesktop.org/xorg/xserver/commit/?id=be5a513fee6cbf29ef7570e57eb0436d70fbd88c
 https://cgit.freedesktop.org/xorg/xserver/commit/?id=60a91031d13e4d29c383087120e318f6b528b6e5
 https://cgit.freedesktop.org/xorg/xserver/commit/?id=7def2fea30060d47780dc1eedc91fada5ae1934f

diffstat:

 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c   |  13 ++++++++++---
 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c |  13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diffs (92 lines):

diff -r 4d2fcbf22ffa -r 65ffb6db9460 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c    Sat Jul 18 04:46:22 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c    Sat Jul 18 15:37:02 2020 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -87,6 +87,7 @@
 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);
@@ -94,6 +95,11 @@
 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.
@@ -144,13 +150,14 @@
                 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:
diff -r 4d2fcbf22ffa -r 65ffb6db9460 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c  Sat Jul 18 04:46:22 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c  Sat Jul 18 15:37:02 2020 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -87,6 +87,7 @@
 #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);
@@ -102,6 +103,11 @@
 
 static X68kMousePriv x68kMousePriv;
 
+static void
+x68kMouseHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
+
 /*-
  *-----------------------------------------------------------------------
  * x68kMouseProc --
@@ -162,13 +168,14 @@
                 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: