Module Name: xsrc
Committed By: tsutsui
Date: Sat Jul 18 04:46:22 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.4 Fri Apr 10 16:49:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c Sat Jul 18 04:46:22 2020
@@ -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 @@ InitOutput(ScreenInfo *pScreenInfo, int
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");
