openfirmware March 2012

openfirmware@openfirmware.info

1 participants
47 discussions

[commit] r2894 - cpu/arm/mmp2
by repository service 16 Mar '12

16 Mar '12

Author: wmb Date: Fri Mar 16 02:02:28 2012 New Revision: 2894 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2894 Log: ARM MMP2 timer driver - improved the code that reads the timer values. The technique I was using to ensure a self-consistent read was bogus, and the hardware documentation is extremely unclear. It turns out that you need to use different techniques for the different timers - careful write/read synchronization for the fast one, and read-until-match for the slower ones. Modified: cpu/arm/mmp2/timer.fth Modified: cpu/arm/mmp2/timer.fth ============================================================================== --- cpu/arm/mmp2/timer.fth Thu Mar 15 00:19:06 2012 (r2893) +++ cpu/arm/mmp2/timer.fth Fri Mar 16 02:02:28 2012 (r2894) @@ -21,37 +21,46 @@ 7 h# 84 timer! ; -[ifdef] arm-assembler +\ The first ldr usually returns stale data; the second one returns good data. +\ Empirically, draining the write buffer does not help. +\ Read-until-match doesn't work with the fast clock because it never matches. code timer0@ ( -- n ) \ 6.5 MHz psh tos,sp set r1,`h# 014000 +io #` mov r0,#1 str r0,[r1,#0xa4] - mov r0,r0 - ldr tos,[r1,#0x28] + ldr tos,[r1,#0xa4] + ldr tos,[r1,#0xa4] c; +\ For the slower timers, we use the read-until-match technique. +\ Apparently the freeze register doesn't update until the next +\ clock tick, so using it doesn't work well for the slow clocks. code timer1@ ( -- n ) \ 32.768 kHz psh tos,sp set r1,`h# 014000 +io #` - mov r0,#1 - str r0,[r1,#0xa8] - mov r0,r0 ldr tos,[r1,#0x2c] + begin + mov r0,tos + ldr tos,[r1,#0x2c] + cmps tos,r0 + = until c; code timer2@ ( -- n ) \ 1 kHz psh tos,sp set r1,`h# 014000 +io #` - mov r0,#1 - str r0,[r1,#0xac] - mov r0,r0 ldr tos,[r1,#0x30] + begin + mov r0,tos + ldr tos,[r1,#0x30] + cmps tos,r0 + = until c; [else] -: timer0@ ( -- n ) 1 h# 0140a4 io! h# 014028 io@ ; -: timer1@ ( -- n ) 1 h# 0140a8 io! h# 01402c io@ ; -: timer2@ ( -- n ) 1 h# 0140ac io! h# 014030 io@ ; +: timer0@ ( -- n ) 1 h# 0140a4 io! h# 0140a4 io@ drop h# 0140a4 io@ ; +: timer1@ ( -- n ) 1 h# 0140a8 io! h# 0140a8 io@ drop h# 0140a8 io@ ; +: timer2@ ( -- n ) 1 h# 0140ac io! h# 0140ac io@ drop h# 0140ac io@ ; [then] : timer0-status@ ( -- n ) h# 014034 io@ ;

1 0

[commit] r2893 - cpu/arm/olpc cpu/x86/pc/olpc/via ofw/gui
by repository service 15 Mar '12

15 Mar '12

