by svn＠openfirmware.info
Author: wmb
Date: 2008-10-31 18:18:42 +0100 (Fri, 31 Oct 2008)
New Revision: 989
Modified:
cpu/x86/pc/neptune/addrs.fth
cpu/x86/pc/neptune/config.fth
Log:
Neptune - fixed a problem in the DMA range configuration that was causing fragmentation of the available list.
Modified: cpu/x86/pc/neptune/addrs.fth
===================================================================
--- cpu/x86/pc/neptune/addrs.fth 2008-10-27 23:37:02 UTC (rev 988)
+++ cpu/x86/pc/neptune/addrs.fth 2008-10-31 17:18:42 UTC (rev 989)
@@ -37,10 +37,8 @@
h# 18.0000 constant heap-size
-h# 300.0000 constant jffs2-dirent-base
-h# 500.0000 constant jffs2-inode-base
-h# 700.0000 constant dma-base
-h# 900.0000 constant dma-size
+h# 800.0000 constant dma-base
+h# 7800.0000 constant dma-size
h# f.0000 constant suspend-base \ In the DOS hole
h# f.0008 constant resume-entry
Modified: cpu/x86/pc/neptune/config.fth
===================================================================
--- cpu/x86/pc/neptune/config.fth 2008-10-27 23:37:02 UTC (rev 988)
+++ cpu/x86/pc/neptune/config.fth 2008-10-31 17:18:42 UTC (rev 989)
@@ -30,7 +30,7 @@
create serial-console \ Define to default to serial port for console
create pc
create linux-support
-create jffs2-support
+\ create jffs2-support
create use-elf
create lx-pll-autoconfig \ enable pll autoconfiguration from bootstrap pin
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-28 00:37:02 +0100 (Tue, 28 Oct 2008)
New Revision: 988
Modified:
clients/lib/lib.c
ofw/core/filecmds.fth
Log:
OLPC trac 8897 - EMACS was leaving cruft at the end of files.
Modified: clients/lib/lib.c
===================================================================
--- clients/lib/lib.c 2008-10-25 00:54:23 UTC (rev 987)
+++ clients/lib/lib.c 2008-10-27 23:37:02 UTC (rev 988)
@@ -105,10 +105,13 @@
if (fp == (FILE *)NULL)
return ((FILE *)NULL);
+ if (mode[0] == 'w') {
+ if ((fp->id = OFCreate(name)) == 0)
+ return ((FILE *)NULL);
+ goto good;
+ }
+
if ((fp->id = OFOpen(name)) == 0) {
- if (mode[0] == 'w' && ((fp->id = OFCreate(name)) != 0))
- goto good;
-
return ((FILE *)NULL);
}
Modified: ofw/core/filecmds.fth
===================================================================
--- ofw/core/filecmds.fth 2008-10-25 00:54:23 UTC (rev 987)
+++ ofw/core/filecmds.fth 2008-10-27 23:37:02 UTC (rev 988)
@@ -527,7 +527,18 @@
dev /client-services
: firmworks,create ( cstr -- ihandle )
- cscount ['] $create-file catch if 2drop 0 then
+ cscount ( path$ )
+
+ \ If the file already exists, delete it so it can be
+ \ recreated with 0 initial length.
+ 2dup ['] $open-file catch if ( path$ x x )
+ 2drop ( path$ )
+ else ( path$ ih )
+ close-dev ( path$ )
+ 2dup ['] $delete catch if 2drop then ( path$ )
+ then ( path$ )
+
+ ['] $create-file catch if 2drop 0 then
;
device-end
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-25 02:54:23 +0200 (Sat, 25 Oct 2008)
New Revision: 987
Modified:
cpu/x86/pc/olpc/versions.fth
Log:
Q2E20 (Q2e19f is functionally equivalent)
Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth 2008-10-13 07:34:25 UTC (rev 986)
+++ cpu/x86/pc/olpc/versions.fth 2008-10-25 00:54:23 UTC (rev 987)
@@ -2,7 +2,7 @@
\ The overall firmware revision
macro: FW_MAJOR E
-macro: FW_MINOR 19b
+macro: FW_MINOR 20
\ The EC microcode
macro: EC_VERSION e18c
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-13 09:34:25 +0200 (Mon, 13 Oct 2008)
New Revision: 986
Modified:
cpu/x86/pc/olpc/memtest.fth
Log:
OLPC trac 8818 - fixed spurious memtest error reports by turning off USB when running memtest.
Modified: cpu/x86/pc/olpc/memtest.fth
===================================================================
--- cpu/x86/pc/olpc/memtest.fth 2008-10-11 07:40:05 UTC (rev 985)
+++ cpu/x86/pc/olpc/memtest.fth 2008-10-13 07:34:25 UTC (rev 986)
@@ -10,6 +10,7 @@
h# 910 config-l@ dup 100.0000 -1 mmu-map
[then]
unfreeze
+ usb-quiet
then
\ If it's not memtest, chain to the linux recognizer
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-11 09:40:05 +0200 (Sat, 11 Oct 2008)
New Revision: 985
Modified:
cpu/x86/pc/linux.fth
Log:
OLPC trac 8811 - fix booting Linux with no ramdisk.
Modified: cpu/x86/pc/linux.fth
===================================================================
--- cpu/x86/pc/linux.fth 2008-10-07 18:57:03 UTC (rev 984)
+++ cpu/x86/pc/linux.fth 2008-10-11 07:40:05 UTC (rev 985)
@@ -258,6 +258,7 @@
init-program
linux-loaded? if
claim-params
+ memory-limit to linux-memtop \ load-ramdisk may change this
['] load-ramdisk guarded
linux-fixup
then
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-07 20:57:03 +0200 (Tue, 07 Oct 2008)
New Revision: 984
Added:
cpu/x86/pc/biosload/build/.gitignore
Modified:
cpu/x86/pc/olpc/fsupdate.fth
dev/olpc/touchpad/touchpad.fth
Log:
OLPC trac 8785 - fixed NAND partition creation bug that was introduced
by the addition of LBA-NAND support to the cafenand driver.
Added: cpu/x86/pc/biosload/build/.gitignore
===================================================================
--- cpu/x86/pc/biosload/build/.gitignore (rev 0)
+++ cpu/x86/pc/biosload/build/.gitignore 2008-10-07 18:57:03 UTC (rev 984)
@@ -0,0 +1 @@
+/build
Modified: cpu/x86/pc/olpc/fsupdate.fth
===================================================================
--- cpu/x86/pc/olpc/fsupdate.fth 2008-10-05 20:00:08 UTC (rev 983)
+++ cpu/x86/pc/olpc/fsupdate.fth 2008-10-07 18:57:03 UTC (rev 984)
@@ -49,7 +49,7 @@
;
: write-partition-map ( -- )
partition-map-offset /nand-page / dup " erase-block" $call-nand
- load-base swap nand-pages/block " write-blocks" $call-nand
+ load-base swap nand-pages/block " write-pages" $call-nand
nand-pages/block <> abort" Can't write partition map"
" read-partmap" $call-nand
;
Modified: dev/olpc/touchpad/touchpad.fth
===================================================================
--- dev/olpc/touchpad/touchpad.fth 2008-10-05 20:00:08 UTC (rev 983)
+++ dev/olpc/touchpad/touchpad.fth 2008-10-07 18:57:03 UTC (rev 984)
@@ -444,6 +444,7 @@
until
close
+ cursor-on
page
0
;
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-05 22:00:08 +0200 (Sun, 05 Oct 2008)
New Revision: 983
Modified:
cpu/x86/pc/olpc/versions.fth
Log:
Q2E19b
Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth 2008-10-05 20:00:04 UTC (rev 982)
+++ cpu/x86/pc/olpc/versions.fth 2008-10-05 20:00:08 UTC (rev 983)
@@ -2,7 +2,7 @@
\ The overall firmware revision
macro: FW_MAJOR E
-macro: FW_MINOR 19a
+macro: FW_MINOR 19b
\ The EC microcode
macro: EC_VERSION e18c
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-05 22:00:04 +0200 (Sun, 05 Oct 2008)
New Revision: 982
Modified:
forth/lib/rstrace.fth
Log:
Ftrace - fix ftrace brokenness resulting from a recent improvement to
the rstrace return stack display decoding.
Modified: forth/lib/rstrace.fth
===================================================================
--- forth/lib/rstrace.fth 2008-10-05 20:00:00 UTC (rev 981)
+++ forth/lib/rstrace.fth 2008-10-05 20:00:04 UTC (rev 982)
@@ -43,7 +43,16 @@
then ( rs-adr n )
9 u.r
;
-: .traceline ( rs-adr -- rs-adr' )
+: .traceline ( ipaddr -- )
+ push-hex
+ dup reasonable-ip?
+ if dup .last-executed ip>token .caller else 9 u.r then cr
+ pop-base
+;
+\ Heuristic display of return stack items, recognizing Forth word nesting,
+\ catch frames, and do loop frames.
+\ For later: It would also be nice to recognize input stream nesting frames.
+: rtraceline ( rs-adr -- rs-adr' )
push-hex ( rs-adr )
@+ ( rs-adr' ip )
dup reasonable-ip? if ( rs-adr ip )
@@ -59,7 +68,7 @@
;
: (rstrace ( end-adr start-adr -- )
begin 2dup u> while ( end-adr adr )
- .traceline ( end-adr adr' )
+ rtraceline ( end-adr adr' )
exit? if 2drop exit then ( end-adr adr )
repeat ( end-adr adr )
2drop
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-05 22:00:00 +0200 (Sun, 05 Oct 2008)
New Revision: 981
Modified:
dev/olpc/touchpad/touchpad.fth
Log:
OLPC trac 8451 - Handle "test /mouse" issues raised by comment 9 of that ticket.
Mostly cosmetic, but also slightly more robust handling of protocol botches.
Modified: dev/olpc/touchpad/touchpad.fth
===================================================================
--- dev/olpc/touchpad/touchpad.fth 2008-10-05 09:37:37 UTC (rev 980)
+++ dev/olpc/touchpad/touchpad.fth 2008-10-05 20:00:00 UTC (rev 981)
@@ -271,8 +271,8 @@
endof
( default )
\ If the high bit is set it means it's the first byte
- \ of a packet. Abort if we don't recognize the type.
- dup h# 80 and abort" Touchpad protocol botch"
+ \ of a packet. Complain if we don't recognize the type.
+ dup h# 80 and if ." Protocol botch" then
\ If the high bit is not set, we have missed a start of packet
miss? @ 0= if ." miss " then
@@ -417,6 +417,9 @@
cursor-off track-init start
+ \ Consume already-queued keys to prevent premature exit
+ begin key? while key drop repeat
+
background
gs-only
begin
@@ -441,6 +444,7 @@
until
close
+ page
0
;
by svn＠openfirmware.info
Author: wmb
Date: 2008-10-05 11:37:37 +0200 (Sun, 05 Oct 2008)
New Revision: 980
Modified:
cpu/x86/pc/olpc/versions.fth
Log:
Q2E19a
Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth 2008-10-05 09:37:32 UTC (rev 979)
+++ cpu/x86/pc/olpc/versions.fth 2008-10-05 09:37:37 UTC (rev 980)
@@ -2,7 +2,7 @@
\ The overall firmware revision
macro: FW_MAJOR E
-macro: FW_MINOR 19
+macro: FW_MINOR 19a
\ The EC microcode
macro: EC_VERSION e18c
