[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k Pull changes ...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/4d2fcbf22ffa
branches:  trunk
changeset: 10498:4d2fcbf22ffa
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 18 04:46:22 2020 +0000

description:
Pull changes of x68kInit.c rev 1.3 from xorg-server.old.

https://mail-index.netbsd.org/source-changes/2020/07/18/msg119473.html
> Use AllocDevicePair() to initialize input devices in InitInput().

Untested, but I'll re-visit on migrating to HAVE_XORG_SERVER_VER=120.

diffstat:

 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r a0d86f125325 -r 4d2fcbf22ffa external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c   Sat Jul 18 04:37:50 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c   Sat Jul 18 04:46:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.5 2020/07/18 04:46:22 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -126,8 +126,13 @@
 void
 InitInput(int argc, char *argv[]) 
 {
-    x68kPointerDevice = AddInputDevice(serverClient, x68kMouseProc, TRUE);
-    x68kKeyboardDevice = AddInputDevice(serverClient, x68kKbdProc, TRUE);
+    int rc;
+
+    rc = AllocDevicePair(serverClient, "x68k",
+                        &x68kPointerDevice, &x68kKeyboardDevice,
+                        x68kMouseProc,x68kKbdProc, FALSE);
+    if (rc != Success)
+       FatalError("Failed to init x68k default input devices.\n");
 
     if ( !mieqInit() )
         FatalError("mieqInit failed\n");