openfirmware February 2011

openfirmware@openfirmware.info

1 participants
16 discussions

[commit] r2165 - cpu/arm dev/video/common
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 07:58:08 2011 New Revision: 2165 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2165 Log: ARM / graphics - added bscan, wscan, lscan primitives and used them if present in replace-color. Modified: cpu/arm/kerncode.fth dev/video/common/rectangle16.fth Modified: cpu/arm/kerncode.fth ============================================================================== --- cpu/arm/kerncode.fth Thu Feb 3 07:57:03 2011 (r2164) +++ cpu/arm/kerncode.fth Thu Feb 3 07:58:08 2011 (r2165) @@ -952,6 +952,66 @@ = until c; +\ Find the first occurence of bvalue, returning the residual string +code bscan ( adr len bvalue -- adr' len' ) + ldmia sp!,{r0,r1} \ r0-len r1-adr tos-bvalue + mov r2,tos \ r2-bvalue + movs tos,r0 \ tos-len + psheq r1,sp + nxteq \ Bail out if len=0 + + begin + ldrb r0,[r1],#1 + cmp r0,r2 + deceq r1,#1 + psheq r1,sp + nxteq + decs tos,1 + = until + psh r1,sp +c; + +\ Find the first occurrence of wvalue, returning the residual string +code wscan ( adr len wvalue -- adr' len' ) + ldmia sp!,{r0,r1} \ r0-len r1-adr tos-lvalue + mov r2,tos \ r2-lvalue + movs tos,r0 \ tos-len + psheq r1,sp + nxteq \ Bail out if len=0 + + begin + ldrh r0,[r1],#2 + cmp r0,r2 + deceq r1,#2 + psheq r1,sp + nxteq + decs tos,2 + <= until + psh r1,sp + mov tos,#0 +c; + +\ Find the first occurrence of lvalue, returning the residual string +code lscan ( adr len lvalue -- adr' len' ) + ldmia sp!,{r0,r1} \ r0-len r1-adr tos-lvalue + mov r2,tos \ r2-lvalue + movs tos,r0 \ tos-len + psheq r1,sp + nxteq \ Bail out if len=0 + + begin + ldr r0,[r1],#4 + cmp r0,r2 + deceq r1,#4 + psheq r1,sp + nxteq + decs tos,4 + <= until + psh r1,sp + mov tos,#0 +c; + + \ code /link ( -- /link ) psh tos,sp mov tos,/link c; code /char ( -- 1 ) psh tos,sp mov tos,#1 c; Modified: dev/video/common/rectangle16.fth ============================================================================== --- dev/video/common/rectangle16.fth Thu Feb 3 07:57:03 2011 (r2164) +++ dev/video/common/rectangle16.fth Thu Feb 3 07:58:08 2011 (r2165) @@ -234,17 +234,39 @@ : dimensions ( -- width height ) width height ; : replace-color ( old new -- ) - depth d# 32 = if + depth d# 32 = if ( old new ) swap 565>argb-pixel swap 565>argb-pixel ( old' new' ) - frame-buffer-adr width height * /l* bounds do + frame-buffer-adr width height * /l* ( old new adr len ) +[ifdef] lscan + begin ( old new adr len ) + fourth lscan ( old new adr' len' ) + dup while ( old new adr' len' ) + third third l! ( old new adr len ) + /l /string ( old new adr' len' ) + repeat ( old new adr' len' ) + 4drop ( ) +[else] + bounds do ( old new ) over i l@ xor h# ffffff and 0= if dup i l! then /l +loop 2drop - else - frame-buffer-adr width height * /w* bounds do - over i w@ = if dup i w! then - /w +loop - 2drop +[then] + else ( old new ) + frame-buffer-adr width height * /w* ( old new adr len ) +[ifdef] wscan + begin ( old new adr len ) + fourth wscan ( old new adr' len' ) + dup while ( old new adr' len' ) + third third w! ( old new adr len ) + /w /string ( old new adr' len' ) + repeat ( old new adr' len' ) + 4drop ( ) +[else] + bounds do ( old new ) + over i w@ = if dup i w! then ( old new ) + /w +loop ( old new ) + 2drop ( ) +[then] then ; \ This creates a device method from a termemu method

1 0

