diff options
| author | Matias Elo <matias.elo@nokia.com> | 2022-01-18 11:01:06 +0200 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2022-03-03 16:38:30 +0200 |
| commit | 20774c8d4b543fa5547c34088ea32981ff11c519 (patch) | |
| tree | 7db435c56436fe3fd884ce5d969160cd5a46119a /platform/linux-generic | |
| parent | 6acdad54c42d63f30a2294450bee8783ee01662b (diff) | |
api: pktio: split packet io types into a separate header
Split packet IO types into a separate header file to enable easier function
inlining. No API changes.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Diffstat (limited to 'platform/linux-generic')
4 files changed, 64 insertions, 39 deletions
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ec8225be7..426a957a2 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -72,6 +72,7 @@ odpapiabiarchinclude_HEADERS += \ include-abi/odp/api/abi/packet_types.h \ include-abi/odp/api/abi/packet_flags.h \ include-abi/odp/api/abi/packet_io.h \ + include-abi/odp/api/abi/packet_io_types.h \ include-abi/odp/api/abi/proto_stats.h \ include-abi/odp/api/abi/proto_stats_types.h \ include-abi/odp/api/abi/pool.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h index 821147fcb..c7c7b2faa 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h @@ -19,47 +19,9 @@ extern "C" { #endif -#include <odp/api/std_types.h> -#include <odp/api/plat/strong_types.h> - -/** @addtogroup odp_packet_io - * Operations on a packet. - * @{ - */ - -typedef ODP_HANDLE_T(odp_pktio_t); -typedef ODP_HANDLE_T(odp_lso_profile_t); - -/** @internal */ -typedef struct odp_pktin_queue_t { - odp_pktio_t pktio; /**< @internal pktio handle */ - int index; /**< @internal pktio queue index */ -} odp_pktin_queue_t; - -/** @internal */ -typedef struct odp_pktout_queue_t { - odp_pktio_t pktio; /**< @internal pktio handle */ - int index; /**< @internal pktio queue index */ -} odp_pktout_queue_t; - -#define ODP_PKTIO_INVALID _odp_cast_scalar(odp_pktio_t, 0) -#define ODP_LSO_PROFILE_INVALID _odp_cast_scalar(odp_lso_profile_t, 0) - -#define ODP_PKTIO_MACADDR_MAXSIZE 16 - -#define ODP_PKTIN_NO_WAIT 0 - -#define ODP_PKTOUT_MAX_QUEUES 64 - -#define ODP_PKTIO_STATS_EXTRA_NAME_LEN 64 - /* Inlined functions for non-ABI compat mode */ #include <odp/api/plat/packet_io_inlines.h> -/** - * @} - */ - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_io_types.h b/platform/linux-generic/include-abi/odp/api/abi/packet_io_types.h new file mode 100644 index 000000000..3106f26a7 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_io_types.h @@ -0,0 +1,62 @@ +/* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2020-2022, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP Packet IO types + */ + +#ifndef ODP_API_ABI_PACKET_IO_TYPES_H_ +#define ODP_API_ABI_PACKET_IO_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/std_types.h> +#include <odp/api/plat/strong_types.h> + +/** @ingroup odp_packet_io + * @{ + */ + +typedef ODP_HANDLE_T(odp_pktio_t); +typedef ODP_HANDLE_T(odp_lso_profile_t); + +/** @internal */ +typedef struct odp_pktin_queue_t { + odp_pktio_t pktio; /**< @internal pktio handle */ + int index; /**< @internal pktio queue index */ +} odp_pktin_queue_t; + +/** @internal */ +typedef struct odp_pktout_queue_t { + odp_pktio_t pktio; /**< @internal pktio handle */ + int index; /**< @internal pktio queue index */ +} odp_pktout_queue_t; + +#define ODP_PKTIO_INVALID _odp_cast_scalar(odp_pktio_t, 0) +#define ODP_LSO_PROFILE_INVALID _odp_cast_scalar(odp_lso_profile_t, 0) + +#define ODP_PKTIO_MACADDR_MAXSIZE 16 + +#define ODP_PKTIN_NO_WAIT 0 + +#define ODP_PKTOUT_MAX_QUEUES 64 + +#define ODP_PKTIO_STATS_EXTRA_NAME_LEN 64 + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/packet_io_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_io_inlines.h index 51c8101e6..a3d1d0d61 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_io_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_io_inlines.h @@ -12,7 +12,7 @@ extern "C" { #endif -#include <odp/api/abi/packet_io.h> +#include <odp/api/abi/packet_io_types.h> #include <stdint.h> |