Fix the bug of Model Number and display the info of Serial Number

According to the NVMe Specification, there is an error when display Model Number.
In addition, currently it does not display the info of Serial Number, so add it.

diff --git a/nvme-print.c b/nvme-print.c
index 60a4c34a4b8200c9524e13dff4544a9f19cbf88b..5722111affa941ffeeb1efdc6af83149aeb0202a 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -579,7 +579,7 @@ void show_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode)
        printf("vid     : %#x\n", le16toh(ctrl->vid));
        printf("ssvid   : %#x\n", le16toh(ctrl->ssvid));
        printf("sn      : %-20.20s\n", ctrl->sn);
-       printf("mn      : %-20.20s\n", ctrl->mn);
+       printf("mn      : %-40.40s\n", ctrl->mn);
        printf("fr      : %-.8s\n", ctrl->fr);
        printf("rab     : %d\n", ctrl->rab);
        printf("ieee    : %02x%02x%02x\n",

diff --git a/nvme.c b/nvme.c
index 9a7e4b34157a8dd538215ef875c3b20c8291b954..4f4307af3676072790e660843d3fe35682b86f5c 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -758,19 +758,19 @@ static void print_list_item(struct list_item list_item)
        sprintf(version,"%d.%d", (list_item.ver >> 16),
                (list_item.ver >> 8) & 0xff);
 
-       printf("%-16s %-20.20s %-8s %-8d %-26s %-16s %-.8s\n", list_item.node,
-               list_item.ctrl.mn, version, list_item.nsid, usage, format, list_item.ctrl.fr);
+       printf("%-16s %-20.20s %-40.40s %-8s %-8d %-26s %-16s %-.8s\n", list_item.node,
+           list_item.ctrl.sn, list_item.ctrl.mn, version, list_item.nsid, usage, format, list_item.ctrl.fr);
 }
 
 static void print_list_items(struct list_item *list_items, unsigned len)
 {
        unsigned i;
 
-       printf("%-16s %-20s %-8s %-8s %-26s %-16s %-8s\n",
-               "Node","Model","Version","Namepace", "Usage", "Format", "FW Rev");
-       printf("%-16s %-20s %-8s %-8s %-26s %-16s %-8s\n",
-            "----------------","--------------------","--------","--------",
-            "--------------------------","----------------","--------");
+       printf("%-16s %-20s %-40s %-8s %-8s %-26s %-16s %-8s\n",
+           "Node", "SN", "Model", "Version", "Namepace", "Usage", "Format", "FW Rev");
+       printf("%-16s %-20s %-40s %-8s %-8s %-26s %-16s %-8s\n",
+            "----------------", "--------------------", "----------------------------------------",
+            "--------", "--------", "--------------------------", "----------------", "--------");
        for (i = 0 ; i < len ; i++)
                print_list_item(list_items[i]);