diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-07-17 20:10:50 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-07-17 20:10:50 -0700 |
| commit | 7e412914fc1e2372890c2af46263f4cefab8cbfe (patch) | |
| tree | 52cbeb0e4f2ac06e1e054001648d2e1867856504 /src/sun_kbd.c | |
| parent | 36cf953910002a00a3694033d49c6c38319b0283 (diff) | |
| download | xorg-driver-xf86-input-keyboard-7e412914fc1e2372890c2af46263f4cefab8cbfe.tar.gz | |
Update Solaris port to work with os layer move into kbd driver
Also remove old code only needed for obsolete "keyboard" driver
Fix default keysym map on Solaris to work correctly when XKB fails
Diffstat (limited to 'src/sun_kbd.c')
| -rw-r--r-- | src/sun_kbd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/sun_kbd.c b/src/sun_kbd.c index 3575dfc..9bb1014 100644 --- a/src/sun_kbd.c +++ b/src/sun_kbd.c @@ -161,7 +161,6 @@ sunKbdInit(sunKbdPrivPtr priv, int kbdFD, const char *devName, pointer options) xf86Msg(X_PROBED, "%s: Keyboard layout: %d\n", devName, klayout); priv->ktype = ktype; - priv->keyMap = sunGetKbdMapping(ktype); priv->oleds = sunKbdGetLeds(priv); return Success; @@ -401,13 +400,6 @@ SetKbdRepeat(InputInfoPtr pInfo, char rad) } static void -KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap) -{ - /* Should probably do something better here */ - xf86KbdGetMapping(pKeySyms, pModMap); -} - -static void ReadInput(InputInfoPtr pInfo) { KbdDevPtr pKbd = (KbdDevPtr) pInfo->private; @@ -420,7 +412,7 @@ ReadInput(InputInfoPtr pInfo) if ((nBytes = read(pInfo->fd, (char *)event, sizeof(event))) > 0) { for (i = 0; i < (nBytes / sizeof(Firm_event)); i++) { - pKbd->PostEvent(pInfo, priv->keyMap[event[i].id], + pKbd->PostEvent(pInfo, event[i].id & 0xFF, event[i].value == VKEY_DOWN ? TRUE : FALSE); } } |