Changeset cefb126 in mainline for kernel/arch/ia32/src/boot/vesa_prot.inc

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ia32/src/boot/vesa_prot.inc (modified) (7 diffs)

kernel/arch/ia32/src/boot/vesa_prot.inc

@@ -5 +5 @@
 #define MBINFO_OFFSET_CMDLINE   16
 
-        # copy real mode VESA initialization code
+        /* Copy real mode VESA initialization code */
+        
+        pm_status $status_vesa_copy
         
         mov $vesa_init, %esi
@@ -12 +14 @@
         rep movsb
         
-        # check for GRUB command line
+        /* Check for GRUB command line */
+        
+        pm_status $status_grub_cmdline
         
         mov grub_eax, %eax
@@ -23 +27 @@
         jnc no_cmdline
         
-        # skip the kernel path in command line
+        /* Skip the kernel path in command line */
         
         mov MBINFO_OFFSET_CMDLINE(%ebx), %esi
@@ -52 +56 @@
         space_loop_done:
         
-        # copy at most 23 characters from command line
+        /* Copy at most 23 characters from command line */
         
         mov $VESA_INIT_SEGMENT << 4, %edi
@@ -68 +72 @@
         cmd_loop_done:
         
-        # zero termination
+        /* Zero termination */
         
         xor %eax, %eax
@@ -75 +79 @@
         no_cmdline:
         
-        # jump to the real mode
+        /* Jump to the real mode */
+        
+        pm_status $status_vesa_real
         
         mov $VESA_INIT_SEGMENT << 4, %edi
@@ -81 +87 @@
         
         vesa_meeting_point:
-                # returned back to protected mode
+                /* Returned back to protected mode */
                 
                 mov %ax, KA2PA(vesa_scanline)