February 2010 - openfirmware - mail.coreboot.org

[commit] r1759 - cpu/x86/pc/olpc
by repository service Feb. 25, 2010

Feb. 25, 2010

Author: wmb Date: Thu Feb 25 23:16:34 2010 New Revision: 1759 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1759 Log: OLPC trac 10022 - Power wait must happen before turning off the EC, otherwise you can't read the AC and battery state. Modified: cpu/x86/pc/olpc/keyject.fth Modified: cpu/x86/pc/olpc/keyject.fth ============================================================================== --- cpu/x86/pc/olpc/keyject.fth Thu Feb 25 01:54:44 2010 (r1758) +++ cpu/x86/pc/olpc/keyject.fth Thu Feb 25 23:16:34 2010 (r1759) @@ -168,7 +168,6 @@ \ Firmware is in flash-buf : update-firmware ( -- ) - wait-enough-power write-firmware ['] verify-firmware catch if @@ -185,6 +184,7 @@ \ Get the new firmware first, so any security checks use the old keys get-new-firmware do-keyject? if + wait-enough-power flash-write-enable inject-keys new-firmware? if update-firmware then @@ -194,6 +194,7 @@ \ we get into an infinite reboot cycle. new-firmware? if ." Updating firmware ..." cr + wait-enough-power flash-write-enable update-firmware flash-write-disable \ Should reboot

1 0

[commit] r1758 - cpu/x86/pc/olpc dev/geode
by repository service Feb. 24, 2010

Feb. 24, 2010

Author: wmb Date: Thu Feb 25 01:54:44 2010 New Revision: 1758 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1758 Log: OLPC trac 10043 - Fix USB keyboard operation for XO-1. Modified: cpu/x86/pc/olpc/devices.fth dev/geode/usb.fth Modified: cpu/x86/pc/olpc/devices.fth ============================================================================== --- cpu/x86/pc/olpc/devices.fth Fri Feb 19 00:34:41 2010 (r1757) +++ cpu/x86/pc/olpc/devices.fth Thu Feb 25 01:54:44 2010 (r1758) @@ -225,14 +225,14 @@ : report-keyboard ( -- ) " /usb@f,4/keyboard" locate-device 0= if drop - " keyboard" " /usb@f,4/keyboard" $devalias + " usb-keyboard" " /usb@f,4/keyboard" $devalias exit then \ In case the keyboard is behind a USB 2 hub " /usb@f,5/keyboard" locate-device 0= if drop - " keyboard" " /usb@f,5/keyboard" $devalias + " usb-keyboard" " /usb@f,5/keyboard" $devalias then ; Modified: dev/geode/usb.fth ============================================================================== --- dev/geode/usb.fth Fri Feb 19 00:34:41 2010 (r1757) +++ dev/geode/usb.fth Thu Feb 25 01:54:44 2010 (r1758) @@ -50,12 +50,32 @@ alias probe-usb2 probe-usb alias p2 probe-usb2 -: ?usb-keyboard ( -- ) - " keyboard" expand-alias if ( devspec$ ) - drop " /usb" comp 0= if ( ) - red-letters ." Using USB keyboard." cr black-letters - " keyboard" input +0 value usb-keyboard-ih + +: attach-usb-keyboard ( -- ) + " usb-keyboard" expand-alias if ( devspec$ ) + drop " /usb" comp 0= if ( ) + " usb-keyboard" open-dev to usb-keyboard-ih + usb-keyboard-ih add-input + exit then + else ( devspec$ ) + 2drop + then +; + +: detach-usb-keyboard ( -- ) + usb-keyboard-ih if + usb-keyboard-ih remove-input + usb-keyboard-ih close-dev + 0 to usb-keyboard-ih + then +; + +: ?usb-keyboard ( -- ) + attach-usb-keyboard + " /usb/serial" open-dev ?dup if + add-input then ;

1 0

[commit] r1757 - cpu/x86/pc/olpc
by repository service Feb. 18, 2010

Feb. 18, 2010

Author: wmb Date: Fri Feb 19 00:34:41 2010 New Revision: 1757 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1757 Log: OLPC trac 10022 - XO 1.0 Keyjector - power state check before bootfw2.zip Modified: cpu/x86/pc/olpc/keyject.fth Modified: cpu/x86/pc/olpc/keyject.fth ============================================================================== --- cpu/x86/pc/olpc/keyject.fth Thu Feb 18 23:24:50 2010 (r1756) +++ cpu/x86/pc/olpc/keyject.fth Fri Feb 19 00:34:41 2010 (r1757) @@ -139,8 +139,36 @@ 2drop ; +: ac-connected? ( -- flag ) bat-status@ h# 10 and 0<> ; + +\ Empirically, a weak-but-present battery can present the "trickle charge" (80) +\ but not present the "present" bit (01). +: battery-present? ( -- flag ) bat-status@ h# 81 and 0<> ; + +\ Similarly, a weak-but-present battery can present the "trickle charge" (80) +\ but not present the "battery low" bit (04). +: battery-strong? ( -- flag ) bat-status@ h# 84 and 0= ; + +: wait-enough-power ( -- ) + ac-connected? 0= if + ." Please connect the AC adapter to continue..." + begin d# 100 ms ac-connected? until + cr + then + battery-present? 0= if + ." Please insert a well-charged battery to continue..." + begin d# 100 ms battery-present? until + cr + then + battery-strong? 0= if + ." The battery is low. Please insert a charged one to continue..." + begin d# 100 ms battery-present? battery-strong? and until + then +; + \ Firmware is in flash-buf : update-firmware ( -- ) + wait-enough-power write-firmware ['] verify-firmware catch if

1 0

[commit] r1756 - cpu/x86/pc/olpc
by repository service Feb. 18, 2010

Feb. 18, 2010

Author: wmb Date: Thu Feb 18 23:24:50 2010 New Revision: 1756 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1756 Log: OLPC trac 10029 - but XO-1 firmware with real keys, not test keys. Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Thu Feb 18 19:56:43 2010 (r1755) +++ cpu/x86/pc/olpc/versions.fth Thu Feb 18 23:24:50 2010 (r1756) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 42 +macro: FW_MINOR 42d \ The EC microcode macro: EC_VERSION e34 @@ -11,8 +11,8 @@ \ Temporarily uncomment the line and modify the path as necessary \ macro: GET_EC cp pq2e18c.img ec.img -\ macro: KEYS mpkeys -macro: KEYS testkeys +macro: KEYS mpkeys +\ macro: KEYS testkeys \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}.olpc1

1 0

[commit] r1755 - cpu/x86/pc/olpc/via
by repository service Feb. 18, 2010

Feb. 18, 2010

Author: wmb Date: Thu Feb 18 19:56:43 2010 New Revision: 1755 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1755 Log: OLPC trac 10026 - menu test leaves current device set to last-executed test. Modified: cpu/x86/pc/olpc/via/mfgtest.fth Modified: cpu/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Thu Feb 18 19:36:21 2010 (r1754) +++ cpu/x86/pc/olpc/via/mfgtest.fth Thu Feb 18 19:56:43 2010 (r1755) @@ -30,9 +30,9 @@ : mfg-test-dev ( $ -- ) restore-scroller - find-device - ??cr ." Testing " pwd - " selftest" current-device execute-phandle-method ( return abort? ) + ??cr ." Testing " 2dup type cr + locate-device if ." Can't find device node" cr exit then ( phandle ) + " selftest" rot execute-phandle-method ( return abort? ) if ?dup if ??cr ." Selftest failed. Return code = " .d cr

1 0

[commit] r1754 - dev/geode/ac97
by repository service Feb. 18, 2010

Feb. 18, 2010

Author: wmb Date: Thu Feb 18 19:36:21 2010 New Revision: 1754 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1754 Log: OLPC trac 10025 - sound-recording plays back in doubletime. Modified: dev/geode/ac97/ac97.fth dev/geode/ac97/selftest.fth Modified: dev/geode/ac97/ac97.fth ============================================================================== --- dev/geode/ac97/ac97.fth Thu Feb 18 06:14:22 2010 (r1753) +++ dev/geode/ac97/ac97.fth Thu Feb 18 19:36:21 2010 (r1754) @@ -209,6 +209,10 @@ d# 48000 instance value sample-rate 0 instance value s/ms +\ Some audio interfaces let you choose the output format; this one doesn't +: mono ( -- ) ; +: stereo ( -- ) ; + : set-sample-rate ( hz -- ) to sample-rate ; : amp-default-on? ( -- flag ) " gx?" eval ; Modified: dev/geode/ac97/selftest.fth ============================================================================== --- dev/geode/ac97/selftest.fth Thu Feb 18 06:14:22 2010 (r1753) +++ dev/geode/ac97/selftest.fth Thu Feb 18 19:36:21 2010 (r1754) @@ -131,14 +131,14 @@ : sweep-test ( -- ) ." Playing sweep" cr make-sweep - d# -9 set-volume play + d# -9 set-volume stereo play ; : mic-test ( -- ) ." Recording ..." cr - record + mono record ." Playing ..." cr - d# -3 set-volume play + d# -3 set-volume mono play ; : selftest ( -- error? )

1 0

[commit] r1753 - ofw/fs/ext2fs
by repository service Feb. 17, 2010

Feb. 17, 2010

Author: wmb Date: Thu Feb 18 06:14:22 2010 New Revision: 1753 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1753 Log: OLPC trac 10028 - OFW reprompts on glob copy. Modified: ofw/fs/ext2fs/blocks.fth ofw/fs/ext2fs/dir.fth ofw/fs/ext2fs/methods.fth Modified: ofw/fs/ext2fs/blocks.fth ============================================================================== --- ofw/fs/ext2fs/blocks.fth Tue Feb 16 23:17:57 2010 (r1752) +++ ofw/fs/ext2fs/blocks.fth Thu Feb 18 06:14:22 2010 (r1753) @@ -17,7 +17,7 @@ \ /n field >device 0 field >data constant /buf-hdr -0 value /buffer +0 instance value /buffer : >bufadr ( n -- a ) /buffer * block-bufs + ; : >buffer ( n -- adr ) >bufadr >data ; Modified: ofw/fs/ext2fs/dir.fth ============================================================================== --- ofw/fs/ext2fs/dir.fth Tue Feb 16 23:17:57 2010 (r1752) +++ ofw/fs/ext2fs/dir.fth Thu Feb 18 06:14:22 2010 (r1753) @@ -7,8 +7,8 @@ 0 instance value dir-block# 0 instance value lblk# -variable diroff -variable totoff +instance variable diroff +instance variable totoff \ Information that we need about the working file/directory \ The working file changes at each level of a path search Modified: ofw/fs/ext2fs/methods.fth ============================================================================== --- ofw/fs/ext2fs/methods.fth Tue Feb 16 23:17:57 2010 (r1752) +++ ofw/fs/ext2fs/methods.fth Thu Feb 18 06:14:22 2010 (r1753) @@ -28,7 +28,7 @@ diroff off ; -0 value renaming? +0 instance value renaming? : $delete ( name$ -- error? ) $find-file if true exit then ( )

