[openfirmware] [commit] r2457 - cpu/x86/pc/alex dev dev/olpc/touchpad ofw/gui

[repository service]

Author: wmb
Date: Wed Aug 10 02:57:09 2011
New Revision: 2457
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2457

Log:
Alex - more fit-and-finish improvements, mainly to handle screen dimension and mouse issues.

Modified:
   cpu/x86/pc/alex/fw.bth
   cpu/x86/pc/alex/mfgtest.fth
   dev/nulluart.fth
   dev/olpc/touchpad/syntpad.fth
   ofw/gui/iconmenu.fth

Modified: cpu/x86/pc/alex/fw.bth
==============================================================================
--- cpu/x86/pc/alex/fw.bth	Wed Aug 10 01:54:30 2011	(r2456)
+++ cpu/x86/pc/alex/fw.bth	Wed Aug 10 02:57:09 2011	(r2457)
@@ -197,6 +197,8 @@
 
 fload ${BP}/ofw/gui/bmptools.fth
 fload ${BP}/ofw/gui/loadmenu.fth
+d# 1280 d# 800 to max-xy
+patch noop set-menu-colors setup-graphics
 patch merge-rect-565 merge-rect merge-cursor  \ Hack since we do all our user-level graphics in 565
 patch merge-rect-565 merge-rect merge-cursor  \ Hack since we do all our user-level graphics in 565
 fload ${BP}/cpu/x86/pc/alex/mfgtest.fth
@@ -206,7 +208,10 @@
 : backlight-off  ( -- )  ;
 fload ${BP}/cpu/x86/pc/alex/disptest.fth
 fload ${BP}/cpu/x86/pc/alex/kbdtest.fth       \ Keyboard diagnostic
-fload ${BP}/dev/olpc/touchpad/touchpad.fth    \ Touchpad diagnostic
+dev /mouse
+fload ${BP}/dev/olpc/touchpad/syntpad.fth     \ Touchpad diagnostic
+base @ decimal patch 24 27 background base !
+dend
 fload ${BP}/cpu/x86/pc/alex/yuv2rgb.fth       \ YUV2 to RGB conversion
 fload ${BP}/cpu/x86/pc/alex/vstest.fth        \ Video stream test helpers
 
@@ -246,7 +251,7 @@
    " probe-" do-drop-in
    probe-pci
    report-pci-fb
-   silent-probe-usb
+\   silent-probe-usb
 ;
 
 \ This reduces processor use when waiting for a key.  It helps

Modified: cpu/x86/pc/alex/mfgtest.fth
==============================================================================
--- cpu/x86/pc/alex/mfgtest.fth	Wed Aug 10 01:54:30 2011	(r2456)
+++ cpu/x86/pc/alex/mfgtest.fth	Wed Aug 10 02:57:09 2011	(r2457)
@@ -203,6 +203,7 @@
 : leds-item     ( -- )  " /leds"      mfg-test-dev  ;
 
 : olpc-menu-items  ( -- )
+   silent-probe-usb
    clear-menu
 
    1 0 set-col-row

Modified: dev/nulluart.fth
==============================================================================
--- dev/nulluart.fth	Wed Aug 10 01:54:30 2011	(r2456)
+++ dev/nulluart.fth	Wed Aug 10 02:57:09 2011	(r2457)
@@ -3,17 +3,17 @@
 
 : inituarts  ( -- )  ;
 : ukey?  ( -- flag )  false  ;
-: uemit?  ( -- flag )  false  ;
+: uemit?  ( -- flag )  true  ;
 : uemit  ( char -- )  drop  ;
-: ukey  ( -- char )  drop  ;
+: ukey  ( -- char )  0  ;
 : ubreak?  ( -- flag )  false  ;
 : clear-break  ( -- )  ;
 
 : install-uart-io  ( -- )
    ['] lf-pstr          is newline-pstring
-   ['] false            is key?
-   ['] 0                is (key
-   ['] drop             is (emit
+   ['] ukey?            is key?
+   ['] ukey              is (key
+   ['] uemit             is (emit
    ['] default-type     is (type
    ['] emit1            is emit
    ['] type1            is type

Modified: dev/olpc/touchpad/syntpad.fth
==============================================================================
--- dev/olpc/touchpad/syntpad.fth	Wed Aug 10 01:54:30 2011	(r2456)
+++ dev/olpc/touchpad/syntpad.fth	Wed Aug 10 02:57:09 2011	(r2457)
@@ -166,6 +166,9 @@
    fill-rectangle-noff                      ( )
 ;
 
+: restore-bg  ( -- )
+   background  0 0  screen-w screen-h  fill-rectangle-noff
+;
 : background  ( -- )
    black  0 0  screen-w screen-h  fill-rectangle-noff
    final-test?  if
@@ -174,7 +177,7 @@
       draw-left-target
       draw-right-target
    else
-      0 d# 27 at-xy  ." Touchpad test.  Both buttons clears screen.  Type a key to exit" cr
+      0 d# 27 at-xy  ." Touchpad test.  Both buttons clears screen.  Type a key to exit"
    then
    mouse-xy dot
 ;
@@ -261,7 +264,7 @@
    then
    close
    cursor-on
-   page
+   restore-bg page
    final-test?  if  selftest-failed?  else  false  then
 ;
 

Modified: ofw/gui/iconmenu.fth
==============================================================================
--- ofw/gui/iconmenu.fth	Wed Aug 10 01:54:30 2011	(r2456)
+++ ofw/gui/iconmenu.fth	Wed Aug 10 02:57:09 2011	(r2457)
@@ -299,7 +299,7 @@
 : restore-scroller-white  ( -- )  0 f  (restore-scroller)  ;
 headers
 defer restore-scroller
-' restore-scroller-white to restore-scroller
+' restore-scroller-bg to restore-scroller
 
 defer do-title  ' noop to do-title
 headerless
@@ -532,7 +532,7 @@
 
    ['] root-menu ['] nest-menu catch drop
 
-   f			( color )
+   background		( color )
    0 0			( color x y )
    screen-wh		( color x y w y )
    fill-rectangle-noff	( )