@@ -5,7 +5,7 @@
#include "cnxk_eventdev.h"
#include "cnxk_tim_evdev.h"
-static struct rte_event_timer_adapter_ops cnxk_tim_ops;
+static struct event_timer_adapter_ops cnxk_tim_ops;
static int
cnxk_tim_chnk_pool_create(struct cnxk_tim_ring *tim_ring,
@@ -353,8 +353,7 @@ cnxk_tim_stats_reset(const struct rte_event_timer_adapter *adapter)
int
cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
- uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops)
+ uint32_t *caps, const struct event_timer_adapter_ops **ops)
{
struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
@@ -267,7 +267,7 @@ cnxk_tim_timer_cancel_burst(const struct rte_event_timer_adapter *adptr,
int cnxk_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops);
+ const struct event_timer_adapter_ops **ops);
void cnxk_tim_init(struct roc_sso *sso);
void cnxk_tim_fini(void);
@@ -381,8 +381,8 @@ dsw_eth_rx_adapter_caps_get(const struct rte_eventdev *dev __rte_unused,
static int
dsw_timer_adapter_caps_get(const struct rte_eventdev *dev __rte_unused,
- uint64_t flags __rte_unused, uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops)
+ uint64_t flags __rte_unused, uint32_t *caps,
+ const struct event_timer_adapter_ops **ops)
{
*caps = 0;
*ops = NULL;
@@ -721,7 +721,7 @@ ssovf_parsekv(const char *key __rte_unused, const char *value, void *opaque)
static int
ssovf_timvf_caps_get(const struct rte_eventdev *dev, uint64_t flags,
- uint32_t *caps, const struct rte_event_timer_adapter_ops **ops)
+ uint32_t *caps, const struct event_timer_adapter_ops **ops)
{
return timvf_timer_adapter_caps_get(dev, flags, caps, ops,
timvf_enable_stats);
@@ -407,18 +407,19 @@ timvf_stats_reset(const struct rte_event_timer_adapter *adapter)
return 0;
}
-static struct rte_event_timer_adapter_ops timvf_ops = {
- .init = timvf_ring_create,
- .uninit = timvf_ring_free,
- .start = timvf_ring_start,
- .stop = timvf_ring_stop,
- .get_info = timvf_ring_info_get,
+static struct event_timer_adapter_ops timvf_ops = {
+ .init = timvf_ring_create,
+ .uninit = timvf_ring_free,
+ .start = timvf_ring_start,
+ .stop = timvf_ring_stop,
+ .get_info = timvf_ring_info_get,
};
int
timvf_timer_adapter_caps_get(const struct rte_eventdev *dev, uint64_t flags,
- uint32_t *caps, const struct rte_event_timer_adapter_ops **ops,
- uint8_t enable_stats)
+ uint32_t *caps,
+ const struct event_timer_adapter_ops **ops,
+ uint8_t enable_stats)
{
RTE_SET_USED(dev);
@@ -5,13 +5,13 @@
#ifndef __TIMVF_EVDEV_H__
#define __TIMVF_EVDEV_H__
+#include <event_timer_adapter_pmd.h>
#include <rte_common.h>
#include <rte_cycles.h>
#include <rte_debug.h>
#include <rte_eal.h>
-#include <rte_eventdev.h>
#include <rte_event_timer_adapter.h>
-#include <rte_event_timer_adapter_pmd.h>
+#include <rte_eventdev.h>
#include <rte_io.h>
#include <rte_lcore.h>
#include <rte_log.h>
@@ -196,8 +196,9 @@ uint8_t timvf_get_ring(void);
void timvf_release_ring(uint8_t vfid);
void *timvf_bar(uint8_t id, uint8_t bar);
int timvf_timer_adapter_caps_get(const struct rte_eventdev *dev, uint64_t flags,
- uint32_t *caps, const struct rte_event_timer_adapter_ops **ops,
- uint8_t enable_stats);
+ uint32_t *caps,
+ const struct event_timer_adapter_ops **ops,
+ uint8_t enable_stats);
uint16_t timvf_timer_cancel_burst(const struct rte_event_timer_adapter *adptr,
struct rte_event_timer **tim, const uint16_t nb_timers);
uint16_t timvf_timer_arm_burst_sp(const struct rte_event_timer_adapter *adptr,
@@ -9,7 +9,7 @@
#include "otx2_evdev.h"
#include "otx2_tim_evdev.h"
-static struct rte_event_timer_adapter_ops otx2_tim_ops;
+static struct event_timer_adapter_ops otx2_tim_ops;
static inline int
tim_get_msix_offsets(void)
@@ -497,8 +497,7 @@ otx2_tim_stats_reset(const struct rte_event_timer_adapter *adapter)
int
otx2_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
- uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops)
+ uint32_t *caps, const struct event_timer_adapter_ops **ops)
{
struct otx2_tim_evdev *dev = tim_priv_get();
@@ -5,8 +5,8 @@
#ifndef __OTX2_TIM_EVDEV_H__
#define __OTX2_TIM_EVDEV_H__
+#include <event_timer_adapter_pmd.h>
#include <rte_event_timer_adapter.h>
-#include <rte_event_timer_adapter_pmd.h>
#include <rte_reciprocal.h>
#include "otx2_dev.h"
@@ -244,7 +244,7 @@ uint16_t otx2_tim_timer_cancel_burst(
int otx2_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops);
+ const struct event_timer_adapter_ops **ops);
void otx2_tim_init(struct rte_pci_device *pci_dev, struct otx2_dev *cmn_dev);
void otx2_tim_fini(void);
@@ -561,10 +561,9 @@ sw_eth_rx_adapter_caps_get(const struct rte_eventdev *dev,
}
static int
-sw_timer_adapter_caps_get(const struct rte_eventdev *dev,
- uint64_t flags,
+sw_timer_adapter_caps_get(const struct rte_eventdev *dev, uint64_t flags,
uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops)
+ const struct event_timer_adapter_ops **ops)
{
RTE_SET_USED(dev);
RTE_SET_USED(flags);
similarity index 95%
rename from lib/eventdev/rte_event_timer_adapter_pmd.h
rename to lib/eventdev/event_timer_adapter_pmd.h
@@ -3,8 +3,8 @@
* All rights reserved.
*/
-#ifndef __RTE_EVENT_TIMER_ADAPTER_PMD_H__
-#define __RTE_EVENT_TIMER_ADAPTER_PMD_H__
+#ifndef __EVENT_TIMER_ADAPTER_PMD_H__
+#define __EVENT_TIMER_ADAPTER_PMD_H__
/**
* @file
@@ -57,7 +57,7 @@ typedef int (*rte_event_timer_adapter_stats_reset_t)(
* @internal Structure containing the functions exported by an event timer
* adapter implementation.
*/
-struct rte_event_timer_adapter_ops {
+struct event_timer_adapter_ops {
rte_event_timer_adapter_init_t init; /**< Set up adapter */
rte_event_timer_adapter_uninit_t uninit;/**< Tear down adapter */
rte_event_timer_adapter_start_t start; /**< Start adapter */
@@ -111,4 +111,4 @@ struct rte_event_timer_adapter_data {
}
#endif
-#endif /* __RTE_EVENT_TIMER_ADAPTER_PMD_H__ */
+#endif /* __EVENT_TIMER_ADAPTER_PMD_H__ */
@@ -28,8 +28,8 @@ extern "C" {
#include <rte_mbuf.h>
#include <rte_mbuf_dyn.h>
+#include "event_timer_adapter_pmd.h"
#include "rte_eventdev.h"
-#include "rte_event_timer_adapter_pmd.h"
/* Logging Macros */
#define RTE_EDEV_LOG_ERR(...) \
@@ -574,10 +574,8 @@ struct rte_event_eth_rx_adapter_queue_conf;
*
*/
typedef int (*eventdev_timer_adapter_caps_get_t)(
- const struct rte_eventdev *dev,
- uint64_t flags,
- uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops);
+ const struct rte_eventdev *dev, uint64_t flags, uint32_t *caps,
+ const struct event_timer_adapter_ops **ops);
/**
* Add ethernet Rx queues to event device. This callback is invoked if
@@ -24,7 +24,6 @@ headers = files(
'rte_event_ring.h',
'rte_event_eth_rx_adapter.h',
'rte_event_timer_adapter.h',
- 'rte_event_timer_adapter_pmd.h',
'rte_event_crypto_adapter.h',
'rte_event_eth_tx_adapter.h',
)
@@ -35,6 +34,7 @@ driver_sdk_headers += files(
'eventdev_pmd.h',
'eventdev_pmd_pci.h',
'eventdev_pmd_vdev.h',
+ 'event_timer_adapter_pmd.h',
)
deps += ['ring', 'ethdev', 'hash', 'mempool', 'mbuf', 'timer', 'cryptodev']
@@ -20,11 +20,11 @@
#include <rte_service_component.h>
#include <rte_cycles.h>
-#include "rte_eventdev.h"
+#include "event_timer_adapter_pmd.h"
#include "eventdev_pmd.h"
-#include "rte_eventdev_trace.h"
#include "rte_event_timer_adapter.h"
-#include "rte_event_timer_adapter_pmd.h"
+#include "rte_eventdev.h"
+#include "rte_eventdev_trace.h"
#define DATA_MZ_NAME_MAX_LEN 64
#define DATA_MZ_NAME_FORMAT "rte_event_timer_adapter_data_%d"
@@ -35,7 +35,7 @@ RTE_LOG_REGISTER_SUFFIX(evtim_svc_logtype, adapter.timer.svc, NOTICE);
static struct rte_event_timer_adapter adapters[RTE_EVENT_TIMER_ADAPTER_NUM_MAX];
-static const struct rte_event_timer_adapter_ops swtim_ops;
+static const struct event_timer_adapter_ops swtim_ops;
#define EVTIM_LOG(level, logtype, ...) \
rte_log(RTE_LOG_ ## level, logtype, \
@@ -1207,15 +1207,15 @@ swtim_arm_tmo_tick_burst(const struct rte_event_timer_adapter *adapter,
return __swtim_arm_burst(adapter, evtims, nb_evtims);
}
-static const struct rte_event_timer_adapter_ops swtim_ops = {
- .init = swtim_init,
- .uninit = swtim_uninit,
- .start = swtim_start,
- .stop = swtim_stop,
- .get_info = swtim_get_info,
- .stats_get = swtim_stats_get,
- .stats_reset = swtim_stats_reset,
- .arm_burst = swtim_arm_burst,
- .arm_tmo_tick_burst = swtim_arm_tmo_tick_burst,
- .cancel_burst = swtim_cancel_burst,
+static const struct event_timer_adapter_ops swtim_ops = {
+ .init = swtim_init,
+ .uninit = swtim_uninit,
+ .start = swtim_start,
+ .stop = swtim_stop,
+ .get_info = swtim_get_info,
+ .stats_get = swtim_stats_get,
+ .stats_reset = swtim_stats_reset,
+ .arm_burst = swtim_arm_burst,
+ .arm_tmo_tick_burst = swtim_arm_tmo_tick_burst,
+ .cancel_burst = swtim_cancel_burst,
};
@@ -523,7 +523,7 @@ struct rte_event_timer_adapter {
/**< Pointer to driver cancel function. */
struct rte_event_timer_adapter_data *data;
/**< Pointer to shared adapter data */
- const struct rte_event_timer_adapter_ops *ops;
+ const struct event_timer_adapter_ops *ops;
/**< Functions exported by adapter driver */
RTE_STD_C11
@@ -140,7 +140,7 @@ int
rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps)
{
struct rte_eventdev *dev;
- const struct rte_event_timer_adapter_ops *ops;
+ const struct event_timer_adapter_ops *ops;
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);