[commit] r2742 - cpu/arm/olpc

[repository service]

Author: wmb
Date: Tue Dec  6 13:57:33 2011
New Revision: 2742
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2742

Log:
OLPC XO-3 - Platform ID -> 10000, fixed touchscreen driver.

Modified:
   cpu/arm/olpc/build-fw.fth
   cpu/arm/olpc/exc7200-touchscreen.fth

Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth	Tue Dec  6 13:57:29 2011	(r2741)
+++ cpu/arm/olpc/build-fw.fth	Tue Dec  6 13:57:33 2011	(r2742)
@@ -438,7 +438,8 @@
    " /usb" " reset-usb" execute-device-method drop
 ;

-d# 9999 to arm-linux-machine-type  \ Marvell Jasper
++ olpc-cl2 d#  9999 to arm-linux-machine-type  \ XO-1.75
++ olpc-cl3 d# 10000 to arm-linux-machine-type  \ XO-3

\ Add a tag describing the linear frame buffer
 : mmp-fb-tag,  ( -- )
@@ -740,8 +741,8 @@
 device-end
 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/exc7200-touchscreen.fth    \ Touchscreen driver and diagnostic
-fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth    \ Touchscreen driver and diagnostic
++ olpc-cl3 fload ${BP}/cpu/arm/olpc/exc7200-touchscreen.fth    \ Touchscreen driver and diagnostic
++ olpc-cl2 fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth    \ Touchscreen driver and diagnostic
 fload ${BP}/cpu/arm/olpc/roller.fth     \ Accelerometer test

\ fload ${BP}/cpu/arm/olpc/pinch.fth  \ Touchscreen gestures

Modified: cpu/arm/olpc/exc7200-touchscreen.fth
==============================================================================
--- cpu/arm/olpc/exc7200-touchscreen.fth	Tue Dec  6 13:57:29 2011	(r2741)
+++ cpu/arm/olpc/exc7200-touchscreen.fth	Tue Dec  6 13:57:33 2011	(r2742)
@@ -69,7 +69,11 @@
 h# 7fff constant touchscreen-max-x
 h# 7fff constant touchscreen-max-y

+: invert-x  ( x y -- x' y )  touchscreen-max-x rot - swap  ;
+: invert-y  ( x y -- x y' )  touchscreen-max-y swap -  ;
+
 : scale-xy  ( x y -- x' y' )
+   invert-x  invert-y
    swap screen-w touchscreen-max-x */
    swap screen-h touchscreen-max-y */
 ;