2005-03-08 02:17:24

by Michal Januszewski

Subject: [announce 5/7] fbsplash - fbdev updates

Fbcmap.c updates.

Signed-off-by: Michael Januszewski <[email protected]>

---
diff -Nru a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
--- a/drivers/video/fbcmap.c 2005-03-07 16:50:34 +01:00
+++ b/drivers/video/fbcmap.c 2005-03-07 16:50:34 +01:00
@@ -16,6 +16,7 @@
#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/slab.h>
+#include "fbsplash.h"

#include <asm/uaccess.h>

@@ -235,6 +236,10 @@
info))
break;
}
+ fb_copy_cmap(cmap, &info->cmap);
+ if (fbsplash_active(info, vc_cons[fg_console].d) &&
+ info->fix.visual == FB_VISUAL_DIRECTCOLOR)
+ fbsplash_fix_pseudo_pal(info, vc_cons[fg_console].d);
return 0;
}

@@ -265,6 +270,9 @@
if (transp)
transp++;
}
+ if (fbsplash_active(info, vc_cons[fg_console].d) &&
+ info->fix.visual == FB_VISUAL_DIRECTCOLOR)
+ fbsplash_fix_pseudo_pal(info, vc_cons[fg_console].d);
return 0;
}




Live long and prosper.
--
Michal 'Spock' Januszewski Gentoo Linux Developer
cell: +48504917690 http://dev.gentoo.org/~spock/
JID: [email protected] freenode: #gentoo-dev, #gentoo-pl

2005-03-08 20:29:52

by James Simmons

Subject: Re: [Linux-fbdev-devel] [announce 5/7] fbsplash - fbdev updates

> diff -Nru a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
> --- a/drivers/video/fbcmap.c 2005-03-07 16:50:34 +01:00
> +++ b/drivers/video/fbcmap.c 2005-03-07 16:50:34 +01:00
> @@ -16,6 +16,7 @@
> #include <linux/tty.h>
> #include <linux/fb.h>
> #include <linux/slab.h>
> +#include "fbsplash.h"
>
> #include <asm/uaccess.h>
>
> @@ -235,6 +236,10 @@
> info))
> break;
> }
> + fb_copy_cmap(cmap, &info->cmap);
> + if (fbsplash_active(info, vc_cons[fg_console].d) &&
> + info->fix.visual == FB_VISUAL_DIRECTCOLOR)
> + fbsplash_fix_pseudo_pal(info, vc_cons[fg_console].d);
> return 0;
> }
>
> @@ -265,6 +270,9 @@
> if (transp)
> transp++;
> }
> + if (fbsplash_active(info, vc_cons[fg_console].d) &&
> + info->fix.visual == FB_VISUAL_DIRECTCOLOR)
> + fbsplash_fix_pseudo_pal(info, vc_cons[fg_console].d);
> return 0;
> }

That is just gross. You are putting console code back into the fbdev core.