From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f181.google.com (mail-pd0-f181.google.com [209.85.192.181]) by dpdk.org (Postfix) with ESMTP id 9E7FC9AAD for ; Tue, 17 Mar 2015 10:31:13 +0100 (CET) Received: by pdbcz9 with SMTP id cz9so4577478pdb.3 for ; Tue, 17 Mar 2015 02:31:13 -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=ESbFyXPaKIPWgDmJRki8BxepEgdwR7rZn1jm4MnbzLuw88A/Y4nzmC6Iy+AMNK/nA8 epYZ7A3xZLA7sbbOjVkGxxFUVH5FBIu93KTcYp0KuBgcEQLS/tZWZKrQFFQhXLIwUrdj 0nv41UnDED7Shm6LHMcE1J4wUaMpI0Qf4mUp8hHSn9YCMKZggjlzJIRoDJ/sBLmjeat0 P5S55VjCU9hAnRzg0XS9yBUHGPxgjO6JeiZPe9ru2nATcq+JxezHw1AgzVnesiW/b2U2 7DvaIWyiiglGOPIiTbHzqMUJsjKfGR8ei7wnaOpVirZhhvErMLtP3YdiP6dK6WnXsdYv 8oNA== X-Gm-Message-State: ALoCoQmrQEo+4qalRYYM7Pe25Olnh009UJfthZXZcH1GBj5GlK0C2KfyyqEOcE6Wy/IbG8a+BPRP X-Received: by 10.66.65.195 with SMTP id z3mr148341970pas.10.1426584673019; Tue, 17 Mar 2015 02:31:13 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id ce1sm21354243pdb.34.2015.03.17.02.31.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Mar 2015 02:31:12 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 17 Mar 2015 18:30:43 +0900 Message-Id: <1426584645-28828-5-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426584645-28828-1-git-send-email-mukawa@igel.co.jp> References: <1426155474-1596-4-git-send-email-mukawa@igel.co.jp> <1426584645-28828-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH 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, 17 Mar 2015 09:31:13 -0000 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