subject:"CVS commit\: xsrc\/external\/mit\/xorg\-server\/dist\/hw"

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2021-07-04 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sun Jul  4 07:03:16 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
elide cast warning: error: cast from pointer to integer of different size


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.14 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.15
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.14	Sat Jul  3 05:43:29 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Sun Jul  4 03:03:16 2021
@@ -61,7 +61,7 @@ volatile unsigned char *ioBase = MAP_FAI
 
 /* XXX why the hell is this necessary?! */
 #if defined(__arm__) || defined(__mips__)
-unsigned PORT_SIZE IOPortBase = (unsigned PORT_SIZE)MAP_FAILED;
+unsigned PORT_SIZE IOPortBase = (unsigned PORT_SIZE)(intptr_t)MAP_FAILED;
 #endif
 
 Bool

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

2021-07-03 Thread Martin Husemann

Module Name:xsrc
Committed By:   martin
Date:   Sat Jul  3 09:43:29 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
Add missing include of compiler.h and make all declarations of
IOPortBase consistent.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.17 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.18
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.17	Mon May 31 21:44:19 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Sat Jul  3 09:43:29 2021
@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *bas
 #define PORT_SIZE short
 #endif
 
-extern unsigned int IOPortBase;  /* Memory mapped I/O port area */
+extern unsigned PORT_SIZE IOPortBase;  /* Memory mapped I/O port area */
 
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.13 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.14
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.13	Fri Jul  2 19:31:47 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Sat Jul  3 09:43:29 2021
@@ -36,6 +36,7 @@
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
 
+#include "compiler.h"
 #include "bus/Pci.h"
 
 /***/

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2021-07-02 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri Jul  2 19:31:47 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
use PORT_SIZE from compiler.h instead of int.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.12 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.13
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.12	Tue Jun  1 20:33:22 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Fri Jul  2 15:31:47 2021
@@ -60,7 +60,7 @@ volatile unsigned char *ioBase = MAP_FAI
 
 /* XXX why the hell is this necessary?! */
 #if defined(__arm__) || defined(__mips__)
-unsigned int IOPortBase = (int)MAP_FAILED;
+unsigned PORT_SIZE IOPortBase = (unsigned PORT_SIZE)MAP_FAILED;
 #endif
 
 Bool
@@ -95,7 +95,7 @@ xf86DisableIO()
 munmap(__UNVOLATILE(ioBase), 0x1);
 ioBase = MAP_FAILED;
 #ifdef __arm__
-IOPortBase = (unsigned int)MAP_FAILED;
+IOPortBase = (unsigned PORT_SIZE)MAP_FAILED;
 #endif
 }
 #endif

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2021-06-01 Thread Joerg Sonnenberger

Module Name:xsrc
Committed By:   joerg
Date:   Wed Jun  2 00:33:22 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
Provide canonical declaration of IOPortBase for MIPS here, too.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.11 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.11	Tue Sep 27 19:10:47 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Wed Jun  2 00:33:22 2021
@@ -59,7 +59,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 volatile unsigned char *ioBase = MAP_FAILED;
 
 /* XXX why the hell is this necessary?! */
-#ifdef __arm__
+#if defined(__arm__) || defined(__mips__)
 unsigned int IOPortBase = (int)MAP_FAILED;
 #endif

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2021-03-22 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Mon Mar 22 14:10:06 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h

Log Message:
Explicitly include dix-config.h for HAVE_foo definitions referred in os.h.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h

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/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.7	Sun Feb  7 16:55:18 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Mon Mar 22 14:10:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.7 2021/02/07 16:55:18 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.8 2021/03/22 14:10:06 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -51,6 +51,7 @@
 #include 
 
 /* dix */
+#include 
 #include 
 #include 
 #include

CVS commit: xsrc/external/mit/xorg-server/dist/hw

