Deleted Added
full compact
ata-pci.c (84419) ata-pci.c (85345)
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-pci.c 84419 2001-10-03 11:36:25Z sos $
28 * $FreeBSD: head/sys/dev/ata/ata-pci.c 85345 2001-10-23 08:01:47Z sos $
29 */
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/disk.h>
35#include <sys/module.h>
36#include <sys/bus.h>

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

200 case 0x0d30105a:
201 case 0x4d30105a:
202 return "Promise ATA100 controller";
203
204 case 0x4d68105a:
205 case 0x6268105a:
206 return "Promise TX2 ATA100 controller";
207
29 */
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/disk.h>
35#include <sys/module.h>
36#include <sys/bus.h>

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

200 case 0x0d30105a:
201 case 0x4d30105a:
202 return "Promise ATA100 controller";
203
204 case 0x4d68105a:
205 case 0x6268105a:
206 return "Promise TX2 ATA100 controller";
207
208 case 0x4d69105a:
209 return "Promise ATA133 controller";
210
208 case 0x00041103:
209 switch (pci_get_revid(dev)) {
210 case 0x00:
211 case 0x01:
212 return "HighPoint HPT366 ATA66 controller";
213 case 0x02:
214 return "HighPoint HPT368 ATA66 controller";
215 case 0x03:

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

439 case 0x0d30105a: /* Promise OEM ATA100 */
440 if (!(ATA_INL(scp->r_bmio, (scp->channel ? 0x14 : 0x1c)) &
441 (scp->channel ? 0x00004000 : 0x00000400)))
442 return 1;
443 break;
444
445 case 0x4d68105a: /* Promise TX2 ATA100 */
446 case 0x6268105a: /* Promise TX2v2 ATA100 */
211 case 0x00041103:
212 switch (pci_get_revid(dev)) {
213 case 0x00:
214 case 0x01:
215 return "HighPoint HPT366 ATA66 controller";
216 case 0x02:
217 return "HighPoint HPT368 ATA66 controller";
218 case 0x03:

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

442 case 0x0d30105a: /* Promise OEM ATA100 */
443 if (!(ATA_INL(scp->r_bmio, (scp->channel ? 0x14 : 0x1c)) &
444 (scp->channel ? 0x00004000 : 0x00000400)))
445 return 1;
446 break;
447
448 case 0x4d68105a: /* Promise TX2 ATA100 */
449 case 0x6268105a: /* Promise TX2v2 ATA100 */
450 case 0x4d69105a: /* Promise ATA133 */
447 ATA_OUTB(scp->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
448 if (!(ATA_INB(scp->r_bmio, ATA_BMDEVSPEC_1) & 0x20))
449 return 1;
450 break;
451 }
452
453 if (scp->flags & ATA_DMA_ACTIVE) {
454 if (!((dmastat = ata_dmastatus(scp)) & ATA_BMSTAT_INTERRUPT))

--- 273 unchanged lines hidden ---
451 ATA_OUTB(scp->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
452 if (!(ATA_INB(scp->r_bmio, ATA_BMDEVSPEC_1) & 0x20))
453 return 1;
454 break;
455 }
456
457 if (scp->flags & ATA_DMA_ACTIVE) {
458 if (!((dmastat = ata_dmastatus(scp)) & ATA_BMSTAT_INTERRUPT))

--- 273 unchanged lines hidden ---