Chameleon Commit Details - 926 - Chameleon open source boot loader project.

Date:

2011-05-30 22:05:13 (12 years 10 months ago)

Author:

Evan Lojewski

Commit:

926

Parents:

925

Message:

Update kReturnKey

Changes:

M	/trunk/i386/boot2/mboot.c
M	/trunk/i386/boot2/gui.h

File differences

-345
346 346
347 347
348 
349 
350 
351 
352 
353 
354 
355 348
356 349
357 350
+    return bootdevice;␊
}␊
␊
enum {␊
    kReturnKey     = 0x0d,␊
    kEscapeKey     = 0x1b,␊
    kBackspaceKey  = 0x08,␊
    kASCIIKeyMask  = 0x7f␊
};␊
␊
// This is the meat of our implementation.  It grabs the boot device from␊
// the multiboot_info and returns it as is.  If it fails it returns␊
// BAD_BOOT_DEVICE.  We can call an awful lot of libsa and libsaio but␊
     return bootdevice;␊
 }␊
 ␊
-enum {␊
-    kReturnKey     = 0x0d,␊
-    kEscapeKey     = 0x1b,␊
-    kBackspaceKey  = 0x08,␊
-    kASCIIKeyMask  = 0x7f␊
-};␊
-␊
 // This is the meat of our implementation.  It grabs the boot device from␊
 // the multiboot_info and returns it as is.  If it fails it returns␊
 // BAD_BOOT_DEVICE.  We can call an awful lot of libsa and libsaio but␊

-41
42 42
43 43
44 
44
45 45
46 46
47 47
+enum {␊
␉kBackspaceKey␉␉= 0x08,␊
␉kTabKey␉␉␉= 0x09,␊
␉kReturnKey␉␉= 0x0d,␊
␉kReturnKey␉␉= '\n',␊
␉kEscapeKey␉␉= 0x1b,␊
␉kUpArrowkey␉␉= 0x4800, ␊
␉kDownArrowkey␉␉= 0x5000,␊
 enum {␊
 ␉kBackspaceKey␉␉= 0x08,␊
 ␉kTabKey␉␉␉= 0x09,␊
-␉kReturnKey␉␉= 0x0d,␊
+␉kReturnKey␉␉= '\n',␊
 ␉kEscapeKey␉␉= 0x1b,␊
 ␉kUpArrowkey␉␉= 0x4800, ␊
 ␉kDownArrowkey␉␉= 0x5000,␊