patch-2.0.36 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.0.35/linux/drivers/block/paride/pf.c linux/drivers/block/paride/pf.c
@@ -111,10 +111,12 @@
 				Small change in pf_completion to round
 				up transfer size.
 	1.02    GRG 1998.06.16  Eliminated an Ugh
+	1.03s   GRG 1998.09.24  Added jumbo support
+				Use HZ in loop timings, extra debugging
 
 */
 
-#define PF_VERSION      "1.02s"
+#define PF_VERSION      "1.03s"
 #define PF_MAJOR	47
 #define PF_NAME		"pf"
 #define PF_UNITS	4
@@ -211,7 +213,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
@@ -495,6 +497,12 @@
 
 {       int     err;
 
+#ifdef PARIDE_JUMBO
+       { extern paride_init();
+         paride_init();
+       } 
+#endif
+
         err = pf_init();
 
         return err;
@@ -616,7 +624,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