xserver: Branch 'master' - 2 commits
Tiago Vignatti
vignatti at kemper.freedesktop.org
Tue Jun 26 23:37:57 PDT 2007
dix/events.c | 1 -
hw/kdrive/ati/ati_dma.c | 2 ++
hw/kdrive/linux/evdev.c | 4 ++--
hw/xfree86/common/xf86Events.c | 3 ---
hw/xfree86/common/xf86Mode.c | 3 +--
hw/xfree86/common/xf86Xinput.c | 2 --
6 files changed, 5 insertions(+), 10 deletions(-)
New commits:
diff-tree d73835efda4995a310188537233a984f4b73628d (from 38f8e536684193c3f70b23be22d818053c676072)
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Jun 27 03:34:13 2007 -0300
More janitor work. Remove 'defined but not used' warnings from kdrive and some minor cosmetic.
diff --git a/dix/events.c b/dix/events.c
index 63bc379..7b4cab0 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -160,7 +160,6 @@ extern Mask xevieFilters[128];
extern int xevieEventSent;
extern int xevieKBEventSent;
int xeviegrabState = 0;
-static xEvent *xeviexE;
#endif
#include <X11/extensions/XIproto.h>
diff --git a/hw/kdrive/ati/ati_dma.c b/hw/kdrive/ati/ati_dma.c
index 70b86d3..2caabdb 100644
--- a/hw/kdrive/ati/ati_dma.c
+++ b/hw/kdrive/ati/ati_dma.c
@@ -43,6 +43,7 @@ extern CARD32 radeon_cp_microcode[][2];
extern CARD32 r200_cp_microcode[][2];
extern CARD32 r300_cp_microcode[][2];
+#if DEBUG_FIFO
static void
ATIDebugFifo(ATIScreenInfo *atis)
{
@@ -69,6 +70,7 @@ ATIDebugFifo(ATIScreenInfo *atis)
MMIO_IN32(mmio, R128_REG_PC_NGUI_CTLSTAT));
}
}
+#endif
static void
ATIUploadMicrocode(ATIScreenInfo *atis)
diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c
index 6c08cfa..deefcf9 100644
--- a/hw/kdrive/linux/evdev.c
+++ b/hw/kdrive/linux/evdev.c
@@ -155,8 +155,6 @@ EvdevInit (KdPointerInfo *pi)
{
int i;
int fd;
- int n = 0;
- char *prot;
if (!pi->path) {
for (i = 0; i < NUM_DEFAULT_EVDEV; i++) {
@@ -277,6 +275,8 @@ EvdevDisable (KdPointerInfo *pi)
{
Kevdev *ke;
+ ke = pi->driverPrivate;
+
if (!pi || !pi->driverPrivate)
return;
diff-tree 38f8e536684193c3f70b23be22d818053c676072 (from 1340f34ec98c41781164018d43bd7bb858d8132b)
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Jun 27 03:19:37 2007 -0300
Janitor work. Remove 'defined but not used' warnings from xorg and other cosmetic.
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 4da74e5..daf53de 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -125,9 +125,6 @@ extern Bool noXkbExtension;
* This has been generalised to work with Linux and *BSD+syscons (DHD)
*/
-#ifdef USE_VT_SYSREQ
-static Bool VTSysreqToggle = FALSE;
-#endif /* !USE_VT_SYSREQ */
_X_EXPORT Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for
*BSD and for avoiding VT
switches when using the DRI
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index b343788..0c25c96 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -458,7 +458,6 @@ xf86LookupMode(ScrnInfoPtr scrp, Display
int ModePrivFlags = 0;
ModeStatus status = MODE_NOMODE;
Bool allowDiv2 = (strategy & LOOKUP_CLKDIV2) != 0;
- Bool haveBuiltin;
int n;
const int types[] = {
M_T_BUILTIN | M_T_PREFERRED,
@@ -2038,6 +2037,7 @@ xf86SetCrtcForModes(ScrnInfoPtr scrp, in
}
+#if 0
static void
add(char **p, char *new)
{
@@ -2046,7 +2046,6 @@ add(char **p, char *new)
strcat(*p, new);
}
-#if 0
_X_EXPORT void
xf86PrintModeline(int scrnIndex,DisplayModePtr mode)
{
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index c08b15f..f3d2f21 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -84,9 +84,7 @@
#include <stdarg.h>
-#include "osdep.h" /* EnabledDevices */
#include <X11/Xpoll.h>
-#include "xf86_OSproc.h" /* sigio stuff */
#include "mi.h"
More information about the xorg-commit
mailing list