svn commit: r239073 - in head/sys/boot/userboot: . test userboot

[John Baldwin]

On Sunday, August 05, 2012 1:04:58 pm Andrey V. Elsukov wrote:
> Author: ae
> Date: Sun Aug  5 17:04:58 2012
> New Revision: 239073
> URL: http://svn.freebsd.org/changeset/base/239073
> 
> Log:
>   Bump USERBOOT_VERSION.
>   
>   Requested by:	dfr
> 
> Modified:
>   head/sys/boot/userboot/test/test.c
>   head/sys/boot/userboot/userboot.h
>   head/sys/boot/userboot/userboot/main.c
> 
> Modified: head/sys/boot/userboot/test/test.c
> 
==============================================================================
> --- head/sys/boot/userboot/test/test.c	Sun Aug  5 16:59:02 2012	
(r239072)
> +++ head/sys/boot/userboot/test/test.c	Sun Aug  5 17:04:58 2012	
(r239073)
> @@ -450,5 +450,5 @@ main(int argc, char** argv)
>  	term.c_lflag &= ~(ICANON|ECHO);
>  	tcsetattr(0, TCSAFLUSH, &term);
>  
> -	func(&cb, NULL, USERBOOT_VERSION_1, disk_fd >= 0);
> +	func(&cb, NULL, USERBOOT_VERSION_2, disk_fd >= 0);
>  }
> 
> Modified: head/sys/boot/userboot/userboot.h
> 
==============================================================================
> --- head/sys/boot/userboot/userboot.h	Sun Aug  5 16:59:02 2012	(r239072)
> +++ head/sys/boot/userboot/userboot.h	Sun Aug  5 17:04:58 2012	(r239073)
> @@ -30,6 +30,7 @@
>   * USERBOOT interface versions
>   */
>  #define	USERBOOT_VERSION_1      1
> +#define	USERBOOT_VERSION_2      2
>  
>  /*
>   * Exit codes from the loader
> 
> Modified: head/sys/boot/userboot/userboot/main.c
> 
==============================================================================
> --- head/sys/boot/userboot/userboot/main.c	Sun Aug  5 16:59:02 2012	
(r239072)
> +++ head/sys/boot/userboot/userboot/main.c	Sun Aug  5 17:04:58 2012	
(r239073)
> @@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
>  #include "disk.h"
>  #include "libuserboot.h"
>  
> +#define	USERBOOT_VERSION	USERBOOT_VERSION_2
> +
>  struct loader_callbacks_v1 *callbacks;
>  void *callbacks_arg;

Should this be called loader_callbacks_v2 now?

-- 
John Baldwin