← Back to branch summary

~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/fix-872244

« back to all changes in this revision

Viewing changes to grub-core/term/at_keyboard.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-17 23:59:10 UTC
  • mto: (17.3.55 sid)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: james.westby@ubuntu.com-20110517235910-ma8u889vyjdfro27
Tags: upstream-1.99
Import upstream version 1.99

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/term/at_keyboard.c
26
26
#include <grub/time.h>
27
27
#include <grub/loader.h>
28
28
 
 
29
GRUB_MOD_LICENSE ("GPLv3+");
 
30
 
29
31
static short at_keyboard_status = 0;
30
32
static int e0_received = 0;
31
33
static int f0_received = 0;
109
111
    {0x38, GRUB_KEYBOARD_KEY_RIGHT_ALT},
110
112
    {0x47, GRUB_KEYBOARD_KEY_HOME}, 
111
113
    {0x48, GRUB_KEYBOARD_KEY_UP},
112
 
    {0x49, GRUB_KEYBOARD_KEY_NPAGE},
 
114
    {0x49, GRUB_KEYBOARD_KEY_PPAGE}, 
113
115
    {0x4b, GRUB_KEYBOARD_KEY_LEFT},
114
116
    {0x4d, GRUB_KEYBOARD_KEY_RIGHT},
115
117
    {0x4f, GRUB_KEYBOARD_KEY_END}, 
116
118
    {0x50, GRUB_KEYBOARD_KEY_DOWN},
117
 
    {0x51, GRUB_KEYBOARD_KEY_PPAGE}, 
 
119
    {0x51, GRUB_KEYBOARD_KEY_NPAGE},
118
120
    {0x52, GRUB_KEYBOARD_KEY_INSERT},
119
121
    {0x53, GRUB_KEYBOARD_KEY_DELETE}, 
120
122
  };
330
332
      return;
331
333
    }
332
334
 
 
335
#if !(defined (GRUB_MACHINE_MIPS_YEELOONG) || defined (GRUB_MACHINE_QEMU))
 
336
  current_set = 1;
 
337
  return;
 
338
#endif
 
339
 
333
340
  grub_keyboard_controller_write (grub_keyboard_controller_orig
334
341
                                  & ~KEYBOARD_AT_TRANSLATE);
335
342
 
424
431
  if (!ret)
425
432
    {
426
433
      if (was_ext)
427
 
        grub_printf ("Unknown key 0xe0+0x%02x from set %d\n",
428
 
                     at_key, current_set);
 
434
        grub_dprintf ("atkeyb", "Unknown key 0xe0+0x%02x from set %d\n",
 
435
                      at_key, current_set);
429
436
      else
430
 
        grub_printf ("Unknown key 0x%02x from set %d\n",
431
 
                     at_key, current_set);
 
437
        grub_dprintf ("atkeyb", "Unknown key 0x%02x from set %d\n",
 
438
                      at_key, current_set);
432
439
      return -1;
433
440
    }
434
441
  return ret;