Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add PNP info to PCI attachment of aac, ncr, ath, aacraid drivers #2

Merged
merged 10 commits into from
May 16, 2018
Merged

Add PNP info to PCI attachment of aac, ncr, ath, aacraid drivers #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3fc7cd8
Adding PNP_INFO to aac
lakhanshiva May 2, 2018
a30d60c
Change descriptor string for MODULE_PNP_INFO in aac
lakhanshiva May 3, 2018
94dae4a
Add PNP info to the PCI attachment of the ncr driver.
lakhanshiva May 3, 2018
18a47bd
Add PNP info to PCI attachment of ath driver, modify ncr driver and a…
lakhanshiva May 3, 2018
71384ca
Add PNP info to the PCI attachment of the aacraid driver.
lakhanshiva May 11, 2018
cefd9cb
Modifying PNP info to correct the .num_entry field
lakhanshiva May 11, 2018
37722c6
Modify sizeof attribute of PNP in if_ath_pci.c
lakhanshiva May 12, 2018
703caee
Update PNP info for aacraid
lakhanshiva May 14, 2018
9740852
Update PNP info for aac_pci
lakhanshiva May 14, 2018
29d3f33
Moved device table before PNP info in aacraid
lakhanshiva May 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sys/dev/aac/aac_pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,8 @@ static driver_t aacch_driver = {

static devclass_t aacch_devclass;
DRIVER_MODULE(aacch, pci, aacch_driver, aacch_devclass, NULL, NULL);
MODULE_PNP_INFO("U16:vendor;U16:device", pci, aacch,
aac_identifiers, sizeof(aac_identifiers[0]), nitems(aac_identifiers) - 1);

static int
aacch_probe(device_t dev)
Expand Down
9 changes: 6 additions & 3 deletions sys/dev/aacraid/aacraid_pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ static driver_t aacraid_pci_driver = {

static devclass_t aacraid_devclass;

DRIVER_MODULE(aacraid, pci, aacraid_pci_driver, aacraid_devclass, 0, 0);
MODULE_DEPEND(aacraid, pci, 1, 1, 1);

struct aac_ident
{
u_int16_t vendor;
Expand All @@ -107,6 +104,12 @@ struct aac_ident
{0, 0, 0, 0, 0, 0, 0}
};

DRIVER_MODULE(aacraid, pci, aacraid_pci_driver, aacraid_devclass, 0, 0);
MODULE_PNP_INFO("U16:vendor;U16:device", pci, aacraid,
aacraid_family_identifiers, sizeof(aacraid_family_identifiers[0]),
nitems(aacraid_family_identifiers) - 1);
MODULE_DEPEND(aacraid, pci, 1, 1, 1);

static struct aac_ident *
aac_find_ident(device_t dev)
{
Expand Down
2 changes: 2 additions & 0 deletions sys/dev/ath/if_ath_pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,8 @@ static driver_t ath_pci_driver = {
};
static devclass_t ath_devclass;
DRIVER_MODULE(if_ath_pci, pci, ath_pci_driver, ath_devclass, 0, 0);
MODULE_PNP_INFO("U16:vendor;U16:device;U16:#;U16:#", pci, if_ath_pci,
ath_pci_id_table, sizeof(ath_pci_id_table[0]), nitems(ath_pci_id_table) - 1);
MODULE_VERSION(if_ath_pci, 1);
MODULE_DEPEND(if_ath_pci, wlan, 1, 1, 1); /* 802.11 media layer */
MODULE_DEPEND(if_ath_pci, ath_main, 1, 1, 1); /* if_ath driver */
Expand Down
2 changes: 2 additions & 0 deletions sys/dev/ncr/ncr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7108,6 +7108,8 @@ static driver_t ncr_driver = {
static devclass_t ncr_devclass;

DRIVER_MODULE(ncr, pci, ncr_driver, ncr_devclass, 0, 0);
MODULE_PNP_INFO("U32:device;U16:#;D:#", pci, ncr, ncr_chip_table,
sizeof(ncr_chip_table[0]), nitems(ncr_chip_table));
MODULE_DEPEND(ncr, cam, 1, 1, 1);
MODULE_DEPEND(ncr, pci, 1, 1, 1);

Expand Down