Deleted Added
full compact
bootstrap.h (176484) bootstrap.h (185029)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/boot/common/bootstrap.h 176484 2008-02-23 18:33:50Z marcel $
26 * $FreeBSD: head/sys/boot/common/bootstrap.h 185029 2008-11-17 20:49:29Z pjd $
27 */
28
29#include <sys/types.h>
30#include <sys/queue.h>
31#include <sys/linker_set.h>
32
33/*
34 * Generic device specifier; architecture-dependant
35 * versions may be larger, but should be allowed to
36 * overlap.
37 */
38struct devdesc
39{
40 struct devsw *d_dev;
41 int d_type;
42#define DEVT_NONE 0
43#define DEVT_DISK 1
44#define DEVT_NET 2
45#define DEVT_CD 3
27 */
28
29#include <sys/types.h>
30#include <sys/queue.h>
31#include <sys/linker_set.h>
32
33/*
34 * Generic device specifier; architecture-dependant
35 * versions may be larger, but should be allowed to
36 * overlap.
37 */
38struct devdesc
39{
40 struct devsw *d_dev;
41 int d_type;
42#define DEVT_NONE 0
43#define DEVT_DISK 1
44#define DEVT_NET 2
45#define DEVT_CD 3
46#define DEVT_ZFS 4
46 int d_unit;
47};
48
49/* Commands and return values; nonzero return sets command_errmsg != NULL */
50typedef int (bootblk_cmd_t)(int argc, char *argv[]);
51extern char *command_errmsg;
52extern char command_errbuf[]; /* XXX blah, length */
53#define CMD_OK 0

--- 254 unchanged lines hidden ---
47 int d_unit;
48};
49
50/* Commands and return values; nonzero return sets command_errmsg != NULL */
51typedef int (bootblk_cmd_t)(int argc, char *argv[]);
52extern char *command_errmsg;
53extern char command_errbuf[]; /* XXX blah, length */
54#define CMD_OK 0

--- 254 unchanged lines hidden ---