[commit] r2164 - dev/usb2/hcd/ohci
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 07:57:03 2011 New Revision: 2164 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2164 Log: USB - fixed OHCI breakage from recent probing rewrite. Modified: dev/usb2/hcd/ohci/ohci.fth dev/usb2/hcd/ohci/probe.fth Modified: dev/usb2/hcd/ohci/ohci.fth ============================================================================== --- dev/usb2/hcd/ohci/ohci.fth Thu Feb 3 02:00:58 2011 (r2163) +++ dev/usb2/hcd/ohci/ohci.fth Thu Feb 3 07:57:03 2011 (r2164) @@ -58,6 +58,19 @@ : hc-cntl-clr ( bit-mask -- ) hc-cntl@ swap invert and hc-cntl! ; : hc-cntl-set ( bit-mask -- ) hc-cntl@ swap or hc-cntl! ; +: reset-port ( port -- ) + >r + h# 1.0002 r@ hc-rh-psta! \ enable port + h# 10 r@ hc-rh-psta! \ reset port + r@ d# 10 0 do + d# 10 ms + dup hc-rh-psta@ 10.0000 and ?leave + loop drop + r@ hc-rh-psta@ 10.0000 and 0= if abort then + h# 1f.0000 r> hc-rh-psta! \ clear status change bits + d# 256 ms +; + : reset-usb ( -- ) ohci-reg dup 0= if map-regs then 1 hc-rh-stat! \ power-off root hub @@ -65,6 +78,7 @@ d# 10 ms 0= if unmap-regs then ; + : init-ohci-regs ( -- ) hcca-phys hc-hcca! \ physical address of hcca Modified: dev/usb2/hcd/ohci/probe.fth ============================================================================== --- dev/usb2/hcd/ohci/probe.fth Thu Feb 3 02:00:58 2011 (r2163) +++ dev/usb2/hcd/ohci/probe.fth Thu Feb 3 07:57:03 2011 (r2164) @@ -4,19 +4,6 @@ hex headers -: reset-port ( port -- ) - >r - h# 1.0002 r@ hc-rh-psta! \ enable port - 10 r@ hc-rh-psta! \ reset port - r@ d# 10 0 do - d# 10 ms - dup hc-rh-psta@ 10.0000 and ?leave - loop drop - r@ hc-rh-psta@ 10.0000 and 0= if abort then - h# 1f.0000 r> hc-rh-psta! \ clear status change bits - 100 ms -; - : probe-root-hub-port ( port -- ) dup hc-rh-psta@ 1 and 0= if drop exit then ( port ) \ No device connected

1 0

[commit] r2163 - cpu/arm/olpc/1.75
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 02:00:58 2011 New Revision: 2163 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2163 Log: OLPC XO-1.75 - include the touchscreen driver in the build. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Thu Feb 3 02:00:19 2011 (r2162) +++ cpu/arm/olpc/1.75/fw.bth Thu Feb 3 02:00:58 2011 (r2163) @@ -162,6 +162,7 @@ fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth +fload ${BP}/cpu/arm/olpc/1.75/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic fload ${BP}/cpu/arm/mmp2/keypad.fth [ifndef] cl2-a1

1 0

