patch-2.1.118 linux/drivers/block/paride/pf.c

Next file: linux/drivers/block/paride/pg.c
Previous file: linux/drivers/block/paride/pd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.117/linux/drivers/block/paride/pf.c linux/drivers/block/paride/pf.c
@@ -76,10 +76,11 @@
                         (default 64)
 
             verbose     This parameter controls the amount of logging
-                        that is done while the driver probes for
-                        devices.  Set it to 0 for a quiet load, or 1 to
-                        see all the progress messages.  (default 0)
-
+                        that the driver will do.  Set it to 0 for
+                        normal operation, 1 to see autoprobe progress
+                        messages, or 2 to see additional debugging
+                        output.  (default 0)
+ 
 	    nice        This parameter controls the driver's use of
 			idle CPU time, at the expense of some speed.
 
@@ -107,10 +108,11 @@
 				Small change in pf_completion to round
 				up transfer size.
 	1.02    GRG 1998.06.16  Eliminated an Ugh
+	1.03    GRG 1998.08.16  Use HZ in loop timings, extra debugging
 
 */
 
-#define PF_VERSION      "1.02"
+#define PF_VERSION      "1.03"
 #define PF_MAJOR	47
 #define PF_NAME		"pf"
 #define PF_UNITS	4
@@ -217,7 +219,7 @@
 #define PF_TMO          800             /* interrupt timeout in jiffies */
 #define PF_SPIN_DEL     50              /* spin delay in micro-seconds  */
 
-#define PF_SPIN         (10000/PF_SPIN_DEL)*PF_TMO  
+#define PF_SPIN         (1000000*PF_TMO)/(HZ*PF_SPIN_DEL)
 
 #define STAT_ERR        0x00001
 #define STAT_INDEX      0x00002
@@ -316,6 +318,7 @@
         pf_ioctl,               /* ioctl */
         NULL,                   /* mmap */
         pf_open,                /* open */
+	NULL,			/* flush */
         pf_release,             /* release */
         block_fsync,            /* fsync */
         NULL,                   /* fasync */
@@ -627,7 +630,7 @@
         return r;
 }
 
-#define DBMSG(msg)      NULL
+#define DBMSG(msg)      ((verbose>1)?(msg):NULL)
 
 static void pf_lock(int unit, int func)
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov