Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit TAB/space cleanup.
details: https://anonhg.NetBSD.org/xsrc/rev/403184eefc24
branches: trunk
changeset: 10527:403184eefc24
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Sat Aug 01 20:09:03 2020 +0000
description:
TAB/space cleanup.
diffstat:
external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68k.man | 10 +-
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c | 34 ++++----
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c | 12 +-
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c | 36 ++++----
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c | 18 ++--
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kIo.c | 24 +++---
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKbd.c | 40 +++++-----
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKeyMap.c | 14 +-
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kMouse.c | 26 +++---
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kReg.h | 4 +-
external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kText.c | 6 +-
external/mit/xorg-server/dist/hw/netbsd/x68k/X68k.man | 10 +-
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c | 34 ++++----
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c | 12 +-
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c | 36 ++++----
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c | 18 ++--
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kIo.c | 24 +++---
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c | 40 +++++-----
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKeyMap.c | 14 +-
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c | 26 +++---
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h | 4 +-
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c | 6 +-
22 files changed, 224 insertions(+), 224 deletions(-)
diffs (truncated from 1462 to 300 lines):
diff -r eb98bcefc8e1 -r 403184eefc24 external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68k.man
--- a/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68k.man Sat Aug 01 13:40:55 2020 +0000
+++ b/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68k.man Sat Aug 01 20:09:03 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: X68k.man,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $
+.\" $NetBSD: X68k.man,v 1.2 2020/08/01 20:09:03 tsutsui Exp $
.\"
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -39,7 +39,7 @@
.Sh DESCRIPTION
.Nm
is the server for Version 11 of the X Window System on X68k hardware
-running
+running
.Nx .
It will normally be started by the
.Xr xdm 1
@@ -121,7 +121,7 @@
or
.Fa Graphic ,
and specifies the screen to be used by this mode. Note that the type
-Graphic requires the
+Graphic requires the
.Pa /dev/grf1
device driver configured in your kernel.
@@ -142,7 +142,7 @@
Remaining arguments are set to the registers of the CRT controler
and the video controler of the x68k.
Be carefull to change these values, or it may
-DAMAGE THE DISPLAY HARDWARE!!
+DAMAGE THE DISPLAY HARDWARE!!
.It Fn Mode
One argument
@@ -155,7 +155,7 @@
.It Fn Mouse
One argument
.Fa type
-is required. Specify the pointing device type; currently
+is required. Specify the pointing device type; currently
.Fa standard
is the only acceptable argument.
.It Fn Keyboard
diff -r eb98bcefc8e1 -r 403184eefc24 external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c
--- a/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c Sat Aug 01 13:40:55 2020 +0000
+++ b/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c Sat Aug 01 20:09:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.3 2020/08/01 20:09:03 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -61,7 +61,7 @@
x68kGetScreenRecByType(int type)
{
int i;
-
+
for (i = 0; i < X68K_FB_TYPES; i++) {
if (x68kScreen[i].type == type)
return &x68kScreen[i];
@@ -175,7 +175,7 @@
int c;
static int line = 1;
Token *ret;
-
+
ret = (Token *)malloc(sizeof(Token));
if (ret == NULL)
FatalError("Out of memory");
@@ -261,7 +261,7 @@
{ "Keyboard", parseKeyboard },
{ "Mode", parseMode },
};
-#define NCOMMANDS (sizeof(command)/sizeof(command[0]))
+#define NCOMMANDS (sizeof(command)/sizeof(command[0]))
/*-------------------------------------------------------------------------
* function "parseCommand"
@@ -277,7 +277,7 @@
Token **argv = 0, *token;
int argc = 0;
int i;
-
+
token = getToken();
if (token->type == TOKEN_EOF)
return FALSE;
@@ -309,7 +309,7 @@
for (i = 0; i < NCOMMANDS; i++) {
if (strcasecmp(command[i].symbol, argv[0]->content.symbol) == 0) {
/* parse command */
- command[i].proc(argc, argv);
+ command[i].proc(argc, argv);
break;
}
}
@@ -342,7 +342,7 @@
checkArguments(int n, enum TokenType *type, int argc_m1, Token **argv)
{
int i;
-
+
if (argc_m1 < n)
parseError(argv[0]->line, "too few arguments to command `%s'",
argv[0]->content.symbol);
@@ -392,14 +392,14 @@
Mode *mode;
char *symbol;
int class, width, height;
-
+
checkArguments(18, argtype, argc-1, argv);
mode = (Mode *)malloc(sizeof(Mode));
if (mode == NULL)
FatalError("Out of memory");
mode->name = strdup(argv[1]->content.symbol);
-
+
/* parse frame buffer type */
symbol = argv[2]->content.symbol;
if (strcasecmp("Text", symbol) == 0)
@@ -409,7 +409,7 @@
else
parseError(argv[2]->line, "unknown frame buffer type");
mode->depth = argv[3]->content.literal;
-
+
/* parse frame buffer class */
symbol = argv[4]->content.symbol;
if (strcasecmp("StaticGray", symbol) == 0)
@@ -430,7 +430,7 @@
class = mode->class;
width = mode->width = argv[5]->content.literal;
height = mode->height = argv[6]->content.literal;
-
+
/* examine whether type, depth, class, width, and height are
a legal combination or not, and then set mode registers */
switch (mode->type) {
@@ -493,7 +493,7 @@
mode->reg.crtc.r14 = 0; mode->reg.crtc.r15 = 0;
mode->reg.crtc.r16 = 0; mode->reg.crtc.r17 = 0;
mode->reg.crtc.r18 = 0; mode->reg.crtc.r19 = 0;
-
+
/* add new mode to linked mode list */
mode->next = modeList;
modeList = mode;
@@ -530,7 +530,7 @@
x68kScreen[0].x68kreg = mode->reg;
x68kScreen[0].scr_width = mode->width;
x68kScreen[0].scr_height = mode->height;
-
+
switch (mode->type) {
/* for TVRAM frame buffer */
case X68K_FB_TEXT:
@@ -579,7 +579,7 @@
parseMouse(int argc, Token **argv)
{
enum TokenType argtype[] = { TOKEN_SYMBOL };
-
+
checkArguments(1, argtype, argc-1, argv);
/* only `standard' mouse allowed */
if (strcasecmp("standard", argv[1]->content.symbol) != 0)
@@ -598,7 +598,7 @@
parseKeyboard(int argc, Token **argv)
{
enum TokenType argtype[] = { TOKEN_SYMBOL };
-
+
checkArguments(1, argtype, argc-1, argv);
if (strcasecmp("standard", argv[1]->content.symbol) == 0) {
x68kKeySyms = &jisKeySyms;
@@ -606,7 +606,7 @@
} else if (strcasecmp("ascii", argv[1]->content.symbol) == 0) {
x68kKeySyms = &asciiKeySyms;
x68kKbdPriv.type = X68K_KB_ASCII;
- } else
+ } else
parseError(argv[1]->line, "unknown keyboard type `%s'",
argv[1]->content.symbol);
}
@@ -624,7 +624,7 @@
parseError(int line, const char *str, ...)
{
va_list arglist;
-
+
fprintf(stderr, "%s:%d: ", configFilename, line);
if (str != NULL) {
va_start(arglist, str);
diff -r eb98bcefc8e1 -r 403184eefc24 external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c
--- a/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c Sat Aug 01 13:40:55 2020 +0000
+++ b/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c Sat Aug 01 20:09:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.3 2020/08/01 20:09:03 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -35,7 +35,7 @@
*
* purpose: open and map frame buffer, and obtain some FB-specific
* infomation. then set controller to approppriate mode as
- * configured in X68kConfig.
+ * configured in X68kConfig.
* argument: (X68kScreenRec *)pPriv : X68k private screen record
* (const char *)device : name of frame buffer device
* returns: (Bool): TRUE if succeeded
@@ -45,7 +45,7 @@
x68kFbCommonOpen(X68kScreenRec *pPriv, const char *device)
{
struct grfinfo gi;
-
+
/* open frame buffer */
if ( ( pPriv->fd = open(device, O_RDWR, 0)) < 0) {
Error( "Can't open frame buffer" );
@@ -57,7 +57,7 @@
return FALSE;
}
pPriv->mapsize = gi.gd_regsize + gi.gd_fbsize;
-
+
/* map control registers and frame buffer */
pPriv->reg = (FbReg *)mmap(0, pPriv->mapsize, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pPriv->fd, 0 );
@@ -96,7 +96,7 @@
/* change video mode */
pPriv->x68kreg = graphNone;
x68kRegSetup(pPriv);
-
+
/* unmap and close frame buffer */
if ( munmap(__UNVOLATILE(pPriv->reg), pPriv->mapsize) == -1 )
Error("Can't unmap frame buffer");
@@ -123,7 +123,7 @@
if ( (pr20 & 0x0003) < (pPriv->x68kreg.crtc.r20 & 0x0003) ||
( (pr20 & 0x0003) == (pPriv->x68kreg.crtc.r20 & 0x0003) &&
(pr20 & 0x0010) < (pPriv->x68kreg.crtc.r20 & 0x0010) ) ) {
-
+
/* to higher resolution */
CRTCSET(r00); CRTCSET(r01); CRTCSET(r02);CRTCSET(r03);
CRTCSET(r04); CRTCSET(r05); CRTCSET(r06);CRTCSET(r07);
diff -r eb98bcefc8e1 -r 403184eefc24 external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c
--- a/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c Sat Aug 01 13:40:55 2020 +0000
+++ b/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c Sat Aug 01 20:09:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.3 2020/08/01 20:09:03 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -62,11 +62,11 @@
tice appear in all copies and that both that copyright no-
tice and this permission notice appear in supporting docu-
mentation, and that the names of Sun or X Consortium
-not be used in advertising or publicity pertaining to
-distribution of the software without specific prior
-written permission. Sun and X Consortium make no
-representations about the suitability of this software for
-any purpose. It is provided "as is" without any express or
+not be used in advertising or publicity pertaining to
+distribution of the software without specific prior
+written permission. Sun and X Consortium make no
+representations about the suitability of this software for
+any purpose. It is provided "as is" without any express or
implied warranty.
SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
@@ -97,15 +97,15 @@
/* Modified from sunCG4C.c for X11R3 by Tom Jarmolowski */
/****************************************************************/
-/*
+/*
* Copyright 1991, 1992, 1993 Kaleb S. Keithley
*
* Permission to use, copy, modify, and distribute this
* software and its documentation for any purpose and without
* fee is hereby granted, provided that the above copyright
- * notice appear in all copies. Kaleb S. Keithley makes no
- * representations about the suitability of this software for
- * any purpose. It is provided "as is" without express or
+ * notice appear in all copies. Kaleb S. Keithley makes no
+ * representations about the suitability of this software for
+ * any purpose. It is provided "as is" without express or
* implied warranty.
*/
@@ -131,7 +131,7 @@
* function "x68kGraphOpen" [ X68kFBProc function ]
*
Home |
Main Index |
Thread Index |
Old Index