[commit] r3500 - cpu/x86/pc/olpc/via

[repository service]

Author: quozl
Date: Sat Dec 15 06:14:47 2012
New Revision: 3500
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3500

Log:
OLPC - allow a touchscreen, if present, to prevent automatic test execution after left rocker key, #11817

Modified:
   cpu/x86/pc/olpc/via/mfgtest.fth

Modified: cpu/x86/pc/olpc/via/mfgtest.fth
==============================================================================
--- cpu/x86/pc/olpc/via/mfgtest.fth	Fri Dec 14 19:27:33 2012	(r3499)
+++ cpu/x86/pc/olpc/via/mfgtest.fth	Sat Dec 15 06:14:47 2012	(r3500)
@@ -202,7 +202,8 @@
    (cr kill-line
    0  d# 30  do
       i d# 10 mod 0=  if  (cr i d# 10 / .d  then
-      mouse-event?  dup  if  nip nip nip  then  ( moused? )
+      touchscreen-event?  dup  if  nip nip nip  then  ( touched? )
+      mouse-event?  dup  if  nip nip nip  then  or  ( touched-or-moused? )
       key?  or  if                     ( )
     drop                          ( )
     menu-interact                 ( )