Deleted Added
full compact
ata-dma.c (87951) ata-dma.c (88159)
1/*-
2 * Copyright (c) 1998,1999,2000,2001 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 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
1/*-
2 * Copyright (c) 1998,1999,2000,2001 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 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * $FreeBSD: head/sys/dev/ata/ata-dma.c 87951 2001-12-14 21:28:49Z sos $
28 * $FreeBSD: head/sys/dev/ata/ata-dma.c 88159 2001-12-19 01:23:32Z jhb $
29 */
30
31#include "pci.h"
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/ata.h>
35#include <sys/bio.h>
36#include <sys/malloc.h>

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

519 }
520 /* we could set PIO mode timings, but we assume the BIOS did that */
521 break;
522
523 case 0x55131039: /* SiS 5591 */
524 if (ata_find_dev(parent, 0x06301039, 0x30) || /* SiS 630 */
525 ata_find_dev(parent, 0x06331039, 0x00) || /* SiS 633 */
526 ata_find_dev(parent, 0x06351039, 0x00) || /* SiS 635 */
29 */
30
31#include "pci.h"
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/ata.h>
35#include <sys/bio.h>
36#include <sys/malloc.h>

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

519 }
520 /* we could set PIO mode timings, but we assume the BIOS did that */
521 break;
522
523 case 0x55131039: /* SiS 5591 */
524 if (ata_find_dev(parent, 0x06301039, 0x30) || /* SiS 630 */
525 ata_find_dev(parent, 0x06331039, 0x00) || /* SiS 633 */
526 ata_find_dev(parent, 0x06351039, 0x00) || /* SiS 635 */
527 ata_find_dev(parent, 0x06451039, 0x00) || /* SiS 635 */
527 ata_find_dev(parent, 0x06451039, 0x00) || /* SiS 645 */
528 ata_find_dev(parent, 0x07301039, 0x00) || /* SiS 730 */
529 ata_find_dev(parent, 0x07331039, 0x00) || /* SiS 733 */
530 ata_find_dev(parent, 0x07351039, 0x00)) { /* SiS 735 */
531 int8_t reg = 0x40 + (devno << 1);
532 int16_t val = pci_read_config(parent, reg, 2) & 0x0fff;
533
534 if (udmamode >= 5) {
535 error = ata_command(scp, device, ATA_C_SETFEATURES, 0,

--- 756 unchanged lines hidden ---
528 ata_find_dev(parent, 0x07301039, 0x00) || /* SiS 730 */
529 ata_find_dev(parent, 0x07331039, 0x00) || /* SiS 733 */
530 ata_find_dev(parent, 0x07351039, 0x00)) { /* SiS 735 */
531 int8_t reg = 0x40 + (devno << 1);
532 int16_t val = pci_read_config(parent, reg, 2) & 0x0fff;
533
534 if (udmamode >= 5) {
535 error = ata_command(scp, device, ATA_C_SETFEATURES, 0,

--- 756 unchanged lines hidden ---