1 0

[commit] r1752 - cpu/x86/pc/olpc/via
by repository service Feb. 16, 2010

Feb. 16, 2010

Author: wmb Date: Tue Feb 16 23:17:57 2010 New Revision: 1752 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1752 Log: q3a33g Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Tue Feb 16 23:16:41 2010 (r1751) +++ cpu/x86/pc/olpc/via/fw-version.fth Tue Feb 16 23:17:57 2010 (r1752) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 33 +macro: FW_MINOR 33g

1 0

[commit] r1751 - cpu/x86/pc/olpc/via
by repository service Feb. 16, 2010

Feb. 16, 2010

Author: wmb Date: Tue Feb 16 23:16:41 2010 New Revision: 1751 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1751 Log: OLPC XO-1.5 - testinstructions.fth - tweaked the scanner drawing to make the tangents match better. Modified: cpu/x86/pc/olpc/via/testinstructions.fth Modified: cpu/x86/pc/olpc/via/testinstructions.fth ============================================================================== --- cpu/x86/pc/olpc/via/testinstructions.fth Tue Feb 16 22:39:03 2010 (r1750) +++ cpu/x86/pc/olpc/via/testinstructions.fth Tue Feb 16 23:16:41 2010 (r1751) @@ -319,9 +319,9 @@ 103 85 123 75 149 75 curveto 174 75 195 85 195 98 curveto - 113 83 moveto - 193 40 228 48 239 61 curveto - 261 90 171 118 171 120 curveto + 111 84 moveto + 193 36 228 48 239 61 curveto + 261 90 171 122 171 118 curveto 235 85 moveto 281 177 310 177 267 201 curveto

1 0

[commit] r1750 - cpu/x86/pc/olpc/via
by repository service Feb. 16, 2010

Feb. 16, 2010

