[openfirmware] [commit] r3437 - in cpu/arm/olpc: . 4.0
repository service
svn at openfirmware.info
Fri Nov 16 02:17:56 CET 2012
Author: quozl
Date: Fri Nov 16 02:17:56 2012
New Revision: 3437
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3437
Log:
OLPC XO-4 - new touchscreen firmware 0.0.0.8 with four finger support, slight compensating changes to timing of deactivate, avoid expecting boot complete message unless a reset is done.
Modified:
cpu/arm/olpc/4.0/nn-version.fth
cpu/arm/olpc/nn-touchscreen.fth
cpu/arm/olpc/nnflash.fth
Modified: cpu/arm/olpc/4.0/nn-version.fth
==============================================================================
--- cpu/arm/olpc/4.0/nn-version.fth Thu Nov 15 23:25:41 2012 (r3436)
+++ cpu/arm/olpc/4.0/nn-version.fth Fri Nov 16 02:17:56 2012 (r3437)
@@ -1,2 +1,2 @@
\ The Neonode touchscreen firmware
-macro: NN_VERSION 0_0_0_7
+macro: NN_VERSION 0_0_0_8
Modified: cpu/arm/olpc/nn-touchscreen.fth
==============================================================================
--- cpu/arm/olpc/nn-touchscreen.fth Thu Nov 15 23:25:41 2012 (r3436)
+++ cpu/arm/olpc/nn-touchscreen.fth Fri Nov 16 02:17:56 2012 (r3437)
@@ -108,6 +108,9 @@
2drop ( )
;
+: flush-input ( -- )
+ 0 0 anticipate
+;
: read-boot-complete ( -- )
@@ -135,7 +138,7 @@
: start ( -- ) h# 04 h# 01 h# ee 3 bytes-out ;
: deactivate ( -- )
- h# 00 h# 01 h# ee 3 bytes-out h# 00 d# 20 anticipate
+ h# 00 h# 01 h# ee 3 bytes-out h# 00 d# 60 anticipate
;
: deconfigure ( -- )
@@ -164,11 +167,13 @@
." no response to reset" cr
pbuf-free false exit
then
- then
- ['] read-boot-complete catch ?dup if
- .error
- ." failed to boot" cr
- pbuf-free false exit
+ ['] read-boot-complete catch ?dup if
+ .error
+ ." failed to boot" cr
+ pbuf-free false exit
+ then
+ else
+ flush-input
then
['] configure catch ?dup if
.error
Modified: cpu/arm/olpc/nnflash.fth
==============================================================================
--- cpu/arm/olpc/nnflash.fth Thu Nov 15 23:25:41 2012 (r3436)
+++ cpu/arm/olpc/nnflash.fth Fri Nov 16 02:17:56 2012 (r3437)
@@ -54,7 +54,7 @@
: update-nn-flash? ( -- flag )
\ XO-4 B1 have clear lightguides incompatible with later versions
\ of touchscreen firmware.
- \ (disabled temporarily so that automatic update can be tested)
+ \ (disabled temporarily so that automatic update can be tested)
\ board-revision h# 4b20 < if false exit then
nn-image$ nn-up-to-date? 0=
;
More information about the openfirmware
mailing list