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-server/dist/hw/sun/sunIo.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.2 Tue Aug 4 14:31:04 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c Sun Aug 9 07:35:42 2020
@@ -205,6 +205,7 @@ ddxProcessArgument(int argc, char *argv[
return 1;
}
if (strcmp (argv[i], "-debug") == 0) { /* -debug */
+ sunDebug = TRUE;
return 1;
}
if (strcmp (argv[i], "-dev") == 0) { /* -dev /dev/mumble */
@@ -212,6 +213,7 @@ ddxProcessArgument(int argc, char *argv[
return 2;
}
if (strcmp (argv[i], "-mono") == 0) { /* -mono */
+ sunForceMono = TRUE;
return 1;
}
if (strcmp (argv[i], "-zaphod") == 0) { /* -zaphod */
