Merge pull request #67 from wdc-tools/master

Fixed option checking for format to match NVMe spec limits.

diff --cc nvme.c
index fd2187a6cd47c75b6e8f050b4e71220898d71cf7,55ae51f0ffed90b1e9084779fdacae7848dab111..0344812b4b4e66ae1093ed2929a06d42e339c43f
--- 1/nvme.c
--- 2/nvme.c
+++ b/nvme.c
@@@ -1263,15 -1330,17 +1263,15 @@@ static int show_registers(int argc, cha
  
  static int format(int argc, char **argv)
  {
 -      const char *desc = "format: re-format a specified namespace on the "\
 +      const char *desc = "Re-format a specified namespace on the "\
                "given device. Can erase all data in namespace (user "\
                "data erase) or delete data encryption key if specified. "\
 -              "Can also be used to change LBAF such that device may "\
 -              "disappear from all lists since capacity superficially "\
 -              "appears to be 0.";
 +              "Can also be used to change LBAF to change the namespaces reported physical block format.";
        const char *namespace_id = "name of desired namespace";
 -      const char *lbaf = "LBA format to apply (req'd)";
 +      const char *lbaf = "LBA format to apply (required)";
        const char *ses = "[0-2]: secure erase";
-       const char *pil = "[0-3]: protection info location";
-       const char *pi = "[0-1]: protection info off/on";
+       const char *pil = "[0-1]: protection info location last/first 8 bytes of metadata";
+       const char *pi = "[0-3]: protection info off/Type 1/Type 2/Type 3";
        const char *ms = "[0-1]: extended format off/on";
        const char *timeout = "timeout value";
        int err;