2021-03-17 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Wed Mar 17 15:02:27 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kKbd.c
x68kMouse.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c sunMouse.c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.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/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.11 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.11	Thu Mar 11 12:08:57 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Wed Mar 17 15:02:27 2021
@@ -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 @@ x68kKbdProc(DeviceIntPtr pDev,	/* Keyboa
 RemoveNotifyFd(x68kKbdPriv.fd);
 pKeyboard->on = FALSE;
 break;
-default:
-FatalError("Unknown keyboard operation\n");
+
+case DEVICE_ABORT:
+break;
 }
 return Success;
 }

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.10 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.10	Thu Mar 11 12:08:57 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Wed Mar 17 15:02:27 2021
@@ -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 @@ x68kMouseProc(DeviceIntPtr device, int w
 		ErrorF("x68kMouseProc ioctl VUIDSFORMAT\n");
 	break;
 
+	case DEVICE_ABORT:
+	break;
 }
 return Success;
 }

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.9	Thu Mar 11 13:12:34 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Wed Mar 17 15:02:27 2021
@@ -692,8 +692,9 @@ sunKbdProc(DeviceIntPtr device, int what
 	RemoveNotifyFd(pPriv->fd);
 	pKeyboard->on = FALSE;
 	break;
-default:
-	FatalError("Unknown keyboard operation\n");
+
+case DEVICE_ABORT:
+	break;
 }
 return Success;
 }

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.4	Thu Mar 11 11:54:41 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c	Wed Mar 17 15:02:27 2021
@@ -180,6 +180,9 @@ sunMouseProc(DeviceIntPtr device, int wh
 	pMouse->on = FALSE;
 	RemoveNotifyFd(sunPtrPriv.fd);
 	break;
+
+	case DEVICE_ABORT:
+	break;
 }
 return Success;
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2021-03-11 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 13:12:34 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c

Log Message:
Avoid polluting console on non-fatal errors.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.8	Thu Mar 11 11:54:41 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Thu Mar 11 13:12:34 2021
@@ -191,7 +191,7 @@ SetLights(KeybdCtrl* ctrl, int fd)
 #endif
 };
 if (ioctl (fd, KIOCSLED, (caddr_t)&led_tab[ctrl->leds & SUN_LED_MASK]) == -1)
-	ErrorF("Failed to set keyboard lights\n");
+	LogMessage(X_ERROR, "Failed to set keyboard lights\n");
 #endif
 }
 
@@ -218,13 +218,13 @@ bell(int fd, int duration)
 
 kbdCmd = KBD_CMD_BELL;
 if (ioctl (fd, KIOCCMD, &kbdCmd) == -1) {
- 	ErrorF("Failed to activate bell\n");
+ 	LogMessage(X_ERROR, "Failed to activate bell\n");
 	return;
 }
 if (duration) usleep (duration);
 kbdCmd = KBD_CMD_NOBELL;
 if (ioctl (fd, KIOCCMD, &kbdCmd) == -1)
-	ErrorF("Failed to deactivate bell\n");
+	LogMessage(X_ERROR, "Failed to deactivate bell\n");
 }
 
 static void
@@ -394,7 +394,7 @@ sunKbdCtrl(DeviceIntPtr device, KeybdCtr
 	pPriv->click = ctrl->click;
 	kbdClickCmd = pPriv->click ? KBD_CMD_CLICK : KBD_CMD_NOCLICK;
 	if (ioctl (pPriv->fd, KIOCCMD, &kbdClickCmd) == -1)
- 	ErrorF("Failed to set keyclick\n");
+ 	LogMessage(X_ERROR, "Failed to set keyclick\n");
 }
 if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & SUN_LED_MASK)))
 	DoLEDs(device, ctrl, pPriv);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2021-03-11 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 12:08:57 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kFb.c x68kGraph.c
x68kKbd.c x68kMouse.c x68kText.c

Log Message:
ErrorF() doesn't append newlines at the end of messages.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.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/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.7	Wed Nov  4 17:16:13 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.7 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.8 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -50,12 +50,12 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 
 /* open frame buffer */
 if ( ( pPriv->fd = open(device, O_RDWR, 0)) < 0) {
-ErrorF( "Can't open frame buffer" );
+ErrorF( "Can't open frame buffer\n" );
 return FALSE;
 }
 /* get frame buffer infomation */
 if ( ioctl( pPriv->fd, GRFIOCGINFO, &gi ) == -1 ) {
-ErrorF( "Can't get grfinfo" );
+ErrorF( "Can't get grfinfo\n" );
 return FALSE;
 }
 pPriv->mapsize = gi.gd_regsize + gi.gd_fbsize;
@@ -64,7 +64,7 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 pPriv->reg = (FbReg *)mmap(0, pPriv->mapsize, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pPriv->fd, 0 );
 if ( pPriv->reg == (FbReg *)-1) {
-ErrorF( "Can't map frame buffer" );
+ErrorF( "Can't map frame buffer\n" );
 return FALSE;
 }
 pPriv->fb = (uint8_t *)((uint32_t)pPriv->reg + gi.gd_regsize);
@@ -114,7 +114,7 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 
 /* unmap and close frame buffer */
 if ( munmap(pPriv->reg, pPriv->mapsize) == -1 )
-ErrorF("Can't unmap frame buffer");
+ErrorF("Can't unmap frame buffer\n");
 close(pPriv->fd);
 }
 

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.9	Wed Nov  4 17:16:13 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.9 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -195,7 +195,7 @@ x68kGraphInit(ScreenPtr pScreen, int arg
 
 /* store private record into screen */
 if (!dixRegisterPrivateKey(&x68kScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) {
-ErrorF("dixRegisterPrivateKey failed");
+ErrorF("dixRegisterPrivateKey failed\n");
 return FALSE;
 }
 x68kSetScreenPrivate(pScreen, pPriv);
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.9	Sun Feb  7 16:55:18 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.9 2021/02/07 16:55:18 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -136,7 +136,7 @@ x68kMouseProc(DeviceIntPtr device, int w
 	case DEVICE_INIT:
 pMouse->devicePrivate = (void *) &x68kMousePriv;
 if( (x68kMousePriv.fd = open("/dev/mouse", O_RDONLY)) == -1 ) {
-ErrorF("Can't open mouse device");
+ErrorF("Can't open mouse device\n");
 return !Success;
 }
 	pMouse->on = FALSE;
@@ -165,18 +165,18 @@ x68kMouseProc(Dev

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2021-03-11 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 11:54:41 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c sunFbs.c sunInit.c
sunKbd.c sunMouse.c

Log Message:
ErrorF() doesn't append newlines at the end of messages.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c \
xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6	Sun Aug  9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Thu Mar 11 11:54:41 2021
@@ -120,7 +120,7 @@ CGUpdateColormap(ScreenPtr pScreen, int 
 sunCmap.blue = &bmap[dex];
 
 if (ioctl(sunFbs[pScreen->myNum].fd, FBIOPUTCMAP, &sunCmap) < 0) {
-	ErrorF("CGUpdateColormap");
+	ErrorF("CGUpdateColormap\n");
 	FatalError( "CGUpdateColormap: FBIOPUTCMAP failed\n" );
 }
 }
@@ -137,7 +137,7 @@ CGGetColormap(ScreenPtr pScreen, int dex
 sunCmap.blue = &bmap[dex];
 
 if (ioctl(sunFbs[pScreen->myNum].fd, FBIOGETCMAP, &sunCmap) < 0) {
-	ErrorF("CGGetColormap");
+	ErrorF("CGGetColormap\n");
 	FatalError( "CGGetColormap: FBIOGETCMAP failed\n" );
 }
 }

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3	Sun Jul 26 07:35:37 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c	Thu Mar 11 11:54:41 2021
@@ -99,7 +99,7 @@ sunMemoryMap(size_t len, off_t off, int 
 
 #if !defined(__bsdi__) && !defined(_MAP_NEW) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 if ((addr = (caddr_t) valloc (mapsize)) == NULL) {
-	ErrorF("Couldn't allocate frame buffer memory");
+	ErrorF("Couldn't allocate frame buffer memory\n");
 	(void) close (fd);
 	return NULL;
 }
@@ -121,7 +121,7 @@ sunMemoryMap(size_t len, off_t off, int 
 		PROT_READ | PROT_WRITE, MAP_SHARED,
 		fd, off);
 if (mapaddr == (void *) -1) {
-	ErrorF("mapping frame buffer memory");
+	ErrorF("mapping frame buffer memory\n");
 	(void) close (fd);
 	mapaddr = NULL;
 }
@@ -134,7 +134,7 @@ sunScreenAllocate(ScreenPtr pScreen)
 sunScreenPtrpPrivate;
 
 if (!dixRegisterPrivateKey(&sunScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) {
-	ErrorF("dixRegisterPrivateKey failed");
+	ErrorF("dixRegisterPrivateKey failed\n");
 	return FALSE;
 }
 pPrivate = calloc(1, sizeof (sunScreenRec));
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3	Sat Nov 21 03:02:09 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c	Thu Mar 11 11:54:41 2021
@@ -133,7 +133,7 @@ sunMouseProc(DeviceIntPtr device, int wh
 switch (what) {
 	case DEVICE_INIT:
 	if (pMouse != &sunPointerDevice->public) {
-		ErrorF ("Cannot open non-system mouse");
+		ErrorF ("Cannot open non-system mouse\n");
 		return !Success;
 	}
 	if (sunPtrPriv.fd == -1)
@@ -156,12 +156,12 @@ sunMouseProc(DeviceIntPtr device, int wh
 
 	case DEVICE_ON:
 	if (ioctl (sunPtrPriv.fd, VUIDGFORMAT, &oformat) == -1) {
-		ErrorF("sunMouseProc ioctl VUIDGFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDGFORMAT\n");
 		return !Success;
 	}
 	format = VUID_FIRM_EVENT;
 	if (ioctl (sunPtrPriv.fd, VUIDSFORMAT, &format) == -1) {
-		ErrorF("sunMouseProc ioctl VUIDSFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDSFORMAT\n");
 		return !Success;
 	}
 	sunPtrPriv.bmask = 0;
@@ -173,7 +173,7 @@ sunMouseProc(DeviceIntPtr device, int wh
 	case DEVICE_CLOSE:
 	pMouse->on = FALSE;
 	if (ioctl (sunPtrPriv.fd, VUIDSFORMAT, &oformat) == -1)
-		ErrorF("sunMouseProc ioctl VUIDSFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDSFORMAT\n");
 	break;
 
 	case DEVICE_OFF:
@@ -210,7 +210,7 @@ sunMouseGetEvents(int fd, Bool on, int *
 	*pNumEvents = 0;
 	*pAgain = FALSE;
 	} else {
-	ErrorF("sunMouseGetEvents read");
+	ErrorF("sunMouseGetEvents read\n");
 	FatalError ("Could not read from mouse");
 	}
 } else {

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.10
--- xsrc/external/mit/xorg-server/di

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2021-02-07 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Feb  7 16:55:18 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kMouse.c
Added Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: mouseEmu3btn.c
mouseEmu3btn.h

Log Message:
Add "Emulate3Buttons" support to the X68k Xorg based monolithic server.

Based on "Emulate3Buttons" functions in the xf86-input-mouse driver,
with various refactoring and cleanups:
- rewrite a magic three-dimensional array for a finate state machine
  with proper named structures etc.
- separate 3 button emulation functions from other stuff

See my post on port-x68k@ (and tech-x11@) for more details:
 https://mail-index.netbsd.org/port-x68k/2021/02/05/msg74.html


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/mouseEmu3btn.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/mouseEmu3btn.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.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/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.6	Tue Nov  3 15:52:57 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Sun Feb  7 16:55:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.7 2021/02/07 16:55:18 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -64,6 +64,7 @@
 #include 
 
 #include "x68kReg.h"
+#include "mouseEmu3btn.h"
 
 /*
  * X68k dependent screen record
@@ -106,6 +107,7 @@ typedef struct _X68kFbProcRec {
 typedef struct _X68kMousePriv {
 int fd;
 int bmask;
+MouseEmu3btn emu3btn;
 } X68kMousePriv, *X68kMousePrivPtr;
 
 typedef struct _X68kKbdPriv {

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.8	Fri Nov 20 19:06:56 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Sun Feb  7 16:55:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.8 2020/11/20 19:06:56 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.9 2021/02/07 16:55:18 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -128,6 +128,9 @@ x68kMouseProc(DeviceIntPtr device, int w
 BYTE	map[4];
 Atom btn_labels[3] = {0};
 Atom axes_labels[2] = { 0, 0 };
+MouseEmu3btnPtr pEmu3btn;
+Bool emu3enable;
+int emu3timeout;
 
 switch (what) {
 	case DEVICE_INIT:
@@ -149,6 +152,15 @@ x68kMouseProc(DeviceIntPtr device, int w
 	InitPointerDeviceStruct(pMouse, map, 3, btn_labels,
 		x68kMouseCtrl, GetMotionHistorySize(),
 		2, axes_labels);
+
+	/* Initialize emulation 3 buttons settings */
+	emu3enable = TRUE;			/* XXX should be configurable */
+	emu3timeout = EMU3B_DEF_TIMEOUT;	/* XXX should be configurable */
+	if (emu3enable) {
+		pEmu3btn = &x68kMousePriv.emu3btn;
+		Emulate3ButtonsEnable(pEmu3btn, device, emu3timeout);
+	}
+
 	break;
 
 	case DEVICE_ON:
@@ -279,10 +291,14 @@ x68kMouseEnqueueEvent(DeviceIntPtr devic
 	 * for a single state change. Should we get a button event which
 	 * reflects the current state of affairs, that event is discarded.
 	 *
-	 * Mouse buttons start at 1.
+	 * Mouse buttons start at 1 as defined in .
+	 *
+	 * The bmask stores which buttons are currently pressed.
+	 * This bmask is also used for Emulate3Buttons functions that
+	 * assume the left button is LSB as defined in mouseEmu3btn.c.
 	 */
 	buttons = (fe->id - MS_LEFT) + 1;
-	bmask = 1 << buttons;
+	bmask = 1 << (buttons - 1);
 	if (fe->value == VKEY_UP) {
 	if (pPriv->bmask & bmask) {
 		type = ButtonRelease;
@@ -298,9 +314,14 @@ x68kMouseEnqueueEvent(DeviceIntPtr devic
 		return;
 	}
 	}
-	flag = POINTER_RELATIVE;
-	valuator_mask_zero(&mask);
-	QueuePointerEvents(device, type, buttons, flag, &mask);
+	if (buttons == Button1 || buttons == Button3) {
+	/* Handle middle button emulation */
+	Emulate3ButtonsQueueEvent(&pPriv->emu3btn, type, buttons, pPriv->bmask);
+	} else {
+	flag = POINTER_RELATIVE;
+	valuator_mask_zero(&mask);
+	QueuePointerEvents(device, type, buttons, flag, &mask);
+	}
 	break;
 case LOC_X_DELTA:
 	valuators[0] = fe->value;

A

CVS commit: xsrc/external/mit/xorg-server/dist/hw

2020-12-08 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Dec  8 10:33:47 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c

Log Message:
add dummy ddxInputThreadInit() if INPUTTHREAD is defined.
fixes sun3 build and should fix x68k build too.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9	Sun Nov  1 11:40:53 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Tue Dec  8 10:33:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.9 2020/11/01 11:40:53 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.10 2020/12/08 10:33:47 mrg Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -261,4 +261,13 @@ OsVendorFatalError(const char *f, va_lis
 {
 }
 
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
 /* EOF x68kInit.c */

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.5	Thu Aug 13 05:12:35 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Tue Dec  8 10:33:47 2020
@@ -190,6 +190,15 @@ AbortDDX(enum ExitCode error)
 LogClose(error);
 }
 
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
 /* Called by GiveUp(). */
 void
 ddxGiveUp(enum ExitCode error)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-11-20 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Nov 21 03:02:09 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunMouse.c

Log Message:
valuator_mask_zero() is enough for mouse button events.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.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/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.2	Thu Aug 13 05:12:35 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c	Sat Nov 21 03:02:09 2020
@@ -283,7 +283,7 @@ sunMouseEnqueueEvent(DeviceIntPtr device
 	}
 	}
 	flag = POINTER_RELATIVE;
-	valuator_mask_set_range(&mask, 0, 0, NULL);
+	valuator_mask_zero(&mask);
 	QueuePointerEvents(device, type, buttons, flag, &mask);
 	break;
 case LOC_X_DELTA:

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-20 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Nov 20 19:06:56 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kMouse.c

Log Message:
valuator_mask_zero() is enough for mouse button events.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.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/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.7	Sat Aug  1 20:21:00 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Fri Nov 20 19:06:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.7 2020/08/01 20:21:00 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.8 2020/11/20 19:06:56 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -299,7 +299,7 @@ x68kMouseEnqueueEvent(DeviceIntPtr devic
 	}
 	}
 	flag = POINTER_RELATIVE;
-	valuator_mask_set_range(&mask, 0, 0, NULL);
+	valuator_mask_zero(&mask);
 	QueuePointerEvents(device, type, buttons, flag, &mask);
 	break;
 case LOC_X_DELTA:

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-16 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Mon Nov 16 16:46:28 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c

Log Message:
Report which settings are chosen per a config file in the log file.

Also reorganize a logging strategy in parseError() and
make several variables and functions static or const.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.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/x68kConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.6	Tue Nov  3 16:59:38 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c	Mon Nov 16 16:46:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.6 2020/11/03 16:59:38 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.7 2020/11/16 16:46:28 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -112,16 +112,20 @@ const char *hostConfigFilename = "/etc/X
 const char *siteConfigFilename = X11_LIBDIR "/X68kConfig";
 const char *configFilename = NULL;
 static FILE *config;
-char modeSet = FALSE;
+static char modeSet = FALSE;
 
 static int parseCommand(void);
+static void logConfig(void);
 
 int
 x68kConfig(void)
 {
-if (configFilename)
+MessageType filefrom = X_DEFAULT;
+
+if (configFilename) {
 	config = fopen(configFilename, "r");
-else {
+	filefrom = X_CMDLINE;
+} else {
 	configFilename = hostConfigFilename;
 	config = fopen(configFilename, "r");
 	if (config == NULL) {
@@ -131,11 +135,15 @@ x68kConfig(void)
 }
 if (config == NULL)
 	FatalError("Can't open X68kConfig file");
+
+LogMessage(filefrom, "Using config file: \"%s\"\n", configFilename);
+
 while (parseCommand())
 ;
 fclose(config);
 if (!modeSet)
 FatalError("No mode set.");
+logConfig();
 return 1;
 }
 
@@ -143,7 +151,7 @@ x68kConfig(void)
 /*-
  *   X68KConfig parsing part
  *---*/
-void parseError(int line, const char *str, ...);
+static void parseError(int line, const char *str, ...);
 
 enum TokenType {
 TOKEN_EOF,
@@ -255,7 +263,7 @@ static void parseMouse(int argc, Token *
 static void parseKeyboard(int argc, Token **argv);
 static void parseMode(int argc, Token **argv);
 
-Command command[] = {
+static const Command command[] = {
 { "ModeDef", parseModeDef },
 { "Mouse", parseMouse },
 { "Keyboard", parseKeyboard },
@@ -263,6 +271,24 @@ Command command[] = {
 };
 #define NCOMMANDS (sizeof(command)/sizeof(command[0]))
 
+static const char *x68kTypeStr[] = {
+	[X68K_FB_NULL]= NULL,
+	[X68K_FB_TEXT]= "Text",
+	[X68K_FB_GRAPHIC] = "Graphic",
+};
+#define NTYPES (sizeof(x68kTypeStr) / sizeof(x68kTypeStr[0]))
+
+static const char *x68kClassStr[] = {
+	[StaticGray]  = "StaticGray",
+	[GrayScale]   = "GrayScale",
+	[StaticColor] = "StaticColor",
+	[PseudoColor] = "PseudoColor",
+	[TrueColor]   = "TrueColor",
+	[DirectColor] = "DirectColor",
+};
+#define NCLASSES (sizeof(x68kClassStr) / sizeof(x68kClassStr[0]))
+#define ClassInvalid	(-1)
+
 /*-
  * function "parseCommand"
  *
@@ -333,13 +359,13 @@ parseCommand(void)
  *  purpose:  examine the number of arguments and the type of each
  *argument.
  *  argument: (int)n : correct number of arguments
- *(enum TokenType *)type : table of types
+ *(const enum TokenType *)type : table of types
  *(int)argc_m1   : actual number of arguments
  *(Token **)argv : command and arguments
  *  returns:  nothing
  *---*/
 static void
-checkArguments(int n, enum TokenType *type, int argc_m1, Token **argv)
+checkArguments(int n, const enum TokenType *type, int argc_m1, Token **argv)
 {
 int i;
 
@@ -359,7 +385,7 @@ checkArguments(int n, enum TokenType *ty
 
 typedef struct _Mode {
 struct _Mode *next;
-char *name;
+const char *name;
 int type;
 int depth;
 int class;
@@ -367,7 +393,8 @@ typedef struct _Mode {
 X68kFbReg reg;
 } Mode;
 
-Mode *modeList = NULL;
+static Mode *modeList = NULL;
+static Mode *modeChosen;
 
 /*-
  * function "parseModeDef"
@@ -379,7 +406,7 @@ Mode *modeList = NULL;
 static void
 parseModeDef(int ar

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-13 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Nov 13 17:45:05 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: X68kConfig

Log Message:
Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig

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/X68kConfig
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.2	Tue Nov  3 15:27:45 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig	Fri Nov 13 17:45:05 2020
@@ -1,4 +1,4 @@
-;; $NetBSD: X68kConfig,v 1.2 2020/11/03 15:27:45 tsutsui Exp $
+;; $NetBSD: X68kConfig,v 1.3 2020/11/13 17:45:05 tsutsui Exp $
 ;;
 ;; X68kConfig: sample configuration for X68k
 ;; written by Yasushi Yamasaki
@@ -81,7 +81,7 @@
   105040)
 
 ;
-; 1024x762x4bit StaticGray
+; 1024x768x4bit StaticGray
 ; CRTC-R20 = 0x041a(1050) VIDEOC-R0 = 0x0004
 ;
 (ModeDef NeedsMultiScan Graphic 4 StaticGray  1024 768

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-04 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Wed Nov  4 17:16:13 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kFb.c x68kGraph.c
x68kKbd.c x68kReg.h x68kText.c

Log Message:
Use exact-width interger types properly for register accesses etc.

No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.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/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.6	Tue Nov  3 15:52:57 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Wed Nov  4 17:16:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.7 2020/11/04 17:16:13 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -132,7 +132,7 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 static void
 x68kRegSetup(X68kScreenRec *pPriv)
 {
-u_short pr20 = pPriv->reg->crtc.r20;
+uint16_t pr20 = pPriv->reg->crtc.r20;
 
 /* timing registers */
 if ( (pr20 & 0x0003) < (pPriv->x68kreg.crtc.r20 & 0x0003) ||
@@ -175,7 +175,7 @@ x68kSaveScreen(ScreenPtr pScreen, Bool o
 {
 X68kScreenRec *pPriv = x68kGetScreenPrivate(pScreen);
 static int status = FALSE;
-static u_short r2;
+static uint16_t r2;
 
 if (on == SCREEN_SAVER_ON || on == SCREEN_SAVER_CYCLE) {
 if (!status) {

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.8	Tue Nov  3 16:59:38 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Wed Nov  4 17:16:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.8 2020/11/03 16:59:38 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.9 2020/11/04 17:16:13 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -125,7 +125,7 @@ static int x68kListInstalledColormaps(Sc
 static void x68kStoreColors(ColormapPtr pmap, int ndef, xColorItem *pdefs);
 
 static void x68kUpdateColormap(ScreenPtr pScreen, int dex, int count,
-   u_char *rmap, u_char *gmap, u_char *bmap);
+   uint8_t *rmap, uint8_t *gmap, uint8_t *bmap);
 
 /*-
  * function "x68kGraphOpen"  [ X68kFBProc function ]
@@ -147,7 +147,7 @@ x68kGraphOpen(X68kScreenRec *pPriv)
 if (pPriv->depth == 15 && pPriv->class == TrueColor) {
 /* for 32768 TrueColor mode */
 	int i;
-	u_short x = 0x0001;
+	uint16_t x = 0x0001;
 	for ( i = 0; i < 256; ) {
 	pPriv->reg->gpal[i++] = x;
 	pPriv->reg->gpal[i++] = x;
@@ -353,7 +353,7 @@ x68kInstallColormap(ColormapPtr cmap)
 register int i;
 register Entry *pent;
 register VisualPtr pVisual = cmap->pVisual;
-u_char   rmap[256], gmap[256], bmap[256];
+uint8_t   rmap[256], gmap[256], bmap[256];
 unsigned long rMask, gMask, bMask;
 int	oRed, oGreen, oBlue;
 
@@ -454,7 +454,7 @@ static void
 x68kStoreColors(ColormapPtr pmap, int ndef, xColorItem *pdefs)
 {
 X68kScreenRec *pPriv = x68kGetScreenPrivate(pmap->pScreen);
-u_char rmap[256], gmap[256], bmap[256];
+uint8_t rmap[256], gmap[256], bmap[256];
 xColorItem expanddefs[256];
 register int i;
 
@@ -481,20 +481,20 @@ x68kStoreColors(ColormapPtr pmap, int nd
  *  argument: (ScreenPtr)pScreen: screen
  *(int)dex  : colormap index
  *(int)count: count for updating
- *(u_char *)[rgb]map: each map
+ *(uint8_t *)[rgb]map: each map
  *  returns:  nothing
  *---*/
 static void
 x68kUpdateColormap(ScreenPtr pScreen, int dex, int count,
-   u_char *rmap, u_char *gmap, u_char *bmap)
+   uint8_t *rmap, uint8_t *gmap, uint8_t *bmap)
 {
 X68kScreenRec *pPriv = x68kGet

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-03 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  3 16:59:38 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c
x68kGraph.c

Log Message:
Remove unnecessary pointer casts from malloc(3).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.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/x68kConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.5	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c	Tue Nov  3 16:59:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.5 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.6 2020/11/03 16:59:38 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -176,7 +176,7 @@ getToken(void)
 static int line = 1;
 Token *ret;
 
-ret = (Token *)malloc(sizeof(Token));
+ret = malloc(sizeof(Token));
 if (ret == NULL)
 FatalError("Out of memory");
 while (TRUE) {
@@ -202,7 +202,7 @@ getToken(void)
 /* is a symbol? */
 if (isalpha(c)) {
 int i = 0;
-ret->content.symbol = (char *)malloc(32 * sizeof(char));
+ret->content.symbol = malloc(32 * sizeof(char));
 if (ret->content.symbol == NULL)
 FatalError("Out of memory");
 do {
@@ -295,7 +295,7 @@ parseCommand(void)
 break;
 }
 argc++;
-argv = (Token **)realloc(argv, sizeof(Token *) * argc);
+argv = realloc(argv, sizeof(Token *) * argc);
 if (argv == NULL)
 FatalError("Out of memory");
 argv[argc-1] = token;
@@ -395,7 +395,7 @@ parseModeDef(int argc, Token **argv)
 
 checkArguments(18, argtype, argc-1, argv);
 
-mode = (Mode *)malloc(sizeof(Mode));
+mode = malloc(sizeof(Mode));
 if (mode == NULL)
 FatalError("Out of memory");
 mode->name = strdup(argv[1]->content.symbol);
@@ -545,7 +545,7 @@ parseMode(int argc, Token **argv)
 x68kFbProc[0].open = x68kGraphOpen;
 x68kFbProc[0].init = x68kGraphInit;
 x68kFbProc[0].close = x68kGraphClose;
-	x68kFormat = (PixmapFormatRec*) malloc (sizeof(PixmapFormatRec));
+	x68kFormat = malloc (sizeof(PixmapFormatRec));
 	x68kFormat->scanlinePad = BITMAP_SCANLINE_PAD;
 x68kFormat->bitsPerPixel = 16;
 switch (mode->depth) {

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.7	Sat Aug  1 20:21:00 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Tue Nov  3 16:59:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.7 2020/08/01 20:21:00 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.8 2020/11/03 16:59:38 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -264,9 +264,9 @@ x68kCfbFinishScreenInit(
 
 ndepths = 1;
 nvisuals = 1;
-depths = (DepthPtr)malloc( sizeof(DepthRec) );
-visuals = (VisualPtr)malloc( sizeof(VisualRec) );
-vid = (VisualID *)malloc( sizeof(VisualID) );
+depths = malloc( sizeof(DepthRec) );
+visuals = malloc( sizeof(VisualRec) );
+vid = malloc( sizeof(VisualID) );
 if( !depths || !visuals || !vid ) {
 free( depths );
 free( visuals );
@@ -296,9 +296,9 @@ x68kCfbFinishScreenInit(
 
 ndepths = 1;
 nvisuals = 1;
-depths = (DepthPtr)malloc( sizeof(DepthRec) );
-visuals = (VisualPtr)malloc( sizeof(VisualRec) );
-vid = (VisualID *)malloc( sizeof(VisualID) );
+depths = malloc( sizeof(DepthRec) );
+visuals = malloc( sizeof(VisualRec) );
+vid = malloc( sizeof(VisualID) );
 if( !depths || !visuals || !vid ) {
 free( depths );
 free( visuals );

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-03 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  3 15:52:57 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kFb.c
x68kReg.h

Log Message:
Avoid a use of __UNVOLATILE(3).  Tested on XM6i.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h

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/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.5	Wed Jul 22 21:24:20 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Tue Nov  3 15:52:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.5 2020/07/22 21:24:20 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -79,7 +79,7 @@ typedef struct _X68kScreenRec {
 int scr_height; /* screen height   */
 int dpi;/* dots per inch   */
 uint8_t *fb;/* frame buffer VA */
-volatile FbReg *reg;/* control register VA */
+FbReg *reg; /* control register VA */
 X68kFbReg x68kreg;  /* control register*/
 int mapsize;/* size of mapped memory */
 ColormapPtr installedMap;   /* installed colormap*/
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.5	Tue Nov  3 15:25:21 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Tue Nov  3 15:52:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.5 2020/11/03 15:25:21 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -113,7 +113,7 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 x68kRegSetup(pPriv);
 
 /* unmap and close frame buffer */
-if ( munmap(__UNVOLATILE(pPriv->reg), pPriv->mapsize) == -1 )
+if ( munmap(pPriv->reg, pPriv->mapsize) == -1 )
 ErrorF("Can't unmap frame buffer");
 close(pPriv->fd);
 }

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.3 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.3	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h	Tue Nov  3 15:52:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kReg.h,v 1.3 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kReg.h,v 1.4 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -28,11 +28,11 @@
  * CRT controller
  */
 typedef struct {
-u_short r00, r01, r02, r03, r04, r05, r06, r07;
-u_short r08, r09, r10, r11, r12, r13, r14, r15;
-u_short r16, r17, r18, r19, r20, r21, r22, r23;
+volatile u_short r00, r01, r02, r03, r04, r05, r06, r07;
+volatile u_short r08, r09, r10, r11, r12, r13, r14, r15;
+volatile u_short r16, r17, r18, r19, r20, r21, r22, r23;
 char pad0[0x450];
-u_short ctrl;
+volatile u_short ctrl;
 char pad1[0x1b7e];
 } Crtc;
 
@@ -47,11 +47,11 @@ typedef struct {
  * video controller
  */
 typedef struct {
-u_short r0;
+volatile u_short r0;
 char pad0[0xfe];
-u_short r1;
+volatile u_short r1;
 char pad1[0xfe];
-u_short r2;
+volatile u_short r2;
 char pad2[0x19fe];
 } Videoc;
 
@@ -63,9 +63,9 @@ typedef struct {
 
 /* system port */
 typedef struct {
-u_short r1, r2, r3, r4;
+volatile u_short r1, r2, r3, r4;
 u_short pad0[2];
-u_short r5, r6;
+volatile u_short r5, r6;
 u_short pad[0x1ff0];
 } Sysport;
 
@@ -74,8 +74,8 @@ typedef struct {
  */
 typedef struct {
 Crtc crtc;
-u_short gpal[256];/* graphic palette */
-u_short tpal[256]; /* text palette */
+volatile u_short gpal[256];/* graphic palette */
+volatile u_short tpal[256]; /* text palette */
 Videoc videoc;
 u_short pad0[0xa000];
 Sysport sysport;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-03 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  3 15:27:45 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: X68kConfig

Log Message:
Add ModeDef for 640x480x4bit PseudoColor.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig

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/X68kConfig
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.1	Sat Mar  1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig	Tue Nov  3 15:27:45 2020
@@ -1,4 +1,4 @@
-;; $NetBSD: X68kConfig,v 1.1 2014/03/01 19:34:47 tsutsui Exp $
+;; $NetBSD: X68kConfig,v 1.2 2020/11/03 15:27:45 tsutsui Exp $
 ;;
 ;; X68kConfig: sample configuration for X68k
 ;; written by Yasushi Yamasaki
@@ -52,6 +52,14 @@
 919   17   81  5675   40  552   27
78930)
 
+;
+; 640x480x4bit PseudoColor
+; CRTC-R20 = 0x0417(1047) VIDEOC-R0 = 0x0004
+;
+(ModeDef Pseudo16Color640x480 Graphic 4 PseudoColor  640 480
+99   11   13   93  5241   33  513   27
+  104740)
+
 ;;
 ;; tricky modes
 ;;
@@ -100,6 +108,7 @@
 ;(Mode Monochrome1024x768)
 ;(Mode Pseudo16Color1024x768)
 ;(Mode NeedsMultiScan)
+;(Mode Pseudo16Color640x480)
 
 ;;
 ;; input devices

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-03 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  3 15:25:21 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kFb.c

Log Message:
Restore video mode properly on exit even on CRT Mode 19 (640x480 31kHz VGA).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.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/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.4	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Tue Nov  3 15:25:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.4 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.5 2020/11/03 15:25:21 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -30,6 +30,8 @@ static void x68kRegSetup(X68kScreenRec *
 
 DevPrivateKeyRec x68kScreenPrivateKeyRec;
 
+static int cons_dwidth;
+
 /*-
  * function "x68kFbCommonOpen"
  *
@@ -68,6 +70,7 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 pPriv->fb = (uint8_t *)((uint32_t)pPriv->reg + gi.gd_regsize);
 
 x68kRegSetup( pPriv );
+cons_dwidth = gi.gd_dwidth;
 
 return TRUE;
 }
@@ -83,7 +86,8 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 void
 x68kFbCommonClose(X68kScreenRec *pPriv)
 {
-X68kFbReg graphNone = {
+static const X68kFbReg graphNone_mode16 = {
+	/* CRT mode 16 (768x512 31.5kHz) */
 { 137,14, 28, 124,
   567, 5, 40, 552,
27, 0,  0,   0,
@@ -93,8 +97,19 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 { 0x0004, 0x21e4, 0x0020 },
 0
 };
+static const X68kFbReg graphNone_mode19 = {
+	/* CRT mode 19 (640x480 31.5kHz VGA mode) */
+{  99,11, 13,  93,
+  524, 1, 33, 513,
+   27, 0,  0,   0,
+0, 0,  0,   0,
+0, 0,  0,   0,
+   0x0417, 0,  0,   0, 0 },
+{ 0x0004, 0x21e4, 0x0020 },
+0
+};
 /* change video mode */
-pPriv->x68kreg = graphNone;
+pPriv->x68kreg = (cons_dwidth == 640) ? graphNone_mode19 : graphNone_mode16;
 x68kRegSetup(pPriv);
 
 /* unmap and close frame buffer */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-01 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Nov  1 11:44:55 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kKbd.c

Log Message:
Fix a suspicious chunk disabled on xfree 4.x migration as sunKbd.c does.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.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/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.8	Sat Aug  1 20:21:00 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Sun Nov  1 11:44:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.8 2020/08/01 20:21:00 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.9 2020/11/01 11:44:55 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -185,10 +185,8 @@ x68kInitModMap(KeySymsRec *KeySyms, CARD
 KeySyms->minKeyCode += MIN_KEYCODE;
 KeySyms->maxKeyCode += MIN_KEYCODE;
 }
-#if 0
 if (KeySyms->maxKeyCode > MAX_KEYCODE)
-KeySyms->maxKeyCode += MAX_KEYCODE;
-#endif
+KeySyms->maxKeyCode = MAX_KEYCODE;
 for (i = KeySyms->minKeyCode;
  i < KeySyms->maxKeyCode; i++) {
 switch (KeySyms->map[(i-KeySyms->minKeyCode)*4]) {

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-11-01 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Nov  1 11:40:53 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c

Log Message:
Call LogInit() for logging to /var/log/X68k.%s.log as Xorg and Xsun servers.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
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.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.8	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Sun Nov  1 11:40:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.8 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.9 2020/11/01 11:40:53 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -75,9 +75,35 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 static int nscreens;
 
+/* default log file paths */
+#ifndef DEFAULT_LOGDIR
+#define DEFAULT_LOGDIR "/var/log"
+#endif
+#ifndef DEFAULT_LOGPREFIX
+#define DEFAULT_LOGPREFIX "X68K."
+#endif
+
 void
 OsVendorInit(void)
 {
+static int inited;
+
+if (!inited) {
+	const char *logfile;
+	char *lf;
+
+#define LOGSUFFIX ".log"
+#define LOGOLDSUFFIX ".old"
+	logfile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX;
+	if (asprintf(&lf, "%s%%s" LOGSUFFIX, logfile) == -1)
+	FatalError("Cannot allocate space for the log file name\n");
+	LogInit(lf, LOGOLDSUFFIX);
+#undef LOGSUFFIX
+#undef LOGOLDSUFFIX
+	free(lf);
+
+	inited = 1;
+}
 }
 
 #ifdef GLXEXT
@@ -178,6 +204,7 @@ AbortDDX(enum ExitCode error)
 fb = x68kGetFbProcRec(i);
 (*fb->close)(screen);
 }
+LogClose(error);
 }
 
 /*-

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-08-12 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Aug 13 05:12:35 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c sunMouse.c

Log Message:
Avoid dumb DevicePtr casts.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.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/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.4	Tue Aug 11 06:49:09 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Thu Aug 13 05:12:35 2020
@@ -170,9 +170,10 @@ AbortDDX(enum ExitCode error)
 #else
 (void) OsSignal (SIGIO, SIG_IGN);
 #endif
-devPtr = (DevicePtr)sunKeyboardDevice;
-if (devPtr)
+if (sunKeyboardDevice) {
+devPtr = &sunKeyboardDevice->public;
 	(void) sunChangeKbdTranslation (((sunKbdPrivPtr)(devPtr->devicePrivate))->fd, FALSE);
+}
 #if defined(SVR4) || defined(CSRG_BASED)
 sunNonBlockConsoleOff ();
 #else

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.6	Sat Aug  1 13:15:57 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Thu Aug 13 05:12:35 2020
@@ -613,7 +613,7 @@ sunInitKbdNames(XkbRMLVOSet *rmlvo, sunK
 int
 sunKbdProc(DeviceIntPtr device, int what)
 {
-DevicePtr pKeyboard = (DevicePtr) device;
+DevicePtr pKeyboard = &device->public;
 sunKbdPrivPtr pPriv;
 KeybdCtrl*	ctrl = &device->kbdfeed->ctrl;
 XkbRMLVOSet rmlvo;
@@ -623,7 +623,7 @@ sunKbdProc(DeviceIntPtr device, int what
 
 switch (what) {
 case DEVICE_INIT:
-	if (pKeyboard != (DevicePtr)sunKeyboardDevice) {
+	if (pKeyboard != &sunKeyboardDevice->public) {
 	ErrorF ("Cannot open non-system keyboard\n");
 	return (!Success);
 	}

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c	Thu Aug 13 05:12:35 2020
@@ -123,7 +123,7 @@ sunMouseCtrl(DeviceIntPtr device, PtrCtr
 int
 sunMouseProc(DeviceIntPtr device, int what)
 {
-DevicePtr	  pMouse = (DevicePtr) device;
+DevicePtr	  pMouse = &device->public;
 int		  format;
 static int	  oformat;
 BYTE	  map[4];
@@ -132,7 +132,7 @@ sunMouseProc(DeviceIntPtr device, int wh
 
 switch (what) {
 	case DEVICE_INIT:
-	if (pMouse != (DevicePtr)sunPointerDevice) {
+	if (pMouse != &sunPointerDevice->public) {
 		ErrorF ("Cannot open non-system mouse");
 		return !Success;
 	}

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-08-10 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Aug 11 06:49:09 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunInit.c sunIo.c

Log Message:
Remove more redundant command option arg checks.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.6	Sun Aug  9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h	Tue Aug 11 06:49:09 2020
@@ -298,6 +298,7 @@ extern fbFd		sunFbs[];
 extern Bool		sunSwapLkeys;
 extern Bool		sunForceMono;
 extern Bool		sunDebug;
+extern char		*sunDeviceList;
 extern Bool		sunFlipPixels;
 extern Bool		sunFbInfo;
 extern Bool		sunCG4Frob;

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.8	Sun Aug  9 11:51:31 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Tue Aug 11 06:49:09 2020
@@ -131,6 +131,7 @@ static Bool	sunDevsInited = FALSE;
 
 Bool sunSwapLkeys = FALSE;
 Bool sunDebug = FALSE;
+char *sunDeviceList = NULL;
 Bool sunForceMono = FALSE;
 Bool sunFlipPixels = FALSE;
 Bool sunFbInfo = FALSE;
@@ -402,14 +403,9 @@ GetDeviceList(int argc, char **argv)
 {
 int		i;
 char	*envList = NULL;
-char	*cmdList = NULL;
+char	*cmdList = sunDeviceList;
 char	**deviceList = NULL;
 
-for (i = 1; i < argc; i++)
-	if (strcmp (argv[i], "-dev") == 0 && i+1 < argc) {
-	cmdList = argv[i + 1];
-	break;
-	}
 if (!cmdList)
 	envList = getenv ("XDEVICE");
 

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.3	Sun Aug  9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Tue Aug 11 06:49:09 2020
@@ -209,7 +209,9 @@ ddxProcessArgument(int argc, char *argv[
 	return 1;
 }
 if (strcmp (argv[i], "-dev") == 0) {	/* -dev /dev/mumble */
-	if (++i >= argc) UseMsg ();
+	if (++i >= argc)
+	UseMsg();
+	sunDeviceList = argv[i];
 	return 2;
 }
 if (strcmp (argv[i], "-mono") == 0) {	/* -mono */
@@ -228,14 +230,6 @@ ddxProcessArgument(int argc, char *argv[
 	sunFbInfo = TRUE;
 	return 1;
 }
-if (strcmp (argv[i], "-kbd") == 0) {	/* -kbd */
-	if (++i >= argc) UseMsg();
-	return 2;
-}
-if (strcmp (argv[i], "-protect") == 0) {	/* -protect */
-	if (++i >= argc) UseMsg();
-	return 2;
-}
 if (strcmp (argv[i], "-cg4frob") == 0) {
 	sunCG4Frob = TRUE;
 	return 1;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-08-09 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Aug  9 11:51:31 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c

Log Message:
Put probed framebuffer info to a log file by default.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.7	Sun Aug  9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Sun Aug  9 11:51:31 2020
@@ -307,6 +307,11 @@ OpenFrameBuffer(
 	}
 	}
 	if (ret) {
+	int verb = 1;
+
+	if (sunFbInfo)
+		verb = -1;
+
 	devFbUsed = TRUE;
 	if (fbattr) {
 		if (fbattr->fbtype.fb_type >= XFBTYPE_LASTPLUSONE) {
@@ -325,16 +330,14 @@ OpenFrameBuffer(
 		if (sunFbData[fbattr->emu_types[_i]].init) {
 			sunFbs[screen].info.fb_type = fbattr->emu_types[_i];
 			ret = TRUE;
-			if (sunFbInfo)
-			ErrorF ("%s is emulating a %s\n", device,
-sunFbData[fbattr->fbtype.fb_type].name);
+			LogMessageVerb(X_INFO, verb, "%s is emulating a %s\n",
+			device, sunFbData[fbattr->fbtype.fb_type].name);
 			break;
 		}
 		}
 	}
-	if (sunFbInfo)
-		ErrorF ("%s is really a %s\n", device,
-		sunFbData[fbattr ? fbattr->fbtype.fb_type : sunFbs[screen].info.fb_type].name);
+	LogMessageVerb(X_INFO, verb, "%s is really a %s\n", device,
+		sunFbData[fbattr ? fbattr->fbtype.fb_type : sunFbs[screen].info.fb_type].name);
 	}
 }
 if (!ret)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-08-09 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Aug  9 07:35:42 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunCfb.c sunInit.c
sunIo.c

Log Message:
Remove redundant command option arg checks.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h \
xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.5	Sun Aug  9 07:29:32 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h	Sun Aug  9 07:35:42 2020
@@ -296,6 +296,8 @@ typedef struct {
 extern sunFbDataRec	sunFbData[];
 extern fbFd		sunFbs[];
 extern Bool		sunSwapLkeys;
+extern Bool		sunForceMono;
+extern Bool		sunDebug;
 extern Bool		sunFlipPixels;
 extern Bool		sunFbInfo;
 extern Bool		sunCG4Frob;
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.5	Sun Jul 26 07:20:50 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Sun Aug  9 07:35:42 2020
@@ -98,7 +98,7 @@ static void CGSaveColormap(ScreenPtr);
 static void CGRestoreColormap(ScreenPtr);
 static void CGScreenInitCommon(ScreenPtr);
 static void CGScreenInit(ScreenPtr);
-static void checkMono(int, char **);
+static void checkMono(void);
 #ifdef INCLUDE_CG2_HEADER
 static void CG2UpdateColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
 static void CG2GetColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
@@ -308,13 +308,11 @@ CGScreenInit(ScreenPtr pScreen)
 }
 
 static void
-checkMono(int argc, char** argv)
+checkMono(void)
 {
-int i;
 
-for (i = 1; i < argc; i++)
-	if (strcmp (argv[i], "-mono") == 0)
-	ErrorF ("-mono not appropriate for CG3/CG4/CG6\n");
+if (sunForceMono)
+	ErrorF("-mono not appropriate for CG3/CG4/CG6\n");
 }
 
 /*
@@ -336,7 +334,7 @@ sunCG3Init(
 {
 int	screen = pScreen->myNum;
 
-checkMono (argc, argv);
+checkMono();
 sunFbs[screen].EnterLeave = (void (*)(ScreenPtr, int))NoopDDA;
 return sunInitCommon (screen, pScreen, (off_t) CG3_MMAP_OFFSET,
 	sunCfbScreenInit, CGScreenInit,
@@ -352,7 +350,7 @@ sunTCXInit(
 {
 int	screen = pScreen->myNum;
 
-checkMono (argc, argv);
+checkMono();
 sunFbs[screen].EnterLeave = (void (*)(ScreenPtr, int))NoopDDA;
 return sunInitCommon (screen, pScreen, (off_t) 0,
 	sunCfbScreenInit, CGScreenInit,
@@ -457,18 +455,12 @@ sunCG2Init(
 )
 {
 int 	screen = pScreen->myNum;
-int		i;
 Bool	ret;
-Bool	mono = FALSE;
-
-for (i = 1; i < argc; i++)
-	if (strcmp (argv[i], "-mono") == 0)
-	mono = TRUE;
 
 sunFbs[screen].EnterLeave = (void (*)(ScreenPtr, int))NoopDDA;
 pScreen->SaveScreen = CG2SaveScreen;
 #ifndef LOWMEMFTPT
-if (mono) {
+if (sunForceMono) {
 	pScreen->whitePixel = 0;
 	pScreen->blackPixel = 1;
 	sunFbs[screen].info.fb_depth = 1;
@@ -518,7 +510,7 @@ sunCG4Init(
 {
 int screen = pScreen->myNum;
 
-checkMono (argc, argv);
+checkMono();
 if (sunCG4Frob)
 	sunFbs[screen].EnterLeave = (void (*)(ScreenPtr, int))NoopDDA;
 else
@@ -543,7 +535,7 @@ sunCG6Init(
 void *fb;
 int screen = pScreen->myNum;
 
-checkMono (argc, argv);
+checkMono();
 if (!sunScreenAllocate (pScreen))
 	return FALSE;
 if (!sunFbs[screen].fb) {

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.6	Sun Aug  9 07:29:32 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Sun Aug  9 07:35:42 2020
@@ -130,6 +130,8 @@ static void sunCfbGetImage(DrawablePtr, 
 static Bool	sunDevsInited = FALSE;
 
 Bool sunSwapLkeys = FALSE;
+Bool sunDebug = FALSE;
+Bool sunForceMono = FALSE;
 Bool sunFlipPixels = FALSE;
 Bool sunFbInfo = FALSE;
 Bool sunCG4Frob = FALSE;
@@ -589,10 +591,8 @@ InitOutput(ScreenInfo *pScreenInfo, int 
 	monitorResolution = 90;
 if (RunFromSigStopParent)
 	nonBlockConsole = 1;
-for (i = 1; i < argc; i++) {
-	if (!strcmp(argv[i],"-debug"))
-	nonBlockConsole = 0;
-}
+if (sunDebug)
+	nonBlockConsole = 0;
 
 /*
  *	Writes to /dev/console can block - causing an

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.2 xsrc/external/mit/xorg-ser

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-08-09 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Aug  9 07:29:32 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunInit.c

Log Message:
Remove a leftover variable for non-XKB autorepeat.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.4	Thu Jul 30 14:32:52 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h	Sun Aug  9 07:29:32 2020
@@ -293,7 +293,6 @@ typedef struct {
 } sunFbDataRec;
 
 /* sunInit.c */
-extern Bool		sunAutoRepeatHandlersInstalled;
 extern sunFbDataRec	sunFbData[];
 extern fbFd		sunFbs[];
 extern Bool		sunSwapLkeys;

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.5	Sun Aug  9 06:30:46 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Sun Aug  9 07:29:32 2020
@@ -129,7 +129,6 @@ static void sunCfbGetImage(DrawablePtr, 
 
 static Bool	sunDevsInited = FALSE;
 
-Bool sunAutoRepeatHandlersInstalled;	/* FALSE each time InitOutput called */
 Bool sunSwapLkeys = FALSE;
 Bool sunFlipPixels = FALSE;
 Bool sunFbInfo = FALSE;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-08-08 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Aug  9 06:30:46 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c

Log Message:
Inform detected keyboard type and layout via LogMessage().


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.4	Tue Aug  4 14:31:04 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Sun Aug  9 06:30:46 2020
@@ -526,7 +526,13 @@ OsVendorInit(void)
 	if (sunPtrPriv.fd < 0)
 	FatalError ("Cannot open /dev/mouse, error %d\n", errno);
 	getKbdType ();
-	if (sunKbdPriv.type == KB_SUN4) {
+	switch (sunKbdPriv.type) {
+	case KB_SUN2:
+	case KB_SUN3:
+	LogMessage(X_INFO, "Sun type %d Keyboard\n", sunKbdPriv.type);
+	break;
+	case KB_SUN4:
+#define LAYOUT_US5	33
 	(void) ioctl (sunKbdPriv.fd, KIOCLAYOUT, &sunKbdPriv.layout);
 	if (sunKbdPriv.layout < 0 ||
 		sunKbdPriv.layout > sunMaxLayout ||
@@ -534,6 +540,12 @@ OsVendorInit(void)
 		FatalError ("Unsupported keyboard type 4 layout %d\n",
 			sunKbdPriv.layout);
 	sunKeySyms[KB_SUN4].map = sunType4KeyMaps[sunKbdPriv.layout];
+	LogMessage(X_INFO, "Sun type %d Keyboard, layout %d\n",
+		sunKbdPriv.layout >= LAYOUT_US5 ? 5 : 4, sunKbdPriv.layout);
+	break;
+	default:
+	LogMessage(X_INFO, "Unknown keyboard type\n");
+	break;
 }
 	inited = 1;
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-08-04 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Aug  4 14:31:04 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c sunIo.c

Log Message:
Call LogInit() for logging to /var/log/Xsun.%s.log as Xorg server.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.3	Thu Jul 30 14:32:52 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Tue Aug  4 14:31:04 2020
@@ -52,6 +52,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include"fb.h"
 #include"extinit.h"
 
+/* default log file paths */
+#ifndef DEFAULT_LOGDIR
+#define DEFAULT_LOGDIR "/var/log"
+#endif
+#ifndef DEFAULT_LOGPREFIX
+#define DEFAULT_LOGPREFIX "Xsun."
+#endif
+
 /* maximum pixmap depth */
 #ifndef SUNMAXDEPTH
 #define SUNMAXDEPTH 8
@@ -481,6 +489,8 @@ OsVendorInit(void)
 {
 static int inited;
 if (!inited) {
+	const char *logfile;
+	char *lf;
 #ifndef i386
 	struct rlimit rl;
 
@@ -495,6 +505,20 @@ OsVendorInit(void)
 	(void) setrlimit (RLIMIT_NOFILE, &rl);
 	}
 #endif
+
+#define LOGSUFFIX ".log"
+#define LOGOLDSUFFIX ".old"
+
+	logfile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX;
+	if (asprintf(&lf, "%s%%s" LOGSUFFIX, logfile) == -1)
+	FatalError("Cannot allocate space for the log file name\n");
+	LogInit(lf, LOGOLDSUFFIX);
+
+#undef LOGSUFFIX
+#undef LOGOLDSUFFIX
+
+	free(lf);
+
 	sunKbdPriv.fd = open ("/dev/kbd", O_RDWR, 0);
 	if (sunKbdPriv.fd < 0)
 	FatalError ("Cannot open /dev/kbd, error %d\n", errno);

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Tue Aug  4 14:31:04 2020
@@ -186,6 +186,7 @@ AbortDDX(enum ExitCode error)
 	sunDisableCursor (pScreen);
 #endif
 }
+LogClose(error);
 }
 
 /* Called by GiveUp(). */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-08-01 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Aug  1 20:21:00 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kGraph.c
x68kKbd.c x68kMouse.c

Log Message:
Replace 'pointer' type with 'void *' to sync with upstream manner.

https://cgit.freedesktop.org/xorg/xserver/commit/?id=60014a4a98ff924ae7f6840781f768c1cc93bbab


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.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/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.6	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Sat Aug  1 20:21:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.6 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.7 2020/08/01 20:21:00 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -116,7 +116,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "fb.h"
 
 /* local functions */
-static Bool x68kCfbFinishScreenInit(ScreenPtr pScreen, pointer pbits,
+static Bool x68kCfbFinishScreenInit(ScreenPtr pScreen, void *pbits,
 int xsize, int ysize,
 int dpix, int dpiy, int width);
 static void x68kInstallColormap(ColormapPtr cmap);
@@ -235,7 +235,7 @@ x68kGraphInit(ScreenPtr pScreen, int arg
  *
  *  purpose:  initialize visuals and perform miscellaneous settings
  *  argument: (ScreenPtr)pScreen : DIX screen record
- *(pointer)pbits : frame buffer
+ *(void *)pbits  : frame buffer
  *(int)xsize, (int)ysize : screen size
  *(int)dpix, (int)dpiy   : screen resolution in dots per inch
  *(int)width : pixel width of frame buffer
@@ -245,7 +245,7 @@ x68kGraphInit(ScreenPtr pScreen, int arg
 static Bool
 x68kCfbFinishScreenInit(
 ScreenPtr pScreen,
-pointer pbits,
+void *pbits,
 int xsize, int ysize,
 int dpix, int dpiy,
 int width)
@@ -361,7 +361,7 @@ x68kInstallColormap(ColormapPtr cmap)
 	return;
 if (pPriv->installedMap)
 	WalkTree(pPriv->installedMap->pScreen, TellLostMap,
-		 (pointer) &(pPriv->installedMap->mid));
+		 (void *) &(pPriv->installedMap->mid));
 
 if (pPriv->class & DynamicClass) {
 if ((cmap->pVisual->class | DynamicClass) == DirectColor) {
@@ -395,7 +395,7 @@ x68kInstallColormap(ColormapPtr cmap)
 x68kUpdateColormap(cmap->pScreen, 0, 1<<(pPriv->depth), rmap, gmap, bmap);
 }
 pPriv->installedMap = cmap;
-WalkTree(cmap->pScreen, TellGainedMap, (pointer) &(cmap->mid));
+WalkTree(cmap->pScreen, TellGainedMap, (void *) &(cmap->mid));
 }
 
 /*-
@@ -414,7 +414,7 @@ x68kUninstallColormap(ColormapPtr cmap)
 	Colormap defMapID = cmap->pScreen->defColormap;
 
 	if (cmap->mid != defMapID) {
-	pointer retval;
+	void *retval;
 	ColormapPtr defMap;
 	dixLookupResourceByType(&retval, defMapID, RT_COLORMAP,
 		serverClient, DixReadAccess);
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.6	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Sat Aug  1 20:21:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.6 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.7 2020/08/01 20:21:00 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -131,7 +131,7 @@ x68kMouseProc(DeviceIntPtr device, int w
 
 switch (what) {
 	case DEVICE_INIT:
-pMouse->devicePrivate = (pointer) &x68kMousePriv;
+pMouse->devicePrivate = (void *) &x68kMousePriv;
 if( (x68kMousePriv.fd = open("/dev/mouse", O_RDONLY)) == -1 ) {
 ErrorF("Can't open mouse device");
 return !Success;

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.8
--- xsrc/extern

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-08-01 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Aug  1 13:15:57 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c

Log Message:
Trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.5	Sat Aug  1 01:49:58 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Sat Aug  1 13:15:57 2020
@@ -716,7 +716,7 @@ sunInitModMap(
 {
 KeySym *k;
 int i, min, max, width;
-
+
 for (i = 0; i < MAP_LENGTH; i++)
 ModMap[i] = NoSymbol;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-31 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Aug  1 01:49:58 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c

Log Message:
Use "empty" for rmlvo model and layout to avoid lingering default settings.

Now all modifier keys (CTRL, SHIFT, and NumLock) work as expected.

It seems XkbApplyMappingChange() doesn't update some XKB modifier
settings even if new modmap data is specified.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.4	Thu Jul 30 14:15:49 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Sat Aug  1 01:49:58 2020
@@ -592,8 +592,8 @@ sunInitKbdNames(XkbRMLVOSet *rmlvo, sunK
 }
 #else
 rmlvo->rules = "base";
-rmlvo->model = NULL;
-rmlvo->layout = NULL;
+rmlvo->model = "empty";
+rmlvo->layout = "empty";
 rmlvo->variant = NULL;
 rmlvo->options = NULL;
 #endif
@@ -649,9 +649,10 @@ sunKbdProc(DeviceIntPtr device, int what
 
 	sunInitKbdNames(&rmlvo, pKeyboard->devicePrivate);
 #if 0 /* XXX needs more work for Xorg xkb */
-	InitKeyboardDeviceStruct(device, rmlvo,
+	InitKeyboardDeviceStruct(device, &rmlvo,
  sunBell, sunKbdCtrl);
 #else
+	XkbSetRulesDflts(&rmlvo);
 	InitKeyboardDeviceStruct(device, NULL,
  sunBell, sunKbdCtrl);
 	XkbApplyMappingChange(device, workingKeySyms,

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-30 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Jul 30 14:32:52 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunInit.c sunKeyMap.c

Log Message:
Remove now unused ModMap data for each keyboard.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c \
xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.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/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.3	Wed Jul 29 17:29:53 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h	Thu Jul 30 14:32:52 2020
@@ -304,10 +304,8 @@ extern Bool		sunNoGX;
 
 /* sunKeyMap.c */
 extern KeySymsRec	sunKeySyms[];
-extern const SunModmapRec *sunModMaps[];
 extern const int	sunMaxLayout;
 extern KeySym		*sunType4KeyMaps[];
-extern const SunModmapRec *sunType4ModMaps[];
 
 /* sunKbd.c */
 extern long		sunAutoRepeatInitiate;

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.2	Fri Jul 24 02:20:20 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Thu Jul 30 14:32:52 2020
@@ -510,7 +510,6 @@ OsVendorInit(void)
 		FatalError ("Unsupported keyboard type 4 layout %d\n",
 			sunKbdPriv.layout);
 	sunKeySyms[KB_SUN4].map = sunType4KeyMaps[sunKbdPriv.layout];
-	sunModMaps[KB_SUN4] = sunType4ModMaps[sunKbdPriv.layout];
 }
 	inited = 1;
 }
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.2	Thu Jul 30 14:15:49 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c	Thu Jul 30 14:32:52 2020
@@ -243,19 +243,9 @@ static KeySym US2Keymap[] = {
 	NoSymbol,	NoSymbol,		/* 0x7f */
 };
 
-static const SunModmapRec US2Modmap[] = {
-	{  99,	ShiftMask },
-	{ 110,	ShiftMask },
-	{  76,	ControlMask },
-	{ 120,	Meta_Mask },
-	{ 122,	Meta_Mask },
-	{   0,	0 }
-};
-
 #else
 
 #define US2Keymap NULL
-#define US2Modmap NULL
 
 #endif /* US2 */
 
@@ -391,20 +381,9 @@ static KeySym US3Keymap[] = {
 	NoSymbol,	NoSymbol,		/* 0x7f */
 };
 
-static const SunModmapRec US3Modmap[] = {
-	{  99,	ShiftMask },
-	{ 110,	ShiftMask },
-	{  76,	ControlMask },
-	{ 119,	LockMask },
-	{ 120,	Meta_Mask },
-	{ 122,	Meta_Mask },
-	{   0,	0 }
-};
-
 #else
 
 #define US3Keymap NULL
-#define US3Modmap NULL
 
 #endif /* US3 */
 
@@ -417,78 +396,6 @@ KeySymsRec sunKeySyms[] = {
 { NULL,		1,	0x7d,	4 }
 };
 
-const SunModmapRec *sunModMaps[] = {
-NULL,
-NULL,
-US2Modmap,
-US3Modmap,
-NULL
-};
-
-static const SunModmapRec Generic5Modmap[] = {
-	{  99,	ShiftMask },
-	{ 110,	ShiftMask },
-	{ 119,	LockMask },
-	{  76,	ControlMask },
-	{ 120,	Meta_Mask },
-	{ 122,	Meta_Mask },
-	{  13,	Mode_switch_Mask },
-	{  98,	Num_Lock_Mask },
-	{  19,	Alt_Mask },
-	{   0,	0}
-};
-
-#if defined(DEN4) || defined(SWEDFIN4) || defined(SWFR4) || defined(SWGE4)
-
-static const SunModmapRec DenSwedFinSw4Modmap[] = {
-{  99,	ShiftMask },
-{ 110,	ShiftMask },
-{  76,	LockMask },
-{ 119,	ControlMask },
-{ 120,	Meta_Mask },
-{ 122,	Meta_Mask },
-{  67,	Mode_switch_Mask },
-{  98,	Num_Lock_Mask },
-{  19,	Alt_Mask },
-{   0,	0 }
-};
-
-#endif
-
-#if defined(FRBE4) || defined(NETH4)
-
-static const SunModmapRec FrBeNeth4Modmap[] = {
-	{  99,	ShiftMask },
-	{ 110,	ShiftMask },
-	{  13,	LockMask },
-	{  76,	ControlMask },
-	{ 120,	Meta_Mask },
-	{ 122,	Meta_Mask },
-	{ 119,	Mode_switch_Mask },
-	{  98,	Num_Lock_Mask },
-	{  19,	Alt_Mask },
-	{   0,	0 }
-};
-
-#endif
-
-#if defined(ITALY4) || defined(NORW4) || defined(PORT4) || defined(SPAINLATAM4)
-
-static const SunModmapRec ItNorPortSp4Modmap[] = {
-	{  99,	ShiftMask },
-	{ 110,	ShiftMask },
-	{  76,	LockMask },
-	{ 119,	ControlMask },
-	{ 120,	Meta_Mask },
-	{ 122,	Meta_Mask },
-	{  13,	Mode_switch_Mask },
-	{  98,	Num_Lock_Mask },
-	{  19,	Alt_Mask },
-	{   0,	0 }
-};
-
-#endif
-
 #ifdef CAN4
 
 static KeySym Canada4Keymap[] = {
@@ -619,23 +526,9 @@ static KeySym Canada4Keymap[] = {
 	XK_KP_Add,	NoSymbol,	NoSymbol,	NoSymbol,	/*125*/
 };
 
-static const SunModmapRec Canada4Modmap[] = {
-	{  99,	ShiftMask },
-	{ 110,	ShiftMask },
-	{  76,	LockMask },
-	{  13,	ControlMask },
-	{ 120,	Meta_Mask },
-	{ 122,	Meta_Mask },
-	{ 119,	Mode_switch_Mask },
-	{  98,	Num_Lock_Mask },
-	{  19,	Alt_Mask },
-	{   0,	0}
-};
-

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-30 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Jul 30 14:15:49 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c sunKeyMap.c

Log Message:
Initialize ModMap dynamically using keymap data per each keyboard.

Now ScrollLock LED works properly.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.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/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.3	Wed Jul 29 17:29:53 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Thu Jul 30 14:15:49 2020
@@ -58,10 +58,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 #define MIN_KEYCODE	7	/* necessary to avoid the mouse buttons */
 #define MAX_KEYCODE	255	/* limited by the protocol */
+#define NUM_KEYCODES	(MAX_KEYCODE - MIN_KEYCODE + 1)
 #ifndef KB_SUN4
 #define KB_SUN4		4
 #endif
 
+#define Meta_Mask	Mod1Mask
+#define Mode_switch_Mask Mod2Mask
+#define Alt_Mask	Mod3Mask
+#define Num_Lock_Mask	Mod4Mask
+#define ScrollLockMask	Mod5Mask
+
 #define tvminus(tv, tv1, tv2)   /* tv = tv1 - tv2 */ \
 		if ((tv1).tv_usec < (tv2).tv_usec) { \
 		(tv1).tv_usec += 100; \
@@ -79,6 +86,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 		}
 
 static void sunKbdHandlerNotify(int, int, void *);
+static void sunInitModMap(const KeySymsRec *, CARD8 *);
 static void SwapLKeys(KeySymsRec *);
 static void SetLights(KeybdCtrl *, int);
 static KeyCode LookupKeyCode(KeySym, XkbDescPtr, KeySymsPtr);
@@ -605,13 +613,12 @@ sunInitKbdNames(XkbRMLVOSet *rmlvo, sunK
 int
 sunKbdProc(DeviceIntPtr device, int what)
 {
-int i;
 DevicePtr pKeyboard = (DevicePtr) device;
 sunKbdPrivPtr pPriv;
 KeybdCtrl*	ctrl = &device->kbdfeed->ctrl;
 XkbRMLVOSet rmlvo;
+CARD8 workingModMap[MAP_LENGTH];
 
-static CARD8 *workingModMap = NULL;
 static KeySymsRec *workingKeySyms;
 
 switch (what) {
@@ -633,14 +640,8 @@ sunKbdProc(DeviceIntPtr device, int what
 	}
 	if (workingKeySyms->maxKeyCode > MAX_KEYCODE)
 		workingKeySyms->maxKeyCode = MAX_KEYCODE;
-	}
 
-	if (!workingModMap) {
-	workingModMap = malloc(MAP_LENGTH);
-	(void) memset(workingModMap, 0, MAP_LENGTH);
-	for(i=0; sunModMaps[sunKbdPriv.type][i].key != 0; i++)
-		workingModMap[sunModMaps[sunKbdPriv.type][i].key + MIN_KEYCODE] =
-		sunModMaps[sunKbdPriv.type][i].modifiers;
+	sunInitModMap(workingKeySyms, workingModMap);
 	}
 
 	pKeyboard->devicePrivate = (void *)&sunKbdPriv;
@@ -696,6 +697,73 @@ sunKbdProc(DeviceIntPtr device, int what
 return Success;
 }
 
+/*-
+ * sunInitModMap --
+ *	Initialize ModMap per specified KeyMap table.
+ *
+ * Results:
+ * 	None.
+ *
+ * Side Effects:
+ *	None.
+ *---*/
+static void
+sunInitModMap(
+const KeySymsRec *KeySyms,	/* KeyMap data to set ModMap */
+CARD8 *ModMap		/* ModMap to be initialized */
+)
+{
+KeySym *k;
+int i, min, max, width;
+
+for (i = 0; i < MAP_LENGTH; i++)
+ModMap[i] = NoSymbol;
+
+min   = KeySyms->minKeyCode;
+max   = KeySyms->maxKeyCode;
+width = KeySyms->mapWidth;
+for (i = min, k = KeySyms->map; i < max; i++, k += width) {
+	switch (*k) {
+
+	case XK_Shift_L:
+	case XK_Shift_R:
+	ModMap[i] = ShiftMask;
+	break;
+
+	case XK_Control_L:
+	case XK_Control_R:
+	ModMap[i] = ControlMask;
+	break;
+
+	case XK_Caps_Lock:
+	ModMap[i] = LockMask;
+	break;
+
+	case XK_Alt_L:
+	case XK_Alt_R:
+	ModMap[i] = Alt_Mask;
+	break;
+
+	case XK_Num_Lock:
+	ModMap[i] = Num_Lock_Mask;
+	break;
+
+	case XK_Scroll_Lock:
+	ModMap[i] = ScrollLockMask;
+	break;
+
+	case XK_Meta_L:
+	case XK_Meta_R:
+	ModMap[i] = Meta_Mask;
+	break;
+
+	case SunXK_AltGraph:
+	ModMap[i] = Mode_switch_Mask;
+	break;
+}
+}
+}
+
 /*-
  *---
  * sunKbdGetEvents --

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c	Thu Jul 30 14:15:49 2020
@@ -111,21 +111,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XK_R15	NoSymbol
 #endif
 
-/* twm and Motif have hard-coded dependencies on Meta being Mod1 :-( */
-#if 0
-/* This set has optimal characteristics for use in the Too

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-29 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Wed Jul 29 17:29:53 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunKbd.c

Log Message:
Remove unused functions required to handle non-XKB autorepeat.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h \
xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.2	Sun Jul 26 07:20:50 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h	Wed Jul 29 17:29:53 2020
@@ -359,8 +359,6 @@ extern Firm_event* sunKbdGetEvents(int, 
 extern void sunKbdEnqueueEvent(DeviceIntPtr, Firm_event *);
 extern int sunKbdProc(DeviceIntPtr, int);
 extern void sunKbdWait(void);
-void sunBlockHandler(int, void *, void *, void *);
-void sunWakeupHandler(int, void *, unsigned long, void *);
 
 /* sunMouse.c */
 extern Firm_event* sunMouseGetEvents(int, Bool, int *, Bool *);
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.2	Wed Jul 29 17:27:44 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Wed Jul 29 17:29:53 2020
@@ -839,15 +839,3 @@ LegalModifier(unsigned int key, DeviceIn
 {
 return TRUE;
 }
-
-/*ARGSUSED*/
-void
-sunBlockHandler(int nscreen, void *pbdata, void *pTimeout, void *pReadmask)
-{
-}
-
-/*ARGSUSED*/
-void
-sunWakeupHandler(int nscreen, void *pbdata, unsigned long err, void *pReadmask)
-{
-}

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-29 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Wed Jul 29 17:27:44 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c

Log Message:
Fix LED defintions to match xkb/xkbInit.c.

Now CapsLock and NumLock LEDs work correctly.
XXX: No ScrollLock LED


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Wed Jul 29 17:27:44 2020
@@ -51,7 +51,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xkbsrv.h"
 #include "xkbstr.h"
 
+#ifdef __sun
 #define SUN_LED_MASK	0x0f
+#else
+#define SUN_LED_MASK	0x07
+#endif
 #define MIN_KEYCODE	7	/* necessary to avoid the mouse buttons */
 #define MAX_KEYCODE	255	/* limited by the protocol */
 #ifndef KB_SUN4
@@ -144,6 +148,7 @@ SetLights(KeybdCtrl* ctrl, int fd)
 #ifdef KIOCSLED
 static unsigned char led_tab[16] = {
 	0,
+#ifdef __sun
 	LED_NUM_LOCK,
 	LED_SCROLL_LOCK,
 	LED_SCROLL_LOCK | LED_NUM_LOCK,
@@ -159,8 +164,25 @@ SetLights(KeybdCtrl* ctrl, int fd)
 	LED_CAPS_LOCK | LED_COMPOSE | LED_NUM_LOCK,
 	LED_CAPS_LOCK | LED_COMPOSE | LED_SCROLL_LOCK,
 	LED_CAPS_LOCK | LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK
+#else
+	LED_CAPS_LOCK,
+	LED_NUM_LOCK,
+	LED_NUM_LOCK | LED_CAPS_LOCK,
+	LED_SCROLL_LOCK,
+	LED_SCROLL_LOCK | LED_CAPS_LOCK,
+	LED_SCROLL_LOCK | LED_NUM_LOCK,
+	LED_SCROLL_LOCK | LED_NUM_LOCK | LED_CAPS_LOCK,
+	LED_COMPOSE,
+	LED_COMPOSE | LED_CAPS_LOCK,
+	LED_COMPOSE | LED_NUM_LOCK,
+	LED_COMPOSE | LED_NUM_LOCK | LED_CAPS_LOCK,
+	LED_COMPOSE | LED_SCROLL_LOCK,
+	LED_COMPOSE | LED_SCROLL_LOCK | LED_CAPS_LOCK,
+	LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK,
+	LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK | LED_CAPS_LOCK,
+#endif
 };
-if (ioctl (fd, KIOCSLED, (caddr_t)&led_tab[ctrl->leds & 0x0f]) == -1)
+if (ioctl (fd, KIOCSLED, (caddr_t)&led_tab[ctrl->leds & SUN_LED_MASK]) == -1)
 	ErrorF("Failed to set keyboard lights");
 #endif
 }
@@ -223,10 +245,17 @@ DDXRingBell(int volume, int pitch, int d
 }
 
 
+#ifdef __sun
 #define XLED_NUM_LOCK0x1
 #define XLED_COMPOSE 0x4
 #define XLED_SCROLL_LOCK 0x2
 #define XLED_CAPS_LOCK   0x8
+#else
+#define XLED_NUM_LOCK0x2
+#define XLED_COMPOSE 0x8
+#define XLED_SCROLL_LOCK 0x4
+#define XLED_CAPS_LOCK   0x1
+#endif
 
 static KeyCode
 LookupKeyCode(KeySym keysym, XkbDescPtr xkb, KeySymsPtr syms)
@@ -324,7 +353,7 @@ DoLEDs(
 	pseudoKey(device, FALSE,
 		LookupKeyCode(SunXK_Compose, xkb, syms));
 
-pPriv->leds = ctrl->leds & 0x0f;
+pPriv->leds = ctrl->leds & SUN_LED_MASK;
 SetLights (ctrl, pPriv->fd);
 free(syms->map);
 free(syms);
@@ -359,7 +388,7 @@ sunKbdCtrl(DeviceIntPtr device, KeybdCtr
 	if (ioctl (pPriv->fd, KIOCCMD, &kbdClickCmd) == -1)
  	ErrorF("Failed to set keyclick");
 }
-if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & 0x0f)))
+if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & SUN_LED_MASK)))
 	DoLEDs(device, ctrl, pPriv);
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-26 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Jul 26 07:35:37 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunFbs.c

Log Message:
Explicitly initialize origColormapValid for readability.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.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/sun/sunFbs.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.2	Sun Jul 26 07:20:50 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c	Sun Jul 26 07:35:37 2020
@@ -141,6 +141,7 @@ sunScreenAllocate(ScreenPtr pScreen)
 if (!pPrivate)
 	return FALSE;
 
+pPrivate->origColormapValid = FALSE;
 sunSetScreenPrivate(pScreen, pPrivate);
 return TRUE;
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-26 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Jul 26 07:20:50 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunCfb.c sunFbs.c

Log Message:
Implement functions to restore palette settings on exiting Xserver.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h \
xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h	Sun Jul 26 07:20:50 2020
@@ -247,11 +247,21 @@ typedef struct {
 CursorPtr	pCursor;		/* current cursor */
 } sunCursorRec, *sunCursorPtr;
 
+#define NCMAP	256
+typedef struct {
+u_char	origRed[NCMAP];
+u_char	origGreen[NCMAP];
+u_char	origBlue[NCMAP];
+} sunCmapRec, *sunCmapPtr;
+
 typedef struct {
 ColormapPtr	installedMap;
 CloseScreenProcPtr CloseScreen;
 void	(*UpdateColormap)(ScreenPtr, int, int, u_char *, u_char *, u_char *);
 void	(*GetColormap)(ScreenPtr, int, int, u_char *, u_char *, u_char *);
+Bool	origColormapValid;
+sunCmapRec	origColormap;
+void	(*RestoreColormap)(ScreenPtr);
 sunCursorRechardwareCursor;
 Bool	hasHardwareCursor;
 } sunScreenRec, *sunScreenPtr;
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c	Sun Jul 26 07:20:50 2020
@@ -137,7 +137,7 @@ sunScreenAllocate(ScreenPtr pScreen)
 	ErrorF("dixRegisterPrivateKey failed");
 	return FALSE;
 }
-pPrivate = malloc (sizeof (sunScreenRec));
+pPrivate = calloc(1, sizeof (sunScreenRec));
 if (!pPrivate)
 	return FALSE;
 
@@ -171,6 +171,8 @@ closeScreen(ScreenPtr pScreen)
 #if 0	/* XXX GX is disabled for now */
 sunDisableCursor (pScreen);
 #endif
+if (pPrivate->origColormapValid)
+	(*pPrivate->RestoreColormap)(pScreen);
 pScreen->CloseScreen = pPrivate->CloseScreen;
 ret = (*pScreen->CloseScreen) (pScreen);
 (void) (*pScreen->SaveScreen) (pScreen, SCREEN_SAVER_OFF);

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.4	Sun Jul 26 07:19:09 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Sun Jul 26 07:20:50 2020
@@ -94,11 +94,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 static void CGUpdateColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
 static void CGGetColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
 static void CGStoreColors(ColormapPtr, int, xColorItem *);
+static void CGSaveColormap(ScreenPtr);
+static void CGRestoreColormap(ScreenPtr);
+static void CGScreenInitCommon(ScreenPtr);
 static void CGScreenInit(ScreenPtr);
 static void checkMono(int, char **);
 #ifdef INCLUDE_CG2_HEADER
 static void CG2UpdateColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
 static void CG2GetColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
+static void CG2RestoreColormap(ScreenPtr);
 static Bool CG2SaveScreen(ScreenPtr, int);
 static void CG2ScreenInit(ScreenPtr pScreen);
 #endif
@@ -246,22 +250,61 @@ CGStoreColors(ColormapPtr pmap, int ndef
 }
 
 static void
-CGScreenInit(ScreenPtr pScreen)
+CGSaveColormap(ScreenPtr pScreen)
 {
-#ifndef STATIC_COLOR /* { */
 sunScreenPtr pPrivate = sunGetScreenPrivate(pScreen);
+sunCmapPtr origColormap;
+u_char *rmap, *gmap, *bmap;
+
+origColormap = &pPrivate->origColormap;
+rmap = origColormap->origRed;
+gmap = origColormap->origGreen;
+bmap = origColormap->origBlue;
+(*pPrivate->GetColormap)(pScreen, 0, NCMAP, rmap, gmap, bmap);
+}
+
+static void
+CGRestoreColormap(ScreenPtr pScreen)
+{
+sunScreenPtr pPrivate = sunGetScreenPrivate(pScreen);
+sunCmapPtr origColormap;
+u_char *rmap, *gmap, *bmap;
+
+if (pPrivate->origColormapValid) {
+	origColormap = &pPrivate->origColormap;
+	rmap = origColormap->origRed;
+	gmap = origColormap->origGreen;
+	bmap = origColormap->origBlue;
+	(*pPrivate->UpdateColormap)(pScreen, 0, NCMAP, rmap, gmap, bmap);
+}
+}
+
+static void
+CGScreenInitCommon(ScreenPtr pScreen)
+{
 pScreen->InstallColormap = sunInstallColormap;
 pScreen->UninstallColormap = sunUninstallColormap;
 pScreen->Li

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-26 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Jul 26 07:19:09 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c

Log Message:
Add prototype declarations for CG2 functions.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.3	Fri Jul 24 03:57:21 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Sun Jul 26 07:19:09 2020
@@ -96,6 +96,12 @@ static void CGGetColormap(ScreenPtr, int
 static void CGStoreColors(ColormapPtr, int, xColorItem *);
 static void CGScreenInit(ScreenPtr);
 static void checkMono(int, char **);
+#ifdef INCLUDE_CG2_HEADER
+static void CG2UpdateColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
+static void CG2GetColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
+static Bool CG2SaveScreen(ScreenPtr, int);
+static void CG2ScreenInit(ScreenPtr pScreen);
+#endif
 static void CG4Switch(ScreenPtr, int);
 
 static void

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-23 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Jul 24 03:57:21 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c

Log Message:
Use proper args for dixLookupResourceByType() to get defcolormap.

Botched in mechanical 1.20 updates.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2	Thu Jul 23 18:14:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Fri Jul 24 03:57:21 2020
@@ -197,7 +197,7 @@ sunUninstallColormap(ColormapPtr cmap)
 	if (cmap->mid != defMapID) {
 	ColormapPtr defMap;
 	dixLookupResourceByType((void **)&defMap, defMapID, RT_COLORMAP,
-NullClient, DixUnknownAccess);
+serverClient, DixUseAccess);
 
 	if (defMap)
 		(*cmap->pScreen->InstallColormap)(defMap);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-23 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Jul 24 02:20:20 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c

Log Message:
Apply upstream "free the EQ allocated memory on shutdown" fixes.

This should be updated before 1.20 import:
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=87d4f90bfcb509471ac9e7886e14a92b33223fd7


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Fri Jul 24 02:20:20 2020
@@ -664,6 +664,7 @@ InitInput(int argc, char **argv)
 void
 CloseInput(void)
 {
+mieqFini();
 }
 
 #if SUNMAXDEPTH == 8

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-23 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Jul 23 18:14:36 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c

Log Message:
Use proper ANSI offsetof(3) to specify framebuffer offset in struct.

Fixes build error on sparc64.  No binary change on sun3.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Thu Jul 23 18:14:36 2020
@@ -418,7 +418,7 @@ sunCG2Init(
 	ret = sunInitCommon (screen, pScreen, (off_t) 0,
 			sunCfbScreenInit, CG2ScreenInit,
 			fbCreateDefColormap, CG2SaveScreen,
-			(int) &((struct cg2memfb *) 0)->pixplane);
+			offsetof(struct cg2memfb, pixplane));
 	((CG2Ptr) sunFbs[screen].fb)->regs.ppmask.reg = 0xFF;
 #ifndef LOWMEMFTPT
 }
@@ -436,7 +436,7 @@ typedef struct {
 u_char mpixel[CG4_MELEN];		/* bit-per-pixel memory */
 u_char epixel[CG4_MELEN];		/* enable plane */
 u_char cpixel[CG4_HEIGHT][CG4_WIDTH];	/* byte-per-pixel memory */
-} *CG4Ptr;
+} *CG4Ptr, CG4Rec;
 
 static void
 CG4Switch(ScreenPtr pScreen, int select)
@@ -462,7 +462,7 @@ sunCG4Init(
 	sunFbs[screen].EnterLeave = CG4Switch;
 return sunInitCommon (screen, pScreen, (off_t) 0,
 	sunCfbScreenInit, CGScreenInit,
-	fbCreateDefColormap, sunSaveScreen, (int) ((CG4Ptr) 0)->cpixel);
+	fbCreateDefColormap, sunSaveScreen, offsetof(CG4Rec, cpixel));
 }
 
 #ifdef FBTYPE_SUNFAST_COLOR /* { */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-07-22 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Wed Jul 22 21:24:20 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kInit.c

Log Message:
Normalize #include paths.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h
cvs rdiff -u -r1.6 -r1.7 \
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/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.4	Fri Apr 10 16:49:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Wed Jul 22 21:24:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.5 2020/07/22 21:24:20 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -43,12 +43,12 @@
 #include 
 
 /* generic X */
-#include 
-#include 
+#include 
+#include 
 #define XK_KATAKANA
-#include 
+#include 
 #define NEED_EVENTS
-#include 
+#include 
 
 /* dix */
 #include 

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.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.6	Sat Jul 18 15:48:08 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Wed Jul 22 21:24:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.6 2020/07/18 15:48:08 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.7 2020/07/22 21:24:20 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -68,7 +68,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ***/
 
-#include "Xos.h"
+#include 
 #include "x68k.h"
 #include "mi.h"
 #include "extinit.h"

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-07-19 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Jul 19 19:11:05 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kKbd.c

Log Message:
Sync with xorg-server.old: Remove #ifdef XKB conditional.

> It has been mandatory on Xorg:
>  
> https://cgit.freedesktop.org/xorg/xserver/commit/?id=40877c6680863bd6a8475f2bb0c54df55bcf0b0e


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.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/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.5	Sat Jul 18 15:37:02 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Sun Jul 19 19:11:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.5 2020/07/18 15:37:02 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.6 2020/07/19 19:11:05 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -382,12 +382,10 @@ x68kKbdCtrl(DeviceIntPtr pDev, KeybdCtrl
 {
 X68kKbdPrivPtr pPriv = (X68kKbdPrivPtr)pDev->public.devicePrivate;
 
-#ifdef XKB
 if (pPriv->leds != ctrl->leds) {
 x68kSetLeds(pPriv, (u_char)ctrl->leds);
 	pPriv->leds = ctrl->leds;
 }
-#endif
 }
 
 /*-

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 18 15:48:08 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c

Log Message:
Add a stub for miinitext of GLX.

As per upstream commits for Xnest:
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=67c303fff303f94b62f03a76de97116c6ebcfda9

Note GLXEXT is defined as 1 in xorg-server/include/xorg-server.h
(i.e. /usr/X11R7/include/xorg/xorg-server.h) so no proper way to
disable it on building MD servers per ${MACHINE} basis.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.5	Sat Jul 18 04:46:22 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Sat Jul 18 15:48:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.5 2020/07/18 04:46:22 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.6 2020/07/18 15:48:08 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -71,6 +71,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Xos.h"
 #include "x68k.h"
 #include "mi.h"
+#include "extinit.h"
 
 static int nscreens;
 
@@ -79,6 +80,13 @@ OsVendorInit(void)
 {
 }
 
+#ifdef GLXEXT
+void
+GlxExtensionInit(void)
+{
+}
+#endif
+
 /*-
  * function "InitOutput"[ called by DIX ]
  *

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 18 15:37:02 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kKbd.c
x68kMouse.c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.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/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.4	Fri Apr 10 16:49:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Sat Jul 18 15:37:02 2020
@@ -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 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 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 x68kKbdBell(int, DeviceIntPt
 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 @@ x68kKbdProc(DeviceIntPtr pDev, 	/* Keybo
 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:
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.4	Fri Apr 10 16:49:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Sat Jul 18 15:37:02 2020
@@ -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 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include 
 #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 @@ DeviceIntPtr x68kPointerDevice = NULL;
 
 static X68kMousePriv x68kMousePriv;
 
+static void
+x68kMouseHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
+
 /*-
  *---
  * x68kMouseProc --
@@ -162,13 +168,14 @@ x68kMouseProc(DeviceIntPtr device, int w
 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:

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-07-17 Thread Izumi Tsutsui

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");

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2020-02-09 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Sun Feb  9 13:02:25 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
Revert previous two commits, will fix this another way.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.17 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.18
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.17	Sun Feb  9 12:53:19 2020
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Sun Feb  9 13:02:24 2020
@@ -356,16 +356,16 @@ listPossibleVideoDrivers(XF86MatchedDriv
 xf86AddMatchedDriver(md, "fbdev");
 #endif
 
-#if defined(__NetBSD__)
-xf86AddMatchedDriver(md, "wsfb");
-#endif
-
 /* Fallback to platform default hardware */
-#if (defined(__i386__) || defined(__amd64__) || defined(__hurd__)) && !defined(__NetBSD__)
+#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
 xf86AddMatchedDriver(md, "vesa");
 #elif defined(__sparc__) && !defined(__sun)
 xf86AddMatchedDriver(md, "sunffb");
 #endif
+
+#if defined(__NetBSD__)
+xf86AddMatchedDriver(md, "wsfb");
+#endif
 }
 
 /* copy a screen section and enter the desired driver

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2020-02-09 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Sun Feb  9 12:53:19 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
Don't autoload vesa on x86 at all as it conflicts with wsfb.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.16 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.17
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.16	Sun Feb  9 11:40:14 2020
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Sun Feb  9 12:53:19 2020
@@ -361,7 +361,7 @@ listPossibleVideoDrivers(XF86MatchedDriv
 #endif
 
 /* Fallback to platform default hardware */
-#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+#if (defined(__i386__) || defined(__amd64__) || defined(__hurd__)) && !defined(__NetBSD__)
 xf86AddMatchedDriver(md, "vesa");
 #elif defined(__sparc__) && !defined(__sun)
 xf86AddMatchedDriver(md, "sunffb");

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2020-02-09 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Sun Feb  9 11:40:14 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
Try wsfb before vesa on x86. Modern video cards may not support VBE at all.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.15 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.16
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.15	Fri Aug 30 15:57:00 2019
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Sun Feb  9 11:40:14 2020
@@ -356,16 +356,16 @@ listPossibleVideoDrivers(XF86MatchedDriv
 xf86AddMatchedDriver(md, "fbdev");
 #endif
 
+#if defined(__NetBSD__)
+xf86AddMatchedDriver(md, "wsfb");
+#endif
+
 /* Fallback to platform default hardware */
 #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
 xf86AddMatchedDriver(md, "vesa");
 #elif defined(__sparc__) && !defined(__sun)
 xf86AddMatchedDriver(md, "sunffb");
 #endif
-
-#if defined(__NetBSD__)
-xf86AddMatchedDriver(md, "wsfb");
-#endif
 }
 
 /* copy a screen section and enter the desired driver

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2019-01-28 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Mon Jan 28 11:50:00 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
Try the modesetting driver before wsfb on NetBSD arm and aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.12 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.13
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.12	Mon Dec 31 10:35:46 2018
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Mon Jan 28 11:50:00 2019
@@ -346,6 +346,10 @@ listPossibleVideoDrivers(XF86MatchedDriv
 xf86AddMatchedDriver(md, "modesetting");
 #endif
 
+#if defined(__NetBSD__) && (defined(__aarch64__) || defined(__arm__))
+xf86AddMatchedDriver(md, "modesetting");
+#endif
+
 #if !defined(__sun)
 /* Fallback to platform default frame buffer driver */
 #if !defined(__linux__) && defined(__sparc__)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

2019-01-10 Thread Maya Rashish

Module Name:xsrc
Committed By:   maya
Date:   Thu Jan 10 14:33:11 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c

Log Message:
pEnt isn't initialized at this point, don't free it
Undo diff to upstream.

There's a good chance we aren't using this code at all.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.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/xfree86/drivers/modesetting/driver.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.3	Mon Dec 31 09:50:00 2018
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c	Thu Jan 10 14:33:11 2019
@@ -901,15 +901,12 @@ PreInit(ScrnInfoPtr pScrn, int flags)
 return FALSE;
 
 if (flags & PROBE_DETECT) {
-	free(pEnt);
 return FALSE;
 }
 
 /* Allocate driverPrivate */
-if (!GetRec(pScrn)) {
-	free(pEnt);
+if (!GetRec(pScrn))
 return FALSE;
-}
 
 pEnt = xf86GetEntityInfo(pScrn->entityList[0]);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2019-01-10 Thread Maya Rashish

Module Name:xsrc
Committed By:   maya
Date:   Thu Jan 10 14:28:44 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86pciBus.c

Log Message:
Undo unnecessary diff to vendor branch.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.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/xfree86/common/xf86pciBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.4	Mon Dec 31 09:50:00 2018
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c	Thu Jan 10 14:28:44 2019
@@ -1072,7 +1072,8 @@ xf86VideoPtrToDriverList(struct pci_devi
any device */
 const char *driverList[5] = { NULL, NULL, NULL, NULL, NULL };
 
-switch (dev->vendor_id) { /* AMD Geode LX */
+switch (dev->vendor_id) {
+/* AMD Geode LX */
 case 0x1022:
 if (dev->device_id == 0x2081)
 driverList[0] = "geode";

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus

2018-12-31 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jan  1 00:40:01 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus:
netbsdSbus.c

Log Message:
s/pointer/void */ in a few places.  remove now (void *) casts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.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/xfree86/os-support/bus/netbsdSbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.5	Sat Aug 20 21:15:07 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c	Tue Jan  1 00:40:01 2019
@@ -611,10 +611,10 @@ sparcDriverName(void)
 return name;
 }
 
-pointer
+void *
 xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
 {
-pointer ret;
+void * ret;
 
 if (psdp->fd == -1) {
 	psdp->fd = open(psdp->device, O_RDWR);
@@ -623,20 +623,20 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsig
 } else if (psdp->fd < 0)
 	return NULL;
 
-ret = (pointer) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE,
+ret = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE,
 			  psdp->fd, offset);
-if (ret == (pointer) -1) {
-	ret = (pointer) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+if (ret == (void *) -1) {
+	ret = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
 			  psdp->fd, offset);
 }
-if (ret == (pointer) -1)
+if (ret == (void *) -1)
 	return NULL;
 
 return ret;
 }
 
 void
-xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
+xf86UnmapSbusMem(sbusDevicePtr psdp, void * addr, unsigned long size)
 {
 munmap (addr, size);
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2018-12-31 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Dec 31 10:35:46 UTC 2018

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
use xf86AddMatchedDriver().


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.11 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.11	Mon Dec 31 09:50:00 2018
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Mon Dec 31 10:35:46 2018
@@ -239,11 +239,11 @@ listPossibleVideoDrivers(XF86MatchedDriv
 /* XXXMRG:  xorg-server 1.10/1.18 -- merge into xf86PlatformMatchDriver()? */
 #ifdef __NetBSD__
 #if defined(__shark)
-matches[i++] = xnfstrdup("chips");
-matches[i++] = xnfstrdup("igs");
+xf86AddMatchedDriver(md, "chips");
+xf86AddMatchedDriver(md, "igs");
 #elif defined(__sgimips)
-matches[i++] = xnfstrdup("crime");
-matches[i++] = xnfstrdup("newport");
+xf86AddMatchedDriver(md, "crime");
+xf86AddMatchedDriver(md, "newport");
 #elif defined(__sparc) || defined(__sparc64)
 /* dig through /dev/fb* */
 {
@@ -269,7 +269,7 @@ listPossibleVideoDrivers(XF86MatchedDriv
 	if (sbusDeviceTable[dev].fbType == fbt.fb_type) {
 		xf86Msg(X_ERROR,"%s: found %s\n", __func__,
 		sbusDeviceTable[dev].driverName);
-		matches[i++] = xnfstrdup(sbusDeviceTable[dev].driverName);
+	xf86AddMatchedDriver(md, sbusDeviceTable[dev].driverName);
 	}
 	}
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2018-10-26 Thread Maya Rashish

Module Name:xsrc
Committed By:   maya
Date:   Fri Oct 26 11:13:29 UTC 2018

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_init.c

Log Message:
Don't error if we are unprivileged


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.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/xfree86/os-support/bsd/bsd_init.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.8	Thu Aug 11 00:04:31 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c	Fri Oct 26 11:13:29 2018
@@ -165,11 +165,6 @@ xf86OpenConsole()
 #endif
 
 if (serverGeneration == 1) {
-/* check if we are run with euid==0 */
-if (geteuid() != 0) {
-FatalError("xf86OpenConsole: Server must be suid root");
-}
-
 if (!KeepTty) {
 /*
  * detaching the controlling tty solves problems of kbd character

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

2018-04-03 Thread Ryo Shimizu

Module Name:xsrc
Committed By:   ryo
Date:   Tue Apr  3 19:53:57 UTC 2018

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.h present.c vblank.c

Log Message:
Fix compile error on evbarm-aarch64. (incompatible pointer types initializing 
'present_get_ust_msc_ptr')


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.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/xfree86/drivers/modesetting/driver.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h:1.1.1.1 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h:1.1.1.1	Wed Aug 10 07:44:34 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h	Tue Apr  3 19:53:57 2018
@@ -139,7 +139,7 @@ xf86CrtcPtr ms_dri2_crtc_covering_drawab
 xf86CrtcPtr ms_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
  xf86CrtcPtr desired, BoxPtr crtc_box_ret);
 
-int ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc);
+int ms_get_crtc_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc);
 
 uint32_t ms_crtc_msc_to_kernel_msc(xf86CrtcPtr crtc, uint64_t expect);
 uint64_t ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint32_t sequence);
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c:1.1.1.1 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c:1.1.1.1	Wed Aug 10 07:44:34 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c	Tue Apr  3 19:53:57 2018
@@ -64,7 +64,7 @@ ms_present_get_crtc(WindowPtr window)
 }
 
 static int
-ms_present_get_ust_msc(RRCrtcPtr crtc, CARD64 *ust, CARD64 *msc)
+ms_present_get_ust_msc(RRCrtcPtr crtc, uint64_t *ust, uint64_t *msc)
 {
 xf86CrtcPtr xf86_crtc = crtc->devPrivate;
 

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c:1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c:1.2	Fri Oct  7 16:08:48 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c	Tue Apr  3 19:53:57 2018
@@ -196,7 +196,7 @@ ms_kernel_msc_to_crtc_msc(xf86CrtcPtr cr
 }
 
 int
-ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc)
+ms_get_crtc_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc)
 {
 uint32_t kernel_msc;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2017-08-05 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Sat Aug  5 06:03:26 UTC 2017

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
alpha_video.c

Log Message:
make this build on netbsd.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.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/xfree86/os-support/bsd/alpha_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.5	Thu Aug 11 00:04:31 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c	Sat Aug  5 06:03:26 2017
@@ -34,6 +34,9 @@
 #include 
 #ifndef __NetBSD__
 #include 
+#else
+#include 
+#include 
 #endif
 
 #include "xf86_OSlib.h"

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/int10

2016-11-21 Thread Soren Jacobsen

Module Name:xsrc
Committed By:   snj
Date:   Tue Nov 22 06:38:08 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10: generic.c

Log Message:
reduce diff to upstream. no functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.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/xfree86/int10/generic.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c:1.3	Thu Aug 11 00:04:30 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c	Tue Nov 22 06:38:08 2016
@@ -145,8 +145,7 @@ xf86ExtendedInitInt10(int entityIndex, i
 /* FIXME: Shouldn't this be a failure case?  Leaving dev as NULL seems like
  * FIXME: an error
  */
-
-   pInt->dev = xf86GetPciInfoForEntity(entityIndex);
+pInt->dev = xf86GetPciInfoForEntity(entityIndex);
 
 /*
  * we need to map video RAM MMIO as some chipsets map mmio

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2016-11-17 Thread Soren Jacobsen

Module Name:xsrc
Committed By:   snj
Date:   Thu Nov 17 16:52:53 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c

Log Message:
fix misplaced conditionalized } that broke pointer detection under
vmware when running X without a config file.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.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/xfree86/common/xf86Config.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.13 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.14
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.13	Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c	Thu Nov 17 16:52:53 2016
@@ -1270,13 +1270,13 @@ checkCoreInputDevices(serverLayoutPtr se
 	} else {
 #endif
 defPtr.inp_driver = strdup("mouse");
+#if defined(__NetBSD__) && (defined(__i386__) || defined(__amd64__))
+}
+#endif
 confInput = &defPtr;
 foundPointer = TRUE;
 from = X_DEFAULT;
 pointerMsg = "default mouse configuration";
-#if defined(__NetBSD__) && (defined(__i386__) || defined(__amd64__))
-}
-#endif
 }
 
 /* Add the core pointer device to the layout, and set it to Core. */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2016-11-02 Thread Joerg Sonnenberger

Module Name:xsrc
Committed By:   joerg
Date:   Wed Nov  2 20:56:40 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Configure.c

Log Message:
Add explicit cast before writing to newly allocated memory.

XXX Beside the strange allocation size, this could be XNFstrdup.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.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/xfree86/common/xf86Configure.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.9 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.9	Thu Aug 18 18:52:02 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c	Wed Nov  2 20:56:40 2016
@@ -144,7 +144,7 @@ xf86AddBusDeviceToConfigure(const char *
 #if defined(__arm32__) || defined(__arm__)
 case BUS_ISA:
 	DevToConfig[i].GDev.busID = xnfalloc(6);
-	strcpy(DevToConfig[i].GDev.busID, "ISA");
+	strcpy((char *)DevToConfig[i].GDev.busID, "ISA");
 	break;
 #endif
 default:

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

2016-10-07 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri Oct  7 16:08:48 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
vblank.c

Log Message:
CID 1373525: Checking for NULL after deref is kind of late.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.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/xfree86/drivers/modesetting/vblank.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c:1.1.1.1 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c:1.1.1.1	Wed Aug 10 03:44:34 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c	Fri Oct  7 12:08:48 2016
@@ -246,14 +246,19 @@ ms_crtc_msc_to_kernel_msc(xf86CrtcPtr cr
 static void
 ms_drm_wakeup_handler(void *data, int err, void *mask)
 {
-ScreenPtr screen = data;
-ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-modesettingPtr ms = modesettingPTR(scrn);
-fd_set *read_mask = mask;
+ScreenPtr screen;
+ScrnInfoPtr scrn;
+modesettingPtr ms;
+fd_set *read_mask;
 
 if (data == NULL || err < 0)
 return;
 
+screen = data;
+scrn = xf86ScreenToScrn(screen);
+ms = modesettingPTR(scrn);
+read_mask = mask;
+
 if (FD_ISSET(ms->fd, read_mask))
 drmHandleEvent(ms->fd, &ms->event_context);
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

2016-10-07 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri Oct  7 16:01:50 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c

Log Message:
CID 1373520: Fix memory leak, don't allocate needlessly.
CID 1373521: Fix memory leak.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.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/xfree86/drivers/modesetting/driver.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.1.1.1 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.1.1.1	Wed Aug 10 03:44:34 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c	Fri Oct  7 12:01:50 2016
@@ -752,8 +752,8 @@ ms_get_drm_master_fd(ScrnInfoPtr pScrn)
 if (pEnt->location.type == BUS_PCI) {
 ms->PciInfo = xf86GetPciInfoForEntity(ms->pEnt->index);
 if (ms->PciInfo) {
-BusID = malloc(64);
-sprintf(BusID, "PCI:%d:%d:%d",
+char BusID[256];
+snprintf(BusID, sizeof(BusID), "PCI:%d:%d:%d",
 #if XSERVER_LIBPCIACCESS
 ((ms->PciInfo->domain << 8) | ms->PciInfo->bus),
 ms->PciInfo->dev, ms->PciInfo->func
@@ -796,12 +796,15 @@ PreInit(ScrnInfoPtr pScrn, int flags)
 pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 
 if (flags & PROBE_DETECT) {
+	free(pEnt);
 return FALSE;
 }
 
 /* Allocate driverPrivate */
-if (!GetRec(pScrn))
+if (!GetRec(pScrn)) {
+	free(pEnt);
 return FALSE;
+}
 
 ms = modesettingPTR(pScrn);
 ms->SaveGeneration = -1;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

2016-10-07 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri Oct  7 15:55:36 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c

Log Message:
CID 1373518: Memory corruption (off-by-one)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.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/xfree86/drivers/modesetting/drmmode_display.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.2	Fri Oct  7 11:43:38 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c	Fri Oct  7 11:55:36 2016
@@ -1370,7 +1370,7 @@ static int parse_path_blob(drmModeProper
 if (!conn)
 return -1;
 len = conn - (blob_data + 4);
-if (len + 1> 5)
+if (len + 1 >= sizeof(conn_id))
 return -1;
 memcpy(conn_id, blob_data + 4, len);
 conn_id[len + 1] = '\0';

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

2016-10-07 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri Oct  7 15:43:38 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c

Log Message:
CID 1373515: check return value.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.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/xfree86/drivers/modesetting/drmmode_display.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.1.1.1 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.1.1.1	Wed Aug 10 03:44:34 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c	Fri Oct  7 11:43:38 2016
@@ -674,11 +674,15 @@ drmmode_set_scanout_pixmap_cpu(xf86CrtcP
 DamageRegister(&ppix->drawable, drmmode_crtc->slave_damage);
 
 if (ppriv->fb_id == 0) {
-drmModeAddFB(drmmode->fd, ppix->drawable.width,
+int ret = drmModeAddFB(drmmode->fd, ppix->drawable.width,
  ppix->drawable.height,
  ppix->drawable.depth,
  ppix->drawable.bitsPerPixel,
  ppix->devKind, ppriv->backing_bo->handle, &ppriv->fb_id);
+	if (ret) {
+	ErrorF("failed to set scanout pixmap cpu\n");
+	return FALSE;
+	}
 }
 return TRUE;
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2016-09-27 Thread Joerg Sonnenberger

Module Name:xsrc
Committed By:   joerg
Date:   Tue Sep 27 19:10:47 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
Silently report success for enabling IO on platforms without it.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.10 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.10	Fri Sep 23 19:59:03 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Tue Sep 27 19:10:47 2016
@@ -82,8 +82,8 @@ xf86EnableIO()
 #ifdef __arm__
 IOPortBase = (unsigned int)ioBase;
 #endif
-return TRUE;
 #endif
+return TRUE;
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2016-09-23 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri Sep 23 19:59:03 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
fix printf format.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.9 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.9	Fri Aug 26 23:52:00 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Fri Sep 23 15:59:03 2016
@@ -73,7 +73,7 @@ xf86EnableIO()
 if (ioBase == MAP_FAILED) {
 ioBase = mmap(NULL, 0x1, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
   PCI_MAGIC_IO_RANGE);
-xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
+xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\n", ioBase);
 if (ioBase == MAP_FAILED) {
 xf86MsgVerb(X_WARNING, 3, "Can't map IO space! (%d)\n", errno);
 return FALSE;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2016-09-10 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Sep 11 03:55:57 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kInit.c
x68kKbd.c x68kMouse.c

Log Message:
Pull more changes from Xnest to adapt X68k to Xorg server 1.18.

- use QueueKeyboardEvents() and QueuePointerEvents() which are provided
  by dix/getevents.c, instead of raw mieqEnqueue() with uninitialized
  local InternalEvent
- remove now actually unused local InternalEvent
- explicitly call mieqFini() in DDX CloseInput()

Confirmed working on XM6i, and "please commit" from mrg@.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.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/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.2	Tue Aug 30 07:50:55 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Sun Sep 11 03:55:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.2 2016/08/30 07:50:55 mrg Exp $ */
+/* $NetBSD: x68k.h,v 1.3 2016/09/11 03:55:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -150,9 +150,6 @@ Bool x68kGraphOpen(X68kScreenRec *);
 Bool x68kGraphInit(ScreenPtr, int, char *[]);
 void x68kGraphClose(X68kScreenRec *);
 
-/* in x68kInit.c */
-extern InternalEvent *x68kEvents;
-
 /* in x68kIo.c */
 void x68kSigIOHandler(int);
 
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.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.2	Tue Aug 30 07:50:55 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Sun Sep 11 03:55:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.2 2016/08/30 07:50:55 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.3 2016/09/11 03:55:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -77,8 +77,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "x68k.h"
 #include "mi.h"
 
-InternalEvent *x68kEvents = NULL;
-
 static int nscreens;
 
 void
@@ -146,6 +144,7 @@ InitInput(int argc, char *argv[]) 
 void
 CloseInput(void)
 {
+mieqFini();
 }
 
 /*-
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.2	Tue Aug 30 07:50:55 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Sun Sep 11 03:55:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.2 2016/08/30 07:50:55 mrg Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.3 2016/09/11 03:55:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -292,13 +292,10 @@ x68kKbdEnqueueEvent(DeviceIntPtr pDev, F
 {
 BYTE		keycode;
 int			type;
-int			i, nevents;
 
 type = ((fe->value == VKEY_UP) ? KeyRelease : KeyPress);
 keycode = (fe->id & 0x7f) + MIN_KEYCODE;
-nevents = GetKeyboardEvents(x68kEvents, pDev, type, keycode);
-for (i = 0; i < nevents; i++)
-	mieqEnqueue(pDev, &x68kEvents[i]);
+QueueKeyboardEvents(pDev, type, keycode);
 }
 
 /*-
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.2	Tue Aug 30 07:50:55 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Sun Sep 11 03:55:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.2 2016/08/30 07:50:55 mrg Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.3 2016/09/11 03:55:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -263,7 +263,7 @@ x68kMouseEnqueueEvent(DeviceIntPtr devic
 X68kMousePrivPtr	pPriv;	/* Private data for pointer */
 int			bmask;	/* Temporary button mask */
 int			type, buttons, flag;
-int			i

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2016-08-30 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 30 07:50:55 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kFb.c
x68kGraph.c x68kInit.c x68kKbd.c x68kMouse.c x68kText.c

Log Message:
port to xorg-server 1.18.  builds and may work, but not tested.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.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/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.1	Sat Mar  1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Tue Aug 30 07:50:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.1 2014/03/01 19:34:47 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.2 2016/08/30 07:50:55 mrg Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -95,7 +95,7 @@ typedef struct _X68kScreenRec {
  */
 typedef struct _X68kFbProcRec {
 Bool (*open)(X68kScreenRec *);		 /* open procedure   */
-Bool (*init)(int, ScreenPtr, int, char *[]); /* initialize procedure */
+Bool (*init)(ScreenPtr, int, char *[]);  /* initialize procedure */
 void (*close)(X68kScreenRec *);		 /* close procedure  */
 } X68kFbProcRec;
 
@@ -123,7 +123,7 @@ typedef struct _X68kKbdPriv {
 #define X68K_KB_STANDARD 0  /* standard keyboard */
 #define X68K_KB_ASCII1  /* ascii map keyboard */
 
-#define MAXEVENTS 32
+#define X68K_MAXEVENTS 32
 
 extern DevPrivateKeyRec x68kScreenPrivateKeyRec;
 #define x68kScreenPrivateKey (&x68kScreenPrivateKeyRec)
@@ -147,11 +147,11 @@ Bool x68kSaveScreen(ScreenPtr, int);
 
 /* x68kGraph.c */
 Bool x68kGraphOpen(X68kScreenRec *);
-Bool x68kGraphInit(int, ScreenPtr, int, char *[]);
+Bool x68kGraphInit(ScreenPtr, int, char *[]);
 void x68kGraphClose(X68kScreenRec *);
 
 /* in x68kInit.c */
-extern EventList *x68kEvents;
+extern InternalEvent *x68kEvents;
 
 /* in x68kIo.c */
 void x68kSigIOHandler(int);
@@ -175,7 +175,7 @@ extern KeySymsRec jisKeySyms, asciiKeySy
 
 /* x68kText.c */
 Bool x68kTextOpen(X68kScreenRec *);
-Bool x68kTextInit(int, ScreenPtr, int, char *[]);
+Bool x68kTextInit(ScreenPtr, int, char *[]);
 void x68kTextClose(X68kScreenRec *);
 
 /* EOF x68k.h */
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.1	Sat Mar  1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Tue Aug 30 07:50:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.1 2014/03/01 19:34:47 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.2 2016/08/30 07:50:55 mrg Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -53,12 +53,12 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 
 /* open frame buffer */
 if ( ( pPriv->fd = open(device, O_RDWR, 0)) < 0) {
-Error( "Can't open frame buffer" );
+ErrorF( "Can't open frame buffer" );
 return FALSE;
 }
 /* get frame buffer infomation */
 if ( ioctl( pPriv->fd, GRFIOCGINFO, &gi ) == -1 ) {
-Error( "Can't get grfinfo" );
+ErrorF( "Can't get grfinfo" );
 return FALSE;
 }
 pPriv->mapsize = gi.gd_regsize + gi.gd_fbsize;
@@ -67,7 +67,7 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 pPriv->reg = (FbReg *)mmap(0, pPriv->mapsize, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pPriv->fd, 0 );
 if ( pPriv->reg == (FbReg *)-1) {
-Error( "Can't map frame buffer" );
+ErrorF( "Can't map frame buffer" );
 return FALSE;
 }
 pPriv->fb = (uint8_t *)((uint32_t)pPriv->reg + gi.gd_regsize);
@@ -104,7 +104,7 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 
 /* unmap and close frame buffer */
 if ( munmap(__UNVOLATILE(pPriv->reg), pPriv->mapsize) == -1 )
-Error("Can't unmap frame buffer");
+ErrorF("Can't unmap frame buffer");
 close(pPriv->fd);
 }
 
Index: xsrc/external/mit/xorg-server/dist/h

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2016-08-26 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Sat Aug 27 03:52:00 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
use PCI_MAGIC_IO_RANGE instead of hardcoding the wrong ( for shark ) offset
now things actually have a chance of working


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.8	Thu Aug 11 00:04:31 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Sat Aug 27 03:52:00 2016
@@ -27,6 +27,7 @@
 #include 
 #endif
 
+#include 
 #include 
 #include 
 #include "xf86.h"
@@ -71,10 +72,10 @@ xf86EnableIO()
 xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
 if (ioBase == MAP_FAILED) {
 ioBase = mmap(NULL, 0x1, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-  0xf200);
+  PCI_MAGIC_IO_RANGE);
 xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
 if (ioBase == MAP_FAILED) {
-xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
+xf86MsgVerb(X_WARNING, 3, "Can't map IO space! (%d)\n", errno);
 return FALSE;
 }
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

2016-08-20 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Sat Aug 20 21:15:07 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
xf86sbusBus.c xf86sbusBus.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus: Sbus.c
netbsdSbus.c

Log Message:
fix build issues for sparc64.  mostly constification.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.9 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.9	Sun Aug 14 01:02:22 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Sat Aug 20 21:15:06 2016
@@ -303,7 +303,7 @@ listPossibleVideoDrivers(char *matches[]
 #ifdef __sparc__
 if (i < (nmatches - 1))
 {
-char *sbusDriver = sparcDriverName();
+const char *sbusDriver = sparcDriverName();
 
 if (sbusDriver)
 matches[i++] = xnfstrdup(sbusDriver);

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.6	Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c	Sat Aug 20 21:15:06 2016
@@ -76,7 +76,6 @@ CheckSbusDevice(const char *device, int 
 psdp->device = xnfstrdup(device);
 psdp->width = fbattr.fbtype.fb_width;
 psdp->height = fbattr.fbtype.fb_height;
-psdp->size = fbattr.fbtype.fb_size;
 psdp->fd = -1;
 }
 
@@ -727,7 +726,7 @@ xf86SbusHandleColormaps(ScreenPtr pScree
 if (pScreen->whitePixel == 0) {
 data[0] = 255;
 data[1] = 0;
-else {
+} else {
 data[0] = 0;
 data[1] = 255;
 }

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.8
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.7	Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h	Sat Aug 20 21:15:06 2016
@@ -52,7 +52,7 @@ typedef struct sbus_device {
 int devId;
 int fbNum;
 int fd;
-int width, height; // XXXMRG also had size
+int width, height;
 sbusPromNode node;
 const char *descr;
 const char *device;
@@ -104,7 +104,7 @@ extern _X_EXPORT int sparcPromGetBool(sb
 extern _X_EXPORT void sparcPromAssignNodes(void);
 extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
 extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
-extern _X_EXPORT char *sparcDriverName(void);
+extern _X_EXPORT const char *sparcDriverName(void);
 
 extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
 extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.1.1.4	Wed Aug 10 07:44:35 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c	Sat Aug 20 21:15:07 2016
@@ -245,7 +245,7 @@ sparcPromGetBool(sbusPromNodePtr pnode, 
 return promGetBool(prop);
 }
 
-static char *
+static const char *
 promWalkGetDriverName(int node, int oldnode)
 {
 int nextnode;
@@ -275,7 +275,7 @@ promWalkGetDriverName(int node, int oldn
 
 nextnode = promGetChild(node);
 if (nextnode) {
-char *name;
+const char *name;
 
 name = promWalkGetDriverName(nextnode, node);
 if (name)
@@ -288,10 +288,10 @@ promWalkGetDriverName(int node, int oldn
 return NULL;
 }
 
-char *
+const char *
 sparcDriverName(void)
 {
-char *name;
+const char *name;
 
 if (sparcPromInit() < 0)
 return NULL;

Index: xsrc/external/mit/xorg-server/dist/hw/xfree8

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

2016-08-18 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Thu Aug 18 18:52:03 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xf86Configure.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
arm_video.c

Log Message:
check for __arm__ as well as __arm32__.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/arm_video.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/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.13 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.14
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.13	Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Thu Aug 18 18:52:02 2016
@@ -97,7 +97,7 @@
 
 #if defined(DO_PROTOTYPES)
 #if !defined(__arm__)
-#if !defined(__sparc__) && !defined(__arm32__) && !defined(__nds32__) \
+#if !defined(__sparc__) && !defined(__arm__) && !defined(__arm32__) && !defined(__nds32__) \
   && !(defined(__alpha__) && defined(linux)) \
   && !(defined(__ia64__) && defined(linux)) \
   && !(defined(__mips64) && defined(linux)) \
@@ -109,7 +109,7 @@ extern _X_EXPORT unsigned int inb(unsign
 extern _X_EXPORT unsigned int inw(unsigned short);
 extern _X_EXPORT unsigned int inl(unsigned short);
 
-#else   /* __sparc__,  __arm32__, __alpha__, __nds32__ */
+#else   /* __sparc__,  __arm__, __arm32__, __alpha__, __nds32__ */
 extern _X_EXPORT void outb(unsigned long, unsigned char);
 extern _X_EXPORT void outw(unsigned long, unsigned short);
 extern _X_EXPORT void outl(unsigned long, unsigned int);
@@ -518,8 +518,8 @@ xf86WriteMmio32Le(__volatile__ void *bas
 barrier();
 }
 
-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-#if defined(__arm32__) || defined(__mips64)
+#elif defined(__mips__) || ((defined(__arm__) || defined(__arm32__)) && !defined(__linux__))
+#if defined(__arm__) || defined(__arm32__) || defined(__mips64)
 #define PORT_SIZE long
 #else
 #define PORT_SIZE short

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.8	Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c	Thu Aug 18 18:52:02 2016
@@ -99,7 +99,7 @@ xf86AddBusDeviceToConfigure(const char *
 ret = xf86SbusConfigure(busData, DevToConfig[i].sVideo);
 break;
 #endif
-#if defined(__arm32__)
+#if defined(__arm32__) || defined(__arm__)
 case BUS_ISA:
 break;
 #endif
@@ -141,7 +141,7 @@ xf86AddBusDeviceToConfigure(const char *
 &DevToConfig[i].GDev);
 break;
 #endif
-#if defined(__arm32__)
+#if defined(__arm32__) || defined(__arm__)
 case BUS_ISA:
 	DevToConfig[i].GDev.busID = xnfalloc(6);
 	strcpy(DevToConfig[i].GDev.busID, "ISA");

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/arm_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/arm_video.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/arm_video.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/arm_video.c:1.6	Thu Aug 11 00:04:31 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/arm_video.c	Thu Aug 18 18:52:02 2016
@@ -160,7 +160,7 @@ xf86DisableIO()
 
 #endif
 
-#if defined(USE_ARC_MMAP) || defined(__arm32__)
+#if defined(USE_ARC_MMAP) || defined(__arm__) || defined(__arm32__)
 
 Bool
 xf86EnableIO()

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

2016-08-13 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Sun Aug 14 01:02:22 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_VTsw.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw: vgaHW.h

Log Message:
fix merge botches.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h

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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.8	Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Sun Aug 14 01:02:22 2016
@@ -339,6 +339,7 @@ listPossibleVideoDrivers(char *matches[]
 #elif defined(__NetBSD__)
 	matches[i++] = xnfstrdup("wsfb");
 #endif
+}
 }
 
 /* copy a screen section and enter the desired driver

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.4	Thu Aug 11 00:04:31 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c	Sun Aug 14 01:02:22 2016
@@ -66,6 +66,7 @@ xf86VTSwitchPending()
 Bool
 xf86VTSwitchAway()
 {
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
 if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
 #ifdef WSCONS_SUPPORT
 	ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.3	Thu Aug 11 00:04:32 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h	Sun Aug 14 01:02:22 2016
@@ -176,6 +176,7 @@ typedef struct _vgaHWRec {
 	(hw)->readST01((hw)); \
 	(hw)->readST01((hw)); \
 	} while (0)
+#endif
 
 /* Function Prototypes */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2016-02-10 Thread Taylor R Campbell

Module Name:xsrc
Committed By:   riastradh
Date:   Thu Feb 11 04:42:15 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86pciBus.c

Log Message:
Try xf86-video-nouveau for nvidia devices by default.

Fall back to nv (and then vesa and then wsfb) if it doesn't work.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.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/xfree86/common/xf86pciBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.1.1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.1.1.5	Tue Aug  2 06:56:54 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c	Thu Feb 11 04:42:15 2016
@@ -1123,7 +1123,11 @@ videoPtrToDriverList(struct pci_device *
 	break;
 	case 0x102b:		driverList[0] = "mga";	break;
 	case 0x10c8:		driverList[0] = "neomagic"; break;
-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
+	case 0x10de:
+	case 0x12d2:
+	driverList[0] = "nouveau";
+	driverList[1] = "nv";
+	break;
 	case 0x1106:		driverList[0] = "openchrome"; break;
 case 0x1b36:		driverList[0] = "qxl"; break;
 	case 0x1163:		driverList[0] = "rendition"; break;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2

2015-12-11 Thread Thomas Klausner

Module Name:xsrc
Committed By:   wiz
Date:   Fri Dec 11 15:33:47 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2: dri2.c

Log Message:
Fix some uninitialized variable warnings with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2.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/xfree86/dri2/dri2.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2.c:1.1.1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2.c:1.1.1.7	Mon Jun  3 07:34:24 2013
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2.c	Fri Dec 11 15:33:47 2015
@@ -201,7 +201,7 @@ typedef struct DRI2DrawableRefRec {
 static DRI2DrawableRefPtr
 DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
 {
-DRI2DrawableRefPtr ref;
+DRI2DrawableRefPtr ref = NULL;
 
 list_for_each_entry(ref, &pPriv->reference_list, link) {
 	if (ref->id == id)
@@ -267,7 +267,7 @@ static int DRI2DrawableGone(pointer p, X
 {
 DRI2DrawablePtr pPriv = p;
 DRI2ScreenPtr   ds = pPriv->dri2_screen;
-DRI2DrawableRefPtr ref, next;
+DRI2DrawableRefPtr ref = NULL, next;
 WindowPtr pWin;
 PixmapPtr pPixmap;
 DrawablePtr pDraw;
@@ -534,7 +534,7 @@ static void
 DRI2InvalidateDrawable(DrawablePtr pDraw)
 {
 DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
-DRI2DrawableRefPtr ref;
+DRI2DrawableRefPtr ref = NULL;
 
 if (!pPriv)
 return;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2015-02-28 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar  1 07:40:53 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_init.c

Log Message:
remove \n\n that confuses the Xorg log file.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.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/xfree86/os-support/bsd/bsd_init.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.6	Tue Aug  2 07:15:04 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c	Sun Mar  1 07:40:53 2015
@@ -482,7 +482,7 @@ xf86OpenSyscons()
 	{
 		xf86ErrorF(" (version 0.x)\n");
 	}
-	xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
+	xf86Msg(from, "using VT number %d\n", xf86Info.vtno);
 	}
 	else
 	{
@@ -601,7 +601,7 @@ xf86OpenPcvt()
 	xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
 		pcvt_version.rmajor, pcvt_version.rminor);
 #endif
-	xf86Msg(X_PROBED, "using VT number %d\n\n", xf86Info.vtno);
+	xf86Msg(X_PROBED, "using VT number %d\n", xf86Info.vtno);
 	}
 	else
 	{

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus

2015-02-26 Thread Soren Jacobsen

Module Name:xsrc
Committed By:   snj
Date:   Thu Feb 26 21:30:00 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus: Pci.h

Log Message:
we've been happily using bsdPciInit since xorg was first imported.
remove local changes that were only relevant in the xfree86 days.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Pci.h

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/xfree86/os-support/bus/Pci.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Pci.h:1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Pci.h:1.8
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Pci.h:1.7	Tue Aug  2 07:15:04 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Pci.h	Thu Feb 26 21:30:00 2015
@@ -148,14 +148,8 @@
 #endif /* defined(linux) */
 
 #ifndef ARCH_PCI_INIT
-#if defined(__NetBSD__)
-#  define ARCH_PCI_INIT netbsdPciInit
-#  define INCLUDE_XF86_MAP_PCI_MEM
-#  define INCLUDE_XF86_NO_DOMAIN
-#else
 #error No PCI support available for this architecture/OS combination
 #endif
-#endif
 
 extern void ARCH_PCI_INIT(void);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2015-02-26 Thread Soren Jacobsen

Module Name:xsrc
Committed By:   snj
Date:   Thu Feb 26 21:16:16 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c

Log Message:
don't look for _drv.o files.  we haven't built any since the bad old days
when all the world was xfree86.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.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/xfree86/common/xf86Config.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.11 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.11	Sun Jan 25 21:45:44 2015
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c	Thu Feb 26 21:16:16 2015
@@ -528,7 +528,7 @@ GenerateDriverlist(char * dirname)
 {
 char **ret;
 const char *subdirs[] = { dirname, NULL };
-static const char *patlist[] = {"(.*)_drv\\.so$", "(.*)_drv\\.o$", NULL};
+static const char *patlist[] = {"(.*)_drv\\.so$", NULL};
 ret = LoaderListDirs(subdirs, patlist);
 
 /* fix up the probe order for video drivers */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2015-02-09 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon Feb  9 17:44:22 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
remove superfluous casts.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

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/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.11 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.12
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.11	Wed Jan 15 19:45:03 2014
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Mon Feb  9 12:44:22 2015
@@ -950,42 +950,42 @@ static __inline__ void
 outb(unsigned short port, unsigned char value)
 {
 if(ioBase == MAP_FAILED) return;
-xf86WriteMmio8((void *)ioBase, port, value);
+xf86WriteMmio8(ioBase, port, value);
 }
 
 static __inline__ void
 outw(unsigned short port, unsigned short value)
 {
 if(ioBase == MAP_FAILED) return;
-xf86WriteMmio16Le((void *)ioBase, port, value);
+xf86WriteMmio16Le(ioBase, port, value);
 }
 
 static __inline__ void
 outl(unsigned short port, unsigned int value)
 {
 if(ioBase == MAP_FAILED) return;
-xf86WriteMmio32Le((void *)ioBase, port, value);
+xf86WriteMmio32Le(ioBase, port, value);
 }
 
 static __inline__ unsigned int
 inb(unsigned short port)
 {
 if(ioBase == MAP_FAILED) return 0;
-return xf86ReadMmio8((void *)ioBase, port);
+return xf86ReadMmio8(ioBase, port);
 }
 
 static __inline__ unsigned int
 inw(unsigned short port)
 {
 if(ioBase == MAP_FAILED) return 0;
-return xf86ReadMmio16Le((void *)ioBase, port);
+return xf86ReadMmio16Le(ioBase, port);
 }
 
 static __inline__ unsigned int
 inl(unsigned short port)
 {
 if(ioBase == MAP_FAILED) return 0;
-return xf86ReadMmio32Le((void *)ioBase, port);
+return xf86ReadMmio32Le(ioBase, port);
 }
 
 #elif defined(__arm__) && defined(__linux__)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2014-08-20 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Wed Aug 20 14:24:50 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
more clang appeasement


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.6	Sun Aug 10 19:21:06 2014
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Wed Aug 20 14:24:50 2014
@@ -157,9 +157,10 @@ Bool xf86EnableIO()
 xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
 if (ioBase == MAP_FAILED)
 {
-ioBase=mmap(NULL, 0x1, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
+ioBase = mmap(NULL, 0x1, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
 PCI_MAGIC_IO_RANGE);
-xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
+xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08lx\n",
+(unsigned long)ioBase);
 if (ioBase == MAP_FAILED) {
 xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
 			return FALSE;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2014-08-10 Thread Joerg Sonnenberger

Module Name:xsrc
Committed By:   joerg
Date:   Sun Aug 10 19:21:07 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
Fix format string.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.5	Tue Nov 23 06:38:09 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Sun Aug 10 19:21:06 2014
@@ -87,7 +87,7 @@ ppcMapVidMem(int ScreenNum, unsigned lon
 		MAP_SHARED, fd, Base);
 	if (base == MAP_FAILED)
 		xf86Msg(X_WARNING, 
-		"%s: could not mmap screen [s=%x,a=%x] (%s)",
+		"%s: could not mmap screen [s=%lx,a=%lx] (%s)",
 		"xf86MapVidMem", Size, Base, strerror(errno));
 
 	return base;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2014-08-06 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Thu Aug  7 02:34:28 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
for i386 and amd64, append vesa to the end of the possible video driver
list. makes "startx" without a config file work on systems where there is
a known native driver, but it is not installed (like "vboxvideo").


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.6	Tue Aug  2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Thu Aug  7 02:34:28 2014
@@ -309,12 +309,10 @@ listPossibleVideoDrivers(char *matches[]
  * Fallback to platform default frame buffer driver  if we didn't probe
  * anything useful
  */
-if (i == 0) {
+if (i < (nmatches - 1)) {
 #ifdef __NetBSD__
 #if defined(__i386__) || defined(__amd64__)
 	matches[i++] = xnfstrdup("vesa");
-#else
-	matches[i++] = xnfstrdup("wsfb");
 #endif
 #else /* !NetBSD */	
 #if !defined(__linux__) && defined(__sparc__)
@@ -329,6 +327,15 @@ listPossibleVideoDrivers(char *matches[]
 #endif
 #endif /* NetBSD */
 }
+
+#ifdef __NetBSD__
+/*
+ * If we haven't found any suitable drivers, try to use wsfb.
+ */
+if (i == 0) {
+	matches[i++] = xnfstrdup("wsfb");
+}
+#endif
 }
 
 /* copy a screen section and enter the desired driver

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus

2014-06-18 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Wed Jun 18 16:49:46 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus:
netbsdSbus.c

Log Message:
OFIOCNEXTPROP -> OFIOCGET
now this can actually work


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.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/xfree86/os-support/bus/netbsdSbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.3	Wed Apr 13 05:14:00 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c	Wed Jun 18 16:49:46 2014
@@ -117,7 +117,7 @@ promGetProperty(const char *prop, int *l
 ofio.of_buf = of_buf;
 ofio.of_buflen = sizeof(of_buf);
 
-if (ioctl(promFd, OFIOCNEXTPROP, &ofio) < 0)
+if (ioctl(promFd, OFIOCGET, &ofio) < 0)
 	return 0;
 
 of_buf[ofio.of_buflen] = '\0';
@@ -137,10 +137,9 @@ promGetBool(const char *prop)
 ofio.of_buf = of_buf;
 ofio.of_buflen = sizeof(of_buf);
 
-if (ioctl(promFd, OFIOCNEXTPROP, &ofio) < 0)
+if (ioctl(promFd, OFIOCGET, &ofio) < 0)
 	return 0;
-
-if (!ofio.of_buflen)
+if (ofio.of_buflen < 0)
 	return 0;
 
 return 1;
@@ -160,12 +159,15 @@ promSetNode(sbusPromNodePtr pnode)
 
 if (!pnode->node || pnode->node == -1)
 	return -1;
+
 if (pnode->cookie[0] & PROM_NODE_SIBLING)
 	node = promGetSibling(pnode->cookie[1]);
 else
 	node = promGetChild(pnode->cookie[1]);
+
 if (pnode->node != node)
 	return -1;
+
 return 0;
 }
 
@@ -197,14 +199,17 @@ sparcPromInit(void)
 	promOpenCount++;
 	return 0;
 }
+
 promFd = open("/dev/openprom", O_RDONLY, 0);
 if (promFd == -1)
 	return -1;
+
 promRootNode = promGetSibling(0);
 if (!promRootNode) {
 	sparcPromClose();
 	return -1;
 }
+
 promIsP1275();
 promOpenCount++;
 
@@ -214,17 +219,19 @@ sparcPromInit(void)
 char *
 sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp)
 {
-if (promSetNode(pnode))
+ if (promSetNode(pnode))
 	return NULL;
-return promGetProperty(prop, lenp);
+
+ return promGetProperty(prop, lenp);
 }
 
 int
 sparcPromGetBool(sbusPromNodePtr pnode, const char *prop)
 {
-if (promSetNode(pnode))
+ if (promSetNode(pnode))
 	return 0;
-return promGetBool(prop);
+
+ return promGetBool(prop);
 }
 
 static void
@@ -242,14 +249,18 @@ promWalkAssignNodes(int node, int oldnod
 	prop = promGetProperty("name", &len);
 	if (!prop || len <= 0)
 		break;
+
 	while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
 		prop++;
+
 	for (i = 0; sbusDeviceTable[i].devId; i++)
 		if (!strcmp(prop, sbusDeviceTable[i].promName))
 		break;
+
 	devId = sbusDeviceTable[i].devId;
-	if (!devId)
+	if(!devId)
 		break;
+
 	if (!sbus) {
 		if (devId == SBUS_DEVICE_FFB) {
 		/*
@@ -261,13 +272,16 @@ promWalkAssignNodes(int node, int oldnod
 		} else if (devId != SBUS_DEVICE_CG14)
 		break;
 	}
+
 	for (i = 0; i < 32; i++) {
 		if (!devicePtrs[i] || devicePtrs[i]->devId != devId)
 		continue;
+
 		if (devicePtrs[i]->node.node) {
 		if ((devicePtrs[i]->node.cookie[0] & ~PROM_NODE_SIBLING) <=
 			(flags & ~PROM_NODE_SIBLING))
 			continue;
+
 		for (j = i + 1, pNode = devicePtrs[i]->node; j < 32; j++) {
 			if (!devicePtrs[j] || devicePtrs[j]->devId != devId)
 			continue;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2014-03-04 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Mar  4 12:11:59 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c
x68kGraph.c

Log Message:
Replace xalloc(), xrealloc() and xfree() with malloc(), realloc() and free().

Per following Xorg changes:
> Replace X-allocation functions with their C89 counterparts
http://cgit.freedesktop.org/xorg/xserver/commit/?id=3f3ff971ecff9936cebafc813af9193b97bba89c


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.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/x68kConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.2	Sun Mar  2 05:52:45 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c	Tue Mar  4 12:11:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.2 2014/03/02 05:52:45 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.3 2014/03/04 12:11:59 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -181,7 +181,7 @@ getToken(void)
 static int line = 1;
 Token *ret;
 
-ret = (Token *)xalloc(sizeof(Token));
+ret = (Token *)malloc(sizeof(Token));
 if (ret == NULL)
 FatalError("Out of memory");
 while (TRUE) {
@@ -207,7 +207,7 @@ getToken(void)
 /* is a symbol? */
 if (isalpha(c)) {
 int i = 0;
-ret->content.symbol = (char *)xalloc(32 * sizeof(char));
+ret->content.symbol = (char *)malloc(32 * sizeof(char));
 if (ret->content.symbol == NULL)
 FatalError("Out of memory");
 do {
@@ -288,7 +288,7 @@ parseCommand(void)
 return FALSE;
 if (token->type != TOKEN_OPEN_PARENTHESIS)
 parseError(token->line, "missing parenthesis");
-xfree(token);
+free(token);
 
 /* get command name and arguments */
 while (TRUE) {
@@ -296,11 +296,11 @@ parseCommand(void)
 if (token->type == TOKEN_EOF)
 parseError(token->line, "reached EOF");
 if (token->type == TOKEN_CLOSE_PARENTHESIS) {
-xfree(token);
+free(token);
 break;
 }
 argc++;
-argv = (Token **)xrealloc(argv, sizeof(Token *) * argc);
+argv = (Token **)realloc(argv, sizeof(Token *) * argc);
 if (argv == NULL)
 FatalError("Out of memory");
 argv[argc-1] = token;
@@ -325,10 +325,10 @@ parseCommand(void)
 /* free arguments */
 for (i = 0; i < argc; i++) {
 if (argv[i]->type == TOKEN_SYMBOL)
-xfree(argv[i]->content.symbol);
-xfree(argv[i]);
+free(argv[i]->content.symbol);
+free(argv[i]);
 }
-xfree(argv);
+free(argv);
 return TRUE;
 }
 
@@ -400,7 +400,7 @@ parseModeDef(int argc, Token **argv)
 
 checkArguments(18, argtype, argc-1, argv);
 
-mode = (Mode *)xalloc(sizeof(Mode));
+mode = (Mode *)malloc(sizeof(Mode));
 if (mode == NULL)
 FatalError("Out of memory");
 mode->name = strdup(argv[1]->content.symbol);
@@ -550,7 +550,7 @@ parseMode(int argc, Token **argv)
 x68kFbProc[0].open = x68kGraphOpen;
 x68kFbProc[0].init = x68kGraphInit;
 x68kFbProc[0].close = x68kGraphClose;
-	x68kFormat = (PixmapFormatRec*) xalloc (sizeof(PixmapFormatRec));
+	x68kFormat = (PixmapFormatRec*) malloc (sizeof(PixmapFormatRec));
 	x68kFormat->scanlinePad = BITMAP_SCANLINE_PAD;
 x68kFormat->bitsPerPixel = 16;
 switch (mode->depth) {

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.1	Sat Mar  1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Tue Mar  4 12:11:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.1 2014/03/01 19:34:47 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.2 2014/03/04 12:11:59 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -270,13 +270,13 @@ x68kCfbFinishScreenInit(
 
 ndepths = 1;
 nvisuals = 1;
-depths = (DepthPtr)xalloc( sizeof(DepthRec) );
-visuals = (VisualPtr)xalloc( sizeof(VisualRec) );
-vid = (VisualID *)xalloc( sizeof(VisualID) );
+d

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2014-03-01 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Mar  2 05:52:45 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c

Log Message:
Fix comment to sync with code.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.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/x68kConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.1	Sat Mar  1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c	Sun Mar  2 05:52:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.1 2014/03/01 19:34:47 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.2 2014/03/02 05:52:45 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -109,7 +109,7 @@ x68kRegisterPixmapFormats(ScreenInfo *pS
  * function "x68kConfig"
  *
  *  purpose:  process general configuration by reading "X68kConfig" file
- */usr/X11R6/lib/X11/ is the default location of this file
+ * is the default location of this file
  *  argument: nothing
  *  returns:  the number of screens
  *---*/

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2014-01-15 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Thu Jan 16 00:45:03 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
Lint does not know about pragmas


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

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/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.10 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.11
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.10	Wed Jan 15 15:27:32 2014
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Wed Jan 15 19:45:03 2014
@@ -1529,7 +1529,7 @@ inl(unsigned short port)
 #  include 
 # endif
 #if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \
-	defined(__USLC__)
+	defined(__USLC__) && !defined(__lint__)
 # pragma asm partial_optimization outl
 # pragma asm partial_optimization outw
 # pragma asm partial_optimization outb

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2014-01-15 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Wed Jan 15 20:27:32 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
fix for lint


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

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/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.9 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.10
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.9	Wed May 16 05:01:37 2012
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Wed Jan 15 15:27:32 2014
@@ -1525,7 +1525,7 @@ inl(unsigned short port)
 #  define asm __asm
 # endif
 #endif
-# if !defined(__SUNPRO_C)
+# if !defined(__SUNPRO_C) && !defined(__lint__)
 #  include 
 # endif
 #if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xnest

2013-07-11 Thread Thomas Klausner

Module Name:xsrc
Committed By:   wiz
Date:   Fri Jul 12 06:21:40 UTC 2013

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xnest: Args.h

Log Message:
Fix typo in header guard.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xnest/Args.h

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/xnest/Args.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xnest/Args.h:1.1.1.1 xsrc/external/mit/xorg-server/dist/hw/xnest/Args.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xnest/Args.h:1.1.1.1	Thu Jul 31 19:50:32 2008
+++ xsrc/external/mit/xorg-server/dist/hw/xnest/Args.h	Fri Jul 12 06:21:39 2013
@@ -12,7 +12,7 @@ is" without express or implied warranty.
 
 */
 
-#ifndef XNESTARGC_H
+#ifndef XNESTARGS_H
 #define XNESTARGS_H
 
 extern char *xnestDisplayName;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2013-06-18 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Wed Jun 19 00:54:08 UTC 2013

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86sbusBus.c
xf86sbusBus.h

Log Message:
add a field to struct sbus_device which records the framebuffer size reported
by ioctl(FBIOGATTR) so drivers can use it


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h

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/xfree86/common/xf86sbusBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.4	Wed Jun 27 20:00:29 2012
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c	Wed Jun 19 00:54:08 2013
@@ -75,6 +75,7 @@ CheckSbusDevice(const char *device, int 
 psdp->device = xnfstrdup(device);
 psdp->width = fbattr.fbtype.fb_width;
 psdp->height = fbattr.fbtype.fb_height;
+psdp->size = fbattr.fbtype.fb_size;
 psdp->fd = -1;
 }
 

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.5	Tue Aug  2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h	Wed Jun 19 00:54:08 2013
@@ -52,7 +52,7 @@ typedef struct sbus_device {
 int			devId;
 int			fbNum;
 int			fd;
-int			width, height;
+int			width, height, size;
 sbusPromNode	node;
 char		*descr;
 char		*device;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2013-02-19 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Wed Feb 20 04:00:48 UTC 2013

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_VTsw.c

Log Message:
remove debug spam


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.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/xfree86/os-support/bsd/bsd_VTsw.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.2	Wed Feb 20 03:57:37 2013
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c	Wed Feb 20 04:00:47 2013
@@ -69,7 +69,6 @@ xf86VTSwitchAway()
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
 	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
 #ifdef WSCONS_SUPPORT
-		xf86Msg(X_ERROR, "KD_TEXT\n");
 		ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
 #endif
 		xf86Info.vtRequestsPending = FALSE;
@@ -88,7 +87,6 @@ xf86VTSwitchTo()
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
 	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
 #ifdef WSCONS_SUPPORT
-		xf86Msg(X_ERROR, "KD_GRAPHICS\n");
 		ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS);
 #endif
 		xf86Info.vtRequestsPending = FALSE;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2013-02-19 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Wed Feb 20 03:57:37 UTC 2013

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_VTsw.c

Log Message:
do ioctl(KDSETMODE) when switching in and out of the Xserver's VT
now this works on top of radeonfb


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.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/xfree86/os-support/bsd/bsd_VTsw.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.1.1.2	Tue Nov 23 05:21:42 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c	Wed Feb 20 03:57:37 2013
@@ -68,6 +68,10 @@ xf86VTSwitchAway()
 {
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
 	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
+#ifdef WSCONS_SUPPORT
+		xf86Msg(X_ERROR, "KD_TEXT\n");
+		ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
+#endif
 		xf86Info.vtRequestsPending = FALSE;
 		if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
 			return FALSE;
@@ -83,6 +87,10 @@ xf86VTSwitchTo()
 {
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
 	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
+#ifdef WSCONS_SUPPORT
+		xf86Msg(X_ERROR, "KD_GRAPHICS\n");
+		ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS);
+#endif
 		xf86Info.vtRequestsPending = FALSE;
 		if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
 			return FALSE;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa

2012-11-02 Thread Alan Barrett

Module Name:xsrc
Committed By:   apb
Date:   Fri Nov  2 07:33:47 UTC 2012

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa: xaaPCache.c

Log Message:
Add parentheses in code that attempts to convert 3 bytes to a 24-bit value.
"+" has higher precedence than "<<", so the old code would have given
incorrect results.  Found using clang -Wshift-op-parentheses.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaPCache.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/xfree86/xaa/xaaPCache.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaPCache.c:1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaPCache.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaPCache.c:1.2	Tue Nov 30 11:09:01 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaPCache.c	Fri Nov  2 07:33:47 2012
@@ -1198,10 +1198,10 @@ load_24bits(void *where)
 }
 
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
-return bytes[2] << 16 + bytes[1] << 8 + bytes[0];
+return (bytes[2] << 16) + (bytes[1] << 8) + bytes[0];
 #endif
 #if X_BYTE_ORDER == X_BIG_ENDIAN
-return bytes[0] << 16 + bytes[1] << 8 + bytes[2];
+return (bytes[0] << 16) + (bytes[1] << 8) + bytes[2];
 #endif
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2012-06-27 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Wed Jun 27 20:00:30 UTC 2012

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86sbusBus.c

Log Message:
when using dixSetPrivate() and friends it helps to initialize the key before
using it. Now colours on suncg6 look right again and we don't spin or crash
on exit anymore.
probably needs to be pulled into -6


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.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/xfree86/common/xf86sbusBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.3	Tue Aug  2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c	Wed Jun 27 20:00:29 2012
@@ -585,7 +585,7 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn
 pScrn->virtualY = psdp->height;
 }
 
-static DevPrivateKeyRec sbusPaletteKeyIndex;
+static DevPrivateKeyRec sbusPaletteKeyIndex = { .initialized = 0 };
 static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex;
 typedef struct _sbusCmap {
 sbusDevicePtr psdp;
@@ -603,7 +603,7 @@ static void
 xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
 			LOCO *colors, VisualPtr pVisual)
 {
-int i, index;
+int i, index, ret;
 sbusCmapPtr cmap;
 struct fbcmap fbcmap;
 unsigned char *data = malloc(numColors*3);
@@ -618,7 +618,10 @@ xf86SbusCmapLoadPalette(ScrnInfoPtr pScr
 for (i = 0; i < numColors; i++) {
 	index = indices[i];
 	if (fbcmap.count && index != fbcmap.index + fbcmap.count) {
-	ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+	ret = ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+	if (ret != 0)
+	xf86Msg(X_ERROR, "%s: ioctl(%d, FBIOPUTCMAP): %d %d\n",
+		  __func__, cmap->psdp->fd, ret, errno);
 	fbcmap.count = 0;
 	fbcmap.index = index;
 	}
@@ -626,7 +629,10 @@ xf86SbusCmapLoadPalette(ScrnInfoPtr pScr
 	fbcmap.green[fbcmap.count] = colors[index].green;
 	fbcmap.blue[fbcmap.count++] = colors[index].blue;
 }
-ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+ret = ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+if (ret != 0)
+xf86Msg(X_ERROR, "%s: ioctl(%d, FBIOPUTCMAP): %d %d\n", __func__,
+  cmap->psdp->fd, ret, errno);
 free(data);
 }
 
@@ -655,9 +661,13 @@ xf86SbusHandleColormaps(ScreenPtr pScree
 {
 sbusCmapPtr cmap;
 struct fbcmap fbcmap;
+int ret;
 unsigned char data[2];
 
 cmap = xnfcalloc(1, sizeof(sbusCmapRec));
+if (!dixPrivateKeyRegistered(sbusPaletteKey)) {
+dixRegisterPrivateKey(sbusPaletteKey, PRIVATE_SCREEN, 0);
+}
 dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap);
 cmap->psdp = psdp;
 fbcmap.index = 0;
@@ -665,7 +675,7 @@ xf86SbusHandleColormaps(ScreenPtr pScree
 fbcmap.red = cmap->origRed;
 fbcmap.green = cmap->origGreen;
 fbcmap.blue = cmap->origBlue;
-if (ioctl (psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)
+if ((ret = ioctl (psdp->fd, FBIOGETCMAP, &fbcmap)) >= 0)
 	cmap->origCmapValid = TRUE;
 fbcmap.index = 0;
 fbcmap.count = 2;
@@ -679,7 +689,10 @@ xf86SbusHandleColormaps(ScreenPtr pScree
 	data[0] = 0;
 	data[1] = 255;
 }
-ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);
+ret = ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);
+if (ret != 0) 
+xf86Msg(X_ERROR, "%s: ioctl(%d, FBIOPUTCMAP): %d %d\n", __func__,
+	  psdp->fd, ret, errno);
 cmap->CloseScreen = pScreen->CloseScreen;
 pScreen->CloseScreen = xf86SbusCmapCloseScreen;
 return xf86HandleColormaps(pScreen, 256, 8,

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2012-05-16 Thread David Brownlee

Module Name:xsrc
Committed By:   abs
Date:   Wed May 16 09:01:38 UTC 2012

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
Add vax to the list of non inb() users


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

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/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8	Tue Aug  2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Wed May 16 09:01:37 2012
@@ -1370,7 +1370,7 @@ static __inline__ void stl_u(unsigned lo
 #   else /* ix86 */
 
 #if !defined(__SUNPRO_C)
-#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) && !defined(__vax__)
 # ifdef GCCUSESGAS
 
 /*
@@ -1479,7 +1479,7 @@ inl(unsigned short port)
 
 # endif /* GCCUSESGAS */
 
-#else /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
+#else /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) && !defined(__vax__) */
 
 static __inline__ void
 outb(unsigned short port, unsigned char val)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

2011-10-22 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Sat Oct 22 15:00:41 UTC 2011

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/parser: Device.c
xf86Parser.h

Log Message:
if the video driver is "vmware" or "vmwlegacy" and no mouse section exists,
use the "vmmouse" input driver instead of "mouse" -- now xorg works properly
in vmware without a config file


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/Device.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/xf86Parser.h

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/xfree86/common/xf86Config.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.8	Sun Oct  9 11:14:43 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c	Sat Oct 22 15:00:40 2011
@@ -1207,6 +1207,14 @@ checkCoreInputDevices(serverLayoutPtr se
 if (!foundPointer && xf86Info.forceInputDevices) {
 	memset(&defPtr, 0, sizeof(defPtr));
 	defPtr.inp_identifier = strdup("");
+#if defined(__NetBSD__) && (defined(__i386__) || defined(__amd64__))
+	if (xf86findDeviceByDriver("vmware", xf86configptr->conf_device_lst) ||
+	xf86findDeviceByDriver("vmwlegacy", xf86configptr->conf_device_lst)) {
+		defPtr.inp_driver = strdup("vmmouse");
+		defPtr.inp_option_lst = xf86addNewOption(defPtr.inp_option_lst, strdup("Protocol"), "wsmouse");
+		defPtr.inp_option_lst = xf86addNewOption(defPtr.inp_option_lst, strdup("Device"), "/dev/wsmouse");
+	} else
+#endif
 	defPtr.inp_driver = strdup("mouse");
 	confInput = &defPtr;
 	foundPointer = TRUE;

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/Device.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/Device.c:1.1.1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/Device.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/Device.c:1.1.1.3	Tue Nov 23 05:21:44 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/Device.c	Sat Oct 22 15:00:40 2011
@@ -369,3 +369,16 @@ xf86findDevice (const char *ident, XF86C
 	}
 	return NULL;
 }
+
+XF86ConfDevicePtr
+xf86findDeviceByDriver (const char *driver, XF86ConfDevicePtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (driver, p->dev_driver) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/xf86Parser.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/xf86Parser.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/xf86Parser.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/xf86Parser.h:1.1.1.4	Tue Aug  2 06:56:57 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/parser/xf86Parser.h	Sat Oct 22 15:00:40 2011
@@ -496,6 +496,7 @@ extern void xf86closeConfigFile(void);
 extern void xf86freeConfig(XF86ConfigPtr p);
 extern int xf86writeConfigFile(const char *, XF86ConfigPtr);
 extern _X_EXPORT XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p);
+extern _X_EXPORT XF86ConfDevicePtr xf86findDeviceByDriver(const char *driver, XF86ConfDevicePtr p);
 extern _X_EXPORT XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list);
 extern _X_EXPORT XF86ConfMonitorPtr xf86findMonitor(const char *ident, XF86ConfMonitorPtr p);
 extern _X_EXPORT XF86ConfModesPtr xf86findModes(const char *ident, XF86ConfModesPtr p);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2011-10-09 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Sun Oct  9 15:11:35 UTC 2011

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Helper.c

Log Message:
xsrc/45442: X -configure doesn't detect S3 Trio32/64

Backout the following commit from upstream:
http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Helper.c?id=0ceac6f64f5ad9bc2ac4b19be2dd245ffba78b05

Despite what the log message says, xf86MatchDevice can be called at
configure time by drivers who still implement the legacy probing API (and
there are a lot of them!).


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.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/xfree86/common/xf86Helper.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.1.1.4	Tue Aug  2 06:56:54 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c	Sun Oct  9 15:11:35 2011
@@ -1400,6 +1400,16 @@ xf86MatchDevice(const char *drivername, 
 	*sectlist = NULL;
 
 /*
+ * 20111009 jmcneill: This line was removed with the following commit upstream:
+ *  http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Helper.c?id=0ceac6f64f5ad9bc2ac4b19be2dd245ffba78b05
+ *
+ * However, the log message is inaccurate: xf86MatchDevice will get called at
+ * configuration time by drivers who still implement the legacy probing
+ * API.
+ */
+if (xf86DoConfigure && xf86DoConfigurePass1) return 1;
+
+/*
  * This can happen when running Xorg -showopts and a module like ati
  * or vmware tries to load its submodules when xf86ConfigLayout is empty
  */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2011-10-09 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Sun Oct  9 14:48:05 UTC 2011

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Configure.c

Log Message:
When configuring a new PCI or SBus device, remember to stash the bus
specific information (in pVideo for PCI or sVideo for SBus), otherwise
more than one driver may try to attach to the device and 'X -configure'
will fail with "Number of created screens does not match number of
detected devices".


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.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/xfree86/common/xf86Configure.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.6	Tue Aug  2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c	Sun Oct  9 14:48:05 2011
@@ -121,11 +121,13 @@ xf86AddBusDeviceToConfigure(const char *
 case BUS_PCI:
 xf86PciConfigureNewDev(busData, DevToConfig[i].pVideo,
&DevToConfig[i].GDev, &chipset);
+DevToConfig[i].pVideo = busData;
 	break;
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
 case BUS_SBUS:
 xf86SbusConfigureNewDev(busData, DevToConfig[i].sVideo,
 &DevToConfig[i].GDev);
+DevToConfig[i].sVideo = busData;
 	break;
 #endif
 #if defined(__arm32__)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2011-10-09 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Sun Oct  9 11:14:43 UTC 2011

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c

Log Message:
re-apply patch from revision 1.2:

GenerateDriverlist: Change driver matching pattern to be the same as the
one used by the module loader.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.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/xfree86/common/xf86Config.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.7	Tue Aug  2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c	Sun Oct  9 11:14:43 2011
@@ -527,7 +527,7 @@ GenerateDriverlist(char * dirname)
 {
 char **ret;
 const char *subdirs[] = { dirname, NULL };
-static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
+static const char *patlist[] = {"(.*)_drv\\.so$", "(.*)_drv\\.o$", NULL};
 ret = LoaderListDirs(subdirs, patlist);
 
 /* fix up the probe order for video drivers */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/loader

2011-08-02 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug  2 09:36:17 UTC 2011

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/loader: loader.c

Log Message:
include dix-config.h since this depends up on symbols defined there


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.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/xfree86/loader/loader.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c:1.1.1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c:1.1.1.5	Tue Aug  2 06:56:56 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/loader.c	Tue Aug  2 09:36:17 2011
@@ -50,6 +50,10 @@
 #include 
 #endif
 
+/*#ifdef HAVE_DIX_CONFIG_H*/
+#include 
+/*#endif*/
+
 #include 
 #include 
 #include

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

2011-04-13 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Wed Apr 13 16:00:38 UTC 2011

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
- get platform #ifdefs in a slightly more sane order
- look for SBus and UPA devices on sparc(64)
- add default drivers for shark and sgimips
- only try wsfb if we can't find any other usable device
With this Xorg without config file works fine on shark, sparc(64) and amd64,
should work on other archs as well.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.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/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.4	Tue Nov 23 06:38:03 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Wed Apr 13 16:00:38 2011
@@ -49,6 +49,13 @@
 # include 
 #endif
 
+#ifdef __NetBSD__
+#if defined(__sparc__) || defined(__sparc64__)
+#include 
+extern struct sbus_devtable sbusDeviceTable[];
+#endif /* sparc / sparc64 */
+#endif /* NetBSD */
+
 /* Sections for the default built-in configuration. */
 
 #define BUILTIN_DEVICE_NAME \
@@ -198,6 +205,45 @@
 }
 i = 0;
 
+#ifdef __NetBSD__
+#if defined(__shark)
+matches[i++] = xnfstrdup("chips");
+matches[i++] = xnfstrdup("igs");
+#elif defined(__sgimips)
+matches[i++] = xnfstrdup("crime");
+matches[i++] = xnfstrdup("newport");
+#elif defined(__sparc) || defined(__sparc64)
+/* dig through /dev/fb* */
+{
+	struct fbtype fbt;
+	int j = 0, fd = 0, dev;
+	char fbpath[32];
+
+	for (j = 0; j < 10; j++) {
+	snprintf(fbpath, 31, "/dev/fb%d", j);
+	xf86Msg(X_ERROR,"%s: trying %s\n", __func__, fbpath);
+	fd = open(fbpath, O_RDONLY, 0);
+	if (fd == -1) continue;
+	memset(&fbt, 0, sizeof(fbt));
+	if (ioctl(fd, FBIOGTYPE, &fbt) == -1) {
+		close(fd);
+		continue;
+	}
+	close(fd);
+	dev = 0;
+	while ((sbusDeviceTable[dev].fbType != 0) &&
+	   (sbusDeviceTable[dev].fbType != fbt.fb_type))
+		dev++;
+	if (sbusDeviceTable[dev].fbType == fbt.fb_type) {
+		xf86Msg(X_ERROR,"%s: found %s\n", __func__,
+		sbusDeviceTable[dev].driverName);
+		matches[i++] = xnfstrdup(sbusDeviceTable[dev].driverName);
+	}
+	}
+}
+#endif
+
+#else /* !NetBSD */
 #ifdef sun
 /* Check for driver type based on /dev/fb type and if valid, use
it instead of PCI bus probe results */
@@ -255,25 +301,33 @@
 	matches[i++] = xnfstrdup(sbusDriver);
 }
 #endif
+#endif /* NetBSD */
 
 i = xf86PciMatchDriver(matches, nmatches);
 
-/* Fallback to platform default hardware */
-if (i < (nmatches - 1)) {
-#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+/*
+ * Fallback to platform default frame buffer driver  if we didn't probe
+ * anything useful
+ */
+if (i == 0) {
+#ifdef __NetBSD__
+#if defined(__i386__) || defined(__amd64__)
 	matches[i++] = xnfstrdup("vesa");
-#elif defined(__sparc__) && !defined(sun)
-	matches[i++] = xnfstrdup("sunffb");
+#else
+	matches[i++] = xnfstrdup("wsfb");
 #endif
-}
-
-/* Fallback to platform default frame buffer driver */
-if (i < (nmatches - 1)) {
+#else /* !NetBSD */	
 #if !defined(__linux__) && defined(__sparc__)
 	matches[i++] = xnfstrdup("wsfb");
 #else
 	matches[i++] = xnfstrdup("fbdev");
 #endif
+#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+	matches[i++] = xnfstrdup("vesa");
+#elif defined(__sparc__) && !defined(sun)
+	matches[i++] = xnfstrdup("sunffb");
+#endif
+#endif /* NetBSD */
 }
 }

1 2 >

1 - 100 of 118 matches

Mail list logo