nvme-print-json: use NVME_BOOT_PARTITION_INFO field definitions

Change it instead of hardcoded field mask and shift values.

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

diff --git a/nvme-print-json.c b/nvme-print-json.c
index 1c34aa58c11b5f5ab4c80a085738ebee10a4f79f..8a103160d68576392a5874cd10553d78bb884c56 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -2000,8 +2000,8 @@ static void json_boot_part_log(void *bp_log, const char *devname,
        struct json_object *r = json_create_object();
 
        obj_add_uint(r, "count", hdr->lid);
-       obj_add_uint(r, "abpid", (le32_to_cpu(hdr->bpinfo) >> 31) & 0x1);
-       obj_add_uint(r, "bpsz", le32_to_cpu(hdr->bpinfo) & 0x7fff);
+       obj_add_uint(r, "abpid", NVME_BOOT_PARTITION_INFO_ABPID(le32_to_cpu(hdr->bpinfo)));
+       obj_add_uint(r, "bpsz", NVME_BOOT_PARTITION_INFO_BPSZ(le32_to_cpu(hdr->bpinfo)));
 
        json_print(r);
 }