From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Aug 2010 15:12:27 +0000 (+0200)
Subject: merge mainline into keylayouts
X-Git-Tag: 1.99~488^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59004db5951e6bc170bd73264754b3a54cc919d4;p=thirdparty%2Fgrub.git

merge mainline into keylayouts
---

59004db5951e6bc170bd73264754b3a54cc919d4
diff --cc term/at_keyboard.c
index f8595a41a,25f32a0a5..2b7dd9bee
--- a/term/at_keyboard.c
+++ b/term/at_keyboard.c
@@@ -149,22 -181,17 +149,16 @@@ grub_at_keyboard_getkey_noblock (void
    switch (code)
      {
        case CAPS_LOCK:
- 	/* Caps lock sends scan code twice.  Get the second one and discard it.  */
- 	while (grub_keyboard_getkey () == -1);
- 
 -	at_keyboard_status ^= KEYBOARD_STATUS_CAPS_LOCK;
 +	at_keyboard_status ^= GRUB_TERM_STATUS_CAPS;
  	led_status ^= KEYBOARD_LED_CAPS;
  	keyboard_controller_led (led_status);
  
  #ifdef DEBUG_AT_KEYBOARD
  	grub_dprintf ("atkeyb", "caps_lock = %d\n", !!(at_keyboard_status & KEYBOARD_STATUS_CAPS_LOCK));
  #endif
 -	key = -1;
 -	break;
 +	return -1;
        case NUM_LOCK:
- 	/* Num lock sends scan code twice.  Get the second one and discard it.  */
- 	while (grub_keyboard_getkey () == -1);
- 
 -	at_keyboard_status ^= KEYBOARD_STATUS_NUM_LOCK;
 +	at_keyboard_status ^= GRUB_TERM_STATUS_NUM;
  	led_status ^= KEYBOARD_LED_NUM;
  	keyboard_controller_led (led_status);