Module Name: src
Committed By: snj
Date: Fri Dec 9 05:15:18 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs piixide.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1298):
sys/dev/pci/piixide.c: revision 1.65
sys/dev/pci/pcidevs: revision 1.1246
- s/82081/82801/ from OpenBSD.
- 0x2829 is SATA. 0x282a is RAID.
--
Rename macro (sync with pcidevs rev. 1.1246). No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.1199.2.7 -r1.1199.2.8 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.64 -r1.64.12.1 src/sys/dev/pci/piixide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1199.2.7 src/sys/dev/pci/pcidevs:1.1199.2.8
--- src/sys/dev/pci/pcidevs:1.1199.2.7 Thu Dec 8 07:56:45 2016
+++ src/sys/dev/pci/pcidevs Fri Dec 9 05:15:18 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1199.2.7 2016/12/08 07:56:45 snj Exp $
+$NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3571,8 +3571,8 @@ product INTEL 82801H_SATA_2 0x2825 82801
product INTEL C610_SATA_RAID_3 0x2826 C61x/X99 SATA Controller (RAID)
product INTEL C610_SSATA_RAID_2 0x2827 C61x/X99 sSATA Controller (RAID)
product INTEL 82801HEM_SATA 0x2828 82801HEM SATA Controller
-product INTEL 82801HBM_SATA_1 0x2829 82801HBM SATA Controller
-product INTEL 82801HBM_SATA_2 0x282a 82081HBM SATA Controller
+product INTEL 82801HBM_SATA_AHCI 0x2829 82801HBM AHCI SATA Controller
+product INTEL 82801HBM_SATA_RAID 0x282a 82801HBM SATA RAID Controller
product INTEL 82801H_USB_1 0x2830 82801H USB UHCI Controller
product INTEL 82801H_USB_2 0x2831 82801H USB UHCI Controller
product INTEL 82801H_USB_3 0x2832 82801H USB UHCI Controller
Index: src/sys/dev/pci/piixide.c
diff -u src/sys/dev/pci/piixide.c:1.64 src/sys/dev/pci/piixide.c:1.64.12.1
--- src/sys/dev/pci/piixide.c:1.64 Wed Nov 14 01:05:49 2012
+++ src/sys/dev/pci/piixide.c Fri Dec 9 05:15:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: piixide.c,v 1.64 2012/11/14 01:05:49 jakllsch Exp $ */
+/* $NetBSD: piixide.c,v 1.64.12.1 2016/12/09 05:15:18 snj Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.64 2012/11/14 01:05:49 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.64.12.1 2016/12/09 05:15:18 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -203,14 +203,14 @@ static const struct pciide_product_desc
"Intel 82801HBM IDE Controller (ICH8M)",
piix_chip_map,
},
- { PCI_PRODUCT_INTEL_82801HBM_SATA_1,
+ { PCI_PRODUCT_INTEL_82801HBM_SATA_AHCI,
0,
- "Intel 82801HBM Serial ATA Controller (ICH8M)",
+ "Intel 82801HBM Serial ATA AHCI Controller (ICH8M)",
piixsata_chip_map,
},
- { PCI_PRODUCT_INTEL_82801HBM_SATA_2,
+ { PCI_PRODUCT_INTEL_82801HBM_SATA_RAID,
0,
- "Intel 82801HBM Serial ATA Controller (ICH8M)",
+ "Intel 82801HBM Serial ATA RAID Controller (ICH8M)",
piixsata_chip_map,
},
{ PCI_PRODUCT_INTEL_82801HEM_SATA,
