openfirmware October 2011

openfirmware@openfirmware.info

1 participants
103 discussions

[commit] r2638 - in cpu/arm: mmp2 olpc/1.75
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 06:25:07 2011 New Revision: 2638 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2638 Log: OLPC XO-1.75 - suspend/resume selftest - moved from memory node to switches node to work around an SMT test problem wherein the suspend/resume test breaks the keyboard on some systems. Modified: cpu/arm/mmp2/rtc.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/probemem.fth Modified: cpu/arm/mmp2/rtc.fth ============================================================================== --- cpu/arm/mmp2/rtc.fth Sat Oct 22 06:03:25 2011 (r2637) +++ cpu/arm/mmp2/rtc.fth Sat Oct 22 06:25:07 2011 (r2638) @@ -46,19 +46,22 @@ \ it's hard to return a real error code. We just have to rely \ on the operator. ." Testing suspend/resume" cr - ." Sleeping for 3 seconds .. " d# 100 ms + ." Sleeping for 3 seconds .. " d# 1000 ms ec-rst-pwr ['] cancel-alarm 3 rtc-wake str ec-max-pwr ( power ) \ Negative power is consumed from battery, positive is supplied to battery dup d# -250 < if ( power ) ." System used too much power during suspend - " negate .d ." mW" cr ( ) true ( error? ) else ( power ) - drop false ( error? ) + ." OKAY" cr drop false ( error? ) then ( error? ) ; -dev /memory -[ifdef] test-s3 ' s3-selftest to test-s3 [then] -dend +dev /switches +: selftest ( -- error? ) + s3-selftest if true exit then + selftest +; +device-end \ LICENSE_BEGIN \ Copyright (c) 2011 FirmWorks Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Sat Oct 22 06:03:25 2011 (r2637) +++ cpu/arm/olpc/1.75/fw.bth Sat Oct 22 06:25:07 2011 (r2638) @@ -181,11 +181,11 @@ fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth fload ${BP}/cpu/arm/mmp2/dramrecal.fth -fload ${BP}/cpu/arm/mmp2/rtc.fth \ Internal RTC, used for wakeups code halt ( -- ) wfi c; fload ${BP}/cpu/arm/olpc/1.75/switches.fth \ Lid and ebook switches +fload ${BP}/cpu/arm/mmp2/rtc.fth \ Internal RTC, used for wakeups fload ${BP}/cpu/arm/olpc/1.75/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools Modified: cpu/arm/olpc/1.75/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Sat Oct 22 06:03:25 2011 (r2637) +++ cpu/arm/olpc/1.75/probemem.fth Sat Oct 22 06:25:07 2011 (r2638) @@ -64,8 +64,6 @@ [then] : .chunk ( adr len -- ) ." Testing address 0x" swap 8u.h ." length 0x" 8u.h cr ; -defer test-s3 ( -- error? ) ' false is test-s3 - : test-mem ( adr len -- ) \ Test a chunk 'o memory 2>r 2r@ 0 mem-claim to p-adr ( ) ( r: adr len ) @@ -115,8 +113,7 @@ then ( adr len ) repeat ( adr len ) 2drop ( ) - - test-s3 ( error? ) + false ; device-end

1 0

[commit] r2637 - cpu/arm/olpc/1.75
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 06:03:25 2011 New Revision: 2637 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2637 Log: OLPC XO-1.75 - accelerometer selftest - increased max-z in selftest for new chip. Modified: cpu/arm/olpc/1.75/accelerometer.fth Modified: cpu/arm/olpc/1.75/accelerometer.fth ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.fth Sat Oct 22 05:40:39 2011 (r2636) +++ cpu/arm/olpc/1.75/accelerometer.fth Sat Oct 22 06:03:25 2011 (r2637) @@ -309,9 +309,9 @@ d# 50 value min-x d# 50 value min-y d# 150 value min-z -d# 100 value max-x -d# 100 value max-y -d# 300 value max-z +d# 150 value max-x +d# 150 value max-y +d# 450 value max-z : range? ( delta max-delta -- error? ) between 0= ; : error? ( dx dy dz -- error? ) @@ -385,7 +385,7 @@ \ The attempt to talk at the old address failed, so we assume the new chip \ Support for new LIS3DHTR chip d# 50 to min-x d# 50 to min-y d# 50 to min-z - d# 150 to max-x d# 150 to max-y d# 300 to max-z + d# 150 to max-x d# 150 to max-y d# 450 to max-z h# 32 6 encode-phys " reg" property ['] lis3dhtr-selftest to lis-selftest else

