openfirmware

openfirmware@openfirmware.info

3007 discussions

r1678 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 19 Jan '10

19 Jan '10

Author: wmb Date: 2010-01-19 02:17:16 +0100 (Tue, 19 Jan 2010) New Revision: 1678 Added: cpu/x86/pc/olpc/via/drawboard.fth Log: Initial checkin of drawboard.fth, which draws an outline of the XO-1.5 circuit board with connectors, useful for manufacturing diagnostic messages. Added: cpu/x86/pc/olpc/via/drawboard.fth =================================================================== --- cpu/x86/pc/olpc/via/drawboard.fth (rev 0) +++ cpu/x86/pc/olpc/via/drawboard.fth 2010-01-19 01:17:16 UTC (rev 1678) @@ -0,0 +1,182 @@ +erase-screen +decimal +: wlan-card + 362 6 75 74 boxat + \ Antenna 0 + 367 10 9 9 boxat + 374 11 moveto 376 13 376 16 374 17 curveto 372 19 370 19 368 17 curveto 366 16 366 13 368 11 curveto 370 9 372 9 374 11 curveto + 371 15 moveto 371 15 371 15 371 15 curveto 371 15 371 15 371 15 curveto 371 15 371 15 371 15 curveto 371 14 371 14 371 15 curveto + \ Antenna 1 + 423 10 9 9 boxat + 431 11 moveto 432 13 432 16 431 17 curveto 429 19 426 19 424 17 curveto 422 16 422 13 424 11 curveto 426 9 429 9 431 11 curveto + 427 15 moveto 427 15 427 15 427 15 curveto 427 15 427 15 427 15 curveto 427 15 427 15 427 15 curveto 427 14 427 14 427 15 curveto +; + +: 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 + 574 58 14 16 boxat + \ Logo + 559 72 moveto 555 72 553 70 553 67 curveto + 559 72 moveto 562 72 565 70 565 67 curveto + 561 59 moveto 561 67 lineto 561 68 560 69 559 69 curveto 558 69 557 68 557 67 curveto 557 59 lineto 557 58 558 58 559 58 curveto 560 58 561 58 561 59 curveto + 559 72 moveto 559 75 lineto + 562 75 moveto 555 75 lineto +; +: headphone-conn + 535 90 45 28 boxat + 574 96 14 16 boxat + \ Logo + 559 95 moveto 564 95 569 101 569 107 curveto + 559 95 moveto 553 95 549 101 549 107 curveto + 554 112 moveto 552 112 550 111 550 110 curveto 550 108 552 107 553 107 curveto 554 112 lineto + 564 107 moveto 566 107 568 109 568 110 curveto 567 111 566 112 564 112 curveto 564 107 lineto +; +: 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 + \ Logo + 551 137 moveto 552 138 552 140 551 141 curveto 550 142 549 142 548 141 curveto 547 140 547 138 548 137 curveto 549 136 550 136 551 137 curveto + 561 133 moveto 562 132 562 131 561 131 curveto 561 130 560 130 560 131 curveto 560 131 560 132 560 133 curveto 560 133 561 133 561 133 curveto + 549 139 moveto 567 139 lineto + 572 139 moveto 567 137 lineto 567 141 lineto 572 139 lineto + 565 145 moveto 567 145 lineto 567 148 lineto 565 148 lineto 565 145 lineto + 554 139 moveto 555 137 556 134 557 133 curveto 558 131 559 132 560 132 curveto + 558 139 moveto 560 141 560 144 562 146 curveto 563 147 565 146 567 146 curveto +; +: usb1-conn + 0 54 45 27 boxat + \ Logo + 13 65 moveto 14 66 14 68 13 69 curveto 12 70 10 70 10 69 curveto 9 68 9 66 10 65 curveto 10 64 12 64 13 65 curveto + 23 61 moveto 23 60 23 59 23 59 curveto 23 58 22 58 22 59 curveto 21 59 21 60 22 61 curveto 22 61 23 61 23 61 curveto + 11 67 moveto 29 67 lineto + 33 67 moveto 29 65 lineto 29 69 lineto 33 67 lineto + 27 73 moveto 29 73 lineto 29 76 lineto 27 76 lineto 27 73 lineto + 16 67 moveto 17 65 17 62 18 61 curveto 19 59 21 60 22 60 curveto + 20 67 moveto 21 69 22 72 23 74 curveto 25 75 27 74 29 74 curveto +; +: usb2-conn + 0 99 45 45 boxat + \ Logo + 13 119 moveto 14 120 14 122 13 123 curveto 12 124 10 124 10 123 curveto 9 122 9 120 10 119 curveto 10 118 12 118 13 119 curveto + 23 115 moveto 23 114 23 113 23 113 curveto 23 112 22 112 22 113 curveto 21 113 21 114 22 115 curveto 22 115 23 115 23 115 curveto + 11 121 moveto 29 121 lineto + 33 121 moveto 29 119 lineto 29 123 lineto 33 121 lineto + 27 127 moveto 29 127 lineto 29 130 lineto 27 130 lineto 27 127 lineto + 16 121 moveto 17 119 17 116 18 115 curveto 19 113 21 114 22 114 curveto + 20 121 moveto 21 123 22 126 23 128 curveto 25 129 27 128 29 128 curveto +; +: battery-conn + 444 306 27 27 boxat + 427 279 18 18 boxat +; + +: led0 + 110 344 moveto 115 349 lineto 110 354 lineto 105 349 lineto 110 344 lineto +; +: led1 + 136 344 moveto 141 349 lineto 136 354 lineto 131 349 lineto 136 344 lineto +; +: led2 + 451 344 moveto 456 349 lineto 451 354 lineto 446 349 lineto 451 344 lineto +; +: led3 + 478 344 moveto 483 349 lineto 478 354 lineto 473 349 lineto 478 344 lineto +; +: cmos-battery-conn + 304 85 12 18 boxat + 306 81 8 4 boxat + 306 103 8 4 boxat +; + +: cmos-battery + 278 45 moveto + 287 53 287 66 278 74 curveto + 270 83 255 83 247 74 curveto + 238 66 238 53 247 45 curveto + 255 36 270 36 278 45 curveto + 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 +; + +: draw-board ( -- ) + erase-screen + d# 10 d# 20 to dot-offset + double-size + + 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 +;

