Attachment #197394 for bug #231625




#define	PCI_PRODUCT_INTEL_WL_8265_1	0x24fd

static const struct iwm_devices {
	uint16_t		vendor;
	uint16_t		device;
	const struct iwm_cfg	*cfg;
} iwm_devices[] = {
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3160_1, &iwm3160_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3160_2, &iwm3160_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3165_1, &iwm3165_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3165_2, &iwm3165_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3168_1, &iwm3168_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7260_1, &iwm7260_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7260_2, &iwm7260_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7265_1, &iwm7265_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7265_2, &iwm7265_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8260_1, &iwm8260_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8260_2, &iwm8260_cfg },
	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8265_1, &iwm8265_cfg },
};

static int

static devclass_t iwm_devclass;

DRIVER_MODULE(iwm, pci, iwm_pci_driver, iwm_devclass, NULL, NULL);
MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, iwm_pci_driver, iwm_devices,
    sizeof(iwm_devices[0]), nitems(iwm_devices));
MODULE_DEPEND(iwm, firmware, 1, 1, 1);
MODULE_DEPEND(iwm, pci, 1, 1, 1);
MODULE_DEPEND(iwm, wlan, 1, 1, 1);

Return to bug 231625

Lines 5694-5714 iwm_intr(void *arg) Link Here

(-)b/sys/dev/iwm/if_iwm.c (-12 / +15 lines)
5694	#define PCI_PRODUCT_INTEL_WL_8265_1 0x24fd	5694	#define PCI_PRODUCT_INTEL_WL_8265_1 0x24fd
5695		5695
5696	static const struct iwm_devices {	5696	static const struct iwm_devices {
		5697	uint16_t vendor;
5697	uint16_t device;	5698	uint16_t device;
5698	const struct iwm_cfg *cfg;	5699	const struct iwm_cfg *cfg;
5699	} iwm_devices[] = {	5700	} iwm_devices[] = {
5700	{ PCI_PRODUCT_INTEL_WL_3160_1, &iwm3160_cfg },	5701	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3160_1, &iwm3160_cfg },
5701	{ PCI_PRODUCT_INTEL_WL_3160_2, &iwm3160_cfg },	5702	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3160_2, &iwm3160_cfg },
5702	{ PCI_PRODUCT_INTEL_WL_3165_1, &iwm3165_cfg },	5703	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3165_1, &iwm3165_cfg },
5703	{ PCI_PRODUCT_INTEL_WL_3165_2, &iwm3165_cfg },	5704	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3165_2, &iwm3165_cfg },
5704	{ PCI_PRODUCT_INTEL_WL_3168_1, &iwm3168_cfg },	5705	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_3168_1, &iwm3168_cfg },
5705	{ PCI_PRODUCT_INTEL_WL_7260_1, &iwm7260_cfg },	5706	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7260_1, &iwm7260_cfg },
5706	{ PCI_PRODUCT_INTEL_WL_7260_2, &iwm7260_cfg },	5707	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7260_2, &iwm7260_cfg },
5707	{ PCI_PRODUCT_INTEL_WL_7265_1, &iwm7265_cfg },	5708	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7265_1, &iwm7265_cfg },
5708	{ PCI_PRODUCT_INTEL_WL_7265_2, &iwm7265_cfg },	5709	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_7265_2, &iwm7265_cfg },
5709	{ PCI_PRODUCT_INTEL_WL_8260_1, &iwm8260_cfg },	5710	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8260_1, &iwm8260_cfg },
5710	{ PCI_PRODUCT_INTEL_WL_8260_2, &iwm8260_cfg },	5711	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8260_2, &iwm8260_cfg },
5711	{ PCI_PRODUCT_INTEL_WL_8265_1, &iwm8265_cfg },	5712	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_8265_1, &iwm8265_cfg },
5712	};	5713	};
5713		5714
5714	static int	5715	static int
Lines 6460-6465 static driver_t iwm_pci_driver = { Link Here
6460	static devclass_t iwm_devclass;	6461	static devclass_t iwm_devclass;
6461		6462
6462	DRIVER_MODULE(iwm, pci, iwm_pci_driver, iwm_devclass, NULL, NULL);	6463	DRIVER_MODULE(iwm, pci, iwm_pci_driver, iwm_devclass, NULL, NULL);
		6464	MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, iwm_pci_driver, iwm_devices,
		6465	sizeof(iwm_devices[0]), nitems(iwm_devices));
6463	MODULE_DEPEND(iwm, firmware, 1, 1, 1);	6466	MODULE_DEPEND(iwm, firmware, 1, 1, 1);
6464	MODULE_DEPEND(iwm, pci, 1, 1, 1);	6467	MODULE_DEPEND(iwm, pci, 1, 1, 1);
6465	MODULE_DEPEND(iwm, wlan, 1, 1, 1);	6468	MODULE_DEPEND(iwm, wlan, 1, 1, 1);