Deleted Added
full compact
agp_apple.c (241856) agp_apple.c (241885)
1/*-
2 * Copyright (c) 2010 Nathan Whitehorn
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) 2010 Nathan Whitehorn
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_apple.c 241856 2012-10-22 03:41:14Z eadler $");
28__FBSDID("$FreeBSD: head/sys/dev/agp/agp_apple.c 241885 2012-10-22 13:06:09Z eadler $");
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/module.h>

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

66 int u3;
67 int needs_2x_reset;
68};
69
70static int
71agp_apple_probe(device_t dev)
72{
73
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/module.h>

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

66 int u3;
67 int needs_2x_reset;
68};
69
70static int
71agp_apple_probe(device_t dev)
72{
73
74 if (resource_disabled("agp", device_get_unit(dev)))
75 return (ENXIO);
76
74 if (pci_get_class(dev) != PCIC_BRIDGE
75 || pci_get_subclass(dev) != PCIS_BRIDGE_HOST)
76 return (ENXIO);
77
78 if (agp_find_caps(dev) == 0)
79 return (ENXIO);
80
81 if (pci_get_class(dev) != PCIC_BRIDGE

--- 218 unchanged lines hidden ---
77 if (pci_get_class(dev) != PCIC_BRIDGE
78 || pci_get_subclass(dev) != PCIS_BRIDGE_HOST)
79 return (ENXIO);
80
81 if (agp_find_caps(dev) == 0)
82 return (ENXIO);
83
84 if (pci_get_class(dev) != PCIC_BRIDGE

--- 218 unchanged lines hidden ---