Deleted Added
full compact
libi386.h (162814) libi386.h (163897)
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/i386/libi386/libi386.h 162814 2006-09-29 20:27:41Z ru $
26 * $FreeBSD: head/sys/boot/i386/libi386/libi386.h 163897 2006-11-02 01:23:18Z marcel $
27 */
28
29
30/*
31 * i386 fully-qualified device descriptor.
32 * Note, this must match the 'struct devdesc' declaration
33 * in bootstrap.h.
34 */
35struct i386_devdesc
36{
37 struct devsw *d_dev;
38 int d_type;
27 */
28
29
30/*
31 * i386 fully-qualified device descriptor.
32 * Note, this must match the 'struct devdesc' declaration
33 * in bootstrap.h.
34 */
35struct i386_devdesc
36{
37 struct devsw *d_dev;
38 int d_type;
39 int d_unit;
39 union
40 {
41 struct
42 {
40 union
41 {
42 struct
43 {
43 int unit;
44 void *data;
44 int slice;
45 int partition;
45 int slice;
46 int partition;
46 void *data;
47 } biosdisk;
48 struct
49 {
47 } biosdisk;
48 struct
49 {
50 int unit;
51 void *data;
52 } bioscd;
50 void *data;
51 } bioscd;
53 struct
54 {
55 int unit; /* XXX net layer lives over these? */
56 } netif;
57 } d_kind;
58};
59
60int i386_getdev(void **vdev, const char *devspec, const char **path);
61char *i386_fmtdev(void *vdev);
62int i386_setcurrdev(struct env_var *ev, int flags, const void *value);
63
64extern struct devdesc currdev; /* our current device */

--- 52 unchanged lines hidden ---
52 } d_kind;
53};
54
55int i386_getdev(void **vdev, const char *devspec, const char **path);
56char *i386_fmtdev(void *vdev);
57int i386_setcurrdev(struct env_var *ev, int flags, const void *value);
58
59extern struct devdesc currdev; /* our current device */

--- 52 unchanged lines hidden ---