patch-2.2.6 linux/include/net/irda/timer.h

• Lines: 83
• Date: Thu Apr 15 05:42:42 1999
• Orig file: v2.2.5/linux/include/net/irda/timer.h
• Orig date: Wed Mar 10 15:29:50 1999

diff -u --recursive --new-file v2.2.5/linux/include/net/irda/timer.h linux/include/net/irda/timer.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Sat Aug 16 00:59:29 1997
- * Modified at:   Thu Feb  4 11:05:24 1999
+ * Modified at:   Tue Apr  6 16:17:16 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1997, 1998 Dag Brattli <dagb@cs.uit.no>, 
@@ -26,6 +26,8 @@
 #ifndef TIMER_H
 #define TIMER_H
 
+#include <asm/param.h>  /* for HZ */
+
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>
 #include <net/irda/irlap.h>
@@ -35,46 +37,46 @@
 /* 
  *  Timeout definitions, some defined in IrLAP p. 92
  */
-#define POLL_TIMEOUT        45             /* Must never exceed 500 ms */
-#define FINAL_TIMEOUT       50             /* Must never exceed 500 ms */
+#define POLL_TIMEOUT        450*HZ/1000    /* Must never exceed 500 ms */
+#define FINAL_TIMEOUT       500*HZ/1000    /* Must never exceed 500 ms */
 
 /* 
  *  Normally twice of p-timer. Note 3, IrLAP p. 60 suggests at least twice 
  *  duration of the P-timer.
  */
 #define WD_TIMEOUT          POLL_TIMEOUT*2
-#define MEDIABUSY_TIMEOUT   50             /* 500 msec */
+#define MEDIABUSY_TIMEOUT   500*HZ/1000    /* 500 msec */
 
 /*
  *  Slot timer must never exceed 85 ms, and must always be at least 25 ms, 
  *  suggested to  75-85 msec by IrDA lite
  */
-#define SLOT_TIMEOUT             8
-#define QUERY_TIMEOUT          100
+#define SLOT_TIMEOUT            80*HZ/1000
+#define QUERY_TIMEOUT           HZ          /* 1 sec */
 
-#define WATCHDOG_TIMEOUT      2000                /* 20 sec */
+#define WATCHDOG_TIMEOUT        20*HZ       /* 20 sec */
 
-typedef void (*TIMER_CALLBACK)( unsigned long);
+typedef void (*TIMER_CALLBACK)(unsigned long);
 
-void irda_start_timer( struct timer_list *ptimer, int timeout, int data,
-		       TIMER_CALLBACK callback);
+void irda_start_timer(struct timer_list *ptimer, int timeout, int data,
+		      TIMER_CALLBACK callback);
 
-inline void irlap_start_slot_timer( struct irlap_cb *self, int timeout);
-inline void irlap_start_query_timer( struct irlap_cb *self, int timeout);
-inline void irlap_start_final_timer( struct irlap_cb *self, int timeout);
-inline void irlap_start_wd_timer( struct irlap_cb *self, int timeout);
-inline void irlap_start_backoff_timer( struct irlap_cb *self, int timeout);
+inline void irlap_start_slot_timer(struct irlap_cb *self, int timeout);
+inline void irlap_start_query_timer(struct irlap_cb *self, int timeout);
+inline void irlap_start_final_timer(struct irlap_cb *self, int timeout);
+inline void irlap_start_wd_timer(struct irlap_cb *self, int timeout);
+inline void irlap_start_backoff_timer(struct irlap_cb *self, int timeout);
 
-inline void irda_device_start_mbusy_timer( struct irda_device *self);
+inline void irda_device_start_mbusy_timer(struct irda_device *self);
 
 struct lsap_cb;
 struct lap_cb;
-inline void irlmp_start_watchdog_timer( struct lsap_cb *, int timeout);
-inline void irlmp_start_discovery_timer( struct irlmp_cb *, int timeout);
+inline void irlmp_start_watchdog_timer(struct lsap_cb *, int timeout);
+inline void irlmp_start_discovery_timer(struct irlmp_cb *, int timeout);
 inline void irlmp_start_idle_timer(struct lap_cb *, int timeout);
 
 struct irobex_cb;
-inline void irobex_start_watchdog_timer( struct irobex_cb *, int timeout);
+inline void irobex_start_watchdog_timer(struct irobex_cb *, int timeout);
 
 #endif