Deleted Added
full compact
agppriv.h (129579) agppriv.h (130585)
1/*-
2 * Copyright (c) 2000 Doug Rabson
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) 2000 Doug Rabson
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/dev/agp/agppriv.h 129579 2004-05-22 13:06:38Z mux $
26 * $FreeBSD: head/sys/dev/agp/agppriv.h 130585 2004-06-16 09:47:26Z phk $
27 */
28
29#ifndef _PCI_AGPPRIV_H_
30#define _PCI_AGPPRIV_H_
31
32/*
33 * This file *must not* be included by code outside the agp driver itself.
34 */

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

70struct agp_softc {
71 struct resource *as_aperture; /* location of aperture */
72 u_int32_t as_maxmem; /* allocation upper bound */
73 u_int32_t as_allocated; /* amount allocated */
74 enum agp_acquire_state as_state;
75 struct agp_memory_list as_memory; /* list of allocated memory */
76 int as_nextid; /* next memory block id */
77 int as_isopen; /* user device is open */
27 */
28
29#ifndef _PCI_AGPPRIV_H_
30#define _PCI_AGPPRIV_H_
31
32/*
33 * This file *must not* be included by code outside the agp driver itself.
34 */

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

70struct agp_softc {
71 struct resource *as_aperture; /* location of aperture */
72 u_int32_t as_maxmem; /* allocation upper bound */
73 u_int32_t as_allocated; /* amount allocated */
74 enum agp_acquire_state as_state;
75 struct agp_memory_list as_memory; /* list of allocated memory */
76 int as_nextid; /* next memory block id */
77 int as_isopen; /* user device is open */
78 dev_t as_devnode; /* from make_dev */
78 struct cdev *as_devnode; /* from make_dev */
79 struct mtx as_lock; /* lock for access to GATT */
80};
81
82struct agp_gatt {
83 u_int32_t ag_entries;
84 u_int32_t *ag_virtual;
85 vm_offset_t ag_physical;
86};

--- 19 unchanged lines hidden ---
79 struct mtx as_lock; /* lock for access to GATT */
80};
81
82struct agp_gatt {
83 u_int32_t ag_entries;
84 u_int32_t *ag_virtual;
85 vm_offset_t ag_physical;
86};

--- 19 unchanged lines hidden ---