Author: wmb Date: Thu Mar 15 00:19:06 2012 New Revision: 2893 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2893 Log: OLPC XO-1,75 - trac #11695 - Added touchscreen support for graphical menu, factoring out common code in the touchscreen drivers and cleaning up some dead menu code in the process. For the older XO-3 build, the touchscreen could already be used to drive the menu in lieu of the nonexistent touchpad/mouse; now machines with both a touchscreen and a touchpad/mouse can use either interchangeably. Added: cpu/arm/olpc/touchscreen-common.fth Modified: cpu/arm/olpc/build-fw.fth cpu/arm/olpc/exc7200-touchscreen.fth cpu/arm/olpc/rm3150-touchscreen.fth cpu/x86/pc/olpc/via/mfgtest.fth ofw/gui/dialog.fth ofw/gui/graphics.fth ofw/gui/iconmenu.fth ofw/gui/mouse.fth ofw/gui/textfld.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Mar 13 23:02:15 2012 (r2892) +++ cpu/arm/olpc/build-fw.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -752,7 +752,6 @@ fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth \+ olpc-cl3 fload ${BP}/cpu/arm/olpc/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic \+ olpc-cl3 fload ${BP}/dev/softkeyboard.fth \ On-screen keyboard -\+ olpc-cl3 devalias mouse /touchscreen \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth \ Touchscreen driver and diagnostic fload ${BP}/cpu/arm/olpc/roller.fth \ Accelerometer test Modified: cpu/arm/olpc/exc7200-touchscreen.fth ============================================================================== --- cpu/arm/olpc/exc7200-touchscreen.fth Tue Mar 13 23:02:15 2012 (r2892) +++ cpu/arm/olpc/exc7200-touchscreen.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -3,31 +3,17 @@ 0 0 " 4,8" " /twsi" begin-package my-space encode-int my-address encode-int encode+ " reg" property -" touchscreen" name -0 value screen-w -0 value screen-h -0 instance value invert-x? -0 instance value invert-y? - -: dimensions ( -- w h ) screen-w screen-h ; - -: #contacts ( -- n ) 2 ; +\ XXX these are really platform-related, not touchscreen-related +: targets? ( -- flag ) true ; \ Used to be "final-test?" +: .tsmsg ( -- ) 0 d# 27 at-xy ." Touchscreen test. Hit both targets to exit" cr ; -h# 7fff constant touchscreen-max-x -h# 7fff constant touchscreen-max-y +fload ${BP}/cpu/arm/olpc/touchscreen-common.fth -: invert-x ( x -- x' ) touchscreen-max-x swap - ; -: invert-y ( y -- y' ) touchscreen-max-y swap - ; +h# 7fff to touchscreen-max-x +h# 7fff to touchscreen-max-y -: scale-x ( x -- x' ) - invert-x? if invert-x then - screen-w touchscreen-max-x */ -; -: scale-y ( y -- y' ) - invert-y? if invert-y then - screen-h touchscreen-max-y */ -; +2 to #contacts \ Try to receive a mouse report packet. If one arrives within \ 20 milliseconds, return true and the decoded information. @@ -43,15 +29,13 @@ r> r> r> 4drop false exit ( -- false ) then ( flags r: z y x ) - r> scale-x ( flags x' r: z y ) - r> scale-y ( flags x y' r: z ) + r> r> scale-xy ( flags x' y' r: z ) 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 ) ; -true value absolute? : stream-poll? ( -- false | x y buttons true ) pad? if ( x y z down? contact# ) 0= if ( x y z down? ) @@ -64,42 +48,6 @@ then ( false | x y buttons 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 /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 -; - \ Display raw data from the device, stopping when a key is typed. : show-pad ( -- ) begin @@ -107,90 +55,10 @@ 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 ) -; - -: targets? ( -- flag ) true ; \ Used to be "final-test?" - -: track-init ( -- ) -\ 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 - targets? if - false to left-hit? - false to right-hit? - draw-left-target - draw-right-target - else - 0 d# 27 at-xy ." Touchscreen test. Hit both targets 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 - -: *3/5 ( n -- n' ) 3 5 */ ; -: dimmer ( color -- color' ) - 565>rgb rot *3/5 rot *3/5 rot *3/5 rgb>565 -; - : track ( x y z down? contact# -- ) setcolor ( x y z down? ) - 0= if - pixcolor @ dup dimmer " replace-color" $call-screen - 3drop exit + 0= if ( x y z ) + 3drop undot exit ( -- ) then ( x y z ) to pressure ( x y ) @@ -202,43 +70,6 @@ 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 ) - targets? 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 @@ -253,21 +84,8 @@ my-unit " set-address" $call-parent true \ Read once to prime the interrupt d# 10 " get" $call-parent 4drop 4drop 2drop - " dimensions" $call-screen to screen-h to screen-w - \ The "TI" tag controls the inverson of X and Y axes. - \ If the tag is missing, axes are not inverted. If present - \ and the value contains either of the letters x or y, the - \ corresponding axis is inverted. This is primarily for - \ development, using prototype touchscreens. - " TI" find-tag if ( adr len ) - begin dup while ( adr len ) - over c@ upc [char] x = if true to invert-x? then - over c@ upc [char] y = if true to invert-y? then - 1 /string ( adr' len' ) - repeat ( adr len ) - 2drop ( ) - then ( ) + set-geometry flush ; @@ -291,7 +109,7 @@ d# 4000 ms then - cursor-off track-init + cursor-off \ Consume already-queued keys to prevent premature exit begin key? while key drop repeat @@ -313,7 +131,6 @@ targets? if selftest-failed? else false then ; - end-package \ LICENSE_BEGIN Modified: cpu/arm/olpc/rm3150-touchscreen.fth ============================================================================== --- cpu/arm/olpc/rm3150-touchscreen.fth Tue Mar 13 23:02:15 2012 (r2892) +++ cpu/arm/olpc/rm3150-touchscreen.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -3,17 +3,21 @@ 0 0 " 4,60" " /twsi" begin-package my-space encode-int my-address encode-int encode+ " reg" property -" touchscreen" name -0 value screen-w -0 value screen-h +\ XXX these are really platform-related, not touchscreen-related +: targets? ( -- flag ) final-test? ; +: .tsmsg ( -- ) 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr ; + +fload ${BP}/cpu/arm/olpc/touchscreen-common.fth + +d# 896 to touchscreen-max-x +d# 672 to touchscreen-max-y + +d# 10 to #contacts : ts-b! ( b reg# -- ) " smbus-b!" $call-parent ; : ts-b@ ( reg# -- b ) " smbus-b@" $call-parent ; -d# 896 constant touchscreen-max-x -d# 672 constant touchscreen-max-y - : 4b>xy ( x.hi x.lo y.hi y.lo -- x y ) swap bwjoin >r swap bwjoin r> ; : touchscreen-present? ( -- flag ) @@ -35,227 +39,60 @@ touchscreen-present? dup if ( okay? ) 0 1 ts-b! ( okay? ) \ Set to polled mode then ( okay? ) - " dimensions" $call-screen to screen-h to screen-w -; - -: dimensions ( -- w h ) screen-w screen-h ; - -: #contacts ( -- n ) d# 10 ; - -: pad-events ( -- n*[ x.hi x.lo y.hi y.lo z ] #contacts ) - d# 99 gpio-pin@ if false exit then - h# 10 ts-b@ h# 7f and >r ( r: #contacts ) - r@ if ( r: #contacts ) - h# 11 1 r@ 5 * " smbus-out-in" $call-parent ( n*[ x.hi x.lo y.hi y.lo z ] r: #contacts ) - then ( n*[ x.hi x.lo y.hi y.lo z ] r: #contacts ) - r> ( n*[ x.hi x.lo y.hi y.lo z ] #contacts ) -; - -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 /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 -; - -: scale-xy ( x y -- x' y' ) - swap screen-w touchscreen-max-x */ - swap screen-h touchscreen-max-y */ -; - -0 [if] -\ 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 + set-geometry ; -: flush ( -- ) begin d# 10 ms pad? while 2drop 3drop repeat ; +: touched? ( -- flag ) d# 99 gpio-pin@ 0= ; +: #touches ( -- n ) h# 10 ts-b@ h# 7f and ; -\ Display raw data from the device, stopping when a key is typed. -: show-pad ( -- ) - begin - pad? if . . . . . cr then - key? until +: pad-events ( -- n*[ x.hi x.lo y.hi y.lo z ] #touches ) + touched? 0= if false exit then + #touches >r r@ if ( r: #touches ) + h# 11 1 r@ 5 * " smbus-out-in" $call-parent ( n*[ x.hi x.lo y.hi y.lo z ] r: #touches ) + then ( n*[ x.hi x.lo y.hi y.lo z ] r: #touches ) + r> ( n*[ x.hi x.lo y.hi y.lo z ] #touches ) ; -[then] : close ( -- ) \ flush h# 82 1 ts-b! \ Restore default interrupt mode ; -: 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 ( -- ) - 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 -; - -: *3/5 ( n -- n' ) 3 5 */ ; -: dimmer ( color -- color' ) - 565>rgb rot *3/5 rot *3/5 rot *3/5 rgb>565 -; - -: setcolor ( contact# -- ) - case - 0 of cyan endof - 1 of yellow endof - 2 of magenta endof - 3 of blue endof - 4 of red endof - 5 of green endof - 6 of cyan dimmer endof - 7 of yellow dimmer endof - 8 of magenta dimmer endof - 9 of blue dimmer endof - d# 10 of red dimmer endof - d# 11 of green dimmer endof - ( default ) white swap - endcase - - pixcolor ! -; -0 value pressure - -: track-n ( .. xhi xlo yhi ylo z #contacts -- ) - ?dup 0= if exit then ( .. xhi xlo yhi ylo z #contacts -- ) +: track-n ( .. xhi xlo yhi ylo z #touches -- ) + ?dup 0= if exit then ( .. xhi xlo yhi ylo z #touches -- ) 1- 0 swap do ( .. xhi xlo yhi ylo z ) i setcolor ( .. xhi xlo yhi ylo z ) to pressure ( .. xhi xlo yhi ylo ) 4b>xy scale-xy ( .. x y ) - final-test? if ( .. x y ) - ?hit-target ( .. x y ) - then ( .. x y ) + targets? if ?hit-target then ( .. x y ) + dot -1 +loop ; -: handle-key ( -- exit? ) - key upc case - [char] P of - cursor-on - cr last-10 - key drop - background - false - endof - - ( key ) true swap - endcase +0 0 2value last-xy +false value last-down? +: no-touch ( -- false | x y buttons true ) + last-down? if + \ Return up event for last "mouse" position + false to last-down? + last-xy 0 true + else + false + then ; - -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 ? ) +: touch ( -- false | x y buttons true ) + #touches 0= if false exit then + h# 11 1 4 " smbus-out-in" $call-parent ( x.hi x.lo y.hi y.lo ) + 4b>xy scale-xy ( x y ) + 2dup to last-xy ( x y ) + true to last-down? ( x y ) + 1 true ( x y buttons true ) +; +: stream-poll? ( -- false | x y buttons true ) + touched? if touch else no-touch then ; - : discard-n ( .. #events -- ) 5 * 0 ?do drop loop ; : selftest ( -- error? ) @@ -272,7 +109,7 @@ d# 4000 ms then - cursor-off track-init + cursor-off \ Consume already-queued keys to prevent premature exit begin key? while key drop repeat Added: cpu/arm/olpc/touchscreen-common.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/touchscreen-common.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -0,0 +1,195 @@ +\ See license at end of file +purpose: Common code for touchscreen drivers and diags + +" touchscreen" name + +true value absolute? + +0 value touchscreen-max-x +0 value touchscreen-max-y + +0 value screen-w +0 value screen-h + +0 value #contacts + +\ External interface method +: dimensions ( -- w h ) screen-w screen-h ; + +0 instance value invert-x? +0 instance value invert-y? + +: set-geometry ( -- ) + " dimensions" $call-screen to screen-h to screen-w + + \ The "TI" tag controls the inverson of X and Y axes. + \ If the tag is missing, axes are not inverted. If present + \ and the value contains either of the letters x or y, the + \ corresponding axis is inverted. This is primarily for + \ development, using prototype touchscreens. + " TI" find-tag if ( adr len ) + begin dup while ( adr len ) + over c@ upc [char] x = if true to invert-x? then + over c@ upc [char] y = if true to invert-y? then + 1 /string ( adr' len' ) + repeat ( adr len ) + 2drop ( ) + then ( ) +; + +: scale-x ( x -- x' ) + invert-x? if touchscreen-max-x swap - then + screen-w touchscreen-max-x */ +; +: scale-y ( y -- y' ) + invert-y? if touchscreen-max-y swap - then + screen-h touchscreen-max-y */ +; + +: scale-xy ( x y -- x' y' ) swap scale-x swap scale-y ; + + +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 + +: *3/5 ( n -- n' ) 3 5 */ ; +: dimmer ( color -- color' ) + 565>rgb rot *3/5 rot *3/5 rot *3/5 rgb>565 +; + +h# 4 value y-offset + +: 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 ) +; + +: 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 ( ) +; + +: undot ( -- ) pixcolor @ dup dimmer " replace-color" $call-screen ; + +: background ( -- ) + black 0 0 screen-w screen-h fill-rectangle-noff + targets? if + false to left-hit? + false to right-hit? + draw-left-target + draw-right-target + else + .tsmsg + then +; + +: setcolor ( contact# -- ) + case + 0 of cyan endof + 1 of yellow endof + 2 of magenta endof + 3 of blue endof + 4 of red endof + 5 of green endof + 6 of cyan dimmer endof + 7 of yellow dimmer endof + 8 of magenta dimmer endof + 9 of blue dimmer endof + d# 10 of red dimmer endof + d# 11 of green dimmer endof + ( default ) white swap + endcase + + pixcolor ! +; + +: handle-key ( -- exit? ) true ; + +false value selftest-failed? \ Success/failure flag for final test mode +: exit-test? ( -- flag ) + targets? 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 ? ) +; + +0 value pressure + +\ LICENSE_BEGIN +\ Copyright (c) 2012 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/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Tue Mar 13 23:02:15 2012 (r2892) +++ cpu/x86/pc/olpc/via/mfgtest.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -155,7 +155,7 @@ : quit-item ( -- ) menu-done ; : init-menu ( -- ) - ?open-screen ?open-mouse + ?open-screen ?open-mouse ?open-touchscreen #mfgrows to rows #mfgcols to cols d# 180 to sq-size Modified: ofw/gui/dialog.fth ============================================================================== --- ofw/gui/dialog.fth Tue Mar 13 23:02:15 2012 (r2892) +++ ofw/gui/dialog.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -201,6 +201,21 @@ ['] selected? find-node nip ( node ) " next-enum" run-method ( ) ; +: get-key-code ( -- c | c 9b ) + key case + \ Distinguish between a bare ESC and an ESC-[ sequence + esc of + d# 10 ms key? if + key [char] [ = if key csi else esc then + else + esc + then + endof + + csi of key csi endof + dup + endcase +; : controls-key ( list -- done? ) key? if >r Modified: ofw/gui/graphics.fth ============================================================================== --- ofw/gui/graphics.fth Tue Mar 13 23:02:15 2012 (r2892) +++ ofw/gui/graphics.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -22,7 +22,6 @@ \ \\\\\\\\\\\\\\\\ \needs screen-ih 0 value screen-ih -0 value mouse-ih : $call-screen ( ??? adr len -- ??? ) screen-ih $call-method ; : screen-execute ( ?? xt -- ?? ) screen-ih package( execute )package ; @@ -58,10 +57,6 @@ then ; -: get-event ( #msecs -- false | x y buttons true ) - " get-event" mouse-ih $call-method -; - : screen-color! ( r g b color# -- ) " color!" $call-screen ; : screen-color@ ( color# -- r g b ) " color@" $call-screen ; : screen-set-colors ( clut color# #colors -- ) Modified: ofw/gui/iconmenu.fth ============================================================================== --- ofw/gui/iconmenu.fth Tue Mar 13 23:02:15 2012 (r2892) +++ ofw/gui/iconmenu.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -20,18 +20,6 @@ \ keyboard input removes mouse cursor and moves mouse to selected square \ keyboard input (arrows) always moves to an occupied square -\ need: -\ put text into square - -\ have: -\ fill-rectangle ( color x y w h - ) color is 0..255 -\ draw-rectangle ( address x y w h - ) address of 128x128 pixmap -\ read-rectangle ( address x y w h - ) -\ move-mouse-cursor ( x y - ) -\ remove-mouse-cursor ( - ) -\ poll-mouse ( -- x y buttons ) -\ get-event ( #msecs -- false | x y buttons true ) - hex \ Icon layout parameters @@ -424,15 +412,24 @@ then ( ) ; -: do-mouse ( - ) +: do-mouse ( -- ) mouse-ih 0= if exit then begin mouse-event? while ( x y buttons ) - remove-mouse-cursor + remove-mouse-cursor ( x y buttons ) -rot update-position ( buttons ) new-sq? draw-mouse-cursor repeat ; +: do-touchscreen ( -- ) + touchscreen-ih 0= if exit then + begin touchscreen-event? while ( x y buttons ) + remove-mouse-cursor ( x y buttons ) + -rot set-xy ( buttons ) + new-sq? + draw-mouse-cursor + repeat +; headers : centered ( adr y w h -- ) @@ -496,7 +493,7 @@ draw-mouse-cursor false to done? - begin do-mouse do-key done? until + begin do-touchscreen do-mouse do-key done? until false to done? remove-mouse-cursor @@ -566,6 +563,7 @@ \ Install menu-or-quit in the "user-interface" defer word later, \ when a root menu is defined. headers + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: ofw/gui/mouse.fth ============================================================================== --- ofw/gui/mouse.fth Tue Mar 13 23:02:15 2012 (r2892) +++ ofw/gui/mouse.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -3,6 +3,8 @@ headerless +0 value mouse-ih + false value mouse-absolute? \ True if coordinates are absolute \ Current mouse cursor position @@ -155,8 +157,9 @@ : clamp ( n min max - m ) rot min max ; +: set-xy ( x y -- ) to ypos to xpos ; : update-position ( x y -- ) - mouse-absolute? if to ypos to xpos exit then + mouse-absolute? if set-xy exit then 2dup or 0= if 2drop exit then \ Avoid flicker if there is no movement \ Minimize the time the cursor is down by doing computation in advance @@ -164,24 +167,9 @@ \ this optimization is probable unnoticeable, but it doesn't cost much. negate ypos + 0 max-y cursor-h - clamp ( x y' ) swap xpos + 0 max-x cursor-w - clamp ( y' x') - to xpos to ypos + swap set-xy ; -: get-key-code ( -- c | c 9b ) - key case - \ Distinguish between a bare ESC and an ESC-[ sequence - esc of - d# 10 ms key? if - key [char] [ = if key csi else esc then - else - esc - then - endof - - csi of key csi endof - dup - endcase -; headers 0 value close-mouse? @@ -215,6 +203,32 @@ " stream-poll?" mouse-ih $call-method ; +0 value touchscreen-ih + +0 value close-touchscreen? + +: ?close-touchscreen ( -- ) + close-touchscreen? if + touchscreen-ih close-dev + 0 to touchscreen-ih + hardware-cursor? if + false to hardware-cursor? + " cursor-off" $call-screen + then + then +; +: ?open-touchscreen ( -- ) + touchscreen-ih 0= dup to close-touchscreen? if + " touchscreen" open-dev is touchscreen-ih + touchscreen-ih 0= if + " /touchscreen" open-dev to touchscreen-ih + then + then +; +: touchscreen-event? ( -- false | x y buttons true ) + " stream-poll?" touchscreen-ih $call-method +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: ofw/gui/textfld.fth ============================================================================== --- ofw/gui/textfld.fth Tue Mar 13 23:02:15 2012 (r2892) +++ ofw/gui/textfld.fth Thu Mar 15 00:19:06 2012 (r2893) @@ -115,7 +115,7 @@ (key remove-mouse-cursor exit then mouse-ih if - begin 10 get-event while + begin mouse-event? while remove-mouse-cursor -rot update-position draw-mouse-cursor

