Deleted Added
full compact
amr_pci.c (140688) amr_pci.c (143164)
1/*-
2 * Copyright (c) 1999,2000 Michael Smith
3 * Copyright (c) 2000 BSDi
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

50 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
51 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
52 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
53 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 * SUCH DAMAGE.
55 */
56
57#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1999,2000 Michael Smith
3 * Copyright (c) 2000 BSDi
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

50 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
51 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
52 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
53 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 * SUCH DAMAGE.
55 */
56
57#include <sys/cdefs.h>
58__FBSDID("$FreeBSD: head/sys/dev/amr/amr_pci.c 140688 2005-01-23 23:25:41Z scottl $");
58__FBSDID("$FreeBSD: head/sys/dev/amr/amr_pci.c 143164 2005-03-05 19:24:22Z imp $");
59
60#include <sys/param.h>
61#include <sys/systm.h>
62#include <sys/kernel.h>
63#include <sys/module.h>
64
65#include <dev/amr/amr_compat.h>
66#include <sys/bus.h>

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

149
150 /* do we need to test for a signature? */
151 if (amr_device_ids[i].flag & PROBE_SIGNATURE) {
152 sig = pci_read_config(dev, AMR_CFG_SIG, 2);
153 if ((sig != AMR_SIGNATURE_1) && (sig != AMR_SIGNATURE_2))
154 continue;
155 }
156 device_set_desc(dev, LSI_DESC_PCI);
59
60#include <sys/param.h>
61#include <sys/systm.h>
62#include <sys/kernel.h>
63#include <sys/module.h>
64
65#include <dev/amr/amr_compat.h>
66#include <sys/bus.h>

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

149
150 /* do we need to test for a signature? */
151 if (amr_device_ids[i].flag & PROBE_SIGNATURE) {
152 sig = pci_read_config(dev, AMR_CFG_SIG, 2);
153 if ((sig != AMR_SIGNATURE_1) && (sig != AMR_SIGNATURE_2))
154 continue;
155 }
156 device_set_desc(dev, LSI_DESC_PCI);
157 return(-10); /* allow room to be overridden */
157 return(BUS_PROBE_DEFAULT);
158 }
159 }
160 return(ENXIO);
161}
162
163static int
164amr_pci_attach(device_t dev)
165{

--- 456 unchanged lines hidden ---
158 }
159 }
160 return(ENXIO);
161}
162
163static int
164amr_pci_attach(device_t dev)
165{

--- 456 unchanged lines hidden ---