1 0

r1677 - cpu/x86/pc/olpc
by svn＠openfirmware.info 19 Jan '10

19 Jan '10

Author: wmb Date: 2010-01-19 02:15:59 +0100 (Tue, 19 Jan 2010) New Revision: 1677 Modified: cpu/x86/pc/olpc/waveform.fth Log: olpc/waveform.fth - added Bezier curve drawing and double-size drawing. Modified: cpu/x86/pc/olpc/waveform.fth =================================================================== --- cpu/x86/pc/olpc/waveform.fth 2010-01-16 20:02:47 UTC (rev 1676) +++ cpu/x86/pc/olpc/waveform.fth 2010-01-19 01:15:59 UTC (rev 1677) @@ -13,10 +13,39 @@ 5 value fg h# f value bg -: pointat ( x y -- ) +: halve ( n -- n/2 ) dup 1 and swap u2/ + ; + +defer pointat ( x y -- ) +defer subpixel-pointat ( xf yf -- ) + +0 0 2value dot-offset + +: draw-dot ( x y -- ) + dot-offset d+ bytes/line * swap wa+ frame-buffer-adr + fg swap w! ; +: subpixel-draw-dot ( xf yf -- ) + swap halve swap halve + bytes/line * swap wa+ frame-buffer-adr + fg swap w! +; +' draw-dot to pointat +' subpixel-draw-dot to subpixel-pointat +: subpixel-double-dot ( x y -- ) + over 1+ over draw-dot + over 1+ over 1+ draw-dot + over over 1+ draw-dot + draw-dot +; +: double-dot ( x y -- ) + swap 2* swap 2* ( x' y' ) + subpixel-double-dot +; +: double-size ( -- ) + ['] double-dot to pointat + ['] subpixel-double-dot to subpixel-pointat +; + variable curx variable cury : moveto ( x y -- ) cury ! curx ! ; : rmove ( dx dy -- ) cury +! curx +! ; @@ -79,6 +108,13 @@ : lineto ( x y -- ) swap curx @ - swap cury @ - rline ; +: boxat ( x y w h -- ) + 2swap moveto ( w h ) + 0 over rline ( w h ) \ Up + over 0 rline ( w h ) \ Right + 0 swap negate rline ( w ) \ Down + negate 0 rline ( ) \ Left +; 1 [if] \ Test for line drawing @@ -104,7 +140,57 @@ 3 +loop ; [then] +3 value subpixel-shift +: >point ( x y -- ) swap subpixel-shift lshift swap subpixel-shift lshift wljoin ; +: place-point ( p -- ) + lwsplit + swap subpixel-shift 1- rshift swap subpixel-shift 1- rshift ( x y ) + subpixel-pointat ( ) +; + +: mid ( p0 p1 -- mid ) + + lwsplit halve swap halve swap wljoin +; +: close-coord? ( n0 n1 -- flag ) - abs 1 subpixel-shift lshift <= ; +: close-point? ( p0 p1 -- flag ) + lwsplit rot lwsplit ( x1 y1 x0 y0 ) + rot close-coord? -rot close-coord? and +; + +\ Bezier curve rendering by the midpoint method - see, for example, +\ http://web.cs.wpi.edu/~matt/courses/cs563/talks/surface/bez_surf.html +: bezier-steps ( p0 p1 p2 p3 -- ) + dup 4 pick close-point? if 4drop exit then + 2over mid >r ( p0 p1 p2 p3 r: p01 ) + -rot tuck ( p0 p3 p2 p1 p2 r: p01 ) + mid >r ( p0 p3 p2 r: p01 p12 ) + over mid ( p0 p3 p23 r: p01 p12 ) + dup r@ mid ( p0 p3 p23 p123 r: p01 p12 ) + r> r@ mid ( p0 p3 p23 p123 p012 r: p01 ) + 2dup mid ( p0 p3 p23 p123 p012 p0123 r: p01 ) + dup place-point ( p0 p3 p23 p123 p012 p0123 r: p01 ) + + \ For convenience of stack manipulation, we calculate the right half "backwards" + \ This gives equivalent results due to the symmetry of the calculation + tuck 2>r ( p0 p3 p23 p123 p0123 r: p01 p012 p0123 ) + recurse ( p0 r: p01 p012 p0123 ) + + 2r> r> -rot ( p0 p01 p012 p0123 ) + recurse ( ) +; +: bezier ( p0 p1 p2 p3 -- ) + dup place-point 4 pick place-point bezier-steps +; + +: curveto ( x1 y1 x2 y2 x3 y3 -- ) + 2>r ( x1 y1 x2 y2 x3 y3 r: x3 y3 ) + 2r@ >point >r >point >r >point >r ( r: x3 y3 p3 p2 p1 ) + curx @ cury @ >point r> r> r> ( p0 p1 p2 p3 r: x3 y3 ) + bezier ( r: x3 y3 ) + 2r> cury ! curx ! +; + : plot0 ( -- x y ) 0 screen-height 10 - ; : clear-plot ( width height -- ) 2>r @@ -165,7 +251,7 @@ dend -: $call-screen ( ? name$ -- ? ) stdout @ $call-method ; +\ : $call-screen ( ? name$ -- ? ) stdout @ $call-method ; : wave ( adr -- ) " waveform" $call-screen ; : clear-plot ( width height -- ) " clear-plot" $call-screen ; : lineplot ( xt xmin xmax xscale ymin ymax -- ) " plot" $call-screen ;

