patch-2.3.16 linux/include/net/irda/iriap.h

Next file: linux/include/net/irda/irias_object.h
Previous file: linux/include/net/irda/irda_device.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/include/net/irda/iriap.h linux/include/net/irda/iriap.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Thu Aug 21 00:02:07 1997
- * Modified at:   Sun May  9 10:56:57 1999
+ * Modified at:   Thu Jul  1 10:10:42 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1997, 1999 Dag Brattli <dagb@cs.uit.no>, All Rights Reserved.
@@ -57,9 +57,9 @@
 				 struct ias_value *value, void *priv);
 
 struct iriap_cb {
-	QUEUE queue; /* Must be first */
-	
-	int          magic;  /* Magic cookie */
+	QUEUE   queue;  /* Must be first */	
+	magic_t magic;  /* Magic cookie */
+
 	int          mode;   /* Client or server */
 
 	__u32        saddr;
@@ -88,9 +88,9 @@
 
 int  iriap_init(void);
 void iriap_cleanup(void);
-void iriap_getvaluebyclass_request( char *name, char *attr, 
-				    __u32 saddr, __u32 daddr,
-				    CONFIRM_CALLBACK callback, void *priv);
+void iriap_getvaluebyclass_request(char *name, char *attr, 
+				   __u32 saddr, __u32 daddr,
+				   CONFIRM_CALLBACK callback, void *priv);
 void iriap_getvaluebyclass_confirm(struct iriap_cb *self, struct sk_buff *skb);
 
 void iriap_send_ack( struct iriap_cb *self);
@@ -98,13 +98,13 @@
 
 void iriap_register_server(void);
 
-void iriap_watchdog_timer_expired( unsigned long data);
+void iriap_watchdog_timer_expired(void *data);
 
-static inline void iriap_start_watchdog_timer( struct iriap_cb *self, 
-					       int timeout) 
+static inline void iriap_start_watchdog_timer(struct iriap_cb *self, 
+					      int timeout) 
 {
-	irda_start_timer( &self->watchdog_timer, timeout, 
-			  (unsigned long) self, iriap_watchdog_timer_expired);
+	irda_start_timer(&self->watchdog_timer, timeout, self, 
+			 iriap_watchdog_timer_expired);
 }
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)