1 0

[commit] r2636 - ofw/fs/ext2fs
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 05:40:39 2011 New Revision: 2636 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2636 Log: Initial checkin of barely-tested code to handle ext3/4 journals. Added: ofw/fs/ext2fs/recovery.fth Added: ofw/fs/ext2fs/recovery.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ ofw/fs/ext2fs/recovery.fth Sat Oct 22 05:40:39 2011 (r2636) @@ -0,0 +1,362 @@ +h# c03b3998 constant jbd_magic + +struct + /l field >h_magic + /l field >h_blocktype + /l field >h_sequence +constant /journal-header + +/journal-header + /c field >h_chksum_type + /c field >h_chksum_size + 2 /c* \ Padding + 4 /l* field >h_chksum + 2 /l* field >h_commit_sec + /l field >h_commit_nsec +constant /commit-header + +/journal-header + /l field >r_count +constant /revoke-header + +struct + /l field >t_blocknr + /l field >t_flags +dup constant /tag32 + /l field >t_blocknr_high +constant /tag64 + +/journal-header + /l field >s_blocksize + /l field >s_maxlen + /l field >s_first + /l field >s_sequence + /l field >s_start + /l field >s_errno + /l field >s_feature_compat + /l field >s_feature_incompat + /l field >s_feature_ro_compat + \ We don't need the rest +drop + +0 value j-buf +0 value j-compat +0 value j-incompat +0 value j-blocksize +0 value j-first +0 value j-last +0 value j-start +0 value j-sequence +0 value tag-bytes + +0 value jsb +0 value bh +0 value obh +: free-journal ( -- ) + jsb if jsb bsize free-mem 0 to jsb then + bh if bh j-blocksize free-mem 0 to bh then + obh if obh j-blocksize free-mem 0 to obh then +; +: read-journal ( -- skip? ) + bsize alloc-mem to jsb + 8 set-inode \ 8 is the well-known inode# for the journal + jsb 0 read-file-block ( ) + + jsb >h_magic be-l@ jbd_magic <> if + free-journal true exit ( -- skip? ) + then + + jsb >h_blocktype be-l@ 3 4 between 0= if + \ Not superblock + free-journal true exit ( -- skip? ) + then + + jsb >s_start be-l@ to j-start + jsb 0= if + free-journal true exit ( -- skip? ) + then + + jsb >s_blocksize be-l@ to j-blocksize ( ) + + j-blocksize bsize <> if + ." Journal block size != filesystem block size" cr + free-journal true exit ( -- skip? ) + then + + j-blocksize alloc-mem to bh ( ) + j-blocksize alloc-mem to obh ( ) + + jsb >s_sequence be-l@ to j-sequence ( ) + jsb >s_first be-l@ to j-first ( ) + jsb >s_maxlen be-l@ to j-last ( ) + + jsb >s_feature_compat be-l@ to j-compat ( ) + jsb >s_feature_incompat be-l@ to j-incompat ( ) + + j-incompat 2 and if /tag64 else /tag32 then to tag-bytes \ 2:FEATURE_INCOMPAT_64BIT + + false ( skip? ) +; + +: +wrap ( n increment -- n' ) + + dup j-last >= if + j-last - j-first + + then +; + +0 value tagend +0 value tagp +: first-tag ( -- ) + bh j-blocksize + to tagend ( ) + bh /journal-header + to tagp ( ) +; +: +tagp ( -- end? ) + tagp >t_flags be-l@ ( flags ) + tagp tag-bytes + ( flags tagp ) + over 2 and 0= if d# 16 + then ( flags tagp ) \ 2:FLAG_SAME_UUID + to tagp ( flags ) + 8 and if ( ) \ 8:FLAG_LAST_TAG + true ( end? ) + else ( ) + tagp tagend >= ( end? ) + then ( end? ) +; +: count-tags ( -- count ) + 0 ( count ) + first-tag begin 1+ +tagp until ( count end? ) +; + +: write-jblock ( d.block# adr -- ) + -rot drop write-fs-block ( error? ) +\ j-blocksize 2swap ( adr len d.block# ) +\ j-blocksize du* ( adr len d.byte# ) +\ write-bytes + if ." Journal recovery write error" cr abort then +; + +0 value next-log-block +: next-jblock ( buf -- ) + next-log-block read-file-block ( ) + next-log-block 1 +wrap to next-log-block ( ) +; + +0 value crc32-sum +: crc32-block ( buf -- ) + crc32-sum crctab rot j-blocksize ($crc) to crc32-sum +; +: calc-chksums ( -- ) + bh crc32-block + count-tags 0 ?do + obh next-jblock obh crc32-block + loop +; + +listnode + /n 2* field >r_block# + /n field >r_sequence +nodetype: revoke-node + +list: revoke-list + +: free-revoke-list ( -- ) + begin revoke-list >next-node while ( ) + revoke-list delete-after ( node ) + revoke-node free-node ( ) + repeat ( ) +; + +: block#> ( d.block# 'node -- d.block# flag ) + >r_block# 2@ 2over d< +; + +\ node is either the found one or the insertion point +: find-revoked ( d.block# -- d.block# node found? ) + revoke-list ['] block#> find-node drop ( d.block# node ) + 3dup >r_block# 2@ d= ( d.block# node ) +; + +0 value next-commit-id + +: revoked? ( d.block# -- revoked? ) + find-revoked if ( d.block# node ) + nip nip ( node ) + >r_sequence @ ( sequence# ) + next-commit-id = ( revoked? ) + else ( d.block# node ) + 3drop false ( revoked? ) + then ( revoked? ) +; + +: set-revoke ( d.block# -- ) + find-revoked if ( d.block# node ) + nip nip ( node ) + next-commit-id over >r_sequence @ - 0>= if ( node ) + next-commit-id over >r_sequence ! ( node ) + then ( node ) + drop ( ) + else ( d.block# node ) + -rot ( node d.block# ) + revoke-node allocate-node >r ( node d.block# r: newnode ) + r@ >r_block# 2! ( node r: newnode ) + next-commit-id r@ >r_sequence ! ( node r: newnode ) + r> swap insert-after ( ) + then ( ) +; + +: replay-tag ( -- ) + obh next-jblock ( ) + + tagp >t_blocknr be-l@ ( block# ) + j-incompat 2 and if ( block# ) \ 2:FEATURE_INCOMPAT_64BIT + tagp >t_blocknr_high be-l@ ( d.block# ) + else ( block# ) + u>d ( d.block# ) + then ( d.block# ) + 2dup revoked? if ( d.block# ) + 2drop ( ) + else ( d.block# ) + tagp >t_flags be-l@ 1 and if ( d.block# ) \ 1:FLAG_ESCAPE + jbd_magic obh >data be-l! ( d.block# ) + then ( d.block# ) + obh write-jblock ( ) + then ( ) +; + +: replay-descriptor-block ( -- ) + first-tag begin replay-tag +tagp until ( ) +; + +0 value pass +: scanning? ( -- flag ) pass 0= ; +: revoking? ( -- flag ) pass 1 = ; +: replaying? ( -- flag ) pass 2 = ; + +0 value end-transaction + +: do-descriptor-block ( -- ) + replaying? if + replay-descriptor-block + else + scanning? if + j-compat 1 and if \ FEATURE_COMPAT_CHECKSUM + end-transaction 0= if + calc-chksums \ Can abort + exit \ Continues loop in pass-loop + then + then + then + next-log-block count-tags +wrap to next-log-block + then +; + +0 value j-failed-commit +: do-commit-chksum ( -- ) + bh >h_chksum be-l@ ( sum ) + end-transaction if ( sum ) + true to j-failed-commit ( sum ) + drop exit ( -- ) + then ( sum ) + + dup crc32-sum = ( sum flag ) + bh >h_chksum_type c@ 1 = and \ 1:CRC32_CHKSUM ( sum flag' ) + bh >h_chksum_size c@ 4 = and \ 4:CRC32_CHKSUM_SIZE ( sum flag' ) + if ( sum ) + drop ( ) + else ( sum ) + 0= ( flag ) + bh >h_chksum_type c@ 0= ( flag' ) + bh >h_chksum_size c@ 0= and 0= if ( flag' ) + next-commit-id to end-transaction ( ) + j-incompat 4 and if ( ) \ 4:FEATURE_INCOMPAT_ASYNC_COMMIT + next-commit-id to j-failed-commit ( ) + abort + then ( ) + then ( ) + then ( ) + -1 to crc32-sum ( ) +; +: do-commit-block ( -- ) + scanning? if + j-compat 1 and if \ FEATURE_COMPAT_CHECKSUM + do-commit-chksum + then + then + next-commit-id 1+ to next-commit-id +; + +: be-x@ ( adr -- d ) dup la1+ be-l@ swap be-l@ ; +: do-revoke-block ( -- ) + revoking? 0= if exit then + + bh /revoke-header + ( adr ) + bh >r_count be-l@ bounds ( endadr adr ) + + j-incompat 2 and if ( endadr adr ) \ 2:FEATURE_INCOMPAT_64BIT + ?do i be-x@ set-revoke 8 +loop ( ) + else + ?do i be-l@ u>d set-revoke 4 +loop ( ) + then +; + +: pass-loop ( -- ) + begin + scanning? 0= if + next-commit-id end-transaction - 0>= if exit then + then + bh next-jblock ( ) + bh >h_magic be-l@ jbd_magic <> if ( ) + exit ( -- ) + then ( ) + bh >h_sequence be-l@ next-commit-id <> if ( adr ) + exit ( -- ) + then ( ) + bh >h_blocktype be-l@ case ( ) + 1 of do-descriptor-block endof ( ) + 2 of do-commit-block endof ( ) + 5 of do-revoke-block endof ( ) + ( default ) drop exit ( ) + endcase ( ) + again +; +: one-pass ( pass -- ) + to pass + -1 to crc32-sum + j-sequence to next-commit-id + j-start to next-log-block + pass-loop + scanning? if + end-transaction 0= if + next-commit-id to end-transaction + then + else + end-transaction next-commit-id <> abort" Recover end-transaction mismatch" + then +; +: commit-journal ( -- ) + 0 jsb >s_start be-l! + jsb 0 write-file-block + flush +; +: process-journal ( -- ) + read-journal if exit then + + 0 ['] one-pass catch if + ." Journal scan failed" cr + free-journal exit + then + + 1 ['] one-pass catch if + ." Journal revoke failed" cr + free-revoke-list free-journal exit + then + + 2 ['] one-pass catch if + ." Journal replay failed" cr + free-revoke-list free-journal exit + then + + free-revoke-list + + \ commit-journal + free-journal +;

