Deleted Added
full compact
ata-jmicron.c (273725) ata-jmicron.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-jmicron.c 273725 2014-10-27 07:20:39Z mav $");
28__FBSDID("$FreeBSD: stable/10/sys/dev/ata/chipsets/ata-jmicron.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>

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

81 if (!(idx = ata_match_chip(dev, ids)))
82 return ENXIO;
83
84 sprintf(buffer, "JMicron %s %s controller",
85 idx->text, ata_mode2str(idx->max_dma));
86 device_set_desc_copy(dev, buffer);
87 ctlr->chip = idx;
88 ctlr->chipinit = ata_jmicron_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>

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

81 if (!(idx = ata_match_chip(dev, ids)))
82 return ENXIO;
83
84 sprintf(buffer, "JMicron %s %s controller",
85 idx->text, ata_mode2str(idx->max_dma));
86 device_set_desc_copy(dev, buffer);
87 ctlr->chip = idx;
88 ctlr->chipinit = ata_jmicron_chipinit;
89 return (BUS_PROBE_DEFAULT);
89 return (BUS_PROBE_LOW_PRIORITY);
90}
91
92static int
93ata_jmicron_chipinit(device_t dev)
94{
95 struct ata_pci_controller *ctlr = device_get_softc(dev);
96 device_t child;
97

--- 66 unchanged lines hidden ---
90}
91
92static int
93ata_jmicron_chipinit(device_t dev)
94{
95 struct ata_pci_controller *ctlr = device_get_softc(dev);
96 device_t child;
97

--- 66 unchanged lines hidden ---