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 <[email protected]>
+\ Copyright (c) 2006-2012 Devin Teske <[email protected]>
 \ 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 <[email protected]>
 \ Copyright (c) 2003 Aleksander Fafula <[email protected]>
-\ Copyright (c) 2006-2011 Devin Teske <[email protected]>
+\ Copyright (c) 2006-2012 Devin Teske <[email protected]>
 \ 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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to