Module Name: xsrc
Committed By: tsutsui
Date: Fri May 20 05:12:42 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k: x68k.h x68kConfig.c
x68kFb.c x68kGraph.c x68kInit.c x68kIo.c x68kKbd.c x68kMouse.c
x68kText.c
Log Message:
More WARNSfy.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/xfree/xc/programs/Xserver/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/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.2 Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.3 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -94,17 +94,18 @@
* frame buffer procedures
*/
typedef struct _X68kFbProcRec {
- Bool (*open)( X68kScreenRec *fb ); /* open procedure */
- Bool (*init)( int screen, ScreenPtr pScreen, /* initialize procedure */
- int argc, char *argv[] );
- void (*close)( X68kScreenRec *fb ); /* close procedure */
+ Bool (*open)(X68kScreenRec *); /* open procedure */
+ Bool (*init)(int, ScreenPtr, int, char *[]); /* initialize procedure */
+ void (*close)(X68kScreenRec *); /* close procedure */
} X68kFbProcRec;
/* frame buffer types */
#define X68K_FB_NULL 0
#define X68K_FB_TEXT 1 /* text VRAM frame buffer */
#define X68K_FB_GRAPHIC 2 /* graphic VRAM frame buffer */
-/* #define X68K_FB_CIRRUS 3 /* not yet */
+#if 0
+#define X68K_FB_CIRRUS 3 /* not yet */
+#endif
#define X68K_FB_TYPES 2
typedef struct _X68kMousePriv {
@@ -125,24 +126,51 @@
#define MAXEVENTS 32
#define TVTOMILLI(tv) (((tv).tv_usec/1000)+((tv).tv_sec*1000))
-int x68kScreenIndex;
-int x68kGeneration;
#define GetScreenPrivate(s) ((X68kScreenRec *) \
((s)->devPrivates[x68kScreenIndex].ptr))
#define SetupScreen(s) X68kScreenRec *pPriv = GetScreenPrivate(s)
+/* in x68kConfig.c */
+X68kScreenRec *x68kGetScreenRec(int);
+X68kScreenRec *x68kGetScreenRecByType(int);
+X68kFbProcRec *x68kGetFbProcRec(int index);
+void x68kRegisterPixmapFormats(ScreenInfo *);
+int x68kConfig(void);
+extern char *configFilename;
+
/* x68kFB.c */
Bool x68kFbCommonOpen(X68kScreenRec *, char *);
void x68kFbCommonClose(X68kScreenRec *);
+Bool x68kSaveScreen(ScreenPtr, Bool);
+extern int x68kScreenIndex;
+extern int x68kGeneration;
+
+/* x68kGraph.c */
+Bool x68kGraphOpen(X68kScreenRec *);
+Bool x68kGraphInit(int, ScreenPtr, int, char *[]);
+void x68kGraphClose(X68kScreenRec *);
+
+/* in x68kIo.c */
+void x68kSigIOHandler(int);
+
+/* in x68kMouse.c */
+int x68kMouseProc(DeviceIntPtr, int);
+Firm_event *x68kMouseGetEvents(int, int *, Bool *);
+void x68kMouseEnqueueEvent(DeviceIntPtr, Firm_event *);
+extern miPointerScreenFuncRec x68kPointerScreenFuncs;
+
+/* in x68kKbd.c */
+int x68kKbdProc(DeviceIntPtr, int);
+Firm_event *x68kKbdGetEvents(int, int *, Bool *);
+void x68kKbdEnqueueEvent(DeviceIntPtr, Firm_event *);
+extern X68kKbdPriv x68kKbdPriv;
+
+/* in x68kKeyMap.c */
+extern KeySymsRec jisKeySyms, asciiKeySyms, *x68kKeySyms;
/* x68kText.c */
-Bool x68kTextOpen(X68kScreenRec *fb);
-Bool x68kTextInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
-void x68kTextClose(X68kScreenRec *fb);
+Bool x68kTextOpen(X68kScreenRec *);
+Bool x68kTextInit(int, ScreenPtr, int, char *[]);
+void x68kTextClose(X68kScreenRec *);
-/* x68kGraph.c */
-Bool x68kGraphOpen(X68kScreenRec *fb);
-Bool x68kGraphInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
-void x68kGraphClose(X68kScreenRec *fb);
-
/* EOF x68k.h */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c:1.2 Fri Dec 9 05:44:51 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.2 2005/12/09 05:44:51 mhitch Exp $ */
+/* $NetBSD: x68kFb.c,v 1.3 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -33,6 +33,9 @@
static void x68kRegSetup(X68kScreenRec *pPriv);
+int x68kScreenIndex;
+int x68kGeneration;
+
/*-------------------------------------------------------------------------
* function "x68kFbCommonOpen"
*
@@ -158,19 +161,19 @@
Bool x68kSaveScreen(ScreenPtr pScreen, Bool on)
{
SetupScreen(pScreen);
- static int stat = FALSE;
+ static int status = FALSE;
static u_short r2;
if (on == SCREEN_SAVER_ON || on == SCREEN_SAVER_CYCLE) {
- if (!stat) {
+ if (!status) {
r2 = pPriv->reg->videoc.r2;
pPriv->reg->videoc.r2 = 0x0000;
- stat = TRUE;
+ status = TRUE;
}
} else {
- if (stat) {
+ if (status) {
pPriv->reg->videoc.r2 = r2;
- stat = FALSE;
+ status = FALSE;
}
}
return TRUE;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.2 Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kText.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68kText.c,v 1.3 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -99,7 +99,6 @@
*-----------------------------------------------------------------------*/
Bool x68kTextInit(int screen, ScreenPtr pScreen, int argc, char *argv[])
{
- extern miPointerScreenFuncRec x68kPointerScreenFuncs;
X68kScreenRec *pPriv;
/* get private screen record set by X68KConfig */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c:1.3 Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.3 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.4 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -31,6 +31,7 @@
#include <stdarg.h>
#include "x68k.h"
+#include "opaque.h"
static PixmapFormatRec *x68kFormat = NULL;
static PixmapFormatRec defaultFormat = {
@@ -45,12 +46,12 @@
* function "x68kGetScreenRec"
*
* purpose: get corresponding screen record
- * argument: (int)index : screen index
+ * argument: (int)sindex : screen index
* returns: (X68kScreenRec *) : X68k dependent screen record
*-----------------------------------------------------------------------*/
-X68kScreenRec *x68kGetScreenRec(int index)
+X68kScreenRec *x68kGetScreenRec(int sindex)
{
- return &x68kScreen[index];
+ return &x68kScreen[sindex];
}
/*-------------------------------------------------------------------------
@@ -75,12 +76,12 @@
* function "x68kGetFbProcRec"
*
* purpose: get corresponding frame buffer procedure record
- * argument: (int)index : screen index
+ * argument: (int)sindex : screen index
* returns: (X68kFbProcRec *) : frame buffer procedure record
*-----------------------------------------------------------------------*/
-X68kFbProcRec *x68kGetFbProcRec(int index)
+X68kFbProcRec *x68kGetFbProcRec(int sindex)
{
- return &x68kFbProc[index];
+ return &x68kFbProc[sindex];
}
/*-------------------------------------------------------------------------
@@ -591,8 +592,6 @@
static void parseKeyboard(int argc, Token **argv)
{
enum TokenType argtype[] = { TOKEN_SYMBOL };
- extern KeySymsRec jisKeySyms, asciiKeySyms, *x68kKeySyms;
- extern X68kKbdPriv x68kKbdPriv;
checkArguments(1, argtype, argc-1, argv);
if (strcasecmp("standard", argv[1]->content.symbol) == 0) {
@@ -618,9 +617,6 @@
void parseError(int line, char *str, ...)
{
va_list arglist;
- int n;
- extern void AbortDDX();
- extern Bool CoreDump;
fprintf(stderr, "%s:%d: ", configFilename, line);
if (str != NULL) {
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.3 Fri May 20 04:30:00 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kIo.c,v 1.3 2011/05/20 04:30:00 tsutsui Exp $ */
+/* $NetBSD: x68kIo.c,v 1.4 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -76,11 +76,7 @@
#include "x68k.h"
#include "mi.h"
-static void x68kEnqueueEvents();
-extern Firm_event* x68kMouseGetEvents( int fd, int *pNumEvents, Bool *pAgain );
-extern void x68kMouseEnqueueEvent( DeviceIntPtr device, Firm_event *fe );
-extern Firm_event* x68kKbdGetEvents( int fd, int *pNumEvents, Bool *pAgain );
-extern void x68kKbdEnqueueEvent( DeviceIntPtr device, Firm_event *fe );
+static void x68kEnqueueEvents(void);
/*--------------------------------------------------------------------
* function "x68kSigIOHandler"
@@ -112,7 +108,7 @@
* Events are passed to the DIX layer.
*
*-----------------------------------------------------------------*/
-void ProcessInputEvents()
+void ProcessInputEvents(void)
{
(void) mieqProcessInputEvents ();
miPointerUpdate ();
@@ -124,7 +120,7 @@
* enqueue them using the mi event queue
*/
-static void x68kEnqueueEvents()
+static void x68kEnqueueEvents(void)
{
Firm_event *ptrEvents, /* Current pointer event */
*kbdEvents; /* Current keyboard event */
@@ -150,6 +146,8 @@
PtrAgain = TRUE;
numKbdEvents = 0;
KbdAgain = TRUE;
+ ptrEvents = NULL; /* XXX gcc */
+ kbdEvents = NULL; /* XXX gcc */
/*
* So long as one event from either device remains unprocess, we loop:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.3 Fri May 20 04:30:00 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.3 2011/05/20 04:30:00 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.4 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -84,10 +84,10 @@
#include "x68k.h"
#include "mi.h"
-static Bool x68kCursorOffScreen();
-static void x68kCrossScreen();
-static void x68kWarpCursor();
-static void x68kMouseCtrl(DeviceIntPtr device, PtrCtrl* ctrl);
+static Bool x68kCursorOffScreen(ScreenPtr *, int *, int *);
+static void x68kCrossScreen(ScreenPtr, Bool);
+static void x68kWarpCursor(ScreenPtr, int, int);
+static void x68kMouseCtrl(DeviceIntPtr, PtrCtrl*);
miPointerScreenFuncRec x68kPointerScreenFuncs = {
x68kCursorOffScreen,
@@ -114,7 +114,6 @@
int format;
static int oformat;
BYTE map[4];
- char *dev;
switch (what) {
case DEVICE_INIT:
@@ -274,12 +273,12 @@
xEvent xE;
X68kMousePrivPtr pPriv; /* Private data for pointer */
int bmask; /* Temporary button mask */
- unsigned long time;
+ time_t etime;
int x, y;
pPriv = (X68kMousePrivPtr)device->public.devicePrivate;
- time = xE.u.keyButtonPointer.time = TVTOMILLI(fe->time);
+ etime = xE.u.keyButtonPointer.time = TVTOMILLI(fe->time);
switch (fe->id) {
case MS_LEFT:
@@ -312,7 +311,7 @@
mieqEnqueue (&xE);
break;
case LOC_X_DELTA:
- miPointerDeltaCursor (MouseAccelerate(device,fe->value),0,time);
+ miPointerDeltaCursor (MouseAccelerate(device,fe->value),0,etime);
break;
case LOC_Y_DELTA:
/*
@@ -320,15 +319,15 @@
* and motion down a negative delta, so we must subtract
* here instead of add...
*/
- miPointerDeltaCursor (0,-MouseAccelerate(device,fe->value),time);
+ miPointerDeltaCursor (0,-MouseAccelerate(device,fe->value),etime);
break;
case LOC_X_ABSOLUTE:
miPointerPosition (&x, &y);
- miPointerAbsoluteCursor (fe->value, y, time);
+ miPointerAbsoluteCursor (fe->value, y, etime);
break;
case LOC_Y_ABSOLUTE:
miPointerPosition (&x, &y);
- miPointerAbsoluteCursor (x, fe->value, time);
+ miPointerAbsoluteCursor (x, fe->value, etime);
break;
default:
FatalError ("sunMouseEnqueueEvent: unrecognized id\n");
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.4 Fri May 20 04:30:00 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.4 2011/05/20 04:30:00 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.5 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -197,7 +197,6 @@
*-----------------------------------------------------------------------*/
Bool x68kGraphInit(int screen, ScreenPtr pScreen, int argc, char *argv[])
{
- extern miPointerScreenFuncRec x68kPointerScreenFuncs;
X68kScreenRec *pPriv;
/* get private screen record set by X68KConfig */
@@ -269,8 +268,6 @@
int ndepths;
VisualID defaultVisual;
int rootdepth = 0;
- extern BSFuncRec cfb16BSFuncRec;
- extern Bool cfb16CreateScreenResources(ScreenPtr pScreen);
/* for 15/16bit TrueColor visual mode */
if (pPriv->depth == 15 && pPriv->class == TrueColor) {
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.4 Fri May 20 04:30:00 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.4 2011/05/20 04:30:00 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.5 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -77,24 +77,20 @@
#include <X11/extensions/XKB.h>
#include <X11/extensions/XKBstr.h>
#include <X11/extensions/XKBsrv.h>
-extern Bool noXkbExtension;
#endif
#define MIN_KEYCODE 7 /* necessary to avoid the mouse buttons */
#define MAX_KEYCODE 255 /* limited by the protocol */
-extern KeySymsRec *x68kKeySyms;
-
X68kKbdPriv x68kKbdPriv;
-static void x68kInitModMap(KeySymsRec *x68kKeySyms, CARD8 *x68kModMap);
+static void x68kInitModMap(KeySymsRec *, CARD8 *);
#ifdef XKB
-static void x68kInitKbdNames(XkbComponentNamesRec* names, X68kKbdPrivPtr pKbd);
+static void x68kInitKbdNames(XkbComponentNamesRec *, X68kKbdPrivPtr);
#endif
-static void x68kKbdBell(int percent, DeviceIntPtr device,
- pointer ctrl, int unused);
-static void x68kKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl);
-static void x68kSetLeds(X68kKbdPrivPtr pPriv, u_char data);
+static void x68kKbdBell(int, DeviceIntPtr, pointer, int);
+static void x68kKbdCtrl(DeviceIntPtr, KeybdCtrl *);
+static void x68kSetLeds(X68kKbdPrivPtr, u_char);
/*------------------------------------------------------------------------
* x68kKbdProc --
@@ -168,23 +164,23 @@
* (CARD8 *)x68kModMap : result
* returns: nothing
*-----------------------------------------------------------------------*/
-static void x68kInitModMap(KeySymsRec *x68kKeySyms, CARD8 *x68kModMap)
+static void x68kInitModMap(KeySymsRec *KeySyms, CARD8 *x68kModMap)
{
int i;
for (i = 0; i < MAP_LENGTH; i++)
x68kModMap[i] = NoSymbol;
- if (x68kKeySyms->minKeyCode < MIN_KEYCODE) {
- x68kKeySyms->minKeyCode += MIN_KEYCODE;
- x68kKeySyms->maxKeyCode += MIN_KEYCODE;
+ if (KeySyms->minKeyCode < MIN_KEYCODE) {
+ KeySyms->minKeyCode += MIN_KEYCODE;
+ KeySyms->maxKeyCode += MIN_KEYCODE;
}
#if 0
- if (x68kKeySyms->maxKeyCode > MAX_KEYCODE)
- x68kKeySyms->maxKeyCode += MAX_KEYCODE;
+ if (KeySyms->maxKeyCode > MAX_KEYCODE)
+ KeySyms->maxKeyCode += MAX_KEYCODE;
#endif
- for (i = x68kKeySyms->minKeyCode;
- i < x68kKeySyms->maxKeyCode; i++) {
- switch (x68kKeySyms->map[(i-x68kKeySyms->minKeyCode)*4]) {
+ for (i = KeySyms->minKeyCode;
+ i < KeySyms->maxKeyCode; i++) {
+ switch (KeySyms->map[(i-KeySyms->minKeyCode)*4]) {
case XK_Shift_L:
case XK_Shift_R:
x68kModMap[i] = ShiftMask;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.6 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.7
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.6 Fri May 20 04:30:00 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.6 2011/05/20 04:30:00 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.7 2011/05/20 05:12:42 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -79,20 +79,6 @@
static int nscreens;
-/* in x68kConfig.c */
-X68kScreenRec *x68kGetScreenRec(int index);
-X68kFbProcRec *x68kGetFbProcRec(int index);
-void x68kRegisterPixmapFormats(ScreenInfo *pScreenInfo);
-int x68kConfig(void);
-
-/* in x68kIo.c */
-void x68kSigIOHandler(int sig);
-
-/* in x68kMouse.c */
-int x68kMouseProc(DeviceIntPtr device, int what);
-/* in x68kKbd.c */
-int x68kKbdProc(DeviceIntPtr device, int what);
-
void OsVendorInit (
#if NeedFunctionPrototypes
void
@@ -219,9 +205,7 @@
*-----------------------------------------------------------------------*/
int ddxProcessArgument(int argc, char *argv[], int i)
{
- extern char *configFilename;
- extern void UseMsg();
-
+
if (strcmp(argv[i], "-x68kconfig") == 0) {
if (++i >= argc)
UseMsg();
@@ -255,6 +239,7 @@
* stubs
*
***************************************************************/
+#include <Xext/dpmsproc.h>
void DPMSSet (level)
int level;
