Mon Feb 1 08:28:48 2016 UTC ()
 Rename macro (sync with pcidevs rev. 1.1246). No functional change.


(msaitoh)
diff -r1.64 -r1.65 src/sys/dev/pci/piixide.c
cvs diff -r1.64 -r1.65 src/sys/dev/pci/piixide.c (expand / switch to unified diff)

--- src/sys/dev/pci/piixide.c 2012/11/14 01:05:49 1.64
+++ src/sys/dev/pci/piixide.c 2016/02/01 08:28:48 1.65
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1/* $NetBSD: piixide.c,v 1.64 2012/11/14 01:05:49 jakllsch Exp $ */ 1/* $NetBSD: piixide.c,v 1.65 2016/02/01 08:28:48 msaitoh 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 * 14 *
15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27#include <sys/cdefs.h> 27#include <sys/cdefs.h>
28__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.64 2012/11/14 01:05:49 jakllsch Exp $"); 28__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.65 2016/02/01 08:28:48 msaitoh Exp $");
29 29
30#include <sys/param.h> 30#include <sys/param.h>
31#include <sys/systm.h> 31#include <sys/systm.h>
32 32
33#include <dev/pci/pcivar.h> 33#include <dev/pci/pcivar.h>
34#include <dev/pci/pcidevs.h> 34#include <dev/pci/pcidevs.h>
35#include <dev/pci/pciidereg.h> 35#include <dev/pci/pciidereg.h>
36#include <dev/pci/pciidevar.h> 36#include <dev/pci/pciidevar.h>
37#include <dev/pci/pciide_piix_reg.h> 37#include <dev/pci/pciide_piix_reg.h>
38 38
39static void piix_chip_map(struct pciide_softc*, 39static void piix_chip_map(struct pciide_softc*,
40 const struct pci_attach_args *); 40 const struct pci_attach_args *);
41static void piix_setup_channel(struct ata_channel *); 41static void piix_setup_channel(struct ata_channel *);
@@ -193,34 +193,34 @@ static const struct pciide_product_desc  @@ -193,34 +193,34 @@ static const struct pciide_product_desc
193 "Intel 82801H Serial ATA RAID Controller (ICH8)", 193 "Intel 82801H Serial ATA RAID Controller (ICH8)",
194 piixsata_chip_map, 194 piixsata_chip_map,
195 }, 195 },
196 { PCI_PRODUCT_INTEL_82801H_SATA_2, 196 { PCI_PRODUCT_INTEL_82801H_SATA_2,
197 0, 197 0,
198 "Intel 82801H Serial ATA Controller (ICH8)", 198 "Intel 82801H Serial ATA Controller (ICH8)",
199 piixsata_chip_map, 199 piixsata_chip_map,
200 }, 200 },
201 { PCI_PRODUCT_INTEL_82801HBM_IDE, 201 { PCI_PRODUCT_INTEL_82801HBM_IDE,
202 0, 202 0,
203 "Intel 82801HBM IDE Controller (ICH8M)", 203 "Intel 82801HBM IDE Controller (ICH8M)",
204 piix_chip_map, 204 piix_chip_map,
205 }, 205 },
206 { PCI_PRODUCT_INTEL_82801HBM_SATA_1, 206 { PCI_PRODUCT_INTEL_82801HBM_SATA_AHCI,
207 0, 207 0,
208 "Intel 82801HBM Serial ATA Controller (ICH8M)", 208 "Intel 82801HBM Serial ATA AHCI Controller (ICH8M)",
209 piixsata_chip_map, 209 piixsata_chip_map,
210 }, 210 },
211 { PCI_PRODUCT_INTEL_82801HBM_SATA_2, 211 { PCI_PRODUCT_INTEL_82801HBM_SATA_RAID,
212 0, 212 0,
213 "Intel 82801HBM Serial ATA Controller (ICH8M)", 213 "Intel 82801HBM Serial ATA RAID Controller (ICH8M)",
214 piixsata_chip_map, 214 piixsata_chip_map,
215 }, 215 },
216 { PCI_PRODUCT_INTEL_82801HEM_SATA, 216 { PCI_PRODUCT_INTEL_82801HEM_SATA,
217 0, 217 0,
218 "Intel 82801HEM Serial ATA Controller (ICH8M)", 218 "Intel 82801HEM Serial ATA Controller (ICH8M)",
219 piixsata_chip_map, 219 piixsata_chip_map,
220 }, 220 },
221 { PCI_PRODUCT_INTEL_63XXESB_IDE, 221 { PCI_PRODUCT_INTEL_63XXESB_IDE,
222 0, 222 0,
223 "Intel 631xESB/632xESB IDE Controller", 223 "Intel 631xESB/632xESB IDE Controller",
224 piix_chip_map, 224 piix_chip_map,
225 }, 225 },
226 { PCI_PRODUCT_INTEL_82801I_SATA_1, 226 { PCI_PRODUCT_INTEL_82801I_SATA_1,