ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dde_ipxe: fix probing multiple NICs 

Fixes #1870.
This commit is contained in:
Josef Söntgen 2016-01-31 15:30:50 +01:00 committed by Christian Helmuth
parent 81ff63c66b
commit 245dfc2c08
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
repos/dde_ipxe/src/lib/dde_ipxe/dde_support.cc
View File

@ -186,21 +186,29 @@ struct Pci_driver
int first_device(int *bus, int *dev, int *fun) int first_device(int *bus, int *dev, int *fun)
{ {
_cap = _pci.first_device(CLASS_NETWORK, CLASS_MASK); _cap = _pci.first_device(CLASS_NETWORK, CLASS_MASK);
if (!_cap.valid())
return -1;
_bus_address(bus, dev, fun); _bus_address(bus, dev, fun);
return 0; return 0;
} }
int next_device(int *bus, int *dev, int *fun) int next_device(int *bus, int *dev, int *fun)
{ {
int result = -1;
_last_cap = _cap; _last_cap = _cap;
_cap = _pci.next_device(_cap, CLASS_NETWORK, CLASS_MASK); _cap = _pci.next_device(_cap, CLASS_NETWORK, CLASS_MASK);
_bus_address(bus, dev, fun); if (_cap.valid()) {
_bus_address(bus, dev, fun);
result = 0;
}
if (_last_cap.valid()) if (_last_cap.valid())
_pci.release_device(_last_cap); _pci.release_device(_last_cap);
return 0; return result;
} }
Genode::addr_t alloc_dma_memory(Genode::size_t size) Genode::addr_t alloc_dma_memory(Genode::size_t size)
@ -383,10 +391,7 @@ extern "C" void dde_request_io(dde_uint8_t virt_bar_ioport)
{ {
using namespace Genode; using namespace Genode;
if (_io_port) { if (_io_port) destroy(env()->heap(), _io_port);
PERR("Io_port_connection already open");
sleep_forever();
}
Platform::Device_client device(pci_drv()._cap); Platform::Device_client device(pci_drv()._cap);
Io_port_session_capability cap = device.io_port(virt_bar_ioport); Io_port_session_capability cap = device.io_port(virt_bar_ioport);