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

Timestamp:

Sep 1, 2011, 1:32:43 PM (14 years ago)

Author:

Markus Thielen

Message:

• added support for /q switch (#7)
• added cv#printf macros to support verbosity setting from command line

File:

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

trunk/src/os2ahci/os2ahci.c

@@ -33 +33 @@
 
 /* parse integer command line parameter */
-#define drv_parm_int(s, value, type, radix)               \
-  {                                                       \
-    char _far *_ep;                                       \
-    if ((s)[1] != ':') {                                  \
-      cprintf("missing colon (:) after /%c\n", *(s));     \
-      goto init_fail;                                     \
-    }                                                     \
-    value = (type) strtol((s) + 2,                        \
-                          (const char _far* _far*) &_ep,  \
-                          radix);                         \
-    s = _ep;                                              \
+#define drv_parm_int(s, value, type, radix)                         \
+  {                                                                 \
+    char _far *_ep;                                                 \
+    if ((s)[1] != ':') {                                            \
+      cprintf("%s: missing colon (:) after /%c\n", drv_name, *(s)); \
+      goto init_fail;                                               \
+    }                                                               \
+    value = (type) strtol((s) + 2,                                  \
+                          (const char _far* _far*) &_ep,            \
+                          radix);                                   \
+    s = _ep;                                                        \
   }
 
@@ -73 +73 @@
 int             thorough_scan = 1; /* if != 0, perform thorough PCI scan */
 int             init_reset;        /* if != 0, reset ports during init */
-int             verbosity;         /* if > 0, show some info during boot */
+int             verbosity = 1;     /* == 1 -> show sign on banner
+                                    *  > 1 -> show adapter info during boot */
 
 PFN             Device_Help = 0;   /* pointer to device helper entry point */
@@ -83 +84 @@
 USHORT          add_handle;        /* driver handle (RegisterDeviceClass) */
 UCHAR           timer_pool[TIMER_POOL_SIZE]; /* timer pool */
+char            drv_name[] = "OS2AHCI"; /* driver name as string */
 
 /* resource manager driver information structure */
 DRIVERSTRUCT rm_drvinfo = {
-  "OS2AHCI",                       /* driver name */
+  drv_name,                        /* driver name */
   "AHCI SATA Driver",              /* driver description */
   "GNU",                           /* vendor name */
@@ -112 +114 @@
 u8              track_size[MAX_AD][AHCI_MAX_PORTS];
 
-static char     init_msg[] = "OS2AHCI driver version %d.%02d\n";
-static char     exit_msg[] = "OS2AHCI driver *not* installed\n";
+static char     init_msg[] = "%s driver version %d.%02d\n";
+static char     exit_msg[] = "%s driver *not* installed\n";
 
 /* ----------------------------- start of code ----------------------------- */
@@ -179 +181 @@
   init_libc();
 
-  /* print initialization message */
-  cprintf(init_msg, VERSION / 100, VERSION % 100);
-
-#ifdef ECS_BUILD
-  cprintf("This driver is licensed for use only in conjunction with eComStation.");
-#endif
-
   /* register driver with resource manager */
   if ((rmrc = RMCreateDriver(&rm_drvinfo, &rm_drvh)) != RMRC_SUCCESS) {
-    cprintf("failed to register driver with resource manager (rc = %d)\n", rmrc);
+    cprintf("%s: failed to register driver with resource manager (rc = %d)\n",
+            drv_name, rmrc);
     goto init_fail;
   }
@@ -205 +201 @@
       case '\0':
         /* end of command line; can only happen if command line is incorrect */
-        cprintf("incomplete command line option\n");
+        cprintf("%s: incomplete command line option\n", drv_name);
         goto init_fail;
 
@@ -223 +219 @@
         drv_parm_int(s, device, u16, 16);
         if (add_pci_id(vendor, device)) {
-          cprintf("failed to add PCI ID %04x:%04x\n", vendor, device);
+          cprintf("%s: failed to add PCI ID %04x:%04x\n", drv_name, vendor, device);
           goto init_fail;
         }
@@ -243 +239 @@
         drv_parm_int(s, adapter_index, int, 10);
         if (adapter_index < 0 || adapter_index >= MAX_AD) {
-          cprintf("invalid adapter index (%d)\n", adapter_index);
+          cprintf("%s: invalid adapter index (%d)\n", drv_name, adapter_index);
           goto init_fail;
         }
@@ -252 +248 @@
         drv_parm_int(s, port_index, int, 10);
         if (port_index < 0 || port_index >= AHCI_MAX_PORTS) {
-          cprintf("invalid port index (%d)\n", port_index);
+          cprintf("%s: invalid port index (%d)\n", drv_name, port_index);
           goto init_fail;
         }
@@ -289 +285 @@
           break;
         default:
-          cprintf("invalid link parameter (%c)\n", *s);
+          cprintf("%s: invalid link parameter (%c)\n", drv_name, *s);
           goto init_fail;
         }
@@ -308 +304 @@
         break;
 
+      case 'q':
+        /* be quiet */
+        verbosity = -1000;
+        break;
+
       default:
-        cprintf("unknown option: /%c\n", *s);
+        cprintf("%s: unknown option: /%c\n", drv_name, *s);
         goto init_fail;
       }
     }
   }
+
+  /* print initialization message */
+  cvprintf(init_msg, drv_name, VERSION / 100, VERSION % 100);
+
+#ifdef ECS_BUILD
+  cvprintf("This driver is licensed for use only in conjunction with eComStation.");
+#endif
 
   if (debug) {
@@ -334 +342 @@
     mdelay_cal();
 
-    if (DevHelp_RegisterDeviceClass("OS2AHCI", (PFN) add_entry, 0, 1,
+    if (DevHelp_RegisterDeviceClass(drv_name, (PFN) add_entry, 0, 1,
                                     &add_handle)) {
-      cprintf("error: couldn't register device class\n");
+      cprintf("%s: couldn't register device class\n", drv_name);
       goto init_fail;
     }
@@ -344 +352 @@
         DevHelp_AllocateCtxHook(mk_NPFN(reset_hook), &reset_ctxhook_h) != 0 ||
         DevHelp_AllocateCtxHook(mk_NPFN(engine_hook), &engine_ctxhook_h)) {
-      cprintf("failed to allocate task-time context hooks\n");
+      cprintf("%s: failed to allocate task-time context hooks\n", drv_name);
       goto init_fail;
     }
@@ -354 +362 @@
   } else {
     /* no adapters found */
-    cprintf(" No adapters found.\n");
+    cvprintf(" No adapters found.\n");
   }
 
@@ -372 +380 @@
   }
 
-  cprintf(exit_msg);
+  cvprintf(exit_msg, drv_name);
   return(STDON | ERROR_I24_QUIET_INIT_FAIL);
 }