1 0

[commit] r2892 - in cpu: arm/olpc/1.75 arm/olpc/3.0 x86/pc/olpc x86/pc/olpc/via
by repository service 13 Mar '12

13 Mar '12

Author: wmb Date: Tue Mar 13 23:02:15 2012 New Revision: 2892 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2892 Log: OLPC trac 11696 - fixed NANDblaster receive bug that affected only XO-1, but switched to fixed version of NANDblaster source for all OLPC platforms. Modified: cpu/arm/olpc/1.75/mcnand-version.fth cpu/arm/olpc/3.0/mcnand-version.fth cpu/x86/pc/olpc/versions.fth cpu/x86/pc/olpc/via/mcnand-version.fth Modified: cpu/arm/olpc/1.75/mcnand-version.fth ============================================================================== --- cpu/arm/olpc/1.75/mcnand-version.fth Tue Mar 13 22:59:17 2012 (r2891) +++ cpu/arm/olpc/1.75/mcnand-version.fth Tue Mar 13 23:02:15 2012 (r2892) @@ -3,6 +3,6 @@ \ With a specific ID, mcastnand.bth will download a tarball without .git stuff. \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ \ is not already present, then you can modify the git subtree as needed. -macro: MCNAND_VERSION ac8bfc65fb2fbb6bc2f6d14226ec74b11530492a +macro: MCNAND_VERSION 9542feb \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD Modified: cpu/arm/olpc/3.0/mcnand-version.fth ============================================================================== --- cpu/arm/olpc/3.0/mcnand-version.fth Tue Mar 13 22:59:17 2012 (r2891) +++ cpu/arm/olpc/3.0/mcnand-version.fth Tue Mar 13 23:02:15 2012 (r2892) @@ -3,6 +3,6 @@ \ With a specific ID, mcastnand.bth will download a tarball without .git stuff. \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ \ is not already present, then you can modify the git subtree as needed. -macro: MCNAND_VERSION ac8bfc65fb2fbb6bc2f6d14226ec74b11530492a +macro: MCNAND_VERSION 9542feb \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Tue Mar 13 22:59:17 2012 (r2891) +++ cpu/x86/pc/olpc/versions.fth Tue Mar 13 23:02:15 2012 (r2892) @@ -26,6 +26,6 @@ \ With a specific ID, mcastnand.bth will download a tarball without .git stuff. \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ \ is not already present, then you can modify the git subtree as needed. -macro: MCNAND_VERSION af0cadd1cbfb17ddfa7dcf299c4c3662ad7120a4 +macro: MCNAND_VERSION 9542feb \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD Modified: cpu/x86/pc/olpc/via/mcnand-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/mcnand-version.fth Tue Mar 13 22:59:17 2012 (r2891) +++ cpu/x86/pc/olpc/via/mcnand-version.fth Tue Mar 13 23:02:15 2012 (r2892) @@ -3,6 +3,6 @@ \ With a specific ID, mcastnand.bth will download a tarball without .git stuff. \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ \ is not already present, then you can modify the git subtree as needed. -macro: MCNAND_VERSION ac8bfc65fb2fbb6bc2f6d14226ec74b11530492a +macro: MCNAND_VERSION 9542feb \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD

