pass pointer to term to term functions

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-05-07 02:30:44 +02:00
1 parent 82e32bc310
commit 58664b94b7
19 files changed
+230 -181

No files matched your search

+4 -4
View File
@@ -1078,7 +1078,7 @@ xsmap:
*/
FUNCTION(grub_console_putchar)
/* Retrieve the base character. */
movl 0(%eax), %edx
movl 0(%edx), %edx
pusha
movb EXT_C(grub_console_cur_color), %bl
@@ -1329,8 +1329,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
@@ -1406,7 +1406,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
+7 -7
View File
@@ -47,14 +47,14 @@ grub_putcode_dumb (grub_uint32_t code,
{
int n;
n = 8 - ((term->getxy () >> 8) & 7);
n = 8 - ((term->getxy (term) >> 8) & 7);
while (n--)
grub_putcode_dumb (' ', term);
return;
}
(term->putchar) (&c);
(term->putchar) (term, &c);
if (code == '\n')
grub_putcode_dumb ('\r', term);
}
@@ -87,9 +87,9 @@ grub_getkey (void)
{
FOR_ACTIVE_TERM_INPUTS(term)
{
int key = term->checkkey ();
int key = term->checkkey (term);
if (key != -1)
return term->getkey ();
return term->getkey (term);
}
grub_cpu_idle ();
@@ -103,7 +103,7 @@ grub_checkkey (void)
FOR_ACTIVE_TERM_INPUTS(term)
{
int key = term->checkkey ();
int key = term->checkkey (term);
if (key != -1)
return key;
}
@@ -120,7 +120,7 @@ grub_getkeystatus (void)
FOR_ACTIVE_TERM_INPUTS(term)
{
if (term->getkeystatus)
status |= term->getkeystatus ();
status |= term->getkeystatus (term);
}
return status;
@@ -139,7 +139,7 @@ grub_cls (void)
grub_term_refresh (term);
}
else
(term->cls) ();
(term->cls) (term);
}
}