[openfirmware] [commit] r3510 - in cpu: arm/olpc/1.75 x86/pc/olpc x86/pc/olpc/images

[repository service]

Author: quozl
Date: Fri Jan  4 05:55:27 2013
New Revision: 3510
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3510

Log:
OLPC XO-1.75 - play sound from file on boot disk, #12128, due to lack of space in SPI FLASH

Added:
   cpu/x86/pc/olpc/images/Beep-Beep-800Hz-8k.wav   (contents, props changed)
Modified:
   cpu/arm/olpc/1.75/olpc.bth
   cpu/x86/pc/olpc/sound.fth

Modified: cpu/arm/olpc/1.75/olpc.bth
==============================================================================
--- cpu/arm/olpc/1.75/olpc.bth	Fri Jan  4 03:50:09 2013	(r3509)
+++ cpu/arm/olpc/1.75/olpc.bth	Fri Jan  4 05:55:27 2013	(r3510)
@@ -82,7 +82,7 @@
 
    " sourceurl"   " sourceurl"                    $add-dropin
 
-   " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav"  " splash"   $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/images/Beep-Beep-800Hz-8k.wav"  " splash"   $add-deflated-dropin
 
    " ec.img"                                     " ecimage.bin"    $add-deflated-dropin
    " ${BP}/clients/emacs/x86/emacs.rc"          " emacs.rc"      $add-deflated-dropin

Added: cpu/x86/pc/olpc/images/Beep-Beep-800Hz-8k.wav
==============================================================================
Binary file. No diff available.

Modified: cpu/x86/pc/olpc/sound.fth
==============================================================================
--- cpu/x86/pc/olpc/sound.fth	Fri Jan  4 03:50:09 2013	(r3509)
+++ cpu/x86/pc/olpc/sound.fth	Fri Jan  4 05:55:27 2013	(r3510)
@@ -28,12 +28,21 @@
 : softer  ( -- )  -2 +volume  ;
 : louder  ( -- )   2 +volume  ;
 
+" int:\boot\jingle.wav"  d# 128 config-string jingle
+: sound-name$  ( -- adr len )
+   jingle $file-exists?  if
+      jingle
+   else
+      " rom:splash"
+   then
+;
+
 : sound  ( -- )
    get-saved-volume  d# -50 <=  if  exit  then
    playback-volume >r  get-saved-volume to playback-volume
    ['] load-started behavior  >r
    ['] noop to load-started
-   " rom:splash" ['] $play-wav catch  if  2drop  then
+   sound-name$ ['] $play-wav catch  if  2drop  then
    r> to load-started
    r> to playback-volume
 ;