June 2011 - openfirmware - mail.coreboot.org

[commit] r2263 - in forth: kernel lib
by repository service June 12, 2011

June 12, 2011

Author: wmb Date: Sun Jun 12 10:50:54 2011 New Revision: 2263 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2263 Log: Moved bits/cell from util.fth to kernel.fth so it's present in time for dlshift and friends. Modified: forth/kernel/kernel.fth forth/lib/util.fth Modified: forth/kernel/kernel.fth ============================================================================== --- forth/kernel/kernel.fth Sat Jun 11 03:14:06 2011 (r2262) +++ forth/kernel/kernel.fth Sun Jun 12 10:50:54 2011 (r2263) @@ -702,6 +702,8 @@ ' allot-abort is allot-error +/n-t 8 * constant bits/cell + : , (s n -- ) here /n allot unaligned-! ; : c, (s char -- ) here dup set-swap-bit /c allot c! ; : w, (s w -- ) here /w allot w! ; Modified: forth/lib/util.fth ============================================================================== --- forth/lib/util.fth Sat Jun 11 03:14:06 2011 (r2262) +++ forth/lib/util.fth Sun Jun 12 10:50:54 2011 (r2263) @@ -66,7 +66,6 @@ \ Default value is no : confirmedn? ( adr len -- yes? ) (confirmed?) [char] Y = ; -/n 8 * constant bits/cell : lowmask ( #bits -- mask ) 1 swap lshift 1- ; : lowbits ( n #bits -- bits ) lowmask and ; : bits ( n bit# #bits -- bits ) -rot rshift swap lowbits ;

1 0

[commit] r2262 - cpu/arm/olpc/1.75
by repository service June 11, 2011

June 11, 2011

Author: wmb Date: Sat Jun 11 03:14:06 2011 New Revision: 2262 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2262 Log: Q4A14 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sat Jun 11 03:13:13 2011 (r2261) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Jun 11 03:14:06 2011 (r2262) @@ -1,5 +1,8 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 13h +macro: FW_MINOR 14 + + +

1 0

[commit] r2261 - cpu/arm/olpc/1.75
by repository service June 11, 2011

June 11, 2011

Author: wmb Date: Sat Jun 11 03:13:13 2011 New Revision: 2261 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2261 Log: OLPC XO-1.75 - implemented power-off, kbc-on, no-kbc-reboot as used by manufacturing scripts. Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Sat Jun 11 01:51:31 2011 (r2260) +++ cpu/arm/olpc/1.75/devices.fth Sat Jun 11 03:13:13 2011 (r2261) @@ -165,6 +165,9 @@ fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree fload ${BP}/dev/olpc/kb3700/eccmds.fth +: ec-power-off ( -- ) reset-ec begin wfi again ; +' ec-power-off to power-off + fload ${BP}/dev/olpc/kb3700/batstat.fth \ Battery status reports fload ${BP}/cpu/arm/olpc/1.75/boardrev.fth \ Board revision decoding Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Sat Jun 11 01:51:31 2011 (r2260) +++ cpu/arm/olpc/1.75/fw.bth Sat Jun 11 03:13:13 2011 (r2261) @@ -150,6 +150,10 @@ fload ${BP}/cpu/arm/olpc/1.75/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools +\ When reprogramming this machine's SPI FLASH, rebooting the EC is unnecessary +: no-kbc-reboot ; +: kbc-on ; + \ Pseudo device that appears in the boot order before net booting 0 0 " " " /" begin-package " prober" device-name

1 0

[commit] r2260 - cpu/arm/olpc/1.75 dev/hdaudio forth/kernel forth/lib
by repository service June 11, 2011

June 11, 2011

Author: wmb Date: Sat Jun 11 01:51:31 2011 New Revision: 2260 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2260 Log: OLPC XO-1.75 trac #10886 - autocorrelation-based audio selftest for XO-1.75 Modified: cpu/arm/olpc/1.75/alc5631.fth cpu/arm/olpc/1.75/sound.fth dev/hdaudio/noiseburst.fth dev/hdaudio/test.fth forth/kernel/double.fth forth/lib/isin.fth forth/lib/tones.fth Modified: cpu/arm/olpc/1.75/alc5631.fth ============================================================================== --- cpu/arm/olpc/1.75/alc5631.fth Fri Jun 10 23:41:31 2011 (r2259) +++ cpu/arm/olpc/1.75/alc5631.fth Sat Jun 11 01:51:31 2011 (r2260) @@ -14,7 +14,7 @@ b# 1110.0000.0001.1101 h# 3c codec! \ Fast VREF control d# 100 ms - h# 8021 h# 34 codec! \ Slave mode, 16 bits, left justified, left channel on LRCLK high + h# 8001 h# 34 codec! \ Slave mode, 16 bits, left justified h# 1010 h# 38 codec! \ Divisors; the values in this register don't seem to make much \ difference unless you set the divisors to very high values. @@ -95,10 +95,10 @@ false value force-speakers? : set-volume ( n -- ) - headphones-inserted? force-speakers? 0= and if - set-headphone-volume + headphones-inserted? ( force-speakers? 0= and ) if + set-headphone-volume mute-speakers else - set-speaker-volume + set-speaker-volume mute-headphones then ; d# 0 constant default-adc-gain \ 0 dB - range is -96.625 to +28.5 @@ -179,7 +179,7 @@ : mic+20db ( -- ) d# 20 set-mic-gain ; : set-default-gains ( -- ) output-config - headphones-inserted? force-speakers? 0= and if + headphones-inserted? ( force-speakers? 0= and ) if headphones-on speakers-off else Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Fri Jun 10 23:41:31 2011 (r2259) +++ cpu/arm/olpc/1.75/sound.fth Sat Jun 11 01:51:31 2011 (r2260) @@ -48,6 +48,12 @@ : reset-rx ( -- ) h# 8000.0002 h# 0c sspa! ; +: active-low-rx-fs ( -- ) + h# 0c sspa@ h# 8001.0000 or h# 0c sspa! +; +: active-high-rx-fs ( -- ) + h# 0c sspa@ h# 10000 invert and h# 8000.0000 or h# 0c sspa! +; : setup-sspa-rx ( -- ) reset-rx @@ -64,10 +70,10 @@ h# 8000.0000 \ Enable writes d# 15 d# 20 lshift or \ Frame sync width -\ We choose the master/slave configuration later, in enable-sspa-tx +\ We choose the master/slave configuration later, in enable-sspa-rx 0 d# 18 lshift or \ Internal clock - master configuration 0 d# 17 lshift or \ Sample on rising edge of clock - 0 d# 16 lshift or \ Active high frame sync + 1 d# 16 lshift or \ Active low frame sync (I2S standard) d# 31 d# 4 lshift or \ Frame sync period 1 d# 2 lshift or \ Flush the FIFO h# 0c sspa! @@ -80,6 +86,12 @@ : reset-tx ( -- ) h# 8000.0002 h# 8c sspa! ; +: active-low-tx-fs ( -- ) + h# 8c sspa@ h# 8001.0000 or h# 8c sspa! +; +: active-high-tx-fs ( -- ) + h# 8c sspa@ h# 10000 and h# 8000.0000 or h# 8c sspa! +; : setup-sspa-tx ( -- ) reset-tx @@ -100,7 +112,10 @@ \ We choose the master/slave configuration later, in master-tx 0 d# 18 lshift or \ External clock - slave configuration (Rx is master) 0 d# 17 lshift or \ Sample on rising edge of clock - 0 d# 16 lshift or \ Active high frame sync + +\ Empirically, this needs to be backwards from what we think it should be + 0 d# 16 lshift or \ Active high frame sync (should be active low, but that gives backwards results) + d# 31 d# 4 lshift or \ Frame sync period 1 d# 2 lshift or \ Flush the FIFO h# 8c sspa! @@ -247,7 +262,7 @@ : open-in ( -- ) ; : close-in ( -- ) ; -: open-out ( -- ) setup-sspa-tx ; +: open-out ( -- ) ; : close-out ( -- ) ; : wait-out ( -- ) @@ -274,6 +289,7 @@ : stop-out ( -- ) disable-sspa-tx + reset-tx stop-out-ring uninstall-playback-alarm false to playing? @@ -313,6 +329,7 @@ : start-audio-out ( adr len -- ) to out-len ( adr ) to out-adr ( ) + setup-sspa-tx ( ) make-out-ring copy-out out-len if copy-out then \ Prefill the second buffer @@ -369,15 +386,30 @@ copy-in ( actual ) repeat ( actual ) disable-sspa-rx ( actual ) + reset-rx ( actual ) ; : read ( adr len -- actual ) open-in audio-in ; +0 value mono? +0 value in-adr0 +0 value in-len0 +: collapse-in ( -- ) + in-len0 0 ?do + in-adr0 i la+ w@ in-adr0 i wa+ w! + loop +; : out-in ( out-adr out-len in-adr in-len -- ) - to in-len to in-adr ( out-adr out-len ) + to in-len0 to in-adr0 ( out-adr out-len ) to out-len to out-adr ( ) + in-adr0 to in-adr ( ) + in-len0 mono? if 2* then to in-len + + audio-clock-on ( ) \ This will mess up any frequency settings + setup-sspa-tx ( ) setup-sspa-rx ( ) + active-high-rx-fs ( ) make-in-ring ( ) make-out-ring ( ) @@ -402,7 +434,12 @@ disable-sspa-rx ( ) disable-sspa-tx ( ) + reset-rx + reset-tx + dac-off adc-off ( ) + + mono? if collapse-in then ( ) ; 0 [if] \ Interactive test words for out-in @@ -452,8 +489,8 @@ set-adc-gain ; -: stereo ; -: mono ; +: stereo false to mono? ; +: mono true to mono? ; : init-codec ( -- ) codec-on @@ -486,6 +523,12 @@ false value force-internal-mic? \ Can't be implemented on XO-1.75 2 value #channels fload ${BP}/dev/hdaudio/test.fth +: input-settings ( -- ) + audio-clock-on ( ) \ If you don't do this, the L/R phase is often wrong +; +: output-settings ( -- ) ; +' input-settings to input-common-settings +' output-settings to output-common-settings end-package Modified: dev/hdaudio/noiseburst.fth ============================================================================== --- dev/hdaudio/noiseburst.fth Fri Jun 10 23:41:31 2011 (r2259) +++ dev/hdaudio/noiseburst.fth Sat Jun 11 01:51:31 2011 (r2260) @@ -302,9 +302,11 @@ drop ( ) ; : -stereo-wmean ( adr len -- ) - 2dup stereo-wmean ( adr len mean ) - -rot bounds ?do ( mean ) - i <w@ over - h# 7fff min h# -7fff max i w! + 2dup stereo-wmean >r ( adr len r: lmean ) + over wa1+ over stereo-wmean r> swap ( adr len lmean rmean ) + 2swap bounds ?do ( lmean rmean ) + i <w@ 2 pick - h# 7fff min h# -7fff max i w! + i wa1+ <w@ over - h# 7fff min h# -7fff max i wa1+ w! /l +loop ( mean ) drop ( ) ; @@ -340,34 +342,44 @@ 3drop ( ) ; +\ sample-delay accounts for the different timing between adc-on and dac-on +\ for different combinations of codec and controller. + +d# 0 value sample-delay +: +sample-delay ( start #samples -- end' start' ) + swap sample-delay + swap bounds +; 0. 2value total-covar -: sm-covar-sum ( adr1 adr2 len end start -- d.covar ) +: sm-covar-sum ( adr1 adr2 len start #samples -- d.covar ) + +sample-delay ( adr1 adr2 len end' start' ) 0. to total-covar do 3dup swap i wa+ swap stereo-mono-covar ( adr1 adr2 len d.covar ) total-covar d+ to total-covar ( adr1 adr2 len ) loop ( adr1 adr2 len ) 3drop ( ) - total-covar + total-covar d2* d2* ; -: sm-covar-abs-sum ( adr1 adr2 len end start -- d.covar ) +: sm-covar-abs-sum ( adr1 adr2 len start #samples -- d.covar ) + +sample-delay ( adr1 adr2 len end' start' ) 0. to total-covar do 3dup swap i wa+ swap stereo-mono-covar ( adr1 adr2 len d.covar ) dabs total-covar d+ to total-covar ( adr1 adr2 len ) loop ( adr1 adr2 len ) 3drop ( ) - total-covar + total-covar d2* d2* ; -: ss-covar-abs-sum ( adr1 adr2 len end start -- d.covar ) +: ss-covar-abs-sum ( adr1 adr2 len start #samples -- d.covar ) + +sample-delay ( adr1 adr2 len end' start' ) 0. to total-covar do 3dup swap i la+ swap stereo-covar ( adr1 adr2 len d.covar ) dabs total-covar d+ to total-covar ( adr1 adr2 len ) loop ( adr1 adr2 len ) 3drop ( ) - total-covar + total-covar d2* d2* ; @@ -457,47 +469,70 @@ debug? if dup .d cr then ; +d# 100 value #fixture +d# 25 value fixture-threshold : fixture-ratio-left ( -- error? ) - left-range d# 160 d# 60 sm-covar-abs-sum nip ( sum1 ) - left-range d# 400 d# 300 sm-covar-abs-sum nip ( sum1 sum2 ) + left-range d# 60 #fixture sm-covar-abs-sum nip ( sum1 ) + left-range d# 300 #fixture sm-covar-abs-sum nip ( sum1 sum2 ) >ratio - d# 25 < + fixture-threshold < ; : fixture-ratio-right ( -- error? ) - right-range d# 160 d# 60 sm-covar-abs-sum nip ( sum1 ) - right-range d# 400 d# 300 sm-covar-abs-sum nip ( sum1 sum2 ) + right-range d# 60 #fixture sm-covar-abs-sum nip ( sum1 ) + right-range d# 300 #fixture sm-covar-abs-sum nip ( sum1 sum2 ) >ratio - d# 25 < + fixture-threshold < ; +d# 60 value case-start-left +d# 60 value case-start-right +d# 400 value case-start-quiet +d# 60 value #case-left +d# 190 value #case-right +d# 25 value case-threshold-left +d# 14 value case-threshold-right + \ This compares the total energy within the impulse response band to the \ total energy in a similar-length band : case-ratio-left ( -- error? ) - left-range d# 120 d# 60 sm-covar-abs-sum nip ( sum1.high ) - left-range d# 460 d# 400 sm-covar-abs-sum nip ( sum1.high sum2.high ) + left-range case-start-left #case-left sm-covar-abs-sum nip ( sum1.high ) + left-range case-start-quiet #case-left sm-covar-abs-sum nip ( sum1.high sum2.high ) >ratio - d# 25 < + case-threshold-left < ; : case-ratio-right ( -- error? ) - right-range d# 250 d# 60 sm-covar-abs-sum nip ( sum1.high ) - right-range d# 590 d# 400 sm-covar-abs-sum nip ( sum1.high sum2.high ) + right-range case-start-right #case-right sm-covar-abs-sum nip ( sum1.high ) + right-range case-start-quiet #case-right sm-covar-abs-sum nip ( sum1.high sum2.high ) >ratio - d# 14 < + case-threshold-right < ; +d# 20 value #loopback +d# 70 value loopback-threshold \ This compares the total energy within the impulse response band to the \ total energy in a similar-length band : loopback-ratio-left ( -- error? ) - left-stereo-range d# 68 d# 48 ss-covar-abs-sum nip ( sum1.high ) - left-stereo-range d# 220 d# 200 ss-covar-abs-sum nip ( sum1.high sum2.high ) + left-stereo-range d# 48 #loopback ss-covar-abs-sum nip ( sum1.high ) + left-stereo-range d# 200 #loopback ss-covar-abs-sum nip ( sum1.high sum2.high ) >ratio - d# 70 < + loopback-threshold < ; : loopback-ratio-right ( -- error? ) - right-stereo-range d# 68 d# 48 ss-covar-abs-sum nip ( sum1.high ) - right-stereo-range d# 220 d# 200 ss-covar-abs-sum nip ( sum1.high sum2.high ) + right-stereo-range d# 48 #loopback ss-covar-abs-sum nip ( sum1.high ) + right-stereo-range d# 200 #loopback ss-covar-abs-sum nip ( sum1.high sum2.high ) >ratio - d# 70 < + loopback-threshold < +; + +\ Ideally we would not put platform-specific information in this module. +\ If we add many more platforms, this should be redesigned. +: configure-xo1.75 ( -- ) + d# -23 to sample-delay + d# 50 to fixture-threshold + d# 40 to #fixture + d# 83 to case-start-right + d# 30 to #case-right + d# 25 to case-threshold-right ; d# 1200 constant #impulse-response @@ -507,7 +542,7 @@ pb + rb #samples ( adr1 adr2 #samples ) #impulse-response 0 do 3dup swap i wa+ swap stereo-mono-covar ( adr1 adr2 #samples d.covar ) - d# 50000000 m/mod nip ( adr1 adr2 #samples n.covar ) + d# 500,000,000 m/mod nip ( adr1 adr2 #samples n.covar ) impulse-response i wa+ w! ( adr1 adr2 #samples ) loop ( adr1 adr2 len ) 3drop ( ) @@ -516,8 +551,8 @@ : calc-stereo-impulse ( offset -- adr ) \ offset is 0 for left or 2 for right dup pb + swap rb + #samples ( adr1 adr2 #samples ) #impulse-response 0 do - 3dup swap i wa+ swap stereo-covar ( adr1 adr2 #samples d.covar ) - d# 50000000 m/mod nip ( adr1 adr2 #samples n.covar ) + 3dup swap i la+ swap stereo-covar ( adr1 adr2 #samples d.covar ) + d# 50,000,000 m/mod nip ( adr1 adr2 #samples n.covar ) impulse-response i wa+ w! ( adr1 adr2 #samples ) loop ( adr1 adr2 len ) 3drop ( ) @@ -561,8 +596,6 @@ : setup-fixture ( -- ) h# 20000 to /pb \ Medium burst /pb 2/ h# 1000 + to /rb \ Mono reception (internal mic) -\ ['] fixture-analyze-left to analyze-left -\ ['] fixture-analyze-right to analyze-right ['] fixture-ratio-left to analyze-left ['] fixture-ratio-right to analyze-right ['] -mono-wmean to fix-dc Modified: dev/hdaudio/test.fth ============================================================================== --- dev/hdaudio/test.fth Fri Jun 10 23:41:31 2011 (r2259) +++ dev/hdaudio/test.fth Sat Jun 11 01:51:31 2011 (r2260) @@ -108,7 +108,7 @@ defer input-common-settings defer output-common-settings [ifdef] with-adc -\ XXX this is hd-audio specific. Factore it out +\ XXX this is hd-audio specific. Factor it out : (input-common-settings) ( -- ) open-in 48kHz 16bit with-adc d# 73 input-gain ; @@ -120,11 +120,12 @@ [then] : test-with-case ( -- ) - " setup-case" $call-analyzer +\ " setup-case" $call-analyzer \ xxx - this needs to use the internal speakers and mic even though the loopback cable is attached true to force-speakers? true to force-internal-mic? + mic-bias-on input-common-settings mono - output-common-settings d# -9 set-volume + output-common-settings d# -1 set-volume ." Testing internal speakers and microphone" cr " setup-case" test-common false to force-speakers? false to force-internal-mic? @@ -135,8 +136,9 @@ ; : test-with-fixture ( -- error? ) true to force-speakers? true to force-internal-mic? + mic-bias-on input-common-settings mono - output-common-settings d# -23 set-volume \ -23 prevents obvious visible clipping + output-common-settings d# -13 set-volume \ -23 prevents obvious visible clipping ." Testing internal speakers and microphone with fixture" cr " setup-fixture" test-common false to force-speakers? false to force-internal-mic? @@ -146,8 +148,9 @@ then ; : test-with-loopback ( -- error? ) - input-common-settings stereo - output-common-settings d# -33 set-volume \ -23 prevents obvious visible clipping + mic-bias-off + input-common-settings stereo + output-common-settings d# -22 set-volume ." Testing headphone and microphone jacks with loopback cable" cr " setup-loopback" test-common plot? if @@ -193,8 +196,13 @@ instructions-done then ; +: configure-platform ( -- ) + board-revision h# 1a28 >= if " configure-xo1.75" $call-analyzer exit then +; \ Returns failure by throwing : automatic-test ( -- ) + configure-platform + disconnect-loopback \ Not for 1.5; it can test internal while loopback is connected " smt-test?" evaluate if test-with-fixture throw else Modified: forth/kernel/double.fth ============================================================================== --- forth/kernel/double.fth Fri Jun 10 23:41:31 2011 (r2259) +++ forth/kernel/double.fth Sat Jun 11 01:51:31 2011 (r2260) @@ -43,6 +43,25 @@ : drot ( d1 d2 d3 -- d2 d3 d1 ) 2>r 2swap 2r> 2swap ; : -drot ( d1 d2 d3 -- d3 d1 d2 ) drot drot ; : dinvert ( d1 -- d2 ) swap invert swap invert ; + +: dlshift ( d1 n -- d2 ) + tuck lshift >r ( low n r: high2 ) + 2dup bits/cell swap - rshift r> or >r ( low n r: high2' ) + lshift r> ( d2 ) +; +: drshift ( d1 n -- d2 ) + 2dup rshift >r ( low high n r: high2 ) + tuck bits/cell swap - lshift ( low n low2 r: high2 ) + -rot rshift or ( low2 r: high2 ) + r> ( d2 ) +; +: d>>a ( d1 n -- d2 ) + 2dup rshift >r ( low high n r: high2 ) + tuck bits/cell swap - lshift ( low n low2 r: high2 ) + -rot >>a or ( low2 r: high2 ) + r> ( d2 ) +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: forth/lib/isin.fth ============================================================================== --- forth/lib/isin.fth Fri Jun 10 23:41:31 2011 (r2259) +++ forth/lib/isin.fth Sat Jun 11 01:51:31 2011 (r2260) @@ -16,23 +16,23 @@ 0 value freq 0 value fstep 0 value #cycle -0 value #half-cycle -0 value #quarter-cycle +0 value #cycle/2 +0 value #cycle/4 : set-freq ( freq sample-rate -- ) to fs ( freq ) dup to freq ( freq ) pi * to fstep fs freq / dup to #cycle - 2/ dup to #half-cycle - 2/ to #quarter-cycle + 2/ dup to #cycle/2 + 2/ to #cycle/4 ; -: set-period ( quarter-cycle -- ) - dup to #quarter-cycle ( quarter-cycle ) - 2* dup to #half-cycle ( half-cycle ) +: set-period ( cycle/4 -- ) + dup to #cycle/4 ( cycle/4 ) + 2* dup to #cycle/2 ( cycle/2 ) 2* dup to #cycle ( cycle ) fs over / to freq ( period ) - pi swap / fs * to fstep ( ) + pi fs rot */ to fstep ( ) ; \ Multiply two fractional numbers where the scale factor is 2^15 @@ -42,27 +42,84 @@ \ Computes (1 - (theta^2 / divisor) * last) : sin-step ( last divisor -- next ) thetasq swap / times one min one swap - ; +0 [if] +\ Cos +\ 1 - t^2/(2) + t^4/(2..4) - t^6/2..6) + t^8/(2..8) +\ 1 - (t^2/(1*2)) * (1 - (t^2/(3*4)) * (1 - (t^2/(5*6)) * (1 - (t^2/(7*8)))) + +: icos ( index -- frac ) + fstep fs 2/ */ to theta + theta dup times to thetasq + one d# 90 cos-step d# 56 cos-step d# 30 cos-step d# 12 cos-step 2 cos-step one min +; +[then] + \ Taylor series expansion of sin, calculated as +\ t - t^3/(2*3) + t^5/(2*3*4*5) - t^7/(2..7) + t^9/(2...9) \ theta * (1 - (theta^2/(2*3)) * (1 - (theta^2/(4*5)) * (1 - (theta^2/(6*7)) * (1 - (theta^2/(8*9)))))) \ This is good for the first quadrant only, i.e. 0 <= index <= fs / freq / 4 -: isin ( index -- frac ) - fstep * fs 2/ / to theta +: calc-sin ( index -- frac ) + fstep fs 2/ */ to theta theta dup times to thetasq one d# 72 sin-step d# 42 sin-step d# 20 sin-step 6 sin-step theta times one min ; : one-cycle ( adr -- ) - #quarter-cycle 1+ 0 do ( adr ) - i isin + #cycle/4 1+ 0 do ( adr ) + i calc-sin 2dup swap i wa+ w! ( adr isin ) - 2dup swap #half-cycle i - wa+ w! ( adr isin ) + 2dup swap #cycle/2 i - wa+ w! ( adr isin ) negate ( adr -isin ) - 2dup swap #half-cycle i + wa+ w! ( adr -isin ) + 2dup swap #cycle/2 i + wa+ w! ( adr -isin ) over #cycle i - wa+ w! ( adr ) loop ( adr ) drop ; + +0 [if] +: reduce-to-quarter-cycle ( -- ) + \ Move a cycle/4 to the left until negative, then fix + #cycle/4 - dup 0<= if #cycle/4 + (sin) exit then ( theta' ) \ Quadrant 1 + #cycle/4 - dup 0<= if negate (sin) exit then ( theta' ) \ Quadrant 2 + #cycle/4 - dup 0<= if #cycle/4 + (sin) negate exit then ( theta' ) \ Quadrant 3 + #cycle/4 - negate (sin) negate \ Quadrant 4 +; +[then] + +\ For isin and icos we use a cosine table instead of a sine table. +\ Argument reduction is a bit easier for cos because it is an even function. +: one-cycle-cos ( adr -- ) + #cycle/4 1+ 0 do ( adr ) + i calc-sin ( adr isin ) + 2dup swap #cycle/4 i - wa+ w! ( adr isin ) \ Quadrant 1 + 2dup swap #cycle/4 3 * i + wa+ w! ( adr isin ) \ Quadrant 4 + negate ( adr -isin ) + 2dup swap #cycle/4 i + wa+ w! ( adr -isin ) \ Quadrant 2 + over #cycle/4 3 * i - wa+ w! ( adr ) \ Quadrant 3 + loop ( adr ) + drop +; + +\ The scale factor for theta is such that h# 10000 is pi radians. +\ Binary 1 is therefore pi/2^16 +0 value cos-table +: init-sincos ( -- ) + cos-table if exit then + h# 20000 /w* alloc-mem to cos-table + 1 h# 20000 set-freq + cos-table one-cycle-cos +; +: release-cos-table ( -- ) cos-table h# 20000 /w* free-mem 0 to cos-table ; + +: icos ( theta -- cos ) + abs ( theta' ) + dup #cycle >= if #cycle mod then ( theta' ) + cos-table swap wa+ <w@ ( cos ) +; +: isin ( theta -- sin ) #cycle/4 - icos ; + + \ d# 16000 to fs \ d# 150 set-freq \ here one-cycle Modified: forth/lib/tones.fth ============================================================================== --- forth/lib/tones.fth Fri Jun 10 23:41:31 2011 (r2259) +++ forth/lib/tones.fth Sat Jun 11 01:51:31 2011 (r2260) @@ -3,14 +3,14 @@ : /cycle ( -- #bytes ) #cycle /l* ; : make-cycle ( adr -- adr' ) - #quarter-cycle 1+ 0 do ( adr ) - i isin ( adr isin ) - 2dup swap i la+ w! ( adr isin ) - 2dup swap #half-cycle i - la+ w! ( adr isin ) - negate ( adr -isin ) - 2dup swap #half-cycle i + la+ w! ( adr -isin ) - over #cycle i - la+ w! ( adr ) - loop ( adr ) + #cycle/4 1+ 0 do ( adr ) + i calc-sin ( adr isin ) + 2dup swap i la+ w! ( adr isin ) + 2dup swap #cycle/2 i - la+ w! ( adr isin ) + negate ( adr -isin ) + 2dup swap #cycle/2 i + la+ w! ( adr -isin ) + over #cycle i - la+ w! ( adr ) + loop ( adr ) /cycle + ;

1 0

[commit] r2259 - cpu/arm/olpc/1.75
by repository service June 10, 2011

June 10, 2011

Author: wmb Date: Fri Jun 10 23:41:31 2011 New Revision: 2259 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2259 Log: XO-1.75 - cleaned up olpc.bth by removing some commented-out stuff that will never be used. Modified: cpu/arm/olpc/1.75/olpc.bth Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Fri Jun 10 18:18:59 2011 (r2258) +++ cpu/arm/olpc/1.75/olpc.bth Fri Jun 10 23:41:31 2011 (r2259) @@ -77,16 +77,6 @@ " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin - -0 [if] - " ${BP}/dev/mmc/sdhci/build/sdhci2.fc" " class080501" $add-deflated-dropin -[then] - -0 [if] - " ${BP}/dev/mmc/sdhci/build/sdmmc.fc" " sdmmc" $add-deflated-dropin - " ${BP}/dev/mmc/sdhci/mv8686/build/mv8686.fc" " mv8686" $add-deflated-dropin -[then] - " sd8686_helper.bin" " helper_sd.bin" $add-deflated-dropin " sd8686.bin" " sd8686.bin" $add-deflated-dropin @@ -98,12 +88,6 @@ " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin [then] - " ${BP}/ofw/fcode/memtest.fth" " memtest.fth" $add-deflated-dropin - -0 [if] - " ${BP}/dev/hdaudio/build/hdaudio.fc" " class040300" $add-deflated-dropin -[then] - " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin @@ -126,14 +110,6 @@ " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin -0 [if] - " ${BP}/ofw/termemu/15x30pc.psf" " font" $add-deflated-dropin -[then] - -0 [if] - " memtest" " memtest" $add-deflated-dropin -[then] - " verify.img" " verify" $add-deflated-dropin " os.public" " ospubkey" $add-dropin \ Incompressible " fw.public" " fwpubkey" $add-dropin \ Incompressible @@ -171,7 +147,6 @@ " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster_tx.bin" " nb_tx" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/winlogo.565" " winlogo.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/tux.565" " tux.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/settings.565" " settings.565" $add-deflated-dropin [then]

1 0

[commit] r2258 - cpu/x86/pc/olpc
by repository service June 10, 2011

June 10, 2011

Author: wmb Date: Fri Jun 10 18:18:59 2011 New Revision: 2258 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2258 Log: Bezier curve drawing code has a stack bug that sometimes cause crashes; not sure why this hadn't been seen before. Modified: cpu/x86/pc/olpc/strokes.fth Modified: cpu/x86/pc/olpc/strokes.fth ============================================================================== --- cpu/x86/pc/olpc/strokes.fth Fri Jun 10 18:17:53 2011 (r2257) +++ cpu/x86/pc/olpc/strokes.fth Fri Jun 10 18:18:59 2011 (r2258) @@ -175,7 +175,7 @@ recurse ( ) ; : bezier ( p0 p1 p2 p3 -- ) - dup bezier-point 4 pick bezier-point bezier-steps + dup bezier-point 3 pick bezier-point bezier-steps ; : curveto ( x1 y1 x2 y2 x3 y3 -- )

1 0

[commit] r2257 - cpu/arm/olpc/1.75
by repository service June 10, 2011

June 10, 2011

Author: wmb Date: Fri Jun 10 18:17:53 2011 New Revision: 2257 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2257 Log: OLPC XO-1.75 - slightly cleaner code in memory test. Modified: cpu/arm/olpc/1.75/probemem.fth Modified: cpu/arm/olpc/1.75/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Wed Jun 8 02:56:48 2011 (r2256) +++ cpu/arm/olpc/1.75/probemem.fth Fri Jun 10 18:17:53 2011 (r2257) @@ -94,8 +94,8 @@ then ( adr len ) begin dup while ( adr len ) - decode-int >r decode-int ( adr len this-len r: this-padr ) - r> swap test-mem ( adr len ) + 2 decode-ints swap ( adr len this-len r: this-padr ) + test-mem ( adr len ) mem-fail? if ( adr len ) 2drop true exit ( -- error ) then ( adr len )

1 0

[commit] r2256 - cpu/x86/pc/olpc/via
by repository service June 8, 2011

June 8, 2011

Author: quozl Date: Wed Jun 8 02:56:48 2011 New Revision: 2256 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2256 Log: OLPC XO-1.5 trac #10970 - code review comments merged and tested against 11.2.0 os22. Modified: cpu/x86/pc/olpc/via/dsdt-c2only.dsl cpu/x86/pc/olpc/via/dsdt.dsl Modified: cpu/x86/pc/olpc/via/dsdt-c2only.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt-c2only.dsl Wed Jun 8 02:39:34 2011 (r2255) +++ cpu/x86/pc/olpc/via/dsdt-c2only.dsl Wed Jun 8 02:56:48 2011 (r2256) @@ -331,7 +331,6 @@ IF (LEqual(Arg0, 0x03)) //S3 { - // Store(0x2,\_SB.PCI0.MEMC.FSEG) //Set F Segment to Read only // Notify(\_SB.PCI0, 0x00) } @@ -373,7 +372,6 @@ } //End of Arg0 EQ 0x01 IF (LEqual(Arg0, 0x03)) { // S3 - // Store(0x0,\_SB.PCI0.MEMC.FSEG) // Disable F Segment Read/Write } IF (LEqual(Arg0, 0x04)) { //S4 @@ -387,28 +385,6 @@ Return (0x00) } -// Method(STRC, 2) { // Compare two String -// If(LNotEqual(Sizeof(Arg0), Sizeof(Arg1))) { -// Return(1) -// } -// -// Add(Sizeof(Arg0), 1, Local0) -// -// Name(BUF0, Buffer(Local0) {}) -// Name(BUF1, Buffer(Local0) {}) -// -// Store(Arg0, BUF0) -// Store(Arg1, BUF1) -// -// While(Local0) { -// Decrement(Local0) -// If(LNotEqual(Derefof(Index(BUF0, Local0)), Derefof(Index(BUF1, Local0)))) { -// Return(1) -// } -// } -// Return(0) // Str1 & Str2 are match -// } - // // System Bus // @@ -575,11 +551,6 @@ OperationRegion(MCPS,PCI_Config,0x00,0x100) Field(MCPS,ByteAcc,NoLock,Preserve) { - Offset(0x83), - , 4, - FSEG, 2, //Rx83[4:5] - , 2, - Offset(0x84), LTMA, 16, //Rx84 and Rx85. Low Top Address of Memory @@ -623,360 +594,6 @@ } }//Device(USBD) -// // SDIO Controller -// Device (SDIO) -// { -// Name(_ADR, 0x000C0000) -// -// OperationRegion(RSDC,PCI_Config,0x00,0x100) -// Field(RSDC,ByteAcc,NoLock,Preserve){ -// Offset(0x00), -// VID, 16, -// Offset(0x04), -// CMDR, 3, -// } -// -// Method(_STA, 0) -// { -// If(LNotEqual(\_SB.PCI0.SDIO.VID, 0x1106)) { -// Return(0x00) -// } Else { -// If(LEqual(\_SB.PCI0.SDIO.CMDR, 0x00)) { -// Return(0x0D) -// } Else { -// Return(0x0F) // present, enabled, functioning -// } -// } -// } -// }//Device(SDIO) - -// // SD $ MS Controller -// Device (SDMS) -// { -// Name(_ADR, 0x000D0000) -// -// OperationRegion(RSDM,PCI_Config,0x00,0x100) -// Field(RSDM,ByteAcc,NoLock,Preserve){ -// Offset(0x00), -// VID, 16, -// Offset(0x04), -// CMDR, 3, -// } -// -// Method(_STA, 0) -// { -// If(LNotEqual(\_SB.PCI0.SDMS.VID, 0x1106)) { -// Return(0x00) -// } Else { -// If(LEqual(\_SB.PCI0.SDMS.CMDR, 0x00)) { -// Return(0x0D) -// } Else { -// Return(0x0F) // present, enabled, functioning -// } -// } -// } -// }//Device(SDMS) -// -// // CE-ATA $ NF Controller(Card Boot) -// Device(CENF) -// { -// Name(_ADR, 0x000E0000) -// -// OperationRegion(RENF,PCI_Config,0x00,0x100) -// Field(RENF,ByteAcc,NoLock,Preserve){ -// Offset(0x00), -// VID, 16, -// Offset(0x04), -// CMDR, 3, -// } -// -// Method(_STA, 0) -// { -// If(LNotEqual(\_SB.PCI0.CENF.VID, 0x1106)) { -// Return(0x00) -// } Else { -// If(LEqual(\_SB.PCI0.CENF.CMDR, 0x00)) { -// Return(0x0D) -// } Else { -// Return(0x0F) // present, enabled, functioning -// } -// } -// } -// } -// -// Device(IDEC) -// { -// -// Name(_ADR, 0x000F0000) //D15F0: a Pata device -// -// Method(_STA,0,NotSerialized) //Status of the Pata Device -// { -// If(LNot(LEqual(\_SB.PCI0.IDEC.VID,0x1106))) -// { -// Return(0x00) //device not exists -// } -// Else -// { -// If(LEqual(\_SB.PCI0.IDEC.CMDR,0x00)) -// { -// Return(0x0D) //device exists & disable -// } -// Else -// { -// Return(0x0F) //device exists & enable -// } -// } -// } -// OperationRegion(SAPR,PCI_Config,0x00,0xC2) -// Field(SAPR,ByteAcc,NoLock,Preserve) -// { -// VID,16, -// Offset(0x04), -// CMDR,3, -// Offset(0x40), -// , 1, -// EPCH, 1, // Enable Primary channel. -// Offset(0x4A), -// PSPT, 8, // IDE Timings, Primary Slave -// PMPT, 8, // IDE Timings, Primary Master -// Offset(0x52), -// PSUT, 4, // Primary Slave UDMA Timing -// PSCT, 1, // Primary Drive Slave Cabal Type -// PSUE, 3, // Primary Slave UDMA Enable -// PMUT, 4, // Primary Master UDMA Timing -// PMCT, 1, // Primary Drive Master Cabal Type -// PMUE, 3, // Primary Master UDMA Enable -// } -// -// Name(REGF,0x01) //accessible OpRegion default -// Method(_REG,2,NotSerialized) // is PCI Config space accessible as OpRegion? -// { -// If(LEqual(Arg0,0x02)) -// { -// Store(Arg1,REGF) -// } -// } -// /* -// Name(TIM0,Package(0x04){ -// Package(){0x78,0xB4,0xF0,0x017F,0x0258}, -// Package(){0x20,0x22,0x33,0x47,0x5D}, -// Package(){0x78,0x50,0x3C,0x2D,0x1E,0x14,0x0F}, -// Package(){0x06,0x05,0x04,0x04,0x03,0x03,0x02,0x02,0x01,0x01,0x01,0x01,0x01,0x01,0x00} -// }) -// */ -// Name(TIM0, Package() -// { // Primary / Secondary channels timings -// Package(){120, 180, 240, 383, 600}, // Timings in ns - Mode 4,3,2,1,0 defined from ATA spec. -// Package(){0x20, 0x22, 0x33, 0x47, 0x5D }, // PIO Timing - Mode 4,3,2,1,0 -// Package(){4, 3, 2, 1, 0}, // PIO mode (TIM0,0) -// Package(){2, 1, 0, 0}, // Multi-word DMA mode -// Package(){120, 80, 60, 45, 30, 20, 15}, // Min UDMA Timings in ns -// Package(){6,5,4,4,3,3,2,2,1,1,1,1,1,1,0}, // UDMA mode -// Package(){0x0E, 8, 6, 4, 2, 1, 0}, // UDMA timing -// }) -// -// Name(TMD0,Buffer(0x14){}) -// CreateDwordField(TMD0,0x00,PIO0) -// CreateDwordField(TMD0,0x04,DMA0) -// CreateDwordField(TMD0,0x08,PIO1) -// CreateDwordField(TMD0,0x0C,DMA1) -// CreateDwordField(TMD0,0x10,CHNF) -// -// Name(GMPT, 0) // Master PIO Timings -// Name(GMUE, 0) // Master UDMA enable -// Name(GMUT, 0) // Master UDMA Timings -// Name(GSPT, 0) // Slave PIO Timings -// Name(GSUE, 0) // Slave UDMA enable -// Name(GSUT, 0) // Slave UDMA Timings -// -// Device(CHN0) //Primary Channel: Pata device -// { -// Name(_ADR,0x00) -// -// Method(_STA,0,NotSerialized) -// { -// If(LNotEqual(\_SB.PCI0.IDEC.EPCH, 0x1)) -// { -// Return(0x00) //channel disable -// } -// Else -// { -// Return(0x0F) //channel enable -// } -// } -// Method(_GTM,0,NotSerialized) //Get Timing Mode -// { -// Return(GTM(PMPT,PMUE,PMUT,PSPT,PSUE,PSUT)) -// } -// Method(_STM, 3) // Set Timing PIO/DMA Mode -// { -// Store(Arg0, TMD0) // Copy Arg0 into TMD0 buffer -// Store(PMPT, GMPT) // Master PIO Timings -// Store(PMUE, GMUE) // Master UDMA enable -// Store(PMUT, GMUT) // Master UDMA Timings -// Store(PSPT, GSPT) // Slave PIO Timings -// Store(PSUE, GSUE) // Slave UDMA enable -// Store(PSUT, GSUT) // Slave UDMA Timings -// STM() -// Store(GMPT, PMPT) // Master PIO Timings -// Store(GMUE, PMUE) // Master UDMA enable -// Store(GMUT, PMUT) // Master UDMA Timings -// Store(GSPT, PSPT) // Slave PIO Timings -// Store(GSUE, PSUE) // Slave UDMA enable -// Store(GSUT, PSUT) // Slave UDMA Timings -// } // end Method _STM -// -// Device(DRV0) //Master Device -// { -// Name(_ADR,0x00) //0 indicates master drive -// Method(_GTF,0,NotSerialized) //Get Task File: return a buffer of ATA command used to re-initialize //////the device -// { -// Return(GTF(0,PMUE,PMUT,PMPT)) -// } -// } -// Device(DRV1) //Slave Device -// { -// Name(_ADR,0x01) //1 indicates slave drive -// Method(_GTF,0,NotSerialized) //Get Task File: return a buffer of ATA command used to re-initialize //the device -// { -// Return(GTF(0,PSUE,PSUT,PSPT)) -// } -// } -// } -// -// Method(GTM,6,Serialized) -// { -// Store(Ones,PIO0) //default value: all bits set to 1 -// Store(Ones,PIO1) //default value: all bits set to 1 -// Store(Ones,DMA0) //default value: all bits set to 1 -// Store(Ones,DMA1) //default value: all bits set to 1 -// Store(0x10,CHNF) //default value: 0x10 -// If(REGF) -// { -// } -// Else -// { -// Return(TMD0) //unable to setup PCI config space as opRegion;return default value -// } -// Store(Match(DeRefOf(Index(TIM0,0x01)),MEQ,Arg0,MTR,0x00,0x00),Local6) -// If(LLess(Local6,Ones)) -// { -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x00)),Local6)),Local7) -// Store(Local7,DMA0) -// Store(Local7,PIO0) -// } -// Store(Match(DeRefOf(Index(TIM0,0x01)),MEQ,Arg3,MTR,0x00,0x00),Local6) -// If(LLess(Local6,Ones)) -// { -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x00)),Local6)),Local7) -// Store(Local7,DMA1) -// Store(Local7,PIO1) -// } -// If(Arg1) -// { -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x05)),Arg2)),Local5) -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x04)),Local5)),DMA0) -// Or(CHNF,0x01,CHNF) -// } -// If(Arg4) -// { -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x05)),Arg5)),Local5) -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x04)),Local5)),DMA1) -// Or(CHNF,0x04,CHNF) -// } -// Return(TMD0) //return timing mode -// } -// -// Method(STM, 0, Serialized) -// { -// -// If(REGF){} // PCI space not accessible -// Else { Return(TMD0) } -// -// Store(0x00, GMUE) // Master UDMA Disable -// Store(0x00, GSUE) // Slave UDMA Disable -// Store(0x07, GMUT) // Master UDMA Mode 0 -// Store(0x07, GSUT) // Slave UDMA Mode 0 -// -// If(And(CHNF, 0x1)) -// { -// Store(Match(DeRefOf(Index(TIM0, 4)), MLE, DMA0, MTR,0,0), Local0) // Get DMA mode -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 6)), Local0)), GMUT) // Timing bit mask 66Mhz -// Or(GMUE, 0x07, GMUE) // Enable UltraDMA for Device 0 -// } -// Else // non - UDMA mode. Possible Multi word DMA -// { -// If(Or(LEqual(PIO0,Ones), LEqual(PIO0,0))) -// { -// If(And(LLess(DMA0,Ones), LGreater(DMA0,0))) -// { -// Store(DMA0, PIO0) // Make PIO0=DMA0 -// } -// } -// } -// -// If(And(CHNF, 0x4)) -// { -// Store(Match(DeRefOf(Index(TIM0, 4)), MLE, DMA1, MTR,0,0), Local0) -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 6)), Local0)), GSUT) // Timing bit mask 66Mhz -// Or(GSUE, 0x07, GSUE) // Enable UltraDMA for Device 0 -// } -// Else // non - UDMA mode. Possible Multi word DMA -// { -// If(Or(LEqual(PIO1, Ones), LEqual(PIO1,0))) -// { -// If(And(LLess(DMA1, Ones), LGreater(DMA1,0))) -// { -// Store(DMA1, PIO1) // Make PIO1 = DMA1 -// } -// } -// } -// -// And(Match(DeRefOf(Index(TIM0, 0)), MGE, PIO0, MTR,0,0), 0x3, Local0) -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 1)), Local0)), Local1) -// Store(Local1, GMPT) -// -// And(Match(DeRefOf(Index(TIM0, 0)), MGE, PIO1, MTR,0,0), 0x3, Local0) -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 1)), Local0)), Local1) -// Store(Local1, GSPT) -// Return(TMD0) -// } // end Method STM -// -// Method(GTF , 4 , Serialized) -// { -// Store(Buffer(7){0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF}, Local1) -// Store(Buffer(7){0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF}, Local2) -// CreateByteField(Local1, 1, Mode) // PIO mode -// CreateByteField(Local2, 1, UMOD) // Ultra mode -// CreateByteField(Local1, 5, PCHA) // master or slave -// CreateByteField(Local2, 5, UCHA) // master or slave -// And(Arg0,0x03,Local3) -// -// If(Lequal(And(Local3,0x01),0x01)) -// { -// Store(0xB0,PCHA) // drive 1 -// Store(0xB0,UCHA) // drive 1 -// } -// -// If(Arg1) -// { -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 5)), Arg2)), UMOD) //Programming DMA Mode -// Or( UMOD, 0x40, UMOD) -// } -// Else -// { // non-UltraDMA -// Store(Match(DeRefOf(Index(TIM0, 1)), MEQ, Arg3, MTR,0,0), Local0) -// Or(0x20, DeRefOf(Index(DeReFof(Index(TIM0, 3)), Local0)), UMOD) -// } -// -// Store(Match(DeRefOf(Index(TIM0, 1)), MEQ, Arg3, MTR,0,0), Local0) -// Or(0x08, DeRefOf(Index(DeReFof(Index(TIM0, 2)), Local0)), Mode) -// Concatenate(Local1, Local2, Local6) -// Return(Local6) -// -// } // end of GTF -// } - Device(USB1) { Name(_ADR,0x00100000) //Address+function. Modified: cpu/x86/pc/olpc/via/dsdt.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl Wed Jun 8 02:39:34 2011 (r2255) +++ cpu/x86/pc/olpc/via/dsdt.dsl Wed Jun 8 02:56:48 2011 (r2256) @@ -333,7 +333,6 @@ IF (LEqual(Arg0, 0x03)) //S3 { - // Store(0x2,\_SB.PCI0.MEMC.FSEG) //Set F Segment to Read only // Notify(\_SB.PCI0, 0x00) } @@ -375,7 +374,6 @@ } //End of Arg0 EQ 0x01 IF (LEqual(Arg0, 0x03)) { // S3 - // Store(0x0,\_SB.PCI0.MEMC.FSEG) // Disable F Segment Read/Write } IF (LEqual(Arg0, 0x04)) { //S4 @@ -389,28 +387,6 @@ Return (0x00) } -// Method(STRC, 2) { // Compare two String -// If(LNotEqual(Sizeof(Arg0), Sizeof(Arg1))) { -// Return(1) -// } -// -// Add(Sizeof(Arg0), 1, Local0) -// -// Name(BUF0, Buffer(Local0) {}) -// Name(BUF1, Buffer(Local0) {}) -// -// Store(Arg0, BUF0) -// Store(Arg1, BUF1) -// -// While(Local0) { -// Decrement(Local0) -// If(LNotEqual(Derefof(Index(BUF0, Local0)), Derefof(Index(BUF1, Local0)))) { -// Return(1) -// } -// } -// Return(0) // Str1 & Str2 are match -// } - // // System Bus // @@ -577,11 +553,6 @@ OperationRegion(MCPS,PCI_Config,0x00,0x100) Field(MCPS,ByteAcc,NoLock,Preserve) { - Offset(0x83), - , 4, - FSEG, 2, //Rx83[4:5] - , 2, - Offset(0x84), LTMA, 16, //Rx84 and Rx85. Low Top Address of Memory @@ -625,360 +596,6 @@ } }//Device(USBD) -// // SDIO Controller -// Device (SDIO) -// { -// Name(_ADR, 0x000C0000) -// -// OperationRegion(RSDC,PCI_Config,0x00,0x100) -// Field(RSDC,ByteAcc,NoLock,Preserve){ -// Offset(0x00), -// VID, 16, -// Offset(0x04), -// CMDR, 3, -// } -// -// Method(_STA, 0) -// { -// If(LNotEqual(\_SB.PCI0.SDIO.VID, 0x1106)) { -// Return(0x00) -// } Else { -// If(LEqual(\_SB.PCI0.SDIO.CMDR, 0x00)) { -// Return(0x0D) -// } Else { -// Return(0x0F) // present, enabled, functioning -// } -// } -// } -// }//Device(SDIO) - -// // SD $ MS Controller -// Device (SDMS) -// { -// Name(_ADR, 0x000D0000) -// -// OperationRegion(RSDM,PCI_Config,0x00,0x100) -// Field(RSDM,ByteAcc,NoLock,Preserve){ -// Offset(0x00), -// VID, 16, -// Offset(0x04), -// CMDR, 3, -// } -// -// Method(_STA, 0) -// { -// If(LNotEqual(\_SB.PCI0.SDMS.VID, 0x1106)) { -// Return(0x00) -// } Else { -// If(LEqual(\_SB.PCI0.SDMS.CMDR, 0x00)) { -// Return(0x0D) -// } Else { -// Return(0x0F) // present, enabled, functioning -// } -// } -// } -// }//Device(SDMS) -// -// // CE-ATA $ NF Controller(Card Boot) -// Device(CENF) -// { -// Name(_ADR, 0x000E0000) -// -// OperationRegion(RENF,PCI_Config,0x00,0x100) -// Field(RENF,ByteAcc,NoLock,Preserve){ -// Offset(0x00), -// VID, 16, -// Offset(0x04), -// CMDR, 3, -// } -// -// Method(_STA, 0) -// { -// If(LNotEqual(\_SB.PCI0.CENF.VID, 0x1106)) { -// Return(0x00) -// } Else { -// If(LEqual(\_SB.PCI0.CENF.CMDR, 0x00)) { -// Return(0x0D) -// } Else { -// Return(0x0F) // present, enabled, functioning -// } -// } -// } -// } -// -// Device(IDEC) -// { -// -// Name(_ADR, 0x000F0000) //D15F0: a Pata device -// -// Method(_STA,0,NotSerialized) //Status of the Pata Device -// { -// If(LNot(LEqual(\_SB.PCI0.IDEC.VID,0x1106))) -// { -// Return(0x00) //device not exists -// } -// Else -// { -// If(LEqual(\_SB.PCI0.IDEC.CMDR,0x00)) -// { -// Return(0x0D) //device exists & disable -// } -// Else -// { -// Return(0x0F) //device exists & enable -// } -// } -// } -// OperationRegion(SAPR,PCI_Config,0x00,0xC2) -// Field(SAPR,ByteAcc,NoLock,Preserve) -// { -// VID,16, -// Offset(0x04), -// CMDR,3, -// Offset(0x40), -// , 1, -// EPCH, 1, // Enable Primary channel. -// Offset(0x4A), -// PSPT, 8, // IDE Timings, Primary Slave -// PMPT, 8, // IDE Timings, Primary Master -// Offset(0x52), -// PSUT, 4, // Primary Slave UDMA Timing -// PSCT, 1, // Primary Drive Slave Cabal Type -// PSUE, 3, // Primary Slave UDMA Enable -// PMUT, 4, // Primary Master UDMA Timing -// PMCT, 1, // Primary Drive Master Cabal Type -// PMUE, 3, // Primary Master UDMA Enable -// } -// -// Name(REGF,0x01) //accessible OpRegion default -// Method(_REG,2,NotSerialized) // is PCI Config space accessible as OpRegion? -// { -// If(LEqual(Arg0,0x02)) -// { -// Store(Arg1,REGF) -// } -// } -// /* -// Name(TIM0,Package(0x04){ -// Package(){0x78,0xB4,0xF0,0x017F,0x0258}, -// Package(){0x20,0x22,0x33,0x47,0x5D}, -// Package(){0x78,0x50,0x3C,0x2D,0x1E,0x14,0x0F}, -// Package(){0x06,0x05,0x04,0x04,0x03,0x03,0x02,0x02,0x01,0x01,0x01,0x01,0x01,0x01,0x00} -// }) -// */ -// Name(TIM0, Package() -// { // Primary / Secondary channels timings -// Package(){120, 180, 240, 383, 600}, // Timings in ns - Mode 4,3,2,1,0 defined from ATA spec. -// Package(){0x20, 0x22, 0x33, 0x47, 0x5D }, // PIO Timing - Mode 4,3,2,1,0 -// Package(){4, 3, 2, 1, 0}, // PIO mode (TIM0,0) -// Package(){2, 1, 0, 0}, // Multi-word DMA mode -// Package(){120, 80, 60, 45, 30, 20, 15}, // Min UDMA Timings in ns -// Package(){6,5,4,4,3,3,2,2,1,1,1,1,1,1,0}, // UDMA mode -// Package(){0x0E, 8, 6, 4, 2, 1, 0}, // UDMA timing -// }) -// -// Name(TMD0,Buffer(0x14){}) -// CreateDwordField(TMD0,0x00,PIO0) -// CreateDwordField(TMD0,0x04,DMA0) -// CreateDwordField(TMD0,0x08,PIO1) -// CreateDwordField(TMD0,0x0C,DMA1) -// CreateDwordField(TMD0,0x10,CHNF) -// -// Name(GMPT, 0) // Master PIO Timings -// Name(GMUE, 0) // Master UDMA enable -// Name(GMUT, 0) // Master UDMA Timings -// Name(GSPT, 0) // Slave PIO Timings -// Name(GSUE, 0) // Slave UDMA enable -// Name(GSUT, 0) // Slave UDMA Timings -// -// Device(CHN0) //Primary Channel: Pata device -// { -// Name(_ADR,0x00) -// -// Method(_STA,0,NotSerialized) -// { -// If(LNotEqual(\_SB.PCI0.IDEC.EPCH, 0x1)) -// { -// Return(0x00) //channel disable -// } -// Else -// { -// Return(0x0F) //channel enable -// } -// } -// Method(_GTM,0,NotSerialized) //Get Timing Mode -// { -// Return(GTM(PMPT,PMUE,PMUT,PSPT,PSUE,PSUT)) -// } -// Method(_STM, 3) // Set Timing PIO/DMA Mode -// { -// Store(Arg0, TMD0) // Copy Arg0 into TMD0 buffer -// Store(PMPT, GMPT) // Master PIO Timings -// Store(PMUE, GMUE) // Master UDMA enable -// Store(PMUT, GMUT) // Master UDMA Timings -// Store(PSPT, GSPT) // Slave PIO Timings -// Store(PSUE, GSUE) // Slave UDMA enable -// Store(PSUT, GSUT) // Slave UDMA Timings -// STM() -// Store(GMPT, PMPT) // Master PIO Timings -// Store(GMUE, PMUE) // Master UDMA enable -// Store(GMUT, PMUT) // Master UDMA Timings -// Store(GSPT, PSPT) // Slave PIO Timings -// Store(GSUE, PSUE) // Slave UDMA enable -// Store(GSUT, PSUT) // Slave UDMA Timings -// } // end Method _STM -// -// Device(DRV0) //Master Device -// { -// Name(_ADR,0x00) //0 indicates master drive -// Method(_GTF,0,NotSerialized) //Get Task File: return a buffer of ATA command used to re-initialize //////the device -// { -// Return(GTF(0,PMUE,PMUT,PMPT)) -// } -// } -// Device(DRV1) //Slave Device -// { -// Name(_ADR,0x01) //1 indicates slave drive -// Method(_GTF,0,NotSerialized) //Get Task File: return a buffer of ATA command used to re-initialize //the device -// { -// Return(GTF(0,PSUE,PSUT,PSPT)) -// } -// } -// } -// -// Method(GTM,6,Serialized) -// { -// Store(Ones,PIO0) //default value: all bits set to 1 -// Store(Ones,PIO1) //default value: all bits set to 1 -// Store(Ones,DMA0) //default value: all bits set to 1 -// Store(Ones,DMA1) //default value: all bits set to 1 -// Store(0x10,CHNF) //default value: 0x10 -// If(REGF) -// { -// } -// Else -// { -// Return(TMD0) //unable to setup PCI config space as opRegion;return default value -// } -// Store(Match(DeRefOf(Index(TIM0,0x01)),MEQ,Arg0,MTR,0x00,0x00),Local6) -// If(LLess(Local6,Ones)) -// { -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x00)),Local6)),Local7) -// Store(Local7,DMA0) -// Store(Local7,PIO0) -// } -// Store(Match(DeRefOf(Index(TIM0,0x01)),MEQ,Arg3,MTR,0x00,0x00),Local6) -// If(LLess(Local6,Ones)) -// { -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x00)),Local6)),Local7) -// Store(Local7,DMA1) -// Store(Local7,PIO1) -// } -// If(Arg1) -// { -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x05)),Arg2)),Local5) -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x04)),Local5)),DMA0) -// Or(CHNF,0x01,CHNF) -// } -// If(Arg4) -// { -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x05)),Arg5)),Local5) -// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x04)),Local5)),DMA1) -// Or(CHNF,0x04,CHNF) -// } -// Return(TMD0) //return timing mode -// } -// -// Method(STM, 0, Serialized) -// { -// -// If(REGF){} // PCI space not accessible -// Else { Return(TMD0) } -// -// Store(0x00, GMUE) // Master UDMA Disable -// Store(0x00, GSUE) // Slave UDMA Disable -// Store(0x07, GMUT) // Master UDMA Mode 0 -// Store(0x07, GSUT) // Slave UDMA Mode 0 -// -// If(And(CHNF, 0x1)) -// { -// Store(Match(DeRefOf(Index(TIM0, 4)), MLE, DMA0, MTR,0,0), Local0) // Get DMA mode -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 6)), Local0)), GMUT) // Timing bit mask 66Mhz -// Or(GMUE, 0x07, GMUE) // Enable UltraDMA for Device 0 -// } -// Else // non - UDMA mode. Possible Multi word DMA -// { -// If(Or(LEqual(PIO0,Ones), LEqual(PIO0,0))) -// { -// If(And(LLess(DMA0,Ones), LGreater(DMA0,0))) -// { -// Store(DMA0, PIO0) // Make PIO0=DMA0 -// } -// } -// } -// -// If(And(CHNF, 0x4)) -// { -// Store(Match(DeRefOf(Index(TIM0, 4)), MLE, DMA1, MTR,0,0), Local0) -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 6)), Local0)), GSUT) // Timing bit mask 66Mhz -// Or(GSUE, 0x07, GSUE) // Enable UltraDMA for Device 0 -// } -// Else // non - UDMA mode. Possible Multi word DMA -// { -// If(Or(LEqual(PIO1, Ones), LEqual(PIO1,0))) -// { -// If(And(LLess(DMA1, Ones), LGreater(DMA1,0))) -// { -// Store(DMA1, PIO1) // Make PIO1 = DMA1 -// } -// } -// } -// -// And(Match(DeRefOf(Index(TIM0, 0)), MGE, PIO0, MTR,0,0), 0x3, Local0) -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 1)), Local0)), Local1) -// Store(Local1, GMPT) -// -// And(Match(DeRefOf(Index(TIM0, 0)), MGE, PIO1, MTR,0,0), 0x3, Local0) -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 1)), Local0)), Local1) -// Store(Local1, GSPT) -// Return(TMD0) -// } // end Method STM -// -// Method(GTF , 4 , Serialized) -// { -// Store(Buffer(7){0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF}, Local1) -// Store(Buffer(7){0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF}, Local2) -// CreateByteField(Local1, 1, Mode) // PIO mode -// CreateByteField(Local2, 1, UMOD) // Ultra mode -// CreateByteField(Local1, 5, PCHA) // master or slave -// CreateByteField(Local2, 5, UCHA) // master or slave -// And(Arg0,0x03,Local3) -// -// If(Lequal(And(Local3,0x01),0x01)) -// { -// Store(0xB0,PCHA) // drive 1 -// Store(0xB0,UCHA) // drive 1 -// } -// -// If(Arg1) -// { -// Store(DeRefOf(Index(DeReFof(Index(TIM0, 5)), Arg2)), UMOD) //Programming DMA Mode -// Or( UMOD, 0x40, UMOD) -// } -// Else -// { // non-UltraDMA -// Store(Match(DeRefOf(Index(TIM0, 1)), MEQ, Arg3, MTR,0,0), Local0) -// Or(0x20, DeRefOf(Index(DeReFof(Index(TIM0, 3)), Local0)), UMOD) -// } -// -// Store(Match(DeRefOf(Index(TIM0, 1)), MEQ, Arg3, MTR,0,0), Local0) -// Or(0x08, DeRefOf(Index(DeReFof(Index(TIM0, 2)), Local0)), Mode) -// Concatenate(Local1, Local2, Local6) -// Return(Local6) -// -// } // end of GTF -// } - Device(USB1) { Name(_ADR,0x00100000) //Address+function.

1 0

[commit] r2255 - cpu/x86/pc/olpc/via
by repository service June 8, 2011

June 8, 2011

Author: quozl Date: Wed Jun 8 02:39:34 2011 New Revision: 2255 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2255 Log: OLPC XO-1.5 trac #10970 - avoid disabling the F segment since it is in use by the DSDT at the time. Modified: cpu/x86/pc/olpc/via/dsdt-c2only.dsl cpu/x86/pc/olpc/via/dsdt.dsl Modified: cpu/x86/pc/olpc/via/dsdt-c2only.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt-c2only.dsl Wed Jun 8 02:19:29 2011 (r2254) +++ cpu/x86/pc/olpc/via/dsdt-c2only.dsl Wed Jun 8 02:39:34 2011 (r2255) @@ -331,7 +331,7 @@ IF (LEqual(Arg0, 0x03)) //S3 { - Store(0x2,\_SB.PCI0.MEMC.FSEG) //Set F Segment to Read only + // Store(0x2,\_SB.PCI0.MEMC.FSEG) //Set F Segment to Read only // Notify(\_SB.PCI0, 0x00) } @@ -373,7 +373,7 @@ } //End of Arg0 EQ 0x01 IF (LEqual(Arg0, 0x03)) { // S3 - Store(0x0,\_SB.PCI0.MEMC.FSEG) // Disable F Segment Read/Write + // Store(0x0,\_SB.PCI0.MEMC.FSEG) // Disable F Segment Read/Write } IF (LEqual(Arg0, 0x04)) { //S4 Modified: cpu/x86/pc/olpc/via/dsdt.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl Wed Jun 8 02:19:29 2011 (r2254) +++ cpu/x86/pc/olpc/via/dsdt.dsl Wed Jun 8 02:39:34 2011 (r2255) @@ -333,7 +333,7 @@ IF (LEqual(Arg0, 0x03)) //S3 { - Store(0x2,\_SB.PCI0.MEMC.FSEG) //Set F Segment to Read only + // Store(0x2,\_SB.PCI0.MEMC.FSEG) //Set F Segment to Read only // Notify(\_SB.PCI0, 0x00) } @@ -375,7 +375,7 @@ } //End of Arg0 EQ 0x01 IF (LEqual(Arg0, 0x03)) { // S3 - Store(0x0,\_SB.PCI0.MEMC.FSEG) // Disable F Segment Read/Write + // Store(0x0,\_SB.PCI0.MEMC.FSEG) // Disable F Segment Read/Write } IF (LEqual(Arg0, 0x04)) { //S4

1 0

[commit] r2254 - dev/hdaudio
by repository service June 8, 2011

June 8, 2011

Author: quozl Date: Wed Jun 8 02:19:29 2011 New Revision: 2254 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2254 Log: OLPC XO-1.5 - fix build regression introduced by svn 2246, use 386-assembler instead of x86-assembler. Watermark: brick tested on XO-1.5 0xD7. Modified: dev/hdaudio/noiseburst.fth Modified: dev/hdaudio/noiseburst.fth ============================================================================== --- dev/hdaudio/noiseburst.fth Wed Jun 8 01:39:13 2011 (r2253) +++ dev/hdaudio/noiseburst.fth Wed Jun 8 02:19:29 2011 (r2254) @@ -118,7 +118,7 @@ mov tos,r4 c; [then] -[ifdef] x86-assembler +[ifdef] 386-assembler code mono-covar ( adr1 adr2 #samples -- d.sum ) cx pop

1 0