upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace all references to loader_callbacks_v1 with loader_callbacks.

Browse source 
Suggested by:	grehan@
This commit is contained in:
Andrey V. Elsukov 2012-10-03 17:20:34 +00:00
parent 75286ea4ca
commit 45ac30d5f8
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/boot/userboot/test/test.c
View file

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

2
sys/boot/userboot/userboot.h
View file

@ -38,7 +38,7 @@
#define USERBOOT_EXIT_QUIT 1
#define USERBOOT_EXIT_REBOOT 2
struct loader_callbacks_v1 {
struct loader_callbacks {
/*
* Console i/o
*/

2
sys/boot/userboot/userboot/libuserboot.h
View file

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

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

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