diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2011-07-21 23:24:54 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2011-07-21 23:24:54 +0000 |
| commit | f552470eec83d3587c603922404ea5115c6963a7 (patch) | |
| tree | f12fca8ecbff140b90683c083795da5299f89452 /bsd_eth_drivers/if_em/if_em.c | |
| parent | 2011-07-20 Till Straumann <Till.Straumann@TU-Berlin.de> (diff) | |
| download | libbsdport-f552470eec83d3587c603922404ea5115c6963a7.tar.bz2 | |
2011-07-21 Till Straumann <Till.Straumann@TU-Berlin.de>
* if_em/e1000_osdep.h, if_em/e1000_osdep.c, if_em/if_em.c:
added e1000_register()/e1000_unregister() to keep track of
devices that are 'in-use'. This allows for sharing the low-level
code between bsdnet and standalone drivers (e.g., for PtP
GigE links).
Diffstat (limited to 'bsd_eth_drivers/if_em/if_em.c')
| -rw-r--r-- | bsd_eth_drivers/if_em/if_em.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/bsd_eth_drivers/if_em/if_em.c b/bsd_eth_drivers/if_em/if_em.c index 9d2f8d5..f0e06d6 100644 --- a/bsd_eth_drivers/if_em/if_em.c +++ b/bsd_eth_drivers/if_em/if_em.c @@ -441,18 +441,6 @@ em_probe(device_t dev) INIT_DEBUGOUT("em_probe: begin"); -#ifdef __rtems__ - /* copy PCI signature to the low-level (bsd-agnostic) support - * struct. - */ - { - struct adapter *adapter = device_get_softc(dev); - adapter->osdep.pcisig.bus = dev->bushdr.pci.bus; - adapter->osdep.pcisig.dev = dev->bushdr.pci.dev; - adapter->osdep.pcisig.fun = dev->bushdr.pci.fun; - } -#endif - pci_vendor_id = pci_get_vendor(dev); if (pci_vendor_id != EM_VENDOR_ID) return (ENXIO); @@ -471,6 +459,22 @@ em_probe(device_t dev) ((pci_subdevice_id == ent->subdevice_id) || (ent->subdevice_id == PCI_ANY_ID))) { +#ifdef __rtems__ + /* Copy PCI signature to the low-level (bsd-agnostic) + * support struct and register with ll-support. This + * step also detects if the device is already in use. + */ + { + struct adapter *adapter = device_get_softc(dev); + + if ( e1000_register( &adapter->osdep.pcisig, + dev->bushdr.pci.bus, + dev->bushdr.pci.dev, + dev->bushdr.pci.fun ) ) { + return (EBUSY); + } + } +#endif sprintf(adapter_name, "%s %s", em_strings[ent->index], em_driver_version); @@ -835,6 +839,10 @@ err_pci: em_free_pci_resources(adapter); EM_LOCK_DESTROY(adapter); +#ifdef __rtems__ + e1000_unregister( &adapter->osdep.pcisig ); +#endif + return (error); } @@ -910,6 +918,10 @@ em_detach(device_t dev) EM_LOCK_DESTROY(adapter); +#ifdef __rtems__ + e1000_unregister( &adapter->osdep.pcisig ); +#endif + return (0); } |