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/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.7 Sat Aug 1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c Sat Aug 1 20:21:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.7 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.8 2020/08/01 20:21:00 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -91,7 +91,7 @@ static void x68kKbdHandlerNotify(int, in
static void x68kInitModMap(KeySymsRec *, CARD8 *);
static void x68kInitKbdNames(XkbRMLVOSet *, X68kKbdPrivPtr);
static void x68kKbdRingBell(DeviceIntPtr, int, int);
-static void x68kKbdBell(int, DeviceIntPtr, pointer, int);
+static void x68kKbdBell(int, DeviceIntPtr, void *, int);
static void x68kKbdCtrl(DeviceIntPtr, KeybdCtrl *);
static void x68kSetLeds(X68kKbdPrivPtr, u_char);
@@ -119,7 +119,7 @@ x68kKbdProc(DeviceIntPtr pDev, /* Keyboa
switch (what) {
case DEVICE_INIT:
- pKeyboard->devicePrivate = (pointer)&x68kKbdPriv;
+ pKeyboard->devicePrivate = (void *)&x68kKbdPriv;
if( (x68kKbdPriv.fd = open("/dev/kbd", O_RDONLY)) == -1 ) {
ErrorF("Can't open keyboard device");
return !Success;
@@ -336,7 +336,7 @@ x68kKbdRingBell(DeviceIntPtr pDev, int v
}
static void
-x68kKbdBell(int volume, DeviceIntPtr pDev, pointer ctrl, int unused)
+x68kKbdBell(int volume, DeviceIntPtr pDev, void *ctrl, int unused)
{
KeybdCtrl* kctrl = (KeybdCtrl*) ctrl;
