From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by dpdk.org (Postfix) with ESMTP id DBA959ABC for ; Tue, 24 Mar 2015 05:19:01 +0100 (CET) Received: by pacwe9 with SMTP id we9so212830497pac.1 for ; Mon, 23 Mar 2015 21:19:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hWIHSUkzSHHY427Ky12n2FRujoJKCOhK6j0Z3kFE+i0=; b=LJB5nydxWPZdPzgunk5lOjrPP7Os0ZXciFJFV09yUPML6WDoi1FKM13Xv5LOLafiZn IgMIThq/J0hew/kT9rjQn2YKxdbU8tVBQID3Ajf5s2dCjelkUVCDSW0KQqkhifH0wWSI oHjtgfVprEfxTB8g3PeFGkUh7IYDJfbDPl4TSdyhdJ6kp6rOArlOs5tMgPta6Urli8Cc 4mQwSUA8ww7hr9UmQJ2MSRffiC5hcPhpA4977fv4LUqs3TUsRlVitYV0PY8GdGVx4tmb n6pCgFZzw4ly5zZldGZoOXsxbFJj+zTD4p1L54an1NBW28y10szq1T7j5OpTgqFq0od8 uf6w== X-Gm-Message-State: ALoCoQmJCGN+YXKJovRAbfzMbmIvK5i6qVOdacmZvsa55JjQ0NBtwLP/4vxzjwufNoLcXZc23kNy X-Received: by 10.66.228.104 with SMTP id sh8mr3966469pac.63.1427170740140; Mon, 23 Mar 2015 21:19:00 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id jx5sm2482078pbc.85.2015.03.23.21.18.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Mar 2015 21:18:59 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 24 Mar 2015 13:18:35 +0900 Message-Id: <1427170717-13879-5-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427170717-13879-1-git-send-email-mukawa@igel.co.jp> References: <1426584645-28828-7-git-send-email-mukawa@igel.co.jp> <1427170717-13879-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v2 4/6] eal/bsdapp: Change names of pci related data structure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2015 04:19:02 -0000 Archived-At: List-Archive: 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 --- 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 3a22b49..85f8671 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", @@ -162,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) { @@ -201,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; - 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