jclklib: test: Add hex support to mask input

Allow user to input hex value to mask with 0x or 0X prefix. Besides, print out the unit for timeout and upper lower limit. Signed-off-by: Song Yoong Siang <[email protected]>
intel-staging · May 14, 2024 · 6e99121 · 6e99121
1 parent 1b65120
commit 6e99121
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/jclklib/client/test.cpp b/jclklib/client/test.cpp
@@ -52,10 +52,10 @@ int main(int argc, char *argv[])
     while ((opt = getopt(argc, argv, "s:c:t:u:l:h")) != -1) {
         switch (opt) {
         case 's':
-            event2Sub1[0] = std::stoul(optarg);
+            event2Sub1[0] = std::stoul(optarg, nullptr, 0);
             break;
         case 'c':
-            composite_event[0] = std::stoul(optarg);
+            composite_event[0] = std::stoul(optarg, nullptr, 0);
             break;
         case 't':
             timeout = std::stoi(optarg);
@@ -70,45 +70,45 @@ int main(int argc, char *argv[])
             std::cout << "Usage of " << argv[0] << " :\n"
                 "Options:\n"
                 "  -s subscribe_event_mask\n"
-                "     Default: " << event2Sub1[0] << "\n"
+                "     Default: 0x" << std::hex << event2Sub1[0] << "\n"
                 "     Bit 0: gmOffsetEvent\n"
                 "     Bit 1: servoLockedEvent\n"
                 "     Bit 2: asCapableEvent\n"
                 "     Bit 3: gmPresentEvent\n"
                 "     Bit 4: gmChangedEvent\n"
                 "  -c composite_event_mask\n"
-                "     Default: " << composite_event[0] << "\n"
+                "     Default: 0x" << composite_event[0] << "\n"
                 "     Bit 0: gmOffsetEvent\n"
                 "     Bit 1: servoLockedEvent\n"
                 "     Bit 2: asCapableEvent\n"
-                "  -t timeout in waiting notification event\n"
-                "     Default: " << timeout << "\n"
-                "  -u upper master offset\n"
-                "     Default: " << upper_master_offset << "\n"
-                "  -l lower master offset\n"
-                "     Default: " << lower_master_offset << "\n";
+                "  -u upper master offset (ns)\n"
+                "     Default: " << std::dec << upper_master_offset << " ns\n"
+                "  -l lower master offset (ns)\n"
+                "     Default: " << lower_master_offset << " ns\n"
+                "  -t timeout in waiting notification event (s)\n"
+                "     Default: " << timeout << " s\n";
             return EXIT_SUCCESS;
         default:
             std::cerr << "Usage of " << argv[0] << " :\n"
                 "Options:\n"
                 "  -s subscribe_event_mask\n"
-                "     Default: " << event2Sub1[0] << "\n"
+                "     Default: 0x" << std::hex << event2Sub1[0] << "\n"
                 "     Bit 0: gmOffsetEvent\n"
                 "     Bit 1: servoLockedEvent\n"
                 "     Bit 2: asCapableEvent\n"
                 "     Bit 3: gmPresentEvent\n"
                 "     Bit 4: gmChangedEvent\n"
                 "  -c composite_event_mask\n"
-                "     Default: " << composite_event[0] << "\n"
+                "     Default: 0x" << composite_event[0] << "\n"
                 "     Bit 0: gmOffsetEvent\n"
                 "     Bit 1: servoLockedEvent\n"
                 "     Bit 2: asCapableEvent\n"
-                "  -t timeout in waiting notification event\n"
-                "     Default: " << timeout << "\n"
-                "  -u upper master offset\n"
-                "     Default: " << upper_master_offset << "\n"
-                "  -l lower master offset\n"
-                "     Default: " << lower_master_offset << "\n";
+                "  -u upper master offset (ns)\n"
+                "     Default: " << std::dec << upper_master_offset << " ns\n"
+                "  -l lower master offset (ns)\n"
+                "     Default: " << lower_master_offset << " ns\n"
+                "  -t timeout in waiting notification event (s)\n"
+                "     Default: " << timeout << " s\n";
             return EXIT_FAILURE;
         }
     }