[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/sun Fixes "FatalError re-...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/33120caf33e7
branches:  trunk
changeset: 10659:33120caf33e7
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Mar 17 15:02:27 2021 +0000

description:
Fixes "FatalError re-entered, aborting" error when Xservers get SIGSEGV.

Handle a new DEVICE_ABORT mode perperly in deviceProc funtions.
Also don't exit via FatalError() on an unknown mode because it looks
upstream assumes DDX deviceProc functions don't treat it fatal:
 https://gitlab.freedesktop.org/xorg/xserver/-/commit/9f79e93b6b3416055d08a0e8f9f16d5fd0649e36

diffstat:

 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c   |  7 ++++---
 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c |  4 +++-
 external/mit/xorg-server/dist/hw/sun/sunKbd.c            |  5 +++--
 external/mit/xorg-server/dist/hw/sun/sunMouse.c          |  3 +++
 4 files changed, 13 insertions(+), 6 deletions(-)

diffs (67 lines):

diff -r b8566a659a0b -r 33120caf33e7 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c    Fri Mar 12 11:43:12 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c    Wed Mar 17 15:02:27 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.11 2021/03/11 12:08:57 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.12 2021/03/17 15:02:27 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -160,8 +160,9 @@
             RemoveNotifyFd(x68kKbdPriv.fd);
             pKeyboard->on = FALSE;
             break;
-        default:
-            FatalError("Unknown keyboard operation\n");
+
+        case DEVICE_ABORT:
+            break;
     }
     return Success;
 }
diff -r b8566a659a0b -r 33120caf33e7 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c  Fri Mar 12 11:43:12 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c  Wed Mar 17 15:02:27 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.11 2021/03/17 15:02:27 tsutsui Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -195,6 +195,8 @@
                ErrorF("x68kMouseProc ioctl VUIDSFORMAT\n");
            break;
 
+       case DEVICE_ABORT:
+           break;
     }
     return Success;
 }
diff -r b8566a659a0b -r 33120caf33e7 external/mit/xorg-server/dist/hw/sun/sunKbd.c
--- a/external/mit/xorg-server/dist/hw/sun/sunKbd.c     Fri Mar 12 11:43:12 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunKbd.c     Wed Mar 17 15:02:27 2021 +0000
@@ -692,8 +692,9 @@
        RemoveNotifyFd(pPriv->fd);
        pKeyboard->on = FALSE;
        break;
-    default:
-       FatalError("Unknown keyboard operation\n");
+
+    case DEVICE_ABORT:
+       break;
     }
     return Success;
 }
diff -r b8566a659a0b -r 33120caf33e7 external/mit/xorg-server/dist/hw/sun/sunMouse.c
--- a/external/mit/xorg-server/dist/hw/sun/sunMouse.c   Fri Mar 12 11:43:12 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunMouse.c   Wed Mar 17 15:02:27 2021 +0000
@@ -180,6 +180,9 @@
            pMouse->on = FALSE;
            RemoveNotifyFd(sunPtrPriv.fd);
            break;
+
+       case DEVICE_ABORT:
+           break;
     }
     return Success;
 }