Changeset 113

Timestamp:

Mar 26, 2010 12:55:18 PM (3 years ago)

Author:

stepan

Message:

use new libpayload HID mechanism to register reset handler for
USB and PS2 keyboard

Signed-off-by: Stefan Reinauer <stepan@…>

File:

• trunk/filo/main/filo.c (modified) (4 diffs)

trunk/filo/main/filo.c

@@ -46 +46 @@
 void relocate(void);
 
+void filo_reset_handler(void)
+{
+        void __attribute__((weak)) platform_reboot(void);
+
+        if (platform_reboot)
+                platform_reboot();
+        else
+                printf("Rebooting not supported.\n");
+
+}
+
+
 static void init(void)
 {
+    /* Gather system information, and implicitly sets up timers */
+    lib_get_sysinfo();
+
     /* Set up the consoles. */
     console_init();
-
-    /* Gather system information, and implicitly sets up timers */
-    lib_get_sysinfo();
 
     printf("%s version %s\n", program_name, program_version);
@@ -69 +81 @@
 #endif
 #endif
-
-
+#if defined(CONFIG_PC_KEYBOARD) || defined(CONFIG_USB_HID)
+    add_reset_handler(filo_reset_handler);
+#endif
 #ifdef CONFIG_SUPPORT_SOUND
     sound_init();
@@ -126 +139 @@
 }
 
-void reset_handler(void)
-{
-        void __attribute__((weak)) platform_reboot(void);
-
-        if (platform_reboot)
-                platform_reboot();
-        else
-                printf("Rebooting not supported.\n");
-
-}
-
 #if CONFIG_USE_GRUB
 /* The main routine */
@@ -146 +148 @@
     /* Initialize */
     init();
-#ifdef CONFIG_PC_KEYBOARD
-    keyboard_add_reset_handler(reset_handler);
-#endif
     grub_menulst();
     grub_main();