OpenBIOS May 2007

openbios@openbios.org

5 participants
108 discussions

r147 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 17 May '07

17 May '07

Author: blueswirl Date: 2007-05-17 21:16:06 +0200 (Thu, 17 May 2007) New Revision: 147 Modified: openbios-devel/arch/sparc32/tree.fs openbios-devel/drivers/esp.c openbios-devel/drivers/obio.c openbios-devel/drivers/sbus.c Log: NetBSD and OpenBSD fixes: - Correct timer and interrupt controller mappings - Add ESP clock frequency to avoid division by zero - CS4231 exists only in SS5 - Disable BPP for now, it's not emulated by Qemu anyway With these fixes, one NetBSD kernel even got to root device prompt on SS5. Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2007-05-17 19:07:21 UTC (rev 146) +++ openbios-devel/arch/sparc32/tree.fs 2007-05-17 19:16:06 UTC (rev 147) @@ -56,22 +56,14 @@ : decode-unit decode-unit-sbus ; finish-device +[IFDEF] CONFIG_BPP " /iommu/sbus" find-device new-device - " SUNW,CS4231" device-name - " serial" device-type - 5 encode-int 0 encode-int encode+ " intr" property - 5 encode-int " interrupts" property - h# 3 encode-int h# 0c000000 encode-int encode+ h# 00000040 encode-int encode+ " reg" property - " audio" encode-string " alias" property -finish-device - -" /iommu/sbus" find-device -new-device " SUNW,bpp" device-name h# 4 encode-int h# 0c800000 encode-int encode+ h# 0000001c encode-int encode+ " reg" property h# 33 encode-int 0 encode-int encode+ " intr" property finish-device +[THEN] " /iommu/sbus" find-device new-device Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2007-05-17 19:07:21 UTC (rev 146) +++ openbios-devel/drivers/esp.c 2007-05-17 19:16:06 UTC (rev 147) @@ -491,6 +491,11 @@ push_str("reg"); fword("property"); + PUSH(0x02625a00); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + for (id = 0; id < 8; id++) { if (!esp->sd[id].present) continue; Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-05-17 19:07:21 UTC (rev 146) +++ openbios-devel/drivers/obio.c 2007-05-17 19:16:06 UTC (rev 147) @@ -859,8 +859,15 @@ regs->l10_timer_limit = (((1000000/100) + 1) << 10); regs->cpu_timers[0].l14_timer_limit = 0; - PUSH((unsigned long)regs); + for (i = 0; i < SUN4M_NCPU; i++) { + PUSH((unsigned long)&regs->cpu_timers[i]); + fword("encode-int"); + if (i != 0) + fword("encode+"); + } + PUSH((unsigned long)&regs->l10_timer_limit); fword("encode-int"); + fword("encode+"); push_str("address"); fword("property"); @@ -905,11 +912,14 @@ intregs->set = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; - // Is this correct? It works for NetBSD at least - PUSH((int)intregs); + for (i = 0; i < SUN4M_NCPU; i++) { + PUSH((unsigned long)&intregs->cpu_intregs[i]); + fword("encode-int"); + if (i != 0) + fword("encode+"); + } + PUSH((unsigned long)&intregs->tbt); fword("encode-int"); - PUSH((int)intregs); - fword("encode-int"); fword("encode+"); push_str("address"); fword("property"); Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2007-05-17 19:07:21 UTC (rev 146) +++ openbios-devel/drivers/sbus.c 2007-05-17 19:16:06 UTC (rev 147) @@ -22,6 +22,8 @@ #define SBUS_SLOTS 16 #define POWER_REGS 0x10 #define POWER_OFFSET 0x0a000000 +#define CS4231_REGS 0x40 +#define CS4231_OFFSET 0x0c000000 static void ob_sbus_node_init(unsigned long bus, unsigned long base) @@ -297,6 +299,51 @@ } static void +ob_cs4231_init(unsigned int slot, unsigned long base) +{ + push_str("/iommu/sbus"); + fword("find-device"); + fword("new-device"); + + push_str("SUNW,CS4231"); + fword("device-name"); + + push_str("serial"); + fword("device-type"); + + PUSH(slot); + fword("encode-int"); + PUSH(CS4231_OFFSET); + fword("encode-int"); + fword("encode+"); + PUSH(CS4231_REGS); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + PUSH(5); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + push_str("intr"); + fword("property"); + + PUSH(5); + fword("encode-int"); + push_str("interrupts"); + fword("property"); + + push_str("audio"); + fword("encode-string"); + push_str("alias"); + fword("property"); + + fword("finish-device"); +} + +static void ob_macio_init(unsigned int slot, unsigned long base, unsigned long offset) { // All devices were integrated to NCR89C100, see @@ -327,7 +374,7 @@ ob_tcx_init(slot, base); break; case 4: // SUNW,CS4231 - //ob_cs4231_init(slot, base); + ob_cs4231_init(slot, base); break; case 5: // MACIO: le, esp, bpp, power-management ob_macio_init(slot, base, 0x08000000);

