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

pci: remove device_cap from dma calls

Browse Source 
Issue #1486
This commit is contained in:
Alexander Boettcher
2015-04-22 16:31:39 +02:00
committed by Christian Helmuth
parent 0ed45d92ff
commit e4d663cf41
8 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
repos/dde_linux/src/lib/usb/pci_driver.cc
View File

@@ -250,7 +250,6 @@ struct Dma_object : Memory_object_base
** Linux interface **
*********************/
static Pci::Device_capability pci_device_cap;
static Pci::Connection pci;
static Genode::Object_pool<Memory_object_base> memory_pool;
@@ -288,13 +287,6 @@ int pci_register_driver(struct pci_driver *drv)
Pci_driver *pci_drv = 0;
try {
/*
* Assign cap already here, since for probing already DMA
* buffer is required and allocated by
* Genode::Mem::alloc_dma_buffer(size_t size)
*/
pci_device_cap = cap;
/* trigger that the device get be assigned to the usb driver */
pci.config_extended(cap);
@@ -395,7 +387,7 @@ const char *pci_name(const struct pci_dev *pdev)
void Ram_object::free() { Genode::env()->ram_session()->free(ram_cap()); }
void Dma_object::free() { pci.free_dma_buffer(pci_device_cap, ram_cap()); }
void Dma_object::free() { pci.free_dma_buffer(ram_cap()); }
Genode::Ram_dataspace_capability
@@ -409,7 +401,7 @@ Backend_memory::alloc(Genode::addr_t size, Genode::Cache_attribute cached)
cap = env()->ram_session()->alloc(size);
o = new (env()->heap()) Ram_object(cap);
} else {
cap = pci.alloc_dma_buffer(pci_device_cap, size);
cap = pci.alloc_dma_buffer(size);
o = new (env()->heap()) Dma_object(cap);
}

9
repos/dde_linux/src/lib/wifi/pci_driver.cc
View File

@@ -293,11 +293,6 @@ extern "C" int pci_register_driver(struct pci_driver *drv)
while (cap.valid()) {
Pci_driver *pci_drv = 0;
try {
/*
* Assign cap already here, since for probing already DMA
* buffer is required and allocated by
* Genode::Mem::alloc_dma_buffer(size_t size)
*/
pci_device_cap = cap;
/* trigger that the device get be assigned to the wifi driver */
@@ -449,7 +444,7 @@ extern "C" int pcie_capability_read_word(struct pci_dev *pdev, int pos, u16 *val
void Ram_object::free() { Genode::env()->ram_session()->free(ram_cap()); }
void Dma_object::free() { pci()->free_dma_buffer(pci_device_cap, ram_cap()); }
void Dma_object::free() { pci()->free_dma_buffer(ram_cap()); }
Genode::Ram_dataspace_capability
@@ -463,7 +458,7 @@ Lx::backend_alloc(Genode::addr_t size, Genode::Cache_attribute cached)
cap = env()->ram_session()->alloc(size);
o = new (env()->heap()) Ram_object(cap);
} else {
cap = pci()->alloc_dma_buffer(pci_device_cap, size);
cap = pci()->alloc_dma_buffer(size);
o = new (env()->heap()) Dma_object(cap);
}