Deleted Added
full compact
ata-dma.c (94037) ata-dma.c (94426)
1/*-
2 * Copyright (c) 1998,1999,2000,2001,2002 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,2002 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 94037 2002-04-07 07:53:34Z sos $
28 * $FreeBSD: head/sys/dev/ata/ata-dma.c 94426 2002-04-11 11:04:23Z sos $
29 */
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/ata.h>
34#include <sys/bio.h>
35#include <sys/malloc.h>
36#include <sys/bus.h>

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

965 return;
966 }
967 }
968 /* we could set PIO mode timings, but we assume the BIOS did that */
969 break;
970
971 case 0x4d69105a: /* Promise TX2 ATA133 controllers */
972 case 0x5275105a: /* Promise TX2 ATA133 controllers */
29 */
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/ata.h>
34#include <sys/bio.h>
35#include <sys/malloc.h>
36#include <sys/bus.h>

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

965 return;
966 }
967 }
968 /* we could set PIO mode timings, but we assume the BIOS did that */
969 break;
970
971 case 0x4d69105a: /* Promise TX2 ATA133 controllers */
972 case 0x5275105a: /* Promise TX2 ATA133 controllers */
973 case 0x6269105a: /* Promise TX2 ATA133 controllers */
973 ATA_OUTB(atadev->channel->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
974 if (udmamode >= 6 &&
975 !(ATA_INB(atadev->channel->r_bmio, ATA_BMDEVSPEC_1) & 0x04)) {
976 error = ata_command(atadev, ATA_C_SETFEATURES, 0,
977 ATA_UDMA6, ATA_C_F_SETXFER, ATA_WAIT_READY);
978 if (bootverbose)
979 ata_prtdev(atadev, "%s setting UDMA6 on Promise chip\n",
980 (error) ? "failed" : "success");

--- 569 unchanged lines hidden ---
974 ATA_OUTB(atadev->channel->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
975 if (udmamode >= 6 &&
976 !(ATA_INB(atadev->channel->r_bmio, ATA_BMDEVSPEC_1) & 0x04)) {
977 error = ata_command(atadev, ATA_C_SETFEATURES, 0,
978 ATA_UDMA6, ATA_C_F_SETXFER, ATA_WAIT_READY);
979 if (bootverbose)
980 ata_prtdev(atadev, "%s setting UDMA6 on Promise chip\n",
981 (error) ? "failed" : "success");

--- 569 unchanged lines hidden ---