Author: czarny Date: Tue Aug 28 17:45:13 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up from LINUX_2_6
---- Files affected:
SOURCES:
kernel-desktop-bootsplash.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/kernel-desktop-bootsplash.patch
diff -u SOURCES/kernel-desktop-bootsplash.patch:1.2
SOURCES/kernel-desktop-bootsplash.patch:1.3
--- SOURCES/kernel-desktop-bootsplash.patch:1.2 Mon Jul 30 17:42:43 2007
+++ SOURCES/kernel-desktop-bootsplash.patch Tue Aug 28 19:45:08 2007
@@ -1,8 +1,8 @@
-diff -urN linux-2.6.22/drivers/char/keyboard.c
linux-2.6.22.bootsplash/drivers/char/keyboard.c
---- linux-2.6.22/drivers/char/keyboard.c 2007-07-09 01:32:17.000000000
+0200
-+++ linux-2.6.22.bootsplash/drivers/char/keyboard.c 2007-07-30
17:31:13.739437346 +0200
-@@ -1138,6 +1138,15 @@
- if (keycode < BTN_MISC && printk_ratelimit())
+diff -urN linux-2.6.21-orig/drivers/char/keyboard.c
linux-2.6.21/drivers/char/keyboard.c
+--- linux-2.6.21-orig/drivers/char/keyboard.c 2007-04-26 10:58:50.000000000
+0300
++++ linux-2.6.21/drivers/char/keyboard.c 2007-04-26 11:29:26.000000000
+0300
+@@ -1164,6 +1164,15 @@
+ if (keycode < BTN_MISC)
printk(KERN_WARNING "keyboard.c: can't emulate
rawmode for keycode %d\n", keycode);
+#ifdef CONFIG_BOOTSPLASH
@@ -17,10 +17,10 @@
#ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */
if (keycode == KEY_SYSRQ && (sysrq_down || (down == 1 && sysrq_alt))) {
if (!sysrq_down) {
-diff -urN linux-2.6.22/drivers/char/n_tty.c
linux-2.6.22.bootsplash/drivers/char/n_tty.c
---- linux-2.6.22/drivers/char/n_tty.c 2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22.bootsplash/drivers/char/n_tty.c 2007-07-30
17:31:13.747437310 +0200
-@@ -1297,6 +1297,15 @@
+diff -urN linux-2.6.21-orig/drivers/char/n_tty.c
linux-2.6.21/drivers/char/n_tty.c
+--- linux-2.6.21-orig/drivers/char/n_tty.c 2007-04-26 10:58:50.000000000
+0300
++++ linux-2.6.21/drivers/char/n_tty.c 2007-04-26 11:29:26.000000000 +0300
+@@ -1296,6 +1296,15 @@
tty->minimum_to_wake = (minimum - (b - buf));
if (!input_available_p(tty, 0)) {
@@ -36,10 +36,10 @@
if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {
retval = -EIO;
break;
-diff -urN linux-2.6.22/drivers/char/vt.c
linux-2.6.22.bootsplash/drivers/char/vt.c
---- linux-2.6.22/drivers/char/vt.c 2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22.bootsplash/drivers/char/vt.c 2007-07-30 17:31:13.755437274
+0200
-@@ -3953,6 +3953,31 @@
+diff -urN linux-2.6.21-orig/drivers/char/vt.c linux-2.6.21/drivers/char/vt.c
+--- linux-2.6.21-orig/drivers/char/vt.c 2007-04-26 10:58:50.000000000
+0300
++++ linux-2.6.21/drivers/char/vt.c 2007-04-26 11:29:26.000000000 +0300
+@@ -3815,6 +3815,31 @@
}
}
@@ -71,9 +71,9 @@
/*
* Visible symbols for modules
*/
-diff -urN linux-2.6.22/drivers/video/bootsplash/bootsplash.c
linux-2.6.22.bootsplash/drivers/video/bootsplash/bootsplash.c
---- linux-2.6.22/drivers/video/bootsplash/bootsplash.c 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.22.bootsplash/drivers/video/bootsplash/bootsplash.c
2007-07-30 17:31:13.775437184 +0200
+diff -urN linux-2.6.21-orig/drivers/video/bootsplash/bootsplash.c
linux-2.6.21/drivers/video/bootsplash/bootsplash.c
+--- linux-2.6.21-orig/drivers/video/bootsplash/bootsplash.c 1970-01-01
03:00:00.000000000 +0300
++++ linux-2.6.21/drivers/video/bootsplash/bootsplash.c 2007-04-26
11:29:26.000000000 +0300
@@ -0,0 +1,983 @@
+/*
+ * linux/drivers/video/bootsplash/bootsplash.c -
@@ -1058,9 +1058,9 @@
+ return;
+}
+
-diff -urN linux-2.6.22/drivers/video/bootsplash/bootsplash.h
linux-2.6.22.bootsplash/drivers/video/bootsplash/bootsplash.h
---- linux-2.6.22/drivers/video/bootsplash/bootsplash.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.22.bootsplash/drivers/video/bootsplash/bootsplash.h
2007-07-30 17:31:13.775437184 +0200
+diff -urN linux-2.6.21-orig/drivers/video/bootsplash/bootsplash.h
linux-2.6.21/drivers/video/bootsplash/bootsplash.h
+--- linux-2.6.21-orig/drivers/video/bootsplash/bootsplash.h 1970-01-01
03:00:00.000000000 +0300
++++ linux-2.6.21/drivers/video/bootsplash/bootsplash.h 2007-04-26
11:29:26.000000000 +0300
@@ -0,0 +1,44 @@
+/*
+ * linux/drivers/video/bootsplash/bootsplash.h - splash screen definition.
@@ -1106,9 +1106,9 @@
+extern void release_console_sem(void);
+
+#endif
-diff -urN linux-2.6.22/drivers/video/bootsplash/decode-jpg.c
linux-2.6.22.bootsplash/drivers/video/bootsplash/decode-jpg.c
---- linux-2.6.22/drivers/video/bootsplash/decode-jpg.c 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.22.bootsplash/drivers/video/bootsplash/decode-jpg.c
2007-07-30 17:31:13.783437148 +0200
+diff -urN linux-2.6.21-orig/drivers/video/bootsplash/decode-jpg.c
linux-2.6.21/drivers/video/bootsplash/decode-jpg.c
+--- linux-2.6.21-orig/drivers/video/bootsplash/decode-jpg.c 1970-01-01
03:00:00.000000000 +0300
++++ linux-2.6.21/drivers/video/bootsplash/decode-jpg.c 2007-04-26
11:29:26.000000000 +0300
@@ -0,0 +1,957 @@
+/*
+ * linux/drivers/video/bootsplash/decode-jpg.c - a tiny jpeg decoder.
@@ -2067,9 +2067,9 @@
+ outy += 64 * 2 - 16 * 4;
+ }
+}
-diff -urN linux-2.6.22/drivers/video/bootsplash/decode-jpg.h
linux-2.6.22.bootsplash/drivers/video/bootsplash/decode-jpg.h
---- linux-2.6.22/drivers/video/bootsplash/decode-jpg.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.22.bootsplash/drivers/video/bootsplash/decode-jpg.h
2007-07-30 17:31:13.783437148 +0200
+diff -urN linux-2.6.21-orig/drivers/video/bootsplash/decode-jpg.h
linux-2.6.21/drivers/video/bootsplash/decode-jpg.h
+--- linux-2.6.21-orig/drivers/video/bootsplash/decode-jpg.h 1970-01-01
03:00:00.000000000 +0300
++++ linux-2.6.21/drivers/video/bootsplash/decode-jpg.h 2007-04-26
11:29:26.000000000 +0300
@@ -0,0 +1,35 @@
+/*
+ * linux/drivers/video/bootsplash/decode-jpg.h - a tiny jpeg decoder.
@@ -2106,9 +2106,9 @@
+extern int jpeg_check_size(unsigned char *, int, int);
+
+#endif
-diff -urN linux-2.6.22/drivers/video/bootsplash/Kconfig
linux-2.6.22.bootsplash/drivers/video/bootsplash/Kconfig
---- linux-2.6.22/drivers/video/bootsplash/Kconfig 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.22.bootsplash/drivers/video/bootsplash/Kconfig 2007-07-30
17:31:13.783437148 +0200
+diff -urN linux-2.6.21-orig/drivers/video/bootsplash/Kconfig
linux-2.6.21/drivers/video/bootsplash/Kconfig
+--- linux-2.6.21-orig/drivers/video/bootsplash/Kconfig 1970-01-01
03:00:00.000000000 +0300
++++ linux-2.6.21/drivers/video/bootsplash/Kconfig 2007-04-26
11:29:26.000000000 +0300
@@ -0,0 +1,17 @@
+#
+# Bootsplash configuration
@@ -2127,18 +2127,18 @@
+ If you are unsure, say N
+endmenu
+
-diff -urN linux-2.6.22/drivers/video/bootsplash/Makefile
linux-2.6.22.bootsplash/drivers/video/bootsplash/Makefile
---- linux-2.6.22/drivers/video/bootsplash/Makefile 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.22.bootsplash/drivers/video/bootsplash/Makefile 2007-07-30
17:31:13.787437130 +0200
+diff -urN linux-2.6.21-orig/drivers/video/bootsplash/Makefile
linux-2.6.21/drivers/video/bootsplash/Makefile
+--- linux-2.6.21-orig/drivers/video/bootsplash/Makefile 1970-01-01
03:00:00.000000000 +0300
++++ linux-2.6.21/drivers/video/bootsplash/Makefile 2007-04-26
11:29:26.000000000 +0300
@@ -0,0 +1,5 @@
+# Makefile for the Linux bootsplash
+
+obj-$(CONFIG_BOOTSPLASH) += bootsplash.o
+obj-$(CONFIG_BOOTSPLASH) += decode-jpg.o
+obj-$(CONFIG_BOOTSPLASH) += render.o
-diff -urN linux-2.6.22/drivers/video/bootsplash/render.c
linux-2.6.22.bootsplash/drivers/video/bootsplash/render.c
---- linux-2.6.22/drivers/video/bootsplash/render.c 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.22.bootsplash/drivers/video/bootsplash/render.c 2007-07-30
17:31:13.787437130 +0200
+diff -urN linux-2.6.21-orig/drivers/video/bootsplash/render.c
linux-2.6.21/drivers/video/bootsplash/render.c
+--- linux-2.6.21-orig/drivers/video/bootsplash/render.c 1970-01-01
03:00:00.000000000 +0300
++++ linux-2.6.21/drivers/video/bootsplash/render.c 2007-04-26
11:29:26.000000000 +0300
@@ -0,0 +1,315 @@
+/*
+ * linux/drivers/video/bootsplash/render.c - splash screen render
functions.
@@ -2455,9 +2455,9 @@
+ }
+}
+
-diff -urN linux-2.6.22/drivers/video/console/bitblit.c
linux-2.6.22.bootsplash/drivers/video/console/bitblit.c
---- linux-2.6.22/drivers/video/console/bitblit.c 2007-07-09
01:32:17.000000000 +0200
-+++ linux-2.6.22.bootsplash/drivers/video/console/bitblit.c 2007-07-30
17:31:13.799437076 +0200
+diff -urN linux-2.6.21-orig/drivers/video/console/bitblit.c
linux-2.6.21/drivers/video/console/bitblit.c
+--- linux-2.6.21-orig/drivers/video/console/bitblit.c 2007-02-04
21:44:54.000000000 +0300
++++ linux-2.6.21/drivers/video/console/bitblit.c 2007-04-26
11:29:26.000000000 +0300
@@ -17,6 +17,9 @@
#include <linux/console.h>
#include <asm/types.h>
@@ -2521,7 +2521,7 @@
+ }
+#endif
+
- region.color = attr_bgcol_ec(bgshift, vc);
+ region.color = 0;
region.rop = ROP_COPY;
@@ -379,6 +410,14 @@
@@ -2539,9 +2539,9 @@
if (info->fbops->fb_cursor)
err = info->fbops->fb_cursor(info, &cursor);
-diff -urN linux-2.6.22/drivers/video/console/fbcon.c
linux-2.6.22.bootsplash/drivers/video/console/fbcon.c
---- linux-2.6.22/drivers/video/console/fbcon.c 2007-07-09 01:32:17.000000000
+0200
-+++ linux-2.6.22.bootsplash/drivers/video/console/fbcon.c 2007-07-30
17:31:13.815437004 +0200
+diff -urN linux-2.6.21-orig/drivers/video/console/fbcon.c
linux-2.6.21/drivers/video/console/fbcon.c
+--- linux-2.6.21-orig/drivers/video/console/fbcon.c 2007-04-26
10:58:53.000000000 +0300
++++ linux-2.6.21/drivers/video/console/fbcon.c 2007-04-26 11:29:26.000000000
+0300
@@ -91,6 +91,10 @@
#include "fbcon.h"
@@ -2561,9 +2561,9 @@
-static signed char con2fb_map[MAX_NR_CONSOLES];
+signed char con2fb_map[MAX_NR_CONSOLES];
static signed char con2fb_map_boot[MAX_NR_CONSOLES];
- #ifndef MODULE
static int logo_height;
-@@ -565,6 +568,10 @@
+ static int logo_lines;
+@@ -563,6 +566,10 @@
for (i = first_fb_vc; i <= last_fb_vc; i++)
con2fb_map[i] = info_idx;
@@ -2574,7 +2574,7 @@
err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
fbcon_is_default);
-@@ -1166,6 +1173,16 @@
+@@ -1125,6 +1132,16 @@
new_rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
new_cols /= vc->vc_font.width;
new_rows /= vc->vc_font.height;
@@ -2591,7 +2591,7 @@
vc_resize(vc, new_cols, new_rows);
/*
-@@ -1811,6 +1828,10 @@
+@@ -1770,6 +1787,10 @@
fbcon_softback_note(vc, t, count);
if (logo_shown >= 0)
goto redraw_up;
@@ -2602,7 +2602,7 @@
switch (p->scrollmode) {
case SCROLL_MOVE:
ops->bmove(vc, info, t + count, 0, t, 0,
-@@ -1895,6 +1916,10 @@
+@@ -1854,6 +1875,10 @@
case SM_DOWN:
if (count > vc->vc_rows) /* Maximum realistic size */
count = vc->vc_rows;
@@ -2613,7 +2613,7 @@
if (logo_shown >= 0)
goto redraw_down;
switch (p->scrollmode) {
-@@ -2039,6 +2064,14 @@
+@@ -1998,6 +2023,14 @@
}
return;
}
@@ -2628,7 +2628,7 @@
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
}
-@@ -2147,6 +2180,10 @@
+@@ -2106,6 +2139,10 @@
info = registered_fb[con2fb_map[vc->vc_num]];
ops = info->fbcon_par;
@@ -2639,7 +2639,7 @@
if (softback_top) {
if (softback_lines)
fbcon_set_origin(vc);
-@@ -2276,6 +2313,12 @@
+@@ -2235,6 +2272,12 @@
{
struct fb_event event;
@@ -2652,7 +2652,7 @@
if (blank) {
unsigned short charmask = vc->vc_hi_font_mask ?
0x1ff : 0xff;
-@@ -2474,10 +2517,19 @@
+@@ -2433,10 +2476,19 @@
if (resize) {
int cols, rows;
@@ -2672,9 +2672,9 @@
vc_resize(vc, cols, rows);
if (CON_IS_VISIBLE(vc) && softback_buf)
fbcon_update_softback(vc);
-diff -urN linux-2.6.22/drivers/video/console/fbcon.h
linux-2.6.22.bootsplash/drivers/video/console/fbcon.h
---- linux-2.6.22/drivers/video/console/fbcon.h 2007-07-09 01:32:17.000000000
+0200
-+++ linux-2.6.22.bootsplash/drivers/video/console/fbcon.h 2007-07-30
17:31:13.819436986 +0200
+diff -urN linux-2.6.21-orig/drivers/video/console/fbcon.h
linux-2.6.21/drivers/video/console/fbcon.h
+--- linux-2.6.21-orig/drivers/video/console/fbcon.h 2007-04-26
10:58:53.000000000 +0300
++++ linux-2.6.21/drivers/video/console/fbcon.h 2007-04-26 11:29:26.000000000
+0300
@@ -25,6 +25,34 @@
* low-level frame buffer device
*/
@@ -2710,10 +2710,10 @@
struct display {
/* Filled in by the low-level console driver */
const u_char *fontdata;
-diff -urN linux-2.6.22/drivers/video/Kconfig
linux-2.6.22.bootsplash/drivers/video/Kconfig
---- linux-2.6.22/drivers/video/Kconfig 2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22.bootsplash/drivers/video/Kconfig 2007-07-30
17:31:13.839436896 +0200
-@@ -1851,5 +1851,9 @@
+diff -urN linux-2.6.21-orig/drivers/video/Kconfig
linux-2.6.21/drivers/video/Kconfig
+--- linux-2.6.21-orig/drivers/video/Kconfig 2007-04-26 10:58:53.000000000
+0300
++++ linux-2.6.21/drivers/video/Kconfig 2007-04-26 11:29:26.000000000 +0300
+@@ -1663,5 +1663,9 @@
source "drivers/video/logo/Kconfig"
endif
@@ -2723,10 +2723,10 @@
+
endmenu
-diff -urN linux-2.6.22/drivers/video/Makefile
linux-2.6.22.bootsplash/drivers/video/Makefile
---- linux-2.6.22/drivers/video/Makefile 2007-07-09 01:32:17.000000000
+0200
-+++ linux-2.6.22.bootsplash/drivers/video/Makefile 2007-07-30
17:32:08.831189432 +0200
-@@ -14,6 +14,7 @@
+diff -urN linux-2.6.21-orig/drivers/video/Makefile
linux-2.6.21/drivers/video/Makefile
+--- linux-2.6.21-orig/drivers/video/Makefile 2007-04-26 10:58:53.000000000
+0300
++++ linux-2.6.21/drivers/video/Makefile 2007-04-26 11:29:26.000000000
+0300
+@@ -13,6 +13,7 @@
obj-$(CONFIG_VT) += console/
obj-$(CONFIG_LOGO) += logo/
obj-y += backlight/ display/
@@ -2734,9 +2734,9 @@
obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o
obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o
-diff -urN linux-2.6.22/drivers/video/vesafb.c
linux-2.6.22.bootsplash/drivers/video/vesafb.c
---- linux-2.6.22/drivers/video/vesafb.c 2007-07-09 01:32:17.000000000
+0200
-+++ linux-2.6.22.bootsplash/drivers/video/vesafb.c 2007-07-30
17:31:13.859436806 +0200
+diff -urN linux-2.6.21-orig/drivers/video/vesafb.c
linux-2.6.21/drivers/video/vesafb.c
+--- linux-2.6.21-orig/drivers/video/vesafb.c 2007-02-04 21:44:54.000000000
+0300
++++ linux-2.6.21/drivers/video/vesafb.c 2007-04-26 11:29:26.000000000
+0300
@@ -174,7 +174,10 @@
return err;
}
@@ -2761,10 +2761,10 @@
if (vram_remap)
size_remap = vram_remap * 1024 * 1024;
if (size_remap < size_vmode)
-diff -urN linux-2.6.22/include/linux/console_struct.h
linux-2.6.22.bootsplash/include/linux/console_struct.h
---- linux-2.6.22/include/linux/console_struct.h 2007-07-09
01:32:17.000000000 +0200
-+++ linux-2.6.22.bootsplash/include/linux/console_struct.h 2007-07-30
17:31:13.859436806 +0200
-@@ -105,6 +105,11 @@
+diff -urN linux-2.6.21-orig/include/linux/console_struct.h
linux-2.6.21/include/linux/console_struct.h
+--- linux-2.6.21-orig/include/linux/console_struct.h 2007-04-26
10:58:54.000000000 +0300
++++ linux-2.6.21/include/linux/console_struct.h 2007-04-26
11:29:26.000000000 +0300
+@@ -99,6 +99,11 @@
struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg
console for this display */
unsigned long vc_uni_pagedir;
unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir
variable for this console */
@@ -2776,10 +2776,10 @@
/* additional information is in vt_kern.h */
};
-diff -urN linux-2.6.22/include/linux/fb.h
linux-2.6.22.bootsplash/include/linux/fb.h
---- linux-2.6.22/include/linux/fb.h 2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22.bootsplash/include/linux/fb.h 2007-07-30 17:31:13.863436788
+0200
-@@ -830,6 +830,14 @@
+diff -urN linux-2.6.21-orig/include/linux/fb.h linux-2.6.21/include/linux/fb.h
+--- linux-2.6.21-orig/include/linux/fb.h 2007-04-26 10:58:54.000000000
+0300
++++ linux-2.6.21/include/linux/fb.h 2007-04-26 11:29:26.000000000 +0300
+@@ -795,6 +795,14 @@
void *fbcon_par; /* fbcon use-only private area */
/* From here on everything is device dependent */
void *par;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-bootsplash.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
