PATCH: Export console functions for use by Software Suspend nicedisplay

From: Nigel Cunningham
Date: Thu Jan 22 2004 - 03:11:30 EST


Hi.

Here's a second patch; this exports gotoxy, reset_terminal, hide_cursor,
getconsxy and putconsxy for use in Software Suspend's nice display.


diff -ruN linux-2.6.1/drivers/char/vt.c software-suspend-linux-2.6.1-rev3/drivers/char/vt.c
--- linux-2.6.1/drivers/char/vt.c 2004-01-13 16:22:58.000000000 +1300
+++ software-suspend-linux-2.6.1-rev3/drivers/char/vt.c 2004-01-22 17:39:08.000000000 +1300
@@ -149,13 +149,13 @@
static void vc_init(unsigned int console, unsigned int rows,
unsigned int cols, int do_clear);
static void blank_screen(unsigned long dummy);
-static void gotoxy(int currcons, int new_x, int new_y);
+void gotoxy(int currcons, int new_x, int new_y);
static void save_cur(int currcons);
-static void reset_terminal(int currcons, int do_clear);
+void reset_terminal(int currcons, int do_clear);
static void con_flush_chars(struct tty_struct *tty);
static void set_vesa_blanking(unsigned long arg);
static void set_cursor(int currcons);
-static void hide_cursor(int currcons);
+void hide_cursor(int currcons);
static void unblank_screen_t(unsigned long dummy);
static void console_callback(void *ignored);

@@ -530,7 +530,7 @@
sw->con_putc(vc_cons[currcons].d, i, y, x);
}

-static void hide_cursor(int currcons)
+void hide_cursor(int currcons)
{
if (currcons == sel_cons)
clear_selection();
@@ -859,7 +859,7 @@
* might also be negative. If the given position is out of
* bounds, the cursor is placed at the nearest margin.
*/
-static void gotoxy(int currcons, int new_x, int new_y)
+void gotoxy(int currcons, int new_x, int new_y)
{
int min_y, max_y;

@@ -1403,7 +1403,7 @@
ESpalette };

/* console_sem is held (except via vc_init()) */
-static void reset_terminal(int currcons, int do_clear)
+void reset_terminal(int currcons, int do_clear)
{
top = 0;
bottom = video_num_lines;
@@ -2996,13 +2996,13 @@
return screenpos(currcons, 2 * w_offset, viewed);
}

-void getconsxy(int currcons, char *p)
+void getconsxy(int currcons, unsigned char *p)
{
p[0] = x;
p[1] = y;
}

-void putconsxy(int currcons, char *p)
+void putconsxy(int currcons, unsigned char *p)
{
gotoxy(currcons, p[0], p[1]);
set_cursor(currcons);

--
My work on Software Suspend is graciously brought to you by
LinuxFund.org.

Attachment: signature.asc
Description: This is a digitally signed message part