From fce1e25542b7858db2a73cb9064c6e434862007d Mon Sep 17 00:00:00 2001 From: deraadt Date: Sat, 17 Apr 2021 14:29:02 +0000 Subject: [PATCH] sync --- sys/dev/pci/pcidevs.h | 34 +++++++++++++++++----------------- sys/dev/pci/pcidevs_data.h | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index b87a2066534..e3bd74b220a 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.1964 2021/04/14 18:36:42 stsp Exp + * OpenBSD: pcidevs,v 1.1965 2021/04/17 14:28:58 deraadt Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -641,8 +641,8 @@ #define PCI_PRODUCT_ALI_M1695 0x1695 /* M1695 PCI */ #define PCI_PRODUCT_ALI_M3309 0x3309 /* M3309 MPEG */ #define PCI_PRODUCT_ALI_M4803 0x5215 /* M4803 */ -#define PCI_PRODUCT_ALI_M5219 0x5219 /* M5219 UDMA IDE */ -#define PCI_PRODUCT_ALI_M5229 0x5229 /* M5229 UDMA IDE */ +#define PCI_PRODUCT_ALI_M5219 0x5219 /* M5219 IDE */ +#define PCI_PRODUCT_ALI_M5229 0x5229 /* M5229 IDE */ #define PCI_PRODUCT_ALI_M5237 0x5237 /* M5237 USB */ #define PCI_PRODUCT_ALI_M5239 0x5239 /* M5239 USB2 */ #define PCI_PRODUCT_ALI_M5243 0x5243 /* M5243 AGP/PCI-PCI */ @@ -3461,13 +3461,13 @@ #define PCI_PRODUCT_INTEL_WL_130_2 0x0897 /* Centrino Wireless-N 130 */ #define PCI_PRODUCT_INTEL_WL_100_1 0x08ae /* Centrino Wireless-N 100 */ #define PCI_PRODUCT_INTEL_WL_100_2 0x08af /* Centrino Wireless-N 100 */ -#define PCI_PRODUCT_INTEL_WL_7260_1 0x08b1 /* Dual Band Wireless AC 7260 */ -#define PCI_PRODUCT_INTEL_WL_7260_2 0x08b2 /* Dual Band Wireless AC 7260 */ -#define PCI_PRODUCT_INTEL_WL_3160_1 0x08b3 /* Dual Band Wireless AC 3160 */ -#define PCI_PRODUCT_INTEL_WL_3160_2 0x08b4 /* Dual Band Wireless AC 3160 */ +#define PCI_PRODUCT_INTEL_WL_7260_1 0x08b1 /* AC 7260 */ +#define PCI_PRODUCT_INTEL_WL_7260_2 0x08b2 /* AC 7260 */ +#define PCI_PRODUCT_INTEL_WL_3160_1 0x08b3 /* AC 3160 */ +#define PCI_PRODUCT_INTEL_WL_3160_2 0x08b4 /* AC 3160 */ #define PCI_PRODUCT_INTEL_NVME 0x0953 /* NVMe */ -#define PCI_PRODUCT_INTEL_WL_7265_1 0x095a /* Dual Band Wireless AC 7265 */ -#define PCI_PRODUCT_INTEL_WL_7265_2 0x095b /* Dual Band Wireless AC 7265 */ +#define PCI_PRODUCT_INTEL_WL_7265_1 0x095a /* AC 7265 */ +#define PCI_PRODUCT_INTEL_WL_7265_2 0x095b /* AC 7265 */ #define PCI_PRODUCT_INTEL_80960RP 0x0960 /* i960 RP */ #define PCI_PRODUCT_INTEL_80960RM 0x0962 /* i960 RM */ #define PCI_PRODUCT_INTEL_80960RN 0x0964 /* i960 RN */ @@ -4386,10 +4386,10 @@ #define PCI_PRODUCT_INTEL_82801EB_USB_5 0x24dd /* 82801EB/ER USB2 */ #define PCI_PRODUCT_INTEL_82801EB_USB_4 0x24de /* 82801EB/ER USB */ #define PCI_PRODUCT_INTEL_82801ER_SATA 0x24df /* 82801ER SATA */ -#define PCI_PRODUCT_INTEL_WL_8260_1 0x24f3 /* Dual Band Wireless AC 8260 */ -#define PCI_PRODUCT_INTEL_WL_8260_2 0x24f4 /* Dual Band Wireless AC 8260 */ -#define PCI_PRODUCT_INTEL_WL_4165_1 0x24f5 /* Dual Band Wireless AC 4165 */ -#define PCI_PRODUCT_INTEL_WL_4165_2 0x24f6 /* Dual Band Wireless AC 4165 */ +#define PCI_PRODUCT_INTEL_WL_8260_1 0x24f3 /* AC 8260 */ +#define PCI_PRODUCT_INTEL_WL_8260_2 0x24f4 /* AC 8260 */ +#define PCI_PRODUCT_INTEL_WL_4165_1 0x24f5 /* AC 4165 */ +#define PCI_PRODUCT_INTEL_WL_4165_2 0x24f6 /* AC 4165 */ #define PCI_PRODUCT_INTEL_WL_3168_1 0x24fb /* Dual Band Wireless-AC 3168 */ #define PCI_PRODUCT_INTEL_WL_8265_1 0x24fd /* Dual Band Wireless-AC 8265 */ #define PCI_PRODUCT_INTEL_82820_HB 0x2501 /* 82820 Host */ @@ -4887,8 +4887,8 @@ #define PCI_PRODUCT_INTEL_I225_K 0x3100 /* I225-K */ #define PCI_PRODUCT_INTEL_I225_K2 0x3101 /* I225-K2 */ #define PCI_PRODUCT_INTEL_3124 0x3124 /* 3124 SATA */ -#define PCI_PRODUCT_INTEL_WL_3165_1 0x3165 /* Dual Band Wireless AC 3165 */ -#define PCI_PRODUCT_INTEL_WL_3165_2 0x3166 /* Dual Band Wireless AC 3165 */ +#define PCI_PRODUCT_INTEL_WL_3165_1 0x3165 /* AC 3165 */ +#define PCI_PRODUCT_INTEL_WL_3165_2 0x3166 /* AC 3165 */ #define PCI_PRODUCT_INTEL_GLK_UHD_605 0x3184 /* UHD Graphics 605 */ #define PCI_PRODUCT_INTEL_GLK_UHD_600 0x3185 /* UHD Graphics 600 */ #define PCI_PRODUCT_INTEL_GLK_DPTF 0x318c /* Gemini Lake DPTF */ @@ -5916,7 +5916,7 @@ #define PCI_PRODUCT_INTEL_300SERIES_U_I2C_6 0x9deb /* 300 Series I2C */ #define PCI_PRODUCT_INTEL_300SERIES_U_XHCI 0x9ded /* 300 Series xHCI */ #define PCI_PRODUCT_INTEL_300SERIES_U_SSRAM 0x9def /* 300 Series Shared SRAM */ -#define PCI_PRODUCT_INTEL_WL_9560_1 0x9df0 /* Dual Band Wireless AC 9560 */ +#define PCI_PRODUCT_INTEL_WL_9560_1 0x9df0 /* AC 9560 */ #define PCI_PRODUCT_INTEL_300SERIES_U_SDXC 0x9df5 /* 300 Series SDXC */ #define PCI_PRODUCT_INTEL_300SERIES_U_THERM 0x9df9 /* 300 Series Thermal */ #define PCI_PRODUCT_INTEL_300SERIES_U_SPI_2 0x9dfb /* 300 Series SPI */ @@ -6166,7 +6166,7 @@ #define PCI_PRODUCT_INTEL_300SERIES_XHCI 0xa36d /* 300 Series xHCI */ #define PCI_PRODUCT_INTEL_300SERIES_XDCI 0xa36e /* 300 Series xDCI */ #define PCI_PRODUCT_INTEL_300SERIES_SSRAM 0xa36f /* 300 Series Shared SRAM */ -#define PCI_PRODUCT_INTEL_WL_9560_2 0xa370 /* Dual Band Wireless AC 9560 */ +#define PCI_PRODUCT_INTEL_WL_9560_2 0xa370 /* AC 9560 */ #define PCI_PRODUCT_INTEL_300SERIES_THERM 0xa379 /* 300 Series Thermal */ #define PCI_PRODUCT_INTEL_300SERIES_GSPI_3 0xa37b /* 300 Series GSPI */ #define PCI_PRODUCT_INTEL_300SERIES_ISH 0xa37c /* 300 Series ISH */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index aacd08fe3c2..1a94da1dc67 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.1964 2021/04/14 18:36:42 stsp Exp + * OpenBSD: pcidevs,v 1.1965 2021/04/17 14:28:58 deraadt Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -905,11 +905,11 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5219, - "M5219 UDMA IDE", + "M5219 IDE", }, { PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5229, - "M5229 UDMA IDE", + "M5229 IDE", }, { PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5237, @@ -11257,19 +11257,19 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7260_1, - "Dual Band Wireless AC 7260", + "AC 7260", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7260_2, - "Dual Band Wireless AC 7260", + "AC 7260", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3160_1, - "Dual Band Wireless AC 3160", + "AC 3160", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3160_2, - "Dual Band Wireless AC 3160", + "AC 3160", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_NVME, @@ -11277,11 +11277,11 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7265_1, - "Dual Band Wireless AC 7265", + "AC 7265", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7265_2, - "Dual Band Wireless AC 7265", + "AC 7265", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RP, @@ -14957,19 +14957,19 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8260_1, - "Dual Band Wireless AC 8260", + "AC 8260", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8260_2, - "Dual Band Wireless AC 8260", + "AC 8260", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_4165_1, - "Dual Band Wireless AC 4165", + "AC 4165", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_4165_2, - "Dual Band Wireless AC 4165", + "AC 4165", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3168_1, @@ -16961,11 +16961,11 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3165_1, - "Dual Band Wireless AC 3165", + "AC 3165", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3165_2, - "Dual Band Wireless AC 3165", + "AC 3165", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_UHD_605, @@ -21077,7 +21077,7 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_9560_1, - "Dual Band Wireless AC 9560", + "AC 9560", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_300SERIES_U_SDXC, @@ -22077,7 +22077,7 @@ static const struct pci_known_product pci_known_products[] = { }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_9560_2, - "Dual Band Wireless AC 9560", + "AC 9560", }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_300SERIES_THERM, -- 2.20.1