1 0

[commit] r2891 - cpu/arm
by repository service 13 Mar '12

13 Mar '12

Author: wmb Date: Tue Mar 13 22:59:17 2012 New Revision: 2891 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2891 Log: ARM - default to passing flattened device tree to Linux. Modified: cpu/arm/linux.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Fri Mar 9 00:08:57 2012 (r2890) +++ cpu/arm/linux.fth Tue Mar 13 22:59:17 2012 (r2891) @@ -89,7 +89,7 @@ 0 tag-l, \ ATAG_NONE ; -0 value use-fdt? +true value use-fdt? : use-fdt ( -- ) true to use-fdt? ; : linux-fixup ( -- )

1 0

[commit] r2890 - cpu/x86/pc/olpc/via
by repository service 09 Mar '12

09 Mar '12

Author: quozl Date: Fri Mar 9 00:08:57 2012 New Revision: 2890 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2890 Log: OLPC - autorun-mfg-tests showed uninitialised menu items, fix #11688 Modified: cpu/x86/pc/olpc/via/mfgtest.fth Modified: cpu/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Mon Mar 5 06:37:00 2012 (r2889) +++ cpu/x86/pc/olpc/via/mfgtest.fth Fri Mar 9 00:08:57 2012 (r2890) @@ -167,10 +167,14 @@ defer test-menu-items -: full-menu ( -- ) +: tiny-menu ( -- ) init-menu clear-menu test-menu-items +; + +: full-menu ( -- ) + tiny-menu " Run all non-interactive tests. (Press a key between tests to stop.)" ['] play-item play.icon 0 1 selected install-icon @@ -183,11 +187,10 @@ ' noop to do-title : autorun-mfg-tests ( -- ) - init-menu ['] run-menu behavior >r ['] mfg-test-autorunner to run-menu \ Run menu automatically true to diag-switch? - ['] test-menu-items ['] nest-menu catch drop + ['] tiny-menu ['] nest-menu catch drop r> to run-menu false to diag-switch? restore-scroller-bg

