OpenBIOS August 2007

openbios@openbios.org

12 participants
103 discussions

r566 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Aug '07

19 Aug '07

Author: wmb Date: 2007-08-19 03:13:03 +0200 (Sun, 19 Aug 2007) New Revision: 566 Modified: cpu/x86/pc/olpc/fw.bth Log: Added game-key (direction-pad left) to invoke the "freeze screen" function for "pretty boot". Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-08-19 01:07:32 UTC (rev 565) +++ cpu/x86/pc/olpc/fw.bth 2007-08-19 01:13:03 UTC (rev 566) @@ -476,23 +476,26 @@ r> to load-started r> to playback-volume ; +: go-hook-freeze + [ ' go-hook behavior compile, ] + 0 " set-source" $call-screen +; +: freeze ( -- ) ['] go-hook-freeze to go-hook ; +: unfreeze ( -- ) ['] usb-quiet to go-hook ; : ?start-sound ( -- ) game-key-mask h# 40 and if start-sound then ; : ?games ( -- ) - game-key-mask h# 20 and if pong then + game-key-mask h# 20 and if pong then ; +: ?freeze ( -- ) + game-key-mask h# 10 and if freeze then +; : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then ; -: go-hook-freeze - [ ' go-hook behavior compile, ] - 0 " set-source" $call-screen -; -: freeze ( -- ) ['] go-hook-freeze to go-hook ; -: unfreeze ( -- ) ['] usb-quiet to go-hook ; : startup ( -- ) standalone? 0= if exit then @@ -505,6 +508,7 @@ stdout off probe-pci ?start-sound + ?freeze ['] false to interrupt-auto-boot? probe-usb \ " nand" $dev-update-flash @@ -522,6 +526,7 @@ ?start-sound open-keyboard ?games + ?freeze optional-startup interpreter-init [ifndef] lx-devel

1 0

r565 - cpu/x86
by svn＠openbios.org 19 Aug '07

19 Aug '07

Author: wmb Date: 2007-08-19 03:07:32 +0200 (Sun, 19 Aug 2007) New Revision: 565 Modified: cpu/x86/catchexc.fth cpu/x86/dtacc.fth Log: OLPC trac #2897 - An ordering problem in the allocation of the cpu-state array versus the setting of a value in that array was causing B2 machines to crash very early in the OFW init sequence - only on Q2C24 firmware. Modified: cpu/x86/catchexc.fth =================================================================== --- cpu/x86/catchexc.fth 2007-08-17 21:23:31 UTC (rev 564) +++ cpu/x86/catchexc.fth 2007-08-19 01:07:32 UTC (rev 565) @@ -333,9 +333,6 @@ forth definitions : catch-exceptions ( -- ) - pssave drop rssave drop \ Force buffer allocation - [ 0 alloc-reg ] literal alloc-mem is cpu-state - d# 00 catch-vector \ Divide by 0 d# 01 catch-vector \ Debugger d# 03 catch-vector \ Breakpoint @@ -354,7 +351,14 @@ ['] (uncatch-exceptions) is uncatch-exceptions ; +: init-exceptions ( -- ) + pssave drop rssave drop \ Force buffer allocation + [ 0 alloc-reg ] literal alloc-mem is cpu-state + restartable? off + catch-exceptions +; + : (cold-hook ( -- ) (cold-hook ['] noop is uncatch-exceptions @@ -418,13 +422,6 @@ ; \ ' print-breakpoint is handle-breakpoint -\ defer restart ( -- ) -hidden also -stand-init: - restartable? off -; -only forth also definitions - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/dtacc.fth =================================================================== --- cpu/x86/dtacc.fth 2007-08-17 21:23:31 UTC (rev 564) +++ cpu/x86/dtacc.fth 2007-08-19 01:07:32 UTC (rev 565) @@ -26,7 +26,7 @@ [ also hidden ] ['] save-state-common to save-state [ previous ] - catch-exceptions + init-exceptions then ;

1 0

r564 - in ofw: disklabel fs/fatfs
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: wmb Date: 2007-08-17 23:23:31 +0200 (Fri, 17 Aug 2007) New Revision: 564 Modified: ofw/disklabel/methods.fth ofw/fs/fatfs/partition.fth Log: OLPC trac #2889 - handle disks that have a bogus duplicate BIOS Parameter Block in sector 0 in addition to the real on in the partition. Modified: ofw/disklabel/methods.fth =================================================================== --- ofw/disklabel/methods.fth 2007-08-17 19:23:21 UTC (rev 563) +++ ofw/disklabel/methods.fth 2007-08-17 21:23:31 UTC (rev 564) @@ -69,7 +69,7 @@ \ If we find certain things in the first sector, we need not bother \ with partitions, and we ignore the partition specification - fat? if get-disk-size exit then + fat? unpartitioned? and if get-disk-size exit then dropin? if get-disk-size exit then zip? if get-disk-size exit then Modified: ofw/fs/fatfs/partition.fth =================================================================== --- ofw/fs/fatfs/partition.fth 2007-08-17 19:23:21 UTC (rev 563) +++ ofw/fs/fatfs/partition.fth 2007-08-17 21:23:31 UTC (rev 564) @@ -10,6 +10,17 @@ sector-buf d# 16 + c@ 1 2 between and ( flag ) \ #FATS ok? ; +\ This is a lame check to see if there might be a partition map entry. +\ It is for the case where the disk has a valid BPB in sector 0, but +\ also has a partition that doesn't start at 0. Thit is a bogus layout, +\ but we need to handle it anyway, because people often screw up when +\ using fdisk and mkdosfs under Linux. It is too easy to run mkdosfs on +\ the overall disk (not the partition). +: unpartitioned? ( -- flag ) + sector-buf h# 1fe + le-w@ h# aa55 <> + sector-buf h# 1c6 + le-l@ 0= or +; + : ptable-bounds ( -- end start ) sector-buf h# 1be + h# 40 bounds ; : ptable-sum ( -- n ) 0 ptable-bounds do i c@ + loop ; : fdisk? ( -- flag )

1 0

r563 - ofw/wifi
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: lwalter Date: 2007-08-17 21:23:21 +0200 (Fri, 17 Aug 2007) New Revision: 563 Modified: ofw/wifi/eapol.fth Log: Mask out bit 7 when deriving common rates Modified: ofw/wifi/eapol.fth =================================================================== --- ofw/wifi/eapol.fth 2007-08-17 18:59:06 UTC (rev 562) +++ ofw/wifi/eapol.fth 2007-08-17 19:23:21 UTC (rev 563) @@ -579,8 +579,8 @@ 0 value cr-idx \ Index into common-rates : supported-rate? ( r -- true | false ) - false swap #rates 0 ?do - supported-rates i + c@ over = if nip true swap leave then + h# 7f and false swap #rates 0 ?do + supported-rates i + c@ h# 7f and over = if nip true swap leave then loop drop ; : add-common-rates ( adr len -- )

1 0

r562 - dev/olpc/cafenand
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: wmb Date: 2007-08-17 20:59:06 +0200 (Fri, 17 Aug 2007) New Revision: 562 Modified: dev/olpc/cafenand/badblock.fth Log: NAND Cleanmarkers are supposed to be 8 bytes, not 12. Compatible with kernels built after Aug 10, 2007. Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2007-08-17 18:31:38 UTC (rev 561) +++ dev/olpc/cafenand/badblock.fth 2007-08-17 18:59:06 UTC (rev 562) @@ -394,7 +394,7 @@ ; : put-cleanmarker ( page# -- ) - " "(85 19 03 20 08 00 00 00 00 00 00 00)" ( page# adr len ) + " "(85 19 03 20 08 00 00 00)" ( page# adr len ) rot /page /ecc + write-bytes ( ) ; : put-cleanmarkers ( show-xt -- )

1 0

r561 - cpu/x86
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: wmb Date: 2007-08-17 20:31:38 +0200 (Fri, 17 Aug 2007) New Revision: 561 Modified: cpu/x86/kernel.bth cpu/x86/savemeta.fth Log: Yet another step in the pstr-elimination sage, see r521. Modified: cpu/x86/kernel.bth =================================================================== --- cpu/x86/kernel.bth 2007-08-17 18:25:27 UTC (rev 560) +++ cpu/x86/kernel.bth 2007-08-17 18:31:38 UTC (rev 561) @@ -117,7 +117,8 @@ hex \Tags close-tag-file -\NotTags .( --- Saving ) dic-file-name ". .( ---) dic-file-name save-meta cr +\NotTags .( --- Saving ) dic-file-name ". .( ---) +dic-file-name count $save-meta cr \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: cpu/x86/savemeta.fth =================================================================== --- cpu/x86/savemeta.fth 2007-08-17 18:25:27 UTC (rev 560) +++ cpu/x86/savemeta.fth 2007-08-17 18:31:38 UTC (rev 561) @@ -8,7 +8,7 @@ 0f + 4 >> ; -: save-meta ( str -- ) +: $save-meta ( filename$ -- ) \ origin-t >hostaddr here-t origin-t - save-image origin-t origin-t h# 1c + le-l!-t \ Relocation base of saved image @@ -17,7 +17,7 @@ origin-t >hostaddr is code-adr makeheader - new-file + $new-file exp-header /exp-header ofd @ fputs code-adr code-size ofd @ fputs relocation-map-t reloc-size ofd @ fputs

1 0

r560 - cpu/x86/pc/olpc
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: wmb Date: 2007-08-17 20:25:27 +0200 (Fri, 17 Aug 2007) New Revision: 560 Modified: cpu/x86/pc/olpc/versions.fth Log: Version q2c24 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-08-17 04:14:16 UTC (rev 559) +++ cpu/x86/pc/olpc/versions.fth 2007-08-17 18:25:27 UTC (rev 560) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 23 +macro: FW_MINOR 24 \ The EC microcode -macro: EC_VERSION c23 +macro: EC_VERSION c24 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r559 - cpu/x86/pc/olpc
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: wmb Date: 2007-08-17 06:14:16 +0200 (Fri, 17 Aug 2007) New Revision: 559 Added: cpu/x86/pc/olpc/rtcwake.fth Log: OLPC rtcwake.fth - Initial checkin of test code to wakeup from RTC alarm. Added: cpu/x86/pc/olpc/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/rtcwake.fth (rev 0) +++ cpu/x86/pc/olpc/rtcwake.fth 2007-08-17 04:14:16 UTC (rev 559) @@ -0,0 +1,36 @@ +\ Suspend/resume test with RTC wakeup +d# 2 value rtc-alarm-delay + +h# 41 constant cmos-alarm-day \ CMOS offset of day alarm +h# 40 constant cmos-alarm-month \ CMOS offset of month alarm +cmos-alarm-day 0 h# 5140.0055 msr! +cmos-alarm-month 0 h# 5140.0056 msr! + +: enable-rtc-alarm ( -- ) + h# c cmos@ drop \ Clear RTC interrupt flags + h# b cmos@ h# 20 or h# b cmos! +; +: disable-rtc-alarm ( -- ) + h# b cmos@ h# 20 invert and h# b cmos! +; +: bcd-cmos! ( binary -- ) " bcd!" clock-node @ $call-method ; +: set-rtc-alarm ( secs -- ) + disable-rtc-alarm + now ( secs s m h ) + d# 60 * d# 60 * swap d# 60 * + + + ( s ) + d# 60 /mod d# 60 /mod d# 24 mod ( s m h ) + h# c0 cmos-alarm-month cmos! ( s m h ) \ Any day + h# c0 cmos-alarm-day cmos! ( s m h ) \ Any month + 5 bcd-cmos! 3 bcd-cmos! 1 bcd-cmos! ( ) + enable-rtc-alarm +; + +: rs ( -- ) + rtc-alarm-delay set-rtc-alarm + s + disable-rtc-alarm +; +patch 500.0000 100.0000 s3 \ Turn on RTC wakeup too +: rss begin d# 50 ms rs ." ." key? until ; + +.( 'rs' does it once, 'rss' does it until you type a key) cr

1 0

r558 - dev/geode/display
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: wmb Date: 2007-08-17 06:12:02 +0200 (Fri, 17 Aug 2007) New Revision: 558 Modified: dev/geode/display/gp.fth dev/geode/display/gxfb.fth Log: GX display driver - save/restore GP registers when suspending. Modified: dev/geode/display/gp.fth =================================================================== --- dev/geode/display/gp.fth 2007-08-17 01:02:12 UTC (rev 557) +++ dev/geode/display/gp.fth 2007-08-17 04:12:02 UTC (rev 558) @@ -3,9 +3,6 @@ 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! ; Modified: dev/geode/display/gxfb.fth =================================================================== --- dev/geode/display/gxfb.fth 2007-08-17 01:02:12 UTC (rev 557) +++ dev/geode/display/gxfb.fth 2007-08-17 04:12:02 UTC (rev 558) @@ -36,7 +36,10 @@ : dc@ ( offset -- value ) dc-base + rl@ ; : vp! ( value offset -- ) vp-base + rl! ; : vp@ ( offset -- value ) vp-base + rl@ ; +: gp! ( l reg -- ) gp-base + rl! ; +: gp@ ( reg -- l ) gp-base + rl@ ; + : iand ( value mask -- ) invert and ; : map-frame-buffer ( -- ) @@ -337,8 +340,8 @@ 0 h# 38 vp! h# 100 0 do h# 40 vp@ l!+ loop \ Gamma h# 410 vp@ l!+ -\ h# 3c 0 do i gp@ l!+ 4 +loop -\ h# 4c gp@ l!+ + h# 3c 0 do i gp@ l!+ 4 +loop + h# 4c gp@ l!+ drop \ video-state - /l / . cr @@ -386,8 +389,8 @@ 0 h# 38 vp! h# 100 0 do l@+ h# 40 vp! loop \ Gamma l@+ h# 410 vp! -\ h# 3c 0 do l@+ i gp! 4 +loop -\ l@+ h# 4c gp! + h# 3c 0 do l@+ i gp! 4 +loop + l@+ h# 4c gp! 0 0 dc! \ Lock drop

1 0

r557 - cpu/x86/pc/olpc dev/olpc/cafenand
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: wmb Date: 2007-08-17 03:02:12 +0200 (Fri, 17 Aug 2007) New Revision: 557 Modified: cpu/x86/pc/olpc/copynand.fth cpu/x86/pc/olpc/nandstat.fth dev/olpc/cafenand/badblock.fth Log: copy-nand - added graphical display of bad-block-table location, fixed a bug in verify-nand and crc-nand (they were stuck on block 0). Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-08-16 22:14:47 UTC (rev 556) +++ cpu/x86/pc/olpc/copynand.fth 2007-08-17 01:02:12 UTC (rev 557) @@ -137,19 +137,20 @@ : (show-erasing) ( #blocks -- ) ." Erasing " . ." blocks" cr ; ' (show-erasing) is show-erasing -defer show-erased +defer show-erased ( block# -- ) : (show-erased) ( block# -- ) (cr . ; ' (show-erased) is show-erased -defer show-bad -: (show-bad) ( block# -- ) drop ; -' (show-bad) is show-bad +defer show-bad ( block# -- ) +' drop is show-bad -defer show-clean -: (show-clean) ( block# -- ) drop ; -' (show-clean) is show-clean +defer show-bbt ( block# -- ) +' drop is show-bbt -defer show-cleaning +defer show-clean ( block# -- ) +' drop is show-clean + +defer show-cleaning ( -- ) : (show-cleaning) ( -- ) cr ." Cleanmarkers" cr ; ' (show-cleaning) is show-cleaning @@ -170,7 +171,7 @@ ['] noop to show-progress #nand-pages nand-pages/block / show-erasing - ['] show-bad ['] show-erased " (wipe)" $call-nand + ['] show-bad ['] show-erased ['] show-bbt " (wipe)" $call-nand #image-eblocks show-writing @@ -205,7 +206,7 @@ " scan-page#" $call-nand .x cr ( ) ?key-stop then ( ) - repeat ( ) + loop ( ) close-nand-ihs ; @@ -251,7 +252,7 @@ else ( actual-crc expected-crc ) 2drop ( ) then ( ) - repeat ( ) + loop ( ) close-nand-ihs ; Modified: cpu/x86/pc/olpc/nandstat.fth =================================================================== --- cpu/x86/pc/olpc/nandstat.fth 2007-08-16 22:14:47 UTC (rev 556) +++ cpu/x86/pc/olpc/nandstat.fth 2007-08-17 01:02:12 UTC (rev 557) @@ -38,12 +38,12 @@ drop ; -: gshow-erased ( eblock# -- ) 0 0 0 rgb>565 show-state ; +: gshow-erased ( eblock# -- ) 0 0 0 rgb>565 show-state ; +: gshow-bad ( eblock# -- ) h# ff 0 0 rgb>565 show-state ; +: gshow-bbt ( eblock# -- ) h# 80 80 0 rgb>565 show-state ; +: gshow-clean ( eblock# -- ) h# 0 0 ff rgb>565 show-state ; -: gshow-bad ( eblock# -- ) h# ff 0 0 rgb>565 show-state ; - : gshow-cleaning ( -- ) ." Cleanmarkers" cr cursor-on ; -: gshow-clean ( eblock# -- ) h# 0 0 ff rgb>565 show-state ; : gshow-writing ( #eblocks -- ) ." Writing " @@ -66,6 +66,7 @@ ['] gshow-erasing to show-erasing ['] gshow-erased to show-erased ['] gshow-bad to show-bad + ['] gshow-bbt to show-bbt ['] gshow-clean to show-clean ['] gshow-cleaning to show-cleaning ['] gshow-writing to show-writing Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2007-08-16 22:14:47 UTC (rev 556) +++ dev/olpc/cafenand/badblock.fth 2007-08-17 01:02:12 UTC (rev 557) @@ -297,26 +297,30 @@ : .bn ( -- ) (cr . ; -: (wipe) ( 'show-bad 'show-erased -- ) +: (wipe) ( 'show-bad 'show-erased 'show-bbt -- ) get-existing-bbt - bbt if - usable-page-limit 0 ?do ( 'show-bad 'show-erased ) - i block-bad? if - i pages/eblock / 2 pick execute - else - i pages/eblock / over execute - i erase-block - then - pages/eblock +loop ( 'show-bad 'show-erased ) - 2drop exit - then ( 'show-bad 'show-erased ) - \ If there is no existing bad block table, make one from factory info - make-bbt - 2drop + bbt 0= if + \ If there is no existing bad block table, make one from factory info + make-bbt + then ( 'show-bad 'show-erased 'show-bbt ) + + bbt0 if bbt0 pages/eblock / over execute then + bbt1 if bbt1 pages/eblock / over execute then + drop ( 'show-bad 'show-erased ) + + usable-page-limit 0 ?do ( 'show-bad 'show-erased ) + i block-bad? if + i pages/eblock / 2 pick execute + else + i pages/eblock / over execute + i erase-block + then + pages/eblock +loop ( 'show-bad 'show-erased ) + 2drop exit ; \ Clear the device but honor the existing bad block table -: wipe ( -- ) ['] drop ['] .bn (wipe) ; +: wipe ( -- ) ['] drop ['] .bn ['] drop (wipe) ; : show-bbt ( -- ) get-bbt

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →