openfirmware

openfirmware@openfirmware.info

3007 discussions

r1371 - cpu/x86/pc/olpc
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:30:04 +0200 (Fri, 18 Sep 2009) New Revision: 1371 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - moved sound-end to a different spot in the secure startup sequence so it doesn't slow down access to the ok prompt. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2009-09-18 01:23:15 UTC (rev 1370) +++ cpu/x86/pc/olpc/security.fth 2009-09-18 01:30:04 UTC (rev 1371) @@ -35,9 +35,11 @@ button-check game-key? if ." Use power button to power off" cr + sound-end begin halt again else ." Powering off in 30 seconds" cr + sound-end d# 30000 ms power-off then ; @@ -1044,6 +1046,7 @@ " init-program" $find if set-cmdline execute + sound-end go then show-x @@ -1088,7 +1091,6 @@ [then] then - sound-end \ The screen may be frozen when we exit, because we want pretty \ boot even when not secure.

1 0

r1370 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:23:15 +0200 (Fri, 18 Sep 2009) New Revision: 1370 Modified: cpu/x86/pc/olpc/via/fw.bth Log: OLPC Via - moved serial-enabled? earlier in the load sequence. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-09-18 01:19:07 UTC (rev 1369) +++ cpu/x86/pc/olpc/via/fw.bth 2009-09-18 01:23:15 UTC (rev 1370) @@ -238,8 +238,6 @@ false to stand-init-debug? \ true to stand-init-debug? -: serial-enabled? ( -- flag ) h# 8846 config-b@ h# 40 and 0<> ; - hex : i-key-wait ( ms -- pressed? ) serial-enabled? 0= if drop false exit then ( ms ) @@ -320,13 +318,13 @@ true value text-on? : text-off ( -- ) text-on? if - screen-ih out-mux-ih remove-mux + screen-ih remove-output false to text-on? then ; : text-on ( -- ) text-on? 0= if - screen-ih out-mux-ih add-mux + screen-ih add-output cursor-on true to text-on? then

1 0

