[OpenBIOS] r396 - cpu/x86/pc/olpc cpu/x86/pc/olpc/images dev/mmc/sdhci dev/usb2/device/storage

[svn at openbios.org]

Author: wmb
Date: 2007-05-18 04:33:58 +0200 (Fri, 18 May 2007)
New Revision: 396

Modified:
   cpu/x86/pc/olpc/gui.fth
   cpu/x86/pc/olpc/images/laptop.565
   cpu/x86/pc/olpc/images/laptop.bmp
   cpu/x86/pc/olpc/images/usbkey.565
   cpu/x86/pc/olpc/images/usbkey.bmp
   cpu/x86/pc/olpc/images/wireless.565
   cpu/x86/pc/olpc/images/wireless.bmp
   cpu/x86/pc/olpc/images/xo.565
   cpu/x86/pc/olpc/images/xo.bmp
   cpu/x86/pc/olpc/loaddropins.fth
   dev/mmc/sdhci/sdmmc.fth
   dev/usb2/device/storage/scsidisk.fth
Log:
Lovely new boot-progress icons.



Modified: cpu/x86/pc/olpc/gui.fth
===================================================================
--- cpu/x86/pc/olpc/gui.fth	2007-05-17 03:58:44 UTC (rev 395)
+++ cpu/x86/pc/olpc/gui.fth	2007-05-18 02:33:58 UTC (rev 396)
@@ -347,19 +347,31 @@
 
 h# 32 buffer: icon-name
 
+: show-icon-file  ( basename$ -- )
+   " rom:" icon-name pack  $cat                  ( )
+   " .565" icon-name $cat                        ( )
+   icon-name count  $show&advance                ( )
+;
+
 : ?show-icon  ( adr len -- )
-   locate-device  0=  if                               ( phandle )
-      " icon" 2 pick  get-package-property  0=  if     ( phandle prop$ )
-         rot drop                                      ( prop$ )
-         $show&advance                                 ( )
-      else                                             ( phandle )
-         " name" rot  get-package-property  if  exit  then  ( prop$ )
-         get-encoded-string                            ( name$ )
-         " rom:" icon-name pack  $cat                  ( )
-         " .565" icon-name $cat                        ( )
-         icon-name count  $show&advance                ( )
-      then                                             ( )
-   then                                                ( )
+   locate-device  if  exit  then                    ( phandle )
+
+   " icon" 2 pick  get-package-property  0=  if     ( phandle prop$ )
+      $show&advance                                 ( phandle )
+      drop exit
+   then                                             ( phandle )
+
+   " iconname" 2 pick  get-package-property  0=  if ( phandle prop$ )
+      get-encoded-string  show-icon-file            ( phandle )
+      drop exit
+    then                                            ( phandle )
+
+   " name"  2 pick  get-package-property  0=  if    ( phandle prop$ )
+      get-encoded-string  show-icon-file            ( phandle )
+      drop exit
+    then                                            ( phandle )
+
+    drop
 ;
 : (?show-device)  ( adr len -- ihandle )
    not-screen? 0=  if  2dup ?show-icon  then

Modified: cpu/x86/pc/olpc/images/laptop.565
===================================================================
(Binary files differ)

Modified: cpu/x86/pc/olpc/images/laptop.bmp
===================================================================
(Binary files differ)

Modified: cpu/x86/pc/olpc/images/usbkey.565
===================================================================
(Binary files differ)

Modified: cpu/x86/pc/olpc/images/usbkey.bmp
===================================================================
(Binary files differ)

Modified: cpu/x86/pc/olpc/images/wireless.565
===================================================================
(Binary files differ)

Modified: cpu/x86/pc/olpc/images/wireless.bmp
===================================================================
(Binary files differ)

Modified: cpu/x86/pc/olpc/images/xo.565
===================================================================
(Binary files differ)

Modified: cpu/x86/pc/olpc/images/xo.bmp
===================================================================
(Binary files differ)

Modified: cpu/x86/pc/olpc/loaddropins.fth
===================================================================
--- cpu/x86/pc/olpc/loaddropins.fth	2007-05-17 03:58:44 UTC (rev 395)
+++ cpu/x86/pc/olpc/loaddropins.fth	2007-05-18 02:33:58 UTC (rev 396)
@@ -33,9 +33,10 @@
 \   " ${BP}/ofw/linux/logom16c.bmp"       " timeout.bmp"    $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565"      $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/laptop.565"   " nandflash.565" $add-deflated-dropin
-   " ${BP}/cpu/x86/pc/olpc/images/network.565"  " ethernet.565"  $add-deflated-dropin
-   " ${BP}/cpu/x86/pc/olpc/images/usbkey.565"   " disk.565"      $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565"  $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/images/usbkey.565"   " usbkey.565"    $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565"      $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/xo.565"       " xo.565"        $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/images/sd.565"       " sdmmc.565"     $add-deflated-dropin
 
    " ${BP}/ofw/termemu/gallant.obf"             " font"          $add-deflated-dropin

Modified: dev/mmc/sdhci/sdmmc.fth
===================================================================
--- dev/mmc/sdhci/sdmmc.fth	2007-05-17 03:58:44 UTC (rev 395)
+++ dev/mmc/sdhci/sdmmc.fth	2007-05-18 02:33:58 UTC (rev 396)
@@ -2,6 +2,7 @@
 \ See license at end of file
 
 " disk" device-name
+" sdmmc" " iconname" string-property
 
 0 instance value label-package
 

Modified: dev/usb2/device/storage/scsidisk.fth
===================================================================
--- dev/usb2/device/storage/scsidisk.fth	2007-05-17 03:58:44 UTC (rev 395)
+++ dev/usb2/device/storage/scsidisk.fth	2007-05-18 02:33:58 UTC (rev 396)
@@ -5,6 +5,7 @@
 
 " block" device-type
 " disk"  encode-string  " compatible" property
+" usbdisk" " iconname" string-property
 
 fload ${BP}/dev/usb2/device/storage/scsicom.fth	\ Utility routines for SCSI commands