Changeset ed88c8e in mainline for kernel/arch/ia32/src/asm.S

Timestamp:

2018-05-29T13:25:07Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fc0b2a8

Parents:

a57fa32

git-author:

Jiri Svoboda <jiri@…> (2018-05-28 17:24:17)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-29 13:25:07)

Message:

fputc, putchar vs. fputwc, putwchar.

File:

• kernel/arch/ia32/src/asm.S (modified) (7 diffs)

kernel/arch/ia32/src/asm.S

@@ -451 +451 @@
  *
  */
-FUNCTION_BEGIN(early_putchar)
+FUNCTION_BEGIN(early_putwchar)
 
 #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB)))
@@ -484 +484 @@
         /* Sanity check for the cursor on screen */
         cmp $2000, %ax
-        jb early_putchar_cursor_ok
+        jb early_putwchar_cursor_ok
 
                 movw $1998, %ax
 
-        early_putchar_cursor_ok:
+        early_putwchar_cursor_ok:
 
         movw %ax, %bx
@@ -497 +497 @@
 
         cmp $0x0a, %al
-        jne early_putchar_backspace
+        jne early_putwchar_backspace
 
                 /* Interpret newline */
@@ -511 +511 @@
                 subw %dx, %bx
 
-                jmp early_putchar_skip
-
-        early_putchar_backspace:
+                jmp early_putwchar_skip
+
+        early_putwchar_backspace:
 
                 cmp $0x08, %al
-                jne early_putchar_print
+                jne early_putwchar_print
 
                 /* Interpret backspace */
 
                 cmp $0x0000, %bx
-                je early_putchar_skip
+                je early_putwchar_skip
 
                 dec %bx
-                jmp early_putchar_skip
-
-        early_putchar_print:
+                jmp early_putwchar_skip
+
+        early_putwchar_print:
 
                 /* Print character */
@@ -534 +534 @@
                 inc %bx
 
-        early_putchar_skip:
+        early_putwchar_skip:
 
         /* Sanity check for the cursor on the last line */
         cmp $2000, %bx
-        jb early_putchar_no_scroll
+        jb early_putwchar_no_scroll
 
                 /* Scroll the screen (24 rows) */
@@ -554 +554 @@
                 movw $1920, %bx
 
-        early_putchar_no_scroll:
+        early_putwchar_no_scroll:
 
         /* Write bits 8 - 15 of the cursor address */
@@ -583 +583 @@
 
         ret
-FUNCTION_END(early_putchar)
-
+FUNCTION_END(early_putwchar)
+