[patch] add 18 bpp support to psplash

[patch] add 18 bpp support to psplash

[Ilya Petrov]

Hi!

Here is small patch to add 18bpp support to psplash.
This needed for motorola ezx gen2 machines (like moto a1200).


diff --git a/recipes/psplash/files/psplash-18bpp.patch
b/recipes/psplash/files/psplash-18bpp.patch
new file mode 100644
index 0000000..b043f56
--- /dev/null
+++ b/recipes/psplash/files/psplash-18bpp.patch
@@ -0,0 +1,42 @@
+--- psplash/psplash-fb.c        2007-08-29 21:27:49.000000000 +0300
++++ /home/muromec/psplash/psplash-fb.c  2009-08-16 03:59:07.000000000 +0300
+@@ -72,6 +72,7 @@
+   fb->real_width  = fb->width  = fb_var.xres;
+   fb->real_height = fb->height = fb_var.yres;
+   fb->bpp    = fb_var.bits_per_pixel;
++  fb->color  = fb_var.red.length + fb_var.green.length + fb_var.blue.length;
+   fb->stride = fb_fix.line_length;
+   fb->type   = fb_fix.type;
+   fb->visual = fb_fix.visual;
+@@ -176,7 +177,7 @@
+     }
+
+   /* FIXME: handle no RGB orderings */
+-  switch (fb->bpp)
++  switch (fb->color)
+     {
+     case 24:
+     case 32:
+@@ -184,6 +185,10 @@
+       *(fb->data + off + 1) = green;
+       *(fb->data + off + 2) = blue;
+       break;
++    case 18:
++      *(fb->data + off)     = (red>>2) | ((green&0x0C)<<4);
++      *(fb->data + off + 1) = ((green&0xF0)>>4) | ((blue&0x3C)<<2);
++      *(fb->data + off + 2) = (blue&0xC0)>>6;
+     case 16:
+       *(volatile uint16 *) (fb->data + off)
+        = ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
+diff -ru psplash/psplash-fb.h /home/muromec/psplash/psplash-fb.h
+--- psplash/psplash-fb.h        2007-08-29 21:27:49.000000000 +0300
++++ /home/muromec/psplash/psplash-fb.h  2009-08-16 03:58:20.000000000 +0300
+@@ -26,6 +26,7 @@
+   int            visual;
+   int            width, height;
+   int            bpp;
++  int            color;
+   int            stride;
+   char         *data;
+   char         *base;
+
diff --git a/recipes/psplash/psplash-angstrom_svn.bb
b/recipes/psplash/psplash-angstrom_svn.bb

-- index f65fb81..fc5e4c2 100644
--- a/recipes/psplash/psplash-angstrom_svn.bb
+++ b/recipes/psplash/psplash-angstrom_svn.bb
@@ -10,6 +10,7 @@ ALTERNATIVE_PRIORITY = "20"
 # You might also want to patch the colors (see patch)

 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
+          file://psplash-18bpp.patch;patch=1 \
           file://logo-math.patch;patch=1 \
           file://psplash-hand-img.h \
           file://psplash-bar-img.h \
 wbr, Ilya
 ICQ: none, Jabber: ilya.muromec@jabber.ru

Re: [patch] add 18 bpp support to psplash

[Holger Hans Peter Freyther]

On Sunday 16 August 2009 03:12:35 Ilya Petrov wrote:
> Hi!
>
> Here is small patch to add 18bpp support to psplash.
> This needed for motorola ezx gen2 machines (like moto a1200).

did you send the patch upstream? Do you have a bug report or commit to point 
to?

z.

Re: [patch] add 18 bpp support to psplash

[Ilya Petrov]

2009/8/16 Holger Hans Peter Freyther <holger+oe@freyther.de>:
> On Sunday 16 August 2009 03:12:35 Ilya Petrov wrote:
>> Hi!
>>
>> Here is small patch to add 18bpp support to psplash.
>> This needed for motorola ezx gen2 machines (like moto a1200).
>
> did you send the patch upstream? Do you have a bug report or commit to point
> to?

no. it not looks alive..


-- 
 wbr, Ilya
 ICQ: none, Jabber: ilya.muromec@jabber.ru

Re: [patch] add 18 bpp support to psplash

[Holger Hans Peter Freyther]

On Sunday 16 August 2009 10:36:59 Ilya Petrov wrote:
> 2009/8/16 Holger Hans Peter Freyther <holger+oe@freyther.de>:
> > On Sunday 16 August 2009 03:12:35 Ilya Petrov wrote:
> >> Hi!
> >>
> >> Here is small patch to add 18bpp support to psplash.
> >> This needed for motorola ezx gen2 machines (like moto a1200).
> >
> > did you send the patch upstream? Do you have a bug report or commit to
> > point to?
>
> no. it not looks alive..

How did you determine this? Is your mail to the maintainer unanswered? Just 
because applying a patch is so easy it is no excuse to turn OE into a 
collection of forks.

	z.

Re: [patch] add 18 bpp support to psplash

[Ilya Petrov]

2009/8/16 Antonio Ospite <ospite@studenti.unina.it>:

> usually they call this 'depth' as a shorthand for 'color depth', naming
> it 'color' would make people think to the actual color _value_.

ok

> Maybe you may want to add some spaces around binary operators, that's
> the style used just below.

ok

diff -ru psplash/psplash-fb.c /home/muromec/psplash/psplash-fb.c
--- psplash/psplash-fb.c        2007-08-29 21:27:49.000000000 +0300
+++ /home/muromec/psplash/psplash-fb.c  2009-08-16 11:59:57.000000000 +0300
@@ -72,6 +72,7 @@
   fb->real_width  = fb->width  = fb_var.xres;
   fb->real_height = fb->height = fb_var.yres;
   fb->bpp    = fb_var.bits_per_pixel;
+  fb->depth  = fb_var.red.length + fb_var.green.length + fb_var.blue.length;
   fb->stride = fb_fix.line_length;
   fb->type   = fb_fix.type;
   fb->visual = fb_fix.visual;
@@ -176,7 +177,7 @@
     }

   /* FIXME: handle no RGB orderings */
