Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
---
src/bsd_kbd.c | 39 ---------------------------------------
src/hurd_kbd.c | 7 -------
src/lnx_kbd.c | 16 ----------------
src/sun_kbd.c | 15 ---------------
src/xf86OSKbd.h | 2 --
5 files changed, 0 insertions(+), 79 deletions(-)
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 710470a..64bba88 100644
--- a/src/bsd_kbd.c
+++ b/src/bsd_kbd.c
@@ -101,44 +101,6 @@ SetKbdLeds(InputInfoPtr pInfo, int leds)
}
static int
-GetKbdLeds(InputInfoPtr pInfo)
-{
- KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
- int leds = 0, real_leds = 0;
-
- switch (pKbd->consType) {
-
-#ifdef PCCONS_SUPPORT
- case PCCONS:
- break;
-#endif
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
- case SYSCONS:
- case PCVT:
- ioctl(pInfo->fd, KDGETLED, &real_leds);
- break;
-#endif
-#if defined(WSCONS_SUPPORT)
- case WSCONS:
- ioctl(pInfo->fd, WSKBDIO_GETLEDS, &real_leds);
- break;
-#endif
- }
-
-#ifdef LED_CAP
- if (real_leds & LED_CAP) leds |= XLED1;
-#endif
-#ifdef LED_NUM
- if (real_leds & LED_NUM) leds |= XLED2;
-#endif
-#ifdef LED_SCR
- if (real_leds & LED_SCR) leds |= XLED3;
-#endif
-
- return(leds);
-}
-
-static int
KbdOn(InputInfoPtr pInfo, int what)
{
KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
@@ -437,7 +399,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
pKbd->KbdOff = KbdOff;
pKbd->Bell = SoundBell;
pKbd->SetLeds = SetKbdLeds;
- pKbd->GetLeds = GetKbdLeds;
pKbd->KbdGetMapping = KbdGetMapping;
pKbd->RemapScanCode = NULL;
diff --git a/src/hurd_kbd.c b/src/hurd_kbd.c
index 8c0cd60..5470532 100644
--- a/src/hurd_kbd.c
+++ b/src/hurd_kbd.c
@@ -89,12 +89,6 @@ SetKbdLeds(InputInfoPtr pInfo, int leds)
return;
}
-static int
-GetKbdLeds(InputInfoPtr pInfo)
-{
- return 0;
-}
-
static void
KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
{
@@ -154,7 +148,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
pKbd->KbdOff = KbdOff;
pKbd->Bell = SoundKbdBell;
pKbd->SetLeds = SetKbdLeds;
- pKbd->GetLeds = GetKbdLeds;
pKbd->KbdGetMapping = KbdGetMapping;
pKbd->RemapScanCode = ATScancode;
pKbd->OpenKeyboard = OpenKeyboard;
diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
index e69e1b6..e46a90e 100644
--- a/src/lnx_kbd.c
+++ b/src/lnx_kbd.c
@@ -67,21 +67,6 @@ SetKbdLeds(InputInfoPtr pInfo, int leds)
ioctl(pInfo->fd, KDSETLED, real_leds);
}
-static int
-GetKbdLeds(InputInfoPtr pInfo)
-{
- char real_leds;
- int leds = 0;
-
- ioctl(pInfo->fd, KDGETLED, &real_leds);
-
- if (real_leds & LED_CAP) leds |= XLED1;
- if (real_leds & LED_NUM) leds |= XLED2;
- if (real_leds & LED_SCR) leds |= XLED3;
-
- return(leds);
-}
-
typedef struct {
int kbdtrans;
struct termios kbdtty;
@@ -213,7 +198,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
pKbd->KbdOff = KbdOff;
pKbd->Bell = SoundBell;
pKbd->SetLeds = SetKbdLeds;
- pKbd->GetLeds = GetKbdLeds;
pKbd->KbdGetMapping = KbdGetMapping;
pKbd->RemapScanCode = NULL;
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index a240087..c5bb4d4 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -395,20 +395,6 @@ SetKbdLeds(InputInfoPtr pInfo, int leds)
sunKbdSetLeds(pInfo, real_leds);
}
-static int
-GetKbdLeds(InputInfoPtr pInfo)
-{
- int leds = 0;
- int real_leds = sunKbdGetLeds(pInfo);
-
- if (real_leds & LED_CAPS_LOCK) leds |= XLED1;
- if (real_leds & LED_NUM_LOCK) leds |= XLED2;
- if (real_leds & LED_SCROLL_LOCK) leds |= XLED3;
- if (real_leds & LED_COMPOSE) leds |= XLED4;
-
- return leds;
-}
-
static void
CloseKeyboard(InputInfoPtr pInfo)
{
@@ -511,7 +497,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
pKbd->KbdOff = KbdOff;
pKbd->Bell = SoundKbdBell;
pKbd->SetLeds = SetKbdLeds;
- pKbd->GetLeds = GetKbdLeds;
pKbd->KbdGetMapping = KbdGetMapping;
pKbd->RemapScanCode = NULL;
diff --git a/src/xf86OSKbd.h b/src/xf86OSKbd.h
index f948cf3..a9ed255 100644
--- a/src/xf86OSKbd.h
+++ b/src/xf86OSKbd.h
@@ -39,7 +39,6 @@ typedef int (*KbdOffProc)(InputInfoPtr pInfo, int
what);
typedef void (*BellProc)(InputInfoPtr pInfo,
int loudness, int pitch, int duration);
typedef void (*SetLedsProc)(InputInfoPtr pInfo, int leds);
-typedef int (*GetLedsProc)(InputInfoPtr pInfo);
typedef void (*KbdGetMappingProc)(InputInfoPtr pInfo,
KeySymsPtr pKeySyms, CARD8* pModMap);
typedef int (*RemapScanCodeProc)(InputInfoPtr pInfo, int *scanCode);
@@ -58,7 +57,6 @@ typedef struct {
KbdOffProc KbdOff;
BellProc Bell;
SetLedsProc SetLeds;
- GetLedsProc GetLeds;
KbdGetMappingProc KbdGetMapping;
RemapScanCodeProc RemapScanCode;
--
1.7.3.5
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
