Author: wmb Date: 2007-08-22 03:05:10 +0200 (Wed, 22 Aug 2007) New Revision: 572
Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/gpioinit.fth cpu/x86/pc/olpc/micin.fth Log: OLPC trac #2767 - finish the job started by r571.
Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-08-21 20:49:43 UTC (rev 571) +++ cpu/x86/pc/olpc/devices.fth 2007-08-22 01:05:10 UTC (rev 572) @@ -324,7 +324,7 @@ " SN" find-tag if 1- else " Unknown" then " serial-number" string-property
[ifndef] lx-devel - 8 ec-cmd " ec-version" integer-property + 8 ec-cmd-b@ " ec-version" integer-property
" PQ2" h# fff0.0000 h# 1.0000 sindex dup 0>= if ( offset ) h# fff0.0000 + cscount ( name )
Modified: cpu/x86/pc/olpc/gpioinit.fth =================================================================== --- cpu/x86/pc/olpc/gpioinit.fth 2007-08-21 20:49:43 UTC (rev 571) +++ cpu/x86/pc/olpc/gpioinit.fth 2007-08-22 01:05:10 UTC (rev 572) @@ -190,7 +190,7 @@ : fix-sirq ( -- ) [ifdef] lx-devel exit [then]
- 9 ec-cmd 9 <> if + 9 ec-cmd-b@ 9 <> if h# 5140.004e rdmsr swap h# 40 or swap h# 5140.004e wrmsr then ;
Modified: cpu/x86/pc/olpc/micin.fth =================================================================== --- cpu/x86/pc/olpc/micin.fth 2007-08-21 20:49:43 UTC (rev 571) +++ cpu/x86/pc/olpc/micin.fth 2007-08-22 01:05:10 UTC (rev 572) @@ -10,14 +10,14 @@ post-b1? if 2 >clr OUT_VAL gpio! \ 5536 GPIO01 else - 2 ec-cmd drop \ EC GPIO18 + 2 ec-cmd-b@ drop \ EC GPIO18 then ; : dc-mode ( -- ) post-b1? if 2 OUT_VAL gpio! \ 5536 GPIO01 else - 1 ec-cmd drop \ EC GPIO18 + 1 ec-cmd-b@ drop \ EC GPIO18 then ;