Author: wmb Date: Tue Feb 16 22:39:03 2010 New Revision: 1750 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1750 Log: OLPC XO-1.5 - renamed drawboardtop.fth to testinstructions.fth Added: cpu/x86/pc/olpc/via/testinstructions.fth - copied unchanged from r1749, cpu/x86/pc/olpc/via/drawboardtop.fth Deleted: cpu/x86/pc/olpc/via/drawboardtop.fth Modified: cpu/x86/pc/olpc/via/fw.bth Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Tue Feb 16 22:32:25 2010 (r1749) +++ cpu/x86/pc/olpc/via/fw.bth Tue Feb 16 22:39:03 2010 (r1750) @@ -354,7 +354,7 @@ fload ${BP}/cpu/x86/pc/olpc/strokes.fth fload ${BP}/cpu/x86/pc/olpc/plot.fth -fload ${BP}/cpu/x86/pc/olpc/via/drawboardtop.fth +fload ${BP}/cpu/x86/pc/olpc/via/testinstructions.fth fload ${BP}/cpu/x86/pc/olpc/via/switches.fth \ Lid and ebook switches fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs Copied: cpu/x86/pc/olpc/via/testinstructions.fth (from r1749, cpu/x86/pc/olpc/via/drawboardtop.fth) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/via/testinstructions.fth Tue Feb 16 22:39:03 2010 (r1750, copy of r1749, cpu/x86/pc/olpc/via/drawboardtop.fth) @@ -0,0 +1,527 @@ +\ See license at end of file +purpose: Drawings of OLPC XO-1.5 board and components for test instructions + +support-package: test-instructions + +decimal + +\ Common items + +: headphones-logo + 24 5 rmove -6 0 -10 6 -10 13 rcurve + 10 -13 rmove 6 0 10 6 10 13 rcurve + -16 4 rmove -2 0 -3 -1 -3 -2 rcurve 0 -3 1 -3 3 -3 rcurve 0 5 rline + 12 -5 rmove 2 0 3 0 3 2 rcurve 0 3 -1 3 -3 3 rcurve 0 -5 rline +; + +: led-symbol ( x y -- ) + moveto 5 5 rline 5 -5 rline -5 -5 rline -5 5 rline +; +: usb-logo + 14 11 rmove + 1 1 1 3 0 4 rcurve + -1 1 -2 1 -3 0 rcurve + -1 -1 -1 -3 0 -4 rcurve + 1 -1 2 -1 3 0 rcurve + + 10 -4 rmove + 1 -1 1 -2 0 -2 rcurve + 0 -1 -1 -1 -1 0 rcurve + 0 0 0 1 0 2 rcurve + 0 0 1 0 1 0 rcurve + + -12 6 rmove 18 0 rline + 5 0 rmove -5 -2 rline 0 4 rline 5 -2 rline + -7 6 rmove 2 0 rline 0 3 rline -2 0 rline 0 -3 rline + -11 -6 rmove + 1 -2 2 -5 3 -6 rcurve + 1 -2 2 -1 3 -1 rcurve + + -2 7 rmove + 2 2 2 5 4 7 rcurve + 1 1 3 0 5 0 rcurve +; +: mic-logo + -4 0 -6 -3 -6 -5 rcurve + 6 5 rmove 3 0 6 -3 6 -5 rcurve + -4 -8 rmove + 0 8 rline 0 1 -1 2 -2 2 rcurve -1 0 -2 -1 -2 -2 rcurve + 0 -8 rline 0 -1 1 -2 2 -2 rcurve 1 0 2 1 2 2 rcurve + -2 13 rmove 0 3 rline 3 0 rmove -7 0 rline +; + +\ Board bottom items + +: rantenna ( -- ) + -5 -5 rmove 10 10 rbox 5 5 rmove rpoint 5 rcircle +; +: wlan-card + 362 6 75 74 boxat + 10 9 rmove rantenna + 55 0 rmove rantenna +; + +: board-outline + 4 36 moveto + 58 36 lineto 58 0 lineto 355 0 lineto 355 99 lineto + 445 99 lineto 445 0 lineto 526 0 lineto 526 36 lineto + 580 36 lineto 580 360 lineto 436 360 lineto 436 324 lineto + 148 324 lineto 148 360 lineto 4 360 lineto 4 36 lineto +; + +: mic-conn + 535 52 45 28 boxat + 24 20 rmove mic-logo + 580 58 8 16 boxat +; +: headphone-conn + 535 90 45 28 boxat + headphones-logo + 580 96 8 16 boxat +; +: ac-conn 553 306 36 27 boxat ; +: ext-sd-slot 13 270 81 90 boxat ; +: kbd-conn 175 279 13 27 boxat ; + +: ext-sd-card + 20 283 moveto 20 369 lineto 87 369 lineto 87 294 lineto 76 283 lineto 20 283 lineto +; + +: usb0-conn + 537 126 45 27 boxat + usb-logo +; +: usb1-conn + 0 54 45 27 boxat + usb-logo +; +: usb2-conn + 0 99 45 45 boxat + 0 9 rmove usb-logo +; +: battery-conn + 444 306 27 27 boxat + 427 279 18 18 boxat +; + +: led0 105 349 led-symbol ; +: led1 131 349 led-symbol ; +: led2 446 349 led-symbol ; +: led3 473 349 led-symbol ; +: cmos-battery-conn + 304 85 12 18 boxat + 306 81 8 4 boxat + 306 103 8 4 boxat +; + +: cmos-battery + 262 60 22 circleat + \ Wires + 243 71 moveto + 238 75 228 81 229 86 curveto + 229 90 242 99 249 100 curveto + 255 100 262 89 269 89 curveto + 275 89 280 100 286 100 curveto + 292 100 297 93 303 90 curveto + 247 76 moveto + 241 81 231 89 229 93 curveto + 226 96 230 99 234 99 curveto + 237 99 244 90 250 91 curveto + 255 91 261 101 268 101 curveto + 274 100 280 90 286 90 curveto + 292 90 298 96 304 99 curveto +; + +: rspkr-conn + 22 154 18 16 boxat + 18 159 4 8 boxat + 40 159 4 8 boxat +; +: lspkr-conn + 544 171 18 16 boxat + 540 175 4 8 boxat + 562 175 4 8 boxat +; + +: wlan-conn 350 81 100 28 boxat ; + +: serial-conn + 72 51 18 27 boxat + 76 47 8 4 boxat + 76 78 8 4 boxat +; + +: int-sd-slot 411 159 51 45 boxat ; + +: int-sd-card + 404 200 moveto + 404 164 lineto 458 164 lineto 458 191 lineto 440 191 lineto 431 200 lineto + 427 200 lineto 427 195 lineto 423 195 lineto 418 199 lineto 404 200 lineto +; + +: basic-layout ( -- ) + clear-drawing + d# 10 d# 20 offsetat + double-drawing +; +: draw-board ( -- ) + basic-layout + board-outline + mic-conn + headphone-conn + ac-conn + ext-sd-slot + kbd-conn + usb0-conn + usb1-conn + usb2-conn + battery-conn + led0 led1 led2 led3 + cmos-battery-conn + cmos-battery + rspkr-conn + lspkr-conn + wlan-conn + serial-conn + int-sd-slot + + wlan-card + int-sd-card + ext-sd-card +; + +\ Board top items + +: button-symbol ( x y -- ) + 2dup 18 18 boxat + swap 9 + swap 9 + 6 circleat +; +: top-outline + 153 360 moveto + 153 324 lineto 441 324 lineto 441 360 lineto 585 360 lineto + 585 36 lineto 531 36 lineto 531 0 lineto 234 0 lineto + 234 99 lineto 144 99 lineto 144 0 lineto 63 0 lineto + 63 36 lineto 9 36 lineto 9 360 lineto 153 360 lineto +; +: headphones-top + 2 95 7 18 boxat + 9 91 45 28 boxat + headphones-logo +; +: mic-top + 9 54 45 28 boxat + 24 20 rmove mic-logo + 2 59 7 18 boxat +; +: acin 0 307 36 27 boxat ; +: int-mic-conn + 70 146 18 18 boxat + 28 15 rmove mic-logo +; +: usb0 + 7 128 45 27 boxat + usb-logo +; +: usb1 + 543 55 45 27 boxat + usb-logo +; +: usb2 + 543 100 45 45 boxat + 0 9 rmove usb-logo +; +: display-conn 252 1 89 18 boxat ; +: camera-conn 540 154 36 18 boxat ; +: backlight-conn 63 46 27 17 boxat ; +: above-int-mic-conn + 79 87 18 27 boxat + 81 82 9 5 boxat + 81 114 9 5 boxat +; +: pwr-but 543 338 button-symbol ; +: rotate-but 30 338 button-symbol ; +: up-but 37 237 button-symbol ; +: down-but 37 278 button-symbol ; +: left-but 14 258 button-symbol ; +: right-but 57 258 button-symbol ; +: o-but 543 239 button-symbol ; +: x-but + 543 279 18 18 boxat + 548 283 moveto 557 292 lineto 548 292 moveto 557 283 lineto +; +: square-but + 521 260 18 18 boxat + 525 264 moveto 534 264 lineto 534 273 lineto 525 273 lineto 525 264 lineto +; +: check-but + 564 259 18 18 boxat + 570 269 moveto 573 273 lineto 578 263 lineto +; +: led0-top 518 348 led-symbol ; +: led1-top 491 348 led-symbol ; +: led2-top 72 348 led-symbol ; +: led3-top 99 348 led-symbol ; +: mic-led 31 45 led-symbol ; +: camera-led 569 45 led-symbol ; +: wlan-conn-top 144 82 90 27 boxat ; +: wlan-card-top 152 7 75 75 boxat ; +: ext-sd-slot-top 497 360 81 9 boxat ; +: ext-sd-card-top + 504 369 moveto 0 -75 rline 11 -11 rline 56 0 rline 0 86 rline -67 0 rline +; +: draw-top ( -- ) + basic-layout + + top-outline + headphones-top + mic-top + acin + int-mic-conn + usb0 usb1 usb2 + display-conn + camera-conn + backlight-conn + above-int-mic-conn + pwr-but + rotate-but + up-but + down-but + left-but + right-but + o-but + x-but + square-but + check-but + led0-top + led1-top + led2-top + led3-top + mic-led + camera-led + wlan-conn-top + wlan-card-top + ext-sd-slot-top +; + +: usb-key ( -- ) + 95 155 moveto 130 165 lineto 130 155 lineto 95 145 lineto 95 155 lineto + 130 155 moveto 150 140 lineto 150 150 lineto 130 165 lineto + 150 140 moveto 115 130 lineto 95 145 lineto + 146 153 moveto 155 155 lineto 155 135 lineto 110 122 lineto 110 133 lineto + 110 122 moveto 110 122 171 67 197 54 curveto 229 38 295 42 155 135 curveto + 155 156 moveto 218 111 229 100 241 81 curveto 248 65 239 51 239 51 curveto +; + +: scanner ( -- ) + 195 98 moveto + 195 111 174 121 149 121 curveto + 123 121 103 111 102 98 curveto + 103 85 123 75 149 75 curveto + 174 75 195 85 195 98 curveto + + 113 83 moveto + 193 40 228 48 239 61 curveto + 261 90 171 118 171 120 curveto + + 235 85 moveto + 281 177 310 177 267 201 curveto + 251 209 227 200 235 189 curveto + 243 177 249 179 248 172 curveto + 239 121 196 109 200 109 curveto +; + +: usb-ethernet + 130 212 moveto + 141 218 145 220 145 205 curveto 145 190 145 190 125 180 curveto + 105 170 105 171 105 185 curveto 105 190 105 185 105 190 curveto + + 105 190 moveto + 106 190 105 192 105 185 curveto 105 170 105 170 135 155 curveto 165 140 165 140 185 150 curveto + 205 160 205 160 205 175 curveto 205 190 205 190 175 205 curveto 145 220 146 221 130 212 curveto + + 125 190 moveto 135 195 lineto 115 205 lineto 95 195 lineto 115 185 lineto 120 188 lineto + 105 215 moveto 115 220 lineto 115 205 lineto 95 195 lineto 95 206 lineto + 115 220 moveto 135 210 lineto 135 195 lineto 115 205 lineto 115 220 lineto + 102 202 moveto 105 201 109 202 110 205 curveto 111 208 111 211 109 213 curveto + 109 213 moveto 78 232 38 242 38 242 curveto + 103 202 moveto 76 219 38 230 38 230 curveto + 130 188 moveto 121 193 lineto 115 190 lineto 125 185 lineto 130 188 lineto + 130 188 moveto 130 189 130 193 130 193 curveto + 115 185 moveto 120 188 lineto + 135 195 moveto 126 191 lineto + + 321 96 moveto 321 106 lineto 322 106 308 124 287 118 curveto + 306 108 moveto 313 105 321 96 321 96 curveto 303 89 lineto 303 89 296 92 289 98 curveto 275 112 291 117 306 108 curveto + 327 90 moveto 327 96 lineto 321 101 lineto + 307 90 moveto 315 85 lineto 327 90 lineto 319 95 lineto + 283 111 moveto 284 114 287 112 288 113 curveto 289 114 289 116 288 117 curveto + 284 111 moveto 284 110 lineto + + 287 111 moveto 250 134 198 157 198 157 curveto + 288 117 moveto 238 147 203 161 203 161 curveto +; + + +0 value blink-time +-1 value blink-state +0 value blink-color +h# ff0000 constant red-888 +h# 00ff00 constant green-888 +h# 0000ff constant blue-888 +h# 000000 constant black-888 +h# ffffff constant white-888 +h# ff00ff constant magenta-888 +magenta-888 to blink-color + +: set-default-color ( -- ) black-888 set-fg ; + +defer selected-object ' noop to selected-object + +: idle ( -- ) + blink-state -1 = if exit then + 1 ms + get-msecs blink-time - 0>= if + blink-state 1 xor dup to blink-state ( state ) + if blink-color set-fg else white-888 set-fg then + selected-object + get-msecs d# 400 + to blink-time + then +; + +: highlight ( xt color -- ) + to blink-color + to selected-object + get-msecs to blink-time + 0 to blink-state + idle +; +: message-off ( -- ) d# 2 d# 27 at-xy kill-line ; +: message ( adr len -- ) cursor-off message-off red-letters type black-letters ; + +: performed ( -- ) + -1 to blink-state + message-off + set-default-color + selected-object + cr +; + +: connect-scanner ( -- ) + basic-layout + " Connect USB barcode scanner to continue.." message + ['] scanner green-888 highlight +; + +: connect-usb-key ( -- ) + basic-layout + " Connect USB stick to continue.." message + ['] usb-key green-888 highlight +; + +: connect-usb-ethernet ( -- ) + basic-layout + " Connect USB Ethernet to continue.." message + ['] usb-ethernet green-888 highlight +; + +: connect-headphones ( -- ) + draw-top + " Connect headphones to continue.." message + ['] headphones-top h# 00e000 highlight \ Green like headphone jack +; +: disconnect-headphones ( -- ) + draw-top + " Disconnect headphones to continue.." message + ['] headphones-top red-888 highlight +; +: connect-microphone ( -- ) + draw-top + " Connect microphone to continue.." message + ['] mic-top h# ff80c0 highlight \ Close enough to the pink of the mic jack +; +: disconnect-microphone ( -- ) + draw-top + " Disconnect microphone to continue.." message + ['] mic-top red-888 highlight +; +: mic+phones-top ( -- ) mic-top headphones-top ; +: connect-loopback ( -- ) + draw-top + " Connect loopback cable to continue.." message + ['] mic+phones-top green-888 highlight +; +: disconnect-loopback ( -- ) + draw-top + " Disconnect loopback cable to continue.." message + ['] mic+phones-top red-888 highlight +; + +: connect-int-sd ( -- ) + draw-board + " Connect internal SD card to continue.." message + ['] int-sd-card green-888 highlight +; +: connect-ext-sd ( -- ) + draw-top + " Connect external SD card to continue.." message + ['] ext-sd-card-top green-888 highlight +; + +: disconnect-int-sd ( -- ) + draw-board + " Disconnect internal SD card to continue.." message + ['] int-sd-card red-888 highlight +; +: disconnect-ext-sd ( -- ) + draw-top + " Disonnect external SD card to continue.." message + ['] ext-sd-card-top red-888 highlight +; + +: open ( -- ok ) true ; +: close ( -- ) ; + +end-support-package +0 value instructions-ih + +: ($instructions) ( name$ -- ) + instructions-ih 0= if + " " " test-instructions" $open-package to instructions-ih + then + instructions-ih $call-method +; +' ($instructions) to $instructions + +: (instructions-idle) ( -- ) " idle" $instructions ; +' (instructions-idle) to instructions-idle + +: (instructions-done) ( -- ) " performed" $instructions ; +' (instructions-done) to instructions-done + +: diag-mode ( -- ) true to diag-switch? ; + +hex + +\ LICENSE_BEGIN +\ Copyright (c) 2010 FirmWorks +\ +\ 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

1 0

[commit] r1749 - cpu/x86/pc/olpc/via dev/hdaudio dev/mmc/sdhci
by repository service Feb. 16, 2010

Feb. 16, 2010

