summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@maxwell.earthlink.net>2002-11-01 01:07:16 -0800
committerJames Simmons <jsimmons@maxwell.earthlink.net>2002-11-01 01:07:16 -0800
commit857361ee2e2f7a5845c3c06bd4ccc1ae30cda3d7 (patch)
tree51fae2780ceec8363d40a2346956c298e10ba171
parent112483d2e231050107ee19a62047daf64968472b (diff)
Neomagic and HGA updates. MAde the software accel code modular. So code cleanup in fbcon. More to go.
Diffstat
-rw-r--r--drivers/char/toshiba.c2
-rw-r--r--drivers/video/Kconfig2
-rw-r--r--drivers/video/Makefile3
-rw-r--r--drivers/video/cfbcopyarea.c9
-rw-r--r--drivers/video/cfbfillrect.c8
-rw-r--r--drivers/video/cfbimgblt.c9
-rw-r--r--drivers/video/console/Kconfig13
-rw-r--r--drivers/video/console/Makefile1
-rw-r--r--drivers/video/console/fbcon-hga.c253
-rw-r--r--drivers/video/console/fbcon.c656
-rw-r--r--drivers/video/console/fbcon.h2
-rw-r--r--drivers/video/fbgen.c29
-rw-r--r--drivers/video/fbmem.c35
-rw-r--r--drivers/video/hgafb.c185
-rw-r--r--drivers/video/neofb.c257
-rw-r--r--drivers/video/tdfxfb.c2
-rw-r--r--include/video/neomagic.h1
17 files changed, 605 insertions, 862 deletions
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 187c78b64fa3..43e4ff396eb8 100644
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -210,7 +210,7 @@ static int tosh_emulate_fan(SMMRegisters *regs)
/*
* Put the laptop into System Management Mode
*/
-static int tosh_smm(SMMRegisters *regs)
+int tosh_smm(SMMRegisters *regs)
{
int eax;
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 0701b47fc330..44713d45e05c 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -297,7 +297,7 @@ config FB_CT65550
config FB_IMSTT
bool "IMS Twin Turbo display support"
- depends on FB && PPC
+ depends on FB && PCI
help
The IMS Twin Turbo is a PCI-based frame buffer card bundled with
many Macintosh and compatible computers.
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 477e0cb7e68c..08aa6478b3c1 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -5,7 +5,8 @@
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
-export-objs := fbmem.o fbcmap.o fbgen.o fbmon.o modedb.o cyber2000fb.o
+export-objs := fbmem.o fbcmap.o fbgen.o fbmon.o modedb.o cfbfillrect.o \
+ cfbcopyarea.o cfbimgblt.o cyber2000fb.o
# Each configuration option enables a list of files.
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index 3bfa19f2b31c..d4f85a716934 100644
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -20,6 +20,8 @@
* the native cpu endians. I also need to deal with MSB position in the word.
*
*/
+#include <linux/config.h>
+#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/fb.h>
@@ -667,3 +669,10 @@ void cfb_copyarea(struct fb_info *p, struct fb_copyarea *area)
}
}
}
+
+EXPORT_SYMBOL(cfb_copyarea);
+
+MODULE_AUTHOR("James Simmons <jsimmons@users.sf.net>");
+MODULE_DESCRIPTION("Generic software accelerated copyarea");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c
index 8f42a317a1c4..ea7c8b763f11 100644
--- a/drivers/video/cfbfillrect.c
+++ b/drivers/video/cfbfillrect.c
@@ -17,6 +17,8 @@
* the native cpu endians. I also need to deal with MSB position in the word.
*
*/
+#include <linux/config.h>
+#include <linux/module.h>
#include <linux/string.h>
#include <linux/fb.h>
#include <asm/types.h>
@@ -224,3 +226,9 @@ void cfb_fillrect(struct fb_info *p, struct fb_fillrect *rect)
}
return;
}
+
+EXPORT_SYMBOL(cfb_fillrect);
+
+MODULE_AUTHOR("James Simmons <jsimmons@users.sf.net>");
+MODULE_DESCRIPTION("Generic software accelerated fill rectangle");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index 96018596ca8e..d1d529bf2507 100644
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -34,6 +34,8 @@
* the native cpu endians. I also need to deal with MSB position in the word.
*
*/
+#include <linux/config.h>
+#include <linux/module.h>
#include <linux/string.h>
#include <linux/fb.h>
#include <asm/types.h>
@@ -338,3 +340,10 @@ void cfb_imageblit(struct fb_info *p, struct fb_image *image)
end_mask = 0;
}
}
+
+EXPORT_SYMBOL(cfb_imageblit);
+
+MODULE_AUTHOR("James Simmons <jsimmons@users.sf.net>");
+MODULE_DESCRIPTION("Generic software accelerated imaging drawing");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 141e82629db8..b2dcf643190e 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -121,8 +121,8 @@ config FBCON_ADVANCED
config FBCON_ACCEL
tristate "Hardware acceleration support" if FBCON_ADVANCED
depends on FB
- default m if !FBCON_ADVANCED && FB_NEOMAGIC!=y && !FB_VESA && !FB_FM2 && FB_HIT!=y && !FB_HP300 && !FB_Q40 && !FB_ANAKIN && !FB_G364 && FB_VIRTUAL!=y && !FB_CLPS711X && !FB_PMAG_BA && !FB_PMAGB_B && FB_3DFX!=y && !FB_TX3912 && !FB_MAXINE && !FB_APOLLO && FB_ATY!=y && !FB_MAC && FB_RIVA!=y && !FB_OF && FB_SGIVW!=y && (FB_NEOMAGIC=m || FB_HIT=m || FB_VIRTUAL=m || FB_3DFX=m || FB_RIVA=m || FB_SGIVW=m)
- default y if !FBCON_ADVANCED && (FB_NEOMAGIC=y || FB_VESA || FB_FM2 || FB_HIT=y || FB_HP300 || FB_Q40 || FB_ANAKIN || FB_G364 || FB_VIRTUAL=y || FB_CLPS711X || FB_PMAG_BA || FB_PMAGB_B || FB_3DFX=y || FB_TX3912 || FB_MAXINE || FB_APOLLO || FB_ATY=y || FB_MAC || FB_RIVA=y || FB_OF || FB_SGIVW=y)
+ default m if !FBCON_ADVANCED && FB_NEOMAGIC!=y && !FB_VESA && !FB_FM2 && FB_HIT!=y && !FB_HP300 && !FB_Q40 && !FB_ANAKIN && !FB_G364 && FB_VIRTUAL!=y && !FB_CLPS711X && !FB_PMAG_BA && !FB_PMAGB_B && FB_3DFX!=y && !FB_TX3912 && !FB_MAXINE && !FB_APOLLO && FB_ATY!=y && !FB_MAC && FB_RIVA!=y && FB_HGA!=y && !FB_OF && FB_SGIVW!=y && (FB_NEOMAGIC=m || FB_HIT=m || FB_VIRTUAL=m || FB_3DFX=m || FB_RIVA=m || FB_SGIVW=m || FB_HGA=m)
+ default y if !FBCON_ADVANCED && (FB_NEOMAGIC=y || FB_VESA || FB_FM2 || FB_HIT=y || FB_HP300 || FB_Q40 || FB_ANAKIN || FB_G364 || FB_VIRTUAL=y || FB_CLPS711X || FB_PMAG_BA || FB_PMAGB_B || FB_3DFX=y || FB_TX3912 || FB_MAXINE || FB_APOLLO || FB_ATY=y || FB_MAC || FB_RIVA=y || FB_OF || FB_SGIVW=y || FB_HGA=y)
config FBCON_AFB
tristate "Amiga bitplanes support" if FBCON_ADVANCED
@@ -166,15 +166,6 @@ config FBCON_IPLAN2P8
This is the low level frame buffer console driver for 8 interleaved
bitplanes (256 colors) on Atari.
-config FBCON_HGA
- tristate "HGA monochrome support (EXPERIMENTAL)" if FBCON_ADVANCED
- depends on FB
- default m if !FBCON_ADVANCED && FB_HGA=m
- default y if !FBCON_ADVANCED && FB_HGA=y
- help
- This is the low level frame buffer console driver for Hercules mono
- graphics cards.
-
# Guess what we need
config FBCON_STI
tristate
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
index 39f27786820a..0ed93a4ca40a 100644
--- a/drivers/video/console/Makefile
+++ b/drivers/video/console/Makefile
@@ -36,7 +36,6 @@ obj-$(CONFIG_FBCON_ILBM) += fbcon-ilbm.o
obj-$(CONFIG_FBCON_IPLAN2P2) += fbcon-iplan2p2.o
obj-$(CONFIG_FBCON_IPLAN2P4) += fbcon-iplan2p4.o
obj-$(CONFIG_FBCON_IPLAN2P8) += fbcon-iplan2p8.o
-obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o
obj-$(CONFIG_FBCON_STI) += fbcon-sti.o
obj-$(CONFIG_FBCON_ACCEL) += fbcon-accel.o
diff --git a/drivers/video/console/fbcon-hga.c b/drivers/video/console/fbcon-hga.c
deleted file mode 100644
index 4cb12c6e47f5..000000000000
--- a/drivers/video/console/fbcon-hga.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * linux/drivers/video/fbcon-hga.c -- Low level frame buffer operations for
- * the Hercules graphics adaptor
- *
- * Created 25 Nov 1999 by Ferenc Bakonyi (fero@drama.obuda.kando.hu)
- * Based on fbcon-mfb.c by Geert Uytterhoeven
- *
- * History:
- *
- * - Revision 0.1.0 (6 Dec 1999): comment changes
- * - First release (25 Nov 1999)
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file COPYING in the main directory of this archive for
- * more details.
- */
-
-#include <linux/module.h>
-#include <linux/tty.h>
-#include <linux/console.h>
-#include <linux/string.h>
-#include <linux/fb.h>
-
-#include <video/fbcon.h>
-#include <video/fbcon-hga.h>
-
-#if 0
-#define DPRINTK(args...) printk(KERN_DEBUG __FILE__": " ##args)
-#else
-#define DPRINTK(args...)
-#endif
-
-#define HGA_ROWADDR(row) ((row%4)*8192 + (row>>2)*90)
-
- /*
- * Hercules monochrome
- */
-
-static inline u8* rowaddr(struct display *p, u_int row)
-{
- return p->fb_info->screen_base + HGA_ROWADDR(row);
-}
-
-void fbcon_hga_setup(struct display *p)
-{
- DPRINTK("fbcon_hga_setup: ll:%d\n", (int)p->line_length);
-
- p->next_line = p->fb_info->fix.line_length;
- p->next_plane = 0;
-}
-
-void fbcon_hga_bmove(struct display *p, int sy, int sx, int dy, int dx,
- int height, int width)
-{
- u8 *src, *dest;
- u_int rows, y1, y2;
-
-#if 0
- if (sx == 0 && dx == 0 && width == p->next_line) {
- src = p->fb_info->screen_base+sy*fontheight(p)*width;
- dest = p->fb_info->screen_base+dy*fontheight(p)*width;
- fb_memmove(dest, src, height*fontheight(p)*width);
- } else
-#endif
- if (dy <= sy) {
- y1 = sy*fontheight(p);
- y2 = dy*fontheight(p);
- for (rows = height*fontheight(p); rows--; ) {
- src = rowaddr(p, y1)+sx;
- dest = rowaddr(p, y2)+dx;
- fb_memmove(dest, src, width);
- y1++;
- y2++;
- }
- } else {
- y1 = (sy+height)*fontheight(p)-1;
- y2 = (dy+height)*fontheight(p)-1;
- for (rows = height*fontheight(p); rows--;) {
- src = rowaddr(p, y1)+sx;
- dest = rowaddr(p, y2)+dx;
- fb_memmove(dest, src, width);
- y1--;
- y2--;
- }
- }
-}
-
-void fbcon_hga_clear(struct vc_data *conp, struct display *p, int sy, int sx,
- int height, int width)
-{
- u8 *dest;
- u_int rows, y;
- int inverse = conp ? attr_reverse(p,conp->vc_video_erase_char) : 0;
-
- DPRINTK("fbcon_hga_clear: sx:%d, sy:%d, height:%d, width:%d\n", sx, sy, height, width);
-
- y = sy*fontheight(p);
-#if 0
- if (sx == 0 && width == p->next_line) {
- if (inverse) {
- fb_memset255(dest, height*fontheight(p)*width);
- } else {
- fb_memclear(dest, height*fontheight(p)*width);
- }
- } else
-#endif
- for (rows = height*fontheight(p); rows--; y++) {
- dest = rowaddr(p, y)+sx;
- if (inverse) {
- fb_memset255(dest, width);
- } else {
- fb_memclear(dest, width);
- }
- }
-}
-
-void fbcon_hga_putc(struct vc_data *conp, struct display *p, int c, int yy,
- int xx)
-{
- u8 *dest, *cdat;
- u_int rows, y, bold, revs, underl;
- u8 d;
-
- cdat = p->fontdata+(c&p->charmask)*fontheight(p);
- bold = attr_bold(p, c);
- revs = attr_reverse(p, c);
- underl = attr_underline(p, c);
- y = yy*fontheight(p);
-
- for (rows = fontheight(p); rows--; y++) {
- d = *cdat++;
- if (underl && !rows)
- d = 0xff;
- else if (bold)
- d |= d>>1;
- if (revs)
- d = ~d;
- dest = rowaddr(p, y)+xx;
- *dest = d;
- }
-}
-
-void fbcon_hga_putcs(struct vc_data *conp, struct display *p,
- const unsigned short *s, int count, int yy, int xx)
-{
- u8 *dest, *cdat;
- u_int rows, y, y0, bold, revs, underl;
- u8 d;
- u16 c;
-
- c = scr_readw(s);
- bold = attr_bold(p, c);
- revs = attr_reverse(p, c);
- underl = attr_underline(p, c);
- y0 = yy*fontheight(p);
-
- while (count--) {
- c = scr_readw(s++) & p->charmask;
- cdat = p->fontdata+c*fontheight(p);
- y = y0;
- for (rows = fontheight(p); rows--; y++) {
- d = *cdat++;
- if (underl && !rows)
- d = 0xff;
- else if (bold)
- d |= d>>1;
- if (revs)
- d = ~d;
- dest = rowaddr(p, y)+xx;
- *dest = d;
- }
- xx++;
- }
-}
-
-void fbcon_hga_revc(struct display *p, int xx, int yy)
-{
- u8 *dest;
- u_int rows, y;
-
- y = yy*fontheight(p);
- for (rows = fontheight(p); rows--; y++) {
- dest = rowaddr(p, y)+xx;
- *dest = ~*dest;
- }
-}
-
-void fbcon_hga_clear_margins(struct vc_data *conp, struct display *p,
- int bottom_only)
-{
- u8 *dest;
- u_int height, y;
- int inverse = conp ? attr_reverse(p,conp->vc_video_erase_char) : 0;
-
- DPRINTK("fbcon_hga_clear_margins: enter\n");
-
- /* No need to handle right margin. */
-
- y = conp->vc_rows * fontheight(p);
- for (height = p->var.yres - y; height-- > 0; y++) {
- DPRINTK("fbcon_hga_clear_margins: y:%d, height:%d\n", y, height);
- dest = rowaddr(p, y);
- if (inverse) {
- fb_memset255(dest, p->next_line);
- } else {
- fb_memclear(dest, p->next_line);
- }
- }
-}
-
-
- /*
- * `switch' for the low level operations
- */
-
-struct display_switch fbcon_hga = {
- .setup = fbcon_hga_setup,
- .bmove = fbcon_hga_bmove,
- .clear = fbcon_hga_clear,
- .putc = fbcon_hga_putc,
- .putcs = fbcon_hga_putcs,
- .revc = fbcon_hga_revc,
- .clear_margins =fbcon_hga_clear_margins,
- .fontwidthmask =FONTWIDTH(8)
-};
-
-
-#ifdef MODULE
-MODULE_LICENSE("GPL");
-
-int init_module(void)
-{
- return 0;
-}
-
-void cleanup_module(void)
-{
-}
-#endif /* MODULE */
-
-
- /*
- * Visible symbols for modules
- */
-
-EXPORT_SYMBOL(fbcon_hga);
-EXPORT_SYMBOL(fbcon_hga_setup);
-EXPORT_SYMBOL(fbcon_hga_bmove);
-EXPORT_SYMBOL(fbcon_hga_clear);
-EXPORT_SYMBOL(fbcon_hga_putc);
-EXPORT_SYMBOL(fbcon_hga_putcs);
-EXPORT_SYMBOL(fbcon_hga_revc);
-EXPORT_SYMBOL(fbcon_hga_clear_margins);
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 85b9505b9702..854b5b119bbb 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -134,7 +134,7 @@ static int softback_lines;
#define CM_SOFTBACK (8)
-#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * conp->vc_size_row)
+#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc->vc_size_row)
static void fbcon_free_font(struct display *);
static int fbcon_set_origin(struct vc_data *);
@@ -177,24 +177,24 @@ static inline void cursor_undrawn(void)
*/
static const char *fbcon_startup(void);
-static void fbcon_init(struct vc_data *conp, int init);
-static void fbcon_deinit(struct vc_data *conp);
+static void fbcon_init(struct vc_data *vc, int init);
+static void fbcon_deinit(struct vc_data *vc);
static int fbcon_changevar(int con);
-static void fbcon_clear(struct vc_data *conp, int sy, int sx, int height,
+static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
int width);
-static void fbcon_putc(struct vc_data *conp, int c, int ypos, int xpos);
-static void fbcon_putcs(struct vc_data *conp, const unsigned short *s, int count,
+static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos);
+static void fbcon_putcs(struct vc_data *vc, const unsigned short *s, int count,
int ypos, int xpos);
-static void fbcon_cursor(struct vc_data *conp, int mode);
-static int fbcon_scroll(struct vc_data *conp, int t, int b, int dir,
+static void fbcon_cursor(struct vc_data *vc, int mode);
+static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
int count);
-static void fbcon_bmove(struct vc_data *conp, int sy, int sx, int dy, int dx,
+static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
int height, int width);
-static int fbcon_switch(struct vc_data *conp);
-static int fbcon_blank(struct vc_data *conp, int blank);
-static int fbcon_font_op(struct vc_data *conp, struct console_font_op *op);
-static int fbcon_set_palette(struct vc_data *conp, unsigned char *table);
-static int fbcon_scrolldelta(struct vc_data *conp, int lines);
+static int fbcon_switch(struct vc_data *vc);
+static int fbcon_blank(struct vc_data *vc, int blank);
+static int fbcon_font_op(struct vc_data *vc, struct console_font_op *op);
+static int fbcon_set_palette(struct vc_data *vc, unsigned char *table);
+static int fbcon_scrolldelta(struct vc_data *vc, int lines);
/*
@@ -205,13 +205,13 @@ static void fbcon_set_display(int con, int init, int logo);
static __inline__ int real_y(struct display *p, int ypos);
static void fbcon_vbl_handler(int irq, void *dummy, struct pt_regs *fp);
static __inline__ void updatescrollmode(struct display *p);
-static __inline__ void ywrap_up(int unit, struct vc_data *conp,
+static __inline__ void ywrap_up(int unit, struct vc_data *vc,
struct display *p, int count);
-static __inline__ void ywrap_down(int unit, struct vc_data *conp,
+static __inline__ void ywrap_down(int unit, struct vc_data *vc,
struct display *p, int count);
-static __inline__ void ypan_up(int unit, struct vc_data *conp,
+static __inline__ void ypan_up(int unit, struct vc_data *vc,
struct display *p, int count);
-static __inline__ void ypan_down(int unit, struct vc_data *conp,
+static __inline__ void ypan_down(int unit, struct vc_data *vc,
struct display *p, int count);
static void fbcon_bmove_rec(struct display *p, int sy, int sx, int dy, int dx,
int height, int width, u_int y_break);
@@ -262,41 +262,6 @@ static int __init fbconsole_setup(char *options)
__setup("fbcon=", fbconsole_setup);
-/**
- * PROC_CONSOLE - find the attached tty or visible console
- * @info: frame buffer info structure
- *
- * Finds the tty attached to the process or visible console if
- * the process is not directly attached to a tty (e.g. remote
- * user) for device @info.
- *
- * Returns -1 errno on error, or tty/visible console number
- * on success.
- *
- */
-
-int PROC_CONSOLE(const struct fb_info *info)
-{
- int fgc;
-
- if (info->display_fg != NULL)
- fgc = info->display_fg->vc_num;
- else
- return -1;
-
- if (!current->tty)
- return fgc;
-
- if (current->tty->driver.type != TTY_DRIVER_TYPE_CONSOLE)
- /* XXX Should report error here? */
- return fgc;
-
- if (minor(current->tty->device) < 1)
- return fgc;
-
- return minor(current->tty->device) - 1;
-}
-
void gen_set_disp(int con, struct fb_info *info)
{
struct display *display = fb_display + con;
@@ -332,41 +297,6 @@ void gen_set_disp(int con, struct fb_info *info)
}
/**
- * set_all_vcs - set all virtual consoles to match
- * @fbidx: frame buffer index (e.g. fb0, fb1, ...)
- * @fb: frame buffer ops structure
- * @var: frame buffer screen structure to set
- * @info: frame buffer info structure
- *
- * Set all virtual consoles to match screen info set in @var
- * for device @info.
- *
- * Returns negative errno on error, or zero on success.
- *
- */
-
-int set_all_vcs(int fbidx, struct fb_ops *fb, struct fb_var_screeninfo *var,
- struct fb_info *info)
-{
- int unit, err;
-
- var->activate |= FB_ACTIVATE_TEST;
- err = fb_set_var(var, info);
- var->activate &= ~FB_ACTIVATE_TEST;
- gen_set_disp(PROC_CONSOLE(info), info);
- if (err)
- return err;
- for (unit = 0; unit < MAX_NR_CONSOLES; unit++)
- if (fb_display[unit].conp && con2fb_map[unit] == fbidx) {
- if (CON_IS_VISIBLE(fb_display[unit].conp))
- fb_set_var(var, info);
- gen_set_disp(unit, info);
- }
- return 0;
-}
-
-
-/**
* set_con2fb_map - map console to frame buffer device
* @unit: virtual console number to map
* @newidx: frame buffer index to map virtual console to
@@ -380,7 +310,7 @@ void set_con2fb_map(int unit, int newidx)
{
int oldidx = con2fb_map[unit];
struct fb_info *oldfb, *newfb;
- struct vc_data *conp;
+ struct vc_data *vc;
char *fontdata;
unsigned short fontwidth, fontheight, fontwidthlog, fontheightlog;
int userfont;
@@ -399,7 +329,7 @@ void set_con2fb_map(int unit, int newidx)
oldfb->fbops->fb_release(oldfb,0);
if (oldfb->fbops->owner)
__MOD_DEC_USE_COUNT(oldfb->fbops->owner);
- conp = fb_display[unit].conp;
+ vc = fb_display[unit].conp;
fontdata = fb_display[unit].fontdata;
fontwidth = fb_display[unit]._fontwidth;
fontheight = fb_display[unit]._fontheight;
@@ -408,7 +338,7 @@ void set_con2fb_map(int unit, int newidx)
userfont = fb_display[unit].userfont;
con2fb_map[unit] = newidx;
- fb_display[unit].conp = conp;
+ fb_display[unit].conp = vc;
fb_display[unit].fontdata = fontdata;
fb_display[unit]._fontwidth = fontwidth;
fb_display[unit]._fontheight = fontheight;
@@ -417,10 +347,10 @@ void set_con2fb_map(int unit, int newidx)
fb_display[unit].userfont = userfont;
fb_display[unit].fb_info = newfb;
gen_set_disp(unit, newfb);
- if (conp)
- conp->vc_display_fg = &newfb->display_fg;
+ if (vc)
+ vc->vc_display_fg = &newfb->display_fg;
if (!newfb->display_fg)
- newfb->display_fg = conp;
+ newfb->display_fg = vc;
/* tell console var has changed */
fbcon_changevar(unit);
}
@@ -520,9 +450,9 @@ static const char *fbcon_startup(void)
return display_desc;
}
-static void fbcon_init(struct vc_data *conp, int init)
+static void fbcon_init(struct vc_data *vc, int init)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct fb_info *info;
/* on which frame buffer will we open this console? */
@@ -538,20 +468,20 @@ static void fbcon_init(struct vc_data *conp, int init)
DPRINTK("res: %dx%d-%d\n",fb_display[unit].var.xres,
fb_display[unit].var.yres,
fb_display[unit].var.bits_per_pixel);
- fb_display[unit].conp = conp;
+ fb_display[unit].conp = vc;
fb_display[unit].fb_info = info;
/* clear out the cmap so we don't have dangling pointers */
fbcon_set_display(unit, init, !init);
/* Must be done after fbcon_set_display to prevent excess updates */
- conp->vc_display_fg = &info->display_fg;
+ vc->vc_display_fg = &info->display_fg;
if (!info->display_fg)
- info->display_fg = conp;
+ info->display_fg = vc;
}
-static void fbcon_deinit(struct vc_data *conp)
+static void fbcon_deinit(struct vc_data *vc)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
fbcon_free_font(p);
@@ -608,7 +538,7 @@ static void fbcon_set_display(int con, int init, int logo)
{
struct display *p = &fb_display[con];
struct fb_info *info = p->fb_info;
- struct vc_data *conp = p->conp;
+ struct vc_data *vc = p->conp;
int nr_rows, nr_cols;
int old_rows, old_cols;
unsigned short *save = NULL, *r, *q;
@@ -687,8 +617,8 @@ static void fbcon_set_display(int con, int init, int logo)
p->dispsw->set_font(p, fontwidth(p), fontheight(p));
updatescrollmode(p);
- old_cols = conp->vc_cols;
- old_rows = conp->vc_rows;
+ old_cols = vc->vc_cols;
+ old_rows = vc->vc_rows;
nr_cols = info->var.xres/fontwidth(p);
nr_rows = info->var.yres/fontheight(p);
@@ -699,16 +629,16 @@ static void fbcon_set_display(int con, int init, int logo)
int step;
logo_lines = (LOGO_H + fontheight(p) - 1) / fontheight(p);
- q = (unsigned short *)(conp->vc_origin + conp->vc_size_row * old_rows);
+ q = (unsigned short *)(vc->vc_origin + vc->vc_size_row * old_rows);
step = logo_lines * old_cols;
for (r = q - logo_lines * old_cols; r < q; r++)
- if (scr_readw(r) != conp->vc_video_erase_char)
+ if (scr_readw(r) != vc->vc_video_erase_char)
break;
if (r != q && nr_rows >= old_rows + logo_lines) {
save = kmalloc(logo_lines * nr_cols * 2, GFP_KERNEL);
if (save) {
int i = old_cols < nr_cols ? old_cols : nr_cols;
- scr_memsetw(save, conp->vc_video_erase_char, logo_lines * nr_cols * 2);
+ scr_memsetw(save, vc->vc_video_erase_char, logo_lines * nr_cols * 2);
r = q - step;
for (cnt = 0; cnt < logo_lines; cnt++, r += i)
scr_memcpyw(save + cnt * nr_cols, r, 2 * i);
@@ -719,17 +649,17 @@ static void fbcon_set_display(int con, int init, int logo)
/* We can scroll screen down */
r = q - step - old_cols;
for (cnt = old_rows - logo_lines; cnt > 0; cnt--) {
- scr_memcpyw(r + step, r, conp->vc_size_row);
+ scr_memcpyw(r + step, r, vc->vc_size_row);
r -= old_cols;
}
if (!save) {
- conp->vc_y += logo_lines;
- conp->vc_pos += logo_lines * conp->vc_size_row;
+ vc->vc_y += logo_lines;
+ vc->vc_pos += logo_lines * vc->vc_size_row;
}
}
- scr_memsetw((unsigned short *)conp->vc_origin,
- conp->vc_video_erase_char,
- conp->vc_size_row * logo_lines);
+ scr_memsetw((unsigned short *)vc->vc_origin,
+ vc->vc_video_erase_char,
+ vc->vc_size_row * logo_lines);
}
/*
@@ -738,24 +668,24 @@ static void fbcon_set_display(int con, int init, int logo)
* resizing the console.
*/
if (init) {
- conp->vc_cols = nr_cols;
- conp->vc_rows = nr_rows;
+ vc->vc_cols = nr_cols;
+ vc->vc_rows = nr_rows;
}
p->vrows = info->var.yres_virtual/fontheight(p);
if ((info->var.yres % fontheight(p)) &&
(info->var.yres_virtual % fontheight(p) < info->var.yres % fontheight(p)))
p->vrows--;
- conp->vc_can_do_color = info->var.bits_per_pixel != 1;
- conp->vc_complement_mask = conp->vc_can_do_color ? 0x7700 : 0x0800;
+ vc->vc_can_do_color = info->var.bits_per_pixel != 1;
+ vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
if (charcnt == 256) {
- conp->vc_hi_font_mask = 0;
+ vc->vc_hi_font_mask = 0;
p->fgshift = 8;
p->bgshift = 12;
p->charmask = 0xff;
} else {
- conp->vc_hi_font_mask = 0x100;
- if (conp->vc_can_do_color)
- conp->vc_complement_mask <<= 1;
+ vc->vc_hi_font_mask = 0x100;
+ if (vc->vc_can_do_color)
+ vc->vc_complement_mask <<= 1;
p->fgshift = 9;
p->bgshift = 13;
p->charmask = 0x1ff;
@@ -771,37 +701,37 @@ static void fbcon_set_display(int con, int init, int logo)
p->bgcol = 0;
if (!init) {
- if (conp->vc_cols != nr_cols || conp->vc_rows != nr_rows)
+ if (vc->vc_cols != nr_cols || vc->vc_rows != nr_rows)
vc_resize(con, nr_cols, nr_rows);
- else if (CON_IS_VISIBLE(conp) &&
- vt_cons[conp->vc_num]->vc_mode == KD_TEXT) {
+ else if (CON_IS_VISIBLE(vc) &&
+ vt_cons[vc->vc_num]->vc_mode == KD_TEXT) {
if (p->dispsw->clear_margins)
- p->dispsw->clear_margins(conp, p, 0);
+ p->dispsw->clear_margins(vc, p, 0);
update_screen(con);
}
if (save) {
- q = (unsigned short *)(conp->vc_origin + conp->vc_size_row * old_rows);
+ q = (unsigned short *)(vc->vc_origin + vc->vc_size_row * old_rows);
scr_memcpyw(q, save, logo_lines * nr_cols * 2);
- conp->vc_y += logo_lines;
- conp->vc_pos += logo_lines * conp->vc_size_row;
+ vc->vc_y += logo_lines;
+ vc->vc_pos += logo_lines * vc->vc_size_row;
kfree(save);
}
}
if (logo) {
- if (logo_lines > conp->vc_bottom) {
+ if (logo_lines > vc->vc_bottom) {
logo_shown = -1;
printk(KERN_INFO "fbcon_startup: disable boot-logo (boot-logo bigger than screen).\n");
} else {
logo_shown = -2;
- conp->vc_top = logo_lines;
+ vc->vc_top = logo_lines;
}
}
if (con == fg_console && softback_buf) {
- int l = fbcon_softback_size / conp->vc_size_row;
+ int l = fbcon_softback_size / vc->vc_size_row;
if (l > 5)
- softback_end = softback_buf + l * conp->vc_size_row;
+ softback_end = softback_buf + l * vc->vc_size_row;
else {
/* Smaller scrollback makes no sense, and 0 would screw
the operation totally */
@@ -845,10 +775,10 @@ static __inline__ int real_y(struct display *p, int ypos)
}
-static void fbcon_clear(struct vc_data *conp, int sy, int sx, int height,
+static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
int width)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
u_int y_break;
int redraw_cursor = 0;
@@ -870,19 +800,19 @@ static void fbcon_clear(struct vc_data *conp, int sy, int sx, int height,
y_break = p->vrows-p->yscroll;
if (sy < y_break && sy+height-1 >= y_break) {
u_int b = y_break-sy;
- p->dispsw->clear(conp, p, real_y(p, sy), sx, b, width);
- p->dispsw->clear(conp, p, real_y(p, sy+b), sx, height-b, width);
+ p->dispsw->clear(vc, p, real_y(p, sy), sx, b, width);
+ p->dispsw->clear(vc, p, real_y(p, sy+b), sx, height-b, width);
} else
- p->dispsw->clear(conp, p, real_y(p, sy), sx, height, width);
+ p->dispsw->clear(vc, p, real_y(p, sy), sx, height, width);
if (redraw_cursor)
vbl_cursor_cnt = CURSOR_DRAW_DELAY;
}
-static void fbcon_putc(struct vc_data *conp, int c, int ypos, int xpos)
+static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
int redraw_cursor = 0;
@@ -897,17 +827,17 @@ static void fbcon_putc(struct vc_data *conp, int c, int ypos, int xpos)
redraw_cursor = 1;
}
- p->dispsw->putc(conp, p, c, real_y(p, ypos), xpos);
+ p->dispsw->putc(vc, p, c, real_y(p, ypos), xpos);
if (redraw_cursor)
vbl_cursor_cnt = CURSOR_DRAW_DELAY;
}
-static void fbcon_putcs(struct vc_data *conp, const unsigned short *s, int count,
+static void fbcon_putcs(struct vc_data *vc, const unsigned short *s, int count,
int ypos, int xpos)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
int redraw_cursor = 0;
@@ -922,30 +852,30 @@ static void fbcon_putcs(struct vc_data *conp, const unsigned short *s, int count
cursor_undrawn();
redraw_cursor = 1;
}
- p->dispsw->putcs(conp, p, s, count, real_y(p, ypos), xpos);
+ p->dispsw->putcs(vc, p, s, count, real_y(p, ypos), xpos);
if (redraw_cursor)
vbl_cursor_cnt = CURSOR_DRAW_DELAY;
}
-static void fbcon_cursor(struct vc_data *conp, int mode)
+static void fbcon_cursor(struct vc_data *vc, int mode)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
- int y = conp->vc_y;
+ int y = vc->vc_y;
if (mode & CM_SOFTBACK) {
mode &= ~CM_SOFTBACK;
if (softback_lines) {
- if (y + softback_lines >= conp->vc_rows)
+ if (y + softback_lines >= vc->vc_rows)
mode = CM_ERASE;
else
y += softback_lines;
}
} else if (softback_lines)
- fbcon_set_origin(conp);
+ fbcon_set_origin(vc);
/* Avoid flickering if there's no real change. */
- if (p->cursor_x == conp->vc_x && p->cursor_y == y &&
+ if (p->cursor_x == vc->vc_x && p->cursor_y == y &&
(mode == CM_ERASE) == !cursor_on)
return;
@@ -953,9 +883,9 @@ static void fbcon_cursor(struct vc_data *conp, int mode)
if (cursor_drawn)
p->dispsw->cursor(p, 0, p->cursor_x, real_y(p, p->cursor_y));
- p->cursor_x = conp->vc_x;
+ p->cursor_x = vc->vc_x;
p->cursor_y = y;
- p->cursor_pos = conp->vc_pos;
+ p->cursor_pos = vc->vc_pos;
switch (mode) {
case CM_ERASE:
@@ -1009,7 +939,7 @@ int update_var(int con, struct fb_info *info)
return 0;
}
-static __inline__ void ywrap_up(int unit, struct vc_data *conp,
+static __inline__ void ywrap_up(int unit, struct vc_data *vc,
struct display *p, int count)
{
struct fb_info *info = p->fb_info;
@@ -1027,7 +957,7 @@ static __inline__ void ywrap_up(int unit, struct vc_data *conp,
scrollback_current = 0;
}
-static __inline__ void ywrap_down(int unit, struct vc_data *conp,
+static __inline__ void ywrap_down(int unit, struct vc_data *vc,
struct display *p, int count)
{
struct fb_info *info = p->fb_info;
@@ -1045,23 +975,23 @@ static __inline__ void ywrap_down(int unit, struct vc_data *conp,
scrollback_current = 0;
}
-static __inline__ void ypan_up(int unit, struct vc_data *conp,
+static __inline__ void ypan_up(int unit, struct vc_data *vc,
struct display *p, int count)
{
struct fb_info *info = p->fb_info;
p->yscroll += count;
- if (p->yscroll > p->vrows-conp->vc_rows) {
- p->dispsw->bmove(p, p->vrows-conp->vc_rows, 0, 0, 0,
- conp->vc_rows, conp->vc_cols);
- p->yscroll -= p->vrows-conp->vc_rows;
+ if (p->yscroll > p->vrows-vc->vc_rows) {
+ p->dispsw->bmove(p, p->vrows-vc->vc_rows, 0, 0, 0,
+ vc->vc_rows, vc->vc_cols);
+ p->yscroll -= p->vrows-vc->vc_rows;
}
info->var.xoffset = 0;
info->var.yoffset = p->yscroll*fontheight(p);
info->var.vmode &= ~FB_VMODE_YWRAP;
update_var(unit, info);
if (p->dispsw->clear_margins)
- p->dispsw->clear_margins(conp, p, 1);
+ p->dispsw->clear_margins(vc, p, 1);
scrollback_max += count;
if (scrollback_max > scrollback_phys_max)
scrollback_max = scrollback_phys_max;
@@ -1069,50 +999,50 @@ static __inline__ void ypan_up(int unit, struct vc_data *conp,
}
-static __inline__ void ypan_down(int unit, struct vc_data *conp,
+static __inline__ void ypan_down(int unit, struct vc_data *vc,
struct display *p, int count)
{
struct fb_info *info = p->fb_info;
p->yscroll -= count;
if (p->yscroll < 0) {
- p->dispsw->bmove(p, 0, 0, p->vrows-conp->vc_rows, 0,
- conp->vc_rows, conp->vc_cols);
- p->yscroll += p->vrows-conp->vc_rows;
+ p->dispsw->bmove(p, 0, 0, p->vrows-vc->vc_rows, 0,
+ vc->vc_rows, vc->vc_cols);
+ p->yscroll += p->vrows-vc->vc_rows;
}
info->var.xoffset = 0;
info->var.yoffset = p->yscroll*fontheight(p);
info->var.vmode &= ~FB_VMODE_YWRAP;
update_var(unit, info);
if (p->dispsw->clear_margins)
- p->dispsw->clear_margins(conp, p, 1);
+ p->dispsw->clear_margins(vc, p, 1);
scrollback_max -= count;
if (scrollback_max < 0)
scrollback_max = 0;
scrollback_current = 0;
}
-static void fbcon_redraw_softback(struct vc_data *conp, struct display *p, long delta)
+static void fbcon_redraw_softback(struct vc_data *vc, struct display *p, long delta)
{
unsigned short *d, *s;
unsigned long n;
int line = 0;
- int count = conp->vc_rows;
+ int count = vc->vc_rows;
d = (u16 *)softback_curr;
if (d == (u16 *)softback_in)
- d = (u16 *)conp->vc_origin;
- n = softback_curr + delta * conp->vc_size_row;
+ d = (u16 *)vc->vc_origin;
+ n = softback_curr + delta * vc->vc_size_row;
softback_lines -= delta;
if (delta < 0) {
if (softback_curr < softback_top && n < softback_buf) {
n += softback_end - softback_buf;
if (n < softback_top) {
- softback_lines -= (softback_top - n) / conp->vc_size_row;
+ softback_lines -= (softback_top - n) / vc->vc_size_row;
n = softback_top;
}
} else if (softback_curr >= softback_top && n < softback_top) {
- softback_lines -= (softback_top - n) / conp->vc_size_row;
+ softback_lines -= (softback_top - n) / vc->vc_size_row;
n = softback_top;
}
} else {
@@ -1132,7 +1062,7 @@ static void fbcon_redraw_softback(struct vc_data *conp, struct display *p, long
softback_curr = n;
s = (u16 *)softback_curr;
if (s == (u16 *)softback_in)
- s = (u16 *)conp->vc_origin;
+ s = (u16 *)vc->vc_origin;
while (count--) {
unsigned short *start;
unsigned short *le;
@@ -1147,7 +1077,7 @@ static void fbcon_redraw_softback(struct vc_data *conp, struct display *p, long
if (attr != (c & 0xff00)) {
attr = c & 0xff00;
if (s > start) {
- p->dispsw->putcs(conp, p, start, s - start,
+ p->dispsw->putcs(vc, p, start, s - start,
real_y(p, line), x);
x += s - start;
start = s;
@@ -1155,7 +1085,7 @@ static void fbcon_redraw_softback(struct vc_data *conp, struct display *p, long
}
if (c == scr_readw(d)) {
if (s > start) {
- p->dispsw->putcs(conp, p, start, s - start,
+ p->dispsw->putcs(vc, p, start, s - start,
real_y(p, line), x);
x += s - start + 1;
start = s + 1;
@@ -1168,24 +1098,24 @@ static void fbcon_redraw_softback(struct vc_data *conp, struct display *p, long
d++;
} while (s < le);
if (s > start)
- p->dispsw->putcs(conp, p, start, s - start, real_y(p, line), x);
+ p->dispsw->putcs(vc, p, start, s - start, real_y(p, line), x);
line++;
if (d == (u16 *)softback_end)
d = (u16 *)softback_buf;
if (d == (u16 *)softback_in)
- d = (u16 *)conp->vc_origin;
+ d = (u16 *)vc->vc_origin;
if (s == (u16 *)softback_end)
s = (u16 *)softback_buf;
if (s == (u16 *)softback_in)
- s = (u16 *)conp->vc_origin;
+ s = (u16 *)vc->vc_origin;
}
}
-static void fbcon_redraw(struct vc_data *conp, struct display *p,
+static void fbcon_redraw(struct vc_data *vc, struct display *p,
int line, int count, int offset)
{
unsigned short *d = (unsigned short *)
- (conp->vc_origin + conp->vc_size_row * line);
+ (vc->vc_origin + vc->vc_size_row * line);
unsigned short *s = d + offset;
while (count--) {
@@ -1200,7 +1130,7 @@ static void fbcon_redraw(struct vc_data *conp, struct display *p,
if (attr != (c & 0xff00)) {
attr = c & 0xff00;
if (s > start) {
- p->dispsw->putcs(conp, p, start, s - start,
+ p->dispsw->putcs(vc, p, start, s - start,
real_y(p, line), x);
x += s - start;
start = s;
@@ -1208,7 +1138,7 @@ static void fbcon_redraw(struct vc_data *conp, struct display *p,
}
if (c == scr_readw(d)) {
if (s > start) {
- p->dispsw->putcs(conp, p, start, s - start,
+ p->dispsw->putcs(vc, p, start, s - start,
real_y(p, line), x);
x += s - start + 1;
start = s + 1;
@@ -1223,22 +1153,22 @@ static void fbcon_redraw(struct vc_data *conp, struct display *p,
d++;
} while (s < le);
if (s > start)
- p->dispsw->putcs(conp, p, start, s - start, real_y(p, line), x);
+ p->dispsw->putcs(vc, p, start, s - start, real_y(p, line), x);
console_conditional_schedule();
if (offset > 0)
line++;
else {
line--;
/* NOTE: We subtract two lines from these pointers */
- s -= conp->vc_size_row;
- d -= conp->vc_size_row;
+ s -= vc->vc_size_row;
+ d -= vc->vc_size_row;
}
}
}
/**
* fbcon_redraw_clear - clear area of the screen
- * @conp: stucture pointing to current active virtual console
+ * @vc: stucture pointing to current active virtual console
* @p: display structure
* @sy: starting Y coordinate
* @sx: starting X coordinate
@@ -1250,13 +1180,13 @@ static void fbcon_redraw(struct vc_data *conp, struct display *p,
*
*/
-void fbcon_redraw_clear(struct vc_data *conp, struct display *p, int sy, int sx,
+void fbcon_redraw_clear(struct vc_data *vc, struct display *p, int sy, int sx,
int height, int width)
{
int x, y;
for (y=0; y<height; y++)
for (x=0; x<width; x++)
- fbcon_putc(conp, ' ', sy+y, sx+x);
+ fbcon_putc(vc, ' ', sy+y, sx+x);
}
@@ -1285,9 +1215,9 @@ void fbcon_redraw_bmove(struct display *p, int sy, int sx, int dy, int dx, int h
/* h will be always 1, but it does not matter if we are more generic */
while (h-- > 0) {
- struct vc_data *conp = p->conp;
+ struct vc_data *vc = p->conp;
unsigned short *d = (unsigned short *)
- (conp->vc_origin + conp->vc_size_row * dy + dx * 2);
+ (vc->vc_origin + vc->vc_size_row * dy + dx * 2);
unsigned short *s = d + (dx - sx);
unsigned short *start = d;
unsigned short *ls = d;
@@ -1301,14 +1231,14 @@ void fbcon_redraw_bmove(struct display *p, int sy, int sx, int dy, int dx, int h
if (attr != (c & 0xff00)) {
attr = c & 0xff00;
if (d > start) {
- p->dispsw->putcs(conp, p, start, d - start, dy, x);
+ p->dispsw->putcs(vc, p, start, d - start, dy, x);
x += d - start;
start = d;
}
}
if (s >= ls && s < le && c == scr_readw(s)) {
if (d > start) {
- p->dispsw->putcs(conp, p, start, d - start, dy, x);
+ p->dispsw->putcs(vc, p, start, d - start, dy, x);
x += d - start + 1;
start = d + 1;
} else {
@@ -1320,29 +1250,29 @@ void fbcon_redraw_bmove(struct display *p, int sy, int sx, int dy, int dx, int h
d++;
} while (d < le);
if (d > start)
- p->dispsw->putcs(conp, p, start, d - start, dy, x);
+ p->dispsw->putcs(vc, p, start, d - start, dy, x);
sy++;
dy++;
}
}
-static inline void fbcon_softback_note(struct vc_data *conp, int t, int count)
+static inline void fbcon_softback_note(struct vc_data *vc, int t, int count)
{
unsigned short *p;
- if (conp->vc_num != fg_console)
+ if (vc->vc_num != fg_console)
return;
- p = (unsigned short *)(conp->vc_origin + t * conp->vc_size_row);
+ p = (unsigned short *)(vc->vc_origin + t * vc->vc_size_row);
while (count) {
- scr_memcpyw((u16 *)softback_in, p, conp->vc_size_row);
+ scr_memcpyw((u16 *)softback_in, p, vc->vc_size_row);
count--;
p = advance_row(p, 1);
- softback_in += conp->vc_size_row;
+ softback_in += vc->vc_size_row;
if (softback_in == softback_end)
softback_in = softback_buf;
if (softback_in == softback_top) {
- softback_top += conp->vc_size_row;
+ softback_top += vc->vc_size_row;
if (softback_top == softback_end)
softback_top = softback_buf;
}
@@ -1350,10 +1280,10 @@ static inline void fbcon_softback_note(struct vc_data *conp, int t, int count)
softback_curr = softback_in;
}
-static int fbcon_scroll(struct vc_data *conp, int t, int b, int dir,
+static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
int count)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
int scroll_partial = !(p->scrollmode & __SCROLL_YNOPARTIAL);
@@ -1363,7 +1293,7 @@ static int fbcon_scroll(struct vc_data *conp, int t, int b, int dir,
if (!count || vt_cons[unit]->vc_mode != KD_TEXT)
return 0;
- fbcon_cursor(conp, CM_ERASE);
+ fbcon_cursor(vc, CM_ERASE);
/*
* ++Geert: Only use ywrap/ypan if the console is in text mode
@@ -1373,124 +1303,124 @@ static int fbcon_scroll(struct vc_data *conp, int t, int b, int dir,
switch (dir) {
case SM_UP:
- if (count > conp->vc_rows) /* Maximum realistic size */
- count = conp->vc_rows;
+ if (count > vc->vc_rows) /* Maximum realistic size */
+ count = vc->vc_rows;
if (softback_top)
- fbcon_softback_note(conp, t, count);
+ fbcon_softback_note(vc, t, count);
if (logo_shown >= 0) goto redraw_up;
switch (p->scrollmode & __SCROLL_YMASK) {
case __SCROLL_YMOVE:
p->dispsw->bmove(p, t+count, 0, t, 0, b-t-count,
- conp->vc_cols);
- p->dispsw->clear(conp, p, b-count, 0, count,
- conp->vc_cols);
+ vc->vc_cols);
+ p->dispsw->clear(vc, p, b-count, 0, count,
+ vc->vc_cols);
break;
case __SCROLL_YWRAP:
- if (b-t-count > 3*conp->vc_rows>>2) {
+ if (b-t-count > 3*vc->vc_rows>>2) {
if (t > 0)
- fbcon_bmove(conp, 0, 0, count, 0, t,
- conp->vc_cols);
- ywrap_up(unit, conp, p, count);
- if (conp->vc_rows-b > 0)
- fbcon_bmove(conp, b-count, 0, b, 0,
- conp->vc_rows-b, conp->vc_cols);
+ fbcon_bmove(vc, 0, 0, count, 0, t,
+ vc->vc_cols);
+ ywrap_up(unit, vc, p, count);
+ if (vc->vc_rows-b > 0)
+ fbcon_bmove(vc, b-count, 0, b, 0,
+ vc->vc_rows-b, vc->vc_cols);
} else if (p->scrollmode & __SCROLL_YPANREDRAW)
goto redraw_up;
else
- fbcon_bmove(conp, t+count, 0, t, 0, b-t-count,
- conp->vc_cols);
- fbcon_clear(conp, b-count, 0, count, conp->vc_cols);
+ fbcon_bmove(vc, t+count, 0, t, 0, b-t-count,
+ vc->vc_cols);
+ fbcon_clear(vc, b-count, 0, count, vc->vc_cols);
break;
case __SCROLL_YPAN:
- if (( p->yscroll + count <= 2 * (p->vrows - conp->vc_rows)) &&
- (( !scroll_partial && (b-t == conp->vc_rows)) ||
- ( scroll_partial && (b-t-count > 3*conp->vc_rows>>2)))) {
+ if (( p->yscroll + count <= 2 * (p->vrows - vc->vc_rows)) &&
+ (( !scroll_partial && (b-t == vc->vc_rows)) ||
+ ( scroll_partial && (b-t-count > 3*vc->vc_rows>>2)))) {
if (t > 0)
- fbcon_bmove(conp, 0, 0, count, 0, t,
- conp->vc_cols);
- ypan_up(unit, conp, p, count);
- if (conp->vc_rows-b > 0)
- fbcon_bmove(conp, b-count, 0, b, 0,
- conp->vc_rows-b, conp->vc_cols);
+ fbcon_bmove(vc, 0, 0, count, 0, t,
+ vc->vc_cols);
+ ypan_up(unit, vc, p, count);
+ if (vc->vc_rows-b > 0)
+ fbcon_bmove(vc, b-count, 0, b, 0,
+ vc->vc_rows-b, vc->vc_cols);
} else if (p->scrollmode & __SCROLL_YPANREDRAW)
goto redraw_up;
else
- fbcon_bmove(conp, t+count, 0, t, 0, b-t-count,
- conp->vc_cols);
- fbcon_clear(conp, b-count, 0, count, conp->vc_cols);
+ fbcon_bmove(vc, t+count, 0, t, 0, b-t-count,
+ vc->vc_cols);
+ fbcon_clear(vc, b-count, 0, count, vc->vc_cols);
break;
case __SCROLL_YREDRAW:
redraw_up:
- fbcon_redraw(conp, p, t, b-t-count, count*conp->vc_cols);
- p->dispsw->clear(conp, p, real_y(p, b-count), 0,
- count, conp->vc_cols);
- scr_memsetw((unsigned short *)(conp->vc_origin +
- conp->vc_size_row * (b-count)),
- conp->vc_video_erase_char,
- conp->vc_size_row * count);
+ fbcon_redraw(vc, p, t, b-t-count, count*vc->vc_cols);
+ p->dispsw->clear(vc, p, real_y(p, b-count), 0,
+ count, vc->vc_cols);
+ scr_memsetw((unsigned short *)(vc->vc_origin +
+ vc->vc_size_row * (b-count)),
+ vc->vc_video_erase_char,
+ vc->vc_size_row * count);
return 1;
}
break;
case SM_DOWN:
- if (count > conp->vc_rows) /* Maximum realistic size */
- count = conp->vc_rows;
+ if (count > vc->vc_rows) /* Maximum realistic size */
+ count = vc->vc_rows;
switch (p->scrollmode & __SCROLL_YMASK) {
case __SCROLL_YMOVE:
p->dispsw->bmove(p, t, 0, t+count, 0, b-t-count,
- conp->vc_cols);
- p->dispsw->clear(conp, p, t, 0,
- count, conp->vc_cols);
+ vc->vc_cols);
+ p->dispsw->clear(vc, p, t, 0,
+ count, vc->vc_cols);
break;
case __SCROLL_YWRAP:
- if (b-t-count > 3*conp->vc_rows>>2) {
- if (conp->vc_rows-b > 0)
- fbcon_bmove(conp, b, 0, b-count, 0,
- conp->vc_rows-b, conp->vc_cols);
- ywrap_down(unit, conp, p, count);
+ if (b-t-count > 3*vc->vc_rows>>2) {
+ if (vc->vc_rows-b > 0)
+ fbcon_bmove(vc, b, 0, b-count, 0,
+ vc->vc_rows-b, vc->vc_cols);
+ ywrap_down(unit, vc, p, count);
if (t > 0)
- fbcon_bmove(conp, count, 0, 0, 0, t,
- conp->vc_cols);
+ fbcon_bmove(vc, count, 0, 0, 0, t,
+ vc->vc_cols);
} else if (p->scrollmode & __SCROLL_YPANREDRAW)
goto redraw_down;
else
- fbcon_bmove(conp, t, 0, t+count, 0, b-t-count,
- conp->vc_cols);
- fbcon_clear(conp, t, 0, count, conp->vc_cols);
+ fbcon_bmove(vc, t, 0, t+count, 0, b-t-count,
+ vc->vc_cols);
+ fbcon_clear(vc, t, 0, count, vc->vc_cols);
break;
case __SCROLL_YPAN:
- if (( count-p->yscroll <= p->vrows-conp->vc_rows) &&
- (( !scroll_partial && (b-t == conp->vc_rows)) ||
- ( scroll_partial && (b-t-count > 3*conp->vc_rows>>2)))) {
- if (conp->vc_rows-b > 0)
- fbcon_bmove(conp, b, 0, b-count, 0,
- conp->vc_rows-b, conp->vc_cols);
- ypan_down(unit, conp, p, count);
+ if (( count-p->yscroll <= p->vrows-vc->vc_rows) &&
+ (( !scroll_partial && (b-t == vc->vc_rows)) ||
+ ( scroll_partial && (b-t-count > 3*vc->vc_rows>>2)))) {
+ if (vc->vc_rows-b > 0)
+ fbcon_bmove(vc, b, 0, b-count, 0,
+ vc->vc_rows-b, vc->vc_cols);
+ ypan_down(unit, vc, p, count);
if (t > 0)
- fbcon_bmove(conp, count, 0, 0, 0, t,
- conp->vc_cols);
+ fbcon_bmove(vc, count, 0, 0, 0, t,
+ vc->vc_cols);
} else if (p->scrollmode & __SCROLL_YPANREDRAW)
goto redraw_down;
else
- fbcon_bmove(conp, t, 0, t+count, 0, b-t-count,
- conp->vc_cols);
- fbcon_clear(conp, t, 0, count, conp->vc_cols);
+ fbcon_bmove(vc, t, 0, t+count, 0, b-t-count,
+ vc->vc_cols);
+ fbcon_clear(vc, t, 0, count, vc->vc_cols);
break;
case __SCROLL_YREDRAW:
redraw_down:
- fbcon_redraw(conp, p, b - 1, b-t-count, -count*conp->vc_cols);
- p->dispsw->clear(conp, p, real_y(p, t), 0,
- count, conp->vc_cols);
- scr_memsetw((unsigned short *)(conp->vc_origin +
- conp->vc_size_row * t),
- conp->vc_video_erase_char,
- conp->vc_size_row * count);
+ fbcon_redraw(vc, p, b - 1, b-t-count, -count*vc->vc_cols);
+ p->dispsw->clear(vc, p, real_y(p, t), 0,
+ count, vc->vc_cols);
+ scr_memsetw((unsigned short *)(vc->vc_origin +
+ vc->vc_size_row * t),
+ vc->vc_video_erase_char,
+ vc->vc_size_row * count);
return 1;
}
}
@@ -1498,10 +1428,10 @@ static int fbcon_scroll(struct vc_data *conp, int t, int b, int dir,
}
-static void fbcon_bmove(struct vc_data *conp, int sy, int sx, int dy, int dx,
+static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
int height, int width)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
if (!p->can_soft_blank && console_blanked)
@@ -1514,7 +1444,7 @@ static void fbcon_bmove(struct vc_data *conp, int sy, int sx, int dy, int dx,
(sx <= p->cursor_x) && (p->cursor_x < sx+width)) ||
((dy <= p->cursor_y) && (p->cursor_y < dy+height) &&
(dx <= p->cursor_x) && (p->cursor_x < dx+width)))
- fbcon_cursor(conp, CM_ERASE|CM_SOFTBACK);
+ fbcon_cursor(vc, CM_ERASE|CM_SOFTBACK);
/* Split blits that cross physical y_wrap case.
* Pathological case involves 4 blits, better to use recursive
@@ -1558,21 +1488,21 @@ static void fbcon_bmove_rec(struct display *p, int sy, int sx, int dy, int dx,
}
-static int fbcon_switch(struct vc_data *conp)
+static int fbcon_switch(struct vc_data *vc)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
struct fb_info *info = p->fb_info;
if (softback_top) {
- int l = fbcon_softback_size / conp->vc_size_row;
+ int l = fbcon_softback_size / vc->vc_size_row;
if (softback_lines)
- fbcon_set_origin(conp);
+ fbcon_set_origin(vc);
softback_top = softback_curr = softback_in = softback_buf;
softback_lines = 0;
if (l > 5)
- softback_end = softback_buf + l * conp->vc_size_row;
+ softback_end = softback_buf + l * vc->vc_size_row;
else {
/* Smaller scrollback makes no sense, and 0 would screw
the operation totally */
@@ -1590,10 +1520,10 @@ static int fbcon_switch(struct vc_data *conp)
info->var.yoffset = p->yscroll = 0;
switch (p->scrollmode & __SCROLL_YMASK) {
case __SCROLL_YWRAP:
- scrollback_phys_max = p->vrows-conp->vc_rows;
+ scrollback_phys_max = p->vrows-vc->vc_rows;
break;
case __SCROLL_YPAN:
- scrollback_phys_max = p->vrows-2*conp->vc_rows;
+ scrollback_phys_max = p->vrows-2*vc->vc_rows;
if (scrollback_phys_max < 0)
scrollback_phys_max = 0;
break;
@@ -1605,21 +1535,21 @@ static int fbcon_switch(struct vc_data *conp)
scrollback_current = 0;
if (p->dispsw->clear_margins && vt_cons[unit]->vc_mode == KD_TEXT)
- p->dispsw->clear_margins(conp, p, 0);
+ p->dispsw->clear_margins(vc, p, 0);
if (logo_shown == -2) {
logo_shown = fg_console;
fbcon_show_logo(); /* This is protected above by initmem_freed */
update_region(fg_console,
- conp->vc_origin + conp->vc_size_row * conp->vc_top,
- conp->vc_size_row * (conp->vc_bottom - conp->vc_top) / 2);
+ vc->vc_origin + vc->vc_size_row * vc->vc_top,
+ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2);
return 0;
}
return 1;
}
-static int fbcon_blank(struct vc_data *conp, int blank)
+static int fbcon_blank(struct vc_data *vc, int blank)
{
- struct display *p = &fb_display[conp->vc_num];
+ struct display *p = &fb_display[vc->vc_num];
struct fb_info *info = p->fb_info;
if (blank < 0) /* Entering graphics mode */
@@ -1641,16 +1571,16 @@ static int fbcon_blank(struct vc_data *conp, int blank)
u_int height;
u_int y_break;
- oldc = conp->vc_video_erase_char;
- conp->vc_video_erase_char &= p->charmask;
- height = conp->vc_rows;
+ oldc = vc->vc_video_erase_char;
+ vc->vc_video_erase_char &= p->charmask;
+ height = vc->vc_rows;
y_break = p->vrows-p->yscroll;
if (height > y_break) {
- p->dispsw->clear(conp, p, real_y(p, 0), 0, y_break, conp->vc_cols);
- p->dispsw->clear(conp, p, real_y(p, y_break), 0, height-y_break, conp->vc_cols);
+ p->dispsw->clear(vc, p, real_y(p, 0), 0, y_break, vc->vc_cols);
+ p->dispsw->clear(vc, p, real_y(p, y_break), 0, height-y_break, vc->vc_cols);
} else
- p->dispsw->clear(conp, p, real_y(p, 0), 0, height, conp->vc_cols);
- conp->vc_video_erase_char = oldc;
+ p->dispsw->clear(vc, p, real_y(p, 0), 0, height, vc->vc_cols);
+ vc->vc_video_erase_char = oldc;
}
return 0;
} else {
@@ -1770,17 +1700,17 @@ static int fbcon_do_set_font(int unit, struct console_font_op *op, u8 *data, int
/* ++Edmund: reorder the attribute bits */
if (p->conp->vc_can_do_color) {
- struct vc_data *conp = p->conp;
- unsigned short *cp = (unsigned short *) conp->vc_origin;
- int count = conp->vc_screenbuf_size/2;
+ struct vc_data *vc = p->conp;
+ unsigned short *cp = (unsigned short *) vc->vc_origin;
+ int count = vc->vc_screenbuf_size/2;
unsigned short c;
for (; count > 0; count--, cp++) {
c = scr_readw(cp);
scr_writew(((c & 0xfe00) >> 1) | (c & 0xff), cp);
}
- c = conp->vc_video_erase_char;
- conp->vc_video_erase_char = ((c & 0xfe00) >> 1) | (c & 0xff);
- conp->vc_attr >>= 1;
+ c = vc->vc_video_erase_char;
+ vc->vc_video_erase_char = ((c & 0xfe00) >> 1) | (c & 0xff);
+ vc->vc_attr >>= 1;
}
} else if (!p->conp->vc_hi_font_mask && cnt == 512) {
@@ -1793,32 +1723,32 @@ static int fbcon_do_set_font(int unit, struct console_font_op *op, u8 *data, int
/* ++Edmund: reorder the attribute bits */
{
- struct vc_data *conp = p->conp;
- unsigned short *cp = (unsigned short *) conp->vc_origin;
- int count = conp->vc_screenbuf_size/2;
+ struct vc_data *vc = p->conp;
+ unsigned short *cp = (unsigned short *) vc->vc_origin;
+ int count = vc->vc_screenbuf_size/2;
unsigned short c;
for (; count > 0; count--, cp++) {
unsigned short newc;
c = scr_readw(cp);
- if (conp->vc_can_do_color)
+ if (vc->vc_can_do_color)
newc = ((c & 0xff00) << 1) | (c & 0xff);
else
newc = c & ~0x100;
scr_writew(newc, cp);
}
- c = conp->vc_video_erase_char;
- if (conp->vc_can_do_color) {
- conp->vc_video_erase_char = ((c & 0xff00) << 1) | (c & 0xff);
- conp->vc_attr <<= 1;
+ c = vc->vc_video_erase_char;
+ if (vc->vc_can_do_color) {
+ vc->vc_video_erase_char = ((c & 0xff00) << 1) | (c & 0xff);
+ vc->vc_attr <<= 1;
} else
- conp->vc_video_erase_char = c & ~0x100;
+ vc->vc_video_erase_char = c & ~0x100;
}
}
fbcon_font_widths(p);
if (resize) {
- struct vc_data *conp = p->conp;
+ struct vc_data *vc = p->conp;
/* reset wrap/pan */
info->var.xoffset = info->var.yoffset = p->yscroll = 0;
p->vrows = info->var.yres_virtual/h;
@@ -1826,10 +1756,10 @@ static int fbcon_do_set_font(int unit, struct console_font_op *op, u8 *data, int
p->vrows--;
updatescrollmode(p);
vc_resize(unit, info->var.xres/w, info->var.yres/h);
- if (CON_IS_VISIBLE(conp) && softback_buf) {
- int l = fbcon_softback_size / conp->vc_size_row;
+ if (CON_IS_VISIBLE(vc) && softback_buf) {
+ int l = fbcon_softback_size / vc->vc_size_row;
if (l > 5)
- softback_end = softback_buf + l * conp->vc_size_row;
+ softback_end = softback_buf + l * vc->vc_size_row;
else {
/* Smaller scrollback makes no sense, and 0 would screw
the operation totally */
@@ -1973,9 +1903,9 @@ static inline int fbcon_set_def_font(int unit, struct console_font_op *op)
return fbcon_do_set_font(unit, op, f->data, 0);
}
-static int fbcon_font_op(struct vc_data *conp, struct console_font_op *op)
+static int fbcon_font_op(struct vc_data *vc, struct console_font_op *op)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
switch (op->op) {
case KD_FONT_OP_SET:
@@ -1999,23 +1929,23 @@ static struct fb_cmap palette_cmap = {
0, 16, palette_red, palette_green, palette_blue, NULL
};
-static int fbcon_set_palette(struct vc_data *conp, unsigned char *table)
+static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
{
- int unit = conp->vc_num;
+ int unit = vc->vc_num;
struct display *p = &fb_display[unit];
struct fb_info *info = p->fb_info;
int i, j, k;
u8 val;
- if (!conp->vc_can_do_color || (!p->can_soft_blank && console_blanked))
+ if (!vc->vc_can_do_color || (!p->can_soft_blank && console_blanked))
return -EINVAL;
for (i = j = 0; i < 16; i++) {
k = table[i];
- val = conp->vc_palette[j++];
+ val = vc->vc_palette[j++];
palette_red[k] = (val<<8)|val;
- val = conp->vc_palette[j++];
+ val = vc->vc_palette[j++];
palette_green[k] = (val<<8)|val;
- val = conp->vc_palette[j++];
+ val = vc->vc_palette[j++];
palette_blue[k] = (val<<8)|val;
}
if (info->var.bits_per_pixel <= 4)
@@ -2026,51 +1956,51 @@ static int fbcon_set_palette(struct vc_data *conp, unsigned char *table)
return fb_set_cmap(&palette_cmap, 1, info);
}
-static u16 *fbcon_screen_pos(struct vc_data *conp, int offset)
+static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
{
int line;
unsigned long p;
- if (conp->vc_num != fg_console || !softback_lines)
- return (u16 *)(conp->vc_origin + offset);
- line = offset / conp->vc_size_row;
+ if (vc->vc_num != fg_console || !softback_lines)
+ return (u16 *)(vc->vc_origin + offset);
+ line = offset / vc->vc_size_row;
if (line >= softback_lines)
- return (u16 *)(conp->vc_origin + offset - softback_lines * conp->vc_size_row);
+ return (u16 *)(vc->vc_origin + offset - softback_lines * vc->vc_size_row);
p = softback_curr + offset;
if (p >= softback_end)
p += softback_buf - softback_end;
return (u16 *)p;
}
-static unsigned long fbcon_getxy(struct vc_data *conp, unsigned long pos, int *px, int *py)
+static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos, int *px, int *py)
{
int x, y;
unsigned long ret;
- if (pos >= conp->vc_origin && pos < conp->vc_scr_end) {
- unsigned long offset = (pos - conp->vc_origin) / 2;
+ if (pos >= vc->vc_origin && pos < vc->vc_scr_end) {
+ unsigned long offset = (pos - vc->vc_origin) / 2;
- x = offset % conp->vc_cols;
- y = offset / conp->vc_cols;
- if (conp->vc_num == fg_console)
+ x = offset % vc->vc_cols;
+ y = offset / vc->vc_cols;
+ if (vc->vc_num == fg_console)
y += softback_lines;
- ret = pos + (conp->vc_cols - x) * 2;
- } else if (conp->vc_num == fg_console && softback_lines) {
+ ret = pos + (vc->vc_cols - x) * 2;
+ } else if (vc->vc_num == fg_console && softback_lines) {
unsigned long offset = pos - softback_curr;
if (pos < softback_curr)
offset += softback_end - softback_buf;
offset /= 2;
- x = offset % conp->vc_cols;
- y = offset / conp->vc_cols;
- ret = pos + (conp->vc_cols - x) * 2;
+ x = offset % vc->vc_cols;
+ y = offset / vc->vc_cols;
+ ret = pos + (vc->vc_cols - x) * 2;
if (ret == softback_end)
ret = softback_buf;
if (ret == softback_in)
- ret = conp->vc_origin;
+ ret = vc->vc_origin;
} else {
/* Should not happen */
x = y = 0;
- ret = conp->vc_origin;
+ ret = vc->vc_origin;
}
if (px) *px = x;
if (py) *py = y;
@@ -2079,13 +2009,13 @@ static unsigned long fbcon_getxy(struct vc_data *conp, unsigned long pos, int *p
/* As we might be inside of softback, we may work with non-contiguous buffer,
that's why we have to use a separate routine. */
-static void fbcon_invert_region(struct vc_data *conp, u16 *p, int cnt)
+static void fbcon_invert_region(struct vc_data *vc, u16 *p, int cnt)
{
while (cnt--) {
u16 a = scr_readw(p);
- if (!conp->vc_can_do_color)
+ if (!vc->vc_can_do_color)
a ^= 0x0800;
- else if (conp->vc_hi_font_mask == 0x100)
+ else if (vc->vc_hi_font_mask == 0x100)
a = ((a) & 0x11ff) | (((a) & 0xe000) >> 4) | (((a) & 0x0e00) << 4);
else
a = ((a) & 0x88ff) | (((a) & 0x7000) >> 4) | (((a) & 0x0700) << 4);
@@ -2093,11 +2023,11 @@ static void fbcon_invert_region(struct vc_data *conp, u16 *p, int cnt)
if (p == (u16 *)softback_end)
p = (u16 *)softback_buf;
if (p == (u16 *)softback_in)
- p = (u16 *)conp->vc_origin;
+ p = (u16 *)vc->vc_origin;
}
}
-static int fbcon_scrolldelta(struct vc_data *conp, int lines)
+static int fbcon_scrolldelta(struct vc_data *vc, int lines)
{
int unit, offset, limit, scrollback_old;
struct fb_info *info;
@@ -2108,7 +2038,7 @@ static int fbcon_scrolldelta(struct vc_data *conp, int lines)
info = p->fb_info;
if (softback_top) {
- if (conp->vc_num != unit)
+ if (vc->vc_num != unit)
return 0;
if (vt_cons[unit]->vc_mode != KD_TEXT || !lines)
return 0;
@@ -2122,22 +2052,22 @@ static int fbcon_scrolldelta(struct vc_data *conp, int lines)
int i;
p = softback_in;
- q = conp->vc_origin + logo_lines * conp->vc_size_row;
+ q = vc->vc_origin + logo_lines * vc->vc_size_row;
for (i = 0; i < logo_lines; i++) {
if (p == softback_top) break;
if (p == softback_buf) p = softback_end;
- p -= conp->vc_size_row;
- q -= conp->vc_size_row;
- scr_memcpyw((u16 *)q, (u16 *)p, conp->vc_size_row);
+ p -= vc->vc_size_row;
+ q -= vc->vc_size_row;
+ scr_memcpyw((u16 *)q, (u16 *)p, vc->vc_size_row);
}
softback_in = p;
- update_region(unit, conp->vc_origin, logo_lines * conp->vc_cols);
+ update_region(unit, vc->vc_origin, logo_lines * vc->vc_cols);
}
logo_shown = -1;
}
- fbcon_cursor(conp, CM_ERASE|CM_SOFTBACK);
- fbcon_redraw_softback(conp, p, lines);
- fbcon_cursor(conp, CM_DRAW|CM_SOFTBACK);
+ fbcon_cursor(vc, CM_ERASE|CM_SOFTBACK);
+ fbcon_redraw_softback(vc, p, lines);
+ fbcon_cursor(vc, CM_DRAW|CM_SOFTBACK);
return 0;
}
@@ -2156,7 +2086,7 @@ static int fbcon_scrolldelta(struct vc_data *conp, int lines)
if (!p->can_soft_blank &&
(console_blanked || vt_cons[unit]->vc_mode != KD_TEXT || !lines))
return 0;
- fbcon_cursor(conp, CM_ERASE);
+ fbcon_cursor(vc, CM_ERASE);
offset = p->yscroll-scrollback_current;
limit = p->vrows;
@@ -2165,7 +2095,7 @@ static int fbcon_scrolldelta(struct vc_data *conp, int lines)
info->var.vmode |= FB_VMODE_YWRAP;
break;
case __SCROLL_YPAN:
- limit -= conp->vc_rows;
+ limit -= vc->vc_rows;
info->var.vmode &= ~FB_VMODE_YWRAP;
break;
}
@@ -2177,14 +2107,14 @@ static int fbcon_scrolldelta(struct vc_data *conp, int lines)
info->var.yoffset = offset*fontheight(p);
update_var(unit, info);
if (!scrollback_current)
- fbcon_cursor(conp, CM_DRAW);
+ fbcon_cursor(vc, CM_DRAW);
return 0;
}
-static int fbcon_set_origin(struct vc_data *conp)
+static int fbcon_set_origin(struct vc_data *vc)
{
if (softback_lines && !console_blanked)
- fbcon_scrolldelta(conp, softback_lines);
+ fbcon_scrolldelta(vc, softback_lines);
return 0;
}
@@ -2281,12 +2211,12 @@ static int __init fbcon_show_logo( void )
}
saved_palette = info->pseudo_palette;
info->pseudo_palette = palette;
- image.width = LOGO_W;
- image.height = LOGO_H;
- image.depth = depth;
- image.data = logo;
- image.dy = 0;
}
+ image.width = LOGO_W;
+ image.height = LOGO_H;
+ image.depth = depth;
+ image.data = logo;
+ image.dy = 0;
#endif
for (x = 0; x < num_online_cpus() * (LOGO_W + 8) &&
@@ -2349,9 +2279,7 @@ static int __init fbcon_show_logo( void )
break;
}
#endif
-#if defined(CONFIG_FBCON_MFB) || defined(CONFIG_FBCON_AFB) || \
- defined(CONFIG_FBCON_ILBM) || defined(CONFIG_FBCON_HGA)
-
+#if defined(CONFIG_FBCON_ILBM) || defined(CONFIG_FBCON_AFB)
if (depth == 1 && (info->fix.type == FB_TYPE_PACKED_PIXELS ||
info->fix.type == FB_TYPE_PLANES ||
info->fix.type == FB_TYPE_INTERLEAVED_PLANES)) {
@@ -2360,7 +2288,7 @@ static int __init fbcon_show_logo( void )
unsigned char inverse = p->inverse || info->fix.visual == FB_VISUAL_MONO01
? 0x00 : 0xff;
- int is_hga = !strncmp(info->modename, "HGA", 3);
+ int is_hga = !strncmp(info->fix.id, "HGA", 3);
/* can't use simply memcpy because need to apply inverse */
for( y1 = 0; y1 < LOGO_H; y1++ ) {
src = logo + y1*LOGO_LINE;
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index 4bba5156e0cd..4c4e4690d385 100644
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -91,8 +91,6 @@ struct display {
extern struct display fb_display[MAX_NR_CONSOLES];
extern char con2fb_map[MAX_NR_CONSOLES];
extern void set_con2fb_map(int unit, int newidx);
-extern int set_all_vcs(int fbidx, struct fb_ops *fb,
- struct fb_var_screeninfo *var, struct fb_info *info);
#define fontheight(p) ((p)->_fontheight)
#define fontheightlog(p) ((p)->_fontheightlog)
diff --git a/drivers/video/fbgen.c b/drivers/video/fbgen.c
index d9a0ab78fe3d..48903c763381 100644
--- a/drivers/video/fbgen.c
+++ b/drivers/video/fbgen.c
@@ -20,34 +20,6 @@
#include <asm/uaccess.h>
#include <asm/io.h>
-int fb_set_var(struct fb_var_screeninfo *var, struct fb_info *info)
-{
- int err;
-
- if (memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {
- if (!info->fbops->fb_check_var) {
- *var = info->var;
- return 0;
- }
-
- if ((err = info->fbops->fb_check_var(var, info)))
- return err;
-
- if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
- info->var = *var;
-
- if (info->fbops->fb_set_par)
- info->fbops->fb_set_par(info);
-
- if (info->fbops->fb_pan_display)
- info->fbops->fb_pan_display(&info->var,
- info);
- fb_set_cmap(&info->cmap, 1, info);
- }
- }
- return 0;
-}
-
int cfb_cursor(struct fb_info *info, struct fbcursor *cursor)
{
int i, size = ((cursor->size.x + 7) / 8) * cursor->size.y;
@@ -143,7 +115,6 @@ int fb_blank(int blank, struct fb_info *info)
}
/* generic frame buffer operations */
-EXPORT_SYMBOL(fb_set_var);
EXPORT_SYMBOL(cfb_cursor);
EXPORT_SYMBOL(fb_pan_display);
EXPORT_SYMBOL(fb_blank);
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 489e246a4408..143c308f61a2 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -464,6 +464,34 @@ static void try_to_load(int fb)
}
#endif /* CONFIG_KMOD */
+int fb_set_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+ int err;
+
+ if (memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {
+ if (!info->fbops->fb_check_var) {
+ *var = info->var;
+ return 0;
+ }
+
+ if ((err = info->fbops->fb_check_var(var, info)))
+ return err;
+
+ if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
+ info->var = *var;
+
+ if (info->fbops->fb_set_par)
+ info->fbops->fb_set_par(info);
+
+ if (info->fbops->fb_pan_display)
+ info->fbops->fb_pan_display(&info->var, info);
+
+ fb_set_cmap(&info->cmap, 1, info);
+ }
+ }
+ return 0;
+}
+
static int
fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
@@ -488,12 +516,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
case FBIOPUT_VSCREENINFO:
if (copy_from_user(&var, (void *) arg, sizeof(var)))
return -EFAULT;
-#ifdef CONFIG_FRAMEBUFFER_CONSOLE
- if (var.activate & FB_ACTIVATE_ALL)
- i = set_all_vcs(fbidx, fb, &var, info);
- else
-#endif
- i = fb_set_var(&var, info);
+ i = fb_set_var(&var, info);
if (i) return i;
if (copy_to_user((void *) arg, &var, sizeof(var)))
return -EFAULT;
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index 0492fe99a9e0..a830076d0396 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -46,8 +46,6 @@
#include <linux/ioport.h>
#include <asm/io.h>
#include <asm/vga.h>
-#include <video/fbcon.h>
-#include <video/fbcon-hga.h>
#ifdef MODULE
@@ -73,9 +71,15 @@
static unsigned long hga_vram_base; /* Base of video memory */
static unsigned long hga_vram_len; /* Size of video memory */
+#define HGA_ROWADDR(row) ((row%4)*8192 + (row>>2)*90)
#define HGA_TXT 0
#define HGA_GFX 1
+static inline u8* rowaddr(struct fb_info *info, u_int row)
+{
+ return info->screen_base + HGA_ROWADDR(row);
+}
+
static int hga_mode = -1; /* 0 = txt, 1 = gfx mode */
static enum { TYPE_HERC, TYPE_HERCPLUS, TYPE_HERCCOLOR } hga_type;
@@ -137,7 +141,6 @@ static struct fb_fix_screeninfo hga_fix = {
};
static struct fb_info fb_info;
-static struct display disp;
/* Don't assume that tty1 will be the initial current console. */
static int release_io_port = 0;
@@ -189,7 +192,6 @@ static void hga_clear_screen(void)
isa_memset_io(hga_vram_base, fillchar, hga_vram_len);
}
-
#ifdef MODULE
static void hga_txt_mode(void)
{
@@ -255,15 +257,13 @@ static void hga_gfx_mode(void)
}
#ifdef MODULE
-static void hga_show_logo(void)
+static void hga_show_logo(struct fb_info *info)
{
int x, y;
- unsigned long dest = hga_vram_base;
char *logo = linux_logo_bw;
for (y = 134; y < 134 + 80 ; y++) /* this needs some cleanup */
for (x = 0; x < 10 ; x++)
- isa_writeb(~*(logo++),
- (dest + (y%4)*8192 + (y>>2)*90 + x + 40));
+ isa_writeb(~*(logo++),(dest + HGA_ROWADDR(y) + x + 40));
}
#endif /* MODULE */
@@ -389,7 +389,6 @@ static int hgafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
/**
* hga_pan_display - pan or wrap the display
* @var:contains new xoffset, yoffset and vmode values
- * @con:unused
* @info:pointer to fb_info object containing info for current hga board
*
* This function looks only at xoffset, yoffset and the %FB_VMODE_YWRAP
@@ -398,12 +397,8 @@ static int hgafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
* A zero is returned on success and %-EINVAL for failure.
*/
-int hga_pan_display(struct fb_var_screeninfo *var, int con,
- struct fb_info *info)
+int hgafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
{
- CHKINFO(-EINVAL);
- DPRINTK("pan_disp: con:%d, wrap:%d, xoff:%d, yoff:%d\n", con, var->vmode & FB_VMODE_YWRAP, var->xoffset, var->yoffset);
-
if (var->vmode & FB_VMODE_YWRAP) {
if (var->yoffset < 0 ||
var->yoffset >= info->var.yres_virtual ||
@@ -442,24 +437,84 @@ int hga_pan_display(struct fb_var_screeninfo *var, int con,
static int hgafb_blank(int blank_mode, struct fb_info *info)
{
- CHKINFO( );
- DPRINTK("hgafb_blank: blank_mode:%d, info:%x, fb_info:%x\n", blank_mode, (unsigned)info, (unsigned)&fb_info);
-
hga_blank(blank_mode);
return 0;
}
+static void hgafb_fillrect(struct fb_info *info, struct fb_fillrect *rect)
+{
+ u_int rows, y;
+ u8 *dest;
+
+ y = rect->dy;
+
+ for (rows = rect->height; rows--; y++) {
+ dest = rowaddr(info, y) + (rect->dx >> 3);
+ switch (rect->rop) {
+ case ROP_COPY:
+ fb_memset(dest, rect->color, (rect->width >> 3));
+ break;
+ case ROP_XOR:
+ *dest = ~*dest;
+ break;
+ }
+ }
+}
+
+static void hgafb_copyarea(struct fb_info *info, struct fb_copyarea *area)
+{
+ u_int rows, y1, y2;
+ u8 *src, *dest;
+
+ if (area->dy <= area->sy) {
+ y1 = area->sy;
+ y2 = area->dy;
+
+ for (rows = area->height; rows--; ) {
+ src = rowaddr(info, y1) + (area->sx >> 3);
+ dest = rowaddr(info, y2) + (area->dx >> 3);
+ fb_memmove(dest, src, (area->width >> 3));
+ y1++;
+ y2++;
+ }
+ } else {
+ y1 = area->sy + area->height - 1;
+ y2 = area->dy + area->height - 1;
+
+ for (rows = area->height; rows--;) {
+ src = rowaddr(info, y1) + (area->sx >> 3);
+ dest = rowaddr(info, y2) + (area->dx >> 3);
+ fb_memmove(dest, src, (area->width >> 3));
+ y1--;
+ y2--;
+ }
+ }
+}
+
+static void hgafb_imageblit(struct fb_info *info, struct fb_image *image)
+{
+ u8 *dest, *cdat = image->data;
+ u_int rows, y = image->dy;
+ u8 d;
+
+ for (rows = image->height; rows--; y++) {
+ d = *cdat++;
+ dest = rowaddr(info, y) + (image->dx >> 3);
+ *dest = d;
+ }
+}
+
+
static struct fb_ops hgafb_ops = {
.owner = THIS_MODULE,
- .fb_set_var = gen_set_var,
- .fb_get_cmap = gen_get_cmap,
- .fb_set_cmap = gen_set_cmap,
.fb_setcolreg = hgafb_setcolreg,
- .fb_pan_display = hga_pan_display,
+ .fb_pan_display = hgafb_pan_display,
.fb_blank = hgafb_blank,
+ .fb_fillrect = hgafb_fillrect,
+ .fb_copyarea = hgafb_copyarea,
+ .fb_imageblit = hgafb_imageblit,
};
-
/* ------------------------------------------------------------------------- *
*
* Functions in fb_info
@@ -484,27 +539,10 @@ int __init hgafb_init(void)
hga_gfx_mode();
hga_clear_screen();
-#ifdef MODULE
- if (!nologo) hga_show_logo();
-#endif /* MODULE */
hga_fix.smem_start = VGA_MAP_MEM(hga_vram_base);
hga_fix.smem_len = hga_vram_len;
- disp.var = hga_default_var;
- disp.can_soft_blank = 1;
- disp.inverse = 0;
-#ifdef FBCON_HAS_HGA
- disp.dispsw = &fbcon_hga;
-#else
-#warning HGAFB will not work as a console!
- disp.dispsw = &fbcon_dummy;
-#endif
- disp.dispsw_data = NULL;
-
- disp.scrollmode = SCROLL_YREDRAW;
-
- strcpy (fb_info.modename, hga_fix.id);
fb_info.node = NODEV;
fb_info.flags = FBINFO_FLAG_DEFAULT;
fb_info.var = hga_default_var;
@@ -516,18 +554,16 @@ int __init hgafb_init(void)
fb_info.monspecs.dpms = 0;
fb_info.fbops = &hgafb_ops;
fb_info.screen_base = (char *)hga_fix.smem_start;
- fb_info.disp = &disp;
- fb_info.currcon = 1;
- fb_info.changevar = NULL;
- fb_info.switch_con = gen_switch;
- fb_info.updatevar = gen_update_var;
if (register_framebuffer(&fb_info) < 0)
return -EINVAL;
+#ifdef MODULE
+ if (!nologo) hga_show_logo(&fb_info);
+#endif /* MODULE */
+
printk(KERN_INFO "fb%d: %s frame buffer device\n",
- minor(fb_info.node), fb_info.modename);
-
+ minor(fb_info.node), fb_info.fix.id);
return 0;
}
@@ -535,49 +571,21 @@ int __init hgafb_init(void)
* Setup
*/
-#ifndef MODULE
int __init hgafb_setup(char *options)
{
- /*
- * Parse user speficied options
- * `video=hga:font:VGA8x16' or
- * `video=hga:font:SUN8x16' recommended
- * Other supported fonts: VGA8x8, Acorn8x8, PEARL8x8
- * More different fonts can be used with the `setfont' utility.
- */
-
- char *this_opt;
-
- fb_info.fontname[0] = '\0';
-
- if (!options || !*options)
- return 0;
-
- while ((this_opt = strsep(&options, ","))) {
- if (!strncmp(this_opt, "font:", 5))
- strcpy(fb_info.fontname, this_opt+5);
- }
return 0;
}
-#endif /* !MODULE */
-
-
- /*
- * Cleanup
- */
#ifdef MODULE
-static void hgafb_cleanup(struct fb_info *info)
+static void __exit hgafb_exit(void)
{
hga_txt_mode();
hga_clear_screen();
- unregister_framebuffer(info);
+ unregister_framebuffer(&fb_info);
if (release_io_ports) release_region(0x3b0, 12);
if (release_io_port) release_region(0x3bf, 1);
}
-#endif /* MODULE */
-
-
+#endif
/* -------------------------------------------------------------------------
*
@@ -585,29 +593,14 @@ static void hgafb_cleanup(struct fb_info *info)
*
* ------------------------------------------------------------------------- */
-#ifdef MODULE
-int init_module(void)
-{
- if (font)
- strncpy(fb_info.fontname, font, sizeof(fb_info.fontname)-1);
- else
- fb_info.fontname[0] = '\0';
-
- return hgafb_init();
-}
-
-void cleanup_module(void)
-{
- hgafb_cleanup(&fb_info);
-}
-
MODULE_AUTHOR("Ferenc Bakonyi (fero@drama.obuda.kando.hu)");
MODULE_DESCRIPTION("FBDev driver for Hercules Graphics Adaptor");
MODULE_LICENSE("GPL");
-MODULE_PARM(font, "s");
-MODULE_PARM_DESC(font, "Specifies one of the compiled-in fonts (VGA8x8, VGA8x16, SUN8x16, Acorn8x8, PEARL8x8) (default=none)");
MODULE_PARM(nologo, "i");
MODULE_PARM_DESC(nologo, "Disables startup logo if != 0 (default=0)");
-#endif /* MODULE */
+#ifdef MODULE
+module_init(hgafb_init);
+module_exit(hgafb_exit);
+#endif
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 4c525d764471..b02186ce909a 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -1,7 +1,7 @@
/*
* linux/drivers/video/neofb.c -- NeoMagic Framebuffer Driver
*
- * Copyright (c) 2001 Denis Oliver Kropp <dok@convergence.de>
+ * Copyright (c) 2001-2002 Denis Oliver Kropp <dok@directfb.org>
*
*
* Card specific code is based on XFree86's neomagic driver.
@@ -11,6 +11,16 @@
* Public License. See the file COPYING in the main directory of this
* archive for more details.
*
+ *
+ * 0.4.1
+ * - Cosmetic changes (dok)
+ *
+ * 0.4
+ * - Toshiba Libretto support, allow modes larger than LCD size if
+ * LCD is disabled, keep BIOS settings if internal/external display
+ * haven't been enabled explicitly
+ * (Thomas J. Moore <dark@mama.indstate.edu>)
+ *
* 0.3.3
* - Porting over to new fbdev api. (jsimmons)
*
@@ -56,6 +66,10 @@
#include <linux/fb.h>
#include <linux/pci.h>
#include <linux/init.h>
+#ifdef CONFIG_TOSHIBA
+#include <linux/toshiba.h>
+extern int tosh_smm(SMMRegisters *regs);
+#endif
#include <asm/io.h>
#include <asm/irq.h>
@@ -69,17 +83,18 @@
#include <video/neomagic.h>
-#define NEOFB_VERSION "0.3.3"
+#define NEOFB_VERSION "0.4.1"
struct neofb_par default_par;
/* --------------------------------------------------------------------- */
-static int disabled = 0;
-static int internal = 0;
-static int external = 0;
-static int nostretch = 0;
-static int nopciburst = 0;
+static int disabled;
+static int internal;
+static int external;
+static int libretto;
+static int nostretch;
+static int nopciburst;
#ifdef MODULE
@@ -93,6 +108,8 @@ MODULE_PARM(internal, "i");
MODULE_PARM_DESC(internal, "Enable output on internal LCD Display.");
MODULE_PARM(external, "i");
MODULE_PARM_DESC(external, "Enable output on external CRT.");
+MODULE_PARM(libretto, "i");
+MODULE_PARM_DESC(libretto, "Force Libretto 100/110 800x480 LCD.");
MODULE_PARM(nostretch, "i");
MODULE_PARM_DESC(nostretch,
"Disable stretching of modes smaller than LCD.");
@@ -550,8 +567,9 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
timings.sync = var->sync;
/* Is the mode larger than the LCD panel? */
- if ((var->xres > par->NeoPanelWidth) ||
- (var->yres > par->NeoPanelHeight)) {
+ if (par->internal_display &&
+ ((var->xres > par->NeoPanelWidth) ||
+ (var->yres > par->NeoPanelHeight))) {
printk(KERN_INFO
"Mode (%dx%d) larger than the LCD panel (%dx%d)\n",
var->xres, var->yres, par->NeoPanelWidth,
@@ -560,23 +578,27 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
}
/* Is the mode one of the acceptable sizes? */
- switch (var->xres) {
- case 1280:
- if (var->yres == 1024)
- mode_ok = 1;
- break;
- case 1024:
- if (var->yres == 768)
- mode_ok = 1;
- break;
- case 800:
- if (var->yres == 600)
- mode_ok = 1;
- break;
- case 640:
- if (var->yres == 480)
- mode_ok = 1;
- break;
+ if (!par->internal_display)
+ mode_ok = 1;
+ else {
+ switch (var->xres) {
+ case 1280:
+ if (var->yres == 1024)
+ mode_ok = 1;
+ break;
+ case 1024:
+ if (var->yres == 768)
+ mode_ok = 1;
+ break;
+ case 800:
+ if (var->yres == (par->libretto ? 480 : 600))
+ mode_ok = 1;
+ break;
+ case 640:
+ if (var->yres == 480)
+ mode_ok = 1;
+ break;
+ }
}
if (!mode_ok) {
@@ -1259,6 +1281,17 @@ static int neofb_blank(int blank, struct fb_info *fb)
switch (blank) {
case 4: /* powerdown - both sync lines down */
+#ifdef CONFIG_TOSHIBA
+ /* attempt to turn off backlight on toshiba; also turns off external */
+ {
+ SMMRegisters regs;
+
+ regs.eax = 0xff00; /* HCI_SET */
+ regs.ebx = 0x0002; /* HCI_BACKLIGHT */
+ regs.ecx = 0x0000; /* HCI_DISABLE */
+ tosh_smm(&regs);
+ }
+#endif
break;
case 3: /* hsync off */
break;
@@ -1267,6 +1300,17 @@ static int neofb_blank(int blank, struct fb_info *fb)
case 1: /* just software blanking of screen */
break;
default: /* case 0, or anything else: unblank */
+#ifdef CONFIG_TOSHIBA
+ /* attempt to re-enable backlight/external on toshiba */
+ {
+ SMMRegisters regs;
+
+ regs.eax = 0xff00; /* HCI_SET */
+ regs.ebx = 0x0002; /* HCI_BACKLIGHT */
+ regs.ecx = 0x0001; /* HCI_ENABLE */
+ tosh_smm(&regs);
+ }
+#endif
break;
}
return 0;
@@ -1399,75 +1443,93 @@ static struct fb_ops neofb_ops = {
/* --------------------------------------------------------------------- */
static struct fb_var_screeninfo __devinitdata neofb_var640x480x8 = {
- accel_flags: FB_ACCELF_TEXT,
- xres: 640,
- yres: 480,
- xres_virtual: 640,
- yres_virtual: 30000,
- bits_per_pixel: 8,
- pixclock: 39722,
- left_margin: 48,
- right_margin: 16,
- upper_margin: 33,
- lower_margin: 10,
- hsync_len: 96,
- vsync_len: 2,
- vmode: FB_VMODE_NONINTERLACED
+ .accel_flags = FB_ACCELF_TEXT,
+ .xres = 640,
+ .yres = 480,
+ .xres_virtual = 640,
+ .yres_virtual = 30000,
+ .bits_per_pixel = 8,
+ .pixclock = 39722,
+ .left_margin = 48,
+ .right_margin = 16,
+ .upper_margin = 33,
+ .lower_margin = 10,
+ .hsync_len = 96,
+ .vsync_len = 2,
+ .vmode = FB_VMODE_NONINTERLACED
};
static struct fb_var_screeninfo __devinitdata neofb_var800x600x8 = {
- accel_flags: FB_ACCELF_TEXT,
- xres: 800,
- yres: 600,
- xres_virtual: 800,
- yres_virtual: 30000,
- bits_per_pixel: 8,
- pixclock: 25000,
- left_margin: 88,
- right_margin: 40,
- upper_margin: 23,
- lower_margin: 1,
- hsync_len: 128,
- vsync_len: 4,
- sync: FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
- vmode: FB_VMODE_NONINTERLACED
+ .accel_flags = FB_ACCELF_TEXT,
+ .xres = 800,
+ .yres = 600,
+ .xres_virtual = 800,
+ .yres_virtual = 30000,
+ .bits_per_pixel = 8,
+ .pixclock = 25000,
+ .left_margin = 88,
+ .right_margin = 40,
+ .upper_margin = 23,
+ .lower_margin = 1,
+ .hsync_len = 128,
+ .vsync_len = 4,
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .vmode = FB_VMODE_NONINTERLACED
+};
+
+static struct fb_var_screeninfo __devinitdata neofb_var800x480x8 = {
+ .accel_flags = FB_ACCELF_TEXT,
+ .xres = 800,
+ .yres = 480,
+ .xres_virtual = 800,
+ .yres_virtual = 30000,
+ .bits_per_pixel = 8,
+ .pixclock = 25000,
+ .left_margin = 88,
+ .right_margin = 40,
+ .upper_margin = 23,
+ .lower_margin = 1,
+ .hsync_len = 128,
+ .vsync_len = 4,
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .vmode = FB_VMODE_NONINTERLACED
};
static struct fb_var_screeninfo __devinitdata neofb_var1024x768x8 = {
- accel_flags: FB_ACCELF_TEXT,
- xres: 1024,
- yres: 768,
- xres_virtual: 1024,
- yres_virtual: 30000,
- bits_per_pixel: 8,
- pixclock: 15385,
- left_margin: 160,
- right_margin: 24,
- upper_margin: 29,
- lower_margin: 3,
- hsync_len: 136,
- vsync_len: 6,
- sync: FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
- vmode: FB_VMODE_NONINTERLACED
+ .accel_flags = FB_ACCELF_TEXT,
+ .xres = 1024,
+ .yres = 768,
+ .xres_virtual = 1024,
+ .yres_virtual = 30000,
+ .bits_per_pixel = 8,
+ .pixclock = 15385,
+ .left_margin = 160,
+ .right_margin = 24,
+ .upper_margin = 29,
+ .lower_margin = 3,
+ .hsync_len = 136,
+ .vsync_len = 6,
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .vmode = FB_VMODE_NONINTERLACED
};
#ifdef NOT_DONE
static struct fb_var_screeninfo __devinitdata neofb_var1280x1024x8 = {
- accel_flags: FB_ACCELF_TEXT,
- xres: 1280,
- yres: 1024,
- xres_virtual: 1280,
- yres_virtual: 30000,
- bits_per_pixel: 8,
- pixclock: 9260,
- left_margin: 248,
- right_margin: 48,
- upper_margin: 38,
- lower_margin: 1,
- hsync_len: 112,
- vsync_len: 3,
- sync: FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
- vmode: FB_VMODE_NONINTERLACED
+ .accel_flags = FB_ACCELF_TEXT,
+ .xres = 1280,
+ .yres = 1024,
+ .xres_virtual = 1280,
+ .yres_virtual = 30000,
+ .bits_per_pixel = 8,
+ .pixclock = 9260,
+ .left_margin = 248,
+ .right_margin = 48,
+ .upper_margin = 38,
+ .lower_margin = 1,
+ .hsync_len = 112,
+ .vsync_len = 3,
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .vmode = FB_VMODE_NONINTERLACED
};
#endif
@@ -1605,6 +1667,13 @@ static int __devinit neo_init_hw(struct fb_info *info)
VGAwGR(0x09, 0x26);
type = VGArGR(0x21);
display = VGArGR(0x20);
+ if (!par->internal_display && !par->external_display) {
+ par->internal_display = display & 2 || !(display & 3) ? 1 : 0;
+ par->external_display = display & 1;
+ printk (KERN_INFO "Autodetected %s display\n",
+ par->internal_display && par->external_display ? "simultaneous" :
+ par->internal_display ? "internal" : "external");
+ }
/* Determine panel width -- used in NeoValidMode. */
w = VGArGR(0x20);
@@ -1617,8 +1686,8 @@ static int __devinit neo_init_hw(struct fb_info *info)
break;
case 0x01:
par->NeoPanelWidth = 800;
- par->NeoPanelHeight = 600;
- neofb_var = &neofb_var800x600x8;
+ par->NeoPanelHeight = par->libretto ? 480 : 600;
+ neofb_var = par->libretto ? &neofb_var800x480x8 : &neofb_var800x600x8;
break;
case 0x02:
par->NeoPanelWidth = 1024;
@@ -1634,7 +1703,7 @@ static int __devinit neo_init_hw(struct fb_info *info)
break;
#else
printk(KERN_ERR
- "neofb: Only 640x480, 800x600 and 1024x768 panels are currently supported\n");
+ "neofb: Only 640x480, 800x600/480 and 1024x768 panels are currently supported\n");
return -1;
#endif
default:
@@ -1761,14 +1830,10 @@ static struct fb_info *__devinit neo_alloc_fb_info(struct pci_dev *dev, const st
par->pci_burst = !nopciburst;
par->lcd_stretch = !nostretch;
+ par->libretto = libretto;
- if (!internal && !external) {
- par->internal_display = 1;
- par->external_display = 0;
- } else {
- par->internal_display = internal;
- par->external_display = external;
- }
+ par->internal_display = internal;
+ par->external_display = external;
switch (info->fix.accel) {
case FB_ACCEL_NEOMAGIC_NM2070:
@@ -2024,6 +2089,8 @@ int __init neofb_setup(char *options)
nostretch = 1;
if (!strncmp(this_opt, "nopciburst", 10))
nopciburst = 1;
+ if (!strncmp(this_opt, "libretto", 8))
+ libretto = 1;
}
return 0;
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 8736c2473dd1..0c4e74c8fbf6 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -1155,8 +1155,6 @@ static void __exit tdfxfb_exit(void)
MODULE_AUTHOR("Hannu Mallat <hmallat@cc.hut.fi>");
MODULE_DESCRIPTION("3Dfx framebuffer device driver");
MODULE_LICENSE("GPL");
-MODULE_PARM(noaccel, "i");
-MODULE_PARM_DESC(noaccel, "Disable hardware acceleration (1 = disabled), enabled by default.");
#ifdef MODULE
module_init(tdfxfb_init);
diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index e0b73849bf0a..eec28b762178 100644
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -176,6 +176,7 @@ struct neofb_par {
int lcd_stretch;
int internal_display;
int external_display;
+ int libretto;
};
typedef struct {
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-07 08:30:02 +0000