types: Move enum nvme_data_tfr to types

As this is part of the spec, let's move this to the types.h header
file.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/src/nvme/types.h b/src/nvme/types.h
index cba57676da489f4e516f7a79324b204154d9111a..94066fc2f4f41ef973e6f2a12064e2a07ab39fc0 100644 (file)
--- a/src/nvme/types.h
+++ b/src/nvme/types.h
@@ -7046,6 +7046,20 @@ enum nvme_fctype {
        nvme_fabrics_type_disconnect            = 0x08,
 };
 
+/**
+ * enum nvme_data_tfr - Data transfer direction of the command
+ * @NVME_DATA_TFR_NO_DATA_TFR:         No data transfer
+ * @NVME_DATA_TFR_HOST_TO_CTRL:                Host to controller
+ * @NVME_DATA_TFR_CTRL_TO_HOST:                Controller to host
+ * @NVME_DATA_TFR_BIDIRECTIONAL:       Bidirectional
+ */
+enum nvme_data_tfr {
+       NVME_DATA_TFR_NO_DATA_TFR       = 0x0,
+       NVME_DATA_TFR_HOST_TO_CTRL      = 0x1,
+       NVME_DATA_TFR_CTRL_TO_HOST      = 0x2,
+       NVME_DATA_TFR_BIDIRECTIONAL     = 0x3,
+};
+
 /**
  * enum nvme_io_opcode - Opcodes for I/O Commands
  * @nvme_cmd_flush:            Flush

diff --git a/src/nvme/util.h b/src/nvme/util.h
index 73be6e962977b5bb5a0d1d9720e743cc647e0196..e72c1569ffa089de004fc00141be65e885d0223e 100644 (file)
--- a/src/nvme/util.h
+++ b/src/nvme/util.h
@@ -155,20 +155,6 @@ void nvme_init_copy_range_f1(struct nvme_copy_range_f1 *copy, __u16 *nlbs,
  */
 int nvme_get_feature_length(int fid, __u32 cdw11, __u32 *len);
 
-/**
- * enum nvme_data_tfr - Data transfer direction of the command
- * @NVME_DATA_TFR_NO_DATA_TFR:         No data transfer
- * @NVME_DATA_TFR_HOST_TO_CTRL:                Host to controller
- * @NVME_DATA_TFR_CTRL_TO_HOST:                Controller to host
- * @NVME_DATA_TFR_BIDIRECTIONAL:       Bidirectional
- */
-enum nvme_data_tfr {
-       NVME_DATA_TFR_NO_DATA_TFR,
-       NVME_DATA_TFR_HOST_TO_CTRL,
-       NVME_DATA_TFR_CTRL_TO_HOST,
-       NVME_DATA_TFR_BIDIRECTIONAL
-};
-
 /**
  * nvme_get_feature_length2() - Retreive the command payload length for a
  *                            specific feature identifier