r919 - in cpu/x86/pc: . olpc

Author: wmb
Date: 2008-09-03 06:52:06 +0200 (Wed, 03 Sep 2008)
New Revision: 919

Added:
   cpu/x86/pc/olpc/help.fth
Modified:
   cpu/x86/pc/linux.fth
   cpu/x86/pc/olpc/fw.bth
Log:
OLPC trac 8280 - set lines/page based on the number of lines on the screen.

Modified: cpu/x86/pc/linux.fth
===================================================================
--- cpu/x86/pc/linux.fth	2008-09-02 22:45:08 UTC (rev 918)
+++ cpu/x86/pc/linux.fth	2008-09-03 04:52:06 UTC (rev 919)
@@ -283,47 +283,6 @@
    ." More information: http://firmworks.com/QuickRef.html" cr
 ;

-d# 34 to default-#lines
-
-warning @ warning off
-: help  ( -- )
-   blue-letters  ." UPDATES:" black-letters  mcr
-   ."   flash u:\q2c18.rom              Rewrite the firmware from USB key" mcr
-   ."   flash nand:\q2c18.rom           Rewrite the firmware from NAND file" mcr
-   ."   copy-nand u:\boot\nand290.img   Rewrite the OS on NAND from USB key" mcr
-   mcr
-   blue-letters  ." DIRECTORY LISTING:" black-letters  mcr
-   ."   dir u:\               List USB key root directory" mcr
-   ."   dir u:\boot\          List USB key /boot directory" mcr
-   ."   dir nand:\boot\       List NAND FLASH /boot directory" mcr
-   ."   dir nand:\boot*.rom  List .rom files in NAND FLASH /boot directory" mcr
-   mcr
-   blue-letters  ." BOOTING:" black-letters  mcr
-   ."   boot                  Load the OS from list of default locations" mcr
-   ."                         'printenv boot-device' shows the list" mcr
-   ."   boot <cmdline>        Load the OS, passing <cmdline> to kernel" mcr
-   ."   boot u:\boot\vmlinuz  Load the OS from a specific location" mcr
-   mcr
-   blue-letters  ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters  mcr
-   ."   boot-device  Kernel or boot script path.  Example: nand:\boot\olpc.fth" mcr
-   ."   boot-file    Default cmdline.    Example: console=ttyS0,115200" mcr
-   ."   ramdisk      initrd pathname.    Example: disk:\boot\initrd.imz" mcr
-   mcr
-   blue-letters  ." MANAGING CONFIGURATION VARIABLES:" black-letters  mcr
-   ."   printenv [ <name> ]     Show configuration variables" mcr
-   ."   setenv <name> <value>   Set configuration variable" mcr
-   ."   editenv <name>          Edit configuration variable" mcr
-   mcr
-   blue-letters  ." DIAGNOSTICS:" black-letters  mcr
-   ."   test <device-name>      Test device.  Example: test mouse" mcr
-   ."   test-all                Test all devices that have test routines" mcr
-   mcr
-   ." More information: "
-   green-letters  ." http://wiki.laptop.org/go/OFW_FAQ" black-letters  cr
-;
-warning !
-
-
 \ LICENSE_BEGIN
 \ Copyright (c) 2006 FirmWorks
 \

Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2008-09-02 22:45:08 UTC (rev 918)
+++ cpu/x86/pc/olpc/fw.bth	2008-09-03 04:52:06 UTC (rev 919)
@@ -314,7 +314,13 @@
    vpci-devices-on   \ Do this after quieting USB
 ;
 ' setup-for-linux to linux-hook
+: screen-#lines  ( -- n )
+   screen-ih 0=  if  default-#lines exit  then
+   screen-ih  package( #lines )package
+;
+' screen-#lines to lines/page

+fload ${BP}/cpu/x86/pc/olpc/help.fth
 fload ${BP}/cpu/x86/pc/olpc/gui.fth
 fload ${BP}/cpu/x86/pc/olpc/suspend.fth      \ Suspend/resume setup
 fload ${BP}/dev/olpc/keyboard/selftest.fth   \ Keyboard diagnostic

Added: cpu/x86/pc/olpc/help.fth
===================================================================
--- cpu/x86/pc/olpc/help.fth	                        (rev 0)
+++ cpu/x86/pc/olpc/help.fth	2008-09-03 04:52:06 UTC (rev 919)
@@ -0,0 +1,32 @@
+purpose: Basic help for OLPC OFW
+
+warning @ warning off
+: help  ( -- )
+   blue-letters  ." UPDATES:" black-letters  mcr
+   ."   flash u:\q2c18.rom              Rewrite the firmware from USB key" mcr
+   ."   flash nand:\q2c18.rom           Rewrite the firmware from NAND file" mcr
+   ."   copy-nand u:\boot\nand290.img   Rewrite the OS on NAND from USB key" mcr
+   blue-letters  ." DIRECTORY LISTING:" black-letters  mcr
+   ."   dir u:\               List USB key root directory" mcr
+   ."   dir u:\boot\          List USB key /boot directory" mcr
+   ."   dir nand:\boot*.rom  List .rom files in NAND FLASH /boot directory" mcr
+   blue-letters  ." BOOTING:" black-letters  mcr
+   ."   boot                  Load the OS from list of default locations" mcr
+   ."                         'printenv boot-device' shows the list" mcr
+   ."   boot <cmdline>        Load the OS, passing <cmdline> to kernel" mcr
+   ."   boot u:\boot\vmlinuz  Load the OS from a specific location" mcr
+   blue-letters  ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters  mcr
+   ."   boot-device  Kernel or boot script path.  Example: nand:\boot\olpc.fth" mcr
+   ."   boot-file    Default cmdline.    Example: console=ttyS0,115200" mcr
+   ."   ramdisk      initrd pathname.    Example: disk:\boot\initrd.imz" mcr
+   blue-letters  ." MANAGING CONFIGURATION VARIABLES:" black-letters  mcr
+   ."   printenv [ <name> ]     Show configuration variables" mcr
+   ."   setenv <name> <value>   Set configuration variable" mcr
+   ."   editenv <name>          Edit configuration variable" mcr
+   blue-letters  ." DIAGNOSTICS:" black-letters  mcr
+   ."   test <device-name>      Test device.  Example: test mouse" mcr
+   ."   test-all                Test all devices that have test routines" mcr
+   blue-letters  ." More information: "  black-letters mcr
+   green-letters  ." http://wiki.laptop.org/go/OFW_FAQ" black-letters  cr
+;
+warning !