Author: wmb Date: Tue Feb 16 22:32:25 2010 New Revision: 1749 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1749 Log: OLPC XO-1.5 - graphical instructions for factory selftest steps. Modified: cpu/x86/pc/olpc/via/drawboardtop.fth cpu/x86/pc/olpc/via/factory.fth cpu/x86/pc/olpc/via/fw.bth dev/hdaudio/test.fth dev/mmc/sdhci/selftest.fth Modified: cpu/x86/pc/olpc/via/drawboardtop.fth ============================================================================== --- cpu/x86/pc/olpc/via/drawboardtop.fth Tue Feb 16 19:46:12 2010 (r1748) +++ cpu/x86/pc/olpc/via/drawboardtop.fth Tue Feb 16 22:32:25 2010 (r1749) @@ -1,3 +1,6 @@ +\ See license at end of file +purpose: Drawings of OLPC XO-1.5 board and components for test instructions + support-package: test-instructions decimal @@ -99,7 +102,7 @@ : battery-conn 444 306 27 27 boxat 427 279 18 18 boxat -; +; : led0 105 349 led-symbol ; : led1 131 349 led-symbol ; @@ -262,8 +265,10 @@ : camera-led 569 45 led-symbol ; : wlan-conn-top 144 82 90 27 boxat ; : wlan-card-top 152 7 75 75 boxat ; -: ext-sd-slot 497 360 81 9 boxat ; - +: ext-sd-slot-top 497 360 81 9 boxat ; +: ext-sd-card-top + 504 369 moveto 0 -75 rline 11 -11 rline 56 0 rline 0 86 rline -67 0 rline +; : draw-top ( -- ) basic-layout @@ -295,7 +300,7 @@ camera-led wlan-conn-top wlan-card-top - ext-sd-slot + ext-sd-slot-top ; : usb-key ( -- ) @@ -453,14 +458,30 @@ : connect-int-sd ( -- ) draw-board - " Power off and connect internal SD card to continue.." message + " Connect internal SD card to continue.." message ['] int-sd-card green-888 highlight -; +; +: connect-ext-sd ( -- ) + draw-top + " Connect external SD card to continue.." message + ['] ext-sd-card-top green-888 highlight +; + +: disconnect-int-sd ( -- ) + draw-board + " Disconnect internal SD card to continue.." message + ['] int-sd-card red-888 highlight +; +: disconnect-ext-sd ( -- ) + draw-top + " Disonnect external SD card to continue.." message + ['] ext-sd-card-top red-888 highlight +; : open ( -- ok ) true ; : close ( -- ) ; -end-package +end-support-package 0 value instructions-ih : ($instructions) ( name$ -- ) @@ -478,3 +499,29 @@ ' (instructions-done) to instructions-done : diag-mode ( -- ) true to diag-switch? ; + +hex + +\ LICENSE_BEGIN +\ Copyright (c) 2010 FirmWorks +\ +\ 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: cpu/x86/pc/olpc/via/factory.fth ============================================================================== --- cpu/x86/pc/olpc/via/factory.fth Tue Feb 16 19:46:12 2010 (r1748) +++ cpu/x86/pc/olpc/via/factory.fth Tue Feb 16 22:32:25 2010 (r1749) @@ -109,7 +109,7 @@ \ begin d# 250 ms silent-probe-usb scanner? until " connect-scanner" $instructions begin instructions-idle d# 400 ms silent-probe-usb scanner? until - instructions-performed + instructions-done clear-drawing ?usb-keyboard then ; @@ -120,7 +120,7 @@ wired-lan? 0= if " connect-usb-ethernet" $instructions begin d# 400 ms instructions-idle silent-probe-usb wired-lan? until - instructions-performed + instructions-done clear-drawing then ; : usb-key? ( -- flag ) @@ -130,7 +130,7 @@ usb-key? 0= if " connect-usb-key" $instructions begin d# 400 ms instructions-idle silent-probe-usb usb-key? until - instructions-performed + instructions-done clear-drawing then ; : stall ( -- ) begin halt again ; Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Tue Feb 16 19:46:12 2010 (r1748) +++ cpu/x86/pc/olpc/via/fw.bth Tue Feb 16 22:32:25 2010 (r1749) @@ -352,6 +352,10 @@ fload ${BP}/cpu/x86/pc/olpc/gui.fth fload ${BP}/cpu/x86/pc/olpc/via/suspend.fth \ Suspend/resume setup +fload ${BP}/cpu/x86/pc/olpc/strokes.fth +fload ${BP}/cpu/x86/pc/olpc/plot.fth +fload ${BP}/cpu/x86/pc/olpc/via/drawboardtop.fth + fload ${BP}/cpu/x86/pc/olpc/via/switches.fth \ Lid and ebook switches fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools @@ -518,11 +522,6 @@ fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth devalias fsdisk int:0 -fload ${BP}/cpu/x86/pc/olpc/strokes.fth -fload ${BP}/cpu/x86/pc/olpc/plot.fth -fload ${BP}/cpu/x86/pc/olpc/via/drawboard.fth -fload ${BP}/cpu/x86/pc/olpc/via/drawboardtop.fth - fload ${BP}/ofw/inet/sntp.fth : olpc-ntp-servers ( -- ) " DHCP time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" Modified: dev/hdaudio/test.fth ============================================================================== --- dev/hdaudio/test.fth Tue Feb 16 19:46:12 2010 (r1748) +++ dev/hdaudio/test.fth Tue Feb 16 22:32:25 2010 (r1749) @@ -15,14 +15,16 @@ ; : connect-headphones ( -- ) headphone-jack pin-sense? 0= if - ." Connect headphones to continue.. " - begin ?key-abort pin-sense? until cr + " connect-headphones" $instructions + begin ?key-abort instructions-idle pin-sense? until + instructions-done then ; : disconnect-headphones ( -- ) headphone-jack pin-sense? if - ." Disconnect headphones to continue.. " - begin ?key-abort pin-sense? 0= until cr + " disconnect-headphones" $instructions + begin ?key-abort instructions-idle pin-sense? 0= until + instructions-done then ; : speaker-test ( -- ) @@ -49,14 +51,16 @@ : connect-mic external-mic pin-sense? 0= if - ." Connect microphone to continue.. " - begin ?key-abort pin-sense? until cr + " connect-microphone" $instructions + begin ?key-abort instructions-idle pin-sense? until + instructions-done then ; : disconnect-mic ( -- ) external-mic pin-sense? if - ." Disconnect microphone to continue.. " - begin ?key-abort pin-sense? 0= until cr + " disconnect-microphone" $instructions + begin ?key-abort instructions-idle pin-sense? 0= until + instructions-done then ; @@ -107,6 +111,7 @@ true to force-speakers? true to force-internal-mic? input-common-settings mono output-common-settings d# -9 set-volume + ." Testing internal speakers and microphone" cr " setup-case" test-common false to force-speakers? false to force-internal-mic? ; @@ -114,12 +119,14 @@ true to force-speakers? true to force-internal-mic? input-common-settings mono output-common-settings d# -23 set-volume \ -23 prevents obvious visible clipping + ." Testing internal speakers and microphone with fixture" cr " setup-fixture" test-common false to force-speakers? false to force-internal-mic? ; : test-with-loopback ( -- error? ) input-common-settings stereo output-common-settings d# -33 set-volume \ -23 prevents obvious visible clipping + ." Testing headphone and microphone jacks with loopback cable" cr " setup-loopback" test-common ; @@ -147,15 +154,17 @@ ; : connect-loopback ( -- ) loopback-connected? 0= if - ." Connect loopback cable to continue.. " - begin ?key-abort loopback-connected? until cr + " connect-loopback" $instructions + begin ?key-abort instructions-idle loopback-connected? until + instructions-done then - d# 500 ms \ Time to make sure the plug is all the way in + d# 500 ms \ Delay to make sure the plug is all the way in ; : disconnect-loopback ( -- ) loopback-disconnected? 0= if - ." Disconnect loopback cable to continue.. " - begin ?key-abort loopback-disconnected? until cr + " disconnect-loopback" $instructions + begin ?key-abort instructions-idle loopback-disconnected? until + instructions-done then ; \ Returns failure by throwing Modified: dev/mmc/sdhci/selftest.fth ============================================================================== --- dev/mmc/sdhci/selftest.fth Tue Feb 16 19:46:12 2010 (r1748) +++ dev/mmc/sdhci/selftest.fth Tue Feb 16 22:32:25 2010 (r1749) @@ -64,11 +64,14 @@ : wait-card? ( -- error? ) card-present? if false exit then diagnostic-mode? if - ." Please insert card in " .slot-name ." to continue test." cr + external? if " connect-ext-sd" else " connect-int-sd" then + $instructions begin d# 100 ms + instructions-idle test-abort? if ." Aborted" true exit then card-present? until + instructions-done ." Card insertion correctly detected." cr d# 200 ms \ Settling time false @@ -82,12 +85,15 @@ diagnostic-mode? 0= if false exit then external? 0= if false exit then - ." Please remove card from " .slot-name ." to continue test." cr + external? if " disconnect-ext-sd" else " disconnect-int-sd" then + $instructions begin d# 100 ms + instructions-idle test-abort? if ." Aborted" true exit then card-present? 0= until + instructions-done ." Card removal correctly detected." cr false ;

1 0

[commit] r1748 - cpu/x86/pc/olpc/via
by repository service Feb. 16, 2010

Feb. 16, 2010

Author: wmb Date: Tue Feb 16 19:46:12 2010 New Revision: 1748 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1748 Log: OLPC trac 10024 - restored progress icons for internal NAND/SD and external SD storage (XO-1.5 build) Modified: cpu/x86/pc/olpc/via/olpc.bth Modified: cpu/x86/pc/olpc/via/olpc.bth ============================================================================== --- cpu/x86/pc/olpc/via/olpc.bth Tue Feb 16 19:45:23 2010 (r1747) +++ cpu/x86/pc/olpc/via/olpc.bth Tue Feb 16 19:46:12 2010 (r1748) @@ -139,7 +139,8 @@ " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/sd.565" " sd.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/DisplayEDID.raw" " edid" $add-deflated-dropin

1 0

[commit] r1747 - cpu/x86/pc/olpc
by repository service Feb. 16, 2010

Feb. 16, 2010

Author: wmb Date: Tue Feb 16 19:45:23 2010 New Revision: 1747 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1747 Log: OLPC trac 10024 - restored progress icons for internal NAND/SD and external SD storage. Modified: cpu/x86/pc/olpc/loaddropins.fth Modified: cpu/x86/pc/olpc/loaddropins.fth ============================================================================== --- cpu/x86/pc/olpc/loaddropins.fth Tue Feb 16 19:42:17 2010 (r1746) +++ cpu/x86/pc/olpc/loaddropins.fth Tue Feb 16 19:45:23 2010 (r1747) @@ -41,13 +41,13 @@ " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nand.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " fastnand.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/sd.565" " sd.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin " ${BP}/ofw/termemu/15x30pc.psf" " font" $add-deflated-dropin [ifdef] use-ega

1 0

[commit] r1746 - cpu/x86/pc/olpc
by repository service Feb. 16, 2010

Feb. 16, 2010

