openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2103 - cpu/arm/olpc/1.75
by repository service 08 Jan '11

08 Jan '11

Author: wmb Date: Sat Jan 8 11:11:59 2011 New Revision: 2103 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2103 Log: OLPC XO-1.75 - Moved the codec-specific words from the sound driver into separate files for each of the two codec choices. Added: cpu/arm/olpc/1.75/alc5624.fth cpu/arm/olpc/1.75/alc5631.fth Modified: cpu/arm/olpc/1.75/sound.fth Added: cpu/arm/olpc/1.75/alc5624.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/alc5624.fth Sat Jan 8 11:11:59 2011 (r2103) @@ -0,0 +1,194 @@ +\ See license at end of file +purpose: Driver for Realtek ALC5624 audio CODEC chip + +: codec-bias-off ( -- ) + h# 8080 h# 02 codec-set + h# 8080 h# 04 codec-set + h# 0000 h# 3a codec! + h# 0000 h# 3c codec! + h# 0000 h# 3e codec! +; +: linux-codec-on + h# 0000 h# 26 codec! \ Don't power down any groups + h# 8000 h# 5e codec! \ Disable fast vref + h# 0c00 h# 3e codec! \ enable HP out volume power + h# 0002 h# 3a codec! \ enable Main bias + h# 2000 h# 3c codec! \ enable Vref + h# 6808 h# 0c codec! \ Stereo DAC Volume + h# 3f3f h# 14 codec! \ ADC Record Mixer Control + h# 4b40 h# 1c codec! \ Output Mixer Control + h# 0500 h# 22 codec! \ Microphone Control + h# 04e8 h# 40 codec! \ General Purpose Control +; +: codec-on ( -- ) + h# 0000 h# 26 codec! \ Don't power down any groups + h# 8002 h# 34 codec! \ Slave mode, 16 bits, left justified + b# 1000.1000.0011.1111 h# 3a codec! \ All on except MONO depop, 0-cross + b# 1010.0011.1111.0011 h# 3c codec! \ All on except ClassAB, PLL, speaker mixer, MONO mixer + b# 0011.1111.1100.1111 h# 3e codec! \ All on except MONO_OUT and PHONE in + h# 0140 h# 40 codec! \ MCLK is SYSCLK, HPamp Vmid 1.25, ClassDamp Vmid 1.5 +; +: codec-off ( -- ) + h# ef00 h# 26 codec! \ Power down everything +; +\ Mic bias 2 is for external mic +: mic-gain ( bits11:8 -- ) h# f00 h# 22 codec-field ; +: mic+0db ( -- ) 0 mic-gain ; \ Needed +: mic+20db ( -- ) h# 500 mic-gain ; \ Needed +: mic+30db ( -- ) h# a00 mic-gain ; +: mic+40db ( -- ) h# f00 mic-gain ; + +: mic-bias-off ( -- ) h# 000c h# 3a codec-clr ; +: mic-bias-on ( -- ) h# 000c h# 3a codec-set ; + +: mic1-high-bias ( -- ) h# 20 h# 22 codec-clr mic-bias-on ; \ 0.90*AVDD, e.g. 3V with AVDD=3.3V +: mic1-low-bias ( -- ) h# 20 h# 22 codec-set mic-bias-on ; \ 0.75*AVDD, e.g. 2.5V with AVDD=3.3V +: mic2-high-bias ( -- ) h# 10 h# 22 codec-clr mic-bias-on ; \ 0.90*AVDD, e.g. 3V with AVDD=3.3V +: mic2-low-bias ( -- ) h# 21 h# 22 codec-set mic-bias-on ; \ 0.75*AVDD, e.g. 2.5V with AVDD=3.3V + +\ The mic bias short circuit detection threshold can be set with reg 0x22 bits 1:0 - +\ 00:600uA 01:1200uA 1x:1800uA +\ 600uA is probably good for OLPC, since the 5.6K bias resistor limits the SC current to less than that. + +\ Sets both speakers simultaneously +: speakers-source ( value -- ) h# d800 h# 1c codec-field ; + +: speakers-off ( -- ) 0 speakers-source ; +: hp-mixer>speakers ( -- ) h# 4800 speakers-source ; +: speaker-mixer>speakers ( -- ) h# 9000 speakers-source ; +: mono>speakers ( -- ) h# d800 speakers-source ; + +: class-ab-speakers ( -- ) h# 2000 h# 1c codec-clr ; +: class-d-speakers ( -- ) h# 2000 h# 1c codec-set ; + +: headphones-off ( -- ) h# 300 h# 1c codec-clr ; +: headphones-on ( -- ) h# 300 h# 1c codec-set ; + +0 [if] \ OLPC does not connect the MONO output +: mono-source ( value -- ) h# c0 h# 1c codec-field ; +: mono-off ( -- ) 0 mono-source ; +: hp-mixer>mono ( -- ) h# 40 mono-source ; +: speaker-mixer>mono ( -- ) h# 80 mono-source ; +: mono-mixer>mono ( -- ) h# c0 mono-source ; +[then] + +: headphones-inserted? ( -- flag ) h# 54 codec@ 2 and 0<> ; + +\ The range is from -34.5 db to +12 dB +: gain>lr ( db -- true | regval false ) + 2* 3 / ( steps ) \ Converts -34.5 .. 12 db to -23 .. 8 steps + dup d# -23 < if ( steps ) + drop true + else ( steps ) + 8 swap - ( -steps ) + 0 max ( clipped-steps ) + dup 8 lshift or ( regval ) + false + then +; +\ The range is from -46.5 db to 0 dB +: >output-volume ( db -- regval mask ) + d# 12 + \ Bias to the range used by gain>lr + gain>lr if h# 8080 then h# 9f9f +; +: set-speaker-volume ( n -- ) >output-volume 2 codec-field ; +: set-headphone-volume ( n -- ) >output-volume 4 codec-field ; +\ : set-mono-volume ( n -- ) >output-volume 6 codec-field ; +: set-volume ( n -- ) + dup set-speaker-volume set-headphone-volume +; +d# 0 constant default-adc-gain \ 0 dB - range is -16.5 to +30 +d# 0 constant default-dac-gain \ 0 dB - range is -34.5 to +12 +d# 44 constant default-mic-gain \ 44 dB - range is -34.5 to +d# 0 constant default-speaker-volume \ 0 dB - range is -46.5 to 0 +d# 0 constant default-headphone-volume \ 0 dB - range is -46.5 to 0 + +: select-headphones ( -- ) h# 300 h# 1c codec! ; +: select-speakers-ab ( -- ) h# 4800 h# 1c codec! ; \ ClassAB, headphone mixer +: select-speakers ( -- ) h# 6800 h# 1c codec! ; \ ClassD, headphone mixer + +: set-line-in-gain ( n -- ) + gain>lr if h# e000 then h# ff1f h# 0a codec-field +; +: set-dac-gain ( n -- ) + gain>lr if h# e000 then h# ff1f h# 0c codec-field +; +false value external-mic? +: mic-routing ( -- n ) + \ Mute selected MIC inputs to the ADC as follows: + \ For external, we send MIC1 to left and MIC2 to right + \ For internal, we send MIC1 to both left and right + external-mic? if h# 2040 else h# 2020 then +; +: set-mic-boost ( db -- db' ) + dup d# 26 > if mic+40db d# 40 - exit then + dup d# 16 > if mic+30db d# 30 - exit then + dup d# 06 > if mic+20db d# 20 - exit then + mic+0db +; +: set-mic-gain ( db -- ) + set-mic-boost ( db' ) + gain>lr if ( ) \ Mute + \ Turn everything off + mic-bias-off ( ) + 0 h# 6060 h# e0e0 ( gain adc-mute mic-output-mute ) + else ( gain ) + mic-bias-on ( gain ) + \ Mic routing to ADC depends on internal or external mic + mic-routing ( gain adc-mute ) + \ To avoid feedback, we do not feedthrough the mic + h# e0e0 ( gain adc-mute mic-output-mute ) + then ( gain adc-mute mic-output-mute ) + h# e0e0 h# 10 codec-field ( gain adc-mute ) + h# 6060 h# 14 codec-field ( gain ) + h# 1f1f h# 0e codec-field +; +: set-adc-gain ( db -- ) \ Range is -16.5 dB to +30 dB + d# 18 - ( db' ) + gain>lr if 0 then ( gain ) + h# f9f h# 12 codec-field + h# 60 h# 12 codec-set \ Enable ADC zero-cross detectors +; +: set-default-gains ( -- ) + headphones-inserted? if select-headphones else select-speakers then + default-speaker-volume set-speaker-volume + default-headphone-volume set-headphone-volume + default-dac-gain set-dac-gain + default-mic-gain set-mic-gain + default-adc-gain set-adc-gain +; + +: set-codec-sample-rate ( rate -- ) + case + d# 8000 of h# 2222 h# 5272 endof + d# 16000 of h# 2020 h# 2272 endof + d# 32000 of h# 2121 h# 2172 endof + d# 48000 of h# 0000 h# 3072 endof + ( default ) true abort" Unsupported audio sample rate" + endcase ( reg62val2 reg60val ) + h# 60 codec! h# 62 codec! +; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/arm/olpc/1.75/alc5631.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/alc5631.fth Sat Jan 8 11:11:59 2011 (r2103) @@ -0,0 +1,200 @@ +\ See license at end of file +purpose: Driver for Realtek ALC5631Q audio CODEC chip + +: codec-on ( -- ) + h# 8001 h# 34 codec! \ Slave mode, 16 bits, left justified + b# 1001.1111.1110.0000 h# 3a codec! \ All on + b# 1111.1100.0011.1100 h# 3b codec! \ All on except PLL + b# 1010.0000.0001.1101 h# 3c codec! \ All on except AX and MONO + b# 1111.1100.0000.0000 h# 3e codec! \ AXI and MONO IN off +\ h# 8c00 h# 40 codec! \ Speaker Amp Auto Ratio GAIN, use HPFs + h# 8000 h# 40 codec! \ Speaker Amp Auto Ratio GAIN, no HPFs + h# 0000 h# 42 codec! \ Use MCLK, not PLL + b# 1110.1100.1001.0000 h# 52 codec! \ Protection on + h# 4000 h# 56 codec! \ Power on Cap-free block with de-pop +; +: codec-off ( -- ) + 0 h# 3a codec! \ All off + 0 h# 3b codec! \ All off + 0 h# 3c codec! \ All off + 0 h# 3e codec! \ All off +; +: 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 + +\ The range is from -46.5 db to +12 dB +: gain>lr-12 ( db -- true | regval false ) + d# 12 min ( db' ) + 2* 3 / ( steps ) \ Converts -46.5 .. 12 db to -31 .. 8 steps + dup d# -31 < if ( steps ) + drop true + else ( steps ) + 8 swap - ( -steps ) + 0 max ( clipped-steps ) + dup 8 lshift or ( regval ) + false + then +; +\ The range is from -46.5 db to 0 dB +: gain>lr ( db -- true | regval false ) + 0 min ( db' ) + 2* 3 / ( steps ) \ Converts -46.5 .. 12 db to -31 .. 8 steps + dup d# -31 < if ( steps ) + drop true + else ( steps ) + 0 swap - ( -steps ) + 0 max ( clipped-steps ) + dup 8 lshift or ( regval ) + false + then +; + +\ This sets up a simple routing from the DAC to the headphone and speaker outputs +: output-config ( -- ) + h# df00 h# 1a codec! \ DACL -> OUTMIXL + h# df00 h# 1c codec! \ DACR -> OUTMIXR + h# 4040 h# 04 codec-set \ OUTMIXLR -> HPOVOLLR + h# d0d0 h# 28 codec! \ DACLR -> SPKMIXLR + h# 4040 h# 02 codec-set \ SPKMIXLR -> SPKVOLLR + h# 9000 h# 2a codec! \ SPKVOLL -> SPOLMIX, SPKVOLR -> SPORMIX + h# 0000 h# 2c codec! \ SPOxMIX -> SPKRMUX, HPOVOL -> HPMUX +; + +: mute-speakers ( -- ) h# 8080 2 codec-set ; +: set-speaker-volume ( n -- ) \ DONE + gain>lr-12 if h# 8080 then h# bfbf 2 codec-field +; +: mute-headphones ( -- ) h# 8080 4 codec-set ; +: set-headphone-volume ( n -- ) \ DONE + gain>lr if h# 8080 then h# 9f9f 4 codec-field +; +: set-volume ( n -- ) + headphones-inserted? if + set-headphone-volume + else + set-speaker-volume + then +; +d# 0 constant default-adc-gain \ 0 dB - range is -96.625 to +28.5 +d# 0 constant default-dac-gain \ 0 dB - range is -96.625 to +28.5 +d# 44 constant default-mic-gain \ 44 dB - range is 0 to 50 dB +d# 0 constant default-speaker-volume \ 0 dB - range is -46.5 to +12 +d# -10 constant default-headphone-volume \ -10 dB - range is -46.5 to 0 + +: adc-mute-all ( -- ) h# f0f0 h# 14 codec! ; +: adc-mute-mic ( -- ) h# 4040 h# 14 codec-set ; +: adc-unmute-mic ( -- ) h# 4040 h# 14 codec-clr ; +\ : adc-unmute-outmix ( -- ) h# 8080 h# 14 codec-clr ; + +\ The useful one is outmix-unmute-dac +: outmix-mute-all ( -- ) h# ff00 dup h# 1a codec! h# 1c codec! ; +: outmix-mute-mic ( -- ) h# 1000 dup h# 1a codec-set h# 1c codec-set ; +: outmix-unmute-mic ( -- ) h# 1000 dup h# 1a codec-clr h# 1c codec-clr ; +: outmix-mute-dac ( -- ) h# 2000 dup h# 1a codec-set h# 1c codec-set ; +: outmix-unmute-dac ( -- ) h# 2000 dup h# 1a codec-clr h# 1c codec-clr ; +: outmix-mute-recmix ( -- ) h# 8000 dup h# 1a codec-set h# 1c codec-set ; +: outmix-unmute-recmix ( -- ) h# 8000 dup h# 1a codec-clr h# 1c codec-clr ; + +: gain>lr-3/8 ( -- lrgain boost ) + d# 28 min + dup 0>= if ( n ) + 8 3 */ ( boost ) \ Convert to .375 dB increments + 0 swap ( lrgain boost ) + else ( n ) + dup d# -96 <= if ( n ) + drop ( ) + h# ffff h# 8080 ( lrgain boost ) + else ( n ) + negate 8 3 */ ( steps ) + dup bwjoin ( lrgain ) + 0 ( lrgain boost ) + then ( lrgain boost ) + then ( lrgain boost ) +; +: set-dac-gain ( n -- ) + dup d# -96 < if outmix-mute-dac else outmix-unmute-dac then + gain>lr-3/8 h# 0c codec! h# 10 codec! +; +: set-adc-gain ( n -- ) + gain>lr-3/8 h# 12 codec! h# 16 codec! +; +: mic1-balanced ( -- ) h# 8000 h# 8000 h# 0e codec-field ; +: mic1-single-ended ( -- ) 0 h# 8000 h# 0e codec-field ; +: mic2-balanced ( -- ) h# 0080 h# 0080 h# 0e codec-field ; +: mic2-single-ended ( -- ) 0 h# 0080 h# 0e codec-field ; + +false value external-mic? +: mic-routing ( -- n ) + mic1-single-ended mic2-single-ended + adc-unmute-mic +; +: db>mic-boost ( db -- code ) + dup d# 52 >= if drop h# 8800 exit then + dup d# 50 >= if drop h# 7700 exit then + dup d# 44 >= if drop h# 6600 exit then + dup d# 40 >= if drop h# 5500 exit then + dup d# 35 >= if drop h# 4400 exit then + dup d# 30 >= if drop h# 3300 exit then + dup d# 24 >= if drop h# 2200 exit then + dup d# 20 >= if drop h# 1100 exit then + drop h# 0000 +; +: set-mic-gain ( db -- ) + db>mic-boost h# ff00 h# 22 codec-field + mic-routing +; +: mic+0db ( -- ) 0 set-mic-gain ; +: mic+20db ( -- ) d# 20 set-mic-gain ; +: set-default-gains ( -- ) + output-config + headphones-inserted? if + default-headphone-volume set-headphone-volume + mute-speakers + else + default-speaker-volume set-speaker-volume + mute-headphones + then + default-dac-gain set-dac-gain + default-mic-gain set-mic-gain + default-adc-gain set-adc-gain +; + +: set-codec-sample-rate ( rate -- ) + case + d# 8000 of h# 2222 h# 5272 endof + d# 16000 of h# 2020 h# 2272 endof + d# 32000 of h# 2121 h# 2172 endof + d# 48000 of h# 0000 h# 3072 endof + ( default ) true abort" Unsupported audio sample rate" + endcase ( reg62val2 reg60val ) + h# 60 codec! h# 62 codec! +; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Sat Jan 8 10:49:39 2011 (r2102) +++ cpu/arm/olpc/1.75/sound.fth Sat Jan 8 11:11:59 2011 (r2103) @@ -187,62 +187,6 @@ r> codec! ( ) ; -: codec-bias-off ( -- ) -[ifdef] cl2-a1 - h# 8080 h# 02 codec-set -[else] - h# c0c0 h# 02 codec-set -[then] - h# 8080 h# 04 codec-set - h# 0000 h# 3a codec! - h# 0000 h# 3c codec! - h# 0000 h# 3e codec! -; -: linux-codec-on - h# 0000 h# 26 codec! \ Don't power down any groups - h# 8000 h# 5e codec! \ Disable fast vref - h# 0c00 h# 3e codec! \ enable HP out volume power - h# 0002 h# 3a codec! \ enable Main bias - h# 2000 h# 3c codec! \ enable Vref - h# 6808 h# 0c codec! \ Stereo DAC Volume - h# 3f3f h# 14 codec! \ ADC Record Mixer Control - h# 4b40 h# 1c codec! \ Output Mixer Control - h# 0500 h# 22 codec! \ Microphone Control - h# 04e8 h# 40 codec! \ General Purpose Control -; -: codec-on ( -- ) -[ifdef] cl2-a1 - h# 30 1 set-twsi-target - h# 0000 h# 26 codec! \ Don't power down any groups - h# 8002 h# 34 codec! \ Slave mode, 16 bits, left justified - b# 1000.1000.0011.1111 h# 3a codec! \ All on except MONO depop, 0-cross - b# 1010.0011.1111.0011 h# 3c codec! \ All on except ClassAB, PLL, speaker mixer, MONO mixer - b# 0011.1111.1100.1111 h# 3e codec! \ All on except MONO_OUT and PHONE in - h# 0140 h# 40 codec! \ MCLK is SYSCLK, HPamp Vmid 1.25, ClassDamp Vmid 1.5 -[else] - h# 34 1 set-twsi-target - h# 8001 h# 34 codec! \ Slave mode, 16 bits, left justified - b# 1001.1111.1110.0000 h# 3a codec! \ All on - b# 1111.1100.0011.1100 h# 3b codec! \ All on except PLL - b# 1010.0000.0001.1101 h# 3c codec! \ All on except AX and MONO - b# 1111.1100.0000.0000 h# 3e codec! \ AXI and MONO IN off -\ h# 8c00 h# 40 codec! \ Speaker Amp Auto Ratio GAIN, use HPFs - h# 8000 h# 40 codec! \ Speaker Amp Auto Ratio GAIN, no HPFs - h# 0000 h# 42 codec! \ Use MCLK, not PLL - b# 1110.1100.1001.0000 h# 52 codec! \ Protection on - h# 4000 h# 56 codec! \ Power on Cap-free block with de-pop -[then] -; -: codec-off ( -- ) -[ifdef] cl2-a1 - h# ef00 h# 26 codec! \ Power down everything -[else] - 0 h# 3a codec! \ All off - 0 h# 3b codec! \ All off - 0 h# 3c codec! \ All off - 0 h# 3e codec! \ All off -[then] -; d# 48000 value sample-rate \ Longest time to wait for a buffer event - a little more @@ -250,20 +194,18 @@ \ at the current sample rate. 0 value buf-timeout -: set-sample-rate ( rate -- ) - to sample-rate - sample-rate case - d# 8000 of h# 2222 h# 5272 d# 48 d# 129 endof - d# 16000 of h# 2020 h# 2272 d# 24 d# 65 endof - d# 32000 of h# 2121 h# 2172 d# 12 d# 33 endof - d# 48000 of h# 0000 h# 3072 d# 8 d# 23 endof +: set-ctlr-sample-rate ( rate -- ) + case + d# 8000 of d# 48 d# 129 endof + d# 16000 of d# 24 d# 65 endof + d# 32000 of d# 12 d# 33 endof + d# 48000 of d# 8 d# 23 endof ( default ) true abort" Unsupported audio sample rate" - endcase ( reg62val2 reg60val sspareg34val timeout ) + endcase ( sspareg34val timeout ) to buf-timeout - 9 lshift h# 183 or h# 34 sspa! h# 60 codec! h# 62 codec! + 9 lshift h# 183 or h# 34 sspa! ; -\ Mic bias 2 is for external mic \ I think we don't need to use the audio PLL, because we are using the PMUM M/N divider \ DIV_MCL 0 DIV_FBCLK 01 FRACT 00da1 \ POSTDIV 1 DIV_OCLK_MODULO 000 (NA) DIV_OCLK_PATTERN 00 (NA) @@ -404,262 +346,24 @@ [then] [ifdef] cl2-a1 -\ Realtek ALC5624 CODEC -: mic-gain ( bits11:8 -- ) h# f00 h# 22 codec-field ; -: mic+0db ( -- ) 0 mic-gain ; \ Needed -: mic+20db ( -- ) h# 500 mic-gain ; \ Needed -: mic+30db ( -- ) h# a00 mic-gain ; -: mic+40db ( -- ) h# f00 mic-gain ; - -: mic-bias-off ( -- ) h# 000c h# 3a codec-clr ; -: mic-bias-on ( -- ) h# 000c h# 3a codec-set ; - -: mic1-high-bias ( -- ) h# 20 h# 22 codec-clr mic-bias-on ; \ 0.90*AVDD, e.g. 3V with AVDD=3.3V -: mic1-low-bias ( -- ) h# 20 h# 22 codec-set mic-bias-on ; \ 0.75*AVDD, e.g. 2.5V with AVDD=3.3V -: mic2-high-bias ( -- ) h# 10 h# 22 codec-clr mic-bias-on ; \ 0.90*AVDD, e.g. 3V with AVDD=3.3V -: mic2-low-bias ( -- ) h# 21 h# 22 codec-set mic-bias-on ; \ 0.75*AVDD, e.g. 2.5V with AVDD=3.3V - -\ The mic bias short circuit detection threshold can be set with reg 0x22 bits 1:0 - -\ 00:600uA 01:1200uA 1x:1800uA -\ 600uA is probably good for OLPC, since the 5.6K bias resistor limits the SC current to less than that. - -\ Sets both speakers simultaneously -: speakers-source ( value -- ) h# d800 h# 1c codec-field ; - -: speakers-off ( -- ) 0 speakers-source ; -: hp-mixer>speakers ( -- ) h# 4800 speakers-source ; -: speaker-mixer>speakers ( -- ) h# 9000 speakers-source ; -: mono>speakers ( -- ) h# d800 speakers-source ; - -: class-ab-speakers ( -- ) h# 2000 h# 1c codec-clr ; -: class-d-speakers ( -- ) h# 2000 h# 1c codec-set ; - -: headphones-off ( -- ) h# 300 h# 1c codec-clr ; -: headphones-on ( -- ) h# 300 h# 1c codec-set ; - -0 [if] \ OLPC does not connect the MONO output -: mono-source ( value -- ) h# c0 h# 1c codec-field ; -: mono-off ( -- ) 0 mono-source ; -: hp-mixer>mono ( -- ) h# 40 mono-source ; -: speaker-mixer>mono ( -- ) h# 80 mono-source ; -: mono-mixer>mono ( -- ) h# c0 mono-source ; -[then] +: init-smbus ( -- ) h# 30 1 set-twsi-target ; -: headphones-inserted? ( -- flag ) h# 54 codec@ 2 and 0<> ; - -\ The range is from -34.5 db to +12 dB -: gain>lr ( db -- true | regval false ) - 2* 3 / ( steps ) \ Converts -34.5 .. 12 db to -23 .. 8 steps - dup d# -23 < if ( steps ) - drop true - else ( steps ) - 8 swap - ( -steps ) - 0 max ( clipped-steps ) - dup 8 lshift or ( regval ) - false - then -; -\ The range is from -46.5 db to 0 dB -: >output-volume ( db -- regval mask ) - d# 12 + \ Bias to the range used by gain>lr - gain>lr if h# 8080 then h# 9f9f -; -: set-speaker-volume ( n -- ) >output-volume 2 codec-field ; -: set-headphone-volume ( n -- ) >output-volume 4 codec-field ; -\ : set-mono-volume ( n -- ) >output-volume 6 codec-field ; -: set-volume ( n -- ) - dup set-speaker-volume set-headphone-volume -; -d# 0 constant default-adc-gain \ 0 dB - range is -16.5 to +30 -d# 0 constant default-dac-gain \ 0 dB - range is -34.5 to +12 -d# 44 constant default-mic-gain \ 44 dB - range is -34.5 to -d# 0 constant default-speaker-volume \ 0 dB - range is -46.5 to 0 -d# 0 constant default-headphone-volume \ 0 dB - range is -46.5 to 0 - -: select-headphones ( -- ) h# 300 h# 1c codec! ; -: select-speakers-ab ( -- ) h# 4800 h# 1c codec! ; \ ClassAB, headphone mixer -: select-speakers ( -- ) h# 6800 h# 1c codec! ; \ ClassD, headphone mixer - -: set-line-in-gain ( n -- ) - gain>lr if h# e000 then h# ff1f h# 0a codec-field -; -: set-dac-gain ( n -- ) - gain>lr if h# e000 then h# ff1f h# 0c codec-field -; -false value external-mic? -: mic-routing ( -- n ) - \ Mute selected MIC inputs to the ADC as follows: - \ For external, we send MIC1 to left and MIC2 to right - \ For internal, we send MIC1 to both left and right - external-mic? if h# 2040 else h# 2020 then -; -: set-mic-boost ( db -- db' ) - dup d# 26 > if mic+40db d# 40 - exit then - dup d# 16 > if mic+30db d# 30 - exit then - dup d# 06 > if mic+20db d# 20 - exit then - mic+0db -; -: set-mic-gain ( db -- ) - set-mic-boost ( db' ) - gain>lr if ( ) \ Mute - \ Turn everything off - mic-bias-off ( ) - 0 h# 6060 h# e0e0 ( gain adc-mute mic-output-mute ) - else ( gain ) - mic-bias-on ( gain ) - \ Mic routing to ADC depends on internal or external mic - mic-routing ( gain adc-mute ) - \ To avoid feedback, we do not feedthrough the mic - h# e0e0 ( gain adc-mute mic-output-mute ) - then ( gain adc-mute mic-output-mute ) - h# e0e0 h# 10 codec-field ( gain adc-mute ) - h# 6060 h# 14 codec-field ( gain ) - h# 1f1f h# 0e codec-field -; -: set-adc-gain ( db -- ) \ Range is -16.5 dB to +30 dB - d# 18 - ( db' ) - gain>lr if 0 then ( gain ) - h# f9f h# 12 codec-field - h# 60 h# 12 codec-set \ Enable ADC zero-cross detectors -; +fload ${BP}/cpu/arm/olpc/1.75/alc5624.fth \ Realtek ALC5624 CODEC [else] -\ Realtek ALC5631Q CODEC -: 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 +: init-smbus ( -- ) h# 34 1 set-twsi-target ; : headphones-inserted? ( -- flag ) d# 97 gpio-pin@ ; : microphone-inserted? ( -- flag ) d# 96 gpio-pin@ ; -\ The range is from -46.5 db to +12 dB -: gain>lr-12 ( db -- true | regval false ) - d# 12 min ( db' ) - 2* 3 / ( steps ) \ Converts -46.5 .. 12 db to -31 .. 8 steps - dup d# -31 < if ( steps ) - drop true - else ( steps ) - 8 swap - ( -steps ) - 0 max ( clipped-steps ) - dup 8 lshift or ( regval ) - false - then -; -\ The range is from -46.5 db to 0 dB -: gain>lr ( db -- true | regval false ) - 0 min ( db' ) - 2* 3 / ( steps ) \ Converts -46.5 .. 12 db to -31 .. 8 steps - dup d# -31 < if ( steps ) - drop true - else ( steps ) - 0 swap - ( -steps ) - 0 max ( clipped-steps ) - dup 8 lshift or ( regval ) - false - then -; - -\ This sets up a simple routing from the DAC to the headphone and speaker outputs -: output-config ( -- ) - h# df00 h# 1a codec! \ DACL -> OUTMIXL - h# df00 h# 1c codec! \ DACR -> OUTMIXR - h# 4040 h# 04 codec-set \ OUTMIXLR -> HPOVOLLR - h# d0d0 h# 28 codec! \ DACLR -> SPKMIXLR - h# 4040 h# 02 codec-set \ SPKMIXLR -> SPKVOLLR - h# 9000 h# 2a codec! \ SPKVOLL -> SPOLMIX, SPKVOLR -> SPORMIX - h# 0000 h# 2c codec! \ SPOxMIX -> SPKRMUX, HPOVOL -> HPMUX -; - -: mute-speakers ( -- ) h# 8080 2 codec-set ; -: set-speaker-volume ( n -- ) \ DONE - gain>lr-12 if h# 8080 then h# bfbf 2 codec-field -; -: mute-headphones ( -- ) h# 8080 4 codec-set ; -: set-headphone-volume ( n -- ) \ DONE - gain>lr if h# 8080 then h# 9f9f 4 codec-field -; -: set-volume ( n -- ) - headphones-inserted? if - set-headphone-volume - else - set-speaker-volume - then -; -d# 0 constant default-adc-gain \ 0 dB - range is -96.625 to +28.5 -d# 0 constant default-dac-gain \ 0 dB - range is -96.625 to +28.5 -d# 44 constant default-mic-gain \ 44 dB - range is 0 to 50 dB -d# 0 constant default-speaker-volume \ 0 dB - range is -46.5 to +12 -d# -10 constant default-headphone-volume \ -10 dB - range is -46.5 to 0 - -: adc-mute-all ( -- ) h# f0f0 h# 14 codec! ; -: adc-mute-mic ( -- ) h# 4040 h# 14 codec-set ; -: adc-unmute-mic ( -- ) h# 4040 h# 14 codec-clr ; -\ : adc-unmute-outmix ( -- ) h# 8080 h# 14 codec-clr ; - -\ The useful one is outmix-unmute-dac -: outmix-mute-all ( -- ) h# ff00 dup h# 1a codec! h# 1c codec! ; -: outmix-mute-mic ( -- ) h# 1000 dup h# 1a codec-set h# 1c codec-set ; -: outmix-unmute-mic ( -- ) h# 1000 dup h# 1a codec-clr h# 1c codec-clr ; -: outmix-mute-dac ( -- ) h# 2000 dup h# 1a codec-set h# 1c codec-set ; -: outmix-unmute-dac ( -- ) h# 2000 dup h# 1a codec-clr h# 1c codec-clr ; -: outmix-mute-recmix ( -- ) h# 8000 dup h# 1a codec-set h# 1c codec-set ; -: outmix-unmute-recmix ( -- ) h# 8000 dup h# 1a codec-clr h# 1c codec-clr ; - -: gain>lr-3/8 ( -- lrgain boost ) - d# 28 min - dup 0>= if ( n ) - 8 3 */ ( boost ) \ Convert to .375 dB increments - 0 swap ( lrgain boost ) - else ( n ) - dup d# -96 <= if ( n ) - drop ( ) - h# ffff h# 8080 ( lrgain boost ) - else ( n ) - negate 8 3 */ ( steps ) - dup bwjoin ( lrgain ) - 0 ( lrgain boost ) - then ( lrgain boost ) - then ( lrgain boost ) -; -: set-dac-gain ( n -- ) - dup d# -96 < if outmix-mute-dac else outmix-unmute-dac then - gain>lr-3/8 h# 0c codec! h# 10 codec! -; -: set-adc-gain ( n -- ) - gain>lr-3/8 h# 12 codec! h# 16 codec! -; -: mic1-balanced ( -- ) h# 8000 h# 8000 h# 0e codec-field ; -: mic1-single-ended ( -- ) 0 h# 8000 h# 0e codec-field ; -: mic2-balanced ( -- ) h# 0080 h# 0080 h# 0e codec-field ; -: mic2-single-ended ( -- ) 0 h# 0080 h# 0e codec-field ; - -false value external-mic? -: mic-routing ( -- n ) - mic1-single-ended mic2-single-ended - adc-unmute-mic -; -: db>mic-boost ( db -- code ) - dup d# 52 >= if drop h# 8800 exit then - dup d# 50 >= if drop h# 7700 exit then - dup d# 44 >= if drop h# 6600 exit then - dup d# 40 >= if drop h# 5500 exit then - dup d# 35 >= if drop h# 4400 exit then - dup d# 30 >= if drop h# 3300 exit then - dup d# 24 >= if drop h# 2200 exit then - dup d# 20 >= if drop h# 1100 exit then - drop h# 0000 -; -: set-mic-gain ( db -- ) - db>mic-boost h# ff00 h# 22 codec-field - mic-routing -; -: mic+0db ( -- ) 0 set-mic-gain ; -: mic+20db ( -- ) d# 20 set-mic-gain ; +fload ${BP}/cpu/arm/olpc/1.75/alc5631.fth \ Realtek ALC5631Q CODEC [then] +: set-sample-rate ( rate -- ) + dup to sample-rate + dup set-ctlr-sample-rate + set-codec-sample-rate +; + \ This is called from "record" in "mic-test" in "selftest" : set-record-gain ( db -- ) \ translate value from ac97 selftest code into our default value @@ -674,24 +378,9 @@ : mono ; : init-codec ( -- ) + init-smbus codec-on -[ifdef] cl2-a1 - headphones-inserted? if select-headphones else select-speakers then - default-speaker-volume set-speaker-volume - default-headphone-volume set-headphone-volume -[else] - output-config - headphones-inserted? if - default-headphone-volume set-headphone-volume - mute-speakers - else - default-speaker-volume set-speaker-volume - mute-headphones - then -[then] - default-dac-gain set-dac-gain - default-mic-gain set-mic-gain - default-adc-gain set-adc-gain + set-default-gains d# 48000 set-sample-rate ; 0 value open-count @@ -712,3 +401,27 @@ fload ${BP}/dev/geode/ac97/selftest.fth end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

