Changeset 156 for trunk/src/os2ahci/os2ahci.c

Timestamp:

May 6, 2013, 7:57:39 PM (12 years ago)

Author:

David Azarewicz

Message:

debugging updates

File:

• trunk/src/os2ahci/os2ahci.c (modified) (7 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -45 +45 @@
   }
 
+#define drv_parm_int_optional(s, value, type, radix) \
+  { \
+    char _far *_ep; \
+    if ((s)[1] == ':') { \
+      value = (type) strtol((s) + 2, (const char _far* _far*) &_ep, radix); \
+      s = _ep; \
+    } else { \
+      value++; \
+    } \
+  }
+
 /* set two-dimensional array of port options */
 #define set_port_option(opt, val)                         \
@@ -88 +99 @@
 int             init_reset = 1;    /* if != 0, reset ports during init */
 int             force_write_cache; /* if != 0, force write cache */
-int             verbosity = 1;     /* == 1 -> show sign on banner
-                                    *  > 1 -> show adapter info during boot */
+int             verbosity = 0;     /* default is quiet. 1=show sign on banner, >1=show adapter info during boot */
 int             use_lvm_info = 1;
+int             wrap_trace_buffer = 0;
+long            com_baud = 0;
 
 PFN             Device_Help = 0;   /* pointer to device helper entry point */
@@ -243 +255 @@
         goto init_fail;
 
+      case 'b':
+        drv_parm_int(s, com_baud, u32, 10);
+        break;
+
       case 'c':
         /* set COM port base address for debug messages */
@@ -252 +268 @@
       case 'd':
         /* increase debug level */
-        debug++;
+        drv_parm_int_optional(s, debug, int, 10);
         break;
 
@@ -347 +363 @@
 
       case 'z':
+        /* Specify to not use the LVM information. There is no reason why anyone would
+         * want to do this, but previous versions of this driver did not have LVM capability,
+         * so this switch is here temporarily just in case.
+         */
         use_lvm_info = !invert_option;
         break;
@@ -352 +372 @@
       case 'v':
         /* be verbose during boot */
-        verbosity++;
+        drv_parm_int_optional(s, verbosity, int, 10);
+        break;
+
+      case 'w':
+        /* Specify to allow the trace buffer to wrap when full. */
+        wrap_trace_buffer = !invert_option;
         break;
 
       case 'q':
-        /* be quiet */
-        verbosity = -1000;
+        /* Temporarily output a non-fatal message to get anyone using this
+         * undocumented switch to stop using it. This will be removed soon
+         * and the error will become fatal.
+         */
+        cprintf("%s: unknown option: /%c\n", drv_name, *s);
         break;
 
@@ -370 +398 @@
   ciprintf(init_msg, drv_name, VERSION / 100, VERSION % 100);
 
-//#ifdef ECS_BUILD
-//  ciprintf("This driver is licensed for use only in conjunction with eComStation.\n");
-//#else
-//  ciprintf("This is the Open Watcom build.\n");
-//#endif
-
-  if (debug) {
-    /* initialize com port for debug output */
-    //DAZ init_com();
-  }
+  if (com_baud) init_com(com_baud); /* initialize com port for debug output */
 
   /* initialize trace buffer if applicable */