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

[Andrey V. Elsukov]

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;