1 0

r1676 - in dev/usb2: device/net hcd hcd/ehci
by svn＠openfirmware.info 16 Jan '10

16 Jan '10

Author: wmb Date: 2010-01-16 21:02:47 +0100 (Sat, 16 Jan 2010) New Revision: 1676 Modified: dev/usb2/device/net/ax8817x.fth dev/usb2/device/net/ethernet.fth dev/usb2/hcd/control.fth dev/usb2/hcd/ehci/bulk.fth dev/usb2/hcd/ehci/qhtd.fth Log: OLPC trac 9423 - Fixed the longstanding problem with losing the first receive packet with USB Ethernet devices. The problem was much deeper, involving data toggle mismatches in the EHCI driver when the driver is re-opened and a new bulk-in ring is established. Modified: dev/usb2/device/net/ax8817x.fth =================================================================== --- dev/usb2/device/net/ax8817x.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/device/net/ax8817x.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -168,8 +168,9 @@ \ I increase the loop count in case the partner is slow in negotiating. \ And if there's no connection at all, let's not wait too long. ax-mii-sw - d# 2000 0 do 1 ax-mii@ 4 and ?leave 1 ms loop + d# 3000 0 do 1 ax-mii@ h# 20 and ?leave 1 ms loop ax-mii-hw + d# 10 ms \ Just in case the link status bit isn't ready just yet ; : select-phy ( -- ) Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/device/net/ethernet.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -147,14 +147,10 @@ headers -\ This loopback test is a reliability improvement. The AX88772, -\ and perhaps other chips, sometimes loses the first received -\ packet. That's annoying, as the first packet is often a -\ reply that we care about, thus causing a timeout and retry. -\ We work around that by sending ourselves a few loopback packets -\ until we receive one. In most cases, the first loopback packet -\ is received correctly, and if not, the second one is okay. -\ We try 5 times just to be safe, exiting as soon as we "win". +\ This loopback code is here just in case it might be useful later. +\ It was originally written as a workaround for a first-packet lossage +\ problem, but the problem was eventually tracked down to a data toggle +\ issue in the EHCI layer. 0 value scratch-buf : clear-rx ( -- ) @@ -181,7 +177,6 @@ clear-rx 5 0 do try-loopback? ?leave loop }loopback - d# 20 ms \ Settling time after switching back scratch-buf d# 2000 free-mem ; @@ -190,8 +185,6 @@ link-up? 0= if ." Network not connected." cr - end-bulk-in - free-buf true exit then @@ -199,7 +192,6 @@ inbuf /inbuf bulk-in-pipe begin-bulk-in start-mac - loopback-test false ; Modified: dev/usb2/hcd/control.fth =================================================================== --- dev/usb2/hcd/control.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/hcd/control.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -78,6 +78,9 @@ : set-config ( cfg -- usberr ) >r 0 0 0 r> DR_DEVICE DR_OUT or SET_CONFIGURATION control-set + \ Setting the configuration initializes the endpoint's bulk data toggles + 0 bulk-out-pipe target di-out-data! + 0 bulk-in-pipe target di-in-data! ; : set-interface ( alt intf -- usberr ) Modified: dev/usb2/hcd/ehci/bulk.fth =================================================================== --- dev/usb2/hcd/ehci/bulk.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/hcd/ehci/bulk.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -207,19 +207,26 @@ r> swap attach-qtds ( ) ; -: make-ring ( /buf #bufs -- qh qtd ) - 2dup * alloc&map ( /buf #bufs va pa ) - dup 4 pick 4 pick alloc-ring-qhqtds ( /buf #bufs va pa qh qtd ) - >r >r ( /buf #bufs va pa r: qtd qh ) - r@ >qh-buf-pa l! r@ >qh-buf l! ( /buf #bufs ) - r@ >qh-#bufs l! r@ >qh-/buf l! ( r: qtd qh ) +: make-ring ( /buf #bufs in? -- qh qtd ) + -rot ( in? /buf #bufs ) + 2dup * alloc&map ( in? /buf #bufs va pa ) + dup 4 pick 4 pick alloc-ring-qhqtds ( in? /buf #bufs va pa qh qtd ) + >r >r ( in? /buf #bufs va pa r: qtd qh ) + r@ >qh-buf-pa l! r@ >qh-buf l! ( in? /buf #bufs ) + r@ >qh-#bufs l! r@ >qh-/buf l! ( in? r: qtd qh ) - \ Start bulk in transaction - r@ pt-bulk fill-qh ( r: qtd qh ) + r@ pt-bulk fill-qh ( in? r: qtd qh ) - \ Let the QH keep track of the data toggle + \ Let the QH keep track of the data toggle on an ongoing basis ... r@ >hcqh-endp-char dup le-l@ QH_TD_TOGGLE invert and swap le-l! + \ But we have to initialize it here based on the last state + r@ >hcqh-overlay >hcqtd-token ( in? token-adr r: qtd qh ) + dup le-l@ ( in? token-adr token-val r: qtd qh ) + rot if bulk-in-data@ else bulk-out-data@ then ( token-adr token-val toggle r: qtd qh ) + or ( token-adr token-val' r: qtd qh ) + swap le-l! ( r: qtd qh ) + r> r> ( qh qtd ) 2dup link-ring ( qh qtd ) over insert-qh ( qh qtd ) @@ -282,7 +289,7 @@ dup to bulk-out-pipe ( /buf #bufs pipe ) set-bulk-vars ( /buf #bufs ) - make-ring ( qh qtd ) + false make-ring ( qh qtd ) to bulk-out-qtd to bulk-out-qh ( ) bulk-out-timeout bulk-out-qh >qh-timeout l! ( ) ; @@ -294,7 +301,7 @@ dup to bulk-in-pipe ( /buf #bufs pipe ) set-bulk-vars ( /buf #bufs ) - make-ring ( qh qtd ) + true make-ring ( qh qtd ) dup activate-in-ring ( qh qtd ) to bulk-in-qtd to bulk-in-qh ( ) bulk-in-timeout bulk-in-qh >qh-timeout l! ( ) @@ -359,8 +366,10 @@ dup >qtd-/buf l@ d# 16 << ( qtd token_word ) TD_STAT_ACTIVE or TD_C_ERR3 or TD_PID_IN or ( qtd token_word' ) - \ Maybe unnecessary based on using dt in QH - bulk-in-data@ or toggle-bulk-in-data ( qtd token_word' ) + \ We need not adjust the data toggle here, as the controller handles + \ it automatically while the queue is active. We set it initially + \ when creating the the queue head, and save it for later after + \ detaching the queue head. over >hcqtd-token le-l! ( qtd ) more-qtds? while ( qtd ) Modified: dev/usb2/hcd/ehci/qhtd.fth =================================================================== --- dev/usb2/hcd/ehci/qhtd.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/hcd/ehci/qhtd.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -244,7 +244,8 @@ \ operations, where ping transactions can help significantly. \ (I'm not sure this matters, as the overlay will overwrite it). - TD_TOGGLE_DATA1 TD_STAT_OUT or swap >hcqtd-token le-l! ( ) + \ The data toggle will be set later + TD_STAT_OUT swap >hcqtd-token le-l! ( ) ; : link-qhqtds ( qtd.v qtd.p #qtds qh -- )

