OpenBIOS July 2007

openbios@openbios.org

3 participants
65 discussions

r506 - cpu/x86/pc/olpc
by svn＠openbios.org 30 Jul '07

30 Jul '07

Author: rsmith Date: 2007-07-30 23:08:57 +0200 (Mon, 30 Jul 2007) New Revision: 506 Modified: cpu/x86/pc/olpc/versions.fth Log: olpc: Update wireless firmware version Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-07-30 18:40:53 UTC (rev 505) +++ cpu/x86/pc/olpc/versions.fth 2007-07-30 21:08:57 UTC (rev 506) @@ -13,4 +13,4 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.220.10.p5 +macro: WLAN_VERSION 5.110.16.p1

1 0

r505 - cpu/x86/pc/olpc
by svn＠openbios.org 30 Jul '07

30 Jul '07

Author: wmb Date: 2007-07-30 20:40:53 +0200 (Mon, 30 Jul 2007) New Revision: 505 Modified: cpu/x86/pc/olpc/versions.fth Log: Version q2c20 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-07-30 18:19:56 UTC (rev 504) +++ cpu/x86/pc/olpc/versions.fth 2007-07-30 18:40:53 UTC (rev 505) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 16 +macro: FW_MINOR 20 \ The EC microcode -macro: EC_VERSION c16 +macro: EC_VERSION c20 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r504 - forth/kernel forth/lib ofw/core
by svn＠openbios.org 30 Jul '07

30 Jul '07