1 0

r146 - openbios-devel/drivers
by svn＠openbios.org 17 May '07

17 May '07

Author: blueswirl Date: 2007-05-17 21:07:21 +0200 (Thu, 17 May 2007) New Revision: 146 Modified: openbios-devel/drivers/iommu.c Log: Fix overallocation Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2007-05-07 20:02:01 UTC (rev 145) +++ openbios-devel/drivers/iommu.c 2007-05-17 19:07:21 UTC (rev 146) @@ -194,7 +194,7 @@ unsigned int mva; off = pa & (PAGE_SIZE - 1); - npages = (off + size + (PAGE_SIZE - 1)) / PAGE_SIZE; + npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; pa &= ~(PAGE_SIZE - 1); va = mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE);

1 0

r395 - cpu/x86/pc/olpc
by svn＠openbios.org 17 May '07

17 May '07

Author: wmb Date: 2007-05-17 05:58:44 +0200 (Thu, 17 May 2007) New Revision: 395 Modified: cpu/x86/pc/olpc/resume.bth Log: OLPC resume - Turn on flat panel drivers in early resume, using newly-discovered fast method. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-05-17 03:57:49 UTC (rev 394) +++ cpu/x86/pc/olpc/resume.bth 2007-05-17 03:58:44 UTC (rev 395) @@ -409,6 +409,12 @@ \ Unfreeze image by setting the DCONLOAD bit (0x800) in the GPIO output register h# 0800 h# 1000 port-wl +[else] + \ Turn on the flat panel power as soon as possible + \ The 400.0000 bit make the panel power-up timers use the 14 MHz clock + \ instead of the 32 kHz clock. That is supposed to be only for simulation, + \ but we have DCON between the CPU and the panel, so we don't need delays. + h# 500.0000 # vp-pa h# 410 + #) mov [then] \ 0 h# 1842 pw! \ Disable power button during early startup

1 0

r394 - dev/geode/ac97
by svn＠openbios.org 17 May '07

17 May '07

