openfirmware July 2009

openfirmware@openfirmware.info

2 participants
38 discussions

r1257 - cpu/x86/pc/olpc/via dev/hdaudio
by svn＠openfirmware.info 29 Jul '09

29 Jul '09

Author: wmb Date: 2009-07-29 03:08:57 +0200 (Wed, 29 Jul 2009) New Revision: 1257 Modified: cpu/x86/pc/olpc/via/addrs.fth dev/hdaudio/core.fth Log: Via - Fixed test /audio Modified: cpu/x86/pc/olpc/via/addrs.fth =================================================================== --- cpu/x86/pc/olpc/via/addrs.fth 2009-07-28 04:19:31 UTC (rev 1256) +++ cpu/x86/pc/olpc/via/addrs.fth 2009-07-29 01:08:57 UTC (rev 1257) @@ -36,7 +36,7 @@ h# 18.0000 constant heap-size -h# 20.0000 constant /dma-extra \ In case the firmware region isn't enough +h# 40.0000 constant /dma-extra \ In case the firmware region isn't enough /fw-ram /dma-extra + constant dma-size \ We let the DMA area overlap the FW area fw-pa /dma-extra - constant dma-base Modified: dev/hdaudio/core.fth =================================================================== --- dev/hdaudio/core.fth 2009-07-28 04:19:31 UTC (rev 1256) +++ dev/hdaudio/core.fth 2009-07-29 01:08:57 UTC (rev 1257) @@ -78,12 +78,11 @@ \ \\ Stream Descriptors \ Default: 48kHz 16bit stereo -1 value scale-factor -0 value sample-base -0 value sample-mul -0 value sample-div -1 value sample-format -2 value #channels +0 instance value sample-base +0 instance value sample-mul +0 instance value sample-div +1 instance value sample-format +2 instance value #channels : stream-format ( -- u ) sample-base d# 14 lshift ( acc ) @@ -221,9 +220,17 @@ ; defer playback-alarm +0 value alarmed? -: install-playback-alarm ( -- ) ['] playback-alarm d# 20 alarm ; -: uninstall-playback-alarm ( -- ) ['] playback-alarm d# 0 alarm ; +: install-playback-alarm ( -- ) + true to alarmed? ['] playback-alarm d# 20 alarm +; +: uninstall-playback-alarm ( -- ) + alarmed? if + ['] playback-alarm d# 0 alarm + false to alarmed? + then +; \ \ Device open and close @@ -232,11 +239,9 @@ : init-codec ( -- ) detect-codec open-codec ; : close-controller ( -- ) reset unmap-regs ; -: open ( -- flag ) init-controller init-codec true ; -: close ( -- ) uninstall-playback-alarm close-codec close-controller ; +d# 48.000 instance value sample-rate +1 instance value scale-factor -d# 48.000 value sample-rate - : low-rate? ( Hz ) dup d# 48.000 < swap d# 44.100 <> and ; : set-sample-rate ( Hz -- ) @@ -255,6 +260,20 @@ then ; +0 value open-count +: open ( -- flag ) + open-count 0= if init-controller then + init-codec + open-count 1+ to open-count + true +; +: close ( -- ) + open-count 1 = if + uninstall-playback-alarm close-codec close-controller + then + open-count 1- 0 max to open-count +; + \ \ Streams \ \\ Sound buffer @@ -400,7 +419,7 @@ : steps/dB ( -- #steps ) step-size 4 * ; : dB>steps ( dB -- #steps ) -4 * step-size / ; -: step# ( dB -- step ) dB>steps 0dB-step + ; +: dB>step# ( dB -- step ) dB>steps 0dB-step + ; \ \\ Playback @@ -409,16 +428,17 @@ : open-out ( -- ) 4 to sd# 48kHz - upsampling? if scale-factor upsample then ( adr len ) ; : audio-out ( adr len -- actual ) + dup >r + upsampling? if scale-factor upsample then ( adr len ) install-sound-buffer ( ) setup-bdl setup-stream enable-codec-playback start-stream - /sound-buffer ( actual ) + r> ( actual ) ; : release-sound-buffer ( -- ) @@ -449,7 +469,7 @@ : wait-sound ( -- ) ; \ sound stops with asynchronous alarm handler -: set-volume ( dB -- ) dac to node step# output-gain ; +: set-volume ( dB -- ) dac to node dB>step# output-gain ; \ \\ Recording

1 0

r1256 - ofw/inet
by svn＠openfirmware.info 28 Jul '09

28 Jul '09

