Merge mainline into keylayouts

kern/i386/pc/startup.S

@@ -1063,7 +1063,7 @@ xsmap:
 
 
 /*
- * void grub_console_real_putchar (int c)
+ * void grub_console_putchar (const struct grub_unicode_glyph *c)
  *
  * Put the character C on the console. Because GRUB wants to write a
  * character with an attribute, this implementation is a bit tricky.
@@ -1076,8 +1076,9 @@ xsmap:
  * get the height of the screen, and the TELETYPE OUTPUT BIOS call doesn't
  * support setting a background attribute.
  */
-FUNCTION(grub_console_real_putchar)
-	movl	%eax, %edx
+FUNCTION(grub_console_putchar)
+	/* Retrieve the base character.  */
+	movl	0(%edx), %edx
 	pusha
 	movb	EXT_C(grub_console_cur_color), %bl
 
@@ -1279,8 +1280,8 @@ FUNCTION(grub_console_gotoxy)
 	pushl	%ebp
 	pushl	%ebx                    /* save EBX */
 
-	movb	%dl, %dh	/* %dh = y */
-	movb	%al, %dl	/* %dl = x */
+	movb	%cl, %dh	/* %dh = y */
+	/* %dl = x */
 
 	call	prot_to_real
 	.code16
@@ -1356,7 +1357,7 @@ FUNCTION(grub_console_setcursor)
 	pushl	%ebx
 
 	/* push ON */
-	pushl	%eax
+	pushl	%edx
 
 	/* check if the standard cursor shape has already been saved */
 	movw	console_cursor_shape, %ax