openfirmware December 2008

openfirmware@openfirmware.info

1 participants
48 discussions

r1036 - forth/wrapper
by svn＠openfirmware.info 19 Dec '08

19 Dec '08

Author: wmb Date: 2008-12-19 20:06:16 +0100 (Fri, 19 Dec 2008) New Revision: 1036 Modified: forth/wrapper/wrapper.c Log: Tweaks to wrapper.c for compilation on ARM. Modified: forth/wrapper/wrapper.c =================================================================== --- forth/wrapper/wrapper.c 2008-12-19 07:55:27 UTC (rev 1035) +++ forth/wrapper/wrapper.c 2008-12-19 19:06:16 UTC (rev 1036) @@ -130,7 +130,7 @@ char *host_os = "freebsd"; #endif -#ifdef HOSTARM +#ifdef __arm__ char *host_cpu = "arm"; #define HOST_LITTLE_ENDIAN #endif @@ -158,7 +158,6 @@ #ifdef ARM char *target_cpu = "arm"; -char *host_cpu = "arm"; #define CPU_MAGIC 0xe1a00000 #define START_OFFSET 8 #endif @@ -937,7 +936,7 @@ #else -# if defined(HOST_LITTLE_ENDIAN) +# if defined(TARGET_POWERPC) && defined(HOST_LITTLE_ENDIAN) lbflips((long *)&header, sizeof(header)); # endif @@ -1549,6 +1548,7 @@ 1200, B1200, 1800, B1800, 2400, B2400, 4800, B4800, 9600, B9600, 19200, B19200, 38400, B38400, 57600, B57600, 115200, B115200, +#ifdef B230400 230400, B230400, #ifdef B4000000 @@ -1558,6 +1558,7 @@ 2500000, B2500000, 3000000, B3000000, 3500000, B3500000, 4000000, B4000000, #endif +#endif -1, -1, };

1 0

r1035 - cpu/x86/pc/olpc
by svn＠openfirmware.info 19 Dec '08

19 Dec '08

Author: wmb Date: 2008-12-19 08:55:27 +0100 (Fri, 19 Dec 2008) New Revision: 1035 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac 9135 - allow re-execution of EMACS without resetting. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-12-16 19:43:19 UTC (rev 1034) +++ cpu/x86/pc/olpc/fw.bth 2008-12-19 07:55:27 UTC (rev 1035) @@ -333,7 +333,10 @@ fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth fload ${BP}/cpu/x86/pc/olpc/memtest.fth -: emacs ( -- ) boot-getline to boot-file " rom:emacs" $boot ; +: emacs ( -- ) + false to already-go? + boot-getline to boot-file " rom:emacs" $boot +; fload ${BP}/cpu/x86/pc/rmtools.fth fload ${BP}/dev/geode/smi.fth

1 0

r1034 - ofw/fs/ufs
by svn＠openfirmware.info 16 Dec '08

16 Dec '08