Author: wmb Date: 2007-05-17 05:57:49 +0200 (Thu, 17 May 2007) New Revision: 394 Modified: dev/geode/ac97/ac97.bth dev/geode/ac97/ac97.fth dev/geode/ac97/selftest.fth Log: ac97 - cleaned up selftest and added a "tone ( freq -- )" method to generate tones of specific frequencies. Modified: dev/geode/ac97/ac97.bth =================================================================== --- dev/geode/ac97/ac97.bth 2007-05-17 01:16:03 UTC (rev 393) +++ dev/geode/ac97/ac97.bth 2007-05-17 03:57:49 UTC (rev 394) @@ -9,6 +9,7 @@ FCode-version2 fload ${BP}/dev/geode/ac97/ac97.fth +fload ${BP}/forth/lib/isin.fth fload ${BP}/dev/geode/ac97/selftest.fth end0 Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-05-17 01:16:03 UTC (rev 393) +++ dev/geode/ac97/ac97.fth 2007-05-17 03:57:49 UTC (rev 394) @@ -239,8 +239,8 @@ 0 set-master-volume \ 0 set-mono-volume h# 0f0f set-headphone-volume - h# 808 set-pcm-gain \ enable line-out - h# 808 h# 38 codec! \ enable surround out (headphones) + h# 606 set-pcm-gain \ enable line-out + h# 606 h# 38 codec! \ enable surround out (headphones) h# 000 h# 76 codec! \ Route mixer out to headphones ; : close-out ( -- ) Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2007-05-17 01:16:03 UTC (rev 393) +++ dev/geode/ac97/selftest.fth 2007-05-17 03:57:49 UTC (rev 394) @@ -23,7 +23,7 @@ record-base record-len audio-in drop ; -h# 0 value plevel +h# 606 value plevel \ -9 dB, highest gain without digital clipping : set-plevel ( db -- ) dup 0> if drop 0 then negate 1+ 2* 3 / dup bwjoin to plevel @@ -40,77 +40,6 @@ record-base record-len audio-out drop write-done ; -[ifdef] notdef -create sin-half -d# 0 w, -d# 3212 w, -d# 6393 w, -d# 9512 w, -d# 12539 w, -d# 15446 w, -d# 18204 w, -d# 20787 w, -d# 23170 w, -d# 25329 w, -d# 27245 w, -d# 28898 w, -d# 30273 w, -d# 31356 w, -d# 32137 w, -d# 32609 w, -d# 32767 w, -d# 32609 w, -d# 32137 w, -d# 31356 w, -d# 30273 w, -d# 28898 w, -d# 27245 w, -d# 25329 w, -d# 23170 w, -d# 20787 w, -d# 18204 w, -d# 15446 w, -d# 12539 w, -d# 9512 w, -d# 6393 w, -d# 3212 w, - - - -0 value wave -: wave++ ( -- wave ) - wave h# 800 + dup h# 7fff and 0= if negate then dup to wave -; -: cycle ( adr -- adr' ) - d# 32 0 do ( adr ) - sin-half i wa+ w@ over w! ( adr value ) - la1+ ( adr' ) - loop ( adr ) - d# 32 0 do ( adr ) - sin-half i wa+ w@ negate over w! ( adr value ) - la1+ ( adr' ) - loop ( adr' ) -; - -: make-wave ( -- ) - \ Start with everything quiet - record-base record-len erase - - \ Add a sine wave to the left channel for the first half of the time - record-base record-len 2/ bounds ( endadr startadr ) - begin 2dup u> while cycle repeat ( endadr startadr ) - 2drop - - \ Add a sine wave to the right channel for the last half of the time - record-base record-len bounds ( endadr startadr ) - record-len 2/ + wa1+ - begin 2dup u> while cycle repeat ( endadr startadr ) - 2drop -; -[then] - -fload ${BP}/forth/lib/isin.fth - d# 500 value tone-freq : /cycle ( -- #bytes ) #cycle /l* ; @@ -127,13 +56,12 @@ /cycle + ; -: make-tone-wave ( -- ) +: make-tone ( freq -- ) + sample-rate to fs ( freq ) set-freq + \ Start with everything quiet record-base record-len erase - sample-rate to fs - tone-freq set-freq - record-base make-cycle drop \ Copy the wave template into the left channel @@ -147,6 +75,13 @@ /cycle +loop ; +: tone ( freq -- ) + record-len la1+ alloc-mem to record-base + make-tone + d# -9 set-glevel play + record-base record-len la1+ free-mem +; + : copy-cycle ( adr #copies -- adr' ) 1 ?do ( adr ) dup /cycle - over ( adr adr- adr ) @@ -155,7 +90,7 @@ loop ( adr' ) ; -: make-wave ( -- ) +: make-sweep ( -- ) \ Start with everything quiet record-base record-len erase @@ -169,6 +104,7 @@ -1 +loop drop +\ record-base record-base record-len 2/ + wa1+ record-len 2/ /w - move \ Copy the left channel into the right channel in reverse order record-base record-len /w - bounds ( end start ) begin 2dup u> while ( end start ) @@ -181,43 +117,29 @@ : selftest-args ( -- arg$ ) my-args ascii : left-parse-string 2drop ; -: ?play-wav-file ( -- ) +: wav-test ( -- ) selftest-args dup 0= if 2drop exit then " $play-wav-loop" $find 0= if 2drop else catch drop then ; -d# -8 value wav-plevel -d# -12 value wav-glevel -: wav-test ( -- ) - wav-plevel set-plevel wav-glevel set-glevel - ?play-wav-file +: sweep-test ( -- ) + ." Playing sweep" cr + make-sweep + d# -9 set-glevel play ; -d# -8 value tone-plevel -d# -12 value tone-glevel - -: tone-test ( -- ) - ." Playing tone" cr - \ Onset of clipping in the P domain is -7 - tone-plevel set-plevel tone-glevel set-glevel - make-wave play -; - -d# -8 value rec-plevel -d# -3 value rec-glevel : mic-test ( -- ) ." Recording ..." cr - rec-plevel set-plevel rec-glevel set-glevel record ." Playing ..." cr - play + d# -3 set-glevel play ; : selftest ( -- error? ) open 0= if ." Failed to open /audio" cr true exit then wav-test record-len la1+ alloc-mem to record-base - tone-test + sweep-test mic-test record-base record-len la1+ free-mem close false

