Changeset 123 for trunk

Timestamp:

Sep 1, 2011, 3:34:05 PM (14 years ago)

Author:

Markus Thielen

Message:

renamed 'cvprintf' to 'ciprintf' to avoid confusion with vprintf-like funcs

Location:

trunk/src/os2ahci

Files:

• os2ahci.c (modified) (3 diffs)
• os2ahci.h (modified) (1 diff)
• pci.c (modified) (1 diff)

trunk/src/os2ahci/os2ahci.c

@@ -317 +317 @@
 
   /* print initialization message */
-  cvprintf(init_msg, drv_name, VERSION / 100, VERSION % 100);
+  ciprintf(init_msg, drv_name, VERSION / 100, VERSION % 100);
 
 #ifdef ECS_BUILD
-  cvprintf("This driver is licensed for use only in conjunction with eComStation.");
+  ciprintf("This driver is licensed for use only in conjunction with eComStation.");
 #endif
 
@@ -362 +362 @@
   } else {
     /* no adapters found */
-    cvprintf(" No adapters found.\n");
+    ciprintf(" No adapters found.\n");
   }
 
@@ -380 +380 @@
   }
 
-  cvprintf(exit_msg, drv_name);
+  ciprintf(exit_msg, drv_name);
   return(STDON | ERROR_I24_QUIET_INIT_FAIL);
 }

trunk/src/os2ahci/os2ahci.h

@@ -105 +105 @@
 #define dddphex   if (debug > 2) phex
 
-/* verbosity console print macros */
-#define cvprintf  if (verbosity > 0) cprintf
-#define cvvprintf if (verbosity > 1) cprintf
+/* verbosity console print macros 
+ * (we use 'i' in ciprintf here to avoid name clash
+ * with vprintf-like funcs)
+ */
+#define ciprintf  if (verbosity > 0) cprintf
+#define ciiprintf if (verbosity > 1) cprintf
 
 /* TRACE macros (for our internal ring buffer trace) */

trunk/src/os2ahci/pci.c

@@ -614 +614 @@
 
   /* found a supported AHCI device */
-  cvvprintf("found AHCI device: %s %s (%04x:%04x)\n"
+  ciiprintf("found AHCI device: %s %s (%04x:%04x)\n"
             " class:0x%06lx bus:%d devfunc:0x%02x\n",
             vendor_from_id(vendor), device_from_id(device),