PATCH 2/2: Export console functions for use in Software Suspend.

From: Nigel Cunningham
Date: Fri Jan 09 2004 - 13:46:11 EST


Hi.

To implement a 'nice display' for Software Suspend, these functions
needed to be exported.

Regards,

Nigel

diff -ruN console-patch-1/drivers/char/vt.c console-patch-2/drivers/char/vt.c
--- console-patch-1/drivers/char/vt.c 2004-01-10 07:17:08.000000000 +1300
+++ console-patch-2/drivers/char/vt.c 2004-01-10 07:17:47.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, unsigned int new_x, unsigned int new_y);
+void gotoxy(int currcons, unsigned int new_x, unsigned 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, unsigned int new_x, unsigned int new_y)
+void gotoxy(int currcons, unsigned int new_x, unsigned int new_y)
{
unsigned 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;
diff -ruN console-patch-1/include/linux/selection.h console-patch-2/include/linux/selection.h
--- console-patch-1/include/linux/selection.h 2004-01-10 07:17:08.000000000 +1300
+++ console-patch-2/include/linux/selection.h 2004-01-10 07:32:06.000000000 +1300
@@ -2,6 +2,7 @@
* selection.h
*
* Interface between console.c, tty_io.c, vt.c, vc_screen.c and selection.c
+ * Also used by Software Suspend for its 'nice display'.
*/

#ifndef _LINUX_SELECTION_H_
@@ -42,4 +43,7 @@
extern u16 vcs_scr_readw(int currcons, const u16 *org);
extern void vcs_scr_writew(int currcons, u16 val, u16 *org);

+extern void gotoxy(int currcons, unsigned int new_x, unsigned int new_y);
+extern void reset_terminal(int currcons, int do_clear);
+extern void hide_cursor(int currcons);
#endif

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

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