Author: wmb Date: 2007-09-25 06:30:34 +0200 (Tue, 25 Sep 2007) New Revision: 635
Modified: dev/geode/acpi.fth dev/olpc/kb3700/ecio.fth Log: OLPC - second try to guard again bricks due to pressing the power button at the wrong time.
Modified: dev/geode/acpi.fth =================================================================== --- dev/geode/acpi.fth 2007-09-19 23:58:43 UTC (rev 634) +++ dev/geode/acpi.fth 2007-09-25 04:30:34 UTC (rev 635) @@ -14,6 +14,9 @@
: enable-power-button ( -- ) 2 acpi-w@ h# 100 or 2 acpi-w! ; : disable-power-button ( -- ) 2 acpi-w@ h# 100 invert and 2 acpi-w! ; +: ignore-power-button ( -- ) 0 h# 40 pm! ; +\ Shorten off delay to .5 sec +: quick-power-button ( -- ) d# 32768 pm-enable or h# 40 pm! ;
h# 4000.0000 constant pm-enable : gx-power-off ( -- ) @@ -44,7 +47,7 @@ stand-init h# 5140.000e rdmsr drop h# fff0 and to acpi-base h# 5140.000f rdmsr drop h# fff0 and to pm-base - d# 32768 pm-enable or h# 40 pm! \ Shorten off delay to .5 sec + quick-power-button ; warning !
Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-09-19 23:58:43 UTC (rev 634) +++ dev/olpc/kb3700/ecio.fth 2007-09-25 04:30:34 UTC (rev 635) @@ -251,9 +251,8 @@ : io-spi-out ( b -- ) spicmd! spi-cmd-wait ;
: io-spi-reprogrammed ( -- ) - ." Powering off..." d# 2000 ms cr - power-off -\ kbc-on + ." Restarting..." d# 2000 ms cr + kbc-on \ ." Keyboard back on" cr ;
@@ -266,8 +265,8 @@
7 to spi-us \ Measured time for "1 fea9 ec!" is 7.9 uS
+ ignore-power-button \ Guard against the user panicing kbc-off - disable-power-button \ Guard against the user panicing ; : use-local-ec ( -- ) ['] io-spi-start to spi-start ; use-local-ec