r1369 - cpu/x86/pc/olpc/via dev dev/geode/ac97 dev/hdaudio dev/olpc dev/olpc/dcon dev/olpc/kb3700 dev/olpc/keyboard dev/olpc/touchpad dev/olpc/viacamera
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:19:07 +0200 (Fri, 18 Sep 2009) New Revision: 1369 Added: dev/hdaudio/test.fth dev/olpc/confirm.fth Modified: cpu/x86/pc/olpc/via/devices.fth cpu/x86/pc/olpc/via/mfgtest.fth dev/geode/ac97/selftest.fth dev/hdaudio/core.fth dev/hdaudio/hdaudio.bth dev/libertas.fth dev/olpc/dcon/viadcon.fth dev/olpc/kb3700/battery.fth dev/olpc/keyboard/selftest.fth dev/olpc/touchpad/touchpad.fth dev/olpc/viacamera/camera.fth Log: OLPC Via - big batch of selftest improvments to make test-all more suitable for the "SMT test" phase of manufacturing. Modified: cpu/x86/pc/olpc/via/devices.fth =================================================================== --- cpu/x86/pc/olpc/via/devices.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ cpu/x86/pc/olpc/via/devices.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -119,6 +119,7 @@ fload ${BP}/dev/16550pkg/16550.fth \ Serial port support package end-support-package [then] +: serial-enabled? ( -- flag ) h# 8846 config-b@ h# 40 and 0<> ; fload ${BP}/dev/pci/isaall.fth \ We don't need a serial selftest because the serial port is internal only @@ -262,6 +263,7 @@ atest? 0= if wlan-reset then ; +fload ${BP}/dev/olpc/confirm.fth \ Selftest interaction modalities fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree fload ${BP}/cpu/x86/pc/olpc/kbdtype.fth \ Export keyboard type Modified: cpu/x86/pc/olpc/via/mfgtest.fth =================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ cpu/x86/pc/olpc/via/mfgtest.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -104,8 +104,8 @@ : camera-item ( -- ) " /camera" mfg-test-dev ; : wlan-item ( -- ) " /wlan" mfg-test-dev ; : timer-item ( -- ) " /timer" mfg-test-dev ; -: touchpad-item ( -- ) " /mouse" mfg-test-dev ; -: keyboard-item ( -- ) " /keyboard" mfg-test-dev ; +: touchpad-item ( -- ) " /8042/mouse" mfg-test-dev ; +: keyboard-item ( -- ) " /8042/keyboard" mfg-test-dev ; : mfgtest-menu ( -- ) clear-menu @@ -125,11 +125,11 @@ " RAM chips" ['] memory-item ram.icon 1 2 install-icon - " SD card controllers - internal and external mass storage" + " Internal mass storage" ['] sd-item sdcard.icon 1 3 install-icon - " USB ports" - ['] usb-item usb.icon 1 4 install-icon + " Plug-in SD card" + ['] sd-item sdcard.icon 1 4 install-icon " Battery" ['] battery-item battery.icon 2 0 install-icon @@ -149,8 +149,8 @@ " RTC (Real-Time Clock)" ['] rtc-item clock.icon 3 0 install-icon - " ISA Timer" - ['] timer-item timer.icon 3 1 install-icon + " USB ports" + ['] usb-item usb.icon 3 1 install-icon \ These are last because they require user participation. \ The earlier tests are all included in automatic batch-mode. @@ -160,7 +160,6 @@ " Touchpad" ['] touchpad-item touchpad.icon 3 3 install-icon - ; ' mfgtest-menu to root-menu Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/geode/ac97/selftest.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -131,7 +131,8 @@ sweep-test mic-test record-base record-len la1+ " dma-free" $call-parent - close false + close + false ; \ LICENSE_BEGIN Modified: dev/hdaudio/core.fth =================================================================== --- dev/hdaudio/core.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/hdaudio/core.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -424,6 +424,8 @@ \ \\ Playback +false value playing? + : upsampling? ( -- ? ) scale-factor 1 <> ; : open-out ( -- ) @@ -455,23 +457,31 @@ ; : write ( adr len -- actual ) - 4 to sd# audio-out install-playback-alarm + 4 to sd# audio-out install-playback-alarm true to playing? ; \ Alarm handle to stop the stream when the content has been played. : playback-completed-alarm ( -- ) - sd# ( sd# ) - 4 to sd# ( sd# ) - stream-done? if write-done then ( sd# ) - to sd# ( ) + sd# ( sd# ) + 4 to sd# ( sd# ) + stream-done? if write-done false to playing? then ( sd# ) + to sd# ( ) ; ' playback-completed-alarm is playback-alarm -: wait-sound ( -- ) ; \ sound stops with asynchronous alarm handler +: wait-sound ( -- ) begin playing? 0= until ; -: set-volume ( dB -- ) dac to node dB>step# output-gain ; +false value left-mute? +false value right-mute? +: set-volume ( dB -- ) + dac to node + dB>step# + dup left-mute? if h# 80 or then h# 3a000 or cmd \ left gain + right-mute? if h# 80 or then h# 39000 or cmd \ right gain +; + \ \\ Recording 0 value recbuf Modified: dev/hdaudio/hdaudio.bth =================================================================== --- dev/hdaudio/hdaudio.bth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/hdaudio/hdaudio.bth 2009-09-18 01:19:07 UTC (rev 1369) @@ -14,6 +14,7 @@ fload ${BP}/dev/hdaudio/extra.fth fload ${BP}/forth/lib/isin.fth fload ${BP}/dev/geode/ac97/selftest.fth +fload ${BP}/dev/hdaudio/test.fth end0 end-tokenizing Added: dev/hdaudio/test.fth =================================================================== --- dev/hdaudio/test.fth (rev 0) +++ dev/hdaudio/test.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -0,0 +1,88 @@ +purpose: Manufacturing testing +\ See license at end of file + +: alloc-buffer ( -- ) + record-len la1+ " dma-alloc" $call-parent to record-base +; +: dealloc-buffer ( -- ) + record-base record-len la1+ " dma-free" $call-parent +; + +: jingle ( -- ) " play-wav rom:splash" evaluate wait-sound ; + +: speaker-test ( -- ) + ." Playing jingle on the left speaker.. " + true to right-mute? + jingle cr + false to right-mute? + true to left-mute? + ." Playing jingle on the right speaker.. " + jingle cr + false to left-mute? +; + +: headphones-test ( -- ) + h# 19 to node + pin-sense? 0= if + ." Connect headphones to continue.. " + begin pin-sense? until cr + then + ." Press a key to play sound.. " key drop cr + h# 1f to node power-off \ turn off speaker + jingle + h# 1f to node power-on \ turn speaker back on +; + +: builtin-mic-test ( -- ) + ." Press a key to test recording / playback on the built-in microphone.. " + key drop cr + mic-test +; + +: external-mic-test ( -- ) + h# 1a to node + pin-sense? 0= if + ." Connect microphone to continue.. " + begin pin-sense? until cr + then + ." Press a key to test recording / playback on the external microphone.. " + key drop cr + mic-test +; + +: interactive-test ( -- error? ) + alloc-buffer + speaker-test + headphones-test + builtin-mic-test + external-mic-test + dealloc-buffer + " confirm-selftest?" eval +; +: selftest ( -- ) + diagnostic-mode? if interactive-test else selftest then +; + +\ LICENSE_BEGIN +\ Copyright (c) 2009 Luke Gorrie +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: dev/libertas.fth =================================================================== --- dev/libertas.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/libertas.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -1696,7 +1696,16 @@ ." Failed to scan" true cr else ( adr len ) \ drop .scan false - drop .ssids false + diagnostic-mode? if ( adr len ) + drop 2+ c@ if ( ) + false + else + ." ERROR: No access points seen" cr + true + then + else ( adr len ) + drop .ssids false + then then close Added: dev/olpc/confirm.fth =================================================================== --- dev/olpc/confirm.fth (rev 0) +++ dev/olpc/confirm.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -0,0 +1,18 @@ +purpose: Operator confirmation of selftest results + +: confirm-selftest? ( -- error? ) + diagnostic-mode? if + ." Did the test pass (n for FAIL) ? " + key dup emit cr upc [char] N = + else + false + then +; + +: has-direct-child? ( name@unit$ -- found? ) + also current @ >r ( name@unit$ r: current ) + [char] @ left-parse-string ( unit$ name$ r: current ) + ['] (find-node) catch ( unit$ name$ found? r: current ) + >r 4drop r> 0<> ( found? r: current ) + r> set-current previous ( found? ) +; Modified: dev/olpc/dcon/viadcon.fth =================================================================== --- dev/olpc/dcon/viadcon.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/olpc/dcon/viadcon.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -110,6 +110,7 @@ ['] dcon! catch if 2drop smb-stop 1 ms smb-off 1 ms smb-on then ; +: mode@ ( -- mode ) 1 dcon@ ; : mode! ( mode -- ) 1 dcon! ; : hres! ( hres -- ) 2 dcon! ; \ def: h# 458 d# 1200 : htotal! ( htotal -- ) 3 dcon! ; \ def: h# 4e8 d# 1256 @@ -124,6 +125,9 @@ : brighter ( -- ) bright@ 1+ h# f min bright! ; : dimmer ( -- ) bright@ 1- 0 max bright! ; +: backlight-off ( -- ) mode@ 8 invert and mode! ; +: backlight-on ( -- ) mode@ 8 or mode! ; + \ Color swizzle, AA, no passthrough, backlight : set-color ( color? -- ) dup to color? Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/olpc/kb3700/battery.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -595,10 +595,96 @@ new-device " battery" device-name 0 0 reg \ Needed so test-all will run the selftest -: selftest ( -- error? ) - .bat + +\ Test that the battery is inserted and not broken. +: test-battery ( -- error? ) + bat-status@ h# 01 and 0= if + ." Insert battery to continue.. " + begin d# 100 ms bat-status@ h# 01 and until + cr + then + ." Testing battery status.. " + bat-status@ h# 04 and if + ." error: battery broken" cr + true + else + ." ok: " cr .bat cr + false + then +; + +: wait-no-ac ( -- error? ) + ." Disconnect AC power to continue.. " + d# 200 0 do + d# 100 ms + bat-status@ h# 10 and 0= if + false unloop cr exit + then + loop + cr + ." ERROR: AC not disconnected" cr + true +; + +\ Test that we can run without AC power. +: test-discharging ( -- error? ) + bat-status@ h# 10 and 0<> if + wait-no-ac if true exit then + then + ." Test running from battery.. " + d# 2000 ms + bat-status@ h# 40 and if + ." ok: battery discharging" cr + false + else + ." ERROR: battery not discharging" cr + true + then +; + +: wait-ac ( -- error? ) + ." Connect AC power to continue.. " + d# 200 0 do + d# 100 ms + bat-status@ h# 10 and if + false unloop cr exit + then + loop + cr + ." ERROR: AC not connected" cr + true +; + +: test-charging ( -- error? ) + bat-status@ h# 10 and 0= if + wait-ac if true exit then + then + ." Test running from AC.. " + d# 2000 ms + bat-status@ h# 40 and 0= if + ." ok: battery is not discharging" cr + false + else + ." ERROR: battery is discharging" cr + true + then +; + +: interactive-test ( -- error? ) + test-battery if true exit then + test-discharging if true exit then + test-charging if true exit then false ; + +: selftest ( -- error? ) + diagnostic-mode? if + interactive-test + else + .bat false + then +; + finish-device device-end Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/olpc/keyboard/selftest.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -429,7 +429,7 @@ screen-ih iselect erase-screen iunselect page close - false + confirm-selftest? ; warning ! Modified: dev/olpc/touchpad/touchpad.fth =================================================================== --- dev/olpc/touchpad/touchpad.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/olpc/touchpad/touchpad.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -466,7 +466,7 @@ close cursor-on page - 0 + confirm-selftest? ; Modified: dev/olpc/viacamera/camera.fth =================================================================== --- dev/olpc/viacamera/camera.fth 2009-09-18 01:15:46 UTC (rev 1368) +++ dev/olpc/viacamera/camera.fth 2009-09-18 01:19:07 UTC (rev 1369) @@ -505,12 +505,17 @@ : unmirrored ( -- ) h# 1e ov@ h# 20 invert and h# 1e ov! ; : selftest ( -- error? ) + serial-enabled? if + ." The serial port is in use so the camera cannot be used" cr + true exit + then camera-open 0= if true exit then d# 300 ms unmirrored shoot-still ?dup if camera-close exit then ( error? ) d# 1,000 ms mirrored shoot-movie full-brightness ( error? ) camera-close ( error? ) + ?dup 0= if confirm-selftest? then ( error? ) ; : dump-regs ( run# -- )