Author: wmb Date: 2008-12-16 20:43:19 +0100 (Tue, 16 Dec 2008) New Revision: 1034 Added: ofw/fs/ufs/ufs.fth Log: Added ufs.fth Added: ofw/fs/ufs/ufs.fth =================================================================== --- ofw/fs/ufs/ufs.fth (rev 0) +++ ofw/fs/ufs/ufs.fth 2008-12-16 19:43:19 UTC (rev 1034) @@ -0,0 +1,431 @@ +purpose: UFS file system support package +\ See license at end of file + +0 0 " support" property + +decimal + +\ +\ UFS low-level block routines +\ + +512 constant ublock +2048 constant /super-block +8 constant ndaddr +16 constant super-block# ( -- n ) +h# 11954 constant fs-magic + +0 instance value temp-block +0 instance value dir-block +0 instance value indirect-block +0 instance value inode +0 instance value dir-inode +0 instance value super-block +0 instance value linkpath + +defer short@ ( adr -- w ) ' be-w@ to short@ +defer int@ ( adr -- l ) ' be-l@ to int@ +: le-quad@ ( adr -- l ) int@ ; +: be-quad@ ( adr -- l ) la1+ int@ ; +defer quad@ ( adr -- l ) ' be-quad@ to quad@ + +\ Unfortunately, 4.4BSD-derived systems use a char field for the +\ name length in the directory entry structure, while most other +\ systems use a short. +: 1+c@ ( adr -- n ) 1+ c@ ; +defer namlen@ ( adr -- n ) ' short@ to namlen@ + +: +sb ( index -- value ) super-block swap la+ int@ ; +: iblkno ( -- n ) 4 +sb ; +: cgoffset ( -- n ) 6 +sb ; +: cgmask ( -- n ) 7 +sb ; +: bsize ( -- n ) 12 +sb ; +: fragshift ( -- n ) 24 +sb ; +: fsbtodbc ( -- n ) 25 +sb ; +: inopb ( -- n ) 30 +sb ; +: ipg ( -- n ) 46 +sb ; +: fpg ( -- n ) 47 +sb ; +: inodefmt ( -- n ) 331 +sb ; \ Reserved (=0) in SunOS, =2 in BSD +: magic ( -- n ) 343 +sb ; + +: /frag ( -- fragsize ) bsize fragshift >> ; + +: read-ublocks ( adr len dev-block# -- error? ) + ublock * 0 " seek" $call-parent ?dup if exit then + ( adr len ) tuck " read" $call-parent <> +; + +: get-super-block ( -- error? ) + super-block /super-block super-block# read-ublocks ?dup if exit then + + ['] le-l@ to int@ ['] le-w@ to short@ ['] le-quad@ to quad@ + magic fs-magic = if false exit then + + ['] be-l@ to int@ ['] be-w@ to short@ ['] be-quad@ to quad@ + magic fs-magic <> +; + +: cgstart ( cg -- block# ) + dup cgmask not and cgoffset * swap fpg * + +; +: cgimin ( cg -- block# ) cgstart iblkno + ; + +: blkstofrags ( #blocks -- #frags ) fragshift << ; + +: fsbtodb ( fs-blk# -- dev-blk# ) fsbtodbc << ; + +: read-fs-blocks ( adr len fs-blk# -- error? ) fsbtodb read-ublocks ; + +\ +\ UFS inode routines +\ + +h# 80 constant /inode + +instance variable blkptr +instance variable blklim +instance variable indirptr +0 instance value lblk# + +: itoo ( i# -- offset ) inopb mod ; +: itog ( i# -- group ) ipg / ; +: itod ( i# -- block# ) + dup itog cgimin swap ipg mod inopb / blkstofrags + +; + +: +i ( n -- ) inode + ; +: file-attr ( -- attributes ) 0 +i short@ ; +: dir? ( -- flag ) file-attr h# 4000 and 0<> ; \ **** +: file-sec ( -- seconds ) 24 +i int@ ; +: file-size ( -- n ) 8 +i quad@ ; \ **** +: direct0 ( -- adr ) 40 +i ; +: indirect0 ( -- adr ) 88 +i ; +: #blks-held ( -- n ) 104 +i int@ ; + +: symlink? ( -- symlink? ) 0 +i short@ o# 0120000 tuck and = ; + +\ **** Select the indicated file for subsequent accesses +: rewind ( -- ) + direct0 blkptr ! indirect0 blklim ! indirect0 indirptr ! + 0 to lblk# +; + +: l@++ ( ptr -- value ) dup @ int@ /l rot +! ; + +\ **** Locate the next block within the current file +: next-block# ( -- n ) + blkptr @ blklim @ = if + indirect-block bsize indirptr l@++ + read-fs-blocks drop ( XXX - what about the error? ) + indirect-block blkptr ! indirect-block bsize + blklim ! + then + lblk# 1+ to lblk# + blkptr l@++ ( blk# ) +; + +: get-dirblk ( -- error? ) dir-block bsize next-block# read-fs-blocks ; + +\ +\ UFS directory routines +\ + +variable diroff +variable totoff +variable current-dir + +\ **** Return the address of the current directory entry +: dirent ( -- adr ) dir-block diroff @ + ; + +\ **** Select the next directory entry +: next-dirent ( -- end? ) + dirent la1+ short@ dup diroff +! totoff +! + totoff @ file-size >= if true exit then + diroff @ bsize = if + get-dirblk ?dup if exit then + diroff off + then + false +; + +\ **** From directory, get handle of the file or subdir that it references +\ For Unix, file handle is the inode # +: file-handle ( -- i# ) dirent int@ ; + +\ **** From directory, get name of file +: file-name ( -- adr len ) + dirent la1+ wa1+ dup wa1+ ( len-adr name-adr ) + swap namlen@ h# ff and ( adr len ) +; + +\ +\ UFS high-level routines +\ +\ After this point, the code should be independent of the disk format! + +: lookup ( adr len -- not-found? ) + begin + 2dup file-name $= if 2drop false exit then + next-dirent + until + 2drop true +; + +: >OFW-path ( adr len -- ) + \ replace / with \ + bounds do i c@ ascii / = if ascii \ i c! then loop +; +: (select-file) ( i# -- error? ) + dup temp-block bsize rot itod ( i# adr len fs-block# ) + read-fs-blocks if drop true exit then ( i# ) + itoo /inode * temp-block + inode /inode move + false +; +defer chdir ' noop is chdir +defer (init-dir) ' noop is (init-dir) +: select-file ( i# -- error? ) + (select-file) ?dup if exit then + symlink? if + #blks-held 0= if \ short symbolic link path + direct0 linkpath over cstrlen 1+ move + else \ long symbolic link path + linkpath bsize direct0 @ + read-fs-blocks ?dup if exit then + then + linkpath dup cstrlen 2dup >OFW-path ascii \ split-after + ?dup if + chdir if 2drop true exit then + else + drop current-dir @ (init-dir) ?dup if exit then + then + dup 0= if 2drop false exit then + lookup ?dup if exit then + file-handle recurse + else + rewind false + then +; + +\ **** Select the directory file +: init-dir ( i# -- error? ) + dup current-dir ! + select-file ?dup if exit then + get-dirblk ?dup if exit then + 0 diroff ! 0 totoff ! + false +; +' init-dir to (init-dir) + +\ **** Select the root directory +: froot ( -- error? ) 2 init-dir ; + +: $chdir ( adr len -- error? ) \ Fail if path is file, not dir + ?dup 0= if drop true exit then + froot if 2drop true exit then + begin ( path-$ ) + over c@ ascii \ = if 1 /string then + ascii \ split-before ( \tail-$ head-$ ) + dup while + lookup if 2drop true exit then + dir? 0= if 2drop true exit then + file-handle init-dir if 2drop true exit then + repeat ( tail-$ head-$ ) + 2drop 2drop false +; +' $chdir to chdir + +\ +\ UFS installation routines +\ + + +\ **** Allocate memory for necessary data structures +: allocate-ufs-buffers ( -- error? ) + /super-block alloc-mem is super-block + get-super-block dup if + super-block /super-block free-mem exit + then + inodefmt 2 = if ['] 1+c@ else ['] short@ then to namlen@ + bsize alloc-mem is temp-block + bsize alloc-mem is dir-block + bsize alloc-mem is indirect-block + bsize alloc-mem is linkpath + /inode alloc-mem is inode + /inode alloc-mem is dir-inode +; + +: release ( -- ) + inode /inode free-mem + dir-inode /inode free-mem + indirect-block bsize free-mem + temp-block bsize free-mem + dir-block bsize free-mem + linkpath bsize free-mem + super-block /super-block free-mem +; + +false instance value file-open? +/fd instance buffer: ufs-fd + +\ UFS DIR routines +\ date&time is number of seconds since 1970 +create days/month +\ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec + 31 c, 28 c, 31 c, 30 c, 31 c, 30 c, 31 c, 31 c, 30 c, 31 c, 30 c, 31 c, + +: >d/m ( day-in-year -- day month ) + 12 0 do + days/month i ca+ c@ 2dup < if + drop 1+ i 1+ leave + then + - + loop +; +: sec>time&date ( seconds -- s m h d m y ) + 60 u/mod 60 u/mod 24 u/mod ( s m h days ) + [ 365 4 * 1+ ] literal /mod >r ( s m h day-in-cycle ) ( r: cycles ) + dup [ 365 365 + 31 + 29 + ] literal + 2dup = if \ exactly leap year Feb 29 + 3drop 2 29 2 ( s m h year-in-cycle d m ) + else + > if 1- then \ after leap year + 365 u/mod ( s m h day-in-year year-in-cycle ) + swap >d/m ( s m h year-in-cycle d m ) + then + rot r> 4 * + 1970 + ( s m h d m y ) +; +: >dir-inode ( -- ) inode dir-inode /inode move ; +: dir-inode> ( -- ) dir-inode inode /inode move ; +: file-info ( id -- false | id' s m h d m y len attributes name$ true ) + file-handle >dir-inode (select-file) if ( id ) + drop false ( false ) + else ( id ) + 1+ file-sec sec>time&date file-size file-attr file-name ( id' .. ) + true ( id' .. name$ true ) + then + dir-inode> +; +: next-file-info ( id -- false | id' s m h d m y len attributes name$ true ) + dup if + next-dirent if drop false else file-info then + else + file-info + then +; + +\ UFS file interface + +: ufsdflen ( 'fhandle -- d.size ) drop file-size 0 ; + +: ufsdfalign ( d.byte# 'fh -- d.aligned ) + drop swap bsize 1- invert and swap +; + +: ufsfclose ( 'fh -- ) + drop bfbase @ bsize free-mem \ Registered with initbuf +; + +: ufsdfseek ( d.byte# 'fh -- ) + drop + bsize um/mod nip ( target-blk# ) + dup lblk# < if rewind then + begin dup lblk# <> while next-block# drop repeat + drop +; + +: ufsfread ( addr count 'fh -- #read ) + drop + file-size lblk# bsize * - ( addr count rem ) + over min -rot ( actual addr count ) + next-block# read-fs-blocks + abort" ufsfread failed" +; + +: $ufsopen ( adr len mode -- fid fmode size align close seek write read ) + >r lookup ( error? ) if + false + else + file-handle select-file if + false + else + bsize alloc-mem bsize initbuf + file-handle r@ + ['] ufsdflen ['] ufsdfalign ['] ufsfclose ['] ufsdfseek ['] nullwrite + r@ write = if ['] nullread else ['] ufsfread then + true + then + then + r> drop +; + +external + +: open ( -- okay? ) + allocate-ufs-buffers if false exit then + + my-args " <NoFile>" $= if true exit then + + my-args ascii \ split-after ( file$ path$ ) + $chdir if 2drop release false exit then ( file$ ) + + \ Filename ends in "\"; select the directory and exit with success + dup 0= if 2drop true exit then ( file$ ) + + file @ >r ufs-fd file ! ( file$ ) + + 2dup r/w $ufsopen 0= if + 2dup r/o $ufsopen 0= if + release 2drop false r> file ! exit + then + then ( file$ file-ops ... ) + + setupfd + 2drop + true to file-open? + true + r> file ! +; + +: close ( -- ) + file-open? if + ufs-fd ['] fclose catch ?dup if .error drop then + then + release +; +: read ( adr len -- actual ) + ufs-fd ['] fgets catch if 3drop 0 then +; +: write ( adr len -- actual ) + tuck ufs-fd ['] fputs catch if 2drop 2drop -1 then +; +: seek ( offset.low offset.high -- error? ) + ufs-fd ['] dfseek catch if 2drop true else false then +; +: size ( -- d ) file-size 0 ; +: load ( adr -- size ) file-size read ; +: files ( -- ) begin file-name type cr next-dirent until ; + +hex + +\ LICENSE_BEGIN +\ Copyright (c) 1994 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

