Deleted Added
sdiff udiff text old ( 265055 ) new ( 284079 )
full compact
proto.h (265055) proto.h (284079)
1/*-
2 * Copyright (c) 2014 Marcel Moolenaar
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 *

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

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2014 Marcel Moolenaar
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 *

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

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/proto/proto.h 265055 2014-04-28 17:58:40Z marcel $
26 * $FreeBSD: head/sys/dev/proto/proto.h 284079 2015-06-06 16:09:25Z marcel $
27 */
28
29#ifndef _DEV_PROTO_H_
30#define _DEV_PROTO_H_
31
32#define PROTO_RES_MAX 16
33
34#define PROTO_RES_UNUSED 0
35#define PROTO_RES_PCICFG 10
27 */
28
29#ifndef _DEV_PROTO_H_
30#define _DEV_PROTO_H_
31
32#define PROTO_RES_MAX 16
33
34#define PROTO_RES_UNUSED 0
35#define PROTO_RES_PCICFG 10
36#define PROTO_RES_BUSDMA 11
36
37struct proto_res {
38 int r_type;
39 int r_rid;
37
38struct proto_res {
39 int r_type;
40 int r_rid;
40 struct resource *r_res;
41 union {
42 struct resource *res;
43 void *busdma;
44 } r_d;
41 u_long r_size;
42 union {
43 void *cookie;
44 struct cdev *cdev;
45 } r_u;
46 uintptr_t r_opened;
47};
48

--- 15 unchanged lines hidden --- 		45 u_long r_size;
46 union {
47 void *cookie;
48 struct cdev *cdev;
49 } r_u;
50 uintptr_t r_opened;
51};
52

--- 15 unchanged lines hidden ---