Author: wmb Date: Tue Feb 16 19:42:17 2010 New Revision: 1746 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1746 Log: Memory selftest - Changed suspend/resume sub-test to do only one pass. Modified: cpu/x86/pc/olpc/rtcwake.fth Modified: cpu/x86/pc/olpc/rtcwake.fth ============================================================================== --- cpu/x86/pc/olpc/rtcwake.fth Tue Feb 16 08:41:37 2010 (r1745) +++ cpu/x86/pc/olpc/rtcwake.fth Tue Feb 16 19:42:17 2010 (r1746) @@ -120,9 +120,7 @@ \ on the operator. ." Testing S3 suspend/resume" cr rtc-alarm-delay >r - ." Sleeping for 1 second .. " 1 to rtc-alarm-delay pm-sleep-rtc cr ." Sleeping for 4 seconds .. " 4 to rtc-alarm-delay pm-sleep-rtc cr - ." Sleeping for 8 seconds .. " 8 to rtc-alarm-delay pm-sleep-rtc cr r> to rtc-alarm-delay false ;

1 0

[commit] r1745 - cpu/x86/build cpu/x86/pc/olpc/via ofw/fcode
by repository service Feb. 15, 2010

Feb. 15, 2010

Author: wmb Date: Tue Feb 16 08:41:37 2010 New Revision: 1745 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1745 Log: OLPC XO-1.5 - Graphical instructions for manufacturing tests. Modified: cpu/x86/build/builder.dic cpu/x86/pc/olpc/via/drawboardtop.fth cpu/x86/pc/olpc/via/factory.fth cpu/x86/pc/olpc/via/smt.fth ofw/fcode/applcode.fth ofw/fcode/extcodes.fth ofw/fcode/loadfcod.fth ofw/fcode/sysprims.fth Modified: cpu/x86/build/builder.dic ============================================================================== Binary file (source and/or target). No diff available. Modified: cpu/x86/pc/olpc/via/drawboardtop.fth ============================================================================== --- cpu/x86/pc/olpc/via/drawboardtop.fth Sat Feb 13 20:27:16 2010 (r1744) +++ cpu/x86/pc/olpc/via/drawboardtop.fth Tue Feb 16 08:41:37 2010 (r1745) @@ -1,3 +1,194 @@ +support-package: test-instructions + +decimal + +\ Common items + +: headphones-logo + 24 5 rmove -6 0 -10 6 -10 13 rcurve + 10 -13 rmove 6 0 10 6 10 13 rcurve + -16 4 rmove -2 0 -3 -1 -3 -2 rcurve 0 -3 1 -3 3 -3 rcurve 0 5 rline + 12 -5 rmove 2 0 3 0 3 2 rcurve 0 3 -1 3 -3 3 rcurve 0 -5 rline +; + +: led-symbol ( x y -- ) + moveto 5 5 rline 5 -5 rline -5 -5 rline -5 5 rline +; +: usb-logo + 14 11 rmove + 1 1 1 3 0 4 rcurve + -1 1 -2 1 -3 0 rcurve + -1 -1 -1 -3 0 -4 rcurve + 1 -1 2 -1 3 0 rcurve + + 10 -4 rmove + 1 -1 1 -2 0 -2 rcurve + 0 -1 -1 -1 -1 0 rcurve + 0 0 0 1 0 2 rcurve + 0 0 1 0 1 0 rcurve + + -12 6 rmove 18 0 rline + 5 0 rmove -5 -2 rline 0 4 rline 5 -2 rline + -7 6 rmove 2 0 rline 0 3 rline -2 0 rline 0 -3 rline + -11 -6 rmove + 1 -2 2 -5 3 -6 rcurve + 1 -2 2 -1 3 -1 rcurve + + -2 7 rmove + 2 2 2 5 4 7 rcurve + 1 1 3 0 5 0 rcurve +; +: mic-logo + -4 0 -6 -3 -6 -5 rcurve + 6 5 rmove 3 0 6 -3 6 -5 rcurve + -4 -8 rmove + 0 8 rline 0 1 -1 2 -2 2 rcurve -1 0 -2 -1 -2 -2 rcurve + 0 -8 rline 0 -1 1 -2 2 -2 rcurve 1 0 2 1 2 2 rcurve + -2 13 rmove 0 3 rline 3 0 rmove -7 0 rline +; + +\ Board bottom items + +: rantenna ( -- ) + -5 -5 rmove 10 10 rbox 5 5 rmove rpoint 5 rcircle +; +: wlan-card + 362 6 75 74 boxat + 10 9 rmove rantenna + 55 0 rmove rantenna +; + +: board-outline + 4 36 moveto + 58 36 lineto 58 0 lineto 355 0 lineto 355 99 lineto + 445 99 lineto 445 0 lineto 526 0 lineto 526 36 lineto + 580 36 lineto 580 360 lineto 436 360 lineto 436 324 lineto + 148 324 lineto 148 360 lineto 4 360 lineto 4 36 lineto +; + +: mic-conn + 535 52 45 28 boxat + 24 20 rmove mic-logo + 580 58 8 16 boxat +; +: headphone-conn + 535 90 45 28 boxat + headphones-logo + 580 96 8 16 boxat +; +: ac-conn 553 306 36 27 boxat ; +: ext-sd-slot 13 270 81 90 boxat ; +: kbd-conn 175 279 13 27 boxat ; + +: ext-sd-card + 20 283 moveto 20 369 lineto 87 369 lineto 87 294 lineto 76 283 lineto 20 283 lineto +; + +: usb0-conn + 537 126 45 27 boxat + usb-logo +; +: usb1-conn + 0 54 45 27 boxat + usb-logo +; +: usb2-conn + 0 99 45 45 boxat + 0 9 rmove usb-logo +; +: battery-conn + 444 306 27 27 boxat + 427 279 18 18 boxat +; + +: led0 105 349 led-symbol ; +: led1 131 349 led-symbol ; +: led2 446 349 led-symbol ; +: led3 473 349 led-symbol ; +: cmos-battery-conn + 304 85 12 18 boxat + 306 81 8 4 boxat + 306 103 8 4 boxat +; + +: cmos-battery + 262 60 22 circleat + \ Wires + 243 71 moveto + 238 75 228 81 229 86 curveto + 229 90 242 99 249 100 curveto + 255 100 262 89 269 89 curveto + 275 89 280 100 286 100 curveto + 292 100 297 93 303 90 curveto + 247 76 moveto + 241 81 231 89 229 93 curveto + 226 96 230 99 234 99 curveto + 237 99 244 90 250 91 curveto + 255 91 261 101 268 101 curveto + 274 100 280 90 286 90 curveto + 292 90 298 96 304 99 curveto +; + +: rspkr-conn + 22 154 18 16 boxat + 18 159 4 8 boxat + 40 159 4 8 boxat +; +: lspkr-conn + 544 171 18 16 boxat + 540 175 4 8 boxat + 562 175 4 8 boxat +; + +: wlan-conn 350 81 100 28 boxat ; + +: serial-conn + 72 51 18 27 boxat + 76 47 8 4 boxat + 76 78 8 4 boxat +; + +: int-sd-slot 411 159 51 45 boxat ; + +: int-sd-card + 404 200 moveto + 404 164 lineto 458 164 lineto 458 191 lineto 440 191 lineto 431 200 lineto + 427 200 lineto 427 195 lineto 423 195 lineto 418 199 lineto 404 200 lineto +; + +: basic-layout ( -- ) + clear-drawing + d# 10 d# 20 offsetat + double-drawing +; +: draw-board ( -- ) + basic-layout + board-outline + mic-conn + headphone-conn + ac-conn + ext-sd-slot + kbd-conn + usb0-conn + usb1-conn + usb2-conn + battery-conn + led0 led1 led2 led3 + cmos-battery-conn + cmos-battery + rspkr-conn + lspkr-conn + wlan-conn + serial-conn + int-sd-slot + + wlan-card + int-sd-card + ext-sd-card +; + +\ Board top items + : button-symbol ( x y -- ) 2dup 18 18 boxat swap 9 + swap 9 + 6 circleat @@ -9,12 +200,12 @@ 234 99 lineto 144 99 lineto 144 0 lineto 63 0 lineto 63 36 lineto 9 36 lineto 9 360 lineto 153 360 lineto ; -: hph +: headphones-top 2 95 7 18 boxat 9 91 45 28 boxat headphones-logo ; -: mic +: mic-top 9 54 45 28 boxat 24 20 rmove mic-logo 2 59 7 18 boxat @@ -74,10 +265,11 @@ : ext-sd-slot 497 360 81 9 boxat ; : draw-top ( -- ) - clear-drawing + basic-layout + top-outline - hph - mic + headphones-top + mic-top acin int-mic-conn usb0 usb1 usb2 @@ -105,3 +297,184 @@ wlan-card-top ext-sd-slot ; + +: usb-key ( -- ) + 95 155 moveto 130 165 lineto 130 155 lineto 95 145 lineto 95 155 lineto + 130 155 moveto 150 140 lineto 150 150 lineto 130 165 lineto + 150 140 moveto 115 130 lineto 95 145 lineto + 146 153 moveto 155 155 lineto 155 135 lineto 110 122 lineto 110 133 lineto + 110 122 moveto 110 122 171 67 197 54 curveto 229 38 295 42 155 135 curveto + 155 156 moveto 218 111 229 100 241 81 curveto 248 65 239 51 239 51 curveto +; + +: scanner ( -- ) + 195 98 moveto + 195 111 174 121 149 121 curveto + 123 121 103 111 102 98 curveto + 103 85 123 75 149 75 curveto + 174 75 195 85 195 98 curveto + + 113 83 moveto + 193 40 228 48 239 61 curveto + 261 90 171 118 171 120 curveto + + 235 85 moveto + 281 177 310 177 267 201 curveto + 251 209 227 200 235 189 curveto + 243 177 249 179 248 172 curveto + 239 121 196 109 200 109 curveto +; + +: usb-ethernet + 130 212 moveto + 141 218 145 220 145 205 curveto 145 190 145 190 125 180 curveto + 105 170 105 171 105 185 curveto 105 190 105 185 105 190 curveto + + 105 190 moveto + 106 190 105 192 105 185 curveto 105 170 105 170 135 155 curveto 165 140 165 140 185 150 curveto + 205 160 205 160 205 175 curveto 205 190 205 190 175 205 curveto 145 220 146 221 130 212 curveto + + 125 190 moveto 135 195 lineto 115 205 lineto 95 195 lineto 115 185 lineto 120 188 lineto + 105 215 moveto 115 220 lineto 115 205 lineto 95 195 lineto 95 206 lineto + 115 220 moveto 135 210 lineto 135 195 lineto 115 205 lineto 115 220 lineto + 102 202 moveto 105 201 109 202 110 205 curveto 111 208 111 211 109 213 curveto + 109 213 moveto 78 232 38 242 38 242 curveto + 103 202 moveto 76 219 38 230 38 230 curveto + 130 188 moveto 121 193 lineto 115 190 lineto 125 185 lineto 130 188 lineto + 130 188 moveto 130 189 130 193 130 193 curveto + 115 185 moveto 120 188 lineto + 135 195 moveto 126 191 lineto + + 321 96 moveto 321 106 lineto 322 106 308 124 287 118 curveto + 306 108 moveto 313 105 321 96 321 96 curveto 303 89 lineto 303 89 296 92 289 98 curveto 275 112 291 117 306 108 curveto + 327 90 moveto 327 96 lineto 321 101 lineto + 307 90 moveto 315 85 lineto 327 90 lineto 319 95 lineto + 283 111 moveto 284 114 287 112 288 113 curveto 289 114 289 116 288 117 curveto + 284 111 moveto 284 110 lineto + + 287 111 moveto 250 134 198 157 198 157 curveto + 288 117 moveto 238 147 203 161 203 161 curveto +; + + +0 value blink-time +-1 value blink-state +0 value blink-color +h# ff0000 constant red-888 +h# 00ff00 constant green-888 +h# 0000ff constant blue-888 +h# 000000 constant black-888 +h# ffffff constant white-888 +h# ff00ff constant magenta-888 +magenta-888 to blink-color + +: set-default-color ( -- ) black-888 set-fg ; + +defer selected-object ' noop to selected-object + +: idle ( -- ) + blink-state -1 = if exit then + 1 ms + get-msecs blink-time - 0>= if + blink-state 1 xor dup to blink-state ( state ) + if blink-color set-fg else white-888 set-fg then + selected-object + get-msecs d# 400 + to blink-time + then +; + +: highlight ( xt color -- ) + to blink-color + to selected-object + get-msecs to blink-time + 0 to blink-state + idle +; +: message-off ( -- ) d# 2 d# 27 at-xy kill-line ; +: message ( adr len -- ) cursor-off message-off red-letters type black-letters ; + +: performed ( -- ) + -1 to blink-state + message-off + set-default-color + selected-object + cr +; + +: connect-scanner ( -- ) + basic-layout + " Connect USB barcode scanner to continue.." message + ['] scanner green-888 highlight +; + +: connect-usb-key ( -- ) + basic-layout + " Connect USB stick to continue.." message + ['] usb-key green-888 highlight +; + +: connect-usb-ethernet ( -- ) + basic-layout + " Connect USB Ethernet to continue.." message + ['] usb-ethernet green-888 highlight +; + +: connect-headphones ( -- ) + draw-top + " Connect headphones to continue.." message + ['] headphones-top h# 00e000 highlight \ Green like headphone jack +; +: disconnect-headphones ( -- ) + draw-top + " Disconnect headphones to continue.." message + ['] headphones-top red-888 highlight +; +: connect-microphone ( -- ) + draw-top + " Connect microphone to continue.." message + ['] mic-top h# ff80c0 highlight \ Close enough to the pink of the mic jack +; +: disconnect-microphone ( -- ) + draw-top + " Disconnect microphone to continue.." message + ['] mic-top red-888 highlight +; +: mic+phones-top ( -- ) mic-top headphones-top ; +: connect-loopback ( -- ) + draw-top + " Connect loopback cable to continue.." message + ['] mic+phones-top green-888 highlight +; +: disconnect-loopback ( -- ) + draw-top + " Disconnect loopback cable to continue.." message + ['] mic+phones-top red-888 highlight +; + +: connect-int-sd ( -- ) + draw-board + " Power off and connect internal SD card to continue.." message + ['] int-sd-card green-888 highlight +; + +: open ( -- ok ) true ; +: close ( -- ) ; + +end-package +0 value instructions-ih + +: ($instructions) ( name$ -- ) + instructions-ih 0= if + " " " test-instructions" $open-package to instructions-ih + then + instructions-ih $call-method +; +' ($instructions) to $instructions + +: (instructions-idle) ( -- ) " idle" $instructions ; +' (instructions-idle) to instructions-idle + +: (instructions-done) ( -- ) " performed" $instructions ; +' (instructions-done) to instructions-done + +: diag-mode ( -- ) true to diag-switch? ; Modified: cpu/x86/pc/olpc/via/factory.fth ============================================================================== --- cpu/x86/pc/olpc/via/factory.fth Sat Feb 13 20:27:16 2010 (r1744) +++ cpu/x86/pc/olpc/via/factory.fth Tue Feb 16 08:41:37 2010 (r1745) @@ -105,8 +105,11 @@ ; : wait-scanner ( -- ) scanner? 0= if - " Connect USB barcode scanner" .instructions - begin d# 1000 ms silent-probe-usb scanner? until +\ " Connect USB barcode scanner" .instructions +\ begin d# 250 ms silent-probe-usb scanner? until + " connect-scanner" $instructions + begin instructions-idle d# 400 ms silent-probe-usb scanner? until + instructions-performed ?usb-keyboard then ; @@ -115,8 +118,9 @@ ; : wait-lan ( -- ) wired-lan? 0= if - " Connect USB Ethernet Adapter" .instructions - begin d# 1000 ms silent-probe-usb wired-lan? until + " connect-usb-ethernet" $instructions + begin d# 400 ms instructions-idle silent-probe-usb wired-lan? until + instructions-performed then ; : usb-key? ( -- flag ) @@ -124,8 +128,9 @@ ; : wait-usb-key ( -- ) usb-key? 0= if - " Connect USB memory stick" .instructions - begin d# 1000 ms silent-probe-usb usb-key? until + " connect-usb-key" $instructions + begin d# 400 ms instructions-idle silent-probe-usb usb-key? until + instructions-performed then ; : stall ( -- ) begin halt again ; Modified: cpu/x86/pc/olpc/via/smt.fth ============================================================================== --- cpu/x86/pc/olpc/via/smt.fth Sat Feb 13 20:27:16 2010 (r1744) +++ cpu/x86/pc/olpc/via/smt.fth Tue Feb 16 08:41:37 2010 (r1745) @@ -271,8 +271,10 @@ : require-int-sd ( -- ) " int:0" open-dev ?dup if close-dev exit then - " Power off and insert internal SD card" .problem - stall +\ " Power off and insert internal SD card" .problem +\ stall + " connect-int-sd" $instructions + begin instructions-idle again ; : wait-connections ( -- ) Modified: ofw/fcode/applcode.fth ============================================================================== --- ofw/fcode/applcode.fth Sat Feb 13 20:27:16 2010 (r1744) +++ ofw/fcode/applcode.fth Tue Feb 16 08:41:37 2010 (r1745) @@ -143,3 +143,7 @@ [then] \ alias wflips wbflips \ alias lflips lwflips + +defer $instructions ( name$ -- ) ' 2drop to $instructions +defer instructions-done ( -- ) ' noop to instructions-done +defer instructions-idle ( -- ) ' noop to instructions-idle Modified: ofw/fcode/extcodes.fth ============================================================================== --- ofw/fcode/extcodes.fth Sat Feb 13 20:27:16 2010 (r1744) +++ ofw/fcode/extcodes.fth Tue Feb 16 08:41:37 2010 (r1745) @@ -3,3 +3,12 @@ hex vfw 070 2 byte-code: lock[ ( -- ) vfw 071 2 byte-code: ]unlock ( -- ) + +vfw 072 2 byte-code: debug-me +vfw 073 2 byte-code: new-instance ( args-adr args-len -- ) +vfw 074 2 byte-code: destroy-instance ( -- ) +vfw 075 2 byte-code: set-default-unit ( -- ) + +vfw 076 2 byte-code: $instructions ( name$ -- ) +vfw 077 2 byte-code: instructions-done ( -- ) +vfw 078 2 byte-code: instructions-idle ( -- ) Modified: ofw/fcode/loadfcod.fth ============================================================================== --- ofw/fcode/loadfcod.fth Sat Feb 13 20:27:16 2010 (r1744) +++ ofw/fcode/loadfcod.fth Tue Feb 16 08:41:37 2010 (r1745) @@ -72,6 +72,7 @@ fload ${BP}/ofw/fcode/comptokt.fth fload ${BP}/ofw/fcode/primlist.fth \ Codes for kernel primitives fload ${BP}/ofw/fcode/sysprims.fth \ Codes for system primitives +fload ${BP}/ofw/fcode/extcodes.fth \ FirmWorks-specific primitives 64\ fload ${BP}/ofw/fcode/sysprm64.fth \ Codes for 64-bit system primitives fload ${BP}/ofw/fcode/debugfc.fth \ FCode source directives fload ${BP}/ofw/fcode/loaddi.fth Modified: ofw/fcode/sysprims.fth ============================================================================== --- ofw/fcode/sysprims.fth Sat Feb 13 20:27:16 2010 (r1744) +++ ofw/fcode/sysprims.fth Tue Feb 16 08:41:37 2010 (r1745) @@ -369,9 +369,3 @@ \ --- parsing argument strings v2 040 2 byte-code: left-parse-string ( adr len char -- adrR lenR adrL lenL ) - -\ --- New FirmWorks stuff -v3 041 2 byte-code: debug-me -v3 042 2 byte-code: new-instance ( args-adr args-len -- ) -v3 043 2 byte-code: destroy-instance ( -- ) -v3 044 2 byte-code: set-default-unit ( -- )

