From patchwork Mon Dec 15 17:09:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 42264 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6260C26C6C for ; Mon, 15 Dec 2014 17:10:24 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id u10sf7526528lbd.10 for ; Mon, 15 Dec 2014 09:10:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=EXyTYU5jdp6lXY7LUadMtXa6tvN7r6UZzLKynrXTa/w=; b=Li8rqAFoJwlnPrzOE0NsXWRc7+emvY85buLDVt3O6r/WHtU29BT3z+iT9UTdhJu5xG HKbXre8k6HtRbM8mp0UjibsrUOryJ050wB4axqBMF6gvNHQ8ZQpBC/WEe6qcIRdwiKbB kh6bnYgnqKWE+E45LcXdgvYh96YLrpRLIe629bjKp+ujSd1tYoNRo4i5yKC8Cb/q2ACR 0AxRYRDGwcppF+gwIoB2Z7ly8ST/Yj8QPf/Feo809JEfsoqx9cr8R+Wj8goyyo3LvIb2 L6riZpMHxC3xwq9C3KqUBVWuXzrzV1HYTM2hTgCJVAo3q/qeKdsL/u05tQ5Liv4kfK1c GNJw== X-Gm-Message-State: ALoCoQld3WtWPgMYU2X6rQi/8a8l0cWjj5OMxXC7H17JX4GQJshOpPmjzFPeB7VXFXMWL92Wfxzb X-Received: by 10.194.92.34 with SMTP id cj2mr546921wjb.5.1418663423384; Mon, 15 Dec 2014 09:10:23 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.11.163 with SMTP id ej3ls726022lad.94.gmail; Mon, 15 Dec 2014 09:10:23 -0800 (PST) X-Received: by 10.112.42.198 with SMTP id q6mr31335163lbl.69.1418663423110; Mon, 15 Dec 2014 09:10:23 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id a4si10991327lbp.132.2014.12.15.09.10.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 09:10:23 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id pv20so9735279lab.27 for ; Mon, 15 Dec 2014 09:10:23 -0800 (PST) X-Received: by 10.152.7.229 with SMTP id m5mr31619076laa.80.1418663423029; Mon, 15 Dec 2014 09:10:23 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.142.69 with SMTP id ru5csp781933lbb; Mon, 15 Dec 2014 09:10:22 -0800 (PST) X-Received: by 10.170.89.130 with SMTP id g124mr25663614yka.24.1418663421784; Mon, 15 Dec 2014 09:10:21 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id k10si11280842qge.43.2014.12.15.09.10.20 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Dec 2014 09:10:21 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y0ZA3-0000f7-F4; Mon, 15 Dec 2014 17:10:19 +0000 Received: from mail-lb0-f175.google.com ([209.85.217.175]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y0Z9r-0000aY-Uw for lng-odp@lists.linaro.org; Mon, 15 Dec 2014 17:10:08 +0000 Received: by mail-lb0-f175.google.com with SMTP id u10so9656860lbd.34 for ; Mon, 15 Dec 2014 09:10:02 -0800 (PST) X-Received: by 10.112.35.234 with SMTP id l10mr31422844lbj.12.1418663402014; Mon, 15 Dec 2014 09:10:02 -0800 (PST) Received: from localhost.localdomain ([80.77.38.170]) by mx.google.com with ESMTPSA id l9sm1208585lae.0.2014.12.15.09.09.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Dec 2014 09:10:00 -0800 (PST) From: Taras Kondratiuk To: lng-odp@lists.linaro.org Date: Mon, 15 Dec 2014 19:09:46 +0200 Message-Id: <1418663392-28354-2-git-send-email-taras.kondratiuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418663392-28354-1-git-send-email-taras.kondratiuk@linaro.org> References: <1418663392-28354-1-git-send-email-taras.kondratiuk@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv6 1/7] api: buffer/shm: prevent circular dependencies X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: taras.kondratiuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Bill Fischofer Move shared memory and buffer pool handles to odp_platform_types.h to allow ODP types cross-references. Signed-off-by: Bill Fischofer Signed-off-by: Taras Kondratiuk --- platform/linux-generic/include/api/odp_buffer_pool.h | 3 --- platform/linux-generic/include/api/odp_platform_types.h | 11 +++++++++++ platform/linux-generic/include/api/odp_shared_memory.h | 10 +--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/platform/linux-generic/include/api/odp_buffer_pool.h b/platform/linux-generic/include/api/odp_buffer_pool.h index 30b83e0..c12d718 100644 --- a/platform/linux-generic/include/api/odp_buffer_pool.h +++ b/platform/linux-generic/include/api/odp_buffer_pool.h @@ -32,9 +32,6 @@ extern "C" { /** Maximum queue name lenght in chars */ #define ODP_BUFFER_POOL_NAME_LEN 32 -/** Invalid buffer pool */ -#define ODP_BUFFER_POOL_INVALID 0 - /** * Create a buffer pool * diff --git a/platform/linux-generic/include/api/odp_platform_types.h b/platform/linux-generic/include/api/odp_platform_types.h index 4db47d3..68d0c55 100644 --- a/platform/linux-generic/include/api/odp_platform_types.h +++ b/platform/linux-generic/include/api/odp_platform_types.h @@ -26,6 +26,9 @@ /** ODP Buffer pool */ typedef uint32_t odp_buffer_pool_t; +/** Invalid buffer pool */ +#define ODP_BUFFER_POOL_INVALID (0) + /** ODP buffer */ typedef uint32_t odp_buffer_t; @@ -65,6 +68,14 @@ typedef uint32_t odp_pktio_t; #define ODP_PKTIO_ANY ((odp_pktio_t)~0) /** + * ODP shared memory block + */ +typedef uint32_t odp_shm_t; + +/** Invalid shared memory block */ +#define ODP_SHM_INVALID 0 + +/** * @} */ diff --git a/platform/linux-generic/include/api/odp_shared_memory.h b/platform/linux-generic/include/api/odp_shared_memory.h index 26e208b..f70db5a 100644 --- a/platform/linux-generic/include/api/odp_shared_memory.h +++ b/platform/linux-generic/include/api/odp_shared_memory.h @@ -20,6 +20,7 @@ extern "C" { #include +#include /** @defgroup odp_shared_memory ODP SHARED MEMORY * Operations on shared memory. @@ -38,15 +39,6 @@ extern "C" { #define ODP_SHM_PROC 0x2 /**< Share with external processes */ /** - * ODP shared memory block - */ -typedef uint32_t odp_shm_t; - -/** Invalid shared memory block */ -#define ODP_SHM_INVALID 0 - - -/** * Shared memory block info */ typedef struct odp_shm_info_t {