1 0

r1675 - dev/usb2/device/net
by svn＠openfirmware.info 15 Jan '10

15 Jan '10

Author: wmb Date: 2010-01-15 03:48:23 +0100 (Fri, 15 Jan 2010) New Revision: 1675 Modified: dev/usb2/device/net/ax8817x.fth dev/usb2/device/net/common.fth dev/usb2/device/net/ethernet.fth dev/usb2/device/net/pegasus.fth Log: OLPC trac 9691 - changed the order of some steps in the USB ethernet start code in hopes of eliminating the "lost first receive packet" syndrome. With these changes, the two Asix-based adapters that I have in hand both start reliably with no DHCP retries. Modified: dev/usb2/device/net/ax8817x.fth =================================================================== --- dev/usb2/device/net/ax8817x.fth 2010-01-14 06:27:28 UTC (rev 1674) +++ dev/usb2/device/net/ax8817x.fth 2010-01-15 02:48:23 UTC (rev 1675) @@ -217,8 +217,7 @@ h# 88 value def-rx-ctl \ SO (MAC ON) and AB (accept broadcast) -: ax-start-nic ( -- ) - ax-auto-neg-wait +: ax-start-mac ( -- ) h# 88 use-promiscuous? if 1 or @@ -228,9 +227,13 @@ to def-rx-ctl def-rx-ctl rx-ctl! ; + +: ax-start-phy ( -- ) + ax-auto-neg-wait +; : ax-promiscuous ( -- ) rx-ctl@ 1 or rx-ctl! ; : ax-set-multicast ( adr len -- ) 2drop rx-ctl@ 2 or rx-ctl! ; -: ax-stop-nic ( -- ) 0 rx-ctl! ; +: ax-stop-mac ( -- ) 0 rx-ctl! ; : ax-init-nic ( -- ) \ Per ax8817x_bind bulk-out-pipe 3 > if @@ -249,8 +252,7 @@ ax-toggle-gpio ax-get-phyid select-phy - h# 80 rx-ctl! \ Turn off receiver during setup - \ ax-stop-nic + ax-stop-mac ax-get-mac-address 2drop ax-set-ipg ax-init-mii @@ -273,8 +275,9 @@ : init-ax ( -- ) ['] ax-init-nic to init-nic ['] ax-link-up? to link-up? - ['] ax-start-nic to start-nic - ['] ax-stop-nic to stop-nic + ['] ax-start-mac to start-mac + ['] ax-start-phy to start-phy + ['] ax-stop-mac to stop-mac ['] ax-get-mac-address to get-mac-address ['] ax-mii@ to mii@ ['] ax-mii! to mii! Modified: dev/usb2/device/net/common.fth =================================================================== --- dev/usb2/device/net/common.fth 2010-01-14 06:27:28 UTC (rev 1674) +++ dev/usb2/device/net/common.fth 2010-01-15 02:48:23 UTC (rev 1675) @@ -18,12 +18,13 @@ false value use-multicast? defer init-nic ( -- ) ' noop to init-nic +defer reset-nic ( -- ) ' noop to reset-nic defer wrap-msg ( adr len -- adr' len' ) ' noop to wrap-msg defer unwrap-msg ( adr len -- adr' len' ) ' noop to unwrap-msg defer link-up? ( -- up? ) ' true to link-up? -defer reset-nic ( -- ) ' noop to reset-nic -defer start-nic ( -- ) ' noop to start-nic -defer stop-nic ( -- ) ' noop to stop-nic +defer start-phy ( -- ) ' noop to start-phy +defer start-mac ( -- ) ' noop to start-mac +defer stop-mac ( -- ) ' noop to stop-mac defer mii{ ( -- ) ' noop to mii{ \ Acquire defer }mii ( -- ) ' noop to }mii \ Release defer mii@ ( reg -- val ) ' noop to mii@ @@ -80,7 +81,7 @@ : property-or-abort ( name$ -- n ) 2dup get-my-property if ( name$ ) - ." Can't find property " type cr stop-nic abort + ." Can't find property " type cr stop-mac abort then ( name$ value$ ) 2swap 2drop decode-int nip nip ( n ) ; Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-14 06:27:28 UTC (rev 1674) +++ dev/usb2/device/net/ethernet.fth 2010-01-15 02:48:23 UTC (rev 1675) @@ -28,7 +28,7 @@ ; : stop-net ( -- ) - stop-nic + stop-mac end-bulk-in free-buf ; @@ -41,7 +41,7 @@ : copy-packet ( adr len -- len' ) dup multi-packet? if 4 + then ( adr len len' ) - /outbuf > if ." USB Ethernet write packet too long" cr stop-nic abort then ( adr len ) + /outbuf > if ." USB Ethernet write packet too long" cr stop-mac abort then ( adr len ) multi-packet? if ( adr len ) dup wbsplit ( adr len len.low len.high ) @@ -71,7 +71,7 @@ \ The data format is: \ length.leword ~length.leword data [ pad-to-even ] : extract-packet ( -- data-adr len ) - residue 4 < if ." Short residue from USB Ethernet" cr stop-nic abort then + residue 4 < if ." Short residue from USB Ethernet" cr stop-mac abort then pkt-adr dup 4 + swap >r r@ c@ r@ 1+ c@ bwjoin ( data-adr length ) @@ -130,7 +130,7 @@ 0 ( adr 0 ) then ( adr ihandle|0 ) - dup 0= if ." Can't open obp-tftp support package" stop-nic abort then + dup 0= if ." Can't open obp-tftp support package" stop-mac abort then ( adr ihandle ) >r @@ -181,23 +181,25 @@ clear-rx 5 0 do try-loopback? ?leave loop }loopback + d# 20 ms \ Settling time after switching back scratch-buf d# 2000 free-mem ; : do-start? ( -- error? ) - start-nic + start-phy link-up? 0= if ." Network not connected." cr - stop-nic + end-bulk-in + free-buf true exit then init-buf inbuf /inbuf bulk-in-pipe begin-bulk-in + start-mac loopback-test - false ; Modified: dev/usb2/device/net/pegasus.fth =================================================================== --- dev/usb2/device/net/pegasus.fth 2010-01-14 06:27:28 UTC (rev 1674) +++ dev/usb2/device/net/pegasus.fth 2010-01-15 02:48:23 UTC (rev 1675) @@ -127,8 +127,7 @@ pg-sync-link-status ; -: pg-start-nic ( -- ) - pg-sync-link-status +: pg-start-mac ( -- ) \ force 100Mbps full-duplex h# 0130c9 use-promiscuous? if @@ -138,10 +137,15 @@ then ectl0 3 pg-write-reg ; + +: pg-start-phy ( -- ) + pg-sync-link-status +; + : pg-promiscuous ( -- ) ectl2 pg-reg-c@ 4 or ectl2 pg-reg-c! ; : pg-set-multicast ( -- ) ectl0 pg-reg-c@ 2 or ectl0 pg-reg-c! ; -: pg-stop-nic ( -- ) +: pg-stop-mac ( -- ) 0 ectl0 2 pg-write-reg ; @@ -155,8 +159,9 @@ : init-pegasus ( -- ) ['] pg-init-nic to init-nic ['] pg-link-up? to link-up? - ['] pg-start-nic to start-nic - ['] pg-stop-nic to stop-nic + ['] pg-start-phy to start-phy + ['] pg-start-mac to start-mac + ['] pg-stop-mac to stop-mac ['] pg-get-mac-address to get-mac-address ['] pg-unwrap-msg to unwrap-msg ['] pg-mii@ to mii@

