[openfirmware] [commit] r3685 - in cpu: arm/olpc x86

[repository service]

Author: quozl
Date: Sat Jul  6 03:55:50 2013
New Revision: 3685
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3685

Log:
OLPC ARM - fix noise when volume adjusted during startup, #12348

Modified:
   cpu/arm/olpc/sound.fth
   cpu/x86/adpcm.fth

Modified: cpu/arm/olpc/sound.fth
==============================================================================
--- cpu/arm/olpc/sound.fth	Wed Jun 26 10:48:31 2013	(r3684)
+++ cpu/arm/olpc/sound.fth	Sat Jul  6 03:55:50 2013	(r3685)
@@ -465,7 +465,7 @@
 0 value alarmed?
 
 : install-playback-alarm     ( -- )
-   true to alarmed?  ['] playback-alarm d# 3 alarm
+   true to alarmed?  ['] playback-alarm d# 2 alarm
 ;
 : uninstall-playback-alarm   ( -- )
    alarmed?  if
@@ -829,7 +829,7 @@
 
 : wait-sound  ( -- )
    lock[
-   begin  playing?  while   d# 10 ms  ?end-playing  repeat
+   begin  playing?  while   d# 2 ms  ?end-playing  repeat
    ]unlock
 ;
 

Modified: cpu/x86/adpcm.fth
==============================================================================
--- cpu/x86/adpcm.fth	Wed Jun 26 10:48:31 2013	(r3684)
+++ cpu/x86/adpcm.fth	Sat Jul  6 03:55:50 2013	(r3685)
@@ -233,7 +233,7 @@
 : wav-#sample   ( -- #sample )   wav-fact-adr dup  if      8 + le-l@  then  ;
 : wav-blk-size  ( -- blk-size )  wav-fmt-adr  dup  if  h# 14 + le-w@  then  ;
 
-: set-volume  ( -- )   " set-volume" $call-audio  ;
+: set-volume  ( volume -- )   " set-volume" $call-audio  ;
 0 value src-sample-rate
 0 value dst-sample-rate
 : try-set-sample-rate  ( desired-rate -- )