summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Vignatti <vignatti@c3sl.ufpr.br>2007-06-27 03:34:13 -0300
committerTiago Vignatti <vignatti@c3sl.ufpr.br>2007-06-27 03:34:13 -0300
commitd73835efda4995a310188537233a984f4b73628d (patch)
treec9afba72dce91ba6cc6a2ef894366f78104f90cd
parent38f8e536684193c3f70b23be22d818053c676072 (diff)
More janitor work. Remove 'defined but not used' warnings from kdrive and some minor cosmetic.
-rw-r--r--dix/events.c1
-rw-r--r--hw/kdrive/ati/ati_dma.c2
-rw-r--r--hw/kdrive/linux/evdev.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/dix/events.c b/dix/events.c
index 63bc3799d..7b4cab06d 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 70b86d36c..2caabdbd8 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 6c08cfa62..deefcf9f4 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;