Author: wmb Date: 2007-07-30 20:19:56 +0200 (Mon, 30 Jul 2007) New Revision: 504 Modified: forth/kernel/kernel.fth forth/kernel/sysio.fth forth/lib/loadcomm.fth forth/lib/stringop.fth ofw/core/ofwcore.fth Log: Added string macro expansion to the base build. Modified: forth/kernel/kernel.fth =================================================================== --- forth/kernel/kernel.fth 2007-07-28 17:45:18 UTC (rev 503) +++ forth/kernel/kernel.fth 2007-07-30 18:19:56 UTC (rev 504) @@ -38,6 +38,7 @@ defer resize ( adr #bytes -- adr' ior ) defer sync-cache ( adr len -- ) ' 2drop is sync-cache +defer $getenv ( adr len -- false | adr' len' true ) defer #out ( -- adr ) defer #line ( -- adr ) @@ -50,6 +51,8 @@ : default-type ( adr len -- ) 0 max bounds ?do pause i c@ (emit loop ; +: null-$getenv ( adr len -- true ) 2drop true ; + \ headerless \ from campus version nuser (#out \ number of characters emitted \ headers \ from campus version @@ -61,6 +64,7 @@ ' key1 is key ' (#out is #out ' (#line is #line +' null-$getenv is $getenv decimal Modified: forth/kernel/sysio.fth =================================================================== --- forth/kernel/sysio.fth 2007-07-28 17:45:18 UTC (rev 503) +++ forth/kernel/sysio.fth 2007-07-30 18:19:56 UTC (rev 504) @@ -161,6 +161,10 @@ : sys-sync-cache ( adr len -- ) swap 116 syscall 2drop ; +: sys-$getenv ( adr len -- true | adr' len' false ) + $cstr d# 84 syscall drop retval dup if cscount false else drop true then +; + : install-wrapper-alloc ( -- ) \ Don't use "is" in case a relocation map needs to be allocated first ['] sys-alloc-mem ['] alloc-mem >body >user token! @@ -185,6 +189,7 @@ install-wrapper-alloc \ init-relocation goes here, for versions that need it install-wrapper-key + ['] sys-$getenv is $getenv ; headers Modified: forth/lib/loadcomm.fth =================================================================== --- forth/lib/loadcomm.fth 2007-07-28 17:45:18 UTC (rev 503) +++ forth/lib/loadcomm.fth 2007-07-30 18:19:56 UTC (rev 504) @@ -25,6 +25,7 @@ fload ${BP}/forth/kernel/endian.fth fload ${BP}/forth/lib/strings.fth +fload ${BP}/forth/lib/stringop.fth fload ${BP}/forth/lib/fastspac.fth Modified: forth/lib/stringop.fth =================================================================== --- forth/lib/stringop.fth 2007-07-28 17:45:18 UTC (rev 503) +++ forth/lib/stringop.fth 2007-07-30 18:19:56 UTC (rev 504) @@ -1,10 +1,6 @@ \ See license at end of file purpose: String tools to manipulate OS file pathnames -: $getenv ( adr len -- false | adr' len' true ) - $cstr d# 84 syscall drop retval dup if cscount true then -; - \ head$ is the portion of str3 preceding str2, and tail$ is the portion \ of str3 following str2 : break$ ( str2 str3 -- head$ tail$ ) @@ -38,13 +34,25 @@ ; vocabulary macros -: macro: ( "name" "value" -- ) - also macros definitions create previous definitions 0 parse ", +: $set-macro ( value$ name$ -- ) + warning @ warning off + also macros definitions $header create-cf previous definitions ( value$ ) + warning ! + ", does> ( -- adr len ) count ; +: $get-macro ( name$ -- true | value$ false ) + ['] macros search-wordlist if execute false else true then +; + +: macro: ( "name" "value" -- ) safe-parse-word 0 parse 2swap $set-macro ; + : expansion ( macro-name$ -- macro-value$ ) - 2dup ['] macros search-wordlist if nip nip execute exit then ( name$ ) - $getenv 0= if " " then + 2dup $get-macro if ( name$ ) + $getenv if " " then ( value$ ) + else ( name$ value$ ) + 2nip ( value$ ) + then ( value$ ) ; \ Expand references to environment variables within str1 @@ -82,24 +90,25 @@ : remaining ( -- adr len ) source >in @ /string ; \ The complexity with last-delim is necessary in order to handle the \ case where files" is at the very end of a line. -0 value last-delim +variable last-delim : files" ( "strings" -- adr len ) - 0 to last-delim + last-delim off here begin #remaining if [char] " parse ( adr len ) $, - source drop >in @ + 1- c@ to last-delim + source drop >in @ + 1- c@ last-delim ! then #remaining 0= while - >in @ if last-delim [char] " <> else true then + >in @ if last-delim @ [char] " <> else true then while bl c, refill 0= until then then ( adr ) here over - ; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: ofw/core/ofwcore.fth =================================================================== --- ofw/core/ofwcore.fth 2007-07-28 17:45:18 UTC (rev 503) +++ ofw/core/ofwcore.fth 2007-07-30 18:19:56 UTC (rev 504) @@ -501,7 +501,7 @@ config-ro ; -: $getenv ( name$ -- true | value$ false ) +: ofw-$getenv ( name$ -- true | value$ false ) 2dup $find-option if ( name$ xt ) nip nip ( xt ) >r r@ get r> decode -null false ( prop$ false ) @@ -3717,6 +3717,7 @@ ['] heap-alloc-mem is alloc-mem ['] heap-free-mem is free-mem ['] resize-memory is resize + ['] ofw-$getenv is $getenv ; headers

1 0

r167 - openbios-devel/arch/sparc32
by svn＠openbios.org 29 Jul '07

29 Jul '07

Author: blueswirl Date: 2007-07-29 22:20:46 +0200 (Sun, 29 Jul 2007) New Revision: 167 Modified: openbios-devel/arch/sparc32/lib.c openbios-devel/arch/sparc32/romvec.c Log: Maximally align allocations Modified: openbios-devel/arch/sparc32/lib.c =================================================================== --- openbios-devel/arch/sparc32/lib.c 2007-07-20 11:23:30 UTC (rev 166) +++ openbios-devel/arch/sparc32/lib.c 2007-07-29 20:20:46 UTC (rev 167) @@ -72,8 +72,7 @@ if( !size ) return NULL; - if( size & 3 ) - size += 4 - (size & 3); + size = (size + 7) & ~7; size += sizeof(alloc_desc_t); /* look in the freelist */ Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-07-20 11:23:30 UTC (rev 166) +++ openbios-devel/arch/sparc32/romvec.c 2007-07-29 20:20:46 UTC (rev 167) @@ -416,6 +416,7 @@ { static unsigned int next_free_address = 0xFFEDA000; + size = (size + 7) & ~7; totmap[0].num_bytes -= size; DPRINTF("obp_dumb_memalloc req 0x%x of %d at 0x%x\n", va, size, totmap[0].num_bytes);

1 0

r503 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Jul '07

28 Jul '07

Author: wmb Date: 2007-07-28 19:45:18 +0200 (Sat, 28 Jul 2007) New Revision: 503 Modified: cpu/x86/pc/olpc/mfgtree.fth Log: OLPC - "invent" SN (0) and U# (0) properties in /mfg-data for systems that have no manufacturing data. Modified: cpu/x86/pc/olpc/mfgtree.fth =================================================================== --- cpu/x86/pc/olpc/mfgtree.fth 2007-07-27 05:29:41 UTC (rev 502) +++ cpu/x86/pc/olpc/mfgtree.fth 2007-07-28 17:45:18 UTC (rev 503) @@ -12,7 +12,18 @@ >r encode-bytes r> 2 property ( adr ) repeat ( adr ) drop + " SN" get-property if + " SHF00000000" " SN" string-property + else + 2drop + then + " U#" get-property if + " 00000000-0000-0000-0000-000000000000" " S#" string-property + else + 2drop + then device-end + ; \ LICENSE_BEGIN

1 0

r502 - ofw/termemu
by svn＠openbios.org 27 Jul '07

27 Jul '07

Author: wmb Date: 2007-07-27 07:29:41 +0200 (Fri, 27 Jul 2007) New Revision: 502 Modified: ofw/termemu/fb16.fth Log: fb16.fth - Added a "d#" for paranoia. Modified: ofw/termemu/fb16.fth =================================================================== --- ofw/termemu/fb16.fth 2007-07-27 05:28:47 UTC (rev 501) +++ ofw/termemu/fb16.fth 2007-07-27 05:29:41 UTC (rev 502) @@ -251,7 +251,7 @@ ['] fb16-delete-characters is delete-characters ['] fb16-insert-lines is insert-lines - bytes/line16 16 mod if + bytes/line16 d# 16 mod if ['] fb16-delete-lines-slow else ['] fb16-delete-lines

1 0

r501 - dev/geode/display
by svn＠openbios.org 27 Jul '07

27 Jul '07

Author: wmb Date: 2007-07-27 07:28:47 +0200 (Fri, 27 Jul 2007) New Revision: 501 Added: dev/geode/display/gp.fth Log: Geode graphics processor support - initial revision, not integrated with the OFW console mechanism. Added: dev/geode/display/gp.fth =================================================================== --- dev/geode/display/gp.fth (rev 0) +++ dev/geode/display/gp.fth 2007-07-27 05:28:47 UTC (rev 501) @@ -0,0 +1,98 @@ +purpose: Geode LX graphics acceleration +\ See license at end of file + +dev screen + +alias depth+ wa+ + +: gp! ( l reg -- ) gp-base + rl! ; +: gp@ ( reg -- l ) gp-base + rl@ ; + +: dst! ( x y -- ) bytes/line16 * swap depth+ 0 gp! ; +: src! ( x y -- ) bytes/line16 * swap depth+ 4 gp! ; +: stride! ( dst-stride src-stride -- ) wljoin 8 gp! ; +: wh! ( width height -- ) swap wljoin h# c gp! ; +\ : fg! ( foreground-color -- ) h# 10 gp! ; +\ : bg! ( background-color -- ) h# 14 gp! ; +: pattern! ( color pat# -- ) h# 18 swap la+ gp! ; +: ropmode! ( mode -- ) h# 38 gp! ; +: blt! ( blt -- ) h# 40 gp! ; +: offset! ( ch3 src dst -- ) + h# ffc0.0000 and ( ch3 src dst' ) + swap h# ffc0.0000 and d# 10 rshift or ( ch3 src+dst ) + swap h# ffc0.0000 and d# 20 rshift or ( ch3+src+dst ) + h# 4c gp! +; + +\ Ready to accept a command +: gp-wait-ready ( -- ) begin h# 44 gp@ 4 and 0= until ; + +\ Finished with all the queued-up commands +: gp-wait-done ( -- ) begin h# 44 gp@ 1 and 0= until ; + +\ Do this once +: gp-setup ( -- ) + frame-buffer-adr >physical dup dup offset! + bytes/line16 dup stride! +; + +\ This one is a big win compared to doing it with the CPU +\ Scrolling the whole screen takes about 3.4 mS (GP) or 74 mS (CPU) +: gp-move ( src-x,y dst-x,y w,h -- ) + gp-wait-ready + wh! dst! src! + h# 6000.00cc ropmode! \ RGB565, Output = source + 1 blt! \ Source data from framebuffer + gp-wait-done +; + +\ gp-fill takes 2/3 as long wfill, and about the same time as lfill +\ gp-fill of the entire OLPC screen takes 2 mS; one character row 120 uS +: gp-fill ( color dst-x,y w,h -- ) + gp-wait-ready + wh! dst! 0 pattern! + h# 6000.00f0 ropmode! \ RGB565, Output = pattern + h# 0 blt! \ No source or destination data from framebuffer + gp-wait-done +; + +\ some tests +1 [if] +: gp-fill-screen ( color -- ) + 0 0 screen-width screen-height gp-fill +; +: gp-scroll-screen ( -- ) + 0 char-height 0 0 screen-width ( src-x,y dst-x,y ) + screen-height char-height - gp-move +; +: gp-fill-last-line ( color -- ) + bg16 0 screen-height char-height - screen-width char-height gp-fill +; +[then] + + +dend + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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

r500 - cpu/x86/pc/olpc ofw/core
by svn＠openbios.org 26 Jul '07

26 Jul '07

Author: wmb Date: 2007-07-26 18:39:29 +0200 (Thu, 26 Jul 2007) New Revision: 500 Modified: cpu/x86/pc/olpc/linux.fth ofw/core/bootparm.fth Log: Made a new /chosen property "ramdisk" so loading the Linux ramdisk doesn't overwrite the "bootpath" property. Modified: cpu/x86/pc/olpc/linux.fth =================================================================== --- cpu/x86/pc/olpc/linux.fth 2007-07-26 16:00:48 UTC (rev 499) +++ cpu/x86/pc/olpc/linux.fth 2007-07-26 16:39:29 UTC (rev 500) @@ -178,13 +178,22 @@ linux-params to %esi ; +d# 256 buffer: ramdisk-buf +' ramdisk-buf " ramdisk" chosen-string + : load-ramdisk ( -- ) - " ramdisk" eval dup 0= if 2drop exit then - 0 to /ramdisk - ." Loading ramdisk image from " 2dup type ." ..." - boot-read + " ramdisk" eval dup 0= if 2drop exit then ( name$ ) + 0 to /ramdisk ( name$ ) + + ['] load-path behavior >r ( name$ r: xt ) + ['] ramdisk-buf to load-path ( name$ r: xt ) + + ." Loading ramdisk image from " 2dup type ." ..." ( name$ r: xt ) + ['] boot-read catch ( throw-code r: xt ) + cr ( throw-code r: xt ) + r> to load-path ( throw-code ) + throw loaded to /ramdisk to ramdisk-adr - cr ; : claim-params ( -- ) Modified: ofw/core/bootparm.fth =================================================================== --- ofw/core/bootparm.fth 2007-07-26 16:00:48 UTC (rev 499) +++ ofw/core/bootparm.fth 2007-07-26 16:39:29 UTC (rev 500) @@ -78,6 +78,9 @@ defer load-started ' noop to load-started defer load-done ' noop to load-done +defer load-path +' path-buf is load-path + headerless : (boot-read) ( adr len -- ) opened-ih if ( adr len ) @@ -89,7 +92,7 @@ ( print-probe-list ) true abort" "r"nCan't open boot device"r"n" then ( fileid ) - dup ihandle>devname path-buf place-cstr drop ( fileid ) + dup ihandle>devname load-path place-cstr drop ( fileid ) >r ( ) load-started 0 !load-size load-base ( load-adr )

1 0

r499 - cpu/x86/pc/olpc
by svn＠openbios.org 26 Jul '07

26 Jul '07

Author: wmb Date: 2007-07-26 18:00:48 +0200 (Thu, 26 Jul 2007) New Revision: 499 Modified: cpu/x86/pc/olpc/devices.fth Log: OLCP - set screen-height appropriately for the XO display. Thanks to Luke Gorrie. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-07-26 16:00:10 UTC (rev 498) +++ cpu/x86/pc/olpc/devices.fth 2007-07-26 16:00:48 UTC (rev 499) @@ -321,6 +321,7 @@ end-package devalias screen /display +also hidden d# 34 to display-height previous \ For editing fload ${BP}/dev/geode/acpi.fth \ Power management

1 0

r498 - cpu/x86
by svn＠openbios.org 26 Jul '07

26 Jul '07

Author: wmb Date: 2007-07-26 18:00:10 +0200 (Thu, 26 Jul 2007) New Revision: 498 Modified: cpu/x86/tsc.fth Log: x86 t( .. )t - use us-factor instead of hardcoding clock speed. Thanks to Luke Gorrie for the patch. Modified: cpu/x86/tsc.fth =================================================================== --- cpu/x86/tsc.fth 2007-07-26 06:42:10 UTC (rev 497) +++ cpu/x86/tsc.fth 2007-07-26 16:00:10 UTC (rev 498) @@ -42,7 +42,7 @@ 2variable timestamp : t( ( -- ) tsc@ timestamp 2! ; : )t ( -- ) - tsc@ timestamp 2@ d- d# 367 um/mod nip ( microseconds ) + tsc@ timestamp 2@ d- us-factor um/mod nip ( microseconds ) push-decimal <# u# u# u# [char] , hold u# u#s u#> type ." uS " pop-base

1 0