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

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

62
63/*
64 * Advanced Micro Devices (AMD) chipset support functions
65 */
66static int
67ata_amd_probe(device_t dev)
68{
69 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>

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

62
63/*
64 * Advanced Micro Devices (AMD) chipset support functions
65 */
66static int
67ata_amd_probe(device_t dev)
68{
69 struct ata_pci_controller *ctlr = device_get_softc(dev);
70 static struct ata_chip_id ids[] =
70 static const struct ata_chip_id const ids[] =
71 {{ ATA_AMD756, 0x00, 0x00, 0, ATA_UDMA4, "756" },
72 { ATA_AMD766, 0x00, AMD_CABLE|AMD_BUG, 0, ATA_UDMA5, "766" },
73 { ATA_AMD768, 0x00, AMD_CABLE, 0, ATA_UDMA5, "768" },
74 { ATA_AMD8111, 0x00, AMD_CABLE, 0, ATA_UDMA6, "8111" },
75 { ATA_AMD5536, 0x00, 0x00, 0, ATA_UDMA5, "CS5536" },
76 { 0, 0, 0, 0, 0, 0}};
77
78 if (pci_get_vendor(dev) != ATA_AMD_ID)

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

108static int
109ata_amd_setmode(device_t dev, int target, int mode)
110{
111 device_t parent = device_get_parent(dev);
112 struct ata_pci_controller *ctlr = device_get_softc(parent);
113 struct ata_channel *ch = device_get_softc(dev);
114 int devno = (ch->unit << 1) + target;
115 int piomode;
71 {{ ATA_AMD756, 0x00, 0x00, 0, ATA_UDMA4, "756" },
72 { ATA_AMD766, 0x00, AMD_CABLE|AMD_BUG, 0, ATA_UDMA5, "766" },
73 { ATA_AMD768, 0x00, AMD_CABLE, 0, ATA_UDMA5, "768" },
74 { ATA_AMD8111, 0x00, AMD_CABLE, 0, ATA_UDMA6, "8111" },
75 { ATA_AMD5536, 0x00, 0x00, 0, ATA_UDMA5, "CS5536" },
76 { 0, 0, 0, 0, 0, 0}};
77
78 if (pci_get_vendor(dev) != ATA_AMD_ID)

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

108static int
109ata_amd_setmode(device_t dev, int target, int mode)
110{
111 device_t parent = device_get_parent(dev);
112 struct ata_pci_controller *ctlr = device_get_softc(parent);
113 struct ata_channel *ch = device_get_softc(dev);
114 int devno = (ch->unit << 1) + target;
115 int piomode;
116 u_int8_t timings[] = { 0xa8, 0x65, 0x42, 0x22, 0x20, 0xa8, 0x22, 0x20 };
117 int modes[7] = { 0xc2, 0xc1, 0xc0, 0xc4, 0xc5, 0xc6, 0xc7 };
116 static const uint8_t timings[] =
117 { 0xa8, 0x65, 0x42, 0x22, 0x20, 0xa8, 0x22, 0x20 };
118 static const uint8_t modes[] =
119 { 0xc2, 0xc1, 0xc0, 0xc4, 0xc5, 0xc6, 0xc7 };
118 int reg = 0x53 - devno;
119
120 mode = min(mode, ctlr->chip->max_dma);
121 if (ctlr->chip->cfg1 & AMD_CABLE) {
122 if (ata_dma_check_80pin && mode > ATA_UDMA2 &&
123 !(pci_read_config(parent, 0x42, 1) & (1 << devno))) {
124 ata_print_cable(dev, "controller");
125 mode = ATA_UDMA2;

--- 31 unchanged lines hidden ---
120 int reg = 0x53 - devno;
121
122 mode = min(mode, ctlr->chip->max_dma);
123 if (ctlr->chip->cfg1 & AMD_CABLE) {
124 if (ata_dma_check_80pin && mode > ATA_UDMA2 &&
125 !(pci_read_config(parent, 0x42, 1) & (1 << devno))) {
126 ata_print_cable(dev, "controller");
127 mode = ATA_UDMA2;

--- 31 unchanged lines hidden ---