Deleted Added
full compact
ata-jmicron.c (230132) ata-jmicron.c (233282)
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-jmicron.c 230132 2012-01-15 13:23:18Z uqs $");
28__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-jmicron.c 233282 2012-03-21 16:59:39Z marius $");
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>

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

58
59/*
60 * JMicron chipset support functions
61 */
62static int
63ata_jmicron_probe(device_t dev)
64{
65 struct ata_pci_controller *ctlr = device_get_softc(dev);
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>

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

58
59/*
60 * JMicron chipset support functions
61 */
62static int
63ata_jmicron_probe(device_t dev)
64{
65 struct ata_pci_controller *ctlr = device_get_softc(dev);
66 struct ata_chip_id *idx;
67 static struct ata_chip_id ids[] =
66 const struct ata_chip_id *idx;
67 static const struct ata_chip_id const ids[] =
68 {{ ATA_JMB360, 0, 1, 0, ATA_SA300, "JMB360" },
69 { ATA_JMB361, 0, 1, 1, ATA_UDMA6, "JMB361" },
70 { ATA_JMB363, 0, 2, 1, ATA_UDMA6, "JMB363" },
71 { ATA_JMB365, 0, 1, 2, ATA_UDMA6, "JMB365" },
72 { ATA_JMB366, 0, 2, 2, ATA_UDMA6, "JMB366" },
73 { ATA_JMB368, 0, 0, 1, ATA_UDMA6, "JMB368" },
74 { 0, 0, 0, 0, 0, 0}};
75 char buffer[64];

--- 87 unchanged lines hidden ---
68 {{ ATA_JMB360, 0, 1, 0, ATA_SA300, "JMB360" },
69 { ATA_JMB361, 0, 1, 1, ATA_UDMA6, "JMB361" },
70 { ATA_JMB363, 0, 2, 1, ATA_UDMA6, "JMB363" },
71 { ATA_JMB365, 0, 1, 2, ATA_UDMA6, "JMB365" },
72 { ATA_JMB366, 0, 2, 2, ATA_UDMA6, "JMB366" },
73 { ATA_JMB368, 0, 0, 1, ATA_UDMA6, "JMB368" },
74 { 0, 0, 0, 0, 0, 0}};
75 char buffer[64];

--- 87 unchanged lines hidden ---