From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.2.5 From: Petr Tesarik Organization: SUSE LINUX, s.r.o. To: kbd@lists.altlinux.org Date: Fri, 27 Jul 2012 09:09:07 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.37.6-0.19-default; KDE/4.6.0; i686; ; ) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <201207270909.07319.ptesarik@suse.cz> Cc: Alexey Gladkov Subject: [kbd] [PATCH v2] setleds: add option to reset state to the BIOS default X-BeenThere: kbd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Linux console tools development discussion List-Id: Linux console tools development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2012 07:09:10 -0000 Archived-At: List-Archive: Hello folks, please consider the following patch for kbd. As you probably know, the Linux kernel resets the LED states to all off on boot. However, many users would like to keep the BIOS NumLock setting, and others get confused after they press one of the lock keys in the boot loader and it gets reset again when Linux initializes the terminal. Because of that, many distros have used various ways to "improve" user experience: setting NumLock on by default, making OS-specific configuration options, or reading the BIOS area. The last option seems best to me, because it usually also preserves whatever you did in the boot loader. Unfortunately, there's no simple utility to read the state, so distros sometimes do insane things to get it (e.g. run hwinfo and grep only for the LED states and then run setleds with the appropriate arguments). Obviously, this approach isn't exactly fast... Since setleds must be always used in the end, the most efficient solution is to add an option that resets the LED states to what they were before the Linux kernel booted. Signed-off-by: Petr Tesarik --- src/setleds.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 58 insertions(+), 3 deletions(-) diff --git a/src/setleds.c b/src/setleds.c index 3577aee..3defdea 100644 --- a/src/setleds.c +++ b/src/setleds.c @@ -11,18 +11,29 @@ #include #include #include +#include +#include #include "nls.h" #include "version.h" +#if defined(__i386__) || defined(__x86_64__) +# define HAVE_BIOS 1 +# define BIOS_KBD_ADDR 0x497 +# define BIOS_LED_SCR 0x01 +# define BIOS_LED_NUM 0x02 +# define BIOS_LED_CAP 0x04 +#endif + static void attr_noreturn usage(void) { fprintf(stderr, _( "Usage:\n" -" setleds [-v] [-L] [-D] [-F] [[+|-][ num | caps | scroll %s]]\n" +" setleds [-v] [-L] [-D] [-F] [[+|-][ num | caps | scroll %s]%s]\n" "Thus,\n" " setleds +caps -num\n" "will set CapsLock, clear NumLock and leave ScrollLock unchanged.\n" +"%s" "The settings before and after the change (if any) are reported\n" "when the -v option is given or when no change is requested.\n" "Normally, setleds influences the vt flag settings\n" @@ -32,9 +43,15 @@ usage(void) "that a subsequent reset will not change the flags.\n" ), #ifdef __sparc__ - "| compose " + "| compose ", +#else + "", +#endif +#ifdef HAVE_BIOS + " | bios ", +"Specify \"bios\" to reset state to the BIOS default.\n" #else - "" + "", "" #endif ); exit(1); @@ -152,6 +169,37 @@ sunsetleds(arg_state char *cur_leds) { #endif } +#ifdef HAVE_BIOS +static void +biosgetleds(char *cur_leds) { + int memfd; + long pagesz, mapoff; + char *map, bios_state; + + memfd = open("/dev/mem", O_RDONLY); + if (memfd < 0) { + perror("/dev/mem"); + fprintf(stderr, _("Error opening /dev/mem.\n")); + exit(1); + } + pagesz = sysconf(_SC_PAGESIZE); + mapoff = BIOS_KBD_ADDR & ~(pagesz-1); + map = mmap(NULL, pagesz, PROT_READ, MAP_SHARED, memfd, mapoff); + if (map == MAP_FAILED) { + perror("/dev/mem"); + fprintf(stderr, _("Error mapping /dev/mem.\n")); + exit(1); + } + bios_state = map[BIOS_KBD_ADDR - mapoff]; + *cur_leds = + (bios_state & BIOS_LED_SCR ? LED_SCR : 0) | + (bios_state & BIOS_LED_NUM ? LED_NUM : 0) | + (bios_state & BIOS_LED_CAP ? LED_CAP : 0); + munmap(map, pagesz); + close(memfd); +} +#endif /* HAVE_BIOS */ + int main(int argc, char **argv) { int optL = 0, optD = 0, optF = 0, verbose = 0; @@ -241,6 +289,13 @@ main(int argc, char **argv) { while(--argc) { ap = *++argv; +#ifdef HAVE_BIOS + if (!strcmp(ap, "bios")) { + biosgetleds(&nval); + ndef = LED_NUM | LED_CAP | LED_SCR; + goto nxtarg; + } +#endif sign = 1; /* by default: set */ if(*ap == '+') ap++;