[dpdk-dev] [PATCH v2 05/15] eal/bsdapp: Change names of pci related data structure

[Tetsuya Mukawa]

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
Also, add 'path' variable to pci_map of bsdapp.

Signed-off-by: Tetsuya Mukawa <mukawa at igel.co.jp>
---
 lib/librte_eal/bsdapp/eal/eal_pci.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c 
b/lib/librte_eal/bsdapp/eal/eal_pci.c
index cbd0a4e..7fcb15d 100644
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -83,8 +83,9 @@
  * enabling bus master.
  */

-struct uio_map {
+struct pci_map {
        void *addr;
+       char *path;
        uint64_t offset;
        uint64_t size;
        uint64_t phaddr;
@@ -94,16 +95,16 @@ struct uio_map {
  * 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 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",
@@ -163,9 +164,9 @@ static int
 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) {

@@ -202,10 +203,10 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        uint64_t offset;
        uint64_t pagesz;
        struct rte_pci_addr *loc = &dev->addr;
-       struct uio_resource *uio_res;
-       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;
+       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;
-- 
1.9.1