1 0

[commit] r1744 - dev/mmc/sdhci
by repository service Feb. 13, 2010

Feb. 13, 2010

Author: wmb Date: Sat Feb 13 20:27:16 2010 New Revision: 1744 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1744 Log: OLPC trac 10024 - Improved SD card detection procedure so it works well for both the CaFe SDHCI controller and the Via SDHCI controller. Modified: dev/mmc/sdhci/sdhci.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Sat Feb 13 08:06:38 2010 (r1743) +++ dev/mmc/sdhci/sdhci.fth Sat Feb 13 20:27:16 2010 (r1744) @@ -153,7 +153,18 @@ \ The debouncer takes about 300 ms to stabilize. : card-inserted? ( -- flag ) - present-state@ h# 30000 and h# 30000 = + get-msecs d# 500 + begin ( time-limit ) + \ When the stable bit is set, we can believe the answer + present-state@ h# 20000 and if ( time-limit ) + drop ( ) + present-state@ h# 10000 and 0<> ( flag ) + exit ( -- flag ) + then ( time-limit ) + dup get-msecs - 0< ( time-limit timeout? ) + until ( time-limit ) + drop ( ) + ." SD Card detect unstable!" cr ( ) + false ( flag ) ; : write-protected? ( -- flag ) present-state@ h# 80000 and 0=

