Changeset 3439


Ignore:
Timestamp:
Nov 17, 2012 12:23:04 AM (6 months ago)
Author:
quozl
Message:

OLPC XO-4 - fix second open of touchscreen device, was caused by timing change that broke test-response, review and reword all aborts, guard the calls in selftest to prevent "No selftest method for /touchscreen", and avoid a second version check during boot

Location:
cpu/arm/olpc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • cpu/arm/olpc/nn-touchscreen.fth

    r3437 r3439  
    117117   0 pbuf 2+ c! 
    118118   h# 07 d# 0 anticipate 
    119    pbuf 2+ c@ h# 07 <> abort" bad response" 
     119   pbuf 2+ c@ h# 07 <> abort" response other than boot complete" 
    120120   pbuf 3 + c@  h# e0 = abort" missing IR PCB" 
    121121; 
    … …  
    123123: read-version 
    124124   h# 1e h# 01 h# ee  3 bytes-out  h# 1e d# 100 anticipate 
    125    pbuf 2+ c@ h# 1e <> abort" bad response" 
     125   pbuf 2+ c@ h# 1e <> abort" response other than status" 
    126126   pbuf 9 + le-w@  pbuf 7 + le-w@ wljoin  pbuf 5 + le-w@ pbuf 3 + le-w@ wljoin 
    127127   to version# 
    … …  
    224224      h# 40 h# 0 h# 0f 3 h# ee 5 bytes-out \ fss full level 
    225225      0 pbuf 2+ c! 
    226       h# 0f d# 30 anticipate 
    227       pbuf 2+ c@ dup 0= abort" no response to fss" 
    228       h# 0f <> abort" bad response to fss" 
     226      h# 0f d# 130 anticipate 
     227      pbuf 2+ c@ dup 0= abort" missing response after fixed signal strength" 
     228      h# 0f <> abort" response other than fixed signal strength" 
    229229   loop 
    230230; 
    … …  
    384384   h# 21 h# 02 h# ee  4 bytes-out 
    385385   h# 21 d# 30 anticipate 
    386    pbuf 2+ c@ h# 21 <> abort" bad response" 
     386   pbuf 2+ c@ h# 21 <> abort" response other than open short" 
    387387 
    388388   pbuf d#  5 +                         ( addr ) 
    … …  
    444444   d# 64 swap h# 0f h# 03 h# ee  5 bytes-out 
    445445   h# 0f d# 20 anticipate 
    446    pbuf 2+ c@ h# 0f <> abort" bad response" 
     446   pbuf 2+ c@ h# 0f <> abort" response other than fixed signal strength" 
    447447   8sp 
    448448   push-decimal 
    … …  
    579579   h# 0d h# 02 h# ee  4 bytes-out 
    580580   h# 0d d# 200 anticipate 
    581    pbuf 2+ c@ h# 0d <> abort" bad response" 
     581   pbuf 2+ c@ h# 0d <> abort" response other than low signals" 
    582582 
    583583   8sp 
    … …  
    10391039   \ MB FINAL 
    10401040   \ MB SHIP 
    1041    open  0=  if 
     1041   ['] open  catch  ?dup  if 
     1042      .error 
    10421043      ." No touchscreen present" cr  false exit 
    10431044   then 
    … …  
    10521053   then 
    10531054 
    1054    test-response 
     1055   ['] test-response  guarded 
    10551056   test-station 6 =  if  d# 86400.000 to test-timeout  then 
    1056    scribble 
     1057   ['] scribble  guarded 
    10571058 
    10581059   close false 

  • cpu/arm/olpc/nnflash.fth

    r3437 r3439  
    4545 
    4646: update-nn-flash  ( -- ) 
    47    nn-image$  2dup nn-up-to-date?  if 
    48       2drop 
    49    else 
    50       reflash-nn 
    51    then 
     47   nn-image$  reflash-nn 
    5248; 
    5349 
Note: See TracChangeset for help on using the changeset viewer.