mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/1] splash: fix background color support
Date: Thu, 14 Mar 2013 15:08:09 +0100	[thread overview]
Message-ID: <20130314140809.GO1906@pengutronix.de> (raw)
In-Reply-To: <1363118349-19267-1-git-send-email-plagnioj@jcrosoft.com>

On Tue, Mar 12, 2013 at 08:59:09PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> the fb info is stored in struct screen by fb_open
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Applied, thanks

Sascha

> ---
>  commands/splash.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/commands/splash.c b/commands/splash.c
> index 4cc463e..0955c01 100644
> --- a/commands/splash.c
> +++ b/commands/splash.c
> @@ -13,7 +13,6 @@ static int do_splash(int argc, char *argv[])
>  	struct screen sc;
>  	int ret, opt, fd;
>  	char *fbdev = "/dev/fb0";
> -	struct fb_info info;
>  	char *image_file;
>  	int offscreen = 0;
>  	u32 bg_color = 0x00000000;
> @@ -21,7 +20,6 @@ static int do_splash(int argc, char *argv[])
>  
>  	memset(&s, 0, sizeof(s));
>  	memset(&sc, 0, sizeof(sc));
> -	memset(&info, 0, sizeof(info));
>  
>  	s.x = -1;
>  	s.y = -1;
> @@ -61,12 +59,12 @@ static int do_splash(int argc, char *argv[])
>  
>  	if (sc.offscreenbuf) {
>  		if (do_bg)
> -			memset_pixel(&info, sc.offscreenbuf, bg_color,
> +			memset_pixel(&sc.info, sc.offscreenbuf, bg_color,
>  					sc.s.width * sc.s.height);
>  		else
>  			memcpy(sc.offscreenbuf, sc.fb, sc.fbsize);
>  	} else if (do_bg) {
> -		memset_pixel(&info, sc.fb, bg_color, sc.s.width * sc.s.height);
> +		memset_pixel(&sc.info, sc.fb, bg_color, sc.s.width * sc.s.height);
>  	}
>  
>  	if (image_renderer_file(&sc, &s, image_file) < 0)
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2013-03-14 14:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-12 19:59 Jean-Christophe PLAGNIOL-VILLARD
2013-03-14 14:08 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130314140809.GO1906@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=plagnioj@jcrosoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox