Deleted Added
full compact
ata-intel.c (193205) ata-intel.c (194893)
1/*-
2 * Copyright (c) 1998 - 2008 S�ren Schmidt <sos@FreeBSD.org>
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 * 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
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 - 2008 S�ren Schmidt <sos@FreeBSD.org>
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 * 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
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-intel.c 193205 2009-06-01 07:05:52Z delphij $");
28__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-intel.c 194893 2009-06-24 19:49:18Z mav $");
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/module.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/ata.h>
36#include <sys/bus.h>

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

141 if (pci_get_vendor(dev) != ATA_INTEL_ID)
142 return ENXIO;
143
144 if (!(ctlr->chip = ata_match_chip(dev, ids)))
145 return ENXIO;
146
147 ata_set_desc(dev);
148 ctlr->chipinit = ata_intel_chipinit;
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/module.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/ata.h>
36#include <sys/bus.h>

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

141 if (pci_get_vendor(dev) != ATA_INTEL_ID)
142 return ENXIO;
143
144 if (!(ctlr->chip = ata_match_chip(dev, ids)))
145 return ENXIO;
146
147 ata_set_desc(dev);
148 ctlr->chipinit = ata_intel_chipinit;
149 return 0;
149 return (BUS_PROBE_DEFAULT);
150}
151
152static int
153ata_intel_chipinit(device_t dev)
154{
155 struct ata_pci_controller *ctlr = device_get_softc(dev);
156
157 if (ata_setup_interrupt(dev, ata_generic_intr))

--- 368 unchanged lines hidden ---
150}
151
152static int
153ata_intel_chipinit(device_t dev)
154{
155 struct ata_pci_controller *ctlr = device_get_softc(dev);
156
157 if (ata_setup_interrupt(dev, ata_generic_intr))

--- 368 unchanged lines hidden ---