1 0

r1674 - in dev/usb2: device device/keyboard device/net device/serial device/storage device/userial device/wlan hcd
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: wmb Date: 2010-01-14 07:27:28 +0100 (Thu, 14 Jan 2010) New Revision: 1674 Modified: dev/usb2/device/common.fth dev/usb2/device/keyboard/kbd.fth dev/usb2/device/net/ethernet.fth dev/usb2/device/serial/uart.fth dev/usb2/device/storage/scsi.fth dev/usb2/device/userial/userial.fth dev/usb2/device/wlan/usb8388.fth dev/usb2/hcd/dev-info.fth dev/usb2/hcd/device.fth Log: OLPC trac 9969 - comment:5 - fixed regression that happens when you remove and reinstert a USB device. Modified: dev/usb2/device/common.fth =================================================================== --- dev/usb2/device/common.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/common.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -36,8 +36,11 @@ get-my-property if 0 else decode-int nip nip then ; +\ This needs to be called every time that the device could have changed +: set-device ( -- ) " assigned-address" get-int-property to device ; + : init ( -- ) - " assigned-address" get-int-property to device + set-device " configuration#" get-int-property to configuration " bulk-in-pipe" get-int-property to bulk-in-pipe " bulk-out-pipe" get-int-property to bulk-out-pipe Modified: dev/usb2/device/keyboard/kbd.fth =================================================================== --- dev/usb2/device/keyboard/kbd.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/keyboard/kbd.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -327,6 +327,7 @@ \ kbd-buf and led-buf must have been allocated : setup-hardware? ( -- error? ) + set-device device set-target " reset?" $call-parent if configuration set-config if Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/net/ethernet.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -223,6 +223,7 @@ : open ( -- ok? ) parse-args + set-device device set-target opencount @ 0= if @@ -248,12 +249,6 @@ headers -: init ( -- ) - init - device set-target - configuration set-config if ." Failed to set ethernet configuration" cr then -; - init \ LICENSE_BEGIN Modified: dev/usb2/device/serial/uart.fth =================================================================== --- dev/usb2/device/serial/uart.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/serial/uart.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -52,6 +52,7 @@ : write ( adr len -- actual ) dup if write-bytes else nip then ; : open ( -- flag ) + set-device device set-target refcount @ 0= if @@ -88,8 +89,6 @@ : init ( -- ) init init-buf - device set-target - configuration set-config if ." Failed set serial port configuration" cr then init-hook free-buf ; Modified: dev/usb2/device/storage/scsi.fth =================================================================== --- dev/usb2/device/storage/scsi.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/storage/scsi.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -79,7 +79,6 @@ init-execute-command alloc-bulk device set-target - configuration set-config if ." Failed to set storage configuration" cr then get-max-lun free-bulk ; @@ -182,6 +181,7 @@ : set-address ( lun -- ) 0 max max-lun min to lun + set-device \ The device number may have changed if we recycled the node device set-target " reset?" $call-parent if configuration set-config if Modified: dev/usb2/device/userial/userial.fth =================================================================== --- dev/usb2/device/userial/userial.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/userial/userial.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -17,6 +17,7 @@ ; : open ( -- flag ) + set-device device set-target " reset?" $call-parent if configuration set-config if Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/wlan/usb8388.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -58,7 +58,7 @@ : end-out-ring ( -- ) " end-out-ring" $call-parent ; -: set-parent-channel ( -- ) device set-target ; +: set-parent-channel ( -- ) set-device device set-target ; : setup-bus-io ( /inbuf /outbuf -- error? ) 4 bulk-out-pipe " begin-out-ring" $call-parent ( /inbuf ) @@ -77,9 +77,6 @@ " vendor-id" property-or-abort to vid " device-id" property-or-abort to pid set-parent-channel - configuration set-config if - ." Failed to set USB configuration for wireless" cr - then ; init Modified: dev/usb2/hcd/dev-info.fth =================================================================== --- dev/usb2/hcd/dev-info.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/hcd/dev-info.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -41,6 +41,10 @@ : di-hub@ ( idx -- hub ) 'di >di-hub c@ ; : di-port! ( port idx -- ) 'di >di-port c! ; : di-port@ ( idx -- port ) 'di >di-port c@ ; +: di-is-reset ( idx -- ) + 'di >di-reset ( adr ) + 0 swap c! +; : di-reset? ( idx -- flag ) 'di >di-reset ( adr ) dup c@ 0= ( adr reset? ) Modified: dev/usb2/hcd/device.fth =================================================================== --- dev/usb2/hcd/device.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/hcd/device.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -244,6 +244,7 @@ dup c@ over + swap 4 + c@ ( dev adr' #endpoints ) swap ENDPOINT find-desc ( dev #endpoints adr' ) swap 0 ?do ( dev adr' ) + over di-is-reset ( dev adr ) dup 4 + le-w@ ( dev adr size ) over 2 + c@ h# f and ( dev adr size pipe ) 3 pick di-maxpayload! ( dev adr )

