doc: add Meson coding style to contributors guide

[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 ee6c087..f29164d 100644 (file)
--- a/lib/librte_rawdev/rte_rawdev.c
+++ b/lib/librte_rawdev/rte_rawdev.c
@@ -29,16 +29,11 @@
 #include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
-#ifdef RTE_LIBRTE_TELEMETRY
 #include <rte_telemetry.h>
-#endif
 
 #include "rte_rawdev.h"
 #include "rte_rawdev_pmd.h"
 
-/* dynamic log identifier */
-int librawdev_logtype;
-
 static struct rte_rawdev rte_rawdevices[RTE_RAWDEV_MAX_DEVS];
 
 struct rte_rawdev *rte_rawdevs = rte_rawdevices;
@@ -83,29 +78,34 @@ rte_rawdev_socket_id(uint16_t dev_id)
 }
 
 int
-rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)
+rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info,
+               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);
 
        rawdev = &rte_rawdevs[dev_id];
 
-       RTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);
-       (*rawdev->dev_ops->dev_info_get)(rawdev, dev_info->dev_private);
-
-       if (dev_info) {
-
-               dev_info->driver_name = rawdev->driver_name;
-               dev_info->device = rawdev->device;
+       if (dev_info->dev_private != NULL) {
+               RTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);
+               ret = (*rawdev->dev_ops->dev_info_get)(rawdev,
+                               dev_info->dev_private,
+                               dev_private_size);
        }
 
-       return 0;
+       dev_info->driver_name = rawdev->driver_name;
+       dev_info->device = rawdev->device;
+       dev_info->socket_id = rawdev->socket_id;
+
+       return ret;
 }
 
 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;
@@ -124,7 +124,8 @@ rte_rawdev_configure(uint16_t dev_id, struct rte_rawdev_info *dev_conf)
        }
 
        /* 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
@@ -136,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,
-                         rte_rawdev_obj_t queue_conf)
+                         rte_rawdev_obj_t queue_conf,
+                         size_t queue_conf_size)
 {
        struct rte_rawdev *dev;
 
@@ -144,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->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,
-                      rte_rawdev_obj_t queue_conf)
+                      rte_rawdev_obj_t queue_conf,
+                      size_t queue_conf_size)
 {
        struct rte_rawdev *dev;
 
@@ -159,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);
-       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
@@ -394,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_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->dev_ops->dev_start == NULL)
+               goto mark_started;
+
        diag = (*dev->dev_ops->dev_start)(dev);
-       if (diag == 0)
-               dev->started = 1;
-       else
+       if (diag != 0)
                return diag;
 
+mark_started:
+       dev->started = 1;
        return 0;
 }
 
@@ -421,15 +426,18 @@ rte_rawdev_stop(uint16_t 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->dev_ops->dev_stop == NULL)
+               goto mark_stopped;
+
        (*dev->dev_ops->dev_stop)(dev);
+
+mark_stopped:
        dev->started = 0;
 }
 
@@ -547,7 +555,6 @@ rte_rawdev_pmd_release(struct rte_rawdev *rawdev)
        return 0;
 }
 
-#ifdef RTE_LIBRTE_TELEMETRY
 static int
 handle_dev_list(const char *cmd __rte_unused,
                const char *params __rte_unused,
@@ -571,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;
+       char *end_param;
 
        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;
 
@@ -615,17 +626,13 @@ handle_dev_xstats(const char *cmd __rte_unused,
        free(rawdev_xstats);
        return 0;
 }
-#endif
 
-RTE_INIT(librawdev_init_log)
+RTE_LOG_REGISTER(librawdev_logtype, lib.rawdev, INFO);
+
+RTE_INIT(librawdev_init_telemetry)
 {
-       librawdev_logtype = rte_log_register("lib.rawdev");
-       if (librawdev_logtype >= 0)
-               rte_log_set_level(librawdev_logtype, RTE_LOG_INFO);
-#ifdef RTE_LIBRTE_TELEMETRY
        rte_telemetry_register_cmd("/rawdev/list", handle_dev_list,
                        "Returns list of available rawdev ports. Takes no parameters");
        rte_telemetry_register_cmd("/rawdev/xstats", handle_dev_xstats,
                        "Returns the xstats for a rawdev port. Parameters: int port_id");
-#endif
 }