Deleted Added
full compact
agp_amd.c (119288) agp_amd.c (127135)
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

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

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
27#include <sys/cdefs.h>
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

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

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
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/agp/agp_amd.c 119288 2003-08-22 07:20:27Z imp $");
28__FBSDID("$FreeBSD: head/sys/dev/agp/agp_amd.c 127135 2004-03-17 17:50:55Z njl $");
29
30#include "opt_bus.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/malloc.h>
35#include <sys/kernel.h>
36#include <sys/bus.h>

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

224 struct agp_amd_gatt *gatt;
225 int error, rid;
226
227 error = agp_generic_attach(dev);
228 if (error)
229 return error;
230
231 rid = AGP_AMD751_REGISTERS;
29
30#include "opt_bus.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/malloc.h>
35#include <sys/kernel.h>
36#include <sys/bus.h>

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

224 struct agp_amd_gatt *gatt;
225 int error, rid;
226
227 error = agp_generic_attach(dev);
228 if (error)
229 return error;
230
231 rid = AGP_AMD751_REGISTERS;
232 sc->regs = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
233 0, ~0, 1, RF_ACTIVE);
232 sc->regs = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
233 RF_ACTIVE);
234 if (!sc->regs) {
235 agp_generic_detach(dev);
236 return ENOMEM;
237 }
238
239 sc->bst = rman_get_bustag(sc->regs);
240 sc->bsh = rman_get_bushandle(sc->regs);
241

--- 181 unchanged lines hidden ---
234 if (!sc->regs) {
235 agp_generic_detach(dev);
236 return ENOMEM;
237 }
238
239 sc->bst = rman_get_bustag(sc->regs);
240 sc->bsh = rman_get_bushandle(sc->regs);
241

--- 181 unchanged lines hidden ---