1 0

r1673 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: rsmith Date: 2010-01-14 05:55:17 +0100 (Thu, 14 Jan 2010) New Revision: 1673 Modified: cpu/x86/pc/olpc/via/versions.fth Log: OLPC 1.5: EC version to 1.9.21 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2010-01-14 04:55:14 UTC (rev 1672) +++ cpu/x86/pc/olpc/via/versions.fth 2010-01-14 04:55:17 UTC (rev 1673) @@ -5,7 +5,7 @@ macro: FW_MINOR 26 \ The EC microcode -macro: EC_VERSION 1_9_20 +macro: EC_VERSION 1_9_21 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r1672 - dev/olpc/kb3700
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: rsmith Date: 2010-01-14 05:55:14 +0100 (Thu, 14 Jan 2010) New Revision: 1672 Modified: dev/olpc/kb3700/battery.fth Log: OLPC: Add IO status for GPIO_08-0F to the bat-debug. Charge mosfet is GPIO_0E Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2010-01-14 04:55:12 UTC (rev 1671) +++ dev/olpc/kb3700/battery.fth 2010-01-14 04:55:14 UTC (rev 1672) @@ -656,6 +656,8 @@ >sdx logstr $cat h# 70 bat-b@ \ AbnormalCauseCode >sdx logstr $cat + h# fc21 ec@ \ GPIO_08-0F 0E is chg mosfet + >sdx logstr $cat decimal bat-V@ bg-V>V >sd.ddd logstr $cat " " logstr $cat \ V