r1033 - cpu/x86/pc/olpc ofw/wifi
by svn＠openfirmware.info 14 Dec '08

14 Dec '08

Author: wmb Date: 2008-12-14 18:43:28 +0100 (Sun, 14 Dec 2008) New Revision: 1033 Modified: cpu/x86/pc/olpc/nandcastui.fth cpu/x86/pc/olpc/versions.fth cpu/x86/pc/olpc/wifichannel.fth ofw/wifi/eapol.fth Log: OLPC - Improved NANDblaster WIFI spectrum analysis, with ".wifi" command. Modified: cpu/x86/pc/olpc/nandcastui.fth =================================================================== --- cpu/x86/pc/olpc/nandcastui.fth 2008-12-12 00:13:49 UTC (rev 1032) +++ cpu/x86/pc/olpc/nandcastui.fth 2008-12-14 17:43:28 UTC (rev 1033) @@ -101,3 +101,27 @@ false to already-go? " boot rom:nb_rx 10.20.0.16,,10.20.0.44" eval ; + +\ LICENSE_BEGIN +\ Copyright (c) 2008 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/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-12-12 00:13:49 UTC (rev 1032) +++ cpu/x86/pc/olpc/versions.fth 2008-12-14 17:43:28 UTC (rev 1033) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 24 +macro: FW_MINOR 24b \ The EC microcode macro: EC_VERSION e21 Modified: cpu/x86/pc/olpc/wifichannel.fth =================================================================== --- cpu/x86/pc/olpc/wifichannel.fth 2008-12-12 00:13:49 UTC (rev 1032) +++ cpu/x86/pc/olpc/wifichannel.fth 2008-12-14 17:43:28 UTC (rev 1033) @@ -1,13 +1,22 @@ +purpose: Analyze WIFI spectrum to find good channels for NANDblaster +\ See license at end of file - 0 value wlan-ih d# 2048 buffer: scan-buf +: $call-wlan ( args method$ -- res ) wlan-ih $call-method ; +: stop-mesh ( -- ) " mesh-stop" $call-wlan drop ; +: start-mesh ( channel# -- ) + " mesh-start" $call-wlan drop + d# 100 0 " set-beacon" $call-wlan +; + : open-wlan ( -- ) " /wlan:force" open-dev to wlan-ih wlan-ih 0= abort" Can't open wireless LAN" - " " " set-ssid" wlan-ih $call-method + " " " set-ssid" $call-wlan ; +: close-wlan ( -- ) wlan-ih ?dup if close-dev 0 to wlan-ih then ; : analyze-beacons ( -- total-rssi max-rssi #beacons ) 0 0 ( tot-rssi max-rssi ) @@ -39,18 +48,64 @@ drop r> ( tot-rssi max-rssi #beacons ) ; +0 value this-rssi +0 0 2value this-ssid +0 value this-channel +: brief-.ap ( adr -- adr' ) + dup 8 + c@ to this-rssi ( adr ) + dup le-w@ ( adr len ) + swap 2 + swap d# 19 /string ( adr' len' ) + begin dup 0> while ( adr len ) + over c@ case ( adr len ) + 0 of over 2+ dup 1- c@ to this-ssid endof + 3 of over 2+ c@ to this-channel endof + endcase ( adr len ) + over 1+ c@ 2 + /string ( adr' len' ) + repeat drop ( adr ) + + push-decimal + ." Channel: " this-channel 2 u.r ( adr ) + ." Strength: " this-rssi 2 u.r ( adr ) + pop-base + ." SSID: " this-ssid type ( adr ) + cr ( adr ) +; + +0 value this-#beacons + +d# 14 constant max-channel# +max-channel# 1+ array >#beacons +max-channel# 1+ array >channel-speed + +1 1 lshift 1 6 lshift or 1 d# 11 lshift or constant def-channel-mask + +: channel-bounds ( -- limit start ) max-channel# 1+ 1 ; + +: channel-avail? ( channel# -- flag ) 1 swap lshift def-channel-mask and ; + +: show-beacons ( -- #beacons ) + \ The first AP structure begins at offset 3 within the scan result + scan-buf 3 + ( 'ap ) + scan-buf 2 + c@ dup >r ( 'ap #beacons ) + 0 ?do ( 'ap ) \ Byte 2 is number of beacons + brief-.ap ( 'ap' ) + loop ( 'ap ) + drop r> ( #beacons ) +; + +: scan-channel ( channel# -- actual ) + 1 swap lshift " set-channel-mask" $call-wlan + scan-buf d# 2048 " scan" $call-wlan ( actual ) +; + : channel-stats ( channel# -- total-rssi max-rssi #beacons ) - 1 swap lshift " set-channel-mask" wlan-ih $call-method - scan-buf d# 2048 " scan" wlan-ih $call-method ( actual ) - if + scan-channel if analyze-beacons else 0 0 0 then ; -d# 15 constant rssi-limit - \ Keep the rssi,chan pair with the lowest max-rssi value : lowest-rssi ( max-rssiN chanN max-rssiM chanM -- max-rssiP P ) 3 pick 2 pick ( max-rssiN chanN max-rssiM chanM max-rssiN max-rssiM ) @@ -67,46 +122,59 @@ then ( max-rssiN' N' no-beacons? ) ; -: scan-mesh-channels ( -- max-rssi chan# ) - h# ffffffff 0 ( max-rssi0 0 ) \ This high rssi always loses - d# 11 try-channel if exit then ( max-rssiN chanN ) - d# 6 try-channel if exit then ( max-rssiN chanN ) - d# 1 try-channel drop ( max-rssi chan# ) -; - : quietest-mesh-channel ( -- max-rssi chan# ) open-wlan - scan-mesh-channels - wlan-ih close-dev + h# ffffffff 0 \ High RSSI for starters ( max-rssi0 0 ) + channel-bounds do ( max-rssiN chanN ) + i channel-avail? if ( max-rssiN chanN ) + i try-channel ?leave ( max-rssiN chanN ) + then + loop + close-wlan ; +d# 10 constant rssi-threshold +: quietest-auto-channel ( -- chan# ) + quietest-mesh-channel ( rssi chan# ) + swap rssi-threshold > if ( chan# ) + ." No wireless channels are quiet. The quietest is channel " dup .d cr ( chan# ) + " Do you want to use that channel" confirmedn? ( chan# proceed? ) + 0= abort" Stopping." + then ( chan# ) +; + : multinand-traffic? ( channel# -- flag ) - " mesh-start" wlan-ih $call-method drop - d# 100 0 " set-beacon" wlan-ih $call-method - " "(01 00 5e 7e 01 02)" " set-multicast" wlan-ih $call-method + start-mesh + " "(01 00 5e 7e 01 02)" " set-multicast" $call-wlan d# 300 0 do - scan-buf d# 2048 " read" wlan-ih $call-method ( actual ) + scan-buf d# 2048 " read" $call-wlan ( actual ) 0> if ( ) scan-buf d# 12 + " XO" comp 0= if ( ) - " mesh-stop" wlan-ih $call-method drop ( ) + stop-mesh ( ) true unloop exit then then 1 ms loop - " mesh-stop" wlan-ih $call-method drop + stop-mesh false ; + : search-channels ( -- true | chan# false ) - d# 11 multinand-traffic? if d# 11 false exit then - d# 6 multinand-traffic? if d# 6 false exit then - d# 1 multinand-traffic? if d# 1 false exit then + channel-bounds do ( ) + i channel-avail? if ( ) + i multinand-traffic? if ( ) + i unloop false exit + then ( ) + then ( ) + loop ( ) true ; + : find-multinand-server ( -- true | chan# false ) open-wlan search-channels - wlan-ih close-dev + close-wlan ; : nandblaster ( -- ) find-multinand-server abort" No multicast NAND server" ( chan# ) @@ -114,16 +182,146 @@ ; alias nb nandblaster -d# 10 constant rssi-threshold +d# 1514 buffer: mesh-test-buf + +: (channel-speed) ( channel# -- kb/sec ) + dup >r start-mesh + " enable-multicast" $call-wlan + 1 " mesh-set-ttl" $call-wlan + h# b " mesh-set-bcast" $call-wlan + + " "(00 00 00 00 00 00 01 00 5e 7e 01 01)XO" mesh-test-buf swap move + + tsc@ + d# 1000 0 do + mesh-test-buf d# 1514 " write" $call-wlan drop + loop + tsc@ 2swap d- ms-factor um/mod nip ( ms ) + d# 1,514,000 swap / ( kb/sec ) + stop-mesh ( kb/sec ) + dup r> >channel-speed ! ( kb/sec ) +; +: channel-speed ( channel# -- kb/sec ) + open-wlan (channel-speed) close-wlan +; + +: ?faster ( chan# kb/sec this-chan# -- chan#' kb/sec ) + dup (channel-speed) ( chan# kb/sec this-chan# this-kb/sec ) + 2 pick over u< if 2swap then ( chan# kb/sec this-chan# this-kb/sec ) + 2drop +; + +: (.channel-speed) ( channel# -- ) + push-decimal + ." Channel: " dup 2 u.r ." " + (channel-speed) + <# u# u# u# [char] . hold u# u#> type ." Mbytes/sec" cr + pop-base +; + +: .wifi-speeds ( -- ) + open-wlan + channel-bounds do + i channel-avail? if + i (.channel-speed) + then + loop + close-wlan +; + +: (.channel-beacons) ( channel# -- ) + dup >r ( r: channel# ) + scan-channel if ( r: channel# ) + show-beacons ( #beacons r: channel# ) + else ( r: channel# ) + 0 ( #beacons r: channel# ) + then ( #beacons r: channel# ) + r> >#beacons ! ( ) +; + +: .wifi-beacons ( -- ) + open-wlan + channel-bounds do + i channel-avail? if + i (.channel-beacons) + then + loop + close-wlan +; + +: .wifi ( -- ) + ." Beacons: " cr + .wifi-beacons + cr + ." Max transmit speeds: (congestion dependent)" cr + .wifi-speeds +; + +d# 2000 constant wifi-speed-threshold +: quiet&fast? ( channel# -- flag ) + dup >#beacons @ if drop false exit then ( channel# ) + >channel-speed @ wifi-speed-threshold > +; + +: quiet-channel-mask ( -- mask ) + 0 ( mask ) + channel-bounds do ( mask ) + i channel-avail? if ( mask ) + i >#beacons @ 0= if ( mask ) + 1 i lshift or ( mask' ) + then ( mask ) + then ( mask ) + loop ( mask ) +; + +: fastest-of ( mask -- chan# ) + 0 0 + channel-bounds do ( mask chan# speed ) + 2 pick 1 i lshift and if ( mask chan# speed ) + dup i >channel-speed @ < if ( mask chan# speed ) + 2drop i i >channel-speed @ ( mask chan#' speed' ) + then ( mask chan# speed ) + then ( mask chan# speed ) + loop ( mask chan# speed ) + rot 2drop +; + : nb-auto-channel ( -- chan# ) - quietest-mesh-channel ( rssi chan# ) - swap rssi-threshold > if ( chan# ) - ." No wireless channels are quiet. The quietest is channel " dup .d cr ( chan# ) - " Do you want to use that channel" confirmedn? ( chan# proceed? ) - 0= abort" Stopping." - then ( chan# ) + ." Analyzing WIFI spectrum" cr + cr + .wifi + + quiet-channel-mask ?dup 0= if def-channel-mask then + fastest-of + cr + ." Using channel " dup .d cr + d# 4000 ms ; : nb-clone ( -- ) nb-auto-channel #nb-clone ; : nb-secure ( -- ) nb-auto-channel #nb-secure-def ; : nb-update ( -- ) nb-auto-channel #nb-update-def ; + +\ LICENSE_BEGIN +\ Copyright (c) 2008 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: ofw/wifi/eapol.fth =================================================================== --- ofw/wifi/eapol.fth 2008-12-12 00:13:49 UTC (rev 1032) +++ ofw/wifi/eapol.fth 2008-12-14 17:43:28 UTC (rev 1033) @@ -500,7 +500,7 @@ : .ap ( adr -- ) ." Address: " dup 2 + .enaddr cr - ." RSSI: " dup 8 + c@ u. cr + ." RSSI: " dup 8 + c@ .d cr ." Beacon interval: " dup d# 17 + le-w@ .d cr ." Capabilities: " dup d# 19 + le-w@ cr .cap dup le-w@ swap 2 + swap d# 19 /string ( adr' len' )

