r849 - cpu/x86/pc cpu/x86/pc/olpc dev/geode/ac97

Author: wmb
Date: 2008-07-04 01:03:23 +0200 (Fri, 04 Jul 2008)
New Revision: 849

Modified:
   cpu/x86/pc/linux.fth
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/memtest.fth
   cpu/x86/pc/olpc/probemem.fth
   dev/geode/ac97/selftest.fth
Log:
Q2E10 - fixed audio and memory diagnostics

Modified: cpu/x86/pc/linux.fth
===================================================================
--- cpu/x86/pc/linux.fth	2008-07-03 22:29:21 UTC (rev 848)
+++ cpu/x86/pc/linux.fth	2008-07-03 23:03:23 UTC (rev 849)
@@ -179,7 +179,6 @@

0 value linux-loaded?

-[ifdef] virtual-mode
 : ?linux-elf-map-in  ( va size -- )
    \ The Linux startup code really wants the physical address to be
    \ virtual_address AND 0x0fff.ffff.  We recognize Linux by the virtual
@@ -196,7 +195,6 @@
    (elf-map-in)
 ;
 ' ?linux-elf-map-in is elf-map-in
-[then]

: init-bzimage?   ( -- flag )
    loaded                               ( adr len )

Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2008-07-03 22:29:21 UTC (rev 848)
+++ cpu/x86/pc/olpc/fw.bth	2008-07-03 23:03:23 UTC (rev 849)
@@ -184,10 +184,10 @@
 [ifdef] virtual-mode
 \ Depends on the assumption that physical memory is mapped 1:1 already
 : (elf-map-in) ( va size -- )  0 mem-claim  drop  ;
-' (elf-map-in) is elf-map-in
 [else]
-' 2drop is elf-map-in
+: (elf-map-in)  ( va size -- )  2drop  ;
 [then]
+' (elf-map-in) is elf-map-in
 [then]

\ Reboot and re-entry code

Modified: cpu/x86/pc/olpc/memtest.fth
===================================================================
--- cpu/x86/pc/olpc/memtest.fth	2008-07-03 22:29:21 UTC (rev 848)
+++ cpu/x86/pc/olpc/memtest.fth	2008-07-03 23:03:23 UTC (rev 849)
@@ -12,10 +12,8 @@
       unfreeze
    then

-[ifdef] ?linux-elf-map-in
    \ If it's not memtest, chain to the linux recognizer
    ?linux-elf-map-in
-[then]
 ;
 ' ?memtest-elf-map-in is elf-map-in

Modified: cpu/x86/pc/olpc/probemem.fth
===================================================================
--- cpu/x86/pc/olpc/probemem.fth	2008-07-03 22:29:21 UTC (rev 848)
+++ cpu/x86/pc/olpc/probemem.fth	2008-07-03 23:03:23 UTC (rev 849)
@@ -85,7 +85,9 @@
    begin  ?dup  while
       2 decode-ints swap		 ( rem$ chunk$ )
       2dup .chunk			 ( rem$ chunk$ )
+[ifdef] virtual-mode
       2dup over swap 3 mmu-map		 ( rem$ chunk$ )
+[then]
       memory-test-suite  if  2drop true exit  then	 ( rem$ )
    repeat  drop
    false

Modified: dev/geode/ac97/selftest.fth
===================================================================
--- dev/geode/ac97/selftest.fth	2008-07-03 22:29:21 UTC (rev 848)
+++ dev/geode/ac97/selftest.fth	2008-07-03 23:03:23 UTC (rev 849)
@@ -65,10 +65,10 @@
 ;

: tone  ( freq -- )
-   record-len la1+  alloc-mem to record-base
+   record-len la1+  " dma-alloc" $call-parent  to record-base
    make-tone
    d# -9 set-volume  play
-   record-base record-len la1+  free-mem
+   record-base record-len la1+  " dma-free" $call-parent
 ;

: copy-cycle  ( adr #copies -- adr' )
@@ -127,10 +127,10 @@
 : selftest  ( -- error? )
    open 0=  if  ." Failed to open /audio" cr true exit  then
    wav-test
-   record-len la1+  alloc-mem to record-base
+   record-len la1+  " dma-alloc" $call-parent to record-base
    sweep-test
    mic-test
-   record-base record-len la1+  free-mem
+   record-base record-len la1+  " dma-free" $call-parent
    close false
 ;