From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by dpdk.org (Postfix) with ESMTP id 89ABDC44C for ; Tue, 30 Jun 2015 10:25:16 +0200 (CEST) Received: by pdcu2 with SMTP id u2so2156967pdc.3 for ; Tue, 30 Jun 2015 01:25:16 -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=3fn3hsbiD3zJLx6pihd89C92dp/2M1jDtJrVoQIIO+Y=; b=Fkq9wW1JWEVhMrT+DPVErvSRYNsaSt4FpllDXYkwfnGsjr0hNXrU8PVBqIWIoG1c17 T4MLaKsP18iFWRIxcOJrrCzr3nPt8gc+kxHx5OlVsLoY3At73M1wJhT6Yy03Y6lsH9+A AeQUxgrksEHEi4xutZoShxaUdfGvrzBknE+l3RoEieB2xxCUI6guJ1EqxMzldiLLZVTf vuxf3j9vKnr3+ExAL8gyd5WVIxsjhBly5GKcRP7fkIzqahzKY6Tv2iiX3IDDF+YMpaFX M2NtQ6fv4Nb0A2ojtZgIF0CUqrczRop1vG95+taAA/EFqdLmCy0le36E5KrhiA+QMFLs zYrw== X-Gm-Message-State: ALoCoQlJ/BtUQIuOYbL1javMpqlPopPvlwjeEoNkKoFYhUm9LyCKsO4TrmxUysnJM1xt2HtpXNON X-Received: by 10.68.129.134 with SMTP id nw6mr40742337pbb.109.1435652715985; Tue, 30 Jun 2015 01:25:15 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id k9sm44733339pdp.60.2015.06.30.01.25.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Jun 2015 01:25:15 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 30 Jun 2015 17:24:20 +0900 Message-Id: <1435652668-3380-5-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435652668-3380-1-git-send-email-mukawa@igel.co.jp> References: <1435306705-11645-4-git-send-email-mukawa@igel.co.jp> <1435652668-3380-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v7 04/12] 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, 30 Jun 2015 08:25:17 -0000 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 --- 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 b071f07..8261e09 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -83,7 +83,7 @@ * enabling bus master. */ -struct uio_map { +struct pci_map { void *addr; uint64_t offset; uint64_t size; @@ -94,16 +94,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 +162,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 +201,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; -- 2.1.4