Replace all references to loader_callbacks_v1 with loader_callbacks.

Suggested by:	grehan@

4 files changed, 6 insertions, 6 deletions

diff --git a/sys/boot/userboot/test/test.c b/sys/boot/userboot/test/test.c
index 63cb5e8..ef5c9a8 100644
--- a/sys/boot/userboot/test/test.c
+++ b/sys/boot/userboot/test/test.c
@@ -364,7 +364,7 @@ test_getmem(void *arg, uint64_t *lowmem, uint64_t *highmem)
         *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;
 
diff --git a/sys/boot/userboot/userboot.h b/sys/boot/userboot/userboot.h
index 9e00899..ddb83a3 100644
--- a/sys/boot/userboot/userboot.h
+++ b/sys/boot/userboot/userboot.h
@@ -38,7 +38,7 @@
 #define	USERBOOT_EXIT_QUIT      1
 #define	USERBOOT_EXIT_REBOOT    2
 
-struct loader_callbacks_v1 {
+struct loader_callbacks {
 	/*
 	 * Console i/o
 	 */
diff --git a/sys/boot/userboot/userboot/libuserboot.h b/sys/boot/userboot/userboot/libuserboot.h
index 0aa1a3f..d795188 100644
--- a/sys/boot/userboot/userboot/libuserboot.h
+++ b/sys/boot/userboot/userboot/libuserboot.h
@@ -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))
diff --git a/sys/boot/userboot/userboot/main.c b/sys/boot/userboot/userboot/main.c
index fb2ca64..374db17 100644
--- a/sys/boot/userboot/userboot/main.c
+++ b/sys/boot/userboot/userboot/main.c
@@ -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;