Date: Tue, 17 Apr 2018 16:46:09 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332652 - in head/sys: conf dev/puc modules/puc Message-ID: <201804171646.w3HGk9vn040646@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Apr 17 16:46:08 2018 New Revision: 332652 URL: https://svnweb.freebsd.org/changeset/base/332652 Log: Add PNP info to the PCI attahement of the puc driver. Adjust sys/conf/files and sys/modules/puc/Makefile to omit pucdata.c now tht it's included by puc_pci.c. Submitted by: Lakhan Shiva Kamireddy (with build fixes by me) Pull Request: https://github.com/freebsd/freebsd/pull/136 Modified: head/sys/conf/files head/sys/dev/puc/puc_pci.c head/sys/modules/puc/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Apr 17 16:46:01 2018 (r332651) +++ head/sys/conf/files Tue Apr 17 16:46:08 2018 (r332652) @@ -2771,7 +2771,6 @@ dev/puc/puc.c optional puc dev/puc/puc_cfg.c optional puc dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci -dev/puc/pucdata.c optional puc pci dev/quicc/quicc_core.c optional quicc dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral Modified: head/sys/dev/puc/puc_pci.c ============================================================================== --- head/sys/dev/puc/puc_pci.c Tue Apr 17 16:46:01 2018 (r332651) +++ head/sys/dev/puc/puc_pci.c Tue Apr 17 16:46:08 2018 (r332652) @@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$"); #include <dev/puc/puc_cfg.h> #include <dev/puc/puc_bfe.h> +#include <dev/puc/pucdata.c> static int puc_msi_disable; SYSCTL_INT(_hw_puc, OID_AUTO, msi_disable, CTLFLAG_RDTUN, @@ -198,3 +199,5 @@ static driver_t puc_pci_driver = { }; DRIVER_MODULE(puc, pci, puc_pci_driver, puc_devclass, 0, 0); +MODULE_PNP_INFO("U16:vendor;U16:device;U16:#;U16:#;D:#", pci, puc, + puc_pci_devices, sizeof(puc_pci_devices[0]), nitems(puc_pci_devices) - 1); Modified: head/sys/modules/puc/Makefile ============================================================================== --- head/sys/modules/puc/Makefile Tue Apr 17 16:46:01 2018 (r332651) +++ head/sys/modules/puc/Makefile Tue Apr 17 16:46:08 2018 (r332652) @@ -4,7 +4,7 @@ .PATH: ${SRCTOP}/sys/dev/puc KMOD= puc -SRCS= puc.c puc_cfg.c puc_pci.c puc_pccard.c pucdata.c +SRCS= puc.c puc_cfg.c puc_pci.c puc_pccard.c SRCS+= bus_if.h device_if.h serdev_if.c serdev_if.h \ card_if.h pci_if.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804171646.w3HGk9vn040646>