1 0

[commit] r1743 - cpu/x86/pc/olpc
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 08:06:38 2010 New Revision: 1743 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1743 Log: Q2E42 Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Sat Feb 13 07:01:43 2010 (r1742) +++ cpu/x86/pc/olpc/versions.fth Sat Feb 13 08:06:38 2010 (r1743) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 41d +macro: FW_MINOR 42 \ The EC microcode macro: EC_VERSION e34

1 0

[commit] r1742 - cpu/x86/pc/olpc
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 07:01:43 2010 New Revision: 1742 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1742 Log: OLPC XO-1.0 build - added some definitions to support new features added to the XO-1.5 build. Modified: cpu/x86/pc/olpc/fw.bth Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Sat Feb 13 06:59:35 2010 (r1741) +++ cpu/x86/pc/olpc/fw.bth Sat Feb 13 07:01:43 2010 (r1742) @@ -303,6 +303,7 @@ fload ${BP}/cpu/x86/pc/olpc/banner.fth fload ${BP}/ofw/gui/loadmenu.fth +false value smt-test? false value final-test? fload ${BP}/cpu/x86/pc/olpc/disptest.fth \ fload ${BP}/ofw/gui/insticon.fth @@ -462,6 +463,7 @@ ; ' olpc-ssids to default-ssids +fload ${BP}/cpu/x86/bootascall.fth fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth

1 0

[commit] r1741 - dev/usb2/device/storage
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 06:59:35 2010 New Revision: 1741 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1741 Log: USB mass storage driver - fixed a potential coherence problem that could result from having multiple deblocker instances open on the same device. Modified: dev/usb2/device/storage/scsicom.fth dev/usb2/device/storage/scsidisk.fth Modified: dev/usb2/device/storage/scsicom.fth ============================================================================== --- dev/usb2/device/storage/scsicom.fth Sat Feb 13 06:58:02 2010 (r1740) +++ dev/usb2/device/storage/scsicom.fth Sat Feb 13 06:59:35 2010 (r1741) @@ -73,7 +73,7 @@ \ block or record oriented, but the OBP external interface is byte-oriented, \ in order to be independent of particular device block sizes. -0 instance value deblocker +0 value deblocker : init-deblocker ( -- okay? ) " " " deblocker" $open-package to deblocker deblocker if Modified: dev/usb2/device/storage/scsidisk.fth ============================================================================== --- dev/usb2/device/storage/scsidisk.fth Sat Feb 13 06:58:02 2010 (r1740) +++ dev/usb2/device/storage/scsidisk.fth Sat Feb 13 06:59:35 2010 (r1741) @@ -139,8 +139,8 @@ \ This method is called by the deblocker -0 instance value #blocks -0 instance value block-size +0 value #blocks +0 value block-size headers @@ -193,40 +193,54 @@ \ Methods used by external clients +0 value open-count + : open ( -- flag ) my-unit parent-set-address - \ Set timeout to 45 sec: some large (>1GB) drives take - \ up to 30 secs to spin up. - d# 45 d# 1000 * set-timeout + open-count if + d# 2000 set-timeout + else - unit-ready? 0= if false exit then + \ Set timeout to 45 sec: some large (>1GB) drives take + \ up to 30 secs to spin up. + d# 45 d# 1000 * set-timeout - \ It might be a good idea to do an inquiry here to determine the - \ device configuration, checking the result to see if the device - \ really is a disk. + unit-ready? 0= if false exit then - \ Make sure the disk is spinning + \ It might be a good idea to do an inquiry here to determine the + \ device configuration, checking the result to see if the device + \ really is a disk. - timed-spin if false exit then + \ Make sure the disk is spinning - read-block-extent if false exit then ( block-size #blocks ) - to #blocks to block-size + timed-spin if false exit then - d# 2000 set-timeout + read-block-extent if false exit then ( block-size #blocks ) + to #blocks to block-size - init-deblocker 0= if false exit then + d# 2000 set-timeout + init-deblocker 0= if false exit then + then init-label-package 0= if - deblocker close-package false exit + open-count 0= if + deblocker close-package + then + false exit then + open-count 1+ to open-count + true ; : close ( -- ) - label-package close-package - deblocker close-package + open-count dup 1- 0 max to open-count ( old-open-count ) + label-package close-package ( old-open-count ) + 1 = if + deblocker close-package + then ; : seek ( offset.low offset.high -- okay? )

1 0

[commit] r1740 - dev/mmc/sdhci
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 06:58:02 2010 New Revision: 1740 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1740 Log: SDHCI - added support for erase-blocks and predeclaring the write size, and fixed a potential coherence problem with duplicate deblocker instances. Modified: dev/mmc/sdhci/sdhci.fth dev/mmc/sdhci/sdmmc.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Sat Feb 13 06:52:26 2010 (r1739) +++ dev/mmc/sdhci/sdhci.fth Sat Feb 13 06:58:02 2010 (r1740) @@ -377,6 +377,13 @@ drop ( ) ; +\ Command register: --cccccc.TTDI.C-rr c-command# T-CmdType D-dataPresent I-CmdIndexCheck C-CmdCRCcheck r-responseType +\ CmdType: 00-normal 01-suspend 10-resume 11-abort +\ ResponseType: 00-none 01-136 10-48 11-48_and_check_busy +\ Argument register: +\ Mode register: --Md-ABD M-Multi d-Direction A-Auto_CMD12 B-BlockCntEnable D-DMAEnable + + : cmd ( arg cmd mode -- ) debug? if ." CMD: " over 4 u.r space then wait-ready @@ -499,11 +506,13 @@ : protected? ( group# -- 32-bits ) h# 1e1a cmd response ; \ CMD30 R1 UNTESTED : erase-blocks ( block# #blocks -- ) \ UNTESTED + intstat-on dup 0= if 2drop exit then 1- bounds ( last first ) h# 201a 0 cmd ( last ) \ CMD32 - R1 h# 211a 0 cmd ( ) \ CMD33 - R1 - h# 261b 0 cmd \ CMD38 - R1b (wait for busy) + 0 h# 261b 0 cmd \ CMD38 - R1b (wait for busy) + intstat-off ; \ CMD40 is MMC @@ -517,11 +526,25 @@ : set-oc ( ocr -- ocr' ) app-prefix h# 2902 0 cmd response ; \ ACMD41 R3 -\ This sends back 512 bits in a single data block. -: app-get-status ( -- status ) app-prefix 0 h# 0d1a h# 12 cmd response ; \ ACMD13 R1 UNTESTED +\ This sends back 512 bits (64 bytes) in a single data block. See sdstatbits +\ It contains things like the allocation unit size and the speed class. +: app-get-status ( -- buf ) \ ACMD13 R1 + intstat-on + scratch-buf d# 64 dup (dma-setup) + app-prefix 0 h# 0d3a h# 13 cmd + response h# 20 and 0= abort" ACMD13 not implemented!" + 2 wait + dma-release + scratch-buf + intstat-off +; : get-#write-blocks ( -- n ) app-prefix 0 h# 161a 0 cmd response ; \ ACMD22 R1 UNTESTED +\ Using this before a write-multiple command speeds up the write by +\ avoiding unnecessary preservation of data that will be clobbered. +: pre-write-erase ( #blocks -- ) intstat-on app-prefix ( #blocks ) h# 171a 0 cmd ; \ ACMD23 R1 + \ You might want to turn this off for data transfer, as it controls \ a resistor on one of the data lines : set-card-detect ( on/off -- ) app-prefix h# 2a1a 0 cmd ; \ ACMD42 R1 UNTESTED @@ -934,24 +957,29 @@ dma-len /block / ; -: r/w-blocks-start ( addr block# #blocks in? -- error? ) - wait-dma-done - over 0= if 2drop 2drop false exit then \ Prevents hangs - intstat-on - >r ( addr block# #blocks r: in? ) - rot dma-setup ( block# r: in? ) - wait-write-done if true exit then - address-shift lshift r> if - read-multiple - else - write-multiple true to writing? - then - true to dma? - false +: r/w-blocks-start ( addr block# #blocks in? fresh? -- error? ) + wait-dma-done ( addr block# #blocks fresh? in? ) + 2 pick 0= if 3drop 2drop false exit then \ Prevents hangs + intstat-on ( addr block# #blocks fresh? in? ) + 2 pick >r >r >r ( addr block# #blocks r: #blocks fresh? in? ) + rot dma-setup ( block# r: #blocks fresh? in? ) + wait-write-done if drop r> r> r> 3drop true exit then ( block# ) + address-shift lshift r> if ( block# r: #blocks fresh? ) + r> r> 2drop ( block# ) + read-multiple ( ) + else ( block# r: #blocks fresh? ) + r> if r> pre-write-erase else r> drop then ( block# ) + write-multiple true to writing? ( ) + then ( ) + true to dma? ( ) + false ( error? ) +; +: fresh-write-blocks-start ( addr block# #blocks -- error? ) + false true r/w-blocks-start ; : r/w-blocks ( addr block# #blocks in? -- actual ) - r/w-blocks-start if -1 exit then r/w-blocks-finish + false r/w-blocks-start if -1 exit then r/w-blocks-finish ; : r/w-ioblocks ( reg# function# inc? addr len blksz in? -- actual ) @@ -1010,6 +1038,17 @@ swap 0 -rot do 2* i csdbit or -1 +loop ; +\ Decoder for the result of ACMD13 - app-get-status +: sdstatbit ( bit# -- b ) + d# 511 swap - ( bit#' ) + dup 3 rshift scratch-buf + c@ ( bit-offset byte ) + swap 7 and 7 xor rshift 1 and +; +: sdstatbits ( high low -- bits ) + swap 0 -rot do 2* i sdstatbit or -1 +loop +; + + \ The calculation below is shown on page 81 of the \ SD Physical Layer Simplified Specification Version 2.00. : size ( -- d.bytes ) Modified: dev/mmc/sdhci/sdmmc.fth ============================================================================== --- dev/mmc/sdhci/sdmmc.fth Sat Feb 13 06:52:26 2010 (r1739) +++ dev/mmc/sdhci/sdmmc.fth Sat Feb 13 06:58:02 2010 (r1740) @@ -15,7 +15,7 @@ \ block or record oriented, but the OBP external interface is byte-oriented, \ in order to be independent of particular device block sizes. -0 instance value deblocker +0 value deblocker external @@ -31,11 +31,15 @@ false " r/w-blocks" $call-parent ; +: erase-blocks ( block# #blocks -- ) + " erase-blocks" $call-parent +; + \ Asynchronous write. Completes on the next call to \ write-blocks-start, write-blocks-finish, or close. \ (Don't do other read/write operations in between.) : write-blocks-start ( adr block# #blocks -- error? ) - false " r/w-blocks-start" $call-parent + " fresh-write-blocks-start" $call-parent ; : write-blocks-end ( -- error? ) false " r/w-blocks-end" $call-parent @@ -48,33 +52,43 @@ : dma-free ( vadr size -- ) " dma-free" $call-parent ; : set-unit ( -- ) 0 my-unit " set-address" $call-parent ; + +0 value open-count : open ( -- ) set-unit - " attach-card" $call-parent 0= if false exit then + open-count 0= if + " attach-card" $call-parent 0= if false exit then - " " " deblocker" $open-package ?dup if - to deblocker - else - ." Can't open deblocker package" cr - false exit + " " " deblocker" $open-package to deblocker + deblocker 0= if + ." Can't open deblocker package" cr + false exit + then then - my-args " disk-label" $open-package ?dup if ( ihandle ) - to label-package + my-args " disk-label" $open-package to label-package + label-package if 0 0 " offset" label-package $call-method to offset-high to offset-low else ." Can't open disk label package" cr - deblocker close-package false exit + open-count 0= if + deblocker close-package + then + false exit then + open-count 1+ to open-count true ; : close ( -- ) - label-package close-package - deblocker close-package - \ Close packages first in case of delayed write flush - " detach-card" $call-parent + open-count dup 1- to open-count ( prev-open-count ) + label-package close-package ( prev-open-count ) + 1 = if ( ) + deblocker close-package ( ) + \ Close packages first in case of delayed write flush + " detach-card" $call-parent ( ) + then ( ) ; : block-size ( -- n ) h# 200 ;

