Deleted Added
full compact
ata-pci.c (94037) ata-pci.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-pci.c 94037 2002-04-07 07:53:34Z sos $
28 * $FreeBSD: head/sys/dev/ata/ata-pci.c 94426 2002-04-11 11:04:23Z sos $
29 */
30
31#include "opt_ata.h"
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/disk.h>
36#include <sys/module.h>

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

265 }
266 else
267 start = end = 0;
268 }
269 return "Promise TX2 ATA100 controller";
270
271 case 0x4d69105a:
272 case 0x5275105a:
29 */
30
31#include "opt_ata.h"
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/disk.h>
36#include <sys/module.h>

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

265 }
266 else
267 start = end = 0;
268 }
269 return "Promise TX2 ATA100 controller";
270
271 case 0x4d69105a:
272 case 0x5275105a:
273 case 0x6269105a:
273 return "Promise TX2 ATA133 controller";
274
275 case 0x00041103:
276 switch (pci_get_revid(dev)) {
277 case 0x00:
278 case 0x01:
279 return "HighPoint HPT366 ATA66 controller";
280 case 0x02:

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

567 (ch->unit ? 0x00004000 : 0x00000400)))
568 return 1;
569 break;
570
571 case 0x4d68105a: /* Promise TX2 ATA100 */
572 case 0x6268105a: /* Promise TX2 ATA100 */
573 case 0x4d69105a: /* Promise TX2 ATA133 */
574 case 0x5275105a: /* Promise TX2 ATA133 */
274 return "Promise TX2 ATA133 controller";
275
276 case 0x00041103:
277 switch (pci_get_revid(dev)) {
278 case 0x00:
279 case 0x01:
280 return "HighPoint HPT366 ATA66 controller";
281 case 0x02:

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

568 (ch->unit ? 0x00004000 : 0x00000400)))
569 return 1;
570 break;
571
572 case 0x4d68105a: /* Promise TX2 ATA100 */
573 case 0x6268105a: /* Promise TX2 ATA100 */
574 case 0x4d69105a: /* Promise TX2 ATA133 */
575 case 0x5275105a: /* Promise TX2 ATA133 */
576 case 0x6269105a: /* Promise TX2 ATA133 */
575 ATA_OUTB(ch->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
576 if (!(ATA_INB(ch->r_bmio, ATA_BMDEVSPEC_1) & 0x20))
577 return 1;
578 break;
579 }
580
581 if (ch->flags & ATA_DMA_ACTIVE) {
582 if (!((dmastat = ata_dmastatus(ch)) & ATA_BMSTAT_INTERRUPT))

--- 275 unchanged lines hidden ---
577 ATA_OUTB(ch->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
578 if (!(ATA_INB(ch->r_bmio, ATA_BMDEVSPEC_1) & 0x20))
579 return 1;
580 break;
581 }
582
583 if (ch->flags & ATA_DMA_ACTIVE) {
584 if (!((dmastat = ata_dmastatus(ch)) & ATA_BMSTAT_INTERRUPT))

--- 275 unchanged lines hidden ---