git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: fix doxygen for parameters of function pointers
[dpdk.git]
/
lib
/
librte_rawdev
/
rte_rawdev.c
diff --git
a/lib/librte_rawdev/rte_rawdev.c
b/lib/librte_rawdev/rte_rawdev.c
index
a576890
..
f29164d
100644
(file)
--- a/
lib/librte_rawdev/rte_rawdev.c
+++ b/
lib/librte_rawdev/rte_rawdev.c
@@
-82,6
+82,7
@@
rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info,
size_t dev_private_size)
{
struct rte_rawdev *rawdev;
size_t dev_private_size)
{
struct rte_rawdev *rawdev;
+ int ret = 0;
RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
RTE_FUNC_PTR_OR_ERR_RET(dev_info, -EINVAL);
RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
RTE_FUNC_PTR_OR_ERR_RET(dev_info, -EINVAL);
@@
-90,7
+91,8
@@
rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info,
if (dev_info->dev_private != NULL) {
RTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);
if (dev_info->dev_private != NULL) {
RTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);
- (*rawdev->dev_ops->dev_info_get)(rawdev, dev_info->dev_private,
+ ret = (*rawdev->dev_ops->dev_info_get)(rawdev,
+ dev_info->dev_private,
dev_private_size);
}
dev_private_size);
}
@@
-98,11
+100,12
@@
rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info,
dev_info->device = rawdev->device;
dev_info->socket_id = rawdev->socket_id;
dev_info->device = rawdev->device;
dev_info->socket_id = rawdev->socket_id;
- return
0
;
+ return
ret
;
}
int
}
int
-rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf)
+rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf,
+ size_t dev_private_size)
{
struct rte_rawdev *dev;
int diag;
{
struct rte_rawdev *dev;
int diag;
@@
-121,7
+124,8
@@
rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf)
}
/* Configure the device */
}
/* Configure the device */
- diag = (*dev->dev_ops->dev_configure)(dev, dev_conf->dev_private);
+ diag = (*dev->dev_ops->dev_configure)(dev, dev_conf->dev_private,
+ dev_private_size);
if (diag != 0)
RTE_RDEV_ERR("dev%d dev_configure = %d", dev_id, diag);
else
if (diag != 0)
RTE_RDEV_ERR("dev%d dev_configure = %d", dev_id, diag);
else
@@
-133,7
+137,8
@@
rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf)
int
rte_rawdev_queue_conf_get(uint16_t dev_id,
uint16_t queue_id,
int
rte_rawdev_queue_conf_get(uint16_t dev_id,
uint16_t queue_id,
- rte_rawdev_obj_t queue_conf)
+ rte_rawdev_obj_t queue_conf,
+ size_t queue_conf_size)
{
struct rte_rawdev *dev;
{
struct rte_rawdev *dev;
@@
-141,14
+146,15
@@
rte_rawdev_queue_conf_get(uint16_t dev_id,
dev = &rte_rawdevs[dev_id];
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_def_conf, -ENOTSUP);
dev = &rte_rawdevs[dev_id];
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_def_conf, -ENOTSUP);
- (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf);
-
return 0
;
+ return (*dev->dev_ops->queue_def_conf)(dev, queue_id, queue_conf,
+
queue_conf_size)
;
}
int
rte_rawdev_queue_setup(uint16_t dev_id,
uint16_t queue_id,
}
int
rte_rawdev_queue_setup(uint16_t dev_id,
uint16_t queue_id,
- rte_rawdev_obj_t queue_conf)
+ rte_rawdev_obj_t queue_conf,
+ size_t queue_conf_size)
{
struct rte_rawdev *dev;
{
struct rte_rawdev *dev;
@@
-156,7
+162,8
@@
rte_rawdev_queue_setup(uint16_t dev_id,
dev = &rte_rawdevs[dev_id];
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_setup, -ENOTSUP);
dev = &rte_rawdevs[dev_id];
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_setup, -ENOTSUP);
- return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf);
+ return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf,
+ queue_conf_size);
}
int
}
int
@@
-391,20
+398,21
@@
rte_rawdev_start(uint16_t dev_id)
RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_rawdevs[dev_id];
RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_rawdevs[dev_id];
- RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP);
-
if (dev->started != 0) {
RTE_RDEV_ERR("Device with dev_id=%" PRIu8 "already started",
dev_id);
return 0;
}
if (dev->started != 0) {
RTE_RDEV_ERR("Device with dev_id=%" PRIu8 "already started",
dev_id);
return 0;
}
+ if (dev->dev_ops->dev_start == NULL)
+ goto mark_started;
+
diag = (*dev->dev_ops->dev_start)(dev);
diag = (*dev->dev_ops->dev_start)(dev);
- if (diag == 0)
- dev->started = 1;
- else
+ if (diag != 0)
return diag;
return diag;
+mark_started:
+ dev->started = 1;
return 0;
}
return 0;
}
@@
-418,15
+426,18
@@
rte_rawdev_stop(uint16_t dev_id)
RTE_RAWDEV_VALID_DEVID_OR_RET(dev_id);
dev = &rte_rawdevs[dev_id];
RTE_RAWDEV_VALID_DEVID_OR_RET(dev_id);
dev = &rte_rawdevs[dev_id];
- RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);
-
if (dev->started == 0) {
RTE_RDEV_ERR("Device with dev_id=%" PRIu8 "already stopped",
dev_id);
return;
}
if (dev->started == 0) {
RTE_RDEV_ERR("Device with dev_id=%" PRIu8 "already stopped",
dev_id);
return;
}
+ if (dev->dev_ops->dev_stop == NULL)
+ goto mark_stopped;
+
(*dev->dev_ops->dev_stop)(dev);
(*dev->dev_ops->dev_stop)(dev);
+
+mark_stopped:
dev->started = 0;
}
dev->started = 0;
}
@@
-567,11
+578,15
@@
handle_dev_xstats(const char *cmd __rte_unused,
struct rte_rawdev_xstats_name *xstat_names;
int dev_id, num_xstats, i, ret;
unsigned int *ids;
struct rte_rawdev_xstats_name *xstat_names;
int dev_id, num_xstats, i, ret;
unsigned int *ids;
+ char *end_param;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
return -1;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
return -1;
- dev_id = atoi(params);
+ dev_id = strtoul(params, &end_param, 0);
+ if (*end_param != '\0')
+ RTE_RDEV_LOG(NOTICE,
+ "Extra parameters passed to rawdev telemetry command, ignoring");
if (!rte_rawdev_pmd_is_valid_dev(dev_id))
return -1;
if (!rte_rawdev_pmd_is_valid_dev(dev_id))
return -1;