1 0

r1671 - dev/olpc/kb3700
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: rsmith Date: 2010-01-14 05:55:12 +0100 (Thu, 14 Jan 2010) New Revision: 1671 Modified: dev/olpc/kb3700/battery.fth Log: OLPC: Update bat-debug comments so they match the variable names in EC code Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2010-01-14 04:55:10 UTC (rev 1670) +++ dev/olpc/kb3700/battery.fth 2010-01-14 04:55:12 UTC (rev 1671) @@ -644,15 +644,15 @@ >sdx logstr $cat h# F780 ec@ \ w1 state >sdx logstr $cat - h# 40 ec-ram@ \ pwr_flag + h# 40 ec-ram@ \ sPOWER_FLAG >sdx logstr $cat - h# a4 ec-ram@ \ bat_status + h# a4 ec-ram@ \ sMBAT_STATUS >sdx logstr $cat - h# a5 ec-ram@ \ chg status + h# a5 ec-ram@ \ sMCHARGE_STATUS >sdx logstr $cat - h# a6 ec-ram@ \ bat misc + h# a6 ec-ram@ \ sMBAT_MISC >sdx logstr $cat - h# a7 ec-ram@ \ bat misc2 + h# a7 ec-ram@ \ sMBAT_MISC2 >sdx logstr $cat h# 70 bat-b@ \ AbnormalCauseCode >sdx logstr $cat

1 0

r1670 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: rsmith Date: 2010-01-14 05:55:10 +0100 (Thu, 14 Jan 2010) New Revision: 1670 Modified: cpu/x86/pc/olpc/via/acpi.fth Log: Mod ACPI reset to use cmd 0xd7 rather than 0xdb Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2010-01-13 00:39:17 UTC (rev 1669) +++ cpu/x86/pc/olpc/via/acpi.fth 2010-01-14 04:55:10 UTC (rev 1670) @@ -59,7 +59,7 @@ ( 070 4 ) h# 5a5 l, \ Flags - see below for bit definitions ( 074 12 ) 1 c, 8 c, 0 c, 1 c, h# 66. d, \ Reset register - I/O, 8 bits, 0 offset, byte access -( 080 1 ) h# db c, \ Reset value +( 080 1 ) h# d7 c, \ Reset value ( 081 3 ) 0 c, 0 c, 0 c, \ Reserved fadt set-acpi-table-length

1 0

r1669 - dev/usb2/device/net
by svn＠openfirmware.info 13 Jan '10

13 Jan '10

