Deleted Added
full compact
ata-all.c (69774) ata-all.c (70186)
1/*-
2 * Copyright (c) 1998,1999,2000 S�ren Schmidt
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 S�ren Schmidt
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-all.c 69774 2000-12-08 20:09:00Z phk $
28 * $FreeBSD: head/sys/dev/ata/ata-all.c 70186 2000-12-19 10:37:03Z sos $
29 */
30
31#include "ata.h"
32#include "isa.h"
33#include "card.h"
34#include "pci.h"
35#include "atadisk.h"
36#include "atapicd.h"

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

259
260 case 0x24118086:
261 return "Intel ICH ATA66 controller";
262
263 case 0x244b8086:
264 return "Intel ICH2 ATA100 controller";
265
266 case 0x522910b9:
29 */
30
31#include "ata.h"
32#include "isa.h"
33#include "card.h"
34#include "pci.h"
35#include "atadisk.h"
36#include "atapicd.h"

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

259
260 case 0x24118086:
261 return "Intel ICH ATA66 controller";
262
263 case 0x244b8086:
264 return "Intel ICH2 ATA100 controller";
265
266 case 0x522910b9:
267 return "AcerLabs Aladdin ATA33 controller";
267 if (pci_get_revid(dev) < 0x20)
268 return "AcerLabs Aladdin ATA controller";
269 else
270 return "AcerLabs Aladdin ATA33 controller";
268
269 case 0x05711106:
270 if (ata_find_dev(dev, 0x05861106, 0))
271 return "VIA 82C586 ATA33 controller";
272 if (ata_find_dev(dev, 0x05961106, 0x12))
273 return "VIA 82C596 ATA66 controller";
274 if (ata_find_dev(dev, 0x05961106, 0))
275 return "VIA 82C596 ATA33 controller";

--- 1532 unchanged lines hidden ---
271
272 case 0x05711106:
273 if (ata_find_dev(dev, 0x05861106, 0))
274 return "VIA 82C586 ATA33 controller";
275 if (ata_find_dev(dev, 0x05961106, 0x12))
276 return "VIA 82C596 ATA66 controller";
277 if (ata_find_dev(dev, 0x05961106, 0))
278 return "VIA 82C596 ATA33 controller";

--- 1532 unchanged lines hidden ---