diff options
| -rw-r--r-- | hw/kdrive/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/kdrive/linux/ts.c | 12 | ||||
| -rw-r--r-- | hw/kdrive/src/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.h | 10 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 10 | ||||
| -rw-r--r-- | hw/kdrive/src/kmap.c | 16 |
6 files changed, 9 insertions, 44 deletions
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am index ee8b3fb0b..877a6ca34 100644 --- a/hw/kdrive/Makefile.am +++ b/hw/kdrive/Makefile.am @@ -1,11 +1,9 @@ if KDRIVEVESA -VESA_SUBDIRS = vesa mach64 +VESA_SUBDIRS = vesa mach64 mga smi endif SUBDIRS = \ src \ linux \ fbdev \ - mga \ - smi \ $(VESA_SUBDIRS) diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c index 7f256988b..937e51e57 100644 --- a/hw/kdrive/linux/ts.c +++ b/hw/kdrive/linux/ts.c @@ -36,17 +36,7 @@ #include "scrnintstr.h" #include "kdrive.h" #include <sys/ioctl.h> -#if 1 #include <linux/h3600_ts.h> /* touch screen events */ -#else -/* inline for non-arm debug builds */ -typedef struct { - unsigned short pressure; - unsigned short x; - unsigned short y; - unsigned short pad; /* TODO TODO word boundary pad */ -} TS_EVENT; -#endif static long lastx = 0, lasty = 0; @@ -104,7 +94,7 @@ TsRead (int tsPort, void *closure) * touch screen, if it is we send absolute coordinates. If not, * then we send delta's so that we can track the entire vga screen. */ - if (KdTsCurScreen == KdTsPhyScreen) { + if (KdCurScreen == KdTsPhyScreen) { flags = KD_BUTTON_1; x = event.x; y = event.y; diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am index c478dbdcb..f6de7ec7f 100644 --- a/hw/kdrive/src/Makefile.am +++ b/hw/kdrive/src/Makefile.am @@ -12,7 +12,6 @@ libkdrive_a_SOURCES = \ kaa.c \ kasync.c \ kcmap.c \ - kcolor.c \ kcurscol.c \ kdrive.c \ kinfo.c \ diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index 481a1e0f6..c38d4959c 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -209,15 +209,7 @@ typedef struct _KdMouseInfo { extern KdMouseInfo *kdMouseInfo; -#ifdef TOUCHSCREEN -/* - * HACK! Send absolute events when touch screen is current, - * else send relative events. Used to drive pointers on - * alternate screens with the touch screen - */ -extern int KdTsCurScreen; -extern int KdTsPhyScreen; -#endif +extern int KdCurScreen; KdMouseInfo *KdMouseInfoAdd (void); void KdParseMouse (char *); diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 641e6a33c..645c05ea3 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1610,19 +1610,13 @@ KdCrossScreen(ScreenPtr pScreen, Bool entering) #endif } -#ifdef TOUCHSCREEN -/* HACK! */ -int KdTsCurScreen; /* current event screen */ -int KdTsPhyScreen = -1; /* screen associated with touch screen */ -#endif +int KdCurScreen; /* current event screen */ static void KdWarpCursor (ScreenPtr pScreen, int x, int y) { KdBlockSigio (); -#ifdef TOUCHSCREEN - KdTsCurScreen = pScreen->myNum; -#endif + KdCurScreen = pScreen->myNum; miPointerWarpCursor (pScreen, x, y); KdUnblockSigio (); } diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c index 53cc5bd37..676282393 100644 --- a/hw/kdrive/src/kmap.c +++ b/hw/kdrive/src/kmap.c @@ -23,21 +23,13 @@ */ /* $RCSId: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.10 2001/07/24 21:26:17 keithp Exp $ */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include "kdrive.h" -#ifdef linux -#ifdef __i386__ -#define HAS_MTRR -#endif -#endif - #include <errno.h> #include <unistd.h> #include <sys/mman.h> -#ifdef HAS_MTRR +#ifdef HAVE_ASM_MTRR_H #include <asm/mtrr.h> #endif @@ -106,14 +98,14 @@ KdUnmapDevice (void *addr, CARD32 size) #endif } -#ifdef HAS_MTRR +#ifdef HAVE_ASM_MTRR_H static int mtrr; #endif void KdSetMappedMode (CARD32 addr, CARD32 size, int mode) { -#ifdef HAS_MTRR +#ifdef HAVE_ASM_MTRR_H struct mtrr_sentry sentry; unsigned long base, bound; unsigned int type; @@ -152,7 +144,7 @@ KdSetMappedMode (CARD32 addr, CARD32 size, int mode) void KdResetMappedMode (CARD32 addr, CARD32 size, int mode) { -#ifdef HAS_MTRR +#ifdef HAVE_ASM_MTRR_H struct mtrr_sentry sentry; unsigned long base, bound; unsigned int type; |