Author: wmb Date: 2009-07-28 06:19:31 +0200 (Tue, 28 Jul 2009) New Revision: 1256 Modified: ofw/inet/ip.fth Log: IP stack - fixed bug in broadcast-ip-addr? introduced by a recent checkin. Modified: ofw/inet/ip.fth =================================================================== --- ofw/inet/ip.fth 2009-07-28 01:17:16 UTC (rev 1255) +++ ofw/inet/ip.fth 2009-07-28 04:19:31 UTC (rev 1256) @@ -78,9 +78,9 @@ \ Matches either h# ffffffff or h# 0 or subnet-specific broadcast addr : broadcast-ip-addr? ( adr-buf -- flag ) - dup broadcast-ip-addr ip= - swap def-broadcast-ip ip= or - over unknown-ip-addr? or + dup broadcast-ip-addr ip= ( adr-buf flag ) + over def-broadcast-ip ip= or ( adr-buf flag ) + swap unknown-ip-addr? or ( flag ) ; : netmask ( -- 'ip )

1 0

r1255 - cpu/x86/pc/olpc
by svn＠openfirmware.info 28 Jul '09

28 Jul '09

Author: wmb Date: 2009-07-28 03:17:16 +0200 (Tue, 28 Jul 2009) New Revision: 1255 Modified: cpu/x86/pc/olpc/fw.bth Log: Fixed load order in XO-1 fw.bth. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2009-07-28 01:16:15 UTC (rev 1254) +++ cpu/x86/pc/olpc/fw.bth 2009-07-28 01:17:16 UTC (rev 1255) @@ -348,10 +348,10 @@ fload ${BP}/cpu/x86/pc/olpc/biosresume.fth fload ${BP}/cpu/x86/pc/olpc/setwp.fth +fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/security.fth fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth -fload ${BP}/cpu/x86/pc/olpc/sound.fth [ifdef] wlan-wackup fload ${BP}/cpu/x86/pc/olpc/wlantest.fth [then]

1 0

r1254 - cpu/x86/pc/olpc
by svn＠openfirmware.info 28 Jul '09

28 Jul '09

Author: wmb Date: 2009-07-28 03:16:15 +0200 (Tue, 28 Jul 2009) New Revision: 1254 Modified: cpu/x86/pc/olpc/HOWTO-keyjector cpu/x86/pc/olpc/security.fth Log: Fixed commentary typos. Tip o' the hat to James Cameron. Modified: cpu/x86/pc/olpc/HOWTO-keyjector =================================================================== --- cpu/x86/pc/olpc/HOWTO-keyjector 2009-07-24 19:41:31 UTC (rev 1253) +++ cpu/x86/pc/olpc/HOWTO-keyjector 2009-07-28 01:16:15 UTC (rev 1254) @@ -1,6 +1,6 @@ A keyjector is an intermediate firmware release that installs additional customer-specific security keys in manufacturing data. -OLPC signs is so it can be auto-reflashed. When it starts, it inserts +OLPC signs it so it can be auto-reflashed. When it starts, it inserts the new keys, then replaces itself with a higher-rev firmware version so it doesn't run again. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2009-07-24 19:41:31 UTC (rev 1253) +++ cpu/x86/pc/olpc/security.fth 2009-07-28 01:16:15 UTC (rev 1254) @@ -282,7 +282,7 @@ then ; -\ break$ splits a string into an initial substring of length n +\ cut$ splits a string into an initial substring of length n \ (head$) and the residual substring (tail$). If the input \ string is shorter than n, head$ is the input string and tail$ is \ the null string.

1 0

r1253 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 24 Jul '09

24 Jul '09

Author: wmb Date: 2009-07-24 21:41:31 +0200 (Fri, 24 Jul 2009) New Revision: 1253 Modified: cpu/x86/pc/olpc/via/versions.fth Log: Q3A06 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-07-24 19:39:14 UTC (rev 1252) +++ cpu/x86/pc/olpc/via/versions.fth 2009-07-24 19:41:31 UTC (rev 1253) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 05b +macro: FW_MINOR 06 \ The EC microcode macro: EC_VERSION 1_9_5

1 0

r1252 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 24 Jul '09

24 Jul '09

