CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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/netbsd/x68k
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, ) == -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(, 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 *)
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(DeviceIntPtr device, int w
case
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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 =
+ 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();
- QueuePointerEvents(device, type, buttons, flag, );
+ if (buttons == Button1 || buttons == Button3) {
+ /* Handle middle button emulation */
+ Emulate3ButtonsQueueEvent(>emu3btn, type, buttons, pPriv->bmask);
+ } else {
+ flag = POINTER_RELATIVE;
+ valuator_mask_zero();
+ QueuePointerEvents(device, type, buttons, flag, );
+ }
break;
case LOC_X_DELTA:
valuators[0] = fe->value;
Added files:
Index:
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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(, 0, 0, NULL); + valuator_mask_zero(); QueuePointerEvents(device, type, buttons, flag, ); break; case LOC_X_DELTA:
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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
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 =
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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
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
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
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
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
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(, "%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/netbsd/x68k
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(, 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)
+pMouse->devicePrivate = (void *)
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
---
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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
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
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
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(, (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
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",
+ , ,
+ 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/netbsd/x68k
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, [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, nevents,
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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 ()
@@ -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, ) == -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/hw/netbsd/x68k/x68kInit.c
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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) );
+depths = (DepthPtr)malloc(
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
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 + *X11_LIBDIR is the default location of this file * argument: nothing * returns: the number of screens *---*/
