svn commit: r280924 - head/sys/boot/forth
Devin Teske
dteske at FreeBSD.org
Tue Mar 31 22:32:40 UTC 2015
Author: dteske
Date: Tue Mar 31 22:32:35 2015
New Revision: 280924
URL: https://svnweb.freebsd.org/changeset/base/280924
Log:
Comments. No functional change(s).
MFC after: 3 days
X-MFC-to: stable/10
Modified:
head/sys/boot/forth/beastie.4th
head/sys/boot/forth/brand.4th
head/sys/boot/forth/check-password.4th
head/sys/boot/forth/frames.4th
head/sys/boot/forth/loader.4th
head/sys/boot/forth/menu.4th
head/sys/boot/forth/pcibios.4th
head/sys/boot/forth/pnp.4th
head/sys/boot/forth/screen.4th
head/sys/boot/forth/support.4th
head/sys/boot/forth/version.4th
Modified: head/sys/boot/forth/beastie.4th
==============================================================================
--- head/sys/boot/forth/beastie.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/beastie.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,4 +1,4 @@
-\ Copyright (c) 2003 Scott Long <scottl at freebsd.org>
+\ Copyright (c) 2003 Scott Long <scottl at FreeBSD.org>
\ Copyright (c) 2003 Aleksander Fafula <alex at fafula.com>
\ Copyright (c) 2006-2015 Devin Teske <dteske at FreeBSD.org>
\ All rights reserved.
Modified: head/sys/boot/forth/brand.4th
==============================================================================
--- head/sys/boot/forth/brand.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/brand.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -29,7 +29,7 @@ marker task-brand.4th
variable brandX
variable brandY
-\ Initialize logo placement
+\ Initialize brand placement to defaults
2 brandX !
1 brandY !
@@ -61,7 +61,7 @@ variable brandY
\ NOTE: Setting `loader_brand' to an undefined value (such as "none") will
\ prevent any brand from being drawn.
\
-: draw-brand ( -- )
+: draw-brand ( -- ) \ at (loader_brand_x,loader_brand_y), else (2,1)
s" loader_brand_x" getenv dup -1 <> if
?number 1 = if brandX ! then
Modified: head/sys/boot/forth/check-password.4th
==============================================================================
--- head/sys/boot/forth/check-password.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/check-password.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -146,8 +146,8 @@ variable readlen \ input len
s" password" getenv dup readmax > if drop readmax then
begin
s" Password: " read ( prompt -- )
- 2dup readval readlen @ compare 0= if
- 2drop exit \ Correct password
+ 2dup readval readlen @ compare 0= if \ Correct password?
+ 2drop exit
then
3000 ms ." loader: incorrect password" 10 emit
again
Modified: head/sys/boot/forth/frames.4th
==============================================================================
--- head/sys/boot/forth/frames.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/frames.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,9 +1,34 @@
-\ Words implementing frame drawing
-\ XXX Filled boxes are left as an exercise for the reader... ;-/
+\ Copyright (c) 2003 Scott Long <scottl at FreeBSD.org>
+\ Copyright (c) 2012-2015 Devin Teske <dteske at FreeBSD.org>
+\ All rights reserved.
+\
+\ Redistribution and use in source and binary forms, with or without
+\ modification, are permitted provided that the following conditions
+\ are met:
+\ 1. Redistributions of source code must retain the above copyright
+\ notice, this list of conditions and the following disclaimer.
+\ 2. Redistributions in binary form must reproduce the above copyright
+\ notice, this list of conditions and the following disclaimer in the
+\ documentation and/or other materials provided with the distribution.
+\
+\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+\ SUCH DAMAGE.
+\
\ $FreeBSD$
marker task-frames.4th
+\ XXX Filled boxes are left as an exercise for the reader... ;-/
+
variable h_el
variable v_el
variable lt_el
Modified: head/sys/boot/forth/loader.4th
==============================================================================
--- head/sys/boot/forth/loader.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/loader.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,4 +1,5 @@
-\ Copyright (c) 1999 Daniel C. Sobral <dcs at freebsd.org>
+\ Copyright (c) 1999 Daniel C. Sobral <dcs at FreeBSD.org>
+\ Copyright (c) 2011-2015 Devin Teske <dteske at FreeBSD.org>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
Modified: head/sys/boot/forth/menu.4th
==============================================================================
--- head/sys/boot/forth/menu.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/menu.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,6 +1,6 @@
-\ Copyright (c) 2003 Scott Long <scottl at freebsd.org>
+\ Copyright (c) 2003 Scott Long <scottl at FreeBSD.org>
\ Copyright (c) 2003 Aleksander Fafula <alex at fafula.com>
-\ Copyright (c) 2006-2013 Devin Teske <dteske at FreeBSD.org>
+\ Copyright (c) 2006-2015 Devin Teske <dteske at FreeBSD.org>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ variable menubllt \ Menu item bullet
variable menuX \ Menu X offset (columns)
variable menuY \ Menu Y offset (rows)
-\ Menu-item key association/detection
+\ Menu-item elements
variable menukey1
variable menukey2
variable menukey3
@@ -144,12 +144,14 @@ create kernelsbuf 256 allot
swap drop ( c bool -- bool ) \ return boolean
;
+\ Forth variables
: menukeyN ( N -- ADDR ) s" menukeyN" 7 +c! evaluate ;
: init_stateN ( N -- ADDR ) s" init_stateN" 10 +c! evaluate ;
: toggle_stateN ( N -- ADDR ) s" toggle_stateN" 12 +c! evaluate ;
: cycle_stateN ( N -- ADDR ) s" cycle_stateN" 11 +c! evaluate ;
: init_textN ( N -- C-ADDR ) s" init_textN" 9 +c! evaluate ;
+\ Environment variables
: kernel[x] ( N -- C-ADDR/U ) s" kernel[x]" 7 +c! ;
: menu_init[x] ( N -- C-ADDR/U ) s" menu_init[x]" 10 +c! ;
: menu_command[x] ( N -- C-ADDR/U ) s" menu_command[x]" 13 +c! ;
@@ -614,7 +616,7 @@ create kernelsbuf 256 allot
;
\ This function creates the list of menu items. This function is called by the
-\ menu-display function. You need not be call it directly.
+\ menu-display function. You need not call it directly.
\
: menu-create ( -- )
Modified: head/sys/boot/forth/pcibios.4th
==============================================================================
--- head/sys/boot/forth/pcibios.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/pcibios.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,4 +1,4 @@
-\ Copyright (c) 2014 M. Warner Losh <imp at freebsd.org>
+\ Copyright (c) 2014 M. Warner Losh <imp at FreeBSD.org>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
Modified: head/sys/boot/forth/pnp.4th
==============================================================================
--- head/sys/boot/forth/pnp.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/pnp.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,4 +1,4 @@
-\ Copyright (c) 2000 Daniel C. Sobral <dcs at freebsd.org>
+\ Copyright (c) 2000 Daniel C. Sobral <dcs at FreeBSD.org>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
Modified: head/sys/boot/forth/screen.4th
==============================================================================
--- head/sys/boot/forth/screen.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/screen.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,4 +1,28 @@
-\ Screen manipulation related words.
+\ Copyright (c) 2003 Scott Long <scottl at FreeBSD.org>
+\ Copyright (c) 2015 Devin Teske <dteske at FreeBSD.org>
+\ All rights reserved.
+\
+\ Redistribution and use in source and binary forms, with or without
+\ modification, are permitted provided that the following conditions
+\ are met:
+\ 1. Redistributions of source code must retain the above copyright
+\ notice, this list of conditions and the following disclaimer.
+\ 2. Redistributions in binary form must reproduce the above copyright
+\ notice, this list of conditions and the following disclaimer in the
+\ documentation and/or other materials provided with the distribution.
+\
+\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+\ SUCH DAMAGE.
+\
\ $FreeBSD$
marker task-screen.4th
Modified: head/sys/boot/forth/support.4th
==============================================================================
--- head/sys/boot/forth/support.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/support.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,4 +1,4 @@
-\ Copyright (c) 1999 Daniel C. Sobral <dcs at freebsd.org>
+\ Copyright (c) 1999 Daniel C. Sobral <dcs at FreeBSD.org>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
Modified: head/sys/boot/forth/version.4th
==============================================================================
--- head/sys/boot/forth/version.4th Tue Mar 31 22:10:40 2015 (r280923)
+++ head/sys/boot/forth/version.4th Tue Mar 31 22:32:35 2015 (r280924)
@@ -1,4 +1,4 @@
-\ Copyright (c) 2006-2013 Devin Teske <dteske at FreeBSD.org>
+\ Copyright (c) 2006-2015 Devin Teske <dteske at FreeBSD.org>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
@@ -49,10 +49,11 @@ variable versionY
\ Default version if none was set
s" loader_version" getenv dup -1 = if
drop
- \ Default version if no logo is requested
+ \ Use above default if no logo is requested
s" loader_logo" getenv dup -1 = if
drop str_loader_version
else
+ \ For tributes, do nothing (defer to beastie.4th)
2dup s" tribute" compare-insensitive 0= if
2drop
s" tribute-logo" sfind if
More information about the svn-src-all
mailing list