From owner-svn-src-head@FreeBSD.ORG  Wed Oct  3 17:20:35 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EEEFF106564A;
	Wed,  3 Oct 2012 17:20:34 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF5A58FC08;
	Wed,  3 Oct 2012 17:20:34 +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 q93HKY7V064476;
	Wed, 3 Oct 2012 17:20:34 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q93HKYUp064470;
	Wed, 3 Oct 2012 17:20:34 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201210031720.q93HKYUp064470@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 3 Oct 2012 17:20:34 +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: r241164 - in head/sys/boot/userboot: . test userboot
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2012 17:20:35 -0000

Author: ae
Date: Wed Oct  3 17:20:34 2012
New Revision: 241164
URL: http://svn.freebsd.org/changeset/base/241164

Log:
  Replace all references to loader_callbacks_v1 with loader_callbacks.
  
  Suggested by:	grehan@

Modified:
  head/sys/boot/userboot/test/test.c
  head/sys/boot/userboot/userboot.h
  head/sys/boot/userboot/userboot/libuserboot.h
  head/sys/boot/userboot/userboot/main.c

Modified: head/sys/boot/userboot/test/test.c
==============================================================================
--- head/sys/boot/userboot/test/test.c	Wed Oct  3 16:48:28 2012	(r241163)
+++ head/sys/boot/userboot/test/test.c	Wed Oct  3 17:20:34 2012	(r241164)
@@ -364,7 +364,7 @@ test_getmem(void *arg, uint64_t *lowmem,
         *highmem = 0;
 }
 
-struct loader_callbacks_v1 cb = {
+struct loader_callbacks cb = {
 	.putc = test_putc,
 	.getc = test_getc,
 	.poll = test_poll,
@@ -405,7 +405,7 @@ int
 main(int argc, char** argv)
 {
 	void *h;
-	void (*func)(struct loader_callbacks_v1 *, void *, int, int);
+	void (*func)(struct loader_callbacks *, void *, int, int);
 	int opt;
 	char *disk_image = NULL;
 

Modified: head/sys/boot/userboot/userboot.h
==============================================================================
--- head/sys/boot/userboot/userboot.h	Wed Oct  3 16:48:28 2012	(r241163)
+++ head/sys/boot/userboot/userboot.h	Wed Oct  3 17:20:34 2012	(r241164)
@@ -38,7 +38,7 @@
 #define	USERBOOT_EXIT_QUIT      1
 #define	USERBOOT_EXIT_REBOOT    2
 
-struct loader_callbacks_v1 {
+struct loader_callbacks {
 	/*
 	 * Console i/o
 	 */

Modified: head/sys/boot/userboot/userboot/libuserboot.h
==============================================================================
--- head/sys/boot/userboot/userboot/libuserboot.h	Wed Oct  3 16:48:28 2012	(r241163)
+++ head/sys/boot/userboot/userboot/libuserboot.h	Wed Oct  3 17:20:34 2012	(r241164)
@@ -28,7 +28,7 @@
 
 #include "userboot.h"
 
-extern struct loader_callbacks_v1 *callbacks;
+extern struct loader_callbacks *callbacks;
 extern void *callbacks_arg;
 
 #define	CALLBACK(fn, args...) (callbacks->fn(callbacks_arg , ##args))

Modified: head/sys/boot/userboot/userboot/main.c
==============================================================================
--- head/sys/boot/userboot/userboot/main.c	Wed Oct  3 16:48:28 2012	(r241163)
+++ head/sys/boot/userboot/userboot/main.c	Wed Oct  3 17:20:34 2012	(r241164)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #define	USERBOOT_VERSION	USERBOOT_VERSION_2
 
-struct loader_callbacks_v1 *callbacks;
+struct loader_callbacks *callbacks;
 void *callbacks_arg;
 
 extern char bootprog_name[];
@@ -67,7 +67,7 @@ exit(int v)
 }
 
 void
-loader_main(struct loader_callbacks_v1 *cb, void *arg, int version, int ndisks)
+loader_main(struct loader_callbacks *cb, void *arg, int version, int ndisks)
 {
 	static char malloc[512*1024];
 	int i;