-  switch (fb->bpp)
+  switch (fb->depth)
     {
     case 24:
     case 32:
@@ -184,6 +185,10 @@
       *(fb->data + off + 1) = green;
       *(fb->data + off + 2) = blue;
       break;
+    case 18:
+      *(fb->data + off)     = (red >> 2) | ((green & 0x0C) << 4);
+      *(fb->data + off + 1) = ((green & 0xF0) >> 4) | ((blue & 0x3C) << 2);
+      *(fb->data + off + 2) = (blue & 0xC0) >> 6;
     case 16:
       *(volatile uint16 *) (fb->data + off)
        = ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
Только в /home/muromec/psplash: psplash-fb.c.orig
diff -ru psplash/psplash-fb.h /home/muromec/psplash/psplash-fb.h
--- psplash/psplash-fb.h        2007-08-29 21:27:49.000000000 +0300
+++ /home/muromec/psplash/psplash-fb.h  2009-08-16 11:58:39.000000000 +0300
@@ -26,6 +26,7 @@
   int            visual;
   int            width, height;
   int            bpp;
+  int            depth;
   int            stride;
   char         *data;
   char         *base;


-- 
 wbr, Ilya
 ICQ: none, Jabber: ilya.muromec@jabber.ru

Re: [patch] add 18 bpp support to psplash

[Ilya Petrov]

2009/8/16 Holger Hans Peter Freyther <holger+oe@freyther.de>:

> How did you determine this? Is your mail to the maintainer unanswered? Just
> because applying a patch is so easy it is no excuse to turn OE into a
> collection of forks.

ok. i`l first send this unpstream


-- 
 wbr, Ilya
 ICQ: none, Jabber: ilya.muromec@jabber.ru

Re: [patch] add 18 bpp support to psplash

[Ilya Petrov]

2009/8/16 Holger Hans Peter Freyther <holger+oe@freyther.de>:

> How did you determine this? Is your mail to the maintainer unanswered? Just
> because applying a patch is so easy it is no excuse to turn OE into a
> collection of forks.

well... the bug below is in "NEW" state from 2008-02-18 and bugzilla
dont even know about
psplash.

http://bugzilla.openedhand.com/show_bug.cgi?id=801

should i send my too?

-- 
 wbr, Ilya
 ICQ: none, Jabber: ilya.muromec@jabber.ru

Re: [patch] add 18 bpp support to psplash

[Holger Hans Peter Freyther]

On Sunday 16 August 2009 11:16:06 Ilya Petrov wrote:
> 2009/8/16 Holger Hans Peter Freyther <holger+oe@freyther.de>:
> > How did you determine this? Is your mail to the maintainer unanswered?
> > Just because applying a patch is so easy it is no excuse to turn OE into
> > a collection of forks.
>
> well... the bug below is in "NEW" state from 2008-02-18 and bugzilla
> dont even know about
> psplash.
>
> http://bugzilla.openedhand.com/show_bug.cgi?id=801
>
> should i send my too?

yes, it is not that we don't know people working at intel...

z.

Re: [patch] add 18 bpp support to psplash

[Ilya Petrov]

2009/8/16 Holger Hans Peter Freyther <holger+oe@freyther.de>:
> yes, it is not that we don't know people working at intel...

sent.

diff --git a/recipes/psplash/files/psplash-18bpp.patch
b/recipes/psplash/files/psplash-18bpp.patch
new file mode 100644
index 0000000..ce4b563
--- /dev/null
+++ b/recipes/psplash/files/psplash-18bpp.patch
@@ -0,0 +1,44 @@
+upstream: http://bugzilla.o-hand.com/show_bug.cgi?id=1764
+
+diff -ru psplash/psplash-fb.c /home/muromec/psplash/psplash-fb.c
+--- psplash/psplash-fb.c       2007-08-29 21:27:49.000000000 +0300
++++ /home/muromec/psplash/psplash-fb.c 2009-08-16 11:59:57.000000000 +0300
+@@ -72,6 +72,7 @@
+   fb->real_width  = fb->width  = fb_var.xres;
+   fb->real_height = fb->height = fb_var.yres;
+   fb->bpp    = fb_var.bits_per_pixel;
++  fb->depth  = fb_var.red.length + fb_var.green.length + fb_var.blue.length;
+   fb->stride = fb_fix.line_length;
+   fb->type   = fb_fix.type;
+   fb->visual = fb_fix.visual;
+@@ -176,7 +177,7 @@
+     }
+
+   /* FIXME: handle no RGB orderings */
+-  switch (fb->bpp)
++  switch (fb->depth)
+     {
+     case 24:
+     case 32:
+@@ -184,6 +185,10 @@
+       *(fb->data + off + 1) = green;
+       *(fb->data + off + 2) = blue;
+       break;
++    case 18:
++      *(fb->data + off)     = (red >> 2) | ((green & 0x0C) << 4);
++      *(fb->data + off + 1) = ((green & 0xF0) >> 4) | ((blue & 0x3C) << 2);
++      *(fb->data + off + 2) = (blue & 0xC0) >> 6;
+     case 16:
+       *(volatile uint16 *) (fb->data + off)
+       = ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
+diff -ru psplash/psplash-fb.h /home/muromec/psplash/psplash-fb.h
+--- psplash/psplash-fb.h       2007-08-29 21:27:49.000000000 +0300
++++ /home/muromec/psplash/psplash-fb.h 2009-08-16 11:58:39.000000000 +0300
+@@ -26,6 +26,7 @@
+   int            visual;
+   int            width, height;
+   int            bpp;
++  int            depth;
+   int            stride;
+   char                *data;
+   char                *base;
diff --git a/recipes/psplash/psplash-angstrom_svn.bb
b/recipes/psplash/psplash-angstrom_svn.bb
index f65fb81..fc5e4c2 100644
--- a/recipes/psplash/psplash-angstrom_svn.bb
+++ b/recipes/psplash/psplash-angstrom_svn.bb
@@ -10,6 +10,7 @@ ALTERNATIVE_PRIORITY = "20"
 # You might also want to patch the colors (see patch)

 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
+          file://psplash-18bpp.patch;patch=1 \
           file://logo-math.patch;patch=1 \
           file://psplash-hand-img.h \
           file://psplash-bar-img.h \





-- 
 wbr, Ilya
 ICQ: none, Jabber: ilya.muromec@jabber.ru