Deleted Added
full compact
ata-highpoint.c (256281) ata-highpoint.c (281140)
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: stable/10/sys/dev/ata/chipsets/ata-highpoint.c 249213 2013-04-06 19:12:49Z marius $");
28__FBSDID("$FreeBSD: stable/10/sys/dev/ata/chipsets/ata-highpoint.c 281140 2015-04-06 08:23:06Z mav $");
29
30#include <sys/param.h>
31#include <sys/module.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/ata.h>
35#include <sys/bus.h>
36#include <sys/endian.h>

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

98 strcat(buffer, " (channel 0+1)");
99 if (pci_get_function(dev) == 1)
100 strcat(buffer, " (channel 2+3)");
101 }
102 sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma));
103 device_set_desc_copy(dev, buffer);
104 ctlr->chip = idx;
105 ctlr->chipinit = ata_highpoint_chipinit;
29
30#include <sys/param.h>
31#include <sys/module.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/ata.h>
35#include <sys/bus.h>
36#include <sys/endian.h>

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

98 strcat(buffer, " (channel 0+1)");
99 if (pci_get_function(dev) == 1)
100 strcat(buffer, " (channel 2+3)");
101 }
102 sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma));
103 device_set_desc_copy(dev, buffer);
104 ctlr->chip = idx;
105 ctlr->chipinit = ata_highpoint_chipinit;
106 return (BUS_PROBE_DEFAULT);
106 return (BUS_PROBE_LOW_PRIORITY);
107}
108
109static int
110ata_highpoint_chipinit(device_t dev)
111{
112 struct ata_pci_controller *ctlr = device_get_softc(dev);
113
114 if (ata_setup_interrupt(dev, ata_generic_intr))

--- 111 unchanged lines hidden ---
107}
108
109static int
110ata_highpoint_chipinit(device_t dev)
111{
112 struct ata_pci_controller *ctlr = device_get_softc(dev);
113
114 if (ata_setup_interrupt(dev, ata_generic_intr))

--- 111 unchanged lines hidden ---