nvme-print: Use EOM optional data present macros changed

Also use the EOM optional data present reserved field macro added.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/nvme-print-json.c b/nvme-print-json.c
index 8cf057f2d007d3b09e188435906c293451abdb92..870c98b455c6e2959f81fec527f5f73f08b08093 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -2011,7 +2011,7 @@ static void json_phy_rx_eom_descs(struct nvme_phy_rx_eom_log *log,
                obj_add_uint(jdesc, "ncols", le16_to_cpu(desc->ncols));
                obj_add_uint(jdesc, "edlen", le16_to_cpu(desc->edlen));
 
-               if (log->odp & NVME_EOM_PRINTABLE_EYE_PRESENT)
+               if (NVME_EOM_ODP_PEFP(log->odp))
                        allocated_eyes[i] = json_eom_printable_eye(desc, r);
 
                /* Eye Data field is vendor specific, doesn't map to JSON */

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 1b62a8e4bd2c8021991e97c28ddd42d92b985e79..0b74561913b368a43ae745a895464965456fb12a 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -707,9 +707,9 @@ static const char *eomip_to_string(__u8 eomip)
 
 static void stdout_phy_rx_eom_odp(uint8_t odp)
 {
-       __u8 rsvd = (odp >> 2) & 0x3F;
-       __u8 edfp = (odp >> 1) & 0x1;
-       __u8 pefp = odp & 0x1;
+       __u8 rsvd = NVME_EOM_ODP_RSVD(odp);
+       __u8 edfp = NVME_EOM_ODP_EDFP(odp);
+       __u8 pefp = NVME_EOM_ODP_PEFP(odp);
 
        if (rsvd)
                printf("  [7:2] : %#x\tReserved\n", rsvd);
@@ -751,7 +751,7 @@ static void stdout_phy_rx_eom_descs(struct nvme_phy_rx_eom_log *log)
                printf("Number of Columns: %u\n", le16_to_cpu(desc->ncols));
                printf("Eye Data Length: %u\n", le16_to_cpu(desc->edlen));
 
-               if (log->odp & NVME_EOM_PRINTABLE_EYE_PRESENT)
+               if (NVME_EOM_ODP_PEFP(log->odp))
                        stdout_eom_printable_eye(desc);
 
                /* Eye Data field is vendor specific */