d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump USERBOOT_VERSION.

Browse Source 
Requested by:	dfr
This commit is contained in:
Andrey V. Elsukov 2012-08-05 17:04:58 +00:00
parent 59fa03faa3
commit 3db1bfd80d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=239073
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/userboot/test/test.c
View File

@ -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);
}

1
sys/boot/userboot/userboot.h
View File

@ -30,6 +30,7 @@
* USERBOOT interface versions
*/
#define USERBOOT_VERSION_1 1
#define USERBOOT_VERSION_2 2
/*
* Exit codes from the loader

4
sys/boot/userboot/userboot/main.c
View File

@ -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 *cb, void *arg, int version, int ndisks)
static char malloc[512*1024];
int i;
if (version != USERBOOT_VERSION_1)
if (version != USERBOOT_VERSION)
abort();
callbacks = cb;