[openfirmware] [commit] r3413 - cpu/arm/olpc

[repository service]

Author: quozl
Date: Sat Nov  3 00:17:39 2012
New Revision: 3413
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3413

Log:
OLPC XO-4 - touchscreen, as of firmware 0.0.0.7, the boot complete message communicates if the IR PCB is not attached

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

Modified: cpu/arm/olpc/nn-touchscreen.fth
==============================================================================
--- cpu/arm/olpc/nn-touchscreen.fth	Fri Nov  2 23:34:51 2012	(r3412)
+++ cpu/arm/olpc/nn-touchscreen.fth	Sat Nov  3 00:17:39 2012	(r3413)
@@ -110,7 +110,12 @@
 
 
 
-: read-boot-complete  ( -- )  h# 07 d# 0 anticipate  ;
+: read-boot-complete  ( -- )
+   0 pbuf 2+ c!
+   h# 07 d# 0 anticipate
+   pbuf 2+ c@ h# 07 <> abort" bad response"
+   pbuf 3 + c@  h# e0 = abort" missing IR PCB"
+;
 
 : read-version
    h# 1e h# 01 h# ee  3 bytes-out  h# 1e d# 100 anticipate
@@ -160,11 +165,13 @@
          pbuf-free  false  exit
       then
    then
-   ['] read-boot-complete  catch  if
-      ." no response on bus" cr
+   ['] read-boot-complete  catch  ?dup  if
+      .error
+      ." failed to boot" cr
       pbuf-free  false  exit
    then
-   ['] configure  catch  if
+   ['] configure  catch  ?dup  if
+      .error
       ." failed to configure" cr
       pbuf-free  false  exit
    then