Menu
▾
▴
linuxconsole-commit
|
From: James S. <jsi...@us...> - 2001-10-29 00:11:04
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv10630/drivers/video
Modified Files:
Config.in fbcon.c fm2fb.c macfb.c newport_con.c promcon.c
sa1100fb.c sgivwfb.c
Log Message:
Synced to 2.4.13
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Config.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- Config.in 2001/10/08 08:35:49 1.52
+++ Config.in 2001/10/29 00:11:00 1.53
@@ -157,9 +157,6 @@
if [ "$CONFIG_FB_ATY" != "n" ]; then
bool ' Mach64 GX support (EXPERIMENTAL)' CONFIG_FB_ATY_GX
bool ' Mach64 CT/VT/GT/LT (incl. 3D RAGE) support' CONFIG_FB_ATY_CT
- if [ "$CONFIG_FB_ATY_CT" = "y" ]; then
- bool ' Sony Vaio C1VE 1024x480 LCD support' CONFIG_FB_ATY_CT_VAIO_LCD
- fi
fi
tristate ' ATI Radeon display support (EXPERIMENTAL)' CONFIG_FB_RADEON
tristate ' ATI Rage 128 display support (EXPERIMENTAL)' CONFIG_FB_ATY128
Index: fbcon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbcon.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- fbcon.c 2001/10/04 02:45:52 1.55
+++ fbcon.c 2001/10/29 00:11:00 1.56
@@ -169,8 +169,9 @@
if (!options || !*options)
return 0;
- if (!strncmp(options, "font:", 5))
- strcpy(fontname, options+5);
+ while (this_opt = strsep(&options, ",")) {
+ if (!strncmp(options, "font:", 5))
+ strcpy(fontname, options+5);
return 0;
}
@@ -374,17 +375,18 @@
unsigned short charmask = (vc->vc_font.charcount > 256) ? 0x1ff: 0xff;
unsigned int width = ((vc->vc_font.width+7)>>3);
struct fb_image image;
+ u16 c = scr_readw(s);
if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR) {
image.fg_color = attr_fgcol(vc, *s);
image.bg_color = attr_bgcol(vc, *s);
} else {
if (info->var.bits_per_pixel > 16) {
- image.fg_color = ((u32*)info->pseudo_palette)[attr_fgcol(vc,*s)];
- image.bg_color = ((u32*)info->pseudo_palette)[attr_bgcol(vc,*s)];
+ image.fg_color = ((u32*)info->pseudo_palette)[attr_fgcol(vc,c)];
+ image.bg_color = ((u32*)info->pseudo_palette)[attr_bgcol(vc,c)];
} else {
- image.fg_color = ((u16*)info->pseudo_palette)[attr_fgcol(vc,*s)];
- image.bg_color = ((u16*)info->pseudo_palette)[attr_bgcol(vc,*s)];
+ image.fg_color = ((u16*)info->pseudo_palette)[attr_fgcol(vc,c)];
+ image.bg_color = ((u16*)info->pseudo_palette)[attr_bgcol(vc,c)];
}
}
image.x = xpos * vc->vc_font.width;
@@ -395,7 +397,8 @@
while (count--) {
image.data = vc->vc_font.data +
- (scr_readw(s++) & charmask)*vc->vc_font.height*width;
+ (scr_readw(s) & charmask)*vc->vc_font.height*width;
+ s++;
info->fbops->fb_imageblit(info, &image);
image.x += vc->vc_font.width;
}
Index: fm2fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fm2fb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fm2fb.c 2001/08/27 16:36:15 1.6
+++ fm2fb.c 2001/10/29 00:11:00 1.7
@@ -315,8 +315,7 @@
if (!options || !*options)
return 0;
- for (this_opt = strtok(options, ","); this_opt;
- this_opt = strtok(NULL, ",")) {
+ while (this_opt = strsep(&options, ",")) {
if (!strncmp(this_opt, "pal", 3))
fm2fb_mode = FM2FB_MODE_PAL;
else if (!strncmp(this_opt, "ntsc", 4))
Index: macfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/macfb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- macfb.c 2001/06/06 14:24:49 1.7
+++ macfb.c 2001/10/29 00:11:00 1.8
@@ -40,6 +40,17 @@
#include <asm/io.h>
#include <asm/machw.h>
+#include <video/fbcon.h>
+#include <video/fbcon-mfb.h>
+#include <video/fbcon-cfb2.h>
+#include <video/fbcon-cfb4.h>
+#include <video/fbcon-cfb8.h>
+#include <video/fbcon-cfb16.h>
+#include <video/fbcon-cfb24.h>
+#include <video/fbcon-cfb32.h>
+
+#if defined(FBCON_HAS_CFB8) || defined(FBCON_HAS_CFB4) || defined(FBCON_HAS_CFB2)
+
/* Common DAC base address for the LC, RBV, Valkyrie, and IIvx */
#define DAC_BASE 0x50f24000
@@ -177,8 +188,20 @@
{0,0,0,0,0,0}
};
+static struct display disp;
static struct fb_info fb_info;
static struct { u_short blue, green, red, pad; } palette[256];
+static union {
+#ifdef FBCON_HAS_CFB16
+ u16 cfb16[16];
+#endif
+#ifdef FBCON_HAS_CFB24
+ u32 cfb24[16];
+#endif
+#ifdef FBCON_HAS_CFB32
+ u32 cfb32[16];
+#endif
+} fbcon_cmap;
static int inverse = 0;
static int vidtest = 0;
@@ -771,9 +794,40 @@
if (con != currcon)
return;
if (fb_display[con].cmap.len)
- fb_set_cmap(&fb_display[con].cmap, 1, info);
+ fb_set_cmap(&fb_display[con].cmap, 1, macfb_setcolreg, info);
else
- fb_set_cmap(fb_default_cmap(video_cmap_len), 1, info);
+ fb_set_cmap(fb_default_cmap(video_cmap_len), 1,
+ macfb_setcolreg, info);
+}
+
+static int macfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
+ struct fb_info *info)
+{
+ if (con == currcon) /* current console? */
+ return fb_get_cmap(cmap, kspc, macfb_getcolreg, info);
+ else if (fb_display[con].cmap.len) /* non default colormap? */
+ fb_copy_cmap(&fb_display[con].cmap, cmap, kspc ? 0 : 2);
+ else
+ fb_copy_cmap(fb_default_cmap(video_cmap_len),
+ cmap, kspc ? 0 : 2);
+ return 0;
+}
+
+static int macfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
+ struct fb_info *info)
+{
+ int err;
+
+ if (!fb_display[con].cmap.len) { /* no colormap allocated? */
+ err = fb_alloc_cmap(&fb_display[con].cmap,video_cmap_len,0);
+ if (err)
+ return err;
+ }
+ if (con == currcon) /* current console? */
+ return fb_set_cmap(cmap, kspc, macfb_setcolreg, info);
+ else
+ fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
+ return 0;
}
static struct fb_ops macfb_ops = {
@@ -781,10 +835,11 @@
fb_get_fix: macfb_get_fix,
fb_get_var: macfb_get_var,
fb_set_var: macfb_set_var,
- fb_setcolreg: macfb_setcolreg,
+ fb_get_cmap: macfb_get_cmap,
+ fb_set_cmap: macfb_set_cmap,
};
-void macfb_setup(char *options, int *ints)
+void __init macfb_setup(char *options, int *ints)
{
char *this_opt;
@@ -820,6 +875,11 @@
return 1;
}
+static void macfb_blank(int blank, struct fb_info *info)
+{
+ /* Not supported */
+}
+
void __init macfb_init(void)
{
struct nubus_dev* ndev = NULL;
@@ -1160,11 +1220,13 @@
break;
}
+ fb_info.changevar = NULL;
fb_info.node = -1;
fb_info.fbops = &macfb_ops;
fb_info.disp = &disp;
fb_info.switch_con = &macfb_switch;
fb_info.updatevar = &macfb_update_var;
+ fb_info.blank = &macfb_blank;
fb_info.flags = FBINFO_FLAG_DEFAULT;
macfb_set_disp(-1);
do_install_cmap(0, &fb_info);
@@ -1175,3 +1237,5 @@
printk("fb%d: %s frame buffer device\n",
GET_FB_IDX(fb_info.node), fb_info.modename);
}
+
+MODULE_LICENSE("GPL");
Index: newport_con.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/newport_con.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- newport_con.c 2001/09/01 21:28:56 1.8
+++ newport_con.c 2001/10/29 00:11:00 1.9
@@ -13,9 +13,14 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/tty.h>
+#include <linux/kd.h>
+#include <linux/selection.h>
+#include <linux/console.h>
+#include <linux/console_struct.h>
#include <linux/vt_kern.h>
#include <linux/mm.h>
#include <linux/module.h>
+#include <linux/slab.h>
[...1066 lines suppressed...]
+ return 0;
}
-void __exit newport_module_exit(void) {
- printk("Unloading SGI Newport Console Driver\n");
-}
+int cleanup_module(void)
+{
+ int i;
-module_init(newport_module_init);
-module_exit(newport_module_exit);
+ printk("Unloading SGI Newport Console Driver\n");
+ /* free memory used by user font */
+ for (i = 0; i < MAX_NR_CONSOLES; i++)
+ newport_set_def_font(i, NULL);
+ return 0;
+}
+#endif
Index: promcon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/promcon.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- promcon.c 2001/05/14 02:53:08 1.7
+++ promcon.c 2001/10/29 00:11:00 1.8
@@ -14,7 +14,11 @@
#include <linux/tty.h>
#include <linux/slab.h>
#include <linux/delay.h>
+#include <linux/console.h>
+#include <linux/console_struct.h>
#include <linux/vt_kern.h>
+#include <linux/selection.h>
+#include <linux/fb.h>
#include <linux/init.h>
#include <linux/kd.h>
@@ -43,71 +47,74 @@
}
static int
-promcon_start(struct vc_data *vc, char *b)
+promcon_start(struct vc_data *conp, char *b)
{
unsigned short *s = (unsigned short *)
- (vc->vc_origin + py * vc->vc_size_row + (px << 1));
+ (conp->vc_origin + py * conp->vc_size_row + (px << 1));
+ u16 cs;
+ cs = scr_readw(s);
if (px == pw) {
unsigned short *t = s - 1;
+ u16 ct = scr_readw(t);
- if (inverted(*s) && inverted(*t))
- return sprintf(b, "\b\033[7m%c\b\033[@%c\033[m",
- *s, *t);
- else if (inverted(*s))
- return sprintf(b, "\b\033[7m%c\033[m\b\033[@%c",
- *s, *t);
- else if (inverted(*t))
- return sprintf(b, "\b%c\b\033[@\033[7m%c\033[m",
- *s, *t);
+ if (inverted(cs) && inverted(ct))
+ return sprintf(b, "\b\033[7m%c\b\033[@%c\033[m", cs,
+ ct);
+ else if (inverted(cs))
+ return sprintf(b, "\b\033[7m%c\033[m\b\033[@%c", cs,
+ ct);
+ else if (inverted(ct))
+ return sprintf(b, "\b%c\b\033[@\033[7m%c\033[m", cs,
+ ct);
else
- return sprintf(b, "\b%c\b\033[@%c", *s, *t);
+ return sprintf(b, "\b%c\b\033[@%c", cs, ct);
}
- if (inverted(*s))
- return sprintf(b, "\033[7m%c\033[m\b", *s);
+ if (inverted(cs))
+ return sprintf(b, "\033[7m%c\033[m\b", cs);
else
- return sprintf(b, "%c\b", *s);
+ return sprintf(b, "%c\b", cs);
}
static int
-promcon_end(struct vc_data *vc, char *b)
+promcon_end(struct vc_data *conp, char *b)
{
unsigned short *s = (unsigned short *)
- (vc->vc_origin + py * vc->vc_size_row + (px << 1));
+ (conp->vc_origin + py * conp->vc_size_row + (px << 1));
char *p = b;
+ u16 cs;
b += sprintf(b, "\033[%d;%dH", py + 1, px + 1);
+ cs = scr_readw(s);
if (px == pw) {
unsigned short *t = s - 1;
+ u16 ct = scr_readw(t);
- if (inverted(*s) && inverted(*t))
- b += sprintf(b, "\b%c\b\033[@\033[7m%c\033[m", *s, *t);
- else if (inverted(*s))
- b += sprintf(b, "\b%c\b\033[@%c", *s, *t);
- else if (inverted(*t))
- b += sprintf(b, "\b\033[7m%c\b\033[@%c\033[m", *s, *t);
+ if (inverted(cs) && inverted(ct))
+ b += sprintf(b, "\b%c\b\033[@\033[7m%c\033[m", cs, ct);
+ else if (inverted(cs))
+ b += sprintf(b, "\b%c\b\033[@%c", cs, ct);
+ else if (inverted(ct))
+ b += sprintf(b, "\b\033[7m%c\b\033[@%c\033[m", cs, ct);
else
- b += sprintf(b, "\b\033[7m%c\033[m\b\033[@%c", *s, *t);
+ b += sprintf(b, "\b\033[7m%c\033[m\b\033[@%c", cs, ct);
return b - p;
}
- if (inverted(*s))
- b += sprintf(b, "%c\b", *s);
+ if (inverted(cs))
+ b += sprintf(b, "%c\b", cs);
else
- b += sprintf(b, "\033[7m%c\033[m\b", *s);
+ b += sprintf(b, "\033[7m%c\033[m\b", cs);
return b - p;
}
-const char __init *promcon_startup(struct vt_struct *vt, int init)
+const char __init *promcon_startup(void)
{
const char *display_desc = "PROM";
- struct vc_data *vc;
- char buf[40];
int node;
-
- vt->default_mode = vc = &prom_default;
+ char buf[40];
node = prom_getchild(prom_root_node);
node = prom_searchsiblings(node, "options");
@@ -124,16 +131,11 @@
ph--;
}
promcon_puts("\033[H\033[J", 6);
- vc->vc_can_do_color = PROMCON_COLOR;
- if (init) {
- vc->vc_cols = pw + 1;
- vc->vc_rows = ph + 1;
- }
return display_desc;
}
static void __init
-promcon_init_unimap(struct vc_data *vc)
+promcon_init_unimap(struct vc_data *conp)
{
mm_segment_t old_fs = get_fs();
struct unipair *p, *p1;
@@ -154,43 +156,50 @@
k++;
}
set_fs(KERNEL_DS);
- con_clear_unimap(vc, NULL);
- con_set_unimap(vc, k, p);
- con_protect_unimap(vc, 1);
+ con_clear_unimap(conp->vc_num, NULL);
+ con_set_unimap(conp->vc_num, k, p);
+ con_protect_unimap(conp->vc_num, 1);
set_fs(old_fs);
kfree(p);
}
static void
-promcon_init(struct vc_data *vc)
+promcon_init(struct vc_data *conp, int init)
{
unsigned long p;
- vc->vc_can_do_color = PROMCON_COLOR;
- vc->vc_cols = vc->display_fg->default_mode->vc_cols;
- vc->vc_rows = vc->display_fg->default_mode->vc_rows;
- p = *vc->vc_uni_pagedir_loc;
- if (vc->vc_uni_pagedir_loc == &vc->vc_uni_pagedir ||
- !--vc->vc_uni_pagedir_loc[1])
- con_free_unimap(vc);
- vc->vc_uni_pagedir_loc = promcon_uni_pagedir;
+ conp->vc_can_do_color = PROMCON_COLOR;
+ if (init) {
+ conp->vc_cols = pw + 1;
+ conp->vc_rows = ph + 1;
+ }
+ p = *conp->vc_uni_pagedir_loc;
+ if (conp->vc_uni_pagedir_loc == &conp->vc_uni_pagedir ||
+ !--conp->vc_uni_pagedir_loc[1])
+ con_free_unimap(conp->vc_num);
+ conp->vc_uni_pagedir_loc = promcon_uni_pagedir;
promcon_uni_pagedir[1]++;
- if (!promcon_uni_pagedir[0] && p)
- promcon_init_unimap(vc);
+ if (!promcon_uni_pagedir[0] && p) {
+ promcon_init_unimap(conp);
+ }
+ if (!init) {
+ if (conp->vc_cols != pw + 1 || conp->vc_rows != ph + 1)
+ vc_resize_con(ph + 1, pw + 1, conp->vc_num);
+ }
}
static void
-promcon_deinit(struct vc_data *vc)
+promcon_deinit(struct vc_data *conp)
{
/* When closing the last console, reset video origin */
if (!--promcon_uni_pagedir[1])
- con_free_unimap(vc);
- vc->vc_uni_pagedir_loc = &vc->vc_uni_pagedir;
- con_set_default_unimap(vc);
+ con_free_unimap(conp->vc_num);
+ conp->vc_uni_pagedir_loc = &conp->vc_uni_pagedir;
+ con_set_default_unimap(conp->vc_num);
}
static int
-promcon_switch(struct vc_data *vc)
+promcon_switch(struct vc_data *conp)
{
return 1;
}
@@ -203,8 +212,9 @@
unsigned char *b = *bp;
while (cnt--) {
- if (attr != inverted(*s)) {
- attr = inverted(*s);
+ u16 c = scr_readw(s);
+ if (attr != inverted(c)) {
+ attr = inverted(c);
if (attr) {
strcpy (b, "\033[7m");
b += 4;
@@ -213,7 +223,8 @@
b += 3;
}
}
- *b++ = *s++;
+ *b++ = c;
+ s++;
if (b - buf >= 224) {
promcon_puts(buf, b - buf);
b = buf;
@@ -224,7 +235,7 @@
}
static void
-promcon_putcs(struct vc_data *vc, const unsigned short *s,
+promcon_putcs(struct vc_data *conp, const unsigned short *s,
int count, int y, int x)
{
unsigned char buf[256], *b = buf;
@@ -232,20 +243,20 @@
unsigned char save;
int i, last = 0;
- if (vc->display_fg->vt_blanked)
+ if (console_blanked)
return;
if (count <= 0)
return;
- b += promcon_start(vc, b);
+ b += promcon_start(conp, b);
if (x + count >= pw + 1) {
if (count == 1) {
x -= 1;
- save = *(unsigned short *)(vc->vc_origin
- + y * vc->vc_size_row
- + (x << 1));
+ save = scr_readw((unsigned short *)(conp->vc_origin
+ + y * conp->vc_size_row
+ + (x << 1)));
if (px != x || py != y) {
b += sprintf(b, "\033[%d;%dH", y + 1, x + 1);
@@ -268,7 +279,7 @@
px++;
- b += promcon_end(vc, b);
+ b += promcon_end(conp, b);
promcon_puts(buf, b - buf);
return;
} else {
@@ -309,44 +320,44 @@
b += 3;
}
- b += promcon_end(vc, b);
+ b += promcon_end(conp, b);
promcon_puts(buf, b - buf);
}
static void
-promcon_putc(struct vc_data *vc, int c, int y, int x)
+promcon_putc(struct vc_data *conp, int c, int y, int x)
{
unsigned short s;
- if (vc->display_fg->vt_blanked)
+ if (console_blanked)
return;
scr_writew(c, &s);
- promcon_putcs(vc, &s, 1, y, x);
+ promcon_putcs(conp, &s, 1, y, x);
}
static void
-promcon_clear(struct vc_data *vc, int sy, int sx, int height, int width)
+promcon_clear(struct vc_data *conp, int sy, int sx, int height, int width)
{
unsigned char buf[256], *b = buf;
int i, j;
- if (vc->display_fg->vt_blanked)
+ if (console_blanked)
return;
- b += promcon_start(vc, b);
+ b += promcon_start(conp, b);
if (!sx && width == pw + 1) {
if (!sy && height == ph + 1) {
strcpy(b, "\033[H\033[J");
b += 6;
- b += promcon_end(vc, b);
+ b += promcon_end(conp, b);
promcon_puts(buf, b - buf);
return;
} else if (sy + height == ph + 1) {
b += sprintf(b, "\033[%dH\033[J", sy + 1);
- b += promcon_end(vc, b);
+ b += promcon_end(conp, b);
promcon_puts(buf, b - buf);
return;
}
@@ -360,7 +371,7 @@
strcpy(b, "\033[K");
b += 3;
- b += promcon_end(vc, b);
+ b += promcon_end(conp, b);
promcon_puts(buf, b - buf);
return;
@@ -375,7 +386,7 @@
strcpy(b, "\033[K");
b += 3;
- b += promcon_end(vc, b);
+ b += promcon_end(conp, b);
promcon_puts(buf, b - buf);
return;
}
@@ -390,29 +401,29 @@
}
}
- b += promcon_end(vc, b);
+ b += promcon_end(conp, b);
promcon_puts(buf, b - buf);
}
static void
-promcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
+promcon_bmove(struct vc_data *conp, int sy, int sx, int dy, int dx,
int height, int width)
{
char buf[256], *b = buf;
- if (vc->display_fg->vt_blanked)
+ if (console_blanked)
return;
- b += promcon_start(vc, b);
+ b += promcon_start(conp, b);
if (sy == dy && height == 1) {
- if (dx > sx && dx + width == vc->vc_cols)
+ if (dx > sx && dx + width == conp->vc_cols)
b += sprintf(b, "\033[%d;%dH\033[%d@\033[%d;%dH",
sy + 1, sx + 1, dx - sx, py + 1, px + 1);
- else if (dx < sx && sx + width == vc->vc_cols)
+ else if (dx < sx && sx + width == conp->vc_cols)
b += sprintf(b, "\033[%d;%dH\033[%dP\033[%d;%dH",
dy + 1, dx + 1, sx - dx, py + 1, px + 1);
- b += promcon_end(vc, b);
+ b += promcon_end(conp, b);
promcon_puts(buf, b - buf);
return;
}
@@ -425,7 +436,7 @@
}
static void
-promcon_cursor(struct vc_data *vc, int mode)
+promcon_cursor(struct vc_data *conp, int mode)
{
char buf[32], *b = buf;
@@ -435,10 +446,10 @@
case CM_MOVE:
case CM_DRAW:
- b += promcon_start(vc, b);
- if (px != vc->vc_x || py != vc->vc_y) {
- px = vc->vc_x;
- py = vc->vc_y;
+ b += promcon_start(conp, b);
+ if (px != conp->vc_x || py != conp->vc_y) {
+ px = conp->vc_x;
+ py = conp->vc_y;
b += sprintf(b, "\033[%d;%dH", py + 1, px + 1);
}
promcon_puts(buf, b - buf);
@@ -447,13 +458,13 @@
}
static int
-promcon_font_op(struct vc_data *vc, struct console_font_op *op)
+promcon_font_op(struct vc_data *conp, struct console_font_op *op)
{
return -ENOSYS;
}
static int
-promcon_blank(struct vc_data *vc, int blank)
+promcon_blank(struct vc_data *conp, int blank)
{
if (blank) {
promcon_puts("\033[H\033[J\033[7m \033[m\b", 15);
@@ -465,16 +476,16 @@
}
static int
-promcon_scroll(struct vc_data *vc, int t, int b, int dir, int count)
+promcon_scroll(struct vc_data *conp, int t, int b, int dir, int count)
{
unsigned char buf[256], *p = buf;
unsigned short *s;
int i;
- if (vc->display_fg->vt_blanked)
+ if (console_blanked)
return 0;
- p += promcon_start(vc, p);
+ p += promcon_start(conp, p);
switch (dir) {
case SM_UP:
@@ -482,13 +493,13 @@
p += sprintf(p, "\033[%dH\033[%dM", t + 1, count);
px = 0;
py = t;
- p += promcon_end(vc, p);
+ p += promcon_end(conp, p);
promcon_puts(buf, p - buf);
break;
}
- s = (unsigned short *)((t + count) * vc->vc_size_row +
- vc->vc_origin);
+ s = (unsigned short *)(conp->vc_origin
+ + (t + count) * conp->vc_size_row);
p += sprintf(p, "\033[%dH", t + 1);
@@ -507,7 +518,7 @@
strcpy(p, "\033[K");
p += 3;
- p += promcon_end(vc, p);
+ p += promcon_end(conp, p);
promcon_puts(buf, p - buf);
break;
@@ -516,12 +527,12 @@
p += sprintf(p, "\033[%dH\033[%dL", t + 1, count);
px = 0;
py = t;
- p += promcon_end(vc, p);
+ p += promcon_end(conp, p);
promcon_puts(buf, p - buf);
break;
}
- s = (unsigned short *)(vc->vc_origin + t * vc->vc_size_row);
+ s = (unsigned short *)(conp->vc_origin + t * conp->vc_size_row);
p += sprintf(p, "\033[%dH", t + 1);
@@ -537,7 +548,7 @@
for (; i < b; i++)
s = promcon_repaint_line(s, buf, &p);
- p += promcon_end(vc, p);
+ p += promcon_end(conp, p);
promcon_puts(buf, p - buf);
break;
}
@@ -546,7 +557,7 @@
}
#if !(PROMCON_COLOR)
-static u8 promcon_build_attr(struct vc_data *vc, u8 _color, u8 _intensity, u8 _blink, u8 _underline, u8 _reverse)
+static u8 promcon_build_attr(struct vc_data *conp, u8 _color, u8 _intensity, u8 _blink, u8 _underline, u8 _reverse)
{
return (_reverse) ? 0xf : 0x7;
}
@@ -576,7 +587,6 @@
con_switch: promcon_switch,
con_blank: promcon_blank,
con_font_op: promcon_font_op,
- con_resize: DUMMY,
con_set_palette: DUMMY,
con_scrolldelta: DUMMY,
#if !(PROMCON_COLOR)
@@ -586,28 +596,11 @@
void __init prom_con_init(void)
{
- const char *display_desc = NULL;
- struct vt_struct *vt;
- struct vc_data *vc;
- long q;
-
- /* Alloc the mem we need */
- vt = (struct vt_struct *) kmalloc(sizeof(struct vt_struct),GFP_KERNEL);
- if (!vt) return;
- vc = (struct vc_data *) kmalloc(sizeof(struct vc_data), GFP_KERNEL);
- vt->kmalloced = 1;
- vt->vt_sw = &prom_con;
- vt->vcs.vc_cons[0] = vc;
- display_desc = create_vt(vt, 0);
- q = (long) kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);
- if (!display_desc || !q) {
- kfree(vt->vcs.vc_cons[0]);
- kfree(vt);
- if (q)
- kfree((char *) q);
- return;
- }
- vc->vc_screenbuf = (unsigned short *) q;
- vc_init(vc, 1);
- promcon_init_unimap(vt->fg_console);
+#ifdef CONFIG_DUMMY_CONSOLE
+ if (conswitchp == &dummy_con)
+ take_over_console(&prom_con, 0, MAX_NR_CONSOLES-1, 1);
+ else
+#endif
+ if (conswitchp == &prom_con)
+ promcon_init_unimap(vc_cons[fg_console].d);
}
Index: sa1100fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/sa1100fb.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sa1100fb.c 2001/10/17 17:00:14 1.16
+++ sa1100fb.c 2001/10/29 00:11:00 1.17
@@ -1931,10 +1931,8 @@
if (!options || !*options)
return 0;
-
- for (this_opt = strtok(options, ","); this_opt;
- this_opt = strtok(NULL, ",")) {
-
+
+ while(this_opt = strsep(&options, ",")) {
if (!strncmp(this_opt, "bpp:", 4))
current_par.max_bpp =
simple_strtoul(this_opt + 4, NULL, 0);
Index: sgivwfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/sgivwfb.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sgivwfb.c 2001/08/31 18:12:45 1.9
+++ sgivwfb.c 2001/10/29 00:11:00 1.10
@@ -611,8 +611,7 @@
if (!options || !*options)
return 0;
- for (this_opt = strtok(options, ","); this_opt;
- this_opt = strtok(NULL, ",")) {
+ while (this_opt = strsep(&options, ",")) {
}
return 0;
}
|
On Sun, Oct 28, 2001 at 04:11:02PM -0800, James Simmons wrote:
> Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
> In directory usw-pr-cvs1:/tmp/cvs-serv10630/drivers/video
>=20
> Modified Files:
> Config.in fbcon.c fm2fb.c macfb.c newport_con.c promcon.c=20
> sa1100fb.c sgivwfb.c=20
> Log Message:
> Synced to 2.4.13
>=20
[snip]
> Index: newport_con.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/newport_con.c,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -d -r1.8 -r1.9
> --- newport_con.c 2001/09/01 21:28:56 1.8
> +++ newport_con.c 2001/10/29 00:11:00 1.9
[snip]
> -void __exit newport_module_exit(void) {
> - printk("Unloading SGI Newport Console Driver\n");
> -}
> +int cleanup_module(void)
> +{
> + int i;
> =20
> -module_init(newport_module_init);
> -module_exit(newport_module_exit);
> + printk("Unloading SGI Newport Console Driver\n");
> + /* free memory used by user font */
> + for (i =3D 0; i < MAX_NR_CONSOLES; i++)
> + newport_set_def_font(i, NULL);
> =20
> + return 0;
> +}
> +#endif
>=20
Careful here.. Linus's tree is still using init_module()/cleanup_module() f=
or
newport.. we want to use module_init()/module_exit() instead..
Regards,
--=20
Paul Mundt <pm...@mv...>
MontaVista Software, Inc.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X