Mon Mar 9 13:13:25 2009 UTC ()
Match Inter 82965PM, from Anon Ymous


(christos)
diff -r1.48 -r1.49 src/sys/dev/pci/piixide.c
cvs diff -r1.48 -r1.49 src/sys/dev/pci/piixide.c (expand / switch to unified diff)

--- src/sys/dev/pci/piixide.c 2009/02/11 06:39:43 1.48
+++ src/sys/dev/pci/piixide.c 2009/03/09 13:13:25 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: piixide.c,v 1.48 2009/02/11 06:39:43 markd Exp $ */ 1/* $NetBSD: piixide.c,v 1.49 2009/03/09 13:13:25 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. 4 * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 3. All advertising materials mentioning features or use of this software 14 * 3. All advertising materials mentioning features or use of this software
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 20 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
21 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 21 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
22 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 22 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
23 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 23 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
24 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 24 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.48 2009/02/11 06:39:43 markd Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.49 2009/03/09 13:13:25 christos Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37 37
38#include <dev/pci/pcivar.h> 38#include <dev/pci/pcivar.h>
39#include <dev/pci/pcidevs.h> 39#include <dev/pci/pcidevs.h>
40#include <dev/pci/pciidereg.h> 40#include <dev/pci/pciidereg.h>
41#include <dev/pci/pciidevar.h> 41#include <dev/pci/pciidevar.h>
42#include <dev/pci/pciide_piix_reg.h> 42#include <dev/pci/pciide_piix_reg.h>
43 43
44static void piix_chip_map(struct pciide_softc*, struct pci_attach_args *); 44static void piix_chip_map(struct pciide_softc*, struct pci_attach_args *);
45static void piix_setup_channel(struct ata_channel *); 45static void piix_setup_channel(struct ata_channel *);
46static void piix3_4_setup_channel(struct ata_channel *); 46static void piix3_4_setup_channel(struct ata_channel *);
@@ -276,26 +276,32 @@ static const struct pciide_product_desc  @@ -276,26 +276,32 @@ static const struct pciide_product_desc
276 "Intel ICH10 Serial ATA 2 Controller 2x2", 276 "Intel ICH10 Serial ATA 2 Controller 2x2",
277 piixsata_chip_map, 277 piixsata_chip_map,
278 }, 278 },
279 { PCI_PRODUCT_INTEL_ICH10_SATA2_4x1, 279 { PCI_PRODUCT_INTEL_ICH10_SATA2_4x1,
280 0, 280 0,
281 "Intel ICH10 Serial ATA 2 Controller 4x1", 281 "Intel ICH10 Serial ATA 2 Controller 4x1",
282 piixsata_chip_map, 282 piixsata_chip_map,
283 }, 283 },
284 { PCI_PRODUCT_INTEL_ICH10_SATA2_4x2, 284 { PCI_PRODUCT_INTEL_ICH10_SATA2_4x2,
285 0, 285 0,
286 "Intel ICH10 Serial ATA 2 Controller 4x2", 286 "Intel ICH10 Serial ATA 2 Controller 4x2",
287 piixsata_chip_map, 287 piixsata_chip_map,
288 }, 288 },
 289 {
 290 PCI_PRODUCT_INTEL_82965PM_IDE,
 291 0,
 292 "Intel 82965PM IDE controller",
 293 piixsata_chip_map,
 294 },
289 { 0, 295 { 0,
290 0, 296 0,
291 NULL, 297 NULL,
292 NULL 298 NULL
293 } 299 }
294}; 300};
295 301
296CFATTACH_DECL_NEW(piixide, sizeof(struct pciide_softc), 302CFATTACH_DECL_NEW(piixide, sizeof(struct pciide_softc),
297 piixide_match, piixide_attach, NULL, NULL); 303 piixide_match, piixide_attach, NULL, NULL);
298 304
299static int 305static int
300piixide_match(device_t parent, cfdata_t match, void *aux) 306piixide_match(device_t parent, cfdata_t match, void *aux)
301{ 307{