1 0

r393 - forth/lib
by svn＠openbios.org 17 May '07

17 May '07

Author: wmb Date: 2007-05-17 03:16:03 +0200 (Thu, 17 May 2007) New Revision: 393 Modified: forth/lib/isin.fth Log: isin.fth - changed "max" to "min" because the attempt to prevent numerical overflow was causing sin waves to become square waves. Modified: forth/lib/isin.fth =================================================================== --- forth/lib/isin.fth 2007-05-17 01:04:15 UTC (rev 392) +++ forth/lib/isin.fth 2007-05-17 01:16:03 UTC (rev 393) @@ -47,7 +47,7 @@ : isin ( index -- frac ) fstep * fs 2/ / to x x dup times to xsq - one d# 72 sin-step d# 42 sin-step d# 20 sin-step 6 sin-step x times one max + one d# 72 sin-step d# 42 sin-step d# 20 sin-step 6 sin-step x times one min ; : one-cycle ( adr -- )

1 0

r392 - cpu/x86/pc/olpc
by svn＠openbios.org 17 May '07

17 May '07

Author: wmb Date: 2007-05-17 03:04:15 +0200 (Thu, 17 May 2007) New Revision: 392 Added: cpu/x86/pc/olpc/mfgtree.fth Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/mfgdata.fth Log: OLPC trac 1493 - added all manufacturing data tags to the device tree, as properties of the new "/mfg-data" node. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-16 10:07:06 UTC (rev 391) +++ cpu/x86/pc/olpc/devices.fth 2007-05-17 01:04:15 UTC (rev 392) @@ -280,6 +280,7 @@ ; fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data +fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree fload ${BP}/cpu/x86/pc/olpc/kbdtype.fth \ Export keyboard type fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming Modified: cpu/x86/pc/olpc/mfgdata.fth =================================================================== --- cpu/x86/pc/olpc/mfgdata.fth 2007-05-16 10:07:06 UTC (rev 391) +++ cpu/x86/pc/olpc/mfgdata.fth 2007-05-17 01:04:15 UTC (rev 392) @@ -1,4 +1,5 @@ purpose: Manufacturing data reader +\ See license at end of file \ The manufacturing data format is specified by \ http://wiki.laptop.org/go/Manufacturing_Data @@ -80,3 +81,27 @@ here 4 2r> + write-spi-flash ( ) ; [then] + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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 Added: cpu/x86/pc/olpc/mfgtree.fth =================================================================== --- cpu/x86/pc/olpc/mfgtree.fth (rev 0) +++ cpu/x86/pc/olpc/mfgtree.fth 2007-05-17 01:04:15 UTC (rev 392) @@ -0,0 +1,40 @@ +purpose: Export manufacturing data via the device tree +\ See license at end of file + +0 0 " " " /" begin-package + " mfg-data" device-name +end-package + +stand-init: Manufacturing data + " /mfg-data" find-device + mfg-data-top ( adr ) + begin another-tag? while ( adr' data$ tname-adr ) + >r encode-bytes r> 2 property ( adr ) + repeat ( adr ) + drop + device-end +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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