1 0

r1032 - cpu/x86/pc/olpc
by svn＠openfirmware.info 12 Dec '08

12 Dec '08

Author: wmb Date: 2008-12-12 01:13:49 +0100 (Fri, 12 Dec 2008) New Revision: 1032 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC - explicit git commit ID for NANDblaster, also fix Divide Error in NANDblaster status reports. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-12-11 22:49:49 UTC (rev 1031) +++ cpu/x86/pc/olpc/versions.fth 2008-12-12 00:13:49 UTC (rev 1032) @@ -26,6 +26,6 @@ \ With a specific ID, mcastnand.bth will download a tarball without .git stuff. \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ \ is not already present, then you can modify the git subtree as needed. -\ macro: MCNAND_VERSION 5f202b05147826ad69fcb849b92290681a56c70c +macro: MCNAND_VERSION 0c73b4a084a27f0687b152dd0395c67fdf54b10f \ macro: MCNAND_VERSION test -macro: MCNAND_VERSION HEAD +\ macro: MCNAND_VERSION HEAD

1 0

r1031 - cpu/x86/pc/olpc
by svn＠openfirmware.info 11 Dec '08

11 Dec '08

Author: wmb Date: 2008-12-11 23:49:49 +0100 (Thu, 11 Dec 2008) New Revision: 1031 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E24 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-12-11 22:46:49 UTC (rev 1030) +++ cpu/x86/pc/olpc/versions.fth 2008-12-11 22:49:49 UTC (rev 1031) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 23 +macro: FW_MINOR 24 \ The EC microcode macro: EC_VERSION e21