[commit] r2102 - cpu/arm/olpc/1.75
by repository service 08 Jan '11

08 Jan '11

Author: wmb Date: Sat Jan 8 10:49:39 2011 New Revision: 2102 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2102 Log: OLPC XO-1.75 A2 - support Realtek ALC5631Q CODEC Modified: cpu/arm/olpc/1.75/sound.fth Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Sat Jan 8 10:28:40 2011 (r2101) +++ cpu/arm/olpc/1.75/sound.fth Sat Jan 8 10:49:39 2011 (r2102) @@ -188,7 +188,11 @@ ; : codec-bias-off ( -- ) +[ifdef] cl2-a1 h# 8080 h# 02 codec-set +[else] + h# c0c0 h# 02 codec-set +[then] h# 8080 h# 04 codec-set h# 0000 h# 3a codec! h# 0000 h# 3c codec! @@ -196,7 +200,7 @@ ; : linux-codec-on h# 0000 h# 26 codec! \ Don't power down any groups - h# 8000 h# 53 codec! \ Disable fast vref + h# 8000 h# 5e codec! \ Disable fast vref h# 0c00 h# 3e codec! \ enable HP out volume power h# 0002 h# 3a codec! \ enable Main bias h# 2000 h# 3c codec! \ enable Vref @@ -207,6 +211,7 @@ h# 04e8 h# 40 codec! \ General Purpose Control ; : codec-on ( -- ) +[ifdef] cl2-a1 h# 30 1 set-twsi-target h# 0000 h# 26 codec! \ Don't power down any groups h# 8002 h# 34 codec! \ Slave mode, 16 bits, left justified @@ -214,9 +219,29 @@ b# 1010.0011.1111.0011 h# 3c codec! \ All on except ClassAB, PLL, speaker mixer, MONO mixer b# 0011.1111.1100.1111 h# 3e codec! \ All on except MONO_OUT and PHONE in h# 0140 h# 40 codec! \ MCLK is SYSCLK, HPamp Vmid 1.25, ClassDamp Vmid 1.5 +[else] + h# 34 1 set-twsi-target + h# 8001 h# 34 codec! \ Slave mode, 16 bits, left justified + b# 1001.1111.1110.0000 h# 3a codec! \ All on + b# 1111.1100.0011.1100 h# 3b codec! \ All on except PLL + b# 1010.0000.0001.1101 h# 3c codec! \ All on except AX and MONO + b# 1111.1100.0000.0000 h# 3e codec! \ AXI and MONO IN off +\ h# 8c00 h# 40 codec! \ Speaker Amp Auto Ratio GAIN, use HPFs + h# 8000 h# 40 codec! \ Speaker Amp Auto Ratio GAIN, no HPFs + h# 0000 h# 42 codec! \ Use MCLK, not PLL + b# 1110.1100.1001.0000 h# 52 codec! \ Protection on + h# 4000 h# 56 codec! \ Power on Cap-free block with de-pop +[then] ; : codec-off ( -- ) +[ifdef] cl2-a1 h# ef00 h# 26 codec! \ Power down everything +[else] + 0 h# 3a codec! \ All off + 0 h# 3b codec! \ All off + 0 h# 3c codec! \ All off + 0 h# 3e codec! \ All off +[then] ; d# 48000 value sample-rate @@ -378,6 +403,8 @@ \ Page 1498 - The data transmit register is listed as RO. How can a transmit register be RO???? [then] +[ifdef] cl2-a1 +\ Realtek ALC5624 CODEC : mic-gain ( bits11:8 -- ) h# f00 h# 22 codec-field ; : mic+0db ( -- ) 0 mic-gain ; \ Needed : mic+20db ( -- ) h# 500 mic-gain ; \ Needed @@ -495,6 +522,143 @@ h# f9f h# 12 codec-field h# 60 h# 12 codec-set \ Enable ADC zero-cross detectors ; +[else] +\ Realtek ALC5631Q CODEC +: 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 + +: headphones-inserted? ( -- flag ) d# 97 gpio-pin@ ; +: microphone-inserted? ( -- flag ) d# 96 gpio-pin@ ; + +\ The range is from -46.5 db to +12 dB +: gain>lr-12 ( db -- true | regval false ) + d# 12 min ( db' ) + 2* 3 / ( steps ) \ Converts -46.5 .. 12 db to -31 .. 8 steps + dup d# -31 < if ( steps ) + drop true + else ( steps ) + 8 swap - ( -steps ) + 0 max ( clipped-steps ) + dup 8 lshift or ( regval ) + false + then +; +\ The range is from -46.5 db to 0 dB +: gain>lr ( db -- true | regval false ) + 0 min ( db' ) + 2* 3 / ( steps ) \ Converts -46.5 .. 12 db to -31 .. 8 steps + dup d# -31 < if ( steps ) + drop true + else ( steps ) + 0 swap - ( -steps ) + 0 max ( clipped-steps ) + dup 8 lshift or ( regval ) + false + then +; + +\ This sets up a simple routing from the DAC to the headphone and speaker outputs +: output-config ( -- ) + h# df00 h# 1a codec! \ DACL -> OUTMIXL + h# df00 h# 1c codec! \ DACR -> OUTMIXR + h# 4040 h# 04 codec-set \ OUTMIXLR -> HPOVOLLR + h# d0d0 h# 28 codec! \ DACLR -> SPKMIXLR + h# 4040 h# 02 codec-set \ SPKMIXLR -> SPKVOLLR + h# 9000 h# 2a codec! \ SPKVOLL -> SPOLMIX, SPKVOLR -> SPORMIX + h# 0000 h# 2c codec! \ SPOxMIX -> SPKRMUX, HPOVOL -> HPMUX +; + +: mute-speakers ( -- ) h# 8080 2 codec-set ; +: set-speaker-volume ( n -- ) \ DONE + gain>lr-12 if h# 8080 then h# bfbf 2 codec-field +; +: mute-headphones ( -- ) h# 8080 4 codec-set ; +: set-headphone-volume ( n -- ) \ DONE + gain>lr if h# 8080 then h# 9f9f 4 codec-field +; +: set-volume ( n -- ) + headphones-inserted? if + set-headphone-volume + else + set-speaker-volume + then +; +d# 0 constant default-adc-gain \ 0 dB - range is -96.625 to +28.5 +d# 0 constant default-dac-gain \ 0 dB - range is -96.625 to +28.5 +d# 44 constant default-mic-gain \ 44 dB - range is 0 to 50 dB +d# 0 constant default-speaker-volume \ 0 dB - range is -46.5 to +12 +d# -10 constant default-headphone-volume \ -10 dB - range is -46.5 to 0 + +: adc-mute-all ( -- ) h# f0f0 h# 14 codec! ; +: adc-mute-mic ( -- ) h# 4040 h# 14 codec-set ; +: adc-unmute-mic ( -- ) h# 4040 h# 14 codec-clr ; +\ : adc-unmute-outmix ( -- ) h# 8080 h# 14 codec-clr ; + +\ The useful one is outmix-unmute-dac +: outmix-mute-all ( -- ) h# ff00 dup h# 1a codec! h# 1c codec! ; +: outmix-mute-mic ( -- ) h# 1000 dup h# 1a codec-set h# 1c codec-set ; +: outmix-unmute-mic ( -- ) h# 1000 dup h# 1a codec-clr h# 1c codec-clr ; +: outmix-mute-dac ( -- ) h# 2000 dup h# 1a codec-set h# 1c codec-set ; +: outmix-unmute-dac ( -- ) h# 2000 dup h# 1a codec-clr h# 1c codec-clr ; +: outmix-mute-recmix ( -- ) h# 8000 dup h# 1a codec-set h# 1c codec-set ; +: outmix-unmute-recmix ( -- ) h# 8000 dup h# 1a codec-clr h# 1c codec-clr ; + +: gain>lr-3/8 ( -- lrgain boost ) + d# 28 min + dup 0>= if ( n ) + 8 3 */ ( boost ) \ Convert to .375 dB increments + 0 swap ( lrgain boost ) + else ( n ) + dup d# -96 <= if ( n ) + drop ( ) + h# ffff h# 8080 ( lrgain boost ) + else ( n ) + negate 8 3 */ ( steps ) + dup bwjoin ( lrgain ) + 0 ( lrgain boost ) + then ( lrgain boost ) + then ( lrgain boost ) +; +: set-dac-gain ( n -- ) + dup d# -96 < if outmix-mute-dac else outmix-unmute-dac then + gain>lr-3/8 h# 0c codec! h# 10 codec! +; +: set-adc-gain ( n -- ) + gain>lr-3/8 h# 12 codec! h# 16 codec! +; +: mic1-balanced ( -- ) h# 8000 h# 8000 h# 0e codec-field ; +: mic1-single-ended ( -- ) 0 h# 8000 h# 0e codec-field ; +: mic2-balanced ( -- ) h# 0080 h# 0080 h# 0e codec-field ; +: mic2-single-ended ( -- ) 0 h# 0080 h# 0e codec-field ; + +false value external-mic? +: mic-routing ( -- n ) + mic1-single-ended mic2-single-ended + adc-unmute-mic +; +: db>mic-boost ( db -- code ) + dup d# 52 >= if drop h# 8800 exit then + dup d# 50 >= if drop h# 7700 exit then + dup d# 44 >= if drop h# 6600 exit then + dup d# 40 >= if drop h# 5500 exit then + dup d# 35 >= if drop h# 4400 exit then + dup d# 30 >= if drop h# 3300 exit then + dup d# 24 >= if drop h# 2200 exit then + dup d# 20 >= if drop h# 1100 exit then + drop h# 0000 +; +: set-mic-gain ( db -- ) + db>mic-boost h# ff00 h# 22 codec-field + mic-routing +; +: mic+0db ( -- ) 0 set-mic-gain ; +: mic+20db ( -- ) d# 20 set-mic-gain ; +[then] \ This is called from "record" in "mic-test" in "selftest" : set-record-gain ( db -- ) @@ -511,9 +675,20 @@ : init-codec ( -- ) codec-on +[ifdef] cl2-a1 headphones-inserted? if select-headphones else select-speakers then default-speaker-volume set-speaker-volume default-headphone-volume set-headphone-volume +[else] + output-config + headphones-inserted? if + default-headphone-volume set-headphone-volume + mute-speakers + else + default-speaker-volume set-speaker-volume + mute-headphones + then +[then] default-dac-gain set-dac-gain default-mic-gain set-mic-gain default-adc-gain set-adc-gain

