svn commit: r239073 - in head/sys/boot/userboot: . test userboot
Andrey V. Elsukov
ae at FreeBSD.org
Sun Aug 5 17:04:59 UTC 2012
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;
@@ -70,7 +72,7 @@ loader_main(struct loader_callbacks_v1 *
static char malloc[512*1024];
int i;
- if (version != USERBOOT_VERSION_1)
+ if (version != USERBOOT_VERSION)
abort();
callbacks = cb;
More information about the svn-src-all
mailing list