Author: wmb Date: 2010-01-13 01:39:17 +0100 (Wed, 13 Jan 2010) New Revision: 1669 Modified: dev/usb2/device/net/ax8817x.fth dev/usb2/device/net/common.fth dev/usb2/device/net/ethernet.fth dev/usb2/device/net/pegasus.fth Log: Added promiscuous and multicast reception capability to USB Ethernet drivers. Modified: dev/usb2/device/net/ax8817x.fth =================================================================== --- dev/usb2/device/net/ax8817x.fth 2010-01-13 00:38:24 UTC (rev 1668) +++ dev/usb2/device/net/ax8817x.fth 2010-01-13 00:39:17 UTC (rev 1669) @@ -215,12 +215,21 @@ 0 value has-internal-loopback? -h# 88 constant def-rx-ctl \ SO (MAC ON) and AB (accept broadcast) +h# 88 value def-rx-ctl \ SO (MAC ON) and AB (accept broadcast) : ax-start-nic ( -- ) ax-auto-neg-wait - def-rx-ctl my-args " promiscuous" $= if 1 or then rx-ctl! + h# 88 + use-promiscuous? if + 1 or + else + use-multicast? if 2 or then + then + to def-rx-ctl + def-rx-ctl rx-ctl! ; +: ax-promiscuous ( -- ) rx-ctl@ 1 or rx-ctl! ; +: ax-set-multicast ( adr len -- ) 2drop rx-ctl@ 2 or rx-ctl! ; : ax-stop-nic ( -- ) 0 rx-ctl! ; : ax-init-nic ( -- ) \ Per ax8817x_bind @@ -273,6 +282,8 @@ ['] ax-mii-hw to }mii ['] ax-loopback{ to loopback{ ['] ax-}loopback to }loopback + ['] ax-promiscuous to promiscuous + ['] ax-set-multicast to set-multicast vid h# 2001 = pid h# 1a00 = and if h# 009f.9d9f to ax-gpio then vid h# 07b8 = pid h# 420a = and if h# 001f.1d1f to ax-gpio then Modified: dev/usb2/device/net/common.fth =================================================================== --- dev/usb2/device/net/common.fth 2010-01-13 00:38:24 UTC (rev 1668) +++ dev/usb2/device/net/common.fth 2010-01-13 00:39:17 UTC (rev 1669) @@ -14,6 +14,9 @@ 6 constant /mac-adr : mac-adr$ ( -- adr len ) mac-adr /mac-adr ; +false value use-promiscuous? +false value use-multicast? + defer init-nic ( -- ) ' noop to init-nic defer wrap-msg ( adr len -- adr' len' ) ' noop to wrap-msg defer unwrap-msg ( adr len -- adr' len' ) ' noop to unwrap-msg @@ -25,6 +28,10 @@ defer }mii ( -- ) ' noop to }mii \ Release defer mii@ ( reg -- val ) ' noop to mii@ defer mii! ( val reg -- ) ' drop to mii@ +external +defer promiscuous ( -- ) ' noop to promiscuous +defer set-multicast ( adr len -- ) ' 2drop to set-multicast +headers : phy-loopback{ ( -- ) mii{ 0 mii@ h# 4000 or 0 mii! }mii Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-13 00:38:24 UTC (rev 1668) +++ dev/usb2/device/net/ethernet.fth 2010-01-13 00:39:17 UTC (rev 1669) @@ -201,6 +201,19 @@ false ; +: parse-args ( -- ) + false to use-promiscuous? + false to use-multicast? + my-args + begin ?dup while + ascii , left-parse-string + 2dup " debug" $= if debug-on then + 2dup " promiscuous" $= if true to use-promiscuous? then + 2dup " multicast" $= if true to use-multicast? then + 2drop + repeat drop +; + external : close ( -- ) @@ -209,7 +222,7 @@ ; : open ( -- ok? ) - my-args " debug" $= if debug-on then + parse-args device set-target opencount @ 0= if Modified: dev/usb2/device/net/pegasus.fth =================================================================== --- dev/usb2/device/net/pegasus.fth 2010-01-13 00:38:24 UTC (rev 1668) +++ dev/usb2/device/net/pegasus.fth 2010-01-13 00:39:17 UTC (rev 1669) @@ -9,9 +9,9 @@ h# f1 constant SET_REG \ Select register definitions -: ec0 0 ; -: ec1 1 ; -: ec2 2 ; +: ectl0 0 ; +: ectl1 1 ; +: ectl2 2 ; : gpio10c h# 7e ; : gpio32c h# 7f ; : phya h# 25 ; @@ -97,8 +97,8 @@ : pg-link-up? ( -- flag ) 1 pg-mii@ 4 and 0<> ; -: pg-reset-mac ( -- ) 8 ec1 pg-reg-c! ; -: pg-mac-reset? ( -- ) ec1 pg-reg-c@ 8 and 0= ; +: pg-reset-mac ( -- ) 8 ectl1 pg-reg-c! ; +: pg-mac-reset? ( -- ) ectl1 pg-reg-c@ 8 and 0= ; : pg-init-mac ( -- ) pg-reset-mac begin pg-mac-reset? until @@ -130,11 +130,19 @@ : pg-start-nic ( -- ) pg-sync-link-status \ force 100Mbps full-duplex - h# 0130c9 ec0 3 pg-write-reg + h# 0130c9 + use-promiscuous? if + h# 040000 or + else + use-multicast? if 2 or then + then + ectl0 3 pg-write-reg ; +: pg-promiscuous ( -- ) ectl2 pg-reg-c@ 4 or ectl2 pg-reg-c! ; +: pg-set-multicast ( -- ) ectl0 pg-reg-c@ 2 or ectl0 pg-reg-c! ; : pg-stop-nic ( -- ) - 0 ec0 2 pg-write-reg + 0 ectl0 2 pg-write-reg ; \ Process the length header that's inlined after the frame @@ -153,6 +161,8 @@ ['] pg-unwrap-msg to unwrap-msg ['] pg-mii@ to mii@ ['] pg-mii! to mii! + ['] pg-promiscuous to promiscuous + ['] pg-set-multicast to set-multicast ; : init ( -- ) init vid pid pegasus? if init-pegasus then ;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware