From: Matias Elo <matias....@nokia.com>

Signed-off-by: Matias Elo <matias....@nokia.com>
---
/** Email created from pull request 667 (matiaselo:dev/abi_clean_invalid)
 ** https://github.com/Linaro/odp/pull/667
 ** Patch: https://github.com/Linaro/odp/pull/667.patch
 ** Base sha: 7c87b66edc84e8c713fefc68d46464660adaf71e
 ** Merge commit sha: 0c5d0fdd232cad0a55d68e819ff9f707fea014f5
 **/
 include/odp/api/abi-default/pool.h                    | 2 +-
 platform/linux-generic/include-abi/odp/api/abi/pool.h | 2 +-
 platform/linux-generic/include/odp_pool_internal.h    | 2 +-
 platform/linux-generic/odp_pool.c                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/odp/api/abi-default/pool.h 
b/include/odp/api/abi-default/pool.h
index f3489ff9c..4c67e309b 100644
--- a/include/odp/api/abi-default/pool.h
+++ b/include/odp/api/abi-default/pool.h
@@ -22,7 +22,7 @@ typedef struct { char dummy; /**< @internal Dummy */ } 
_odp_abi_pool_t;
 
 typedef _odp_abi_pool_t *odp_pool_t;
 
-#define ODP_POOL_INVALID   ((odp_pool_t)0xffffffff)
+#define ODP_POOL_INVALID   ((odp_pool_t)0)
 
 #define ODP_POOL_NAME_LEN  32
 
diff --git a/platform/linux-generic/include-abi/odp/api/abi/pool.h 
b/platform/linux-generic/include-abi/odp/api/abi/pool.h
index cd161d5a9..9ac1cf673 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/pool.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/pool.h
@@ -27,7 +27,7 @@ extern "C" {
 
 typedef ODP_HANDLE_T(odp_pool_t);
 
-#define ODP_POOL_INVALID _odp_cast_scalar(odp_pool_t, 0xffffffff)
+#define ODP_POOL_INVALID _odp_cast_scalar(odp_pool_t, 0)
 
 #define ODP_POOL_NAME_LEN  32
 
diff --git a/platform/linux-generic/include/odp_pool_internal.h 
b/platform/linux-generic/include/odp_pool_internal.h
index e3de2b65d..e8a046142 100644
--- a/platform/linux-generic/include/odp_pool_internal.h
+++ b/platform/linux-generic/include/odp_pool_internal.h
@@ -96,7 +96,7 @@ static inline pool_t *pool_entry(uint32_t pool_idx)
 
 static inline pool_t *pool_entry_from_hdl(odp_pool_t pool_hdl)
 {
-       return &pool_tbl->pool[_odp_typeval(pool_hdl)];
+       return &pool_tbl->pool[_odp_typeval(pool_hdl) - 1];
 }
 
 static inline odp_buffer_hdr_t *buf_hdl_to_hdr(odp_buffer_t buf)
diff --git a/platform/linux-generic/odp_pool.c 
b/platform/linux-generic/odp_pool.c
index 01ee9234b..7f5dfa8bf 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -70,7 +70,7 @@ const _odp_pool_inline_offset_t ODP_ALIGNED_CACHE 
_odp_pool_inline = {
 
 static inline odp_pool_t pool_index_to_handle(uint32_t pool_idx)
 {
-       return _odp_cast_scalar(odp_pool_t, pool_idx);
+       return _odp_cast_scalar(odp_pool_t, pool_idx + 1);
 }
 
 static inline pool_t *pool_from_buf(odp_buffer_t buf)

Reply via email to