[openfirmware] [commit] r3507 - in cpu/arm/olpc: . 4.0

[repository service]

Author: quozl
Date: Thu Jan  3 23:51:07 2013
New Revision: 3507
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3507

Log:
OLPC XO-4 - touchscreen, update version to 0.0.0.10, print version in decimal, rely on CForth for clearing pull-up on TOUCH_HD#, change polarity of TOUCH_HD#, breaks automatic update from version 0.0.0.9 and earlier.  #12391

Modified:
   cpu/arm/olpc/4.0/nn-version.fth
   cpu/arm/olpc/nn-touchscreen.fth

Modified: cpu/arm/olpc/4.0/nn-version.fth
==============================================================================
--- cpu/arm/olpc/4.0/nn-version.fth	Thu Jan  3 00:16:35 2013	(r3506)
+++ cpu/arm/olpc/4.0/nn-version.fth	Thu Jan  3 23:51:07 2013	(r3507)
@@ -1,2 +1,2 @@
 \ The Neonode touchscreen firmware
-macro: NN_VERSION 0_0_0_9
+macro: NN_VERSION 0_0_0_10

Modified: cpu/arm/olpc/nn-touchscreen.fth
==============================================================================
--- cpu/arm/olpc/nn-touchscreen.fth	Thu Jan  3 00:16:35 2013	(r3506)
+++ cpu/arm/olpc/nn-touchscreen.fth	Thu Jan  3 23:51:07 2013	(r3507)
@@ -31,7 +31,9 @@
 0. 2value version#
 : get-version  ( -- version.d )  version#  ;
 
-: (.)'  ( version-segment.w -- )  (.) type  [char] . emit  ;
+: (.)'  ( version-segment.w -- )
+   push-decimal  (.)  type  [char] . emit  pop-base
+;
 
 : .version  ( version.d -- )  lwsplit (.)' (.)'  lwsplit (.)' (.)'  ;
 
@@ -71,10 +73,11 @@
 : hold-reset  ( -- )  touch-rst-gpio# gpio-clr  ;
 : no-data?  ( -- no-data? )  touch-int-gpio# gpio-pin@  ;
 : absent?  ( -- flag )
-   touch-hd-gpio# af@  +pull-dn  touch-hd-gpio# af!
-   1 ms
-   touch-hd-gpio# gpio-pin@
-   touch-hd-gpio# af@  0 +pull-dn invert and  touch-hd-gpio# af!
+   board-revision h# 4b20  >=  if
+      touch-hd-gpio# gpio-pin@  0=
+   else
+      false
+   then
 ;
 
 d# 250 constant /pbuf