diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2006-09-01 16:11:12 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2006-09-01 16:11:12 +0000 |
| commit | acda5dd92a257782ddd80b1fb6a5f6543d280db6 (patch) | |
| tree | e6b950e6c459160b25575e705a3494c8d2e99f83 /sys/dev/em | |
| parent | 34de220dcf5086bc0c13420d390d6eeb026d6c66 (diff) | |
Notes
Diffstat (limited to 'sys/dev/em')
| -rw-r--r-- | sys/dev/em/if_em.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index 8d9a1d3b98a3..b0f878346b75 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -1978,22 +1978,16 @@ em_identify_hardware(struct adapter *adapter) device_t dev = adapter->dev; /* Make sure our PCI config space has the necessary stuff set */ + pci_enable_busmaster(dev); + pci_enable_io(dev, SYS_RES_MEMORY); adapter->hw.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2); - if (!((adapter->hw.pci_cmd_word & PCIM_CMD_BUSMASTEREN) && - (adapter->hw.pci_cmd_word & PCIM_CMD_MEMEN))) { - device_printf(dev, "Memory Access and/or Bus Master bits " - "were not set!\n"); - adapter->hw.pci_cmd_word |= - (PCIM_CMD_BUSMASTEREN | PCIM_CMD_MEMEN); - pci_write_config(dev, PCIR_COMMAND, adapter->hw.pci_cmd_word, 2); - } /* Save off the information about this board */ adapter->hw.vendor_id = pci_get_vendor(dev); adapter->hw.device_id = pci_get_device(dev); - adapter->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1); - adapter->hw.subsystem_vendor_id = pci_read_config(dev, PCIR_SUBVEND_0, 2); - adapter->hw.subsystem_id = pci_read_config(dev, PCIR_SUBDEV_0, 2); + adapter->hw.revision_id = pci_get_revid(dev); + adapter->hw.subsystem_vendor_id = pci_get_subvendor(dev); + adapter->hw.subsystem_id = pci_get_subdevice(dev); /* Identify the MAC */ if (em_set_mac_type(&adapter->hw)) |