1 0

[commit] r2635 - ofw/inet
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 05:40:33 2011 New Revision: 2635 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2635 Log: IP pkg - Added known? and ntp-server-ip passthrough methods to IP package so ntp-set-clock does not silently abort during the DHCP phase. When that happens, it leaves the net device open, sometimes leading to later failures with that device. Modified: ofw/inet/ippkg.fth Modified: ofw/inet/ippkg.fth ============================================================================== --- ofw/inet/ippkg.fth Sat Oct 22 05:40:28 2011 (r2634) +++ ofw/inet/ippkg.fth Sat Oct 22 05:40:33 2011 (r2635) @@ -63,6 +63,8 @@ call-tftp: link-mtu ( -- n ) call-tftp: max-ip-payload ( -- n ) call-tftp: alloc-udp-port ( -- port# ) +call-tftp: known? ( 'ip -- flag ) +call-tftp: ntp-server-ip ( -- 'ip ) finish-device device-end

1 0

[commit] r2634 - dev/olpc/mmp2camera
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 05:40:28 2011 New Revision: 2634 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2634 Log: OLPC XO-1.75 - rev C uses GPIO 144 to control CAM_PWRDN; added support for that. Also requires a change in CForth. Modified: dev/olpc/mmp2camera/platform.fth Modified: dev/olpc/mmp2camera/platform.fth ============================================================================== --- dev/olpc/mmp2camera/platform.fth Sat Oct 22 05:40:23 2011 (r2633) +++ dev/olpc/mmp2camera/platform.fth Sat Oct 22 05:40:28 2011 (r2634) @@ -19,13 +19,14 @@ : sensor-power-on ( -- ) d# 145 gpio-set ; : sensor-power-off ( -- ) d# 145 gpio-clr ; [else] -: sensor-power-on ( -- ) d# 150 gpio-set ; -: sensor-power-off ( -- ) d# 150 gpio-clr ; +: sensor-power-on ( -- ) d# 150 gpio-set d# 144 gpio-clr ; +: sensor-power-off ( -- ) ( d# 144 gpio-set ) d# 150 gpio-clr ; \ Leave low for Linux [then] \ CAM_HSYNC is on GPIO67, CAM_VSYNC is on GPIO68 \ PIXMCLK on GPIO69, PIXCLK on GPIO70, PIXDATA[7:0] on GPIO[59:66] \ CAM_SCL on GPIO108, CAM_SDA on GPIO109 (bitbang) +\ CAM_PWRDN on GPIO144 \ LICENSE_BEGIN \ Copyright (c) 2011 FirmWorks

1 0

[commit] r2633 - cpu/x86/pc/alex/build
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 05:40:23 2011 New Revision: 2633 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2633 Log: gitignore Added: cpu/x86/pc/alex/build/.gitignore Modified: .gitignore Modified: .gitignore ============================================================================== --- .gitignore Sat Oct 22 05:40:16 2011 (r2632) +++ .gitignore Sat Oct 22 05:40:23 2011 (r2633) @@ -17,3 +17,5 @@ *~ headers *.md5 +*.public +*.lo Added: cpu/x86/pc/alex/build/.gitignore ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/alex/build/.gitignore Sat Oct 22 05:40:23 2011 (r2633) @@ -0,0 +1,2 @@ +build +testicons

1 0

[commit] r2632 - cpu/arm/olpc/1.75
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 05:40:16 2011 New Revision: 2632 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2632 Log: gitignore Added: cpu/arm/olpc/1.75/.gitignore Added: cpu/arm/olpc/1.75/.gitignore ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/.gitignore Sat Oct 22 05:40:16 2011 (r2632) @@ -0,0 +1,6 @@ +armforth +build +cforth +multicast-nand +sourceurl +testicons

1 0

[commit] r2631 - cpu/arm/mmp2
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 05:40:09 2011 New Revision: 2631 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2631 Log: OLPC XO-1.75 - added delay in low-level suspend/resume code to fix resume failures that occur on some rev C memory configurations. Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Sat Oct 22 05:40:03 2011 (r2630) +++ cpu/arm/mmp2/dramrecal.fth Sat Oct 22 05:40:09 2011 (r2631) @@ -86,6 +86,8 @@ mov r1, #0x40000000 \ DLL_UPDATE_EN str r1, [r0, #0x240] \ PHY_CTRL14 + mov r1, #0x0300 begin decs r1,1 0= until \ Delay, needed for some DRAMs + mov r1, #0x80 \ Exit Self Refresh value str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0

1 0

[commit] r2630 - cpu/arm/olpc/1.75
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 05:40:03 2011 New Revision: 2630 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2630 Log: OLPC XO-1.75 - added watch-dc-biased and watch-dc-unbiased commands for checking sensor input mode. Modified: cpu/arm/olpc/1.75/alc5631.fth cpu/arm/olpc/1.75/sound.fth Modified: cpu/arm/olpc/1.75/alc5631.fth ============================================================================== --- cpu/arm/olpc/1.75/alc5631.fth Sat Oct 22 05:39:56 2011 (r2629) +++ cpu/arm/olpc/1.75/alc5631.fth Sat Oct 22 05:40:03 2011 (r2630) @@ -30,7 +30,7 @@ \ The speaker gain ratio must be <= the ratio of SPKVDD to AVDD. \ In our system, SPKVDD is 5V and AVDD is 3.3V, so we need a gain ratio <= 1.51 . \ The value 3 gives a ratio of 1.44, and value 4 gives a ratio of 1.56 . We use 3. - h# 3e00 h# 40 codec! \ Speaker Amp Ratio GAIN is 1.44x, no HPFs + h# 3e00 h# 40 codec! \ Speaker Amp Ratio GAIN is 1.44x, HPF on ADC and DAC h# 0000 h# 42 codec! \ Use MCLK, not PLL \ b# 1110.1100.1001.0000 h# 52 codec! \ Protection on @@ -42,10 +42,10 @@ : mic-bias-off ( -- ) h# 000c h# 3b codec-clr ; : mic-bias-on ( -- ) h# 000c h# 3b codec-set ; -: mic1-high-bias ( -- ) h# 80 h# 22 codec-clr mic-bias-on ; \ 0.90*AVDD, e.g. 3V with AVDD=3.3V -: mic1-low-bias ( -- ) h# 80 h# 22 codec-set mic-bias-on ; \ 0.75*AVDD, e.g. 2.5V with AVDD=3.3V -: mic2-high-bias ( -- ) h# 08 h# 22 codec-clr mic-bias-on ; \ 0.90*AVDD, e.g. 3V with AVDD=3.3V -: mic2-low-bias ( -- ) h# 08 h# 22 codec-set mic-bias-on ; \ 0.75*AVDD, e.g. 2.5V with AVDD=3.3V +: mic1-high-bias ( -- ) h# 80 h# 22 codec-clr ; \ 0.90*AVDD, e.g. 3V with AVDD=3.3V +: mic1-low-bias ( -- ) h# 80 h# 22 codec-set ; \ 0.75*AVDD, e.g. 2.5V with AVDD=3.3V +: mic2-high-bias ( -- ) h# 08 h# 22 codec-clr ; \ 0.90*AVDD, e.g. 3V with AVDD=3.3V +: mic2-low-bias ( -- ) h# 08 h# 22 codec-set ; \ 0.75*AVDD, e.g. 2.5V with AVDD=3.3V : depop! ( value -- ) h# 54 codec! ; : pwr3a! ( value -- ) h# 3a codec! ; @@ -201,8 +201,9 @@ : adc-mono-right ( -- ) h# 8000 adc-source ; \ R->L+R : adc-stereo-reversed ( -- ) h# c000 adc-source ; \ L->R, R->L (channels swapped) +true value mic-bias? : open-in-specific ( -- ) - h# 000c h# 3b codec-set \ Power on MIC1/2 bias + mic-bias? if mic-bias-on else mic-bias-off then \ Power on MIC1/2 bias adc-stereo h# 0c00 h# 3b codec-set \ Power on RECMIXLR h# 0030 h# 3b codec-set \ Power on MIC1/2 boost gain Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Sat Oct 22 05:39:56 2011 (r2629) +++ cpu/arm/olpc/1.75/sound.fth Sat Oct 22 05:40:03 2011 (r2630) @@ -400,6 +400,51 @@ : read ( adr len -- actual ) open-in audio-in close-in ; 0 value mono? +: stereo false to mono? ; +: mono true to mono? ; + +: average-channel ( adr -- n ) + 0 swap /audio-buf bounds do ( accum ) + i <w@ + ( accum' ) + /l +loop ( accum ) + /audio-buf /l / / ( average ) +; +: average-in ( -- ) + my-in-desc 2 la+ l@ ( adr ) + (cr push-decimal ( adr ) + dup average-channel ( adr average ) + 6 .r space ( adr ) + wa1+ average-channel ( average ) + 6 .r ( ) + pop-base ( ) + my-in-desc 3 la+ l@ to my-in-desc +; +: audio-watch ( -- ) + setup-sspa-rx ( ) + make-in-ring ( ) + start-in-ring ( ) + master-rx ( ) + begin ( ) + wait-in ( ) + average-in ( ) + key? until ( ) + disable-sspa-rx ( ) + stop-in-ring ( ) + reset-rx ( ) +; +: watch-dc ( bias? -- ) + to mic-bias? + d# 143 gpio-set \ DC input mode + h# 0400 h# 40 codec-clr + open-in + stereo 0 set-adc-gain 0 set-mic-gain + \ High bias gets us closer to the top of the digital range - but bias can + \ be turned off completely with "false to mic-bias?" + mic1-high-bias mic2-high-bias + audio-watch + close-in +; + 0 value in-adr0 0 value in-len0 : collapse-in ( -- ) @@ -504,9 +549,6 @@ set-adc-gain ; -: stereo false to mono? ; -: mono true to mono? ; - : init-codec ( -- ) codec-on set-default-gains @@ -570,6 +612,15 @@ end-package +: (watch-dc) ( bias? -- ) + " /audio" open-dev >r ( bias? r: ihandle ) + " watch-dc" r@ $call-method ( r: ihandle ) + r> close-dev ( ) +; +: watch-dc-biased ( -- ) true (watch-dc) ; +: watch-dc-unbiased ( -- ) false (watch-dc) ; + + \ LICENSE_BEGIN \ Copyright (c) 2011 FirmWorks \

1 0

[commit] r2629 - in cpu/arm: mmp2 olpc/1.75
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 05:39:56 2011 New Revision: 2629 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2629 Log: OLPC XO-1.75 - turn off timer interrupts when entering Linux. Modified: cpu/arm/mmp2/timer.fth cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/mmp2/timer.fth ============================================================================== --- cpu/arm/mmp2/timer.fth Sat Oct 22 05:39:50 2011 (r2628) +++ cpu/arm/mmp2/timer.fth Sat Oct 22 05:39:56 2011 (r2629) @@ -161,6 +161,11 @@ ; ' (set-tick-limit) to set-tick-limit +: timers-off ( -- ) + 0 timer0-ier! 0 timer1-ier! 0 timer2-ier! \ Disable timer interrupts + 7 timer0-icr! 7 timer1-icr! 7 timer2-icr! \ Clear pending interrupts +; + : can-idle? ( -- flag ) interrupts-enabled? if d# 15 interrupt-enabled? Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Sat Oct 22 05:39:50 2011 (r2628) +++ cpu/arm/olpc/1.75/fw.bth Sat Oct 22 05:39:56 2011 (r2629) @@ -33,6 +33,7 @@ " /usb" " reset-usb" execute-device-method drop ; : quiesce ( -- ) + timers-off usb-quiet close-ec ;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware October 2011