diff options
| author | Phil Blundell <pb@reciva.com> | 2003-10-04 02:56:54 +0000 |
|---|---|---|
| committer | Phil Blundell <pb@reciva.com> | 2003-10-04 02:56:54 +0000 |
| commit | f3d8476ced1e3ba4b4ca7c9e23e98c2cc7ffcc14 (patch) | |
| tree | 8e09cdc7c5980424ed4e7c84dd2736de3adb263f | |
| parent | aae3e6dcb3d72eba6d7d8d99079782ed1bfe63bd (diff) | |
few more fixes for h3600 ts
| -rw-r--r-- | hw/kdrive/fbdev/fbdev.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/linux/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/kdrive/linux/ts.c | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c index 3bdeed1d1..0a1c7e2d1 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -31,6 +31,8 @@ /* this code was used to debug MSB 24bpp code on a 16bpp frame buffer */ #undef FAKE24_ON_16 +extern int KdTsPhyScreen; + Bool fbdevInitialize (KdCardInfo *card, FbdevPriv *priv) { diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am index cc64b7720..081767cc7 100644 --- a/hw/kdrive/linux/Makefile.am +++ b/hw/kdrive/linux/Makefile.am @@ -23,3 +23,7 @@ liblinux_a_SOURCES = \ if TSLIB liblinux_a_SOURCES += tslib.c endif + +if H3600_TS +liblinux_a_SOURCES += ts.c +endif diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c index 937e51e57..f896f6b19 100644 --- a/hw/kdrive/linux/ts.c +++ b/hw/kdrive/linux/ts.c @@ -40,6 +40,8 @@ static long lastx = 0, lasty = 0; +int KdTsPhyScreen = 0; + int TsReadBytes (int fd, char *buf, int len, int min) { @@ -98,7 +100,9 @@ TsRead (int tsPort, void *closure) flags = KD_BUTTON_1; x = event.x; y = event.y; - } else { + } + else + { flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA; if ((lastx == 0) || (lasty == 0)) { x = 0; @@ -109,7 +113,7 @@ TsRead (int tsPort, void *closure) } lastx = event.x; lasty = event.y; - } + } } else { flags = KD_MOUSE_DELTA; x = 0; |