1 0

[commit] r2889 - cpu/arm/olpc/1.75
by repository service 05 Mar '12

05 Mar '12

Author: quozl Date: Mon Mar 5 06:37:00 2012 New Revision: 2889 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2889 Log: Q4D05 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Fri Mar 2 23:20:59 2012 (r2888) +++ cpu/arm/olpc/1.75/fw-version.fth Mon Mar 5 06:37:00 2012 (r2889) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 04 +macro: FW_MINOR 05

1 0

[commit] r2888 - cpu/x86/pc/olpc
by repository service 02 Mar '12

02 Mar '12

Author: wmb Date: Fri Mar 2 23:20:59 2012 New Revision: 2888 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2888 Log: OLPC - change hex-decode to store the decoded information in-place, thus eliminating the need for auxiliary buffers. Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Wed Feb 29 23:45:54 2012 (r2887) +++ cpu/x86/pc/olpc/security.fth Fri Mar 2 23:20:59 2012 (r2888) @@ -193,18 +193,26 @@ d# 256 constant /sig /sig buffer: sig-buf -\ hex-decode decodes a hexadecimal signature string, storing it in -\ binary form at sig-buf. It returns the adr,len of the binary string. +h# 10e constant /key +/key buffer: key-buf -: hex-decode ( hex$ -- true | sig$ false ) - sig-buf -rot ( adr hex$ ) - bounds ?do ( adr ) - i 2 push-hex $number pop-base if ( adr ) - 2drop true unloop exit - then ( adr n ) - over c! 1+ ( adr' ) - 2 +loop ( adr ) - sig-buf tuck - false ( sig$ false ) +\ $hex-decode decodes a hexadecimal signature string, storing it in +\ binary form at adr, returning adr,len of the binary string and false. +\ It returns true if hex$ is too long for the binary buffer length +\ maxlen or if hex$ contains a non-hexadecimal character. + +: $hex-decode ( hex$ adr maxlen -- true | binary$ false ) + 2* third < if ( hex$ adr ) + 3drop true exit ( -- true ) + then ( hex$ adr ) + dup 2swap ( adr adr hex$ ) + bounds ?do ( adr nextadr ) + i 2 push-hex $number pop-base if ( adr nextadr ) + 2drop true unloop exit ( -- true ) + then ( adr nextadr n ) + over c! 1+ ( adr nextadr' ) + 2 +loop ( adr nextadr ) + over - false ( binary$ false ) ; \ cut$ splits a string into an initial substring of length n @@ -230,11 +238,8 @@ then ( rem$ ) bl left-parse-string 2drop ( rem$ ) \ Discard hash name bl left-parse-string 2nip ( key$ ) \ Get key signature - /sig 2* min hex-decode if ( key$ ) - 2drop true ( true ) - exit - then ( binary-key$ ) - false ( binary-key$ false ) + + key-buf /key $hex-decode ( true | binary-key$ false ) ; \ True if short$ matches the end of long$ @@ -472,13 +477,14 @@ \ Check that the keyid matches our pubkey bl left-parse-string ( line$' keyid$ ) - /sig 2* min hex-decode if ( line$ ) + key-buf /key $hex-decode if ( line$ ) 2drop false exit - then ( line$ binary-key$ ) + then ( line$ binary-keyid$ ) key-in-list? 0= if ( line$ ) 2drop false exit then ( line$ ) + \ Now thiskey$ contains the full key$ that was matched by keyid$ \ Check that the signature occupies the rest of the line bl left-parse-string ( line$' sig$ ) @@ -487,21 +493,18 @@ 2drop false exit then ( sig$ ) - dup /sig 2* <> if ( sig$ ) - 2drop false exit - then ( sig$ ) - - hex-decode if ( ) + sig-buf /sig $hex-decode if ( ) false exit then ( binary-sig$ ) + dup /sig <> if ( binary-sig$ ) + 2drop false exit + then ( binary-sig$ ) + \ Cryptographically verify the data against the signature 2>r 0 signed-data$ 2r> thiskey$ exp-hashname$ signature-bad? 0= ; -h# 10e constant /key -/key buffer: keybuf - 0 0 2value sig02-key$ 0 0 2value expiry$ @@ -517,17 +520,14 @@ \ Check that the keyid matches our pubkey, but only if it's \ the first one bl left-parse-string ( line$' pubkey$ ) - hex-decode if ( line$ ) - 2drop false unloop exit + + key-buf /key $hex-decode if ( line$ ) + 2drop false unloop exit ( -- false ) then ( line$ binary-key$ ) - i if ( line$ binary-key$ ) - dup /key <> if ( line$ binary-key$ ) - 4drop false unloop exit - then ( line$ binary-key$ ) - tuck keybuf swap move ( line$ binary-keylen ) - keybuf swap ( line$ binary-key$' ) - else ( line$ binary-keyid$ ) + dup /key <> if ( line$ binary-keyid$ ) + \ If the length is shorter than a full key, it's a keyid + \ which we look for in our key list key-in-list? 0= if ( line$ ) 2drop false unloop exit then ( line$ ) @@ -544,14 +544,14 @@ \ Get the signature bl left-parse-string ( line$ sig$) - dup /sig 2* <> if ( line$ sig$ ) - 4drop false unloop exit - then ( line sig$ ) - - hex-decode if ( line$ ) - 2drop false unloop exit + sig-buf /sig $hex-decode if ( line$ ) + 2drop false unloop exit ( -- false ) then ( line$ binary-sig$ ) + dup /sig <> if ( line$ binary-sig$ ) + 4drop false unloop exit + then ( line binary-sig$ ) + 2>r ( line$' r: binary-sig$ ) \ If it's the final signature, check the signed data @@ -1349,6 +1349,19 @@ time&date >iso8601$ " md" $add-tag ; +\ The following is for compatibility with the script fsverify.fth . +\ fs-verify only needs h#20 bytes, that being the length of a sha256 hash +\ in binary form, but we give it h#100 as that is the previous length of +\ hex-decode's buffer. Since buffer: uses lazy allocation, we won't waste +\ space unless compat-buf is actually used. + +h# 100 constant /compat-buf \ Large enough for sha512 +/compat-buf buffer: compat-buf + +: hex-decode ( hex$ -- true | binary$ false ) + compat-buf /compat-buf $hex-decode +; + \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks \

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware March 2012