Changeset 3060

Timestamp:

Jul 12, 2012 11:02:13 PM (11 months ago)

Author:

wmb

Message:

OLPC ARM - split previously-ifdef'ed testitems.fth file into per-platform non-ifdef'ed versions.

Location:

cpu/arm/olpc

Files:

• 1.75/fw.bth (modified) (1 diff)
• 1.75/testitems.fth (modified) (6 diffs)
• 3.0/fw.bth (modified) (1 diff)
• 3.0/testitems.fth (added)
• build-fw.fth (modified) (1 diff)
• cl4/fw.bth (modified) (1 diff)
• cl4/testitems.fth (added)

cpu/arm/olpc/1.75/fw.bth

@@ -40 +40 @@
 fload ${BP}/cpu/arm/olpc/1.75/switches.fth
 fload ${BP}/cpu/arm/olpc/1.75/leds.fth
+fload ${BP}/cpu/arm/olpc/1.75/testitems.fth
 fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth
 fload ${BP}/cpu/arm/olpc/gpio-gamekeys.fth

cpu/arm/olpc/1.75/testitems.fth

@@ -13 +13 @@
 icon: wifi.icon     rom:wifi.565
 icon: audio.icon    rom:audio.565
-\- olpc-cl3 icon: touchpad.icon rom:touchpad.565
-\+ olpc-cl3 icon: touchscreen.icon rom:touchpad.565
+icon: touchpad.icon rom:touchpad.565
 icon: display.icon  rom:display.565
-\- olpc-cl3 icon: keyboard.icon rom:keyboard.565
+icon: keyboard.icon rom:keyboard.565
 icon: timer.icon    rom:timer.565
 icon: clock.icon    rom:clock.565
@@ -22 +21 @@
 icon: leds.icon     rom:leds.565
 
-\+ olpc-cl3  : screen-kbd-scroller  ( -- )  blank-screen  open-screen-keyboard  ;
-\+ olpc-cl3  ' screen-kbd-scroller to scroller-on
-\+ olpc-cl3  ' close-screen-keyboard to scroller-off
 
 : cpu-item      ( -- )  " /cpu"       mfg-test-dev  ;
@@ -30 +26 @@
 : spiflash-item ( -- )  " /flash"     mfg-test-dev  ;
 : memory-item   ( -- )  " /memory"    mfg-test-dev  ;
-\+ olpc-cl2  : usb-item   ( -- )  " /usb/hub"   mfg-test-dev  ;
-\+ olpc-cl3  : otg-item   ( -- )  " otg"        mfg-test-dev  ;
-\+ olpc-cl3  : usb-item   ( -- )  " usba"       mfg-test-dev  ;
+: usb-item   ( -- )  " /usb/hub"   mfg-test-dev  ;
 : int-sd-item   ( -- )  " int:0"      mfg-test-dev  ;
-\- olpc-cl3 : ext-sd-item   ( -- )  " ext:0"      mfg-test-dev  ;
+: ext-sd-item   ( -- )  " ext:0"      mfg-test-dev  ;
 : rtc-item      ( -- )  " /rtc"       mfg-test-dev  ;
 : display-item  ( -- )  " /display"   gfx-test-dev  ;
@@ -41 +35 @@
 : wlan-item     ( -- )  " /wlan"      mfg-test-dev  ;
 : timer-item    ( -- )  " /timer"     mfg-test-dev  ;
-\- olpc-cl3 : touchpad-item ( -- )  " mouse"  mfg-test-dev  ;
-\+ olpc-cl3 : touchscreen-item ( -- )  " /touchscreen"  gfx-test-dev  ;
-\- olpc-cl3 : keyboard-item ( -- )  " keyboard"   mfg-test-dev  ;
+: touchpad-item ( -- )  " mouse"  mfg-test-dev  ;
+: keyboard-item ( -- )  " keyboard"   mfg-test-dev  ;
 : switch-item   ( -- )  " /accelerometer" mfg-test-dev  " /switches"  mfg-test-dev  ;
 : leds-item     ( -- )  " /leds"      mfg-test-dev   ;
@@ -63 +56 @@
    ['] int-sd-item    sdcard.icon   add-icon
 
-\- olpc-cl3  " Plug-in SD card"
-\- olpc-cl3  ['] ext-sd-item  sdcard.icon  add-icon
+   " Plug-in SD card"
+   ['] ext-sd-item  sdcard.icon  add-icon
 
    " Wireless LAN"
@@ -84 +77 @@
    ['] rtc-item       clock.icon    add-icon
 
-\+ olpc-cl2  " USB ports"
-\+ olpc-cl3  " USB-A port"
+   " USB ports"
    ['] usb-item       usb.icon      add-icon
 
-\+ olpc-cl3  " USB OTG port"
-\+ olpc-cl3  ['] otg-item  usb.icon  add-icon
 
    \ These are last because they require user participation.
    \ The earlier tests are all included in automatic batch-mode.
 
-\- olpc-cl3  " Keyboard"
-\- olpc-cl3  ['] keyboard-item     keyboard.icon     add-icon
+   " Keyboard"
+   ['] keyboard-item     keyboard.icon     add-icon
 
-\- olpc-cl3  " Touchpad"
-\- olpc-cl3  ['] touchpad-item     touchpad.icon     add-icon
+   " Touchpad"
+   ['] touchpad-item     touchpad.icon     add-icon
 
-\+ olpc-cl3  " Touchscreen"
-\+ olpc-cl3  ['] touchscreen-item  touchscreen.icon  add-icon
 
    " LEDs"

cpu/arm/olpc/3.0/fw.bth

@@ -18 +18 @@
 fload ${BP}/cpu/arm/olpc/3.0/switches.fth
 fload ${BP}/cpu/arm/olpc/3.0/leds.fth
+fload ${BP}/cpu/arm/olpc/3.0/testitems.fth
 fload ${BP}/cpu/arm/olpc/3.0/testinstructions.fth
 fload ${BP}/cpu/arm/olpc/test-tweaks.fth

cpu/arm/olpc/build-fw.fth

@@ -794 +794 @@
 : ?text-on  ( -- )  key?  if  text-on visible  then  ;
 [then]
-
-fload ${BP}/cpu/arm/olpc/1.75/testitems.fth
 
 : startup  ( -- )

cpu/arm/olpc/cl4/fw.bth

@@ -35 +35 @@
 fload ${BP}/cpu/arm/olpc/cl4/switches.fth
 fload ${BP}/cpu/arm/olpc/cl4/leds.fth
+fload ${BP}/cpu/arm/olpc/cl4/testitems.fth
 fload ${BP}/cpu/arm/olpc/cl4/testinstructions.fth
 fload ${BP}/cpu/arm/olpc/gpio-gamekeys.fth