Changeset 3774 for trunk/src/host/splash/splashimg.pl

Timestamp:

01/05/08 19:07:00 (5 years ago)

Author:

werner

Message:

target/u-boot/patches/uboot-20061030-neo1973.patch: disable HWSWP in LCDCON5 to

make frame buffer organization consistent with what u-boot's CFB driver
supports. Note that this requires pixels in swap screens to be swapped.

This resolves
​http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1140

• board/neo1973/common/jbt6k74.c (board_video_init): disable HWSWP in LCDCON5

host/splash/splashimg.pl: added option -swap to swap pixels
host/splash/splashimg.pl: added spaces after commas

File:

• trunk/src/host/splash/splashimg.pl (modified) (5 diffs)

trunk/src/host/splash/splashimg.pl

@@ -3 +3 @@
 # splashimg.pl - Convert a 480x640 PNG to a splash screen raw dump 
 #
-# Copyright (C) 2006-2007 by OpenMoko, Inc.
+# Copyright (C) 2006-2008 by OpenMoko, Inc.
 # Written by Werner Almesberger <werner@openmoko.org>
 # All Rights Reserved
@@ -24 +24 @@
 
 $bpp = 16;
+$swap_pix = 0;
 
 
 sub usage
 {
-    print STDERR "usage: $0 [-32] [-pnm] [System_boot.png]\n";
+    print STDERR "usage: $0 [-32] [-pnm] [-swap] [System_boot.png]\n";
     exit(1);
 }
@@ -40 +41 @@
     elsif ($ARGV[0] eq "-pnm") {
         $pnm = 1;
+        shift @ARGV;
+    }
+    elsif ($ARGV[0] eq "-swap") {
+        $swap_pix = 1;
         shift @ARGV;
     }
@@ -65 +70 @@
 
 for ("red", "grn", "blu") {
-    open(FILE,"noname.$_") || die "noname.$_";
-    $f = join("",<FILE>);
+    open(FILE, "noname.$_") || die "noname.$_";
+    $f = join("", <FILE>);
     close FILE;
     unlink("noname.$_");
     $f =~ s/^P5\s+(\d+)\s+(\d+)\s+(\d+)\s//s;
-    ($w,$h,$p) = ($1,$2,$3);
+    ($w, $h, $p) = ($1, $2, $3);
     $p{$_} = $f;
 }
@@ -77 +82 @@
 
 for ($i = 0; $i != $w*$h; $i++) {
-    $r = unpack("C",substr($p{"red"},$i,1));
-    $g = unpack("C",substr($p{"grn"},$i,1));
-    $b = unpack("C",substr($p{"blu"},$i,1));
+    $r = unpack("C", substr($p{"red"}, $i ^ $swap_pix, 1));
+    $g = unpack("C", substr($p{"grn"}, $i ^ $swap_pix, 1));
+    $b = unpack("C", substr($p{"blu"}, $i ^ $swap_pix, 1));
     if ($bpp == 16) {
         $v = ($r >> 3) << 11 | ($g >> 2) << 5 | ($b >> 3);
-        print pack("v",$v) || die "print: $!";
+        print pack("v", $v) || die "print: $!";
     }
     else {
         $v = ($r) << 16 | ($g) << 8 | $b;
-        print pack("V",$v) || die "print: $!";
+        print pack("V", $v) || die "print: $!";
     }
 }