1 0

r1030 - cpu/x86/pc/olpc
by svn＠openfirmware.info 11 Dec '08

11 Dec '08

Author: wmb Date: 2008-12-11 23:46:49 +0100 (Thu, 11 Dec 2008) New Revision: 1030 Modified: cpu/x86/pc/olpc/nandcastui.fth cpu/x86/pc/olpc/wifichannel.fth Log: OLPC NANDblaster - fixed some UI problems found in early testing. Modified: cpu/x86/pc/olpc/nandcastui.fth =================================================================== --- cpu/x86/pc/olpc/nandcastui.fth 2008-12-11 20:00:00 UTC (rev 1029) +++ cpu/x86/pc/olpc/nandcastui.fth 2008-12-11 22:46:49 UTC (rev 1030) @@ -62,20 +62,23 @@ " rom:nb_tx ether:%d %s %d 131072 %d %d %d %d" sprintf boot-load go ; -: nb-clone1 ( -- ) 1 #nb-clone ; -: nb-clone6 ( -- ) 6 #nb-clone ; +: #nb-update-def ( channel# -- ) >r " u:\fs.plc" " u:\fs.img" r> #nb-update ; +: #nb-secure-def ( channel# -- ) >r " u:\fs.zip" " u:\fs.img" r> #nb-secure ; + +: nb-clone1 ( -- ) 1 #nb-clone ; +: nb-clone6 ( -- ) 6 #nb-clone ; : nb-clone11 ( -- ) d# 11 #nb-clone ; -: nb-update1 ( -- ) 1 #nb-update ; -: nb-update6 ( -- ) 6 #nb-update ; -: nb-update11 ( -- ) d# 11 #nb-update ; +: nb-update1 ( -- ) 1 #nb-update-def ; +: nb-update6 ( -- ) 6 #nb-update-def ; +: nb-update11 ( -- ) d# 11 #nb-update-def ; -: nb-secure1 ( -- ) 1 #nb-secure ; -: nb-secure6 ( -- ) 6 #nb-secure ; -: nb-secure11 ( -- ) d# 11 #nb-secure ; +: nb-secure1 ( -- ) 1 #nb-secure-def ; +: nb-secure6 ( -- ) 6 #nb-secure-def ; +: nb-secure11 ( -- ) d# 11 #nb-secure-def ; -: nb1 ( -- ) 1 #nb ; -: nb6 ( -- ) 6 #nb ; +: nb1 ( -- ) 1 #nb ; +: nb6 ( -- ) 6 #nb ; : nb11 ( -- ) d# 11 #nb ; : mesh-clone Modified: cpu/x86/pc/olpc/wifichannel.fth =================================================================== --- cpu/x86/pc/olpc/wifichannel.fth 2008-12-11 20:00:00 UTC (rev 1029) +++ cpu/x86/pc/olpc/wifichannel.fth 2008-12-11 22:46:49 UTC (rev 1030) @@ -116,11 +116,14 @@ d# 10 constant rssi-threshold : nb-auto-channel ( -- chan# ) - quietest-mesh-channel ( rssi chan# ) - swap rssi-threshold > abort" No quiet channels" ( chan# ) + quietest-mesh-channel ( rssi chan# ) + swap rssi-threshold > if ( chan# ) + ." No wireless channels are quiet. The quietest is channel " dup .d cr ( chan# ) + " Do you want to use that channel" confirmedn? ( chan# proceed? ) + 0= abort" Stopping." + then ( chan# ) ; -: nb-clone ( -- ) nb-auto-channel #nb-clone ; - -: nb-update " u:\fs.plc" " u:\fs.img" nb-auto-channel #nb-update ; -: nb-secure " u:\fs.zip" " u:\fs.img" nb-auto-channel #nb-secure ; +: nb-clone ( -- ) nb-auto-channel #nb-clone ; +: nb-secure ( -- ) nb-auto-channel #nb-secure-def ; +: nb-update ( -- ) nb-auto-channel #nb-update-def ;