1 0

[commit] r1739 - ofw/fs/ext2fs
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 06:52:26 2010 New Revision: 1739 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1739 Log: OLPC trac 9972 - ext2 filesystem package - fixed a bug in the calculation of backup group descriptor block numbers when the block size is not 1K. Modified: ofw/fs/ext2fs/bitmap.fth ofw/fs/ext2fs/sb.fth Modified: ofw/fs/ext2fs/bitmap.fth ============================================================================== --- ofw/fs/ext2fs/bitmap.fth Sat Feb 13 06:50:43 2010 (r1738) +++ ofw/fs/ext2fs/bitmap.fth Sat Feb 13 06:52:26 2010 (r1739) @@ -169,7 +169,7 @@ \ the block bitmap number in the group descriptor. If it is larger than \ the calculated block number, do the backup. #groups 1 do - i bpg * 2+ ( possible-gn ) + i bpg * gds-fs-block# + ( possible-gn ) dup i block-bitmap < if ( possible-gn ) block ( gdn-adr ) 0 group-desc ( gdn-adr gd0-adr ) Modified: ofw/fs/ext2fs/sb.fth ============================================================================== --- ofw/fs/ext2fs/sb.fth Sat Feb 13 06:50:43 2010 (r1738) +++ ofw/fs/ext2fs/sb.fth Sat Feb 13 06:52:26 2010 (r1739) @@ -90,7 +90,7 @@ ; : gds-fs-block# ( -- fs-block# ) - bsize d# 1024 = if 2 else 1 then ( logical block# ) + datablock0 1+ ( logical-block# ) ; : gds-block# ( -- dev-block# ) gds-fs-block# bsize ublock / * ( dev-block# )

1 0

[commit] r1738 - in ofw: disklabel fs/cdfs
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 06:50:43 2010 New Revision: 1738 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1738 Log: disk-label package - support unpartitioned disk layout where an ext2/3 filesystem occupies the entire device. Modified: ofw/disklabel/common.fth ofw/disklabel/methods.fth ofw/fs/cdfs/partition.fth Modified: ofw/disklabel/common.fth ============================================================================== --- ofw/disklabel/common.fth Sat Feb 13 06:48:48 2010 (r1737) +++ ofw/disklabel/common.fth Sat Feb 13 06:50:43 2010 (r1738) @@ -17,10 +17,17 @@ 0 instance value sector-offset -: read-sector ( sector# -- ) +\ For ISO-9660 CD-ROMs +: read-hw-sector ( sector# -- ) sector-offset + /sector um* " seek" $call-parent abort" Seek failed" sector-buf /sector " read" $call-parent /sector <> abort" Read failed" ; +\ For everything else +: read-sector ( sector# -- ) + sector-offset + h# 200 um* " seek" $call-parent abort" Seek failed" + sector-buf h# 200 " read" $call-parent h# 200 <> abort" Read failed" +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: ofw/disklabel/methods.fth ============================================================================== --- ofw/disklabel/methods.fth Sat Feb 13 06:48:48 2010 (r1737) +++ ofw/disklabel/methods.fth Sat Feb 13 06:50:43 2010 (r1738) @@ -98,6 +98,11 @@ then [then] + 2 read-sector ext2? if + ext2fs-type to partition-type + get-disk-size exit + then + \ Nothing we tried worked. abort ; Modified: ofw/fs/cdfs/partition.fth ============================================================================== --- ofw/fs/cdfs/partition.fth Sat Feb 13 06:48:48 2010 (r1737) +++ ofw/fs/cdfs/partition.fth Sat Feb 13 06:50:43 2010 (r1738) @@ -4,7 +4,7 @@ \ Returns true if the disk or partition is an ISO 9660 file \ system volume, as determined by reading the primary volume descriptor. : iso-9660? ( -- flag ) - d# 16 ['] read-sector catch if drop false exit then + d# 16 ['] read-hw-sector catch if drop false exit then sector-buf c@ 1 = sector-buf 1+ 5 " CD001" $= and dup if ( flag ) iso-type to partition-type

1 0

[commit] r1737 - forth/lib
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 06:48:48 2010 New Revision: 1737 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1737 Log: sprintf - fixed egregious bug in the handling of backslash escapes. Modified: forth/lib/printf.fth Modified: forth/lib/printf.fth ============================================================================== --- forth/lib/printf.fth Sat Feb 13 06:48:07 2010 (r1736) +++ forth/lib/printf.fth Sat Feb 13 06:48:48 2010 (r1737) @@ -38,13 +38,13 @@ : replace\ ( ... tail$ -- ... tail$' ) \ Handle backslash escapes 1/string ( ... tail$ char ) case - [char] n of newline +spchar then - [char] r of carret +spchar then - [char] t of control i +spchar then - [char] f of control l +spchar then - [char] l of linefeed +spchar then - [char] b of control h +spchar then - [char] ! of bell +spchar then + [char] n of newline +spchar endof + [char] r of carret +spchar endof + [char] t of control i +spchar endof + [char] f of control l +spchar endof + [char] l of linefeed +spchar endof + [char] b of control h +spchar endof + [char] ! of bell +spchar endof ( default ) dup +spchar endcase ;

1 0

[commit] r1736 - dev/usb2/device/wlan
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 06:48:07 2010 New Revision: 1736 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1736 Log: OLPC XO-1.0 - fixed regression in wireless open routine - new USB set-config scheme was improperly applied to the wireless driver. Modified: dev/usb2/device/wlan/usb8388.fth Modified: dev/usb2/device/wlan/usb8388.fth ============================================================================== --- dev/usb2/device/wlan/usb8388.fth Sat Feb 13 06:47:01 2010 (r1735) +++ dev/usb2/device/wlan/usb8388.fth Sat Feb 13 06:48:07 2010 (r1736) @@ -61,6 +61,13 @@ : set-parent-channel ( -- ) set-device device set-target ; : setup-bus-io ( /inbuf /outbuf -- error? ) + reset? if + configuration set-config if + ." Failed to set USB configuration for wireless" cr + true exit + then + bulk-in-pipe bulk-out-pipe reset-bulk-toggles + then 4 bulk-out-pipe " begin-out-ring" $call-parent ( /inbuf ) h# 40 bulk-in-pipe " begin-in-ring" $call-parent false

1 0

[commit] r1735 - dev/usb2/device/wlan
by repository service Feb. 12, 2010

Feb. 12, 2010

Author: wmb Date: Sat Feb 13 06:47:01 2010 New Revision: 1735 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1735 Log: OLPC XO-1.0 - fixed regression in wireless firmware download result checking. Modified: dev/usb2/device/wlan/fw8388.fth Modified: dev/usb2/device/wlan/fw8388.fth ============================================================================== --- dev/usb2/device/wlan/fw8388.fth Sat Feb 13 06:45:40 2010 (r1734) +++ dev/usb2/device/wlan/fw8388.fth Sat Feb 13 06:47:01 2010 (r1735) @@ -28,8 +28,9 @@ constant /boot-ack \ >cmd-ack-status -0 constant boot-ack-ok \ Download ok -1 constant boot-ack-fail \ Download failed +1 constant boot-ack-ok \ Download ok +\ 0 constant boot-ack-fail \ Download failed +\ 2 constant boot-ack-unsupported \ Unsupported command \ USB image download request structure struct @@ -73,11 +74,12 @@ " Bad command status length" vtype false exit then ( adr ) - >boot-magic le-l@ case ( ) - 0 of false exit endof \ BOOT_CMD_RESP_FAIL - 1 of true exit endof \ BOOT_CMD_RESP_OK - 2 of false exit endof \ BOOT_CMD_RESP_NOT_SUPPORTED - endcase + dup >boot-magic le-l@ boot-magic <> if ( adr ) + drop ( ) + " Bad magic number in boot response" vtype ( ) + false exit + then ( adr ) + >cmd-status c@ boot-ack-ok = ( ok? ) ; : wait-cmd-fw-dl-ack ( -- acked? )

1 0