Author: wmb Date: 2009-07-24 21:39:14 +0200 (Fri, 24 Jul 2009) New Revision: 1252 Modified: cpu/x86/pc/olpc/via/ioinit.fth Log: Via ioinit - set IO-APIC register 03 in ioinit so it has the right value for resume from S3. Modified: cpu/x86/pc/olpc/via/ioinit.fth =================================================================== --- cpu/x86/pc/olpc/via/ioinit.fth 2009-07-24 19:38:21 UTC (rev 1251) +++ cpu/x86/pc/olpc/via/ioinit.fth 2009-07-24 19:39:14 UTC (rev 1252) @@ -323,3 +323,5 @@ \ acpi-io-base h# 26 + port-rb h# 07 bitset al dx out \ Settings to support C4 state acpi-io-base h# 26 + port-rb h# 06 bitset al dx out \ Settings to support C3 state acpi-io-base h# 4c + port-rl h# 400 bitset ax dx out \ Set USB power high + +3 # io-apic-mmio-base #) byte mov 1 # io-apic-mmio-base h# 10 + #) mov \ IO-APIC FSB delivery type

1 0

r1251 - cpu/x86/pc/olpc/via dev/hdaudio
by svn＠openfirmware.info 24 Jul '09

24 Jul '09

Author: wmb Date: 2009-07-24 21:38:21 +0200 (Fri, 24 Jul 2009) New Revision: 1251 Added: cpu/x86/pc/olpc/via/sound.fth Modified: cpu/x86/pc/olpc/via/fw.bth dev/hdaudio/conexant.fth dev/hdaudio/core.fth Log: Via audio - added completion alarm to stop startup sound. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-07-24 19:36:19 UTC (rev 1250) +++ cpu/x86/pc/olpc/via/fw.bth 2009-07-24 19:38:21 UTC (rev 1251) @@ -347,6 +347,7 @@ fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth +fload ${BP}/cpu/x86/pc/olpc/via/sound.fth fload ${BP}/cpu/x86/pc/olpc/security.fth fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth Added: cpu/x86/pc/olpc/via/sound.fth =================================================================== --- cpu/x86/pc/olpc/via/sound.fth (rev 0) +++ cpu/x86/pc/olpc/via/sound.fth 2009-07-24 19:38:21 UTC (rev 1251) @@ -0,0 +1,8 @@ +: audio-quiet ( -- ) + [ ' go-hook behavior compile, ] \ Chain to old behavior + audio-ih if + audio-ih close-dev + 0 to audio-ih + then +; +' audio-quiet to go-hook Modified: dev/hdaudio/conexant.fth =================================================================== --- dev/hdaudio/conexant.fth 2009-07-24 19:36:19 UTC (rev 1250) +++ dev/hdaudio/conexant.fth 2009-07-24 19:38:21 UTC (rev 1251) @@ -20,17 +20,6 @@ h# 10 to node h# 3a03e cmd h# 3903e cmd ; -: cx2058x-open ( -- ) - h# 10 to dac - h# 14 to adc - power-on-all - volume-on-all -; - -: cx2058x-close ( -- ) - 1 to node ( function group) power-off -; - h# 1a value mic-in \ Port B h# 1b value mic \ Port C h# 17 value mux \ mux between the two @@ -54,13 +43,109 @@ ; : cx2058x-disable-playback ( -- ) ; -: cx2058x-init ( -- ) +: 1/8" ( u -- u ) h# 10000 or ; +: green ( u -- u ) h# 4000 or ; +: pink ( u -- u ) h# 9000 or ; +: hp-out ( u -- u ) h# 200000 or ; +: spdiff-out ( u -- u ) h# 400000 or ; +: mic-in ( u -- u ) h# a00000 or ; +: line-in ( u -- u ) h# 800000 or ; +: line-out ( u -- u ) ; +: speaker ( u -- u ) h# 100000 or ; +: left ( u -- u ) h# 3000000 or ; +: front ( u -- u ) h# 2000000 or ; +: internal ( u -- u ) h# 10000000 or ; +: jack ( u -- u ) h# 00000000 or ; +: unused ( u -- u ) h# 40000000 or ; +: builtin ( u -- u ) h# 80000000 or ; + +: config( ( node -- null-config-default ) to node 0 ; + +: )config ( config-default -- ) + \ set the high 24 bits of the config-default value + \ the low 8 bits (default association, sequence) are preserved + 8 rshift dup h# ff and 71d00 or cmd + 8 rshift dup h# ff and 71e00 or cmd + 8 rshift h# ff and 71f00 or cmd +; + +: port-a ( -- u ) 19 config( 1/8" green left hp-out jack )config ; +: port-b ( -- u ) 1a config( 1/8" pink left mic-in jack )config ; +: port-c ( -- u ) 1b config( builtin front mic-in )config ; +: port-d ( -- u ) 1c config( unused line-out )config ; +: port-e ( -- u ) 1d config( unused line-out )config ; +: port-f ( -- u ) 1e config( 1/8" pink left line-in jack )config ; +: port-g ( -- u ) 1f config( builtin front speaker )config ; +: port-h ( -- u ) 20 config( unused spdiff-out )config ; +: port-i ( -- u ) 22 config( unused spdiff-out )config ; +: port-j ( -- u ) 23 config( unused mic-in )config ; + +: config-default ( -- u ) f1c00 cmd? ; + +: setup-config-default ( -- ) + port-a port-b port-c port-d port-e port-f port-g port-h port-i port-j +; + +: vendor-settings ( -- ) + h# 25 to node + h# 290a8 cmd \ high-pass filter, semi-manual mode, 600Hz cutoff + h# 34001 cmd \ speaker power 1 dB gain + h# 38001 cmd \ over-current / short-circuit protection, 2.6A threshold + h# 39019 cmd \ temperature protection at 130C + h# 42011 cmd \ over-temperature shutdown of class-D +; + +\ check (expect) that cmd yields value +: check-cmd ( value cmd -- ) + dup . ." cmd? => " + cmd? ( value actual ) + push-hex dup 0 <# # # # #> type pop-base ( value actual ) + over = if ( value ) + ." (ok)" drop + else + ." but expected " . + then + cr +; + +: over-temperature? ( -- ? ) h# c3000 cmd? 4 and 0<> ; + +\ Test word to make sure the right settings are configured +: .vendor-settings ( -- ) + h# 25 to node + h# 0a8 h# a9000 check-cmd + h# 001 h# b4000 check-cmd + h# 001 h# b8000 check-cmd + h# 019 h# b9000 check-cmd + h# 011 h# c2000 check-cmd + over-temperature? if + ." over temperature!" + else + ." temperature is within bounds + then +; + +: cx2058x-open ( -- ) + h# 10 to dac + h# 14 to adc + power-on-all + volume-on-all + vendor-settings + setup-config-default +; + +: cx2058x-close ( -- ) + 1 to node ( function group) power-off +; + +: cx2058x-init ( -- ) ['] cx2058x-open to open-codec ['] cx2058x-close to close-codec ['] cx2058x-enable-recording to enable-codec-recording ['] cx2058x-disable-recording to disable-codec-recording ['] cx2058x-enable-playback to enable-codec-playback ['] cx2058x-enable-playback to disable-codec-playback +\ setup-config-default ; \ LICENSE_BEGIN Modified: dev/hdaudio/core.fth =================================================================== --- dev/hdaudio/core.fth 2009-07-24 19:36:19 UTC (rev 1250) +++ dev/hdaudio/core.fth 2009-07-24 19:38:21 UTC (rev 1251) @@ -108,7 +108,7 @@ \ Stream descriptor register interface. \ There are multiple stream descriptors, each with their own register set. -0 constant sd# +0 instance value sd# : sd+ ( offset -- adr ) sd# h# 20 * + au + ; : sdctl h# 80 sd+ ; @@ -214,9 +214,17 @@ : deassert-stream-reset ( -- ) 0 sdctl rb! begin sdctl rb@ 1 and 0 = until ; : reset-stream ( -- ) assert-stream-reset deassert-stream-reset ; -: stop-stream ( -- ) 0 sdctl rb! begin sdctl rb@ 2 and 0= until ; : start-stream ( -- ) 2 sdctl rb! begin sdctl rb@ 2 and 0<> until ; +: stop-stream ( -- ) + 0 sdctl rb! begin sdctl rb@ 2 and 0= until + 4 sdsts rb! \ clear completion flag +; +defer playback-alarm + +: install-playback-alarm ( -- ) ['] playback-alarm d# 20 alarm ; +: uninstall-playback-alarm ( -- ) ['] playback-alarm d# 0 alarm ; + \ \ Device open and close : restart-controller ( -- ) reset start 1 ms ( 250us wait required ) ; @@ -225,7 +233,7 @@ : close-controller ( -- ) reset unmap-regs ; : open ( -- flag ) init-controller init-codec true ; -: close ( -- ) close-codec close-controller ; +: close ( -- ) uninstall-playback-alarm close-codec close-controller ; d# 48.000 value sample-rate @@ -233,7 +241,7 @@ : set-sample-rate ( Hz -- ) dup to sample-rate ( Hz ) - dup low-rate? if ( Hz ) + dup low-rate? if ( Hz ) 48kHz d# 48.000 swap / to scale-factor else ( Hz ) 1 to scale-factor @@ -267,7 +275,7 @@ 0 value pad-buffer 0 value pad-buffer-phys -d# 2048 value /pad-buffer +d# 8092 value /pad-buffer : alloc-pad-buffer ( -- ) /pad-buffer dma-alloc to pad-buffer @@ -329,7 +337,7 @@ /sound-buffer /pad-buffer + sdcbl rl! \ bytes of stream data h# 440000 sdctl rl! \ stream 4 1 sdlvi rw! \ two buffers - 1c sdsts c! \ clear status flags + 1c sdsts rb! \ clear status flags bdl-phys sdbdpl rl! 0 sdbdpu rl! stream-format sdfmt rw! @@ -401,7 +409,7 @@ : open-out ( -- ) 4 to sd# 48kHz - upsampling? if scale-factor upsample then ( adr len ) + upsampling? if scale-factor upsample then ( adr len ) ; : audio-out ( adr len -- actual ) @@ -415,7 +423,7 @@ : release-sound-buffer ( -- ) sound-buffer sound-buffer-phys /sound-buffer dma-map-out - upsampling? if sound-buffer /sound-buffer dma-free then + upsampling? if sound-buffer /sound-buffer dma-free then ; : write-done ( -- ) @@ -426,13 +434,21 @@ ; : write ( adr len -- actual ) - open-out audio-out + open-out audio-out install-playback-alarm ; -\ XXX remove when write is fixed to set up a completion handler -: wait-sound ( -- ) write-done ; - +\ Alarm handle to stop the stream when the content has been played. +: playback-completed-alarm ( -- ) + sd# ( sd# ) + 4 to sd# ( sd# ) + stream-done? if write-done then ( sd# ) + to sd# ( ) +; +' playback-completed-alarm is playback-alarm + +: wait-sound ( -- ) ; \ sound stops with asynchronous alarm handler + : set-volume ( dB -- ) dac to node step# output-gain ; \ \\ Recording @@ -484,6 +500,7 @@ : in-gain-steps ( -- n ) in-amp-caps 8 rshift h# 7f and 1+ ; : set-record-gain ( dB -- ) drop ( hardcoded for now ) adc to node h# 40 input-gain ; + \ LICENSE_BEGIN \ Copyright (c) 2009 Luke Gorrie <luke(a)bup.co.nz> \

1 0

r1250 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 24 Jul '09

24 Jul '09

Author: wmb Date: 2009-07-24 21:36:19 +0200 (Fri, 24 Jul 2009) New Revision: 1250 Modified: cpu/x86/pc/olpc/via/dsdt.dsl Log: Via ACPI DSDT - removed a spurious comment. Modified: cpu/x86/pc/olpc/via/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl 2009-07-24 19:35:51 UTC (rev 1249) +++ cpu/x86/pc/olpc/via/dsdt.dsl 2009-07-24 19:36:19 UTC (rev 1250) @@ -1808,7 +1808,6 @@ Name (_STA, 0x0F) } - // DDD geoderom has no battery stuff Name (BIFP, Package (0x0D) // Battery info (static) p 342 { One, // Power units - 1 : mAh / mA