1 0

[commit] r2101 - dev/mmc/sdhci
by repository service 08 Jan '11

08 Jan '11

Author: wmb Date: Sat Jan 8 10:28:40 2011 New Revision: 2101 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2101 Log: SDHCI - improve support for MMC cards so eMMC on XO-1.75 A2 works. Modified: dev/mmc/sdhci/sdhci.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Sat Jan 8 10:23:46 2011 (r2100) +++ dev/mmc/sdhci/sdhci.fth Sat Jan 8 10:28:40 2011 (r2101) @@ -74,8 +74,16 @@ : host-high-speed ( -- ) h# 28 cb@ 4 or h# 28 cb! ; : host-low-speed ( -- ) h# 28 cb@ 4 invert and h# 28 cb! ; -: 4-bit ( -- ) h# 28 cb@ 2 or h# 28 cb! ; -: 1-bit ( -- ) h# 28 cb@ 2 invert and h# 28 cb! ; +: 4-bit ( -- ) h# 28 cb@ h# 20 invert and 2 or h# 28 cb! ; +: 1-bit ( -- ) h# 28 cb@ h# 22 invert and h# 28 cb! ; + +: hc-supports-8-bit? ( -- flag ) + h# 28 cb@ ( old-val ) + dup h# 20 or h# 28 cb! ( old-val ) + h# 28 cb@ h# 20 and 0<> ( old-val flag ) + swap h# 28 cb! ( flag ) +; +: 8-bit ( -- ) h# 28 cb@ h# 20 or h# 28 cb! ; \ : led-on ( -- ) h# 28 cb@ 1 or h# 28 cb! ; \ : led-off ( -- ) h# 28 cb@ 1 invert and h# 28 cb! ; @@ -428,6 +436,9 @@ dma-release scratch-buf ; +: mmc-switch ( arg -- ) \ CMD6 for MMC - no data + h# 061b 0 cmd response h# 80 and if ." MMC SWITCH_ERROR" cr then +; : deselect-card ( -- ) 0 h# 0700 0 cmd ; \ CMD7 - with null RCA : select-card ( -- ) \ CMD7 R1b @@ -511,6 +522,34 @@ intstat-off ; +\ The bit numbering follows the table on page 78 of the +\ SD Physical Layer Simplified Specification Version 2.00. + +\ The "8 -" accounts for the fact that the chip's response +\ registers omit the CRC and tag in bits [7:0] +: csdbit ( bit# -- b ) + 8 - + dup 3 rshift csd + c@ ( bit# byte ) + swap 7 and rshift 1 and +; +: csdbits ( high low -- bits ) + swap 0 -rot do 2* i csdbit or -1 +loop +; + +: mmc-v4? ( -- flag ) d# 125 d# 122 csdbits 4 >= ; + +\ This sends back 512 bytes in a single data block. +0 instance value ext-csd-buf + +\ Must be called with inststat-on +: get-ext-csd ( -- ) \ CMD8 R1 + d# 512 " dma-alloc" $call-parent to ext-csd-buf + ext-csd-buf d# 512 dup (dma-setup) + 0 h# 083a h# 13 cmd + 2 wait + dma-release +; + \ Decoder for the result of ACMD13 - app-get-status : sdstatbit ( bit# -- b ) d# 511 swap - ( bit#' ) @@ -540,7 +579,13 @@ \ Using this before a write-multiple command speeds up the write by \ avoiding unnecessary preservation of data that will be clobbered. -: pre-write-erase ( #blocks -- ) intstat-on app-prefix ( #blocks ) h# 171a 0 cmd ; \ ACMD23 R1 +: pre-write-erase ( #blocks -- ) + mmc? if + drop + else + intstat-on app-prefix ( #blocks ) h# 171a 0 cmd \ ACMD23 R1 + then +; \ You might want to turn this off for data transfer, as it controls \ a resistor on one of the data lines @@ -661,7 +706,7 @@ \ SD version 2 adds CMD8. Pre-v2 cards will time out. false to timeout? send-if-cond ( ) - timeout? if h# 0030.0000 else h# 4030.0000 then to oc-mode + timeout? if h# 40ff.8000 else h# 4030.0000 then to oc-mode wait-powered if true exit then @@ -696,13 +741,46 @@ then ; +: ext-csd-set ( mask index -- ) 0 -rot 1 bljoin mmc-switch ; +: ext-csd-clr ( mask index -- ) 0 -rot 2 bljoin mmc-switch ; +: ext-csd! ( value index -- ) 0 -rot 3 bljoin mmc-switch ; +: mmc-ddr-4-bit ( -- ) 5 d# 183 ext-csd! ; +: mmc-ddr-8-bit ( -- ) 6 d# 183 ext-csd! ; +: mmc-1-bit ( -- ) 0 d# 183 ext-csd! ; +: mmc-4-bit ( -- ) 1 d# 183 ext-csd! ; +: mmc-8-bit ( -- ) 2 d# 183 ext-csd! ; +: mmc-high-speed ( -- ) 1 d# 185 ext-csd! ; +: mmc-26-mhz? ( -- flag ) d# 196 ext-csd-buf + c@ 1 and 0<> ; +: mmc-52-mhz? ( -- flag ) d# 196 ext-csd-buf + c@ 2 and 0<> ; +: configure-mmc ( -- ) + mmc-v4? if + get-ext-csd \ MMC Cmd 8 - Get extended CSD + + \ Ideally, the width selection would be done by using CMD19 to test the bus + hc-supports-8-bit? if + mmc-8-bit 8-bit + else + mmc-4-bit 4-bit + then + + \ Ideally, we should set the speed class/power consumption - but the devices + \ I have don't really care, so it's hard to test. + + mmc-52-mhz? if + mmc-high-speed card-clock-50 + else + mmc-26-mhz? if + mmc-high-speed card-clock-25 + then + then + else + \ Pre-v4 MMC cards do not support SWITCH, so the only choice is 1-bit + 1-bit + then +; : configure-transfer ( -- ) mmc? if - 1-bit - \ We don't support 4-bit mode for MMC yet - - \ We don't support switching to high speed on MMC yet. - \ Doing so requires reading the EXT_CSD block + configure-mmc else 2 set-bus-width \ acmd6 - bus width 4 4-bit @@ -897,12 +975,14 @@ get-all-cids \ Cmd 2 mmc? if - h# 10000 set-rca \ Cmd 3 (MMC) - Get relative card address + h# 20000 set-rca \ Cmd 3 (MMC) - Get relative card address else get-rca \ Cmd 3 (SD) - Get relative card address then - card-clock-25 + mmc? 0= if + card-clock-25 + then get-csd \ Cmd 9 - Get card-specific data get-cid \ Cmd 10 - Get card ID @@ -1034,6 +1114,7 @@ : close ( -- ) open-count 1 = if scratch-buf d# 64 " dma-free" $call-parent + ext-csd-buf if ext-csd-buf d# 512 " dma-free" $call-parent then then open-count 1- 0 max to open-count ; @@ -1060,23 +1141,14 @@ r> base ! ; -\ The bit numbering follows the table on page 78 of the -\ SD Physical Layer Simplified Specification Version 2.00. - -\ The "8 -" accounts for the fact that the chip's response -\ registers omit the CRC and tag in bits [7:0] -: csdbit ( bit# -- b ) - 8 - - dup 3 rshift csd + c@ ( bit# byte ) - swap 7 and rshift 1 and -; -: csdbits ( high low -- bits ) - swap 0 -rot do 2* i csdbit or -1 +loop -; - \ The calculation below is shown on page 81 of the \ SD Physical Layer Simplified Specification Version 2.00. : size ( -- d.bytes ) + ext-csd-buf if + ext-csd-buf d# 212 + le-l@ d# 512 um* + exit + then + d# 127 d# 126 csdbits case 0 of d# 49 d# 47 csdbits ( c_size_mult )

