Module Name: xsrc
Committed By: tsutsui
Date: Sun Oct 10 05:33:32 UTC 2010
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast: dreamcast.h
dreamcastColormap.c dreamcastFB.c dreamcastInit.c dreamcastIo.c
dreamcastKbd.c dreamcastKeymap.c dreamcastMouse.c dreamcastScreen.c
Log Message:
WARNSfy and misc cleanup. (done for bug tracking but no fatal one)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastColormap.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastFB.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastIo.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKeymap.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastInit.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastScreen.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.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/dreamcast/dreamcast.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h:1.1 Sat Feb 7 02:39:07 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h Sun Oct 10 05:33:32 2010
@@ -31,12 +31,11 @@
#include <sys/filio.h>
#include <sys/ioctl.h>
#include <sys/resource.h>
+#include <sys/time.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplay_usl_io.h>
-extern int gettimeofday();
-
/*
* Server specific headers
*/
@@ -58,13 +57,6 @@
#include "servermd.h"
#include "windowstr.h"
-#undef __P
-#if NeedFunctionPrototypes
-# define __P(p) p
-#else
-# define __P(p) ()
-#endif
-
/*
* ddx specific headers
*/
@@ -129,14 +121,14 @@
unsigned char* fb; /* Frame buffer itself */
int fd; /* frame buffer for ioctl()s, */
struct wsdisplay_fbinfo info; /* */
- void (*EnterLeave)();/* screen switch */
+ void (*EnterLeave)(ScreenPtr, int);/* screen switch */
char* devname; /* device name (e.g. "/dev/ttyE0") */
} dreamcastFbRec, *dreamcastFbPtr;
typedef struct {
ColormapPtr installedMap;
CloseScreenProcPtr CloseScreen;
- void (*UpdateColormap)();
+ void (*UpdateColormap)(ScreenPtr, int, int, u_char *, u_char *, u_char *);
Bool hasHardwareCursor;
} dreamcastScreenRec, *dreamcastScreenPtr;
@@ -144,62 +136,68 @@
extern Bool noXkbExtension;
#endif
-#define dreamcastError(str) { \
- int mode; \
- dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, &mode); \
+#define dreamcastError(str) do { \
+ int __m; \
+ dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, &__m); \
Error(str); \
- dreamcastSetDisplayMode(fileno(stderr), mode, NULL); \
-}
+ dreamcastSetDisplayMode(fileno(stderr), __m, NULL); \
+} while (/*CONSTCOND*/0)
-#define dreamcastErrorF(a) { \
- int mode; \
- dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, &mode); \
+#define dreamcastErrorF(a) do { \
+ int __m; \
+ dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, &__m); \
ErrorF a; \
- dreamcastSetDisplayMode(fileno(stderr), mode, NULL); \
-}
+ dreamcastSetDisplayMode(fileno(stderr), __m, NULL); \
+} while (/*CONSTCOND*/0)
-#define dreamcastFatalError(a) { \
- int mode; \
- dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, &mode); \
+#define dreamcastFatalError(a) do { \
+ int __m; \
+ dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, &__m); \
FatalError a; \
-}
+} while (/*CONSTCOND*/0)
+
+/*
+ * dreamcastColormap.c
+ */
+void dreamcastColormapInit(ScreenPtr pScreen);
/*
* dreamcastInit.c
*/
-dreamcastFbPtr dreamcastGetScreenFb __P((ScreenPtr pScreen));
+dreamcastFbPtr dreamcastGetScreenFb(ScreenPtr pScreen);
/*
* dreamcastIo.c
*/
-void dreamcastCleanupFd __P((int));
-void dreamcastEnqueueEvents __P((void));
+void dreamcastCleanupFd(int);
+void dreamcastEnqueueEvents(void);
/*
* dreamcastKbd.c
*/
-int dreamcastKbdProc __P((DeviceIntPtr pKeyboard, int what));
-dreamcastEvent* dreamcastKbdGetEvents __P((dreamcastKbdPrivPtr, int*, Bool*));
-void dreamcastKbdEnqueueEvent __P((DeviceIntPtr dev, dreamcastEvent* fe));
+int dreamcastKbdProc(DeviceIntPtr pKeyboard, int what);
+dreamcastEvent* dreamcastKbdGetEvents(dreamcastKbdPrivPtr, int*, Bool*);
+void dreamcastKbdEnqueueEvent(DeviceIntPtr dev, dreamcastEvent* fe);
/*
* dreamcastMouse.c
*/
-int dreamcastMouseProc __P((DeviceIntPtr pMouse, int what));
-dreamcastEvent* dreamcastMouseGetEvents __P((dreamcastPtrPrivPtr, int*, Bool*));
-void dreamcastMouseEnqueueEvent __P((DeviceIntPtr dev, dreamcastEvent*));
+int dreamcastMouseProc(DeviceIntPtr pMouse, int what);
+dreamcastEvent* dreamcastMouseGetEvents(dreamcastPtrPrivPtr, int*, Bool*);
+void dreamcastMouseEnqueueEvent(DeviceIntPtr dev, dreamcastEvent*);
/*
* dreamcastScreen.c
*/
-pointer dreamcastMemoryMap __P((size_t len, off_t off, int fd));
-Bool dreamcastScreenInit __P((ScreenPtr pScreen));
-dreamcastScreenPtr dreamcastGetScreenPrivate __P((ScreenPtr pScreen));
+pointer dreamcastMemoryMap(size_t len, off_t off, int fd);
+Bool dreamcastScreenInit(ScreenPtr pScreen);
+Bool dreamcastAllocateScreenPrivate(ScreenPtr pScreen);
+dreamcastScreenPtr dreamcastGetScreenPrivate(ScreenPtr pScreen);
/*
* dreamcastFB.c
*/
-Bool dreamcastFBInit __P((int scrn, ScreenPtr pScrn, int argc, char** argv));
+Bool dreamcastFBInit(int scrn, ScreenPtr pScrn, int argc, char** argv);
int dreamcastSetDisplayMode(int, int, int *);
#endif
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastColormap.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastColormap.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastColormap.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastColormap.c:1.1 Sat Feb 7 02:39:07 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastColormap.c Sun Oct 10 05:33:32 2010
@@ -94,28 +94,26 @@
static ColormapPtr InstalledMaps[MAXSCREENS];
-void
-dreamcastInstallColormap(pmap)
- ColormapPtr pmap;
+static void
+dreamcastInstallColormap(ColormapPtr pmap)
{
- int index = pmap->pScreen->myNum;
- ColormapPtr oldpmap = InstalledMaps[index];
+ int i = pmap->pScreen->myNum;
+ ColormapPtr oldpmap = InstalledMaps[i];
if (pmap != oldpmap)
{
if (oldpmap != (ColormapPtr)None)
WalkTree(pmap->pScreen, TellLostMap, (char *)&oldpmap->mid);
- InstalledMaps[index] = pmap;
+ InstalledMaps[i] = pmap;
WalkTree(pmap->pScreen, TellGainedMap, (char *)&pmap->mid);
}
}
-void
-dreamcastUninstallColormap(pmap)
- ColormapPtr pmap;
+static void
+dreamcastUninstallColormap(ColormapPtr pmap)
{
- int index = pmap->pScreen->myNum;
- ColormapPtr curpmap = InstalledMaps[index];
+ int i = pmap->pScreen->myNum;
+ ColormapPtr curpmap = InstalledMaps[i];
if(pmap == curpmap)
{
@@ -128,10 +126,8 @@
}
}
-int
-dreamcastListInstalledColormaps(pScreen, pmaps)
- ScreenPtr pScreen;
- Colormap *pmaps;
+static int
+dreamcastListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
{
/* By the time we are processing requests, we can guarantee that there
* is always a colormap installed */
@@ -140,14 +136,11 @@
}
void
-dreamcastColormapInit (pScreen)
- ScreenPtr pScreen;
+dreamcastColormapInit (ScreenPtr pScreen)
{
- dreamcastScreenPtr pPrivate = dreamcastGetScreenPrivate(pScreen);
- dreamcastFbPtr pFb = dreamcastGetScreenFb(pScreen);
pScreen->InstallColormap = dreamcastInstallColormap;
pScreen->UninstallColormap = dreamcastUninstallColormap;
pScreen->ListInstalledColormaps = dreamcastListInstalledColormaps;
- pScreen->StoreColors = (void (*)())NoopDDA;
+ pScreen->StoreColors = (void *)NoopDDA;
}
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastFB.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastFB.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastFB.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastFB.c:1.1 Sat Feb 7 02:39:07 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastFB.c Sun Oct 10 05:33:32 2010
@@ -34,7 +34,9 @@
#include "dreamcast.h"
#define FORCE_SEPARATE_PRIVATE
+#include "mi.h"
#include "cfb.h"
+#include "cfb16.h"
#include <stdio.h>
@@ -43,24 +45,23 @@
extern Bool cfb16CreateScreenResources(ScreenPtr pScreen);
-Bool
-dreamcast16ScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
- register ScreenPtr pScreen;
- pointer pbits; /* pointer to screen bitmap */
- int xsize, ysize; /* in pixels */
- int dpix, dpiy; /* dots per inch */
- int width; /* pixel width of frame buffer */
+static Bool
+dreamcast16ScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, int ysize,
+ int dpix, int dpiy, int width)
+ /* pointer pbits; pointer to screen bitmap */
+ /* int xsize, ysize; in pixels */
+ /* int dpix, dpiy; dots per inch */
+ /* int width; pixel width of frame buffer */
{
- int i, j;
#ifdef CFB_NEED_SCREEN_PRIVATE
pointer oldDevPrivate;
#endif
- VisualPtr visuals;
- DepthPtr depths;
+ VisualPtr visuals = NULL;
+ DepthPtr depths = NULL;
int nvisuals;
int ndepths;
int rootdepth;
- VisualID defaultVisual;
+ VisualID defaultVisual = 0;
dreamcastFbPtr pFb = dreamcastGetScreenFb(pScreen);
struct wsdisplay_fbinfo *fbconf = &pFb->info;
extern Bool cfb16CloseScreen(int index, ScreenPtr pScreen);
@@ -160,10 +161,9 @@
int res;
dreamcastFbPtr pFb = dreamcastGetScreenFb(pScreen);
unsigned char *fb = pFb->fb;
- int rowsize;
struct wsdisplay_fbinfo *fbconf = &pFb->info;
- pFb->EnterLeave = (void (*)())NoopDDA;
+ pFb->EnterLeave = (void *)NoopDDA;
if (!dreamcastAllocateScreenPrivate(pScreen))
return FALSE;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastIo.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastIo.c:1.1 Sat Feb 7 02:39:07 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastIo.c Sun Oct 10 05:33:32 2010
@@ -49,6 +49,7 @@
#include <stdio.h>
#define NEED_EVENTS
+#include "mi.h"
#include "dreamcast.h"
void
@@ -110,8 +111,10 @@
if (!pPointer->public.on || !pKeyboard->public.on)
return;
+ ptrEvents = NULL;
numPtrEvents = 0;
PtrAgain = TRUE;
+ kbdEvents = NULL;
numKbdEvents = 0;
KbdAgain = TRUE;
@@ -163,12 +166,11 @@
* DDX - specific abort routine. Called by AbortServer().
*/
void
-AbortDDX()
+AbortDDX(void)
{
int i;
ScreenPtr pScreen;
dreamcastFbPtr pFb;
- DevicePtr devPtr;
OsSignal (SIGIO, SIG_IGN);
for (i = 0; i < screenInfo.numScreens; i++)
@@ -194,7 +196,6 @@
char *argv[];
int i;
{
- extern void UseMsg();
#if 0 /* XXX */
#ifndef XKB
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKeymap.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKeymap.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKeymap.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKeymap.c:1.1 Sat Feb 7 02:39:07 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKeymap.c Sun Oct 10 05:33:32 2010
@@ -776,37 +776,37 @@
#define ScrollLockMask Mod5Mask
static dreamcastModmapRec modmap_jpkbd[] = {
- 0xe1, ShiftMask, /* Shift_L */
- 0xe5, ShiftMask, /* Shift_R */
- 0x39, LockMask, /* CapsLock */
- 0xe0, ControlMask, /* Control_L */
- 0xe4, ControlMask, /* Control_R */
- 0xe2, AltMask, /* Alt_L */
- 0xe6, AltMask, /* Alt_R */
- 0x35, AltLangMask, /* Zenkaku_Hankaku */
- 0x88, KanaMask, /* Hiragana_Katakana */
- 0x47, ScrollLockMask, /* ScrollLock */
- 0, 0
+ { 0xe1, ShiftMask }, /* Shift_L */
+ { 0xe5, ShiftMask }, /* Shift_R */
+ { 0x39, LockMask }, /* CapsLock */
+ { 0xe0, ControlMask }, /* Control_L */
+ { 0xe4, ControlMask }, /* Control_R */
+ { 0xe2, AltMask }, /* Alt_L */
+ { 0xe6, AltMask }, /* Alt_R */
+ { 0x35, AltLangMask }, /* Zenkaku_Hankaku */
+ { 0x88, KanaMask }, /* Hiragana_Katakana */
+ { 0x47, ScrollLockMask }, /* ScrollLock */
+ { 0, 0 }
};
static dreamcastModmapRec modmap_uskbd[] = {
- 0xe1, ShiftMask, /* Shift_L */
- 0xe5, ShiftMask, /* Shift_R */
- 0x39, LockMask, /* CapsLock */
- 0xe0, ControlMask, /* Control_L */
- 0xe4, ControlMask, /* Control_R */
- 0xe2, AltMask, /* Alt_L */
- 0xe6, AltMask, /* Alt_R */
- 0x53, NumLockMask, /* NumLock */
- 0x47, ScrollLockMask, /* ScrollLock */
- 0, 0
+ { 0xe1, ShiftMask }, /* Shift_L */
+ { 0xe5, ShiftMask }, /* Shift_R */
+ { 0x39, LockMask }, /* CapsLock */
+ { 0xe0, ControlMask }, /* Control_L */
+ { 0xe4, ControlMask }, /* Control_R */
+ { 0xe2, AltMask }, /* Alt_L */
+ { 0xe6, AltMask }, /* Alt_R */
+ { 0x53, NumLockMask }, /* NumLock */
+ { 0x47, ScrollLockMask }, /* ScrollLock */
+ { 0, 0 }
};
KeySymsRec dreamcastKeySyms[] = {
- /* map minKC maxKC width */
- map_jpkbd, 0x00, 0xe7, GLYPHS_PER_KEY,
- map_ukkbd, 0x00, 0xe7, GLYPHS_PER_KEY,
- map_uskbd, 0x00, 0xe7, GLYPHS_PER_KEY,
+ /* map minKC maxKC width */
+ { map_jpkbd, 0x00, 0xe7, GLYPHS_PER_KEY },
+ { map_ukkbd, 0x00, 0xe7, GLYPHS_PER_KEY },
+ { map_uskbd, 0x00, 0xe7, GLYPHS_PER_KEY },
};
dreamcastModmapRec *dreamcastModMaps[] = {
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastInit.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastInit.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastInit.c:1.2 Wed Mar 30 17:27:41 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastInit.c Sun Oct 10 05:33:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dreamcastInit.c,v 1.2 2005/03/30 17:27:41 tron Exp $ */
+/* $NetBSD: dreamcastInit.c,v 1.3 2010/10/10 05:33:32 tsutsui Exp $ */
/*
* Modified from hpcInit.c of Xhpc
@@ -6,7 +6,7 @@
#include "dreamcast.h"
#include "gcstruct.h"
-/* #include "mi.h" */
+#include "mi.h"
#include "mibstore.h"
#include "cfb.h"
@@ -31,6 +31,7 @@
0, /* last known button state */
};
+#if 0
/*
* a list of devices to try if there is no environment or command
* line list of devices
@@ -40,6 +41,7 @@
"/dev/ttyE4", "/dev/ttyE5", "/dev/ttyE6", "/dev/ttyE7",
};
#define FALLBACK_LIST_LEN sizeof fallbackList / sizeof fallbackList[0]
+#endif
dreamcastFbRec dreamcastFbs[MAXSCREENS];
@@ -65,9 +67,9 @@
* The fd of the framebuffer.
*/
static int
-OpenFrameBuffer(device, screen)
- char *device; /* e.g. "/dev/ttyE0" */
- int screen; /* what screen am I going to be */
+OpenFrameBuffer(char *device, int screen)
+/* char *device; e.g. "/dev/ttyE0" */
+/* int screen; what screen am I going to be */
{
int ret = TRUE;
@@ -108,8 +110,7 @@
*
*/
static void
-SigIOHandler(sig)
- int sig;
+SigIOHandler(int sig)
{
int olderrno = errno;
@@ -118,9 +119,7 @@
}
static char**
-GetDeviceList (argc, argv)
- int argc;
- char **argv;
+GetDeviceList (int argc, char **argv)
{
int i;
char *envList = NULL;
@@ -179,24 +178,21 @@
}
void
-OsVendorPreInit()
+OsVendorPreInit(void)
{
}
void
-OsVendorInit()
+OsVendorInit(void)
{
}
-void
-InitKbdMouse(argc, argv)
- int argc;
- char **argv;
+static void
+InitKbdMouse(int argc, char **argv)
{
struct rlimit rl;
int maxfds, kbdtype, layout;
int i;
- char **devList;
static int inited;
@@ -226,17 +222,17 @@
* try each mouse device
*/
for (i = 0; i < 8; i++) {
- char devname[16];
+ char dvname[16];
if (dreamcastKbdPriv.fd == -1) {
- sprintf(devname, "/dev/wskbd%d", i);
- dreamcastKbdPriv.fd = open(devname, O_RDWR);
+ sprintf(dvname, "/dev/wskbd%d", i);
+ dreamcastKbdPriv.fd = open(dvname, O_RDWR);
}
if (dreamcastPtrPriv.fd == -1) {
- sprintf(devname, "/dev/wsmouse%d", i);
- if ((dreamcastPtrPriv.fd = open(devname, O_RDWR)) < 0)
- dreamcastError(devname);
+ sprintf(dvname, "/dev/wsmouse%d", i);
+ if ((dreamcastPtrPriv.fd = open(dvname, O_RDWR)) < 0)
+ dreamcastError(dvname);
}
}
@@ -277,7 +273,7 @@
dreamcastKbdPriv.layout = DREAMCAST_KBDLAYOUT_US;
break;
default:
- dreamcastError(("Unknown keyboard layout; assume JP layout.\n"));
+ dreamcastError("Unknown keyboard layout; assume JP layout.\n");
dreamcastKbdPriv.layout = DREAMCAST_KBDLAYOUT_JP;
break;
}
@@ -303,9 +299,7 @@
int i, scr;
int nonBlockConsole = 0;
char **devList;
- static int setup_on_exit = 0;
extern Bool RunFromSmartParent;
- dreamcastScreenPtr pPrivate;
if (!monitorResolution)
monitorResolution = 75;
@@ -359,8 +353,7 @@
int argc;
char **argv;
{
- DeviceIntPtr p, k;
- extern Bool mieqInit();
+ pointer p, k;
InitKbdMouse(argc, argv);
@@ -407,19 +400,18 @@
* stubs
*
***************************************************************/
+#include <Xext/dpmsproc.h>
-void DPMSSet (level)
- int level;
+void DPMSSet (int level)
{
}
-int DPMSGet (level)
- int* level;
+int DPMSGet (int *level)
{
return -1;
}
-Bool DPMSSupported ()
+Bool DPMSSupported (void)
{
return FALSE;
}
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastScreen.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastScreen.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastScreen.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastScreen.c:1.2 Fri Dec 9 05:44:50 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastScreen.c Sun Oct 10 05:33:32 2010
@@ -86,7 +86,6 @@
ScreenPtr pScreen;
{
dreamcastScreenPtr pPrivate;
- extern int AllocateScreenPrivateIndex();
if (generation != serverGeneration) {
dreamcastScreenIndex = AllocateScreenPrivateIndex();
@@ -134,13 +133,12 @@
(void) close (fd);
return NULL;
}
- return mapaddr + off;
+ mapaddr = (char *)mapaddr + off;
+ return mapaddr;
}
static Bool
-dreamcastSaveScreen (pScreen, on)
- ScreenPtr pScreen;
- int on;
+dreamcastSaveScreen (ScreenPtr pScreen, int on)
{
int state;
dreamcastFbPtr pFb = dreamcastGetScreenFb(pScreen);
@@ -158,9 +156,7 @@
}
static Bool
-dreamcastCloseScreen (i, pScreen)
- int i;
- ScreenPtr pScreen;
+dreamcastCloseScreen (int i, ScreenPtr pScreen)
{
Bool ret;
dreamcastScreenPtr pPrivate = dreamcastGetScreenPrivate(pScreen);
@@ -181,9 +177,6 @@
ScreenPtr pScreen;
{
dreamcastScreenPtr pPrivate;
- extern void dreamcastBlockHandler();
- extern void dreamcastWakeupHandler();
- static ScreenPtr autoRepeatScreen;
extern miPointerScreenFuncRec dreamcastPointerScreenFuncs;
pPrivate = dreamcastGetScreenPrivate(pScreen);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.5 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.6
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.5 Sun Oct 10 05:21:43 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c Sun Oct 10 05:33:32 2010
@@ -45,6 +45,7 @@
*/
#define NEED_EVENTS
+#include "mi.h"
#include "dreamcast.h"
#include "keysym.h"
#include <stdio.h>
@@ -65,11 +66,9 @@
* None, really...
*/
static void
-dreamcastBell(percent, device, ctrl, unused)
- int percent; /* Percentage of full volume */
- DeviceIntPtr device; /* Keyboard to ring */
- pointer ctrl;
- int unused;
+dreamcastBell(int percent, DeviceIntPtr device, pointer ctrl, int unused)
+/* int percent; Percentage of full volume */
+/* DeviceIntPtr device; Keyboard to ring */
{
/* None */
}
@@ -85,9 +84,8 @@
* Some...
*/
static void
-dreamcastKbdCtrl(device, ctrl)
- DeviceIntPtr device; /* Keyboard to alter */
- KeybdCtrl* ctrl;
+dreamcastKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl)
+/* DeviceIntPtr device; Keyboard to alter */
{
dreamcastKbdPrivPtr pPriv = (dreamcastKbdPrivPtr) device->public.devicePrivate;
@@ -104,16 +102,13 @@
* None.
*/
int
-dreamcastKbdProc(device, what)
- DeviceIntPtr device; /* Keyboard to manipulate */
- int what; /* What to do to it */
+dreamcastKbdProc(DeviceIntPtr device, int what)
+/* DeviceIntPtr device; Keyboard to manipulate */
+/* int what; What to do to it */
{
int i;
DevicePtr pKeyboard = (DevicePtr) device;
dreamcastKbdPrivPtr pPriv;
- KeybdCtrl* ctrl = &device->kbdfeed->ctrl;
- extern int XkbDfltRepeatDelay, XkbDfltRepeatInterval;
- struct termios tkbdtty;
static CARD8 *workingModMap = NULL;
static KeySymsRec *workingKeySyms;
@@ -203,7 +198,6 @@
{
int fd;
int nBytes; /* number of bytes of events available. */
- u_char c, c2;
static dreamcastEvent evBuf[MAXEVENTS]; /* Buffer for dreamcastEvents */
fd = pPriv->fd;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.3 Sun Oct 10 05:28:49 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c Sun Oct 10 05:33:32 2010
@@ -56,13 +56,14 @@
*/
#define NEED_EVENTS
+#include "mi.h"
#include "dreamcast.h"
#include <stdio.h>
-static Bool dreamcastCursorOffScreen();
-static void dreamcastCrossScreen();
-static void dreamcastWarpCursor();
+static Bool dreamcastCursorOffScreen(ScreenPtr *, int *, int *);
+static void dreamcastCrossScreen(ScreenPtr, Bool);
+static void dreamcastWarpCursor(ScreenPtr, int, int);
miPointerScreenFuncRec dreamcastPointerScreenFuncs = {
dreamcastCursorOffScreen,
@@ -82,10 +83,8 @@
* Side Effects:
* None.
*/
-void
-dreamcastMouseCtrl(device, ctrl)
- DeviceIntPtr device;
- PtrCtrl* ctrl;
+static void
+dreamcastMouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl)
{
}
@@ -104,10 +103,7 @@
int what; /* What to do with it */
{
DevicePtr pMouse = (DevicePtr) device;
- int format;
- static int oformat;
BYTE map[7];
- char *dev;
switch (what) {
case DEVICE_INIT:
@@ -208,9 +204,7 @@
* None.
*/
static short
-MouseAccelerate (device, delta)
- DeviceIntPtr device;
- int delta;
+MouseAccelerate (DeviceIntPtr device, int delta)
{
int sgn = sign(delta);
PtrCtrl *pCtrl;
@@ -247,13 +241,12 @@
{
xEvent xE;
dreamcastPtrPrivPtr pPriv; /* Private data for pointer */
- dreamcastKbdPrivPtr keyPriv;/* Private keyboard data for button emul */
- unsigned long time;
+ unsigned long ptime;
int x, y, bmask;
pPriv = (dreamcastPtrPrivPtr)device->public.devicePrivate;
- time = xE.u.keyButtonPointer.time = TSTOMILLI(fe->time);
+ ptime = xE.u.keyButtonPointer.time = TSTOMILLI(fe->time);
/*
* Mouse buttons start at 1.
@@ -304,21 +297,21 @@
mieqEnqueue (&xE);
break;
case WSCONS_EVENT_MOUSE_DELTA_X:
- miPointerDeltaCursor (MouseAccelerate(device,fe->value),0,time);
+ miPointerDeltaCursor (MouseAccelerate(device,fe->value),0,ptime);
break;
case WSCONS_EVENT_MOUSE_DELTA_Y:
- miPointerDeltaCursor (0,-MouseAccelerate(device,fe->value),time);
+ miPointerDeltaCursor (0,-MouseAccelerate(device,fe->value),ptime);
break;
case WSCONS_EVENT_MOUSE_DELTA_Z:
/* Ignore for now. */
break;
case WSCONS_EVENT_MOUSE_ABSOLUTE_X:
miPointerPosition (&x, &y);
- miPointerAbsoluteCursor (fe->value, y, time);
+ miPointerAbsoluteCursor (fe->value, y, ptime);
break;
case WSCONS_EVENT_MOUSE_ABSOLUTE_Y:
miPointerPosition (&x, &y);
- miPointerAbsoluteCursor (x, fe->value, time);
+ miPointerAbsoluteCursor (x, fe->value, ptime);
break;
case WSCONS_EVENT_MOUSE_ABSOLUTE_Z:
break;
@@ -333,8 +326,7 @@
ScreenPtr *pScreen;
int *x, *y;
{
- int index, ret = FALSE;
- extern Bool PointerConfinedToScreen();
+ int ret = FALSE;
if (PointerConfinedToScreen()) return TRUE;
return ret;
