| Message ID | 1422961460-30920-1-git-send-email-ola.liljedahl@linaro.org |
|---|---|
| State | Accepted |
| Commit | bcc0d9004010df4a77e521cb42bf9351980b47fa |
| Headers | show |
Merged, Thanks. On 02/03/2015 02:36 PM, Savolainen, Petri (NSN - FI/Espoo) wrote: > Reviewed-by: Petri Savolainen <petri.savolainen@linaro.org> > >> -----Original Message----- >> From: lng-odp-bounces@lists.linaro.org [mailto:lng-odp- >> bounces@lists.linaro.org] On Behalf Of ext Ola Liljedahl >> Sent: Tuesday, February 03, 2015 1:04 PM >> To: lng-odp@lists.linaro.org >> Subject: [lng-odp] [PATCHv2] api: odp_event.h: remove >> ODP_EVENT_TYPE_INVALID >> >> Remove ODP_EVENT_TYPE_INVALID from odp_event.h. >> Update description of odp_event_type(), is does not return >> ODP_EVENT_TYPE_INVALID. >> Remove ODP_POOL_TYPE_INVALID from odp_pool.h. It was defined to >> ODP_EVENT_TYPE_INVALID. >> >> Signed-off-by: Ola Liljedahl <ola.liljedahl@linaro.org> >> --- >> (This document/code contribution attached is provided under the terms of >> agreement LES-LTM-21309) >> >> Changed description of odp_event_type() after review by Petri S. >> >> include/odp/api/event.h | 9 ++------- >> include/odp/api/pool.h | 2 -- >> platform/linux-generic/include/odp/plat/event_types.h | 1 - >> 3 files changed, 2 insertions(+), 10 deletions(-) >> >> diff --git a/include/odp/api/event.h b/include/odp/api/event.h >> index 50c031a..d0413b9 100644 >> --- a/include/odp/api/event.h >> +++ b/include/odp/api/event.h >> @@ -36,11 +36,6 @@ extern "C" { >> */ >> >> /** >> - * @def ODP_EVENT_TYPE_INVALID >> - * Invalid event type >> - */ >> - >> -/** >> * @def ODP_EVENT_BUFFER >> * Buffer event >> */ >> @@ -61,11 +56,11 @@ extern "C" { >> */ >> >> /** >> - * Event type >> + * Get event type >> * >> * @param event Event handle >> * >> - * @return Event type or ODP_EVENT_TYPE_INVALID >> + * @return Event type >> */ >> int odp_event_type(odp_event_t event); >> >> diff --git a/include/odp/api/pool.h b/include/odp/api/pool.h >> index 1582102..d09d92e 100644 >> --- a/include/odp/api/pool.h >> +++ b/include/odp/api/pool.h >> @@ -79,8 +79,6 @@ typedef struct odp_pool_param_t { >> >> } odp_pool_param_t; >> >> -/** Invalid pool type */ >> -#define ODP_POOL_TYPE_INVALID ODP_EVENT_TYPE_INVALID >> /** Packet pool*/ >> #define ODP_POOL_PACKET ODP_EVENT_PACKET >> /** Buffer pool */ >> diff --git a/platform/linux-generic/include/odp/plat/event_types.h >> b/platform/linux-generic/include/odp/plat/event_types.h >> index 4a0756b..c98d416 100644 >> --- a/platform/linux-generic/include/odp/plat/event_types.h >> +++ b/platform/linux-generic/include/odp/plat/event_types.h >> @@ -30,7 +30,6 @@ typedef odp_buffer_t odp_event_t; >> >> #define ODP_EVENT_INVALID ODP_BUFFER_INVALID >> >> -#define ODP_EVENT_TYPE_INVALID (-1) >> #define ODP_EVENT_BUFFER 1 >> #define ODP_EVENT_PACKET 2 >> #define ODP_EVENT_TIMEOUT 3 >> -- >> 1.9.1 >> >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> http://lists.linaro.org/mailman/listinfo/lng-odp > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/include/odp/api/event.h b/include/odp/api/event.h index 50c031a..d0413b9 100644 --- a/include/odp/api/event.h +++ b/include/odp/api/event.h @@ -36,11 +36,6 @@ extern "C" { */ /** - * @def ODP_EVENT_TYPE_INVALID - * Invalid event type - */ - -/** * @def ODP_EVENT_BUFFER * Buffer event */ @@ -61,11 +56,11 @@ extern "C" { */ /** - * Event type + * Get event type * * @param event Event handle * - * @return Event type or ODP_EVENT_TYPE_INVALID + * @return Event type */ int odp_event_type(odp_event_t event); diff --git a/include/odp/api/pool.h b/include/odp/api/pool.h index 1582102..d09d92e 100644 --- a/include/odp/api/pool.h +++ b/include/odp/api/pool.h @@ -79,8 +79,6 @@ typedef struct odp_pool_param_t { } odp_pool_param_t; -/** Invalid pool type */ -#define ODP_POOL_TYPE_INVALID ODP_EVENT_TYPE_INVALID /** Packet pool*/ #define ODP_POOL_PACKET ODP_EVENT_PACKET /** Buffer pool */ diff --git a/platform/linux-generic/include/odp/plat/event_types.h b/platform/linux-generic/include/odp/plat/event_types.h index 4a0756b..c98d416 100644 --- a/platform/linux-generic/include/odp/plat/event_types.h +++ b/platform/linux-generic/include/odp/plat/event_types.h @@ -30,7 +30,6 @@ typedef odp_buffer_t odp_event_t; #define ODP_EVENT_INVALID ODP_BUFFER_INVALID -#define ODP_EVENT_TYPE_INVALID (-1) #define ODP_EVENT_BUFFER 1 #define ODP_EVENT_PACKET 2 #define ODP_EVENT_TIMEOUT 3
Remove ODP_EVENT_TYPE_INVALID from odp_event.h. Update description of odp_event_type(), is does not return ODP_EVENT_TYPE_INVALID. Remove ODP_POOL_TYPE_INVALID from odp_pool.h. It was defined to ODP_EVENT_TYPE_INVALID. Signed-off-by: Ola Liljedahl <ola.liljedahl@linaro.org> --- (This document/code contribution attached is provided under the terms of agreement LES-LTM-21309) Changed description of odp_event_type() after review by Petri S. include/odp/api/event.h | 9 ++------- include/odp/api/pool.h | 2 -- platform/linux-generic/include/odp/plat/event_types.h | 1 - 3 files changed, 2 insertions(+), 10 deletions(-)