1 0

[commit] r2100 - cpu/arm/mmp2
by repository service 08 Jan '11

08 Jan '11

Author: wmb Date: Sat Jan 8 10:23:46 2011 New Revision: 2100 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2100 Log: XO-1.75 A2 - Fixed bug in keypad driver that caused game key misreading. Modified: cpu/arm/mmp2/keypad.fth Modified: cpu/arm/mmp2/keypad.fth ============================================================================== --- cpu/arm/mmp2/keypad.fth Sat Jan 1 19:09:22 2011 (r2099) +++ cpu/arm/mmp2/keypad.fth Sat Jan 8 10:23:46 2011 (r2100) @@ -8,7 +8,7 @@ : kp! ( n offset -- ) h# d4012000 + l! ; : kp@ ( offset -- n ) h# d4012000 + l@ ; : keypad-direct-mode ( #keys -- ) - 1+ 6 lshift h# 202 or 0 kp! + 1- 6 lshift h# 202 or 0 kp! ; : scan-keypad ( -- n ) 0 kp@ h# 4000.0000 or 0 kp!

1 0

Problem with a:\nvram.dat in qemu
by Christian Johansson 05 Jan '11

05 Jan '11

Hi, I tried to enable the 'pseudo-nvram' by enable the 'create pseudo-nvram' in /cpu/x86/pc/emu/config.fth. But after attaching floppyof.img (from http://www.firmworks.com/linux/ ), i get this on init: <snip> Pseudo-NVRAM Can't read the configuration memory The configuration memory is invalid. Using default values. <snip> If I type 'dir a:', I get the reply: fat-file-system --A-rwxrwxrwx 4096 2010-12-30 16:32:24 NVRAM.DAT And if I type: setenv auto-boot? true I get: Failed to transfer any blocks seek failed in translate-params Failed to transfer any blocks Flushbuf error auto-boot? = true '.partition a' doesn't give any reply, besides the header. Is there another option that will have to be enabled or what have I done wrong? //Br Christian

2 3

[commit] r2099 - cpu/arm
by repository service 01 Jan '11

01 Jan '11

Author: wmb Date: Sat Jan 1 19:09:22 2011 New Revision: 2099 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2099 Log: Jumped the gun on upstreaming armsim.c , pulling it. Deleted: cpu/arm/armsim.c

1 0

[commit] r2098 - cpu/arm
by repository service 01 Jan '11

01 Jan '11

Author: wmb Date: Sat Jan 1 11:20:48 2011 New Revision: 2098 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2098 Log: ARM simulator - allowed compiling-out the tracing code for extra speed. Modified: cpu/arm/armsim.c Modified: cpu/arm/armsim.c ============================================================================== --- cpu/arm/armsim.c Sat Jan 1 10:56:55 2011 (r2097) +++ cpu/arm/armsim.c Sat Jan 1 11:20:48 2011 (r2098) @@ -21,13 +21,13 @@ static u32 trace = 0; -//#if TRACE +#if TRACE #define INSTR(a) if (trace) printf("%s -- %0x N%d Z%d C%d V%d %s\n", \ a, COND, N, Z, C, V, cond ? "true" : "false"); \ if (cond == 0) break -//#else -//#define INSTR(a) if (cond == 0) break -//#endif +#else +#define INSTR(a) if (cond == 0) break +#endif #define MAXMEM 0x80000 #define MEM(type, adr) *(type *)(&mem[(adr)]) @@ -248,10 +248,10 @@ while (1) { instruction = MEM(u32, PC - 8); last_pc = PC; -//#if TRACE +#if TRACE if (trace) regdump(instruction, last_pc, 0); -//#endif +#endif EVAL_COND(COND); if (cond == 0xf) UNIMP("unconditional");

1 0

[commit] r2097 - cpu/arm cpu/arm/build cpu/x86/Darwin cpu/x86/Linux forth/wrapper forth/wrapper/zip
by repository service 01 Jan '11

01 Jan '11

Author: wmb Date: Sat Jan 1 10:56:55 2011 New Revision: 2097 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2097 Log: Added ARM simulator - thanks to Mike Tuciarone! - so cross-compiling an ARM OFW can be done without QEMU, and 5x faster than with QEMU. Added: cpu/arm/armsim.c cpu/x86/Darwin/Makefile.armforth cpu/x86/Linux/Makefile.armsim Modified: cpu/arm/assem.fth cpu/arm/build/Makefile cpu/arm/build/builder.dic cpu/arm/disassem.fth cpu/arm/sys.fth cpu/x86/Darwin/Makefile forth/wrapper/wrapper.c forth/wrapper/zip/inflate.c Added: cpu/arm/armsim.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/armsim.c Sat Jan 1 10:56:55 2011 (r2097) @@ -0,0 +1,1199 @@ +// +// ARM32 Application-level simulator. +// +// +// Copyright (c) 2007 FirmWorks +// Copyright 2010 Apple, Inc. All rights reserved. +// See license at end. + +#include <stdio.h> +#include <stdlib.h> +#include <signal.h> + +typedef char s8; +typedef short s16; +typedef int s32; +typedef long long s64; +typedef unsigned char u8; +typedef unsigned short u16; +typedef unsigned int u32; +typedef unsigned long long u64; + +static u32 trace = 0; + +//#if TRACE +#define INSTR(a) if (trace) printf("%s -- %0x N%d Z%d C%d V%d %s\n", \ + a, COND, N, Z, C, V, cond ? "true" : "false"); \ + if (cond == 0) break +//#else +//#define INSTR(a) if (cond == 0) break +//#endif + +#define MAXMEM 0x80000 +#define MEM(type, adr) *(type *)(&mem[(adr)]) + +u32 r[16]; +#define SP r[13] +#define LR r[14] +#define PC r[15] + +void regdump(u32 instruction, u32 last_pc, u8 cr) +{ + printf(" 0 %08x 1 %08x 2 %08x 3 %08x\n", r[0], r[1], r[2], r[3]); + printf(" 4 %08x 5 %08x 6 %08x 7 %08x\n", r[4], r[5], r[6], r[7]); + printf(" 8 %08x 9 %08x a %08x b %08x\n", r[8], r[9], r[10], r[11]); + printf(" c %08x d %08x e %08x f %08x\n", r[12], r[13], r[14], r[15]); + printf("pc %08x lpc %08x i %08x ", PC - 8, last_pc, instruction); + if (cr) + putchar('\n'); +} + +#define UFIELD(lbit,nbits) ( (instruction << (31 - lbit)) >> (32 - nbits)) +#define SFIELD(lbit,nbits) ((long)(instruction << (31 - lbit)) >> (32 - nbits)) + +#define COND UFIELD(31, 4) +#define OP UFIELD(27, 7) +#define S UFIELD(20, 1) +#define L UFIELD(20, 1) +#define RD r[UFIELD(15, 4)] +#define RN r[UFIELD(19, 4)] +#define RM r[UFIELD( 3, 4)] +#define RS r[UFIELD(11, 4)] +#define TYPE UFIELD( 6, 2) +#define IMM5 UFIELD(11, 5) +#define OP1 UFIELD( 4, 1) +#define OP2 UFIELD( 7, 1) +#define ROT UFIELD(11, 4) +#define IMM8 UFIELD( 7, 8) +#define IMM24 UFIELD(23,24) +#define LINK UFIELD( 5, 1) +#define MSB UFIELD(20, 5) +#define LSB UFIELD(11, 5) +#define BXTYPE UFIELD( 7, 4) +#define IMM12 UFIELD(11,12) +#define IMM16 ((UFIELD(19, 4) << 12) | IMM12) +#define IMMHL ((UFIELD(11, 4) << 4) | UFIELD( 3, 4)) +#define P UFIELD(24, 1) +#define U UFIELD(23, 1) +#define W UFIELD(21, 1) + +// In BTGT we want to force a PC update. Since we don't implement Thumb +// the value "1" must always be invalid for last_pc. +struct { signed int imm24:24; } sext24; +#define BTGT { PC += sext24.imm24 = (IMM24 << 2); last_pc = 1; } + +#define ROTATE(imm, rot) (((imm) >> (rot)) | ((imm) << (32-(rot)))) +#define IMM32 ROTATE(IMM8, (ROT<<1)) + +#define SHSRC (OP1 ? RS : IMM5) +#define SHFT(res) \ +{ \ + switch (TYPE) { \ + case 0: res = RM << SHSRC; break; \ + case 1: res = RM >> SHSRC; break; \ + case 2: if (SHSRC == 0) { res = ((s32)(RM) < 0) ? -1 : 0; } else { res = (s32)(RM) >> SHSRC; } break; \ + case 3: res = ROTATE(RM, SHSRC); \ + } \ +} + +#define BF(sb, eb) ((u32)(((s32)0x80000000) >> (sb - eb))) >> (31 - sb); + +union { + u32 all; + struct { + u32 res :28; + u32 Vbit:1; + u32 Zbit:1; + u32 Cbit:1; + u32 Nbit:1; + } bits; +} APSR; + +#define N (APSR.bits.Nbit) +#define Z (APSR.bits.Zbit) +#define C (APSR.bits.Cbit) +#define V (APSR.bits.Vbit) + +// FIXME: We're skipping the V bit for now. + +/* Leave C alone. */ +#define UPCC(res) \ +{ \ + if (S) { \ + N = (res) >> 31; \ + Z = (res == 0); \ +/* FIXME - possible problem with C bit - should be set to carry output from shifter */ \ + } \ +} + +#define ADC(dest, a, b, c) \ +{ \ + temp = (a) + (b) + (c); \ + if (S) { \ + N = temp >> 31; \ + Z = temp == 0; \ + C = (temp < (a)) || ((c) && (temp == (a))); \ + V = ((((s32)(temp)^(s32)(a)) < 0) && (((s32)(a)^(s32)(b)) >= 0)); \ + } \ + dest = temp; \ +} + +#define SBB(dest, a, b, c) \ +{ \ + temp = (a) - (b) - (!(c)); \ + if (S) { \ + N = temp >> 31; \ + Z = temp == 0; \ + C = !(((a) < temp) || ((!(c)) && ((a) == temp))); \ + V = ((((s32)temp^(s32)(a)) < 0) && (((s32)(a)^(s32)(b)) < 0)); \ + } \ + dest = temp; \ +} + +#define UNIMP(s) \ +{ \ + printf("UNIMPLEMENTED '%s' op %02x s %d bxtype %02x\n", s, OP, S, BXTYPE); \ + regdump(instruction, last_pc, 1); \ + return; \ +} + +#define EVAL_COND(cc) \ +{ \ + switch (cc) { \ + case 0x0: cond = (Z == 1); break; \ + case 0x1: cond = (Z == 0); break; \ + case 0x2: cond = (C == 1); break; \ + case 0x3: cond = (C == 0); break; \ + case 0x4: cond = (N == 1); break; \ + case 0x5: cond = (N == 0); break; \ + case 0x6: cond = (V == 1); break; \ + case 0x7: cond = (V == 0); break; \ + case 0x8: cond = (C == 1 && Z == 0); break; \ + case 0x9: cond = (C == 0 || Z == 1); break; \ + case 0xa: cond = (N == V); break; \ + case 0xb: cond = (N != V); break; \ + case 0xc: cond = (Z == 0 && N == V); break; \ + case 0xd: cond = (Z == 1 || N != V); break; \ + case 0xe: cond = (1); break; \ + case 0xf: cond = (0xf); break; \ + } \ +} + +u32 instruction; +u32 last_pc; + +void simhandler(int sig) +{ + extern void restoremode(); + + psignal(sig, "forth"); + regdump(instruction, last_pc, 1); + restoremode(); + exit(1); +} + + // alf = find(adr, len, link, origin); +u32 * +find(u8 *adr, u32 len, u32 *link, void *origin) +{ + u8 *wp, *np; + u32 namelen; + + while (link != origin) { + link -= 1; // Move from code field to link field + np = (u8 *)link - 1; + namelen = (*np) & 0x1f; + if (namelen == len) { + np -= namelen; + wp = adr; + while (namelen--) { + if (*np++ != *wp++) { + break; + } + } + if (namelen == -1) { + return (link); + } + } + link = (u32 *)*link; + } + return ((u32 *)0); +} + +void +simulate(u8 *mem, u32 start, u32 header, u32 syscall_vec, + u32 memtop, u32 argc, u32 argv) +{ + // register u32 instruction; + register u32 res; + register u32 cond; + register u32 temp; + u32 indent = 0; + u32 name; + u32 namelen; + // u32 last_pc; + + signal(SIGBUS, simhandler); + signal(SIGSEGV, simhandler); + + APSR.all = 0; + PC = start + 8; // Stupid ARM. + r[0] = header; + r[1] = 0; // Tell Forth it is using the simulator + r[2] = memtop; + r[3] = argc; + SP = memtop; + *((u32 *)SP) = argv; + + while (1) { + instruction = MEM(u32, PC - 8); + last_pc = PC; +//#if TRACE + if (trace) + regdump(instruction, last_pc, 0); +//#endif + EVAL_COND(COND); + if (cond == 0xf) + UNIMP("unconditional"); + switch (OP) { +case 0x00: if (OP1 == 0 || OP2 == 0) { + INSTR("and"); SHFT(res); RD = RN & res; UPCC(RD); break; + } + switch (BXTYPE) { + case 0x9: INSTR("mul"); RN = RS * RM; UPCC(RN); break; + // P=0, U=0, bit22=0, W=0 - post-index, add offset, register, no writeback + case 0xb: + if (L) { + INSTR("ldrh"); + RD = MEM(u16, RN); + RN = RN + RM; + } else { + INSTR("strh"); + MEM(u16, RN) = RD; + RN = RN + RM; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + RD = MEM(s8, RN); + RN = RN + RM; + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + RD = MEM(s16, RN); + RN = RN + RM; + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; +case 0x01: if (OP1 == 0 || OP2 == 0) { + INSTR("eor"); SHFT(res); RD = RN ^ res; UPCC(RD); break; + } + switch (BXTYPE) { + case 0x9: UNIMP("mla"); break; + // P=0, U=0, bit22=0, W=1 - post-index, add offset, register, writeback - UNPREDICTABLE (P=0, W=1) + case 0xb: UNIMP("ldrh"); break; // UNPREDICTABLE + case 0xd: UNIMP("ldrd"); break; // UNPREDICTABLE + case 0xf: UNIMP("ldrsh"); break; // UNPREDICTABLE + } break; +case 0x02: if (OP1 == 0 || OP2 == 0) { + INSTR("sub"); SHFT(res); SBB(RD, RN, res, 1); break; + } + switch (BXTYPE) { + // P=0, U=0, bit22=1, W=0 - post-index, add offset, immediate, no writeback + case 0xb: + if (L) { + INSTR("ldrh"); + RD = MEM(u16, RN); + RN = RN + IMMHL; + } else { + INSTR("strh"); + MEM(u16, RN) = RD; + RN = RN + IMMHL; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + RD = MEM(s8, RN); + RN = RN + IMMHL; + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + RD = MEM(s16, RN); + RN = RN + IMMHL; + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; +case 0x03: if (OP1 == 0 || OP2 == 0) { + INSTR("rsb"); SHFT(res); SBB(RD, res, RN, 1); break; + } else { + switch (BXTYPE) { + case 0x1: + case 0x3: + case 0x5: + case 0x7: INSTR("rsb"); SHFT(res); SBB(RD, res, RN, 1); break; + case 0x9: UNIMP("mls"); break; + // P=0, U=0, bit22=1, W=1 - post-index, add offset, immediate, writeback - UNPREDICTABLE (P=0, W=1) + case 0xb: UNIMP("ldrh"); break; // UNPREDICTABLE + case 0xd: UNIMP("ldrd"); break; // UNPREDICTABLE + case 0xf: UNIMP("ldrsh"); break; // UNPREDICTABLE + } break; + } break; +case 0x04: if (OP1 == 0 || OP2 == 0) { + INSTR("add"); SHFT(res); ADC(RD, RN, res, 0); break; + } + switch (BXTYPE) { + // P=0, U=1, bit22=0, W=0 - post-index, subtract offset, register, no writeback + case 0xb: + if (L) { + INSTR("ldrh"); + RD = MEM(u16, RN); + RN = RN - RM; + } else { + INSTR("strh"); + MEM(u16, RN) = RD; + RN = RN - RM; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + RD = MEM(s8, RN); + RN = RN - RM; + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + RD = MEM(s16, RN); + RN = RN - RM; + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; +case 0x05: if (OP1 == 0 || OP2 == 0) { + INSTR("adc"); SHFT(res); ADC(RD, RN, res, C); break; + } + switch (BXTYPE) { + // P=0, U=1, bit22=0, W=1 - post-index, subtract offset, register, writeback - UNPREDICTABLE (P=0, W=1) + case 0xb: UNIMP("ldrh"); break; // UNPREDICTABLE + case 0xd: UNIMP("ldrd"); break; // UNPREDICTABLE + case 0xf: UNIMP("ldrsh"); break; // UNPREDICTABLE + default: UNIMP("BXTYPE"); break; + } break; +case 0x06: if (OP1 == 0 || OP2 == 0) { + INSTR("sbc"); SHFT(res); +// printf("sbc RN %x res %x ~res %x C %x -- ", RN, res, ~(res), C); +// ADC(RD, RN, ~(res), C); +// printf("res %x\n", RD); +// printf("sbc RN %x res %x ~res %x C %x -- ", RN, res, ~(res), C); + SBB(RD, RN, res, C); +// printf("res %x\n", RD); +break; + } else { + switch (BXTYPE) { + case 0x1: + case 0x3: + case 0x5: + case 0x7: INSTR("sbc"); SHFT(res); SBB(RD, res, RN, C); break; + case 0x9: UNIMP("smull"); break; + // P=0, U=1, bit22=1, W=0 - post-index, subtract offset, immediate, no writeback + case 0xb: + if (L) { + INSTR("ldrh"); + RD = MEM(u16, RN); + RN = RN - IMMHL; + } else { + INSTR("strh"); + MEM(u16, RN) = RD; + RN = RN - IMMHL; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + RD = MEM(s8, RN); + RN = RN - IMMHL; + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + RD = MEM(s16, RN); + RN = RN - IMMHL; + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; + } break; +case 0x07: if (OP1 == 0 || OP2 == 0) { + INSTR("rsc"); SHFT(res); SBB(RD, res, RN, C); break; + } else { + switch (BXTYPE) { + case 0x1: + case 0x3: + case 0x5: + case 0x7: INSTR("rsc"); SHFT(res); SBB(RD, res, RN, C); break; + case 0x9: UNIMP("smlal"); break; + // P=0, U=1, bit22=1, W=1 - post-index, subtract offset, immediate, writeback - UNPREDICTABLE (P=0, W=1) + case 0xb: UNIMP("ldrh"); break; // UNPREDICTABLE + case 0xd: UNIMP("ldrd"); break; // UNPREDICTABLE + case 0xf: UNIMP("ldrsh"); break; // UNPREDICTABLE + default: UNIMP("BXTYPE"); break; + } break; + } break; +case 0x08: switch (BXTYPE) { + case 0x0: INSTR("mrs"); RD = APSR.all; break; + case 0x5: UNIMP("qadd"); break; + case 0x8: + case 0xa: + case 0xc: + case 0xe: UNIMP("smlabb"); break; + // P=1, U=0, bit22=0, W=0 - offset/pre-index, subtract offset, register, no writeback + case 0xb: + if (L) { + INSTR("ldrh"); + RD = MEM(u16, RN - RM); + } else { + INSTR("strh"); + MEM(u16, RN - RM) = RD; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + RD = MEM(s8, RN - RM); + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + RD = MEM(s16, RN - RM); + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; +case 0x09: switch (BXTYPE) { + case 0x0: UNIMP("msr"); break; + case 0x1: INSTR("bx"); PC = RM; break; + case 0x2: INSTR("bxj"); PC = RM; break; + case 0x3: INSTR("blx"); if (LINK) LR = PC - 4; PC = RM; break; + case 0x5: UNIMP("qsub"); break; + case 0x7: UNIMP("bkpt"); break; + case 0x8: + case 0xa: + case 0xc: + case 0xe: UNIMP("smlawb"); break; + // P=1, U=0, bit22=0, W=1 - offset/pre-index, subtract offset, register, writeback + case 0xb: + if (L) { + INSTR("ldrh"); + temp = RN - RM; + RD = MEM(u16, temp); + RN = temp; + } else { + INSTR("strh"); + temp = RN - RM; + MEM(u16, temp) = RD; + RN = temp; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + temp = RN - RM; + RD = MEM(s8, temp); + RN = temp; + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + temp = RN - RM; + RD = MEM(s16, temp); + RN = temp; + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; +case 0x0a: if (OP1 == 0 || OP2 == 0) { + INSTR("cmp"); SHFT(res); SBB(res, RN, res, 1); break; + } + switch (BXTYPE) { + case 0x5: UNIMP("qdadd"); break; + case 0x8: + case 0xa: + case 0xc: + case 0xe: UNIMP("smlalbb"); break; + // P=1, U=0, bit22=1, W=0 - offset/pre-index, subtract offset, immediate, no writeback + case 0xb: + if (L) { + INSTR("ldrh"); + RD = MEM(u16, RN - IMMHL); + } else { + INSTR("strh"); + MEM(u16, RN - IMMHL) = RD; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + RD = MEM(s8, RN - IMMHL); + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + RD = MEM(s16, RN - IMMHL); + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; +case 0x0b: if (OP1 == 0 || OP2 == 0) { + if (S) { + INSTR("cmn"); SHFT(res); ADC(res, RN, res, 0); break; + } else { + // "You don't need this instruction anyway." + // --mjterave(a)gmail.com + UNIMP("clz"); break; + } + } + switch (BXTYPE) { + case 0x5: UNIMP("qdsub"); break; + case 0x8: + case 0xa: + case 0xc: + case 0xe: UNIMP("smulbb"); break; + // P=1, U=0, bit22=1, W=1 - offset/pre-index, subtract offset, immediate, writeback + case 0xb: + if (L) { + INSTR("ldrh"); + temp = RN - IMMHL; + RD = MEM(u16, temp); + RN = temp; + } else { + INSTR("strh"); + temp = RN - IMMHL; + MEM(u16, temp) = RD; + RN = temp; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + temp = RN - IMMHL; + RD = MEM(s8, temp); + RN = temp; + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + temp = RN - IMMHL; + RD = MEM(s16, temp); + RN = temp; + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; +case 0x0c: if (OP1 == 0 || OP2 == 0) { + INSTR("orr"); SHFT(res); RD = RN | res; UPCC(res); break; + } else { + switch (BXTYPE) { + case 0x1: + case 0x3: + case 0x5: + case 0x7: INSTR("orr"); SHFT(res); RD = RN | res; UPCC(res); + break; + case 0x9: UNIMP("ldrex"); break; + // P=1, U=0, bit22=0, W=0 - offset/pre-index, subtract offset, register, no writeback + case 0xb: + if (L) { + INSTR("ldrh"); + RD = MEM(u16, RN + RM); + } else { + INSTR("strh"); + MEM(u16, RN + RM) = RD; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + RD = MEM(s8, RN + RM); + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + RD = MEM(s16, RN + RM); + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; + } break; +case 0x0d: switch (BXTYPE) { + case 0x0: + if (instruction == 0xe1a00000) { + INSTR("nop"); break; + } else if (IMM5 == 0) { + if (instruction == 0xe1a0f009) { // mov pc,up i.e. the part of NEXT at the end of each code word + INSTR("NEXT"); + } else { + INSTR("mov"); + } + RD = RM; UPCC(RD); break; + } /* else fall through */ + case 0x8: + case 0x1: INSTR("lsl"); SHFT(RD); UPCC(RD); break; + case 0x2: + case 0xa: + case 0x3: INSTR("lsr"); SHFT(RD); UPCC(RD); break; + case 0x4: + case 0xc: + case 0x5: INSTR("asr"); SHFT(RD); UPCC(RD); break; + case 0x6: + case 0xe: + case 0x7: INSTR("ror"); SHFT(RD); UPCC(RD); break; + case 0x9: UNIMP("ldrexd"); break; + // P=1, U=1, bit22=0, W=1 - offset/pre-index, add offset, register, writeback + case 0xb: + if (L) { + INSTR("ldrh"); + temp = RN + RM; + RD = MEM(u16, temp); + RN = temp; + } else { + INSTR("strh"); + temp = RN + RM; + MEM(u16, temp) = RD; + RN = temp; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + temp = RN + RM; + RD = MEM(s8, temp); + RN = temp; + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + temp = RN + RM; + RD = MEM(s16, temp); + RN = temp; + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + }; break; +case 0x0e: if (OP1 == 0 || OP2 == 0) { + INSTR("bic"); SHFT(res); RD = RN & ~res; UPCC(RD); break; + } + switch (BXTYPE) { + case 0x9: UNIMP("ldrexb"); break; + // P=1, U=1, bit22=1, W=0 - offset/pre-index, add offset, immediate, no writeback + case 0xb: + if (L) { + INSTR("ldrh"); + RD = MEM(u16, RN + IMMHL); + } else { + INSTR("strh"); + MEM(u16, RN + IMMHL) = RD; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + RD = MEM(s8, RN + IMMHL); + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + RD = MEM(s16, RN + IMMHL); + } else { + UNIMP("strd"); + } + break; + } break; +case 0x0f: if (OP1 == 0 || OP2 == 0) { + INSTR("mvn"); SHFT(res); RD = ~res; UPCC(RD); break; + } else { + switch (BXTYPE) { + case 0x9: UNIMP("ldrexh"); break; + // P=1, U=1, bit22=1, W=1 - offset/pre-index, add offset, immediate, writeback + case 0xb: + if (L) { + INSTR("ldrh"); + temp = RN + IMMHL; + RD = MEM(u16, temp); + RN = temp; + } else { + INSTR("strh"); + temp = RN + IMMHL; + MEM(u16, temp) = RD; + RN = temp; + } + break; + case 0xd: + if (L) { + INSTR("ldrsb"); + temp = RN + IMMHL; + RD = MEM(s8, temp); + RN = temp; + } else { + UNIMP("ldrd"); + } + break; + case 0xf: if (L) { + INSTR("ldrsh"); + temp = RN + IMMHL; + RD = MEM(s16, temp); + RN = temp; + } else { + UNIMP("strd"); + } + break; + default: UNIMP("BXTYPE"); break; + } break; + } break; +case 0x10: INSTR("and"); RD = RN & IMM32; UPCC(RD); break; +case 0x11: INSTR("eor"); RD = RN ^ IMM32; UPCC(RD); break; +case 0x12: INSTR("sub"); SBB(RD, RN, IMM32, 1); break; +case 0x13: INSTR("rsb"); SBB(RD, IMM32, RN, 1); break; +case 0x14: /* if (instruction == 0xe2809020) trace = 0; */ + INSTR("add"); ADC(RD, RN, IMM32, 0); break; +case 0x15: INSTR("adc"); ADC(RD, RN, IMM32, C); break; +case 0x16: INSTR("sbc"); SBB(RD, IMM32, RN, C); break; +case 0x17: INSTR("rsc"); SBB(RD, IMM32, RN, C); break; +case 0x18: INSTR("mov"); RD = IMM16; break; +case 0x19: switch (BXTYPE) { + case 0x0: INSTR("nop"); break; + case 0x1: + INSTR("wrc"); + if (RN == -2) { + printf("Tracing on\n"); + trace = 1; + } else if (RN == -1) { +// trace = 1; +// printf("find %x %x %x %x\n",r[2], r[1], r[0], r[3]); + // alf = find(u8 *adr, u32 len, u32 *link, void *origin); + r[0] = (u32)find((u8 *)r[2], r[1], (u32 *)r[0], (u8 *)r[3]); +// printf("returns %x\n", r[0]); + } else { + /* Handle Forth wrapper calls - the call# is in RN */ + r[0] = (*(long (*) ())(*(long *)(syscall_vec + RN))) + (r[0],r[1],r[2],r[3],r[4],r[5]); + } + break; + + case 0xf: UNIMP("dbg"); break; + default: UNIMP("msr"); break; + } break; +case 0x1a: if (S) { + INSTR("cmp"); SBB(res, RN, IMM32, 1); break; + } else { + INSTR("movt"); RD = (IMM16 << 16) | (RD & 0xffff); break; + } +case 0x1b: INSTR("cmn"); ADC(res, RN, IMM32, 0); break; +case 0x1c: INSTR("orr"); RD = RN | IMM32; UPCC(RD); break; +case 0x1d: INSTR("mov"); RD = IMM32; UPCC(RD); break; +case 0x1e: INSTR("bic"); RD = RN & (~IMM32); UPCC(RD); break; +case 0x1f: INSTR("mvn"); RD = ~IMM32; UPCC(RD); break; +case 0x20: +case 0x21: if (L) { + INSTR("ldr"); RD = MEM(u32, RN); RN -= IMM12; + } else { + INSTR("str"); MEM(u32, RN) = RD; RN -= IMM12; + } break; +case 0x22: +case 0x23: if (L) { + INSTR("ldrb"); RD = MEM(u8, RN); RN -= IMM12; + } else { + INSTR("strb"); MEM(u8, RN) = RD; RN -= IMM12; + } break; +case 0x24: if (L) { + if (UFIELD(19, 4) == 0xd) { + INSTR("pop"); RD = MEM(u32, RN); RN += IMM12; + } else { + if (instruction == 0xe49cf004) { // ldr pc,[ip],#4 i.e. the guts of NEXT + INSTR("DONEXT"); + } else if (instruction == 0xe49ca004) { // ldr tos,[ip],#4 i.e. the guts of (lit) and (') + INSTR("DOLIT"); + } else { + if (instruction == 0xe49bc004) { indent--; if (indent < 0) indent = 0; } + INSTR("ldr"); + } + RD = MEM(u32, RN); RN += IMM12; + if (trace) { + // If NEXT or ('), show the name of the word + if ((instruction == 0xe49cf004) || (instruction == 0xe49ca004)) { + name = RD - 5; + // If name is not in the dictionary area, it is probably a numeric literal + if (name >= r[9] && ((name - r[9]) < 0x100000)) { + namelen = *(char *)name & 0x3f; + name = name - namelen; + // Indent with * for EMACS outline mode - handy for hiding subordinate calls +// for (temp = 0; temp < indent; temp++) +// putchar('*'); + while (namelen--) + putchar(*(char *)name++); + printf(" Stack: %x %x %x %x indent %x\n" , + ((u32 *)r[13])[2], ((u32 *)r[13])[1], ((u32 *)r[13])[0], r[10], indent); + } + } + } + } + } else { + INSTR("str"); MEM(u32, RN) = RD; RN += IMM12; + } break; +case 0x25: if (L) { + INSTR("ldr"); RD = MEM(u32, RN); RN += IMM12; + } else { + INSTR("str"); MEM(u32, RN) = RD; RN += IMM12; + } break; +case 0x26: +case 0x27: if (L) { + INSTR("ldrb"); RD = MEM(u8, RN); RN += IMM12; + } else { + INSTR("strb"); MEM(u8, RN) = RD; RN += IMM12; + } break; +case 0x28: if (L) { + INSTR("ldr"); RD = MEM(u32, RN - IMM12); break; + } else { + INSTR("str"); MEM(u32, RN - IMM12) = RD; break; + } break; +case 0x29: if (L) { + INSTR("ldr"); RN -= IMM12; RD = MEM(u32, RN); break; + } else { + if (instruction == 0xe52bc004) indent++; // DOCOLON + INSTR("str"); RN -= IMM12; MEM(u32, RN) = RD; + break; + } break; +case 0x2a: if (L) { + INSTR("ldrb"); RD = MEM(u8, RN - IMM12); break; + } else { + INSTR("strb"); MEM(u8, RN - IMM12) = RD; break; + } break; +case 0x2b: if (L) { + INSTR("ldrb"); RN -= IMM12; RD = MEM(u8, RN); break; + } else { + INSTR("strb"); RN -= IMM12; MEM(u8, RN) = RD; break; + } break; +case 0x2c: if (L) { + INSTR("ldr"); RD = MEM(u32, RN + IMM12); break; + } else { + INSTR("str"); MEM(u32, RN + IMM12) = RD; break; + } break; +case 0x2d: if (L) { + INSTR("ldr"); RN += IMM12; RD = MEM(u32, RN); break; + } else { + INSTR("str"); RN += IMM12; MEM(u32, RN) = RD; break; + } break; +case 0x2e: if (L) { + INSTR("ldrb"); RD = MEM(u8, RN + IMM12); break; + } else { + INSTR("strb"); MEM(u8, RN + IMM12) = RD; break; + } break; +case 0x2f: if (L) { + INSTR("ldrb"); RN += IMM12; RD = MEM(u8, RN); break; + } else { + INSTR("strb"); RN += IMM12; MEM(u8, RN) = RD; break; + } break; +case 0x30: +case 0x31: if (OP1) { + UNIMP("mcr"); break; + } else if (L) { + INSTR("ldr"); SHFT(res); RD = MEM(u32, RN); RN -= res; break; + } else { + INSTR("str"); SHFT(res); MEM(u32, RN) = RD; RN -= res; break; + } break; +case 0x32: +case 0x33: if (OP1) { + UNIMP("mcr"); break; + } else if (L) { + INSTR("ldrb"); SHFT(res); RD = MEM(u8, RN); RN -= res; break; + } else { + INSTR("strb"); SHFT(res); MEM(u8, RN) = RD; RN -= res; break; + } break; +case 0x34: +case 0x35: if (OP1) { + UNIMP("mcr"); break; + } else if (L) { + INSTR("ldr"); SHFT(res); RD = MEM(u32, RN); RN += res; break; + } else { + INSTR("str"); SHFT(res); MEM(u32, RN) = RD; RN += res; break; + } break; +case 0x36: +case 0x37: if (OP1) { + UNIMP("mcr"); break; + } else if (L) { + INSTR("ldrb"); SHFT(res); RD = MEM(u8, RN); RN += res; break; + } else { + INSTR("strb"); SHFT(res); MEM(u8, RN) = RD; RN += res; break; + } break; +case 0x38: if (OP1) { + UNIMP("smlad"); break; + } else if (L) { + INSTR("ldr"); SHFT(res); RD = MEM(u32, RN - res); break; + } else { + INSTR("str"); SHFT(res); MEM(u32, RN - res) = RD; break; + } break; +case 0x39: if (L) { + INSTR("ldr"); SHFT(res); RN -= res; RD = MEM(u32, RN); break; + } else { + INSTR("str"); SHFT(res); RN -= res; MEM(u32, RN) = RD; break; + } break; +case 0x3a: if (OP1) { + UNIMP("smlald"); break; + } else if (L) { + INSTR("ldrb"); SHFT(res); RD = MEM(u8, RN - res); break; + } else { + INSTR("strb"); SHFT(res); MEM(u8, RN - res) = RD; break; + } break; +case 0x3b: if (L) { + INSTR("ldrb"); SHFT(res); RN -= res; RD = MEM(u8, RN); break; + } else { + INSTR("strb"); SHFT(res); RN -= res; MEM(u8, RN) = RD; break; + } +case 0x3c: if (L) { + INSTR("ldr"); SHFT(res); RD = MEM(u32, RN + res); break; + } else { + INSTR("str"); SHFT(res); MEM(u32, RN + res) = RD; break; + } +case 0x3d: if (OP1) { + UNIMP("sbfx"); break; + } else if (L) { + INSTR("ldr"); SHFT(res); RN += res; RD = MEM(u32, RN); break; + } else { + INSTR("str"); SHFT(res); RN += res; MEM(u32, RN) = RD; break; + } break; +case 0x3e: if (OP1) { + if (UFIELD(3, 4) == 0xf) { + INSTR("bfc"); RD &= ~BF(MSB, LSB); + } else { + INSTR("bfi"); + RD &= ~BF(MSB, LSB); + RD |= RN & ~BF(MSB, LSB); + } + } else if (L) { + INSTR("ldrb"); SHFT(res); RD = MEM(u8, RN + res); + } else { + INSTR("strb"); SHFT(res); MEM(u8, RN + res) = RD; + } break; +case 0x3f: if (L) { + INSTR("ldrb"); SHFT(res); RN += res; RD = MEM(u8, RN); break; + } else { + INSTR("strb"); SHFT(res); RN += res; MEM(u8, RN) = RD; break; + } break; +case 0x40: +case 0x41: { u32 base = RN; + u32 reglist = UFIELD(15, 16); + s32 reg; + if (L) { + INSTR("ldmda"); + } else { + INSTR("stmda"); + } + for (reg = 15; reg >= 0; reg--) { + if ((1 << reg) & reglist) { + if (L) { + r[reg] = MEM(u32, base); + } else { + MEM(u32, base) = r[reg]; + } + base -= 4; + } + } + if (W) RN = base; + } break; +case 0x42: UNIMP("xxx"); +case 0x43: UNIMP("xxx"); +case 0x44: +case 0x45: { u32 base = RN; + u32 reglist = UFIELD(15, 16); + s32 reg; + if (L) { + INSTR("ldm"); + } else { + INSTR("stm"); + } + for (reg = 0; reg < 16; reg++) { + if ((1 << reg) & reglist) { + if (L) { + r[reg] = MEM(u32, base); + } else { + MEM(u32, base) = r[reg]; + } + base += 4; + } + } + if (W) RN = base; + } break; +case 0x46: UNIMP("xxx"); +case 0x47: UNIMP("xxx"); +case 0x48: +case 0x49: { u32 base = RN; + u32 reglist = UFIELD(15, 16); + s32 reg; + if (L) { + INSTR("ldmdb"); + } else { + INSTR("stmdb"); + } + for (reg = 15; reg >= 0; reg--) { + if ((1 << reg) & reglist) { + base -= 4; + if (L) { + r[reg] = MEM(u32, base); + } else { + MEM(u32, base) = r[reg]; + } + } + } + if (W) RN = base; + } break; +case 0x4a: UNIMP("xxx"); break; +case 0x4b: UNIMP("xxx"); break; +case 0x4c: +case 0x4d: { u32 base = RN + 4; + u32 reglist = UFIELD(15, 16); + s32 reg; + if (L) { + INSTR("ldmib"); + } else { + INSTR("stmib"); + } + for (reg = 0; reg < 16; reg++) { + if ((1 << reg) & reglist) { + if (L) { + r[reg] = MEM(u32, base); + } else { + MEM(u32, base) = r[reg]; + } + base += 4; + } + } + if (W) RN = base; + } break; +case 0x4e: UNIMP("xxx"); break; +case 0x4f: UNIMP("xxx"); break; +case 0x50: +case 0x51: +case 0x52: +case 0x53: +case 0x54: +case 0x55: +case 0x56: +case 0x57: INSTR("b"); BTGT; break; +case 0x58: +case 0x59: +case 0x5a: +case 0x5b: +case 0x5c: +case 0x5d: +case 0x5e: +case 0x5f: INSTR("bl"); LR = PC - 4; BTGT; break; +case 0x60: +case 0x61: UNIMP("stc"); break; +case 0x62: UNIMP("mcrr"); break; +case 0x63: +case 0x64: +case 0x65: +case 0x66: +case 0x67: +case 0x68: +case 0x69: +case 0x6a: +case 0x6b: +case 0x6c: +case 0x6d: +case 0x6e: UNIMP("stc"); break; +case 0x6f: UNIMP("ldc"); break; +case 0x70: +case 0x71: +case 0x72: +case 0x73: +case 0x74: +case 0x75: +case 0x76: +case 0x77: UNIMP("cdp"); break; +case 0x78: +case 0x79: +case 0x7a: +case 0x7b: +case 0x7c: +case 0x7d: +case 0x7e: +case 0x7f: UNIMP("svc"); break; + } // switch (OP) + if (PC == last_pc) + PC += 4; + else // branch or move + PC += 8; + } // while (1) +} + +// LICENSE_BEGIN +// Copyright (c) 2007 FirmWorks +// Copyright 2010 Apple, Inc. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// LICENSE_END Modified: cpu/arm/assem.fth ============================================================================== --- cpu/arm/assem.fth Thu Dec 23 21:34:52 2010 (r2096) +++ cpu/arm/assem.fth Sat Jan 1 10:56:55 2011 (r2097) @@ -990,6 +990,9 @@ : adr ( -- ) true (set) ; : set ( -- ) false (set) ; +\ Wrapper Call - FirmWorks pseudo-op for armsim wrapper calls +: wrc ( -- ) h# 03200010 {cond} init-operands get-r16 !op ; + : nop32 ( -- ) h# 0320f000 {cond} !op ; : yield ( -- ) h# 0320f001 {cond} !op ; : wfe ( -- ) h# 0320f002 {cond} !op ; Modified: cpu/arm/build/Makefile ============================================================================== --- cpu/arm/build/Makefile Thu Dec 23 21:34:52 2010 (r2096) +++ cpu/arm/build/Makefile Sat Jan 1 10:56:55 2011 (r2097) @@ -1,4 +1,9 @@ +BASEDIR= `(cd ../../../; pwd;)` + OS := $(shell uname) +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../${HOSTCPU}/${OS} +BUILDSH= ${BASEDIR}/forth/lib/build.sh all: basefw.dic @@ -9,8 +14,11 @@ ../${OS}/forth: @make -C ../${OS} forth -build: ../${OS}/forth - @ln -sf ../${OS}/forth $@ +build: + @ln -sf ${BUILDSH} build + +# build: ../${OS}/forth +# @ln -sf ../${OS}/forth $@ %.dic: FORCE build ./build $@ Modified: cpu/arm/build/builder.dic ============================================================================== Binary file (source and/or target). No diff available. Modified: cpu/arm/disassem.fth ============================================================================== --- cpu/arm/disassem.fth Thu Dec 23 21:34:52 2010 (r2096) +++ cpu/arm/disassem.fth Sat Jan 1 10:56:55 2011 (r2097) @@ -154,12 +154,21 @@ endcase {<cond>} ; +\ Wrapper call pseudo-op - used to request system functions from armsim +: .wrc ( -- ) + ." wrc" + {<cond>} op-col .rn +; : .mrs/sr ( -- ) d#21 bit? if \ MSR - instruction @ h# 00cf.fff8 and h# 00000.f000 = if + instruction @ h# 00cf.fff8 and h# 0000.f000 = if .event exit then + instruction @ h# 00c0.fff8 and h# 0000.0010 = if + .wrc + exit + then ." msr" {<cond>} op-col .psr .fields ., .r/imm else \ MRS Modified: cpu/arm/sys.fth ============================================================================== --- cpu/arm/sys.fth Thu Dec 23 21:34:52 2010 (r2096) +++ cpu/arm/sys.fth Sat Jan 1 10:56:55 2011 (r2097) @@ -28,11 +28,13 @@ psh ip,rp \ This register may be clobbered ldr r6,'user syscall-vec \ Get address of system call table - add r6,r6,tos \ Call through vector - ldr r6,[r6] + cmp r6,#0 + wrceq tos \ For the simulator, we execute a fake instruction + addne r6,r6,tos \ Call through vector + ldrne r6,[r6] - mov lk,pc \ Return address - mov pc,r6 + movne lk,pc \ Return address + movne pc,r6 \ ldr pc,[r6,tos] \ Call through vector str r0,'user sysretval \ Save the result @@ -73,10 +75,31 @@ ; ' sys-init-io is init-io -: sys-init ; \ Environment initialization chain +code (wrapper-find-next) ( adr len link origin -- adr len alf true | adr len false ) + mov r3,tos \ origin in r3 + ldmia sp,{r0,r1,r2} \ r0: link, r1: len, r2: adr + ldr r0,[r0] \ Dereference first link in threads area + mvn r4,#0 \ -1 in r4 - tells the wrapper to do the find thing + wrc r4 + cmp r0,#0 + strne r0,[sp] \ Found: alf on memory stack (second item) + mvnne tos,#0 \ Found: true in top of stack register + inceq sp,1cell \ Not found - remove link from memory stack + moveq tos,#0 \ Not found - false in top of stack register +c; +: wrapper-find-next ( adr len link -- adr len alf true | adr len false ) + origin (wrapper-find-next) +; +\ Override $find-next with the wrapper accelerator version if we are +\ hosted under armsim +: sys-init ( -- ) + syscall-vec @ 0= if ['] wrapper-find-next is $find-next then +; + ' sys-init is init-environment decimal + \ LICENSE_BEGIN \ Copyright (c) 1994 FirmWorks \ Modified: cpu/x86/Darwin/Makefile ============================================================================== --- cpu/x86/Darwin/Makefile Thu Dec 23 21:34:52 2010 (r2096) +++ cpu/x86/Darwin/Makefile Sat Jan 1 10:56:55 2011 (r2097) @@ -52,8 +52,11 @@ inflate.o: ${ZIPDIR}/inflate.c ${CC} -c -m32 -O0 -fpic $< -o $@ +# Well, we're not going to get objcopy in a generic OS X environment, so +# let's just fake it. ../build/inflate.bin: inflate.o - ${OBJCOPY} -O binary $< $@ + # ${OBJCOPY} -O binary $< $@ + dd if=$< of=$@ bs=256 skip=1 %.o: ${WRDIR}/%.c ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ Added: cpu/x86/Darwin/Makefile.armforth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/Darwin/Makefile.armforth Sat Jan 1 10:56:55 2011 (r2097) @@ -0,0 +1,74 @@ +# Wrapper makefile for x86 Mac OS X / Darwin + +BP=../../.. + +# Flags for the simulator version +OPT = -O +CFLAGS = -g -m32 -DARMSIM -DTARGET_ARM -DARM + +# Extra CFLAGS needed by Darwin hosts. GCC doesn't define __unix__ here, +# so we must include it ourselves. +CFLAGS += -D__unix__=1 -Wimplicit-function-declaration +#CFLAGS += -DUSE_XCB + +WRTAIL = forth/wrapper +WRDIR = ${BP}/${WRTAIL} +ZIPTAIL = ${WRTAIL}/zip +ZIPDIR = ${BP}/${ZIPTAIL} +ARMDIR = ${BP}/cpu/arm + +ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o + +OBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS} +TRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS} +SIMROMOBJS = simrom.o armsim.simrom.o + +# Apple's GCC is a bit brain-dead. It's probably best to install gcc43 and +# binutils from macports. See http://macports.macforge.net for how to install +# and use macports. At the very least, binutils from macports seems to be +# required. + +# The default compiler on Mac OS X (as of 10.5 anyway) does not honor -fpic. +# GCC will warn about -fpic not being supported, assumes you meant -fPIC, +# and switches to that. That should be okay, but if you're concerned about it +# I'm providing this already defined override for ${CC}. To use it, just +# uncomment it, or pass CC= on the command line. This is here to make things +# easier for us lazy people. +#CC = /opt/local/bin/gcc-mp-4.3 + +all: armforth armforth.trace + +armforth: $(OBJS) + $(CC) $(LFLAGS) $(OBJS) -o $@ + +armforth.trace: $(TRACEOBJS) + $(CC) $(LFLAGS) $(TRACEOBJS) -o $@ + +simrom: $(SIMROMOBJS) + $(CC) $(LFLAGS) $(SIMROMOBJS) -o $@ + +wrapsim.o: ${WRDIR}/wrapper.c + ${CC} -c ${CFLAGS} $< -o $@ + +%.o: ${WRDIR}/%.c + ${CC} -c ${CFLAGS} $< -o $@ + +%.o: ${ZIPDIR}/%.c + ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + +armsim.o: $(ARMDIR)/armsim.c + $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -c $< -o $@ + +armsim.trace.o: $(ARMDIR)/armsim.c + $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE=1 -c $< -o $@ + +armsim.simrom.o: $(ARMDIR)/armsim.c + $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE=1 -DSIMROM -c $< -o $@ + +simrom.o: $(ARMDIR)/simrom.c + $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE=1 -DSIMROM -c $< -o $@ + +clean: + @rm -f *.o armforth armforth.trace + +FRC: Added: cpu/x86/Linux/Makefile.armsim ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/Linux/Makefile.armsim Sat Jan 1 10:56:55 2011 (r2097) @@ -0,0 +1,56 @@ +# Wrapper makefile for x86 Mac OS X / Darwin + +BP=../../.. + +# Flags for the simulator version +OPT = -O +CFLAGS = -g -m32 -DARMSIM -DTARGET_ARM -DARM + +WRTAIL = forth/wrapper +WRDIR = ${BP}/${WRTAIL} +ZIPTAIL = ${WRTAIL}/zip +ZIPDIR = ${BP}/${ZIPTAIL} +ARMDIR = ${BP}/cpu/arm + +ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o + +OBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS} +TRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS} +SIMROMOBJS = simrom.o armsim.simrom.o + +all: armforth armforth.trace + +armforth: $(OBJS) + $(CC) $(LFLAGS) $(OBJS) -o $@ + +armforth.trace: $(TRACEOBJS) + $(CC) $(LFLAGS) $(TRACEOBJS) -o $@ + +simrom: $(SIMROMOBJS) + $(CC) $(LFLAGS) $(SIMROMOBJS) -o $@ + +wrapsim.o: ${WRDIR}/wrapper.c + ${CC} -c ${CFLAGS} $< -o $@ + +%.o: ${WRDIR}/%.c + ${CC} -c ${CFLAGS} $< -o $@ + +%.o: ${ZIPDIR}/%.c + ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + +armsim.o: $(ARMDIR)/armsim.c + $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -c $< -o $@ + +armsim.trace.o: $(ARMDIR)/armsim.c + $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE=1 -c $< -o $@ + +armsim.simrom.o: $(ARMDIR)/armsim.c + $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE=1 -DSIMROM -c $< -o $@ + +simrom.o: $(ARMDIR)/simrom.c + $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE=1 -DSIMROM -c $< -o $@ + +clean: + @rm -f *.o armforth armforth.trace + +FRC: Modified: forth/wrapper/wrapper.c ============================================================================== --- forth/wrapper/wrapper.c Thu Dec 23 21:34:52 2010 (r2096) +++ forth/wrapper/wrapper.c Sat Jan 1 10:56:55 2011 (r2097) @@ -339,7 +339,6 @@ INTERNAL long path_open(); INTERNAL void keymode(); INTERNAL void keyqmode(); -INTERNAL void restoremode(); INTERNAL long f_open(), f_creat(); INTERNAL long f_close(), f_read(), f_write(); @@ -347,13 +346,16 @@ INTERNAL long f_lseek(); INTERNAL long f_crstr(); -#ifdef PPCSIM +#if defined(PPCSIM) || defined (ARMSIM) /* These are not INTERNAL because the PowerPC simulator uses then */ long c_key(); long s_bye(); + void simulate(); + void restoremode(); #else INTERNAL long c_key(); INTERNAL long s_bye(); + INTERNAL void restoremode(); #endif INTERNAL long c_emit(); @@ -976,7 +978,7 @@ if (header.h_magic != CPU_MAGIC) { error("forth: Incorrect dictionary file header in ", dictfile); -/* XXX */ printf("%x %x\n", CPU_MAGIC, header.h_magic); +/* XXX */ printf("%x %x\n", CPU_MAGIC, (unsigned int) header.h_magic); exit(1); } @@ -1003,6 +1005,10 @@ # ifdef PPCSIM printf("PowerPC Instruction Set Simulator\n"); printf("Copyright 1994 FirmWorks All rights reserved\n"); +# elif ARMSIM + printf("ARM Instruction Set Simulator\n"); + printf("Copyright 1994 FirmWorks All rights reserved\n"); + printf("Copyright 2010 Apple, Inc. All rights reserved\n"); # endif loadaddr = (char *)m_alloc(dictsize); @@ -1056,10 +1062,14 @@ * exit with its return value as the status code. */ -#ifdef PPCSIM +#if defined(PPCSIM) simulate(0L, loadaddr+sizeof(header)+START_OFFSET, loadaddr, functions, ((long)loadaddr+dictsize - 16) & ~15, argc, argv, 1 /* 0=POWER, 1=PowerPC */); +#elif defined(ARMSIM) + // printf("loadaddr = 0x%x\n",loadaddr); + simulate(0L, loadaddr, loadaddr, functions, + ((long)loadaddr+dictsize - 16) & ~15, argc, argv); #else s_flushcache(loadaddr, dictsize); /* We're about to execute data! */ # ifdef TARGET_X86 @@ -1104,6 +1114,7 @@ s_bye(0L); # endif #endif + restoremode(); } /* @@ -1516,7 +1527,7 @@ } } -INTERNAL void +void restoremode() { initline(); Modified: forth/wrapper/zip/inflate.c ============================================================================== --- forth/wrapper/zip/inflate.c Thu Dec 23 21:34:52 2010 (r2096) +++ forth/wrapper/zip/inflate.c Sat Jan 1 10:56:55 2011 (r2097) @@ -172,7 +172,7 @@ * Return size of clear. */ int -inflate(struct workspace *wsptr, int nohdr, u_char* clear, u_char *compr) __attribute__((section ("text_inflate"))); +inflate(struct workspace *wsptr, int nohdr, u_char* clear, u_char *compr); int inflate(struct workspace *wsptr, int nohdr, u_char* clear, u_char *compr)

1 0

[commit] r2096 - dev/ide
by repository service 23 Dec '10

23 Dec '10

Author: wmb Date: Thu Dec 23 21:34:52 2010 New Revision: 2096 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2096 Log: IDE driver - fixed a longstanding stack problem in probing code. Modified: dev/ide/generic.fth Modified: dev/ide/generic.fth ============================================================================== --- dev/ide/generic.fth Wed Dec 22 07:05:26 2010 (r2095) +++ dev/ide/generic.fth Thu Dec 23 21:34:52 2010 (r2096) @@ -310,6 +310,8 @@ else false ( found? ) then + else + false ( found? ) then then else

1 0

[commit] r2095 - cpu/arm/olpc/1.75
by repository service 22 Dec '10

22 Dec '10

Author: quozl Date: Wed Dec 22 07:05:26 2010 New Revision: 2095 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2095 Log: OLPC XO-1.75 - add test instructions image for bottom face of A1 PCB, rework top face to use relative coordinates. Modified: cpu/arm/olpc/1.75/testinstructions.fth Modified: cpu/arm/olpc/1.75/testinstructions.fth ============================================================================== --- cpu/arm/olpc/1.75/testinstructions.fth Tue Dec 21 01:25:16 2010 (r2094) +++ cpu/arm/olpc/1.75/testinstructions.fth Wed Dec 22 07:05:26 2010 (r2095) @@ -64,37 +64,25 @@ ; : board-outline - \ bottom left corner - 2 370 moveto - - \ left side cutout - 2 253 lineto 11 253 lineto 11 236 lineto 6 236 lineto - - \ top left corner - 6 37 lineto - \ wireless cutout - 60 37 lineto 60 0 lineto 114 0 lineto 114 96 lineto - 205 96 lineto 205 0 lineto 524 0 lineto 524 37 lineto - - \ top right corner - 580 37 lineto - - \ right side cutout - 580 164 lineto 569 164 lineto 569 207 lineto 576 207 lineto - 576 242 lineto 569 242 lineto 569 259 lineto 580 259 lineto - - \ bottom right corner - 580 370 lineto - - \ lower cutout - 495 370 lineto 495 366 lineto 446 366 lineto - 446 353 lineto 423 353 lineto 423 336 lineto - 396 336 lineto 396 231 lineto 183 231 lineto 183 333 lineto - 155 333 lineto 155 349 lineto 132 349 lineto 132 366 lineto - 95 366 lineto 95 370 lineto - - \ bottom left corner - 2 370 lineto + ( lower left corner ) 2 370 moveto + ( left side cutout ) 0 -117 rline 9 0 rline + 0 -17 rline -5 0 rline + ( upper left corner ) 0 -199 rline + ( wireless cutout ) 54 0 rline 0 -37 rline 54 0 rline + 0 96 rline 91 0 rline 0 -96 rline + 319 0 rline 0 37 rline + ( upper right corner ) 56 0 rline + ( right side cutout ) 0 127 rline -11 0 rline 0 43 rline + 7 0 rline 0 35 rline -7 0 rline + 0 17 rline 11 0 rline + ( lower right corner ) 0 111 rline + ( lower cutout ) -85 0 rline 0 -4 rline -49 0 rline + 0 -13 rline -23 0 rline 0 -17 rline + -27 0 rline 0 -105 rline -213 0 rline + 0 102 rline -28 0 rline 0 16 rline + -23 0 rline 0 17 rline -37 0 rline + 0 4 rline + ( lower left corner ) -93 0 rline ; : mic-conn @@ -229,13 +217,18 @@ 2dup 18 18 boxat swap 9 + swap 9 + 6 circleat ; + : top-outline - 153 360 moveto - 153 324 lineto 441 324 lineto 441 360 lineto 585 360 lineto - 585 36 lineto 531 36 lineto 531 0 lineto 234 0 lineto - 234 99 lineto 144 99 lineto 144 0 lineto 63 0 lineto - 63 36 lineto 9 36 lineto 9 360 lineto 153 360 lineto + 584 370 moveto + 0 -117 rline -9 0 rline 0 -17 rline 5 0 rline 0 -199 rline -54 0 rline + 0 -37 rline -54 0 rline 0 96 rline -91 0 rline 0 -96 rline -319 0 rline + 0 37 rline -56 0 rline 0 127 rline 11 0 rline 0 43 rline -7 0 rline + 0 35 rline 7 0 rline 0 17 rline -11 0 rline 0 111 rline 85 0 rline + 0 -4 rline 49 0 rline 0 -13 rline 23 0 rline 0 -17 rline 27 0 rline + 0 -105 rline 213 0 rline 0 102 rline 28 0 rline 0 16 rline 23 0 rline + 0 17 rline 37 0 rline 0 4 rline 93 0 rline ; + : headphones-top 2 95 7 18 boxat 9 91 45 28 boxat @@ -296,8 +289,8 @@ : led3-top 99 348 led-symbol ; : mic-led 31 45 led-symbol ; : camera-led 569 45 led-symbol ; -: wlan-conn-top 144 82 90 27 boxat ; -: wlan-card-top 152 7 75 75 boxat ; +: wlan-conn-top 374 76 104 27 boxat ; +: wlan-card-top 389 7 75 75 boxat ; : ext-sd-slot-top 497 360 81 9 boxat ; : ext-sd-card-top 504 369 moveto 0 -75 rline 11 -11 rline 56 0 rline 0 86 rline -67 0 rline

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware