. 修正 timeout 函数 issues #418

chenall · Jul 1, 2023 · 4fe13e6 · 4fe13e6
1 parent f7219af
commit 4fe13e6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/ChangeLog_chenall.txt b/ChangeLog_chenall.txt
@@ -1,4 +1,7 @@
 更新说明：
+2023-07-01 (yaya)
+  修正 timeout 函数。issues #418
+
 2023-06-23 (yaya)
   碎片数由39增加到126。
   避免分区项空洞。issues #416

diff --git a/stage2/asm.S b/stage2/asm.S
@@ -15056,7 +15056,7 @@ ENTRY(console_getkey)
 
 	cmpl	$0xFFFFFFFF, %edx
 	jne	1f
-  pushl $20
+  pushl $1
   call defer
   popl %eax
   cmpb $0, beep_enable
@@ -15217,7 +15217,7 @@ ENTRY(console_checkkey)
 9:
 	cmpl	$0xFFFFFFFF, %edx
 	jne 3f
-	pushl $20
+	pushl $1
 	call defer
 	popl %eax
 	cmpb $0, beep_enable

diff --git a/stage2/stage2.c b/stage2/stage2.c
@@ -978,10 +978,8 @@ run_menu (char *menu_entries, char *config_entries, /*int num_entries,*/ char *h
   if (! show_menu)
     {
       /* Get current time.  */
-//      while ((time1 = getrtsecs ()) == 0xFF)
-//	;
-		if (grub_timeout >= 0)
-			timeout_enable = 1;
+      while ((time1 = getrtsecs ()) == 0xFF)
+	;
 
       while (1)
 	{
@@ -1018,9 +1016,7 @@ run_menu (char *menu_entries, char *config_entries, /*int num_entries,*/ char *h
 
 	  /* If GRUB_TIMEOUT is expired, boot the default entry.  */
 	  if (grub_timeout >=0
-//	      && (time1 = getrtsecs ()) != time2
-				&& time1 != time2
-	      /* && time1 != 0xFF */)
+	      && (time1 = getrtsecs ()) != time2)
 	    {
 	      if (grub_timeout <= 0)
 		{
@@ -1187,8 +1183,9 @@ run_menu (char *menu_entries, char *config_entries, /*int num_entries,*/ char *h
    if (menu_init_script_file[0] != 0 )	
 	 command_func(menu_init_script_file,BUILTIN_MENU);
   /* XX using RT clock now, need to initialize value */
-//  while ((time1 = getrtsecs()) == 0xFF);
-	if (grub_timeout >= 0)
+  if (!ext_timer)
+    while ((time1 = getrtsecs()) == 0xFF);
+  else if (grub_timeout >= 0)
 		timeout_enable = 1;
 
   old_c = 0;
@@ -1202,9 +1199,9 @@ run_menu (char *menu_entries, char *config_entries, /*int num_entries,*/ char *h
       /* Initialize to NULL just in case...  */
       //cur_entry = NULL;
 	//cur_entry = menu_entries; /* for modified menu */
-
-//      if (grub_timeout >= 0 && (time1 = getrtsecs()) != time2 /* && time1 != 0xFF */)
-		if (grub_timeout >= 0 && time1 != time2 /* && time1 != 0xFF */)
+    if (grub_timeout >= 0 && 
+        ((!ext_timer && ((time1 = getrtsecs()) != time2)) ||
+        (ext_timer && time1 != time2)))
 	{
 	  if (grub_timeout <= 0)
 	    {