From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tetsuya Mukawa Subject: [PATCH v9 04/12] eal/bsdapp: Change names of pci related data structure Date: Wed, 8 Jul 2015 19:34:45 +0900 Message-ID: <1436351693-2349-5-git-send-email-mukawa@igel.co.jp> References: <1435652668-3380-12-git-send-email-mukawa@igel.co.jp> <1436351693-2349-1-git-send-email-mukawa@igel.co.jp> To: dev@dpdk.org Return-path: Received: from mail-pd0-f169.google.com (mail-pd0-f169.google.com [209.85.192.169]) by dpdk.org (Postfix) with ESMTP id 39FF568BA for ; Wed, 8 Jul 2015 12:35:44 +0200 (CEST) Received: by pddu5 with SMTP id u5so56167093pdd.3 for ; Wed, 08 Jul 2015 03:35:43 -0700 (PDT) In-Reply-To: <1436351693-2349-1-git-send-email-mukawa@igel.co.jp> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: "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 Signed-off-by: Tetsuya Mukawa Acked-by: Bernard Iremonger Acked-by: David Marchand --- lib/librte_eal/bsdapp/eal/eal_pci.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index da17685..aeaedec 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -84,7 +84,7 @@ * enabling bus master. */ -struct uio_map { +struct pci_map { void *addr; uint64_t offset; uint64_t size; @@ -95,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 +163,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 +202,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 = 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; -- 2.1.4