cryptodev: remove PMD type

[dpdk.git] / lib / librte_cryptodev / rte_cryptodev.h

diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h
index cf28541..417e3f9 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -50,17 +50,17 @@ extern "C" {
 #include "rte_dev.h"
 #include <rte_common.h>
 
-#define CRYPTODEV_NAME_NULL_PMD                cryptodev_null_pmd
+#define CRYPTODEV_NAME_NULL_PMD                crypto_null
 /**< Null crypto PMD device name */
-#define CRYPTODEV_NAME_AESNI_MB_PMD    cryptodev_aesni_mb_pmd
+#define CRYPTODEV_NAME_AESNI_MB_PMD    crypto_aesni_mb
 /**< AES-NI Multi buffer PMD device name */
-#define CRYPTODEV_NAME_AESNI_GCM_PMD   cryptodev_aesni_gcm_pmd
+#define CRYPTODEV_NAME_AESNI_GCM_PMD   crypto_aesni_gcm
 /**< AES-NI GCM PMD device name */
-#define CRYPTODEV_NAME_QAT_SYM_PMD     cryptodev_qat_sym_pmd
+#define CRYPTODEV_NAME_QAT_SYM_PMD     crypto_qat
 /**< Intel QAT Symmetric Crypto PMD device name */
-#define CRYPTODEV_NAME_SNOW3G_PMD      cryptodev_snow3g_pmd
+#define CRYPTODEV_NAME_SNOW3G_PMD      crypto_snow3g
 /**< SNOW 3G PMD device name */
-#define CRYPTODEV_NAME_KASUMI_PMD      cryptodev_kasumi_pmd
+#define CRYPTODEV_NAME_KASUMI_PMD      crypto_kasumi
 /**< KASUMI PMD device name */
 
 /** Crypto device type */
@@ -77,26 +77,30 @@ extern const char **rte_cyptodev_names;
 
 /* Logging Macros */
 
-#define CDEV_LOG_ERR(fmt, args...)                                     \
-               RTE_LOG(ERR, CRYPTODEV, "%s() line %u: " fmt "\n",      \
-                               __func__, __LINE__, ## args)
+#define CDEV_LOG_ERR(...) \
+       RTE_LOG(ERR, CRYPTODEV, \
+               RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+                       __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
 
-#define CDEV_PMD_LOG_ERR(dev, fmt, args...)                            \
-               RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-                               dev, __func__, __LINE__, ## args)
+#define CDEV_PMD_LOG_ERR(dev, ...) \
+       RTE_LOG(ERR, CRYPTODEV, \
+               RTE_FMT("[%s] %s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+                       dev, __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
 
 #ifdef RTE_LIBRTE_CRYPTODEV_DEBUG
-#define CDEV_LOG_DEBUG(fmt, args...)                                   \
-               RTE_LOG(DEBUG, CRYPTODEV, "%s() line %u: " fmt "\n",    \
-                               __func__, __LINE__, ## args)            \
+#define CDEV_LOG_DEBUG(...) \
+       RTE_LOG(DEBUG, CRYPTODEV, \
+               RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+                       __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
 
-#define CDEV_PMD_TRACE(fmt, args...)                                   \
-               RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s: " fmt "\n",         \
-                               dev, __func__, ## args)
+#define CDEV_PMD_TRACE(...) \
+       RTE_LOG(DEBUG, CRYPTODEV, \
+               RTE_FMT("[%s] %s: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+                       dev, __func__, RTE_FMT_TAIL(__VA_ARGS__,)))
 
 #else
-#define CDEV_LOG_DEBUG(fmt, args...)
-#define CDEV_PMD_TRACE(fmt, args...)
+#define CDEV_LOG_DEBUG(...) (void)0
+#define CDEV_PMD_TRACE(...) (void)0
 #endif
 
 /**
@@ -616,8 +620,6 @@ struct rte_cryptodev {
 
        enum rte_cryptodev_type dev_type;
        /**< Crypto device type */
-       enum pmd_type pmd_type;
-       /**< PMD type - PDEV / VDEV */
 
        struct rte_cryptodev_cb_list link_intr_cbs;
        /**< User application callback for interrupts if present */