1 0

r1368 - dev/usb2/hcd/uhci
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:15:46 +0200 (Fri, 18 Sep 2009) New Revision: 1368 Modified: dev/usb2/hcd/uhci/qhtd.fth Log: USB UHCI driver - handle NULL_DATA case for td size field. Modified: dev/usb2/hcd/uhci/qhtd.fth =================================================================== --- dev/usb2/hcd/uhci/qhtd.fth 2009-09-18 01:14:00 UTC (rev 1367) +++ dev/usb2/hcd/uhci/qhtd.fth 2009-09-18 01:15:46 UTC (rev 1368) @@ -332,7 +332,8 @@ : get-actual ( td #td -- actual ) 0 -rot 0 ?do ( actual td ) dup >hctd-stat le-l@ dup TD_STAT_ACTIVE and 0= if - TD_ACTUAL_MASK and 1+ + TD_ACTUAL_MASK and ( actual td size-code ) + dup TD_NULL_DATA_SIZE = if drop 0 else 1+ then ( actual td this-size ) rot + swap ( actual' td ) else drop then >td-next l@ ( actual td' )

1 0

r1367 - ofw/wifi
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:14:00 +0200 (Fri, 18 Sep 2009) New Revision: 1367 Modified: ofw/wifi/eapol.fth Log: Wifi package - added #ssids method. Modified: ofw/wifi/eapol.fth =================================================================== --- ofw/wifi/eapol.fth 2009-09-18 01:13:17 UTC (rev 1366) +++ ofw/wifi/eapol.fth 2009-09-18 01:14:00 UTC (rev 1367) @@ -548,6 +548,8 @@ loop drop ( ) ; +: #ssids ( adr -- n ) 2 + c@ ; + \ ======================================================================= \ Associate

1 0

r1366 - forth/lib
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:13:17 +0200 (Fri, 18 Sep 2009) New Revision: 1366 Modified: forth/lib/printf.fth Log: printf - added %u formatting specifier. Modified: forth/lib/printf.fth =================================================================== --- forth/lib/printf.fth 2009-09-18 01:11:56 UTC (rev 1365) +++ forth/lib/printf.fth 2009-09-18 01:13:17 UTC (rev 1366) @@ -25,10 +25,11 @@ : replace% ( ... tail$ -- ... tail$' ) \ Handle % escapes 1/string ( ... tail$ char ) case - [char] d of push-decimal rot <# u#s u#> +spbuf pop-base endof - [char] x of push-hex rot <# u#s u#> +spbuf pop-base endof + [char] u of push-decimal rot (u.) +spbuf pop-base endof + [char] d of push-decimal rot (.) +spbuf pop-base endof + [char] x of push-hex rot (u.) +spbuf pop-base endof [char] s of 2swap +spbuf endof - [char] o of push-octal rot <# u#s u#> +spbuf pop-base endof + [char] o of push-octal rot (u.) +spbuf pop-base endof -1 of endof ( default ) dup +spchar endcase

1 0

r1365 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:11:56 +0200 (Fri, 18 Sep 2009) New Revision: 1365 Modified: cpu/x86/pc/olpc/via/usb.fth Log: OLPC Via - fixed problem with USB keyboard installation. Modified: cpu/x86/pc/olpc/via/usb.fth =================================================================== --- cpu/x86/pc/olpc/via/usb.fth 2009-09-18 01:10:26 UTC (rev 1364) +++ cpu/x86/pc/olpc/via/usb.fth 2009-09-18 01:11:56 UTC (rev 1365) @@ -61,16 +61,14 @@ : ?usb-keyboard ( -- ) " usb-keyboard" expand-alias if ( devspec$ ) drop " /usb" comp 0= if ( ) - red-letters ." Using USB keyboard." cr black-letters - " usb-keyboard" open-dev add-mux + " usb-keyboard" open-dev add-input exit then else ( devspec$ ) 2drop then " /usb/serial" open-dev ?dup if - red-letters ." Using USB serial console." cr black-letters - add-mux + add-input then ;

1 0

r1364 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:10:26 +0200 (Fri, 18 Sep 2009) New Revision: 1364 Modified: cpu/x86/pc/olpc/via/dsdt.dsl Log: OLPC Via DSDT - Fixes for lid, ebook, and power switches, thanks to Paul Fox. Modified: cpu/x86/pc/olpc/via/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl 2009-09-18 01:04:26 UTC (rev 1363) +++ cpu/x86/pc/olpc/via/dsdt.dsl 2009-09-18 01:10:26 UTC (rev 1364) @@ -118,6 +118,12 @@ DBG1, 8, } +// PMIO_RX04 +OperationRegion(\SCIE, SystemIO, 0x0404, 0x2) // Genernal Purpose SCI Enable +Field(\SCIE, ByteAcc, NoLock, Preserve) { + SCIZ, 1, // SCI / SMI enable +} + OperationRegion(\GPST, SystemIO, 0x0420, 0x2) Field(\GPST, ByteAcc, NoLock, Preserve) { GS00,1, // GPI0 @@ -138,6 +144,15 @@ GS15,1, // north module SERR# } +OperationRegion(GPIO, SystemIO, 0x0448, 0x4) +Field(GPIO, ByteAcc, NoLock, Preserve) { + ,7, + GPI7,1, + ,1, + GPI9,1, + ,22, +} + // PMIO_RX22/3 OperationRegion(\GPSE, SystemIO, 0x0422, 0x2) // Genernal Purpose SCI Enable Field(\GPSE, ByteAcc, NoLock, Preserve) { @@ -176,31 +191,22 @@ } // from BIOS porting guide, section 13.2.2 -OperationRegion(\EDGE, SystemIO, 0x042c, 0x1) // SMI enable, lid edge polarity +OperationRegion(\EDGE, SystemIO, 0x042c, 1) // SMI enable, lid edge polarity Field(\EDGE, ByteAcc, NoLock, Preserve) { , 1, // SMI enable (1 == enable) , 1, // - , 1, // power button polarity (1 == falling) + PPOL, 1, // power button polarity (1 == falling) , 1, // , 1, // , 1, // battery low enable (0 == enable) TPOL, 1, // therm polarity (1 == falling) LPOL, 1, // lid polarity (1 == falling) } - -// from BIOS porting guide, section 13.2.2.4 -OperationRegion(\ENB, SystemIO, 0x048c, 0x1) // SMI enable, lid edge polarity -Field(\ENB, ByteAcc, NoLock, Preserve) { - , 3, - TENB, 1, // therm enable (1 == enabled) - , 4, -} - OperationRegion(\Stus, SystemIO, 0x0430, 0x1) // Global Status Field(\Stus, ByteAcc, NoLock, Preserve) { PADS, 8, - } +} OperationRegion(\Prie, SystemIO, 0x0434, 0x1) Field(\Prie, ByteAcc, NoLock, Preserve) { @@ -234,11 +240,6 @@ Notify(\_SB.PCI0,0x2) } - Method(_L08) { // A-series EBOOK event (RING) (will go away) - UPUT (0x64) // d - Notify(\_SB.PCI0.EBKA, 0x80) - } - Method(_L09) { UPUT (0x39) // 9 Notify(\_SB.PCI0.VT86.PS2M, 0x02) //Internal Mouse Controller PME Status @@ -247,6 +248,7 @@ Method(_L0A) { // EBOOK event (THRM#) UPUT (0x65) // e Not(TPOL, TPOL) // Flip the therm polarity bit + Store (One, GS10) // clear interrupt caused by polarity flip Notify(\_SB.PCI0.EBK, 0x80) } @@ -283,6 +285,8 @@ Notify(\_SB.PCI0.USB3, 0x00) Notify(\_SB.PCI0.EHCI, 0x00) + Store(One, SCIZ) + If (LEqual (Arg0, 1)) //S1 { Notify (\_SB.SLPB, 0x02) @@ -379,7 +383,11 @@ Scope(\_SB) { - // define Sleeping button as mentioned in ACPI spec 2.0 + Method(_INI, 0) + { + Store(One, SCIZ) + } + Device (SLPB) { Name (_HID, EISAID("PNP0C0E")) // Hardware Device ID SLEEPBTN @@ -2284,68 +2292,56 @@ } } // Device(P2PB) - Device (EBK) { - Name (_PRW, Package (0x02) { 0x0A, 0x04 }) // Event 0A, wakes from S4 + Device (EC) { + Name (_PRW, Package (0x02) { 0x01, 0x04 }) // Event 01, wakes from S4 Method(_INI, 0) { - UPUT (0x6b) // k - Store (One, TENB) // Enable ebook (THERM#) - Store (One, THRM) + UPUT (0x49) // I + Store (One, GPWK) // Enable gpwake } - Method(EBK) { - If (TPOL) { // ebook is "open" - UPUT (0x65) // e - } Else { - UPUT (0x45) // E - } - Return(TPOL) - } - } // Device(EBK) + } // Device(EC) - // RING-based ebook support, on A-series boards - Device (EBKA) { - Name (_PRW, Package (0x02) { 0x08, 0x04 }) // Event 08, wakes from S4 + Device (EBK) { + Name (_HID, "XO15EBK") + Name (_PRW, Package (0x02) { 0x0A, 0x04 }) // Event 0A, wakes from S4 Method(_INI, 0) { - UPUT (0x69) // i - Store (One, RING) + Store (One, THRM) + Store (GPI9, TPOL) // init edge detect from current state } Method(EBK) { - If (TPOL) { // ebook is "open" + If (TPOL) { + // non-zero means waiting for fall, so switch is open UPUT (0x65) // e } Else { UPUT (0x45) // E } Return(TPOL) } - } // Device(EBKA) + } // Device(EBK) - Device (EC) { - Name (_PRW, Package (0x02) { 0x01, 0x04 }) // Event 01, wakes from S4 + Device (LID) { + Name (_HID, EisaId ("PNP0C0D")) + Name (_PRW, Package (0x02) { 0x0B, 0x04 }) // Event 0B, wakes from S4 Method(_INI, 0) { - UPUT (0x49) // I - Store (One, GPWK) // Enable gpwake + Store (GPI7, LPOL) // init edge detect from current state } - } // Device(EC) - Device (LID) { - Name (_HID, EisaId ("PNP0C0D")) - Name (_PRW, Package (0x02) { 0x0B, 0x04 }) // Event 0B, wakes from S4 - Method(_LID) { - If (LPOL) { // Lid is open + If (LPOL) { + // non-zero means waiting for fall, so switch is open UPUT (0x6c) // l } Else { UPUT (0x4c) // L } - Return(LNot(LPOL)) // pgf is unclear on why this polarity is correct + Return(LPOL) } } // Device(LID)

1 0

r1363 - in cpu/x86/pc/olpc: . via
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:04:26 +0200 (Fri, 18 Sep 2009) New Revision: 1363 Modified: cpu/x86/pc/olpc/gridmap.fth cpu/x86/pc/olpc/via/copynand.fth Log: OLPC file system update utility - added scaling to grid map display so that large filesystem updates will fit on the screen. Modified: cpu/x86/pc/olpc/gridmap.fth =================================================================== --- cpu/x86/pc/olpc/gridmap.fth 2009-09-18 01:02:26 UTC (rev 1362) +++ cpu/x86/pc/olpc/gridmap.fth 2009-09-18 01:04:26 UTC (rev 1363) @@ -8,14 +8,30 @@ 9 constant grid-h d# 128 value #cols +d# 94 value #rows +: max-grid ( -- n ) #rows #cols * ; + \needs xy+ : xy+ ( x1 y1 x2 y2 -- x3 y3 ) rot + -rot + swap ; \needs xy* : xy* ( x y w h -- x*w y*h ) rot * >r * r> ; : do-fill ( color x y w h -- ) " fill-rectangle" $call-screen ; +1 value scale-factor +: scale-block# ( eblock# -- ) scale-factor / ; +: set-grid-scale ( #eblocks -- ) + d# 1000 1 do ( #eblocks ) + dup i / max-grid <= if ( #eblocks ) + drop ( ) + i to scale-factor ( ) + unloop exit + then ( #eblocks ) + loop + true abort" Grid map scale factor too large" +; + \ States: 0:erased 1:bad 2:waiting for write 3:written -: >loc ( eblock# -- x y ) #cols /mod grid-w grid-h xy* ulhc xy+ ; +: >loc ( eblock# -- x y ) scale-block# #cols /mod grid-w grid-h xy* ulhc xy+ ; : show-state ( eblock# state -- ) swap >loc glyph-w glyph-h do-fill ; Modified: cpu/x86/pc/olpc/via/copynand.fth =================================================================== --- cpu/x86/pc/olpc/via/copynand.fth 2009-09-18 01:02:26 UTC (rev 1362) +++ cpu/x86/pc/olpc/via/copynand.fth 2009-09-18 01:04:26 UTC (rev 1363) @@ -129,17 +129,19 @@ h# ff h# ff 0 rgb>565 constant pending-color \ yellow 0 h# ff 0 rgb>565 constant written-color \ green 0 h# ff h# ff rgb>565 constant strange-color \ cyan -h# ff h# ff h# ff rgb>565 constant starting-color \ white +h# e8 h# e8 h# e8 rgb>565 constant starting-color \ very light gray -d# 22 constant status-line +d# 28 constant status-line : gshow-init ( #eblocks -- ) + dup set-grid-scale cursor-off " erase-screen" $call-screen starting-color ( #eblocks color ) - swap 0 ?do i over show-state loop - drop - 0 status-line at-xy + over 0 ?do i over show-state loop ( #eblocks color ) + drop ( #eblocks ) + 1 status-line at-xy + ." Blocks/square: " scale-factor .d ." Total blocks: " .d ; : gshow-erasing ( #eblocks -- ) drop ." Erasing " ; @@ -150,7 +152,7 @@ : gshow-clean ( eblock# -- ) clean-color show-state ; : gshow-strange ( eblock# -- ) strange-color show-state ; -: gshow-cleaning ( -- ) d# 26 status-line at-xy ." Cleanmarkers" cr ; +: gshow-cleaning ( -- ) 7 status-line at-xy ." Cleanmarkers" cr ; : gshow-done ( -- ) cursor-on ; : gshow-pending ( eblock# -- ) pending-color show-state ; @@ -165,7 +167,7 @@ drop ; -: show-eblock# ( eblock# -- ) d# 20 status-line at-xy .x ; +: show-eblock# ( eblock# -- ) d# 40 status-line at-xy .d ; : gshow-written ( eblock# -- ) dup written-color show-state show-eblock#

1 0

r1362 - cpu/x86/pc/olpc
by svn＠openfirmware.info 18 Sep '09

18 Sep '09

Author: wmb Date: 2009-09-18 03:02:26 +0200 (Fri, 18 Sep 2009) New Revision: 1362 Modified: cpu/x86/pc/olpc/disptest.fth Log: OLPC display selftest - added additional test patterns, DCON test, and brightness test. Modified: cpu/x86/pc/olpc/disptest.fth =================================================================== --- cpu/x86/pc/olpc/disptest.fth 2009-09-14 07:45:46 UTC (rev 1361) +++ cpu/x86/pc/olpc/disptest.fth 2009-09-18 01:02:26 UTC (rev 1362) @@ -9,24 +9,30 @@ \ white magenta yellow red green blue cyan black ffff w, f81f w, ffe0 w, f800 w, 07e0 w, 001f w, 07ff w, 0000 w, +: fill-rect ( -- ) " fill-rectangle" $call-screen ; + +: whole-screen ( -- x y w h ) 0 0 dimensions ; + +: black-screen ( -- ) 0 whole-screen fill-rect ; + : test-color16 ( n -- color ) test-colors16 swap bar-int / test-colors16-mask and wa+ w@ ; : .horizontal-bars16 ( -- ) dimensions ( width height ) 0 ?do ( width ) - i test-color16 0 i 3 pick bar-int " fill-rectangle" $call-screen + i test-color16 0 i 3 pick bar-int fill-rect bar-int +loop drop ; : .vertical-bars16 ( -- ) dimensions ( width height ) swap 0 ?do ( height ) - i test-color16 i 0 bar-int 4 pick " fill-rectangle" $call-screen + i test-color16 i 0 bar-int 4 pick fill-rect bar-int +loop drop ; instance variable rn \ Random number -d# 60,000 constant burnin-time \ 1 minute +d# 5,000 constant burnin-time \ 5 seconds : random ( -- n ) rn @ d# 1103515245 * d# 12345 + h# 7FFFFFFF and dup rn ! @@ -68,17 +74,110 @@ drop ; +0 value xbias +0 value ybias +0 value hstripe +0 value vstripe +: set-stripes ( -- ) + width d# 256 / to hstripe + height d# 256 / to vstripe + width hstripe d# 256 * - to xbias + height vstripe d# 256 * - to ybias +; +: gvsr ( -- ) + set-stripes black-screen ( ) + d# 256 0 do ( ) + d# 256 0 do ( ) + i j 0 rgb>565 ( color ) + hstripe i * xbias + ( color x ) + vstripe j * ybias + ( color x y ) + hstripe vstripe ( color x y ) + fill-rect + loop + loop +; +: gvsb ( -- ) + set-stripes black-screen ( ) + d# 256 0 do ( ) + d# 256 0 do ( ) + 0 j i rgb>565 ( color ) + hstripe i * xbias + ( color x ) + vstripe j * ybias + ( color x y ) + hstripe vstripe ( color x y ) + fill-rect + loop + loop +; +: hgradient ( -- ) + set-stripes black-screen ( ) + d# 256 0 do ( ) + i i i rgb>565 ( color ) + hstripe i * xbias + 0 ( color x y ) + hstripe height ( color x y sw h ) + fill-rect ( ) + loop ( ) +; + +: vgradient ( -- ) + set-stripes black-screen ( ) + d# 256 0 do ( ) + i i i rgb>565 ( color ) + 0 vstripe i * ybias + ( color x y ) + width vstripe ( color x y w sh ) + fill-rect ( ) + loop ( ) +; + + +h# ff h# ff h# ff rgb>565 constant white-color + +: hline ( y -- ) >r white-color 0 r> width 1 fill-rect ; +: vline ( y -- ) >r white-color r> 0 1 height fill-rect ; + +: crosshatch ( -- ) + black-screen + height 0 do i hline d# 10 +loop + width 0 do i vline d# 10 +loop +; +: short-wait ( -- ) d# 500 ms ; +: brightness-ramp ( -- ) + 0 h# 0f do i bright! short-wait -1 +loop + backlight-off short-wait backlight-on + h# f bright! +; + +: red-screen ( -- ) + load-base whole-screen " read-rectangle" $call-screen + h# ff 00 00 rgb>565 whole-screen fill-rect + d# 1000 ms + load-base whole-screen fill-rect +; +: wait ( -- ) + d# 1000 ms + 0 set-source \ Freeze image + d# 1000 ms + 1 set-source \ Unfreeze image + d# 1000 ms +; + warning @ warning off : selftest ( -- error? ) depth d# 16 <> if false exit then - .horizontal-bars16 - d# 2000 ms - .vertical-bars16 - d# 2000 ms - ." Press a key to stop early." cr - d# 1000 ms + .horizontal-bars16 wait + .vertical-bars16 wait + gvsr wait + gvsb wait + hgradient wait + vgradient wait + crosshatch wait + brightness-ramp + + burnin-time d# 5000 > if + ." Press a key to stop early." cr + d# 1000 ms + then random-selftest - false + confirm-selftest? ; warning !

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware