| Message ID | 1423157797-23369-1-git-send-email-taras.kondratiuk@linaro.org |
|---|---|
| State | Accepted |
| Commit | 594b4f473932609125990423c1ddc80a02fa45d3 |
| Headers | show |
On Thu, Feb 5, 2015 at 11:36 AM, Taras Kondratiuk < taras.kondratiuk@linaro.org> wrote: > Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org> > Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> > --- > include/odp/api/buffer.h | 19 +++++++++++++++++++ > include/odp/api/pool.h | 20 -------------------- > platform/linux-generic/include/odp/pool.h | 1 + > 3 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/include/odp/api/buffer.h b/include/odp/api/buffer.h > index 09bddf2..4bbac1e 100644 > --- a/include/odp/api/buffer.h > +++ b/include/odp/api/buffer.h > @@ -105,6 +105,25 @@ int odp_buffer_is_valid(odp_buffer_t buf); > odp_pool_t odp_buffer_pool(odp_buffer_t buf); > > /** > + * Buffer alloc > + * > + * The validity of a buffer can be cheked at any time with > odp_buffer_is_valid() > + * @param pool Pool handle > + * > + * @return Handle of allocated buffer > + * @retval ODP_BUFFER_INVALID Buffer could not be allocated > + */ > +odp_buffer_t odp_buffer_alloc(odp_pool_t pool); > + > +/** > + * Buffer free > + * > + * @param buf Buffer handle > + * > + */ > +void odp_buffer_free(odp_buffer_t buf); > + > +/** > * Print buffer metadata to STDOUT > * > * @param buf Buffer handle > diff --git a/include/odp/api/pool.h b/include/odp/api/pool.h > index 14d18fb..f5dda10 100644 > --- a/include/odp/api/pool.h > +++ b/include/odp/api/pool.h > @@ -22,7 +22,6 @@ extern "C" { > > #include <odp/std_types.h> > #include <odp/plat/shared_memory_types.h> > -#include <odp/buffer.h> > #include <odp/event.h> > > /** @addtogroup odp_buffer > @@ -195,25 +194,6 @@ void odp_pool_print(odp_pool_t pool); > uint64_t odp_pool_to_u64(odp_pool_t hdl); > > /** > - * Buffer alloc > - * > - * The validity of a buffer can be cheked at any time with > odp_buffer_is_valid() > - * @param pool Pool handle > - * > - * @return Handle of allocated buffer > - * @retval ODP_BUFFER_INVALID Buffer could not be allocated > - */ > -odp_buffer_t odp_buffer_alloc(odp_pool_t pool); > - > -/** > - * Buffer free > - * > - * @param buf Buffer handle > - * > - */ > -void odp_buffer_free(odp_buffer_t buf); > - > -/** > * @} > */ > > diff --git a/platform/linux-generic/include/odp/pool.h > b/platform/linux-generic/include/odp/pool.h > index 0591fcf..e68b11e 100644 > --- a/platform/linux-generic/include/odp/pool.h > +++ b/platform/linux-generic/include/odp/pool.h > @@ -25,6 +25,7 @@ extern "C" { > * @} > */ > > +#include <odp/plat/pool_types.h> > #include <odp/api/pool.h> > > #ifdef __cplusplus > -- > 1.9.1 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
Merged! Maxim. On 02/05/2015 08:36 PM, Taras Kondratiuk wrote: > Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org> > --- > include/odp/api/buffer.h | 19 +++++++++++++++++++ > include/odp/api/pool.h | 20 -------------------- > platform/linux-generic/include/odp/pool.h | 1 + > 3 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/include/odp/api/buffer.h b/include/odp/api/buffer.h > index 09bddf2..4bbac1e 100644 > --- a/include/odp/api/buffer.h > +++ b/include/odp/api/buffer.h > @@ -105,6 +105,25 @@ int odp_buffer_is_valid(odp_buffer_t buf); > odp_pool_t odp_buffer_pool(odp_buffer_t buf); > > /** > + * Buffer alloc > + * > + * The validity of a buffer can be cheked at any time with odp_buffer_is_valid() > + * @param pool Pool handle > + * > + * @return Handle of allocated buffer > + * @retval ODP_BUFFER_INVALID Buffer could not be allocated > + */ > +odp_buffer_t odp_buffer_alloc(odp_pool_t pool); > + > +/** > + * Buffer free > + * > + * @param buf Buffer handle > + * > + */ > +void odp_buffer_free(odp_buffer_t buf); > + > +/** > * Print buffer metadata to STDOUT > * > * @param buf Buffer handle > diff --git a/include/odp/api/pool.h b/include/odp/api/pool.h > index 14d18fb..f5dda10 100644 > --- a/include/odp/api/pool.h > +++ b/include/odp/api/pool.h > @@ -22,7 +22,6 @@ extern "C" { > > #include <odp/std_types.h> > #include <odp/plat/shared_memory_types.h> > -#include <odp/buffer.h> > #include <odp/event.h> > > /** @addtogroup odp_buffer > @@ -195,25 +194,6 @@ void odp_pool_print(odp_pool_t pool); > uint64_t odp_pool_to_u64(odp_pool_t hdl); > > /** > - * Buffer alloc > - * > - * The validity of a buffer can be cheked at any time with odp_buffer_is_valid() > - * @param pool Pool handle > - * > - * @return Handle of allocated buffer > - * @retval ODP_BUFFER_INVALID Buffer could not be allocated > - */ > -odp_buffer_t odp_buffer_alloc(odp_pool_t pool); > - > -/** > - * Buffer free > - * > - * @param buf Buffer handle > - * > - */ > -void odp_buffer_free(odp_buffer_t buf); > - > -/** > * @} > */ > > diff --git a/platform/linux-generic/include/odp/pool.h b/platform/linux-generic/include/odp/pool.h > index 0591fcf..e68b11e 100644 > --- a/platform/linux-generic/include/odp/pool.h > +++ b/platform/linux-generic/include/odp/pool.h > @@ -25,6 +25,7 @@ extern "C" { > * @} > */ > > +#include <odp/plat/pool_types.h> > #include <odp/api/pool.h> > > #ifdef __cplusplus
diff --git a/include/odp/api/buffer.h b/include/odp/api/buffer.h index 09bddf2..4bbac1e 100644 --- a/include/odp/api/buffer.h +++ b/include/odp/api/buffer.h @@ -105,6 +105,25 @@ int odp_buffer_is_valid(odp_buffer_t buf); odp_pool_t odp_buffer_pool(odp_buffer_t buf); /** + * Buffer alloc + * + * The validity of a buffer can be cheked at any time with odp_buffer_is_valid() + * @param pool Pool handle + * + * @return Handle of allocated buffer + * @retval ODP_BUFFER_INVALID Buffer could not be allocated + */ +odp_buffer_t odp_buffer_alloc(odp_pool_t pool); + +/** + * Buffer free + * + * @param buf Buffer handle + * + */ +void odp_buffer_free(odp_buffer_t buf); + +/** * Print buffer metadata to STDOUT * * @param buf Buffer handle diff --git a/include/odp/api/pool.h b/include/odp/api/pool.h index 14d18fb..f5dda10 100644 --- a/include/odp/api/pool.h +++ b/include/odp/api/pool.h @@ -22,7 +22,6 @@ extern "C" { #include <odp/std_types.h> #include <odp/plat/shared_memory_types.h> -#include <odp/buffer.h> #include <odp/event.h> /** @addtogroup odp_buffer @@ -195,25 +194,6 @@ void odp_pool_print(odp_pool_t pool); uint64_t odp_pool_to_u64(odp_pool_t hdl); /** - * Buffer alloc - * - * The validity of a buffer can be cheked at any time with odp_buffer_is_valid() - * @param pool Pool handle - * - * @return Handle of allocated buffer - * @retval ODP_BUFFER_INVALID Buffer could not be allocated - */ -odp_buffer_t odp_buffer_alloc(odp_pool_t pool); - -/** - * Buffer free - * - * @param buf Buffer handle - * - */ -void odp_buffer_free(odp_buffer_t buf); - -/** * @} */ diff --git a/platform/linux-generic/include/odp/pool.h b/platform/linux-generic/include/odp/pool.h index 0591fcf..e68b11e 100644 --- a/platform/linux-generic/include/odp/pool.h +++ b/platform/linux-generic/include/odp/pool.h @@ -25,6 +25,7 @@ extern "C" { * @} */ +#include <odp/plat/pool_types.h> #include <odp/api/pool.h> #ifdef __cplusplus
Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org> --- include/odp/api/buffer.h | 19 +++++++++++++++++++ include/odp/api/pool.h | 20 -------------------- platform/linux-generic/include/odp/pool.h | 1 + 3 files changed, 20 insertions(+), 20 deletions(-)