From owner-svn-src-head@FreeBSD.ORG Sun Oct 7 15:37:31 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A134D1065672; Sun, 7 Oct 2012 15:37:31 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8BDAA8FC14; Sun, 7 Oct 2012 15:37:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q97FbV6P024731; Sun, 7 Oct 2012 15:37:31 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97FbVGx024728; Sun, 7 Oct 2012 15:37:31 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201210071537.q97FbVGx024728@svn.freebsd.org> From: Devin Teske Date: Sun, 7 Oct 2012 15:37:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r241310 - head/sys/boot/forth X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 15:37:31 -0000 Author: dteske Date: Sun Oct 7 15:37:30 2012 New Revision: 241310 URL: http://svn.freebsd.org/changeset/base/241310 Log: Comment and Copyright fixes/updates. Reviewed by: adrian (co-mentor) Approved by: adrian (co-mentor) Modified: head/sys/boot/forth/menu-commands.4th head/sys/boot/forth/menu.4th Modified: head/sys/boot/forth/menu-commands.4th ============================================================================== --- head/sys/boot/forth/menu-commands.4th Sun Oct 7 05:11:29 2012 (r241309) +++ head/sys/boot/forth/menu-commands.4th Sun Oct 7 15:37:30 2012 (r241310) @@ -1,4 +1,4 @@ -\ Copyright (c) 2006-2011 Devin Teske +\ Copyright (c) 2006-2012 Devin Teske \ All rights reserved. \ \ Redistribution and use in source and binary forms, with or without @@ -144,10 +144,6 @@ marker task-menu-commands.4th @ \ dereference address into value 48 + \ convert to ASCII numeral - \ Since we are [in this file] going to override the standard `boot' - \ routine with a custom one, you should know that we use $kernel - \ when referencing the desired kernel. Set $kernel below. - s" set kernel=${kernel_prefix}${kernel[N]}${kernel_suffix}" \ command to assemble full kernel-path -rot tuck 36 + c! swap \ replace 'N' with array index value @@ -168,10 +164,6 @@ marker task-menu-commands.4th @ \ dereference address into value 48 + \ convert to ASCII numeral - \ Since we are [in this file] going to override the standard `boot' - \ routine with a custom one, you should know that we use $root when - \ booting. Set $root below. - s" set root=${root_prefix}${root[N]}${root_prefix}" \ command to assemble full kernel-path -rot tuck 30 + c! swap \ replace 'N' with array index value Modified: head/sys/boot/forth/menu.4th ============================================================================== --- head/sys/boot/forth/menu.4th Sun Oct 7 05:11:29 2012 (r241309) +++ head/sys/boot/forth/menu.4th Sun Oct 7 15:37:30 2012 (r241310) @@ -1,6 +1,6 @@ \ Copyright (c) 2003 Scott Long \ Copyright (c) 2003 Aleksander Fafula -\ Copyright (c) 2006-2011 Devin Teske +\ Copyright (c) 2006-2012 Devin Teske \ All rights reserved. \ \ Redistribution and use in source and binary forms, with or without @@ -384,7 +384,7 @@ create init_text8 255 allot \ ACPI option is to be presented to the user, otherwise returns -1. Used \ internally by menu-create, you need not (nor should you) call this directly. \ -: acpimenuitem ( -- C-Addr | -1 ) +: acpimenuitem ( -- C-Addr/U | -1 ) arch-i386? if acpipresent? if @@ -493,7 +493,7 @@ create init_text8 255 allot \ If this is the ACPI menu option, act accordingly. dup menuacpi @ = if - acpimenuitem ( -- C-Addr | -1 ) + acpimenuitem ( -- C-Addr/U | -1 ) else loader_color? if s" ansi_caption[x]" @@ -502,14 +502,14 @@ create init_text8 255 allot then then - ( C-Addr | -1 ) + ( C-Addr/U | -1 ) dup -1 <> if \ replace 'x' with current iteration -rot 2dup 13 + c! rot \ test for environment variable getenv dup -1 <> if - printmenuitem ( C-Addr -- N ) + printmenuitem ( C-Addr/U -- N ) s" menukeyN !" \ generate cmd to store result -rot 2dup 7 + c! rot