Reformatted text output to match other plugins

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index e14766568adf62c9dfb181db863a2c05cc45fd8f..81568aefbcaf74c340e5616c9b4d6d8c1c240bca 100644 (file)
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -3252,119 +3252,111 @@ static void wdc_print_bd_ca_log_normal(void *data)
 {
        struct wdc_bd_ca_log_format *bd_data = (struct wdc_bd_ca_log_format *)data;
        __u64 *raw;
-       __u16 *word_raw;
+       __u16 *word_raw1, *word_raw2, *word_raw3;
        __u32  *dword_raw;
        __u8  *byte_raw;
 
        if (bd_data->field_id == 0x00) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  CA Log Page values :- \n");
-               printf("  Program fail counts                 %20"PRIu64"\n",
-                               le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
-               printf("  %% Remaining of allowable program fails               %3"PRIu8"\n",
-                               bd_data->normalized_value);
+               printf("Additional Smart Log for NVME device:X namespace-id:Y\n");
+               printf("key                     normalized raw\n");
+        printf("program_fail_count              : %3"PRIu8"%%       %20"PRIu64"\n",
+                               bd_data->normalized_value, le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x01) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Erase fail count                    %20"PRIu64"\n",
-                               le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
-               printf("  %% Remaining of allowable erase fails                 %3"PRIu8"\n",
-                               bd_data->normalized_value);
+               printf("erase_fail_count                : %3"PRIu8"%%       %20"PRIu64"\n",
+                               bd_data->normalized_value, le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x02) {
-               word_raw = (__u16*)bd_data->raw_value;
-               printf("  Min erase cycles                              %10"PRIu16"\n",
-                               le16_to_cpu(*word_raw));
-               word_raw = (__u16*)&bd_data->raw_value[2];
-               printf("  Max erase cycles                              %10"PRIu16"\n",
-                               le16_to_cpu(*word_raw));
-               word_raw = (__u16*)&bd_data->raw_value[4];
-               printf("  Ave erase cycles                              %10"PRIu16"\n",
-                               le16_to_cpu(*word_raw));
-               printf("  Wear Leveling Normalized                             %3"PRIu8"\n",
-                               bd_data->normalized_value);
-
+               word_raw1 = (__u16*)bd_data->raw_value;
+               word_raw2 = (__u16*)&bd_data->raw_value[2];
+               word_raw3 = (__u16*)&bd_data->raw_value[4];
+               printf("wear_leveling                   : %3"PRIu8"%%       min: %10"PRIu16", max: %10"PRIu16", avg: %10"PRIu16"\n",
+                               bd_data->normalized_value,
+                               le16_to_cpu(*word_raw1),
+                               le16_to_cpu(*word_raw2),
+                               le16_to_cpu(*word_raw3));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x03) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  End to end error detection count    %20"PRIu64"\n",
-                               le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
+               printf("end_to_end_error_detection_count: %3"PRIu8"%%       %20"PRIu64"\n",
+                               bd_data->normalized_value, le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x04) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Crc error count                     %20"PRIu64"\n",
-                               le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
+               printf("crc_error_count                 : %3"PRIu8"%%       %20"PRIu64"\n",
+                          bd_data->normalized_value, le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x05) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Timed workload media error              %20.3f\n",
-                               safe_div_fp((*raw & 0x00FFFFFFFFFFFFFF), 1024.0));
+               printf("timed_workload_media_wear       : %3"PRIu8"%%       %20.3f"PRIu64"%%\n",
+                          bd_data->normalized_value, 
+                          safe_div_fp((*raw & 0x00FFFFFFFFFFFFFF), 1024.0));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x06) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Timed workload host reads %%                          %3"PRIu64"\n",
-                               le64_to_cpu(*raw & 0x00000000000000FF));
+               printf("timed_workload_host_reads       : %3"PRIu8"%%       %3"PRIu64"%%\n",
+                          bd_data->normalized_value, le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x07) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Timed workload timer                %20"PRIu64"\n",
-                               le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
+               printf("timed_workload_timer            : %3"PRIu8"%%       %20"PRIu64"\n",
+                          bd_data->normalized_value, le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x08) {
                byte_raw = (__u8*)bd_data->raw_value;
-               printf("  Throttle status %%                             %10"PRIu16"\n",
-                               *byte_raw);
                dword_raw = (__u32*)&bd_data->raw_value[1];
-               printf("  Throttling event counter                      %10"PRIu16"\n",
-                               le32_to_cpu(*dword_raw));
+               printf("thermal_throttle_status         : %3"PRIu8"%%       %10"PRIu16"%%, cnt: %10"PRIu16"\n",
+                               bd_data->normalized_value, *byte_raw, le32_to_cpu(*dword_raw));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x09) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Retry buffer overflow count         %20"PRIu64"\n",
-                               le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
+               printf("retry_buffer_overflow_count     : %3"PRIu8"%%       %20"PRIu64"\n",
+                          bd_data->normalized_value, le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x0A) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Pll lock loss count                 %20"PRIu64"\n",
-                               le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
+               printf("pll_lock_loss_count             : %3"PRIu8"%%       %20"PRIu64"\n",
+                          bd_data->normalized_value, le64_to_cpu(*raw & 0x00FFFFFFFFFFFFFF));
        } else {
                goto invalid_id;
        }
        bd_data++;
        if (bd_data->field_id == 0x0B) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Nand bytes written (32mb)           %20.0f\n",
-                               safe_div_fp((*raw & 0x00FFFFFFFFFFFFFF), 0xFFFF));
+               printf("nand_bytes_written              : %3"PRIu8"%%       sectors: %20.0f"PRIu64"\n",
+                          bd_data->normalized_value, safe_div_fp((*raw & 0x00FFFFFFFFFFFFFF), 0xFFFF));
                raw = (__u64*)bd_data->raw_value;
        } else {
                goto invalid_id;
@@ -3372,8 +3364,8 @@ static void wdc_print_bd_ca_log_normal(void *data)
        bd_data++;
        if (bd_data->field_id == 0x0C) {
                raw = (__u64*)bd_data->raw_value;
-               printf("  Host bytes written (32mb)           %20.0f\n",
-                               safe_div_fp((*raw & 0x00FFFFFFFFFFFFFF), 0xFFFF));
+               printf("host_bytes_written              : %3"PRIu8"%%       sectors: %20.0f"PRIu64"\n",
+                          bd_data->normalized_value, safe_div_fp((*raw & 0x00FFFFFFFFFFFFFF), 0xFFFF));
                raw = (__u64*)bd_data->raw_value;
        } else {
                goto invalid_id;