[commit] r2162 - cpu/arm/mmp2
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 02:00:19 2011 New Revision: 2162 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2162 Log: OLPC XO-1.75 - Added a device node for the Marvell Armada 610 TWSI hardware. Modified: cpu/arm/mmp2/twsi.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Thu Feb 3 01:59:11 2011 (r2161) +++ cpu/arm/mmp2/twsi.fth Thu Feb 3 02:00:19 2011 (r2162) @@ -91,41 +91,32 @@ : twsi-get ( register-address .. #reg-bytes #data-bytes -- data-byte ... ) >r ( reg-adr .. #regs r: #data-bytes ) - \ Handle the case where the device does not require that a write register address be sent - slave-address ( reg-adr .. #regs slave-address r: #data-bytes ) - over 0= if ( reg-adr .. #regs slave-address r: #data-bytes ) - r@ if ( reg-adr .. #regs slave-address r: #data-bytes ) - 1 or ( reg-adr .. #regs slave-address' r: #data-bytes ) - then ( reg-adr .. #regs slave-address' r: #data-bytes ) - then ( reg-adr .. #regs slave-address' r: #data-bytes ) - - twsi-start ( reg-adr .. #regs r: #data-bytes ) - - \ Abort the transaction if both #reg-bytes and #data-bytes are 0 - dup r@ or 0= if ( #regs r: #data-bytes ) - iue+scle bbu_ICR_MA or cr! ( #regs r: #data-bytes ) \ Master abort - r> 2drop exit ( -- ) - then ( reg-adr .. #regs r: #data-bytes ) - - \ Send register addresses, if any - 0 ?do 0 twsi-putbyte loop ( r: #data-bytes ) - - \ If no result data requested, quit now - r> dup 0= if ( #data-bytes ) - drop ( ) - iue+scle bbu_ICR_STOP or cr! ( ) - exit - then ( #data-bytes ) - - \ Otherwise send the read address with another start bit - slave-address 1 or bbu_ICR_START twsi-putbyte ( #data-bytes ) - sr@ sr! \ clear ITE and IRF status bits ( #data-bytes ) - \ Bug on line 367 of bbu_TWSI.s - writes SR without first reading it - - 1- 0 ?do 0 twsi-getbyte loop ( bytes ) - - \ Set the stop bit on the final byte - bbu_ICR_STOP bbu_ICR_ACKNAK or twsi-getbyte ( bytes ) + ?dup if ( reg-adr .. #regs slave-address r: #data-bytes ) + slave-address ( reg-adr .. #regs slave-address r: #data-bytes ) + twsi-start ( reg-adr .. #regs r: #data-bytes ) + + \ Send register addresses + 0 ?do 0 twsi-putbyte loop ( r: #data-bytes ) + + \ If no result data requested, quit now + r@ 0= if ( r: #data-bytes ) + r> drop ( ) + iue+scle bbu_ICR_STOP or cr! ( ) + exit + then ( r: #data-bytes ) + then ( r: #data-bytes ) + + r> ?dup if ( #data-bytes ) + \ Send the read address with a (or another) start bit + slave-address 1 or bbu_ICR_START twsi-putbyte ( #data-bytes ) + sr@ sr! \ clear ITE and IRF status bits ( #data-bytes ) + \ Bug on line 367 of bbu_TWSI.s - writes SR without first reading it + + 1- 0 ?do 0 twsi-getbyte loop ( bytes ) + + \ Set the stop bit on the final byte + bbu_ICR_STOP bbu_ICR_ACKNAK or twsi-getbyte ( bytes ) + then ; : twsi-write ( byte .. #bytes -- ) @@ -137,3 +128,20 @@ : twsi-b@ ( reg -- byte ) 1 1 twsi-get ; : twsi-b! ( byte reg -- ) 2 twsi-write ; + +0 0 " " " /" begin-package +" twsi" name + +0 0 instance 2value child-address +: open ( -- okay? ) true ; +: close ( -- ) ; +: set-address ( target channel -- ) to child-address ; +2 " #address-cells" integer-property +0 " #size-cells" integer-property +: get ( #bytes -- bytes ... ) + child-address set-twsi-target + 0 swap twsi-get +; +: decode-unit ( adr len -- low high ) parse-2int ; +: encode-unit ( low high -- adr len ) >r <# u#s drop [char] , hold r> u#s u#> ; +end-package

1 0

[commit] r2161 - cpu/arm/olpc/1.75
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 01:59:11 2011 New Revision: 2161 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2161 Log: EETI EXC7200 Touchscreen driver - initial revision. Added: cpu/arm/olpc/1.75/exc7200-touchscreen.fth Added: cpu/arm/olpc/1.75/exc7200-touchscreen.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/exc7200-touchscreen.fth Thu Feb 3 01:59:11 2011 (r2161) @@ -0,0 +1,290 @@ +\ See license at end of file +purpose: Driver and diagnostic for EETI EXC7200 Multitouch I2C Touchscreen + +0 0 " 4,8" " /twsi" begin-package +my-space encode-int my-address encode-int encode+ " reg" property +" touchscreen" name +: open ( -- okay? ) + my-unit " set-address" $call-parent true +; +: close ( -- ) ; +: get-touch? ( -- false | x y z down? contact# true ) + d# 99 gpio-pin@ if false exit then + d# 10 " get" $call-parent ( 4 flags xlo xhi ylo yhi zlo zhi 0 0 ) + 2drop bwjoin >r bwjoin >r bwjoin >r ( 4 flags r: z y x ) + swap 4 <> if ( flags r: z y x ) + r> r> r> 4drop false exit ( -- false ) + then + dup h# 82 and h# 82 <> if ( flags r: z y x ) + r> r> r> 4drop false exit ( -- false ) + then ( flags r: z y x ) + + r> r> r> 3 roll ( x y z flags ) + dup 1 and 0<> ( x y z flags down? ) + swap 2 rshift h# 1f and ( x y z down? contact# ) + true ( x y z down? contact# true ) +; + + +h# f800 constant red +h# 07e0 constant green +h# 001f constant blue +h# ffe0 constant yellow +h# f81f constant magenta +h# 07ff constant cyan +h# ffff constant white +h# 0000 constant black + +variable pixcolor + +h# 4 value y-offset +0 value screen-w +0 value screen-h +0 value /line +2 value /pixel + + +variable ptr + +\ The following code receives and decodes touchpad packets + +: show-packets ( adr len -- ) + push-hex + bounds ?do + i 6 bounds ?do i c@ 3 u.r loop cr + 6 +loop + pop-base +; +: last-10 ( -- ) + ptr @ load-base - d# 60 > if + ptr @ d# 60 - d# 60 + else + load-base ptr @ over - + then + show-packets +; + +h# 7fff constant touchscreen-max-x +h# 7fff constant touchscreen-max-y + +: scale-xy ( x y -- x' y' ) + swap screen-w touchscreen-max-x */ + swap screen-h touchscreen-max-y */ +; + +\ Try to receive a mouse report packet. If one arrives within +\ 20 milliseconds, return true and the decoded information. +\ Otherwise return false. +: pad? ( -- false | x y z down? contact# true ) + get-touch? if ( x dy buttons ) + 2>r >r scale-xy r> 2r> ( x' y' z down? contact# ) + true + else + false + then +; + +\ Display raw data from the device, stopping when a key is typed. +: show-pad ( -- ) + begin + pad? if . . . . . cr then + key? until +; + +: button ( color x -- ) + screen-h d# 50 - d# 200 d# 30 fill-rectangle-noff +; +d# 300 d# 300 2constant target-wh +: left-target ( -- x y w h ) 0 0 target-wh ; +: right-target ( -- x y w h ) screen-w screen-h target-wh xy- target-wh ; +false value left-hit? +false value right-hit? +: inside? ( mouse-x,y x y w h -- flag ) + >r >r ( mouse-x mouse-y x y r: h w ) + xy- ( dx dy ) + swap r> u< ( dy x-inside? ) + swap r> u< ( x-inside? y-inside? ) + and ( flag ) +; + +: draw-left-target ( -- ) green left-target fill-rectangle-noff ; +: draw-right-target ( -- ) red right-target fill-rectangle-noff ; + +: ?hit-target ( -- ) + pixcolor @ cyan = if \ touch1 ( x y ) + 2dup left-target inside? if ( x y ) + yellow left-target fill-rectangle-noff ( x y ) + true to left-hit? ( x y ) + exit + then ( x y ) + then ( x y ) + pixcolor @ yellow = if \ touch2 ( x y ) + 2dup right-target inside? if ( x y ) + yellow right-target fill-rectangle-noff ( x y ) + true to right-hit? ( x y ) + exit + then ( x y ) + then ( x y ) +; + +: track-init ( -- ) + " dimensions" $call-screen to screen-h to screen-w + screen-ih package( bytes/line )package to /line + load-base ptr ! +; + +: dot ( x y -- ) + swap screen-w 3 - min swap y-offset + screen-h 3 - min ( x' y' ) + pixcolor @ -rot 3 3 ( color x y w h ) + fill-rectangle-noff ( ) +; + +: background ( -- ) + black 0 0 screen-w screen-h fill-rectangle-noff + final-test? if + false to left-hit? + false to right-hit? + draw-left-target + draw-right-target + else + 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr + then +; + +: setcolor ( contact# -- ) + case + 0 of cyan endof + 1 of yellow endof + 2 of magenta endof + 3 of blue endof + ( default ) white swap + endcase + + pixcolor ! +; +0 value pressure + +: track ( x y z down? contact# -- ) + setcolor ( x y z down? ) + 0= if + pixcolor @ black " replace-color" $call-screen + 3drop exit + then ( x y z ) + to pressure ( x y ) + +\ dup 5 and 5 = if background load-base ptr ! then + + final-test? if ( x y ) + ?hit-target ( x y ) + then ( x y ) + + dot +; + +: handle-key ( -- exit? ) + key upc case + [char] P of + cursor-on + cr last-10 + key drop + background + false + endof + + ( key ) true swap + endcase +; + +false value selftest-failed? \ Success/failure flag for final test mode +: exit-test? ( -- flag ) + final-test? if ( ) + \ If the targets have been hit, we exit with successa + left-hit? right-hit? and if ( ) + false to selftest-failed? ( ) + true ( flag ) + exit + then ( ) + + \ Otherwise we give the tester a chance to bail out by typing a key, + \ thus indicating failure + key? 0= if false exit then ( ) + key drop ( ) + true to selftest-failed? ( ) + true ( flag ) + exit + then ( ) + + \ If not final test mode, we only exit via a key - no targets + key? if handle-key else false then ( exit ? ) +; +: touchscreen-present? ( -- flag ) + d# 10 " get" ['] $call-parent catch if ( x x x ) + 3drop false + else ( n n n n n n n n n n ) + 4drop 4drop 2drop true + then +; + +: selftest ( -- error? ) + open 0= if + ." Touchscreen open failed" true exit + then + + touchscreen-present? 0= if + ." Touchscreen doesn't respond" true exit + then + + \ Being able to open the touchpad is good enough in SMT mode + smt-test? if close false exit then + + final-test? 0= if + ." Touchscreen test will start in 4 seconds" cr + d# 4000 ms + then + + cursor-off track-init + + \ Consume already-queued keys to prevent premature exit + begin key? while key drop repeat + + \ Consume already-queued trackpad events to prevent premature exit + begin pad? while 2drop 3drop repeat + + background + begin + ['] pad? catch ?dup if .error close true exit then + if track then + exit-test? until + + close + cursor-on + page + final-test? if selftest-failed? else false then +; + + +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] r2160 - dev/olpc/touchpad
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 00:30:28 2011 New Revision: 2160 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2160 Log: Synaptics touchpad driver - removed more dead code and fixed bogus comments left over from the ALPS driver. Modified: dev/olpc/touchpad/syntpad.fth Modified: dev/olpc/touchpad/syntpad.fth ============================================================================== --- dev/olpc/touchpad/syntpad.fth Mon Jan 31 01:36:17 2011 (r2159) +++ dev/olpc/touchpad/syntpad.fth Thu Feb 3 00:30:28 2011 (r2160) @@ -2,23 +2,6 @@ \ Add this code to the existing mouse driver dev /mouse -variable 'get-data 'get-data off -variable 'get-data? 'get-data? off - -: setup ( -- ) - 'get-data @ 0= if - " get-data" my-parent ihandle>phandle find-method if - 'get-data ! - then - then - 'get-data? @ 0= if - " get-data?" my-parent ihandle>phandle find-method if - 'get-data? ! - then - then -; - - h# f800 constant red h# 07e0 constant green h# 001f constant blue @@ -41,24 +24,13 @@ \ existing Open Firmware mouse driver: \ open initializes the port and resets the device -\ cmd sends a command byte and waits for the ack -\ read1 reads 1 response byte -\ read2 reads 2 response bytes -\ mouse1:1 command e6 \ mouse2:1 command e7 \ stream-on command f4 -\ stream-off command f5 +\ stream-mode command ea,f4 \ mouse-status command e9 and reads 3 response bytes -\ set-resolution command e8 then sends another command byte -\ get-data? reads a data byte if one is available -\ get-data waits for and reads a data byte - +\ stream-poll? ( -- false | dx dy buttons true ) variable ptr -0 value show-raw? - -\ Runs the special Device ID command and checks for the ALPS return code -\ Ref: 5.2.10 (1) of Hybrid-GP2B-T-1.pdf \ The Synaptics touchpad version is 64.02.30 @@ -67,20 +39,18 @@ 0 bljoin ; -\ Put the device into advanced mode and enable it +\ Put the device into streaming mode and enable it : start ( -- ) - setup stream-mode ; \ The normal mouse driver uses remote mode, but this device \ doesn't support remote mode, so patch the mouse driver -\ "open" routine to substitute "noop" for "remote-mode". +\ "open" routine to substitute "start" for "remote-mode". patch start remote-mode open -\ The following code receives and decodes touchpad packets in the -\ various special formats +\ The following code receives and decodes touchpad packets : show-packets ( adr len -- ) push-hex @@ -112,7 +82,7 @@ r> ( buttons ) ; -\ Try to receive a GS-format packet. If one arrives within +\ Try to receive a mouse report packet. If one arrives within \ 20 milliseconds, return true and the decoded information. \ Otherwise return false. : pad? ( -- false | x y buttons true ) @@ -123,8 +93,7 @@ then ; -\ Switch the device to glide format and display -\ the data that it sends. Stop when a key is typed. +\ Display raw data from the device, stopping when a key is typed. : show-pad ( -- ) start begin

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware February 2011