frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdrive: Delete unused TOUCHSCREEN define. 

There's nothing in configure to enable this, and KdTsPhyScreen isn't
defined anywhere.

[ajax: Rebase, also clean up Xfbdev]

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Jamey Sharp 2011-05-12 15:21:52 -07:00 committed by Adam Jackson
parent e31fe8115e
commit d08ac36606
6 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/kdrive/ephyr/ephyr.c
View File

@ -50,7 +50,6 @@
#include "xkbsrv.h" #include "xkbsrv.h"
extern int KdTsPhyScreen;
extern Bool ephyr_glamor; extern Bool ephyr_glamor;
KdKeyboardInfo *ephyrKbd; KdKeyboardInfo *ephyrKbd;

6
hw/kdrive/fake/fake.c
View File

@ -25,8 +25,6 @@
#endif #endif
#include "fake.h" #include "fake.h"
extern int KdTsPhyScreen;
Bool Bool
fakeInitialize(KdCardInfo * card, FakePriv * priv) fakeInitialize(KdCardInfo * card, FakePriv * priv)
{ {
@ -364,10 +362,6 @@ fakeCreateColormap(ColormapPtr pmap)
Bool Bool
fakeInitScreen(ScreenPtr pScreen) fakeInitScreen(ScreenPtr pScreen)
{ {
#ifdef TOUCHSCREEN
KdTsPhyScreen = pScreen->myNum;
#endif
pScreen->CreateColormap = fakeCreateColormap; pScreen->CreateColormap = fakeCreateColormap;
return TRUE; return TRUE;
} }

6
hw/kdrive/fbdev/fbdev.c
View File

@ -28,8 +28,6 @@
#include <errno.h> #include <errno.h>
extern int KdTsPhyScreen;
const char *fbdevDevicePath = NULL; const char *fbdevDevicePath = NULL;
static Bool static Bool
@ -698,10 +696,6 @@ fbdevCreateColormap(ColormapPtr pmap)
Bool Bool
fbdevInitScreen(ScreenPtr pScreen) fbdevInitScreen(ScreenPtr pScreen)
{ {
#ifdef TOUCHSCREEN
KdTsPhyScreen = pScreen->myNum;
#endif
pScreen->CreateColormap = fbdevCreateColormap; pScreen->CreateColormap = fbdevCreateColormap;
return TRUE; return TRUE;
} }

3
include/dix-config.h.in
View File

@ -307,9 +307,6 @@
/* Support TCP socket connections */ /* Support TCP socket connections */
#undef TCPCONN #undef TCPCONN
/* Enable touchscreen support */
#undef TOUCHSCREEN
/* Support tslib touchscreen abstraction library */ /* Support tslib touchscreen abstraction library */
#undef TSLIB #undef TSLIB

3
include/kdrive-config.h.in
View File

@ -13,9 +13,6 @@
/* Include framebuffer support in X servers */ /* Include framebuffer support in X servers */
#undef KDRIVEFBDEV #undef KDRIVEFBDEV
/* Enable touchscreen support */
#undef TOUCHSCREEN
/* Support tslib touchscreen abstraction library */ /* Support tslib touchscreen abstraction library */
#undef TSLIB #undef TSLIB

3
include/xorg-server.h.in
View File

@ -101,9 +101,6 @@
/* Support TCP socket connections */ /* Support TCP socket connections */
#undef TCPCONN #undef TCPCONN
/* Enable touchscreen support */
#undef TOUCHSCREEN
/* Support tslib touchscreen abstraction library */ /* Support tslib touchscreen abstraction library */
#undef TSLIB #undef TSLIB