vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

print a carriage return as well as a newline, in grub_putchar instead of console_putchar.

Browse source
This commit is contained in:
okuji 2000-08-27 16:02:08 +00:00
parent 563b471fc7
commit a1fafbfb0e
3 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2000-08-28 OKUJI Yoshinori <okuji@gnu.org>
* stage2/asm.S (console_putchar): Don't print a carriage return
when C is a newline.
* stage2/char_io.c (grub_putchar): Call grub_putchar with the
arugment set to a carriage return, if C is a newline.
[!STAGE1_5 && SUPPORT_SERIAL]: Don't print a carriage return
when C is a newline.
2000-08-27 OKUJI Yoshinori <okuji@gnu.org> 2000-08-27 OKUJI Yoshinori <okuji@gnu.org>
* lib/device.c [__linux__]: Don't include linux/fs.h. * lib/device.c [__linux__]: Don't include linux/fs.h.

12
stage2/asm.S
View file

@ -1395,17 +1395,7 @@ ENTRY(console_putchar)
push %ebx push %ebx
movb 0x10(%esp), %bl movb 0x10(%esp), %bl
/* if not '\n', just print the character */
cmpb $0xa, %bl
jne pc_notnewline
/* if newline, print CR as well */
pushl $0xd
call EXT_C(console_putchar)
popl %eax
pc_notnewline:
call EXT_C(prot_to_real) call EXT_C(prot_to_real)
.code16 .code16

10
stage2/char_io.c
View file

@ -878,6 +878,9 @@ checkkey (void)
void void
grub_putchar (int c) grub_putchar (int c)
{ {
if (c == '\n')
grub_putchar ('\r');
#ifdef STAGE1_5 #ifdef STAGE1_5
/* In Stage 1.5, only the normal console is supported. */ /* In Stage 1.5, only the normal console is supported. */
@ -890,12 +893,7 @@ grub_putchar (int c)
# ifdef SUPPORT_SERIAL # ifdef SUPPORT_SERIAL
if (terminal & TERMINAL_SERIAL) if (terminal & TERMINAL_SERIAL)
{ serial_putchar (c);
if (c == '\n')
serial_putchar ('\r');
serial_putchar (c);
}
# endif /* SUPPORT_SERIAL */ # endif /* SUPPORT_SERIAL */
#endif /* ! STAGE1_5 */ #endif /* ! STAGE1_5 */