From 838949ea97c9594c224d095bafbcd19e3932a001 Mon Sep 17 00:00:00 2001 From: James Bergsten Date: Thu, 9 May 2019 11:05:53 -0700 Subject: [PATCH] nvme: Make Telemetry definition in nvme_spec.h consistent with rest of the file. No functional changes. Signed-off-by: James Bergsten Change-Id: Ia7ceea56a30703539a6376121bc418b9266cb34c Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453915 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- include/spdk/nvme_spec.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/include/spdk/nvme_spec.h b/include/spdk/nvme_spec.h index 172540319..9b05304ac 100644 --- a/include/spdk/nvme_spec.h +++ b/include/spdk/nvme_spec.h @@ -1937,16 +1937,23 @@ SPDK_STATIC_ASSERT(sizeof(struct spdk_nvme_cmds_and_effect_log_page) == 4096, "I * Get Log Page – Telemetry Host/Controller Initiated Log (Log Identifiers 07h/08h) */ struct spdk_nvme_telemetry_log_page_hdr { - uint8_t lpi; /* Log page identifier */ + /* Log page identifier */ + uint8_t lpi; uint8_t rsvd[4]; uint8_t ieee_oui[3]; - uint16_t dalb1; /* Data area 1 last block */ - uint16_t dalb2; /* Data area 2 last block */ - uint16_t dalb3; /* Data area 3 last block */ + /* Data area 1 last block */ + uint16_t dalb1; + /* Data area 2 last block */ + uint16_t dalb2; + /* Data area 3 last block */ + uint16_t dalb3; uint8_t rsvd1[368]; - uint8_t ctrlr_avail; /* Controller initiated data avail */ - uint8_t ctrlr_gen; /* Controller initiated telemetry data generation */ - uint8_t rsnident[128]; /* Reason identifier */ + /* Controller initiated data avail */ + uint8_t ctrlr_avail; + /* Controller initiated telemetry data generation */ + uint8_t ctrlr_gen; + /* Reason identifier */ + uint8_t rsnident[128]; uint8_t telemetry_datablock[0]; }; SPDK_STATIC_ASSERT(sizeof(struct spdk_nvme_telemetry_log_page_hdr) == 512, "Incorrect size");