diff options
| author | Keith Packard <keithp@keithp.com> | 2000-12-08 23:04:57 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2000-12-08 23:04:57 +0000 |
| commit | ec4916836c42cb4a1dc1622dddd27951a90a52c9 (patch) | |
| tree | 0bc722c38480573b02903cab1f908f030933843c /hw | |
| parent | d09a156d92dbcd9368be20dabe47ea197f19357e (diff) | |
kdrive: dont try MTRR on non-x86, fix backspace mappingxf-4_0_1Zaxf-4_0_1Z
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kdrive/linux/keyboard.c | 4 | ||||
| -rw-r--r-- | hw/kdrive/src/kmap.c | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c index b9d52884d..3040af987 100644 --- a/hw/kdrive/linux/keyboard.c +++ b/hw/kdrive/linux/keyboard.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/kdrive/linux/keyboard.c,v 1.4 2000/10/10 14:05:48 tsi Exp $ * * Copyright © 1999 Keith Packard * @@ -64,7 +64,7 @@ static const KeySym linux_to_x[256] = { XK_p, XK_q, XK_r, XK_s, XK_t, XK_u, XK_v, XK_w, XK_x, XK_y, XK_z, XK_braceleft, - XK_bar, XK_braceright, XK_asciitilde, XK_Delete, + XK_bar, XK_braceright, XK_asciitilde, XK_BackSpace, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c index e0d615576..a5e34766d 100644 --- a/hw/kdrive/src/kmap.c +++ b/hw/kdrive/src/kmap.c @@ -26,6 +26,12 @@ #include "kdrive.h" #ifdef linux +#ifdef __i386__ +#define HAS_MTRR +#endif +#endif + +#ifdef HAS_MTRR #include <errno.h> #include <unistd.h> #include <sys/mman.h> @@ -91,14 +97,14 @@ KdUnmapDevice (void *addr, CARD32 size) #endif } -#ifdef linux +#ifdef HAS_MTRR static int mtrr; #endif void KdSetMappedMode (CARD32 addr, CARD32 size, int mode) { -#ifdef linux +#ifdef HAS_MTRR struct mtrr_sentry sentry; unsigned long base, bound; unsigned int type; @@ -131,7 +137,7 @@ KdSetMappedMode (CARD32 addr, CARD32 size, int mode) void KdResetMappedMode (CARD32 addr, CARD32 size, int mode) { -#ifdef linux +#ifdef HAS_MTRR struct mtrr_sentry sentry; unsigned long base, bound; unsigned int type; |