1 0

r1029 - cpu/x86/pc/olpc
by svn＠openfirmware.info 11 Dec '08

11 Dec '08

Author: wmb Date: 2008-12-11 21:00:00 +0100 (Thu, 11 Dec 2008) New Revision: 1029 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E23 (uses e21 EC firmware and p23 wireless firmware) Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-12-11 06:05:43 UTC (rev 1028) +++ cpu/x86/pc/olpc/versions.fth 2008-12-11 20:00:00 UTC (rev 1029) @@ -1,11 +1,11 @@ \ Version numbers of items included in the OLPC firmware image \ The overall firmware revision -macro: FW_MAJOR F -macro: FW_MINOR 01 +macro: FW_MAJOR E +macro: FW_MINOR 23 \ The EC microcode -macro: EC_VERSION 1_1_0 +macro: EC_VERSION e21 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}.olpc1 -macro: WLAN_VERSION 5.110.22.p20 +macro: WLAN_VERSION 5.110.22.p23 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

r1028 - dev/usb2/hcd/ehci
by svn＠openfirmware.info 11 Dec '08

11 Dec '08

Author: wmb Date: 2008-12-11 07:05:43 +0100 (Thu, 11 Dec 2008) New Revision: 1028 Modified: dev/usb2/hcd/ehci/bulk.fth Log: USB - fixed bulk-in timeout setting; only seems to affect some USB CD-ROM drives. Modified: dev/usb2/hcd/ehci/bulk.fth =================================================================== --- dev/usb2/hcd/ehci/bulk.fth 2008-12-11 04:22:27 UTC (rev 1027) +++ dev/usb2/hcd/ehci/bulk.fth 2008-12-11 06:05:43 UTC (rev 1028) @@ -177,7 +177,7 @@ unmap&free ; -: set-bulk-in-timeout ( ms -- ) ?dup if bulk-in-qh >qh-timeout l! then ; +: set-bulk-in-timeout ( ms -- ) to bulk-in-timeout ; : alloc-ring-bufs ( /buf #bufs qh -- ) >r

1 0

r1027 - cpu/x86/pc/olpc
by svn＠openfirmware.info 11 Dec '08

11 Dec '08

Author: rsmith Date: 2008-12-11 05:22:27 +0100 (Thu, 11 Dec 2008) New Revision: 1027 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: * Bump versions to F series and new EC code version numbering Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-12-11 04:14:34 UTC (rev 1026) +++ cpu/x86/pc/olpc/versions.fth 2008-12-11 04:22:27 UTC (rev 1027) @@ -1,11 +1,11 @@ \ Version numbers of items included in the OLPC firmware image \ The overall firmware revision -macro: FW_MAJOR E -macro: FW_MINOR 22h +macro: FW_MAJOR F +macro: FW_MINOR 01 \ The EC microcode -macro: EC_VERSION e21 +macro: EC_VERSION 1_1_0 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware December 2008