To merge pci code of linuxapp and bsdapp, this patch changes names
like below.
- uio_map to pci_map
- uio_resource to mapped_pci_resource
- uio_res_list to mapped_pci_res_list
Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: David Marchand <david.marchand@6wind.com>
* enabling bus master.
*/
* enabling bus master.
*/
void *addr;
uint64_t offset;
uint64_t size;
void *addr;
uint64_t offset;
uint64_t size;
* For multi-process we need to reproduce all PCI mappings in secondary
* processes, so save them in a tailq.
*/
* For multi-process we need to reproduce all PCI mappings in secondary
* processes, so save them in a tailq.
*/
-struct uio_resource {
- TAILQ_ENTRY(uio_resource) next;
+struct mapped_pci_resource {
+ TAILQ_ENTRY(mapped_pci_resource) next;
struct rte_pci_addr pci_addr;
char path[PATH_MAX];
size_t nb_maps;
struct rte_pci_addr pci_addr;
char path[PATH_MAX];
size_t nb_maps;
- struct uio_map maps[PCI_MAX_RESOURCE];
+ struct pci_map maps[PCI_MAX_RESOURCE];
-TAILQ_HEAD(uio_res_list, uio_resource);
+TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);
static struct rte_tailq_elem rte_uio_tailq = {
.name = "UIO_RESOURCE_LIST",
static struct rte_tailq_elem rte_uio_tailq = {
.name = "UIO_RESOURCE_LIST",
pci_uio_map_secondary(struct rte_pci_device *dev)
{
size_t i;
pci_uio_map_secondary(struct rte_pci_device *dev)
{
size_t i;
- struct uio_resource *uio_res;
- struct uio_res_list *uio_res_list =
- RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list);
+ struct mapped_pci_resource *uio_res;
+ struct mapped_pci_res_list *uio_res_list =
+ RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
TAILQ_FOREACH(uio_res, uio_res_list, next) {
TAILQ_FOREACH(uio_res, uio_res_list, next) {
uint64_t offset;
uint64_t pagesz;
struct rte_pci_addr *loc = &dev->addr;
uint64_t offset;
uint64_t pagesz;
struct rte_pci_addr *loc = &dev->addr;
- struct uio_resource *uio_res = NULL;
- struct uio_res_list *uio_res_list =
- RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list);
- struct uio_map *maps;
+ struct mapped_pci_resource *uio_res = NULL;
+ struct mapped_pci_res_list *uio_res_list =
+ RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
+ struct pci_map *maps;
dev->intr_handle.fd = -1;
dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
dev->intr_handle.fd = -1;
dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;