1 0

r1249 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 24 Jul '09

24 Jul '09

Author: wmb Date: 2009-07-24 21:35:51 +0200 (Fri, 24 Jul 2009) New Revision: 1249 Modified: cpu/x86/pc/olpc/via/acpi.fth Log: Via ACPI - reset using EC cmd66(0xdb) instead of port 92. Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2009-07-22 07:29:06 UTC (rev 1248) +++ cpu/x86/pc/olpc/via/acpi.fth 2009-07-24 19:35:51 UTC (rev 1249) @@ -57,9 +57,9 @@ ( 06D 2 ) h# 0 w, \ Boot Architecture Flags ( 06F 1 ) h# 0 c, \ Reserved ( 070 4 ) h# 5a5 l, \ Flags - see below for bit definitions -( 074 12 ) 1 c, 8 c, 0 c, 1 c, h# 92. d, \ Reset register - I/O, 8 bits, 0 offset, byte access +( 074 12 ) 1 c, 8 c, 0 c, 1 c, h# 66. d, \ Reset register - I/O, 8 bits, 0 offset, byte access -( 080 1 ) h# 1 c, \ Reset value +( 080 1 ) h# db c, \ Reset value ( 081 3 ) 0 c, 0 c, 0 c, \ Reserved fadt set-acpi-table-length

1 0

OpenFirmware on Atom Z5xx/Poulsbo platform
by llandre 22 Jul '09

22 Jul '09

At the Small Form Factor Boards Conference in Munich, it will be presented an Atom/Poulsbo-based system running OpenFirmware as boot loader. For more details please visit: http://www.dave.eu/index.php?page=5&news=168&group=news&subgroup= Best regards, llandre DAVE Electronics System House - R&D Department web: http://www.dave.eu email: r&d2(a)dave-tech.it

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware July 2009