r391 - cpu/x86/pc/olpc
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 12:07:06 +0200 (Wed, 16 May 2007) New Revision: 391 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/versions.fth Log: Q2C12 - Backed out game key changes again, but kept the other stuff since C11. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-16 09:22:10 UTC (rev 390) +++ cpu/x86/pc/olpc/fw.bth 2007-05-16 10:07:06 UTC (rev 391) @@ -436,6 +436,7 @@ : user-switch? ( -- flag ) [ifdef] lx-devel false exit [then] atest? if true exit then +true exit game-key@ 0<> dup if ." Release the game key to continue" cr begin d# 100 ms game-key@ 0= until Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-05-16 09:22:10 UTC (rev 390) +++ cpu/x86/pc/olpc/versions.fth 2007-05-16 10:07:06 UTC (rev 391) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 11 +macro: FW_MINOR 12 \ The EC microcode macro: EC_VERSION c11 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp ~/pqc10t.bin ec.img +\ macro: GET_EC cp ./c11t-1.bin ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1

1 0

r390 - ofw/fs/jffs2
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 11:22:10 +0200 (Wed, 16 May 2007) New Revision: 390 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - Removed some unnecessary verbosity, and added some commented-out debugging code. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-16 09:05:57 UTC (rev 389) +++ ofw/fs/jffs2/jffs2.fth 2007-05-16 09:22:10 UTC (rev 390) @@ -262,8 +262,8 @@ dup w@ case ( len adr case: type ) inode-type of scan-sum-inode endof dirent-type of scan-sum-dirent endof - xattr-type of drop d# 18 ." XA" cr endof - xref-type of drop 6 ." R" cr endof + xattr-type of drop d# 18 ( ." XA" cr ) endof + xref-type of drop 6 ( ." R" cr ) endof h# ffff of drop dup ( find-nonblank ) endof \ Keep scanning to end ." Unrecognized summary node type " dup .x cr abort endcase @@ -427,6 +427,80 @@ pages/eblock +loop ; +0 [if] +/eblock value summary-start + +: .eb ( -- ) + the-eblock# .xxx +; + +: xanother-node? ( adr -- false | adr' true ) + eb-end swap ?do + i w@ jffs2-magic = if + i header-crc? if + i +raw-node eb-end u<= if + i true unloop exit + then + then + then + loop + false +; +: .offset ( adr -- ) ." offset " block-buf - . ." in " .eb ; + +: check-node-data ( adr -- ) +; +Mitch_Bradley: the most common type of 'bad node'will have a mismatching data crc. And the node will end in 0xff 0xff 0xff .... when it wasn't intended to. Because of an interrupted write. +[22:52] <dwmw2_gone> those ones are almost certainly harmless + +> Mitch_Bradley: it should also always be true that there is no range of a file _not_ covered by a data node +[22:54] <dwmw2_gone> even if it's just a "hole" node -- with JFFS2_COMPR_ZERO. +[22:54] <Mitch_Bradley> oh, that's useful +[22:54] <dwmw2_gone> I had to add those 'hole' nodes to deal with truncation and then later writes past the (new) end of the file + +: check-node ( adr -- len ) + dup w@ jffs2-magic = if ( adr ) + dup header-crc? if ( adr ) + dup +raw-node ( adr adr' ) + over - swap ( len adr ) + check-node-data ( len ) + else + ." Bad header CRC at " .offset + /eblock ( len ) + then ( len ) + else ( adr ) + check-em + then +; + +: check-nodes ( -- ) + block-buf summary-start erased? if exit then + block-buf summary-start bounds ?do i check-node +loop +; + +: check-summary ( -- ) + /eblock to summary-start + + \ Check magic number + block-buf /page + -1 j@ h# 02851885 <> if exit then + + block-buf /eblock + -2 j@ to summary-start + + block-buf summary-start + bad-summary? if + ." Bad summary CRC for " .eb exit + then +; + +: check-blocks ( -- ) + pages/chip 0 do + i page>eblock to the-eblock# + the-eblock# read-eblock + check-summary + check-nodes + pages/eblock +loop +; +[then] + : place-node ( node where -- ) ! next-minode na1+ to next-minode ( ) @@ -929,8 +1003,12 @@ 0 to seek-ptr ( ) - set-sizes allocate-buffers scan-occupied ( ) + set-sizes allocate-buffers ( ) +\ my-args " :check" $= if check-blocks true exit then + + scan-occupied ( ) + \ This is the value we will use for file-buf if we use read and seek next-inode to file-buf

1 0

r389 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 11:05:57 +0200 (Wed, 16 May 2007) New Revision: 389 Modified: cpu/x86/pc/olpc/devices.fth dev/olpc/kb3700/ecio.fth Log: OLPC - in the EC, turn off auto-SCI-generation for port 66, thus squelching a flood of SCIs. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-16 08:54:20 UTC (rev 388) +++ cpu/x86/pc/olpc/devices.fth 2007-05-16 09:05:57 UTC (rev 389) @@ -253,6 +253,10 @@ to board-revision ; +stand-init: Quiet SCI + sci-quiet +; + stand-init: Wireless reset [ifdef] lx-devel exit [then] Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-16 08:54:20 UTC (rev 388) +++ dev/olpc/kb3700/ecio.fth 2007-05-16 09:05:57 UTC (rev 389) @@ -149,6 +149,10 @@ : snoop-board-id@ ( -- id ) h# fa20 ec@ ; +\ This makes the EC stop generating a flood of SCIs every time you do +\ the port 66 command sequence. +: sci-quiet ( -- ) h# 50 h# ff03 ec! ; + \ While accessing the SPI FLASH, we have to turn off the keyboard controller, \ because it continuously fetches from the SPI FLASH when it's on. That \ interferes with our accesses.

1 0

r388 - dev/olpc/cafecamera
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 10:54:20 +0200 (Wed, 16 May 2007) New Revision: 388 Modified: dev/olpc/cafecamera/cafecamera.fth Log: OLPC CaFe camera - turn off sensor power when not in use. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-05-16 08:52:09 UTC (rev 387) +++ dev/olpc/cafecamera/cafecamera.fth 2007-05-16 08:54:20 UTC (rev 388) @@ -408,12 +408,18 @@ 40 dup cl@ 1000.0000 invert and swap cl! \ power up 30 b4 cl! \ power up, reset 1 ms - 31 b4 cl! + 31 b4 cl! \ release reset 1 ms ; : power-off ( -- ) - 0 3038 cl! \ Turn off CaFe GPIO3 to disable power + 30 b4 cl! \ assert Cam_Reset + 1 ms + 32 b4 cl! \ assert Cam_Reset and Cam_PWRDN + 1 ms + 0008.0000 315c cl! \ Remove VDD + 5 ms + 40 dup cl@ 1000.0000 or swap cl! \ power off ; : init ( -- ) (init)

1 0

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