Author: wmb Date: 2009-08-19 21:30:38 +0200 (Wed, 19 Aug 2009) New Revision: 1302
Modified: cpu/x86/pc/olpc/via/ioinit.fth dev/olpc/dcon/viadcon.fth Log: Via - Fixes to DCONLOAD code for B-test.
Modified: cpu/x86/pc/olpc/via/ioinit.fth =================================================================== --- cpu/x86/pc/olpc/via/ioinit.fth 2009-08-19 18:34:36 UTC (rev 1301) +++ cpu/x86/pc/olpc/via/ioinit.fth 2009-08-19 19:30:38 UTC (rev 1302) @@ -209,7 +209,7 @@ [then]
94 ff 68 mreg \ be like Phx - 95 ff c9 mreg \ 8 bit enables GPIO0,1 + 95 ff cd mreg \ 0x0c enables GPIO0,1 (per datasheet; programmer's manual is vague) [ifdef] demo-board 97 ff 80 mreg \ be like Phx [then]
Modified: dev/olpc/dcon/viadcon.fth =================================================================== --- dev/olpc/dcon/viadcon.fth 2009-08-19 18:34:36 UTC (rev 1301) +++ dev/olpc/dcon/viadcon.fth 2009-08-19 19:30:38 UTC (rev 1302) @@ -40,7 +40,13 @@ h# 4d acpi-b@ h# 10 or h# 4d acpi-b! \ GPIO1 then ; -: dcon-unload ( -- ) h# 4f acpi-b@ h# 04 invert and h# 4f acpi-b! ; +: dcon-unload ( -- ) + atest? if + h# 4f acpi-b@ h# 04 invert and h# 4f acpi-b! \ GPO12 + else + h# 4d acpi-b@ h# 10 invert and h# 4d acpi-b! \ GPIO1 + then +; : dcon-blnk? ( -- flag ) h# 4a acpi-b@ 4 and 0<> ; : dcon-stat@ ( -- n ) h# 4b acpi-b@ 3 and ; : dcon-irq? ( -- flag ) 1 smb-reg@ h# 20 and 0<> ;