patch-2.2.3 linux/include/net/irda/irlpt_common.h

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

diff -u --recursive --new-file v2.2.2/linux/include/net/irda/irlpt_common.h linux/include/net/irda/irlpt_common.h
@@ -1,6 +1,6 @@
 /*********************************************************************
  *
- * Filename:      irlpt.c
+ * Filename:      irlpt_common.h
  * Version:       
  * Description:   
  * Status:        Experimental.
@@ -67,7 +67,6 @@
 	IRLPT_CLIENT_QUERY,
 	IRLPT_CLIENT_READY,
 	IRLPT_CLIENT_WAITI,
-	IRLPT_CLIENT_WAITR,
 	IRLPT_CLIENT_CONN,
 } IRLPT_CLIENT_STATE;
 
@@ -87,10 +86,6 @@
 	LMP_DISCONNECT,
 	LMP_CONNECT_INDICATION,
 	LMP_DISCONNECT_INDICATION,
-#if 0
-	TTP_CONNECT_INDICATION,
-	TTP_DISCONNECT_INDICATION,
-#endif
         IRLPT_DISCOVERY_INDICATION,
 	IRLPT_CONNECT_REQUEST,
 	IRLPT_DISCONNECT_REQUEST,
@@ -101,6 +96,7 @@
 	struct lsap_cb *lsap;
 	__u8 dlsap_sel;
 	__u32 daddr;
+	__u32 saddr;
 };
 
 /* Command packet types */
@@ -142,7 +138,8 @@
 
 	int magic;		/* magic used to detect corruption of 
 				   the struct */
-	__u32 daddr;		/* my local address. */
+	__u32 daddr;		/* address of remote printer */
+	__u32 saddr;            /* my local address. */
 
 	struct timer_list retry_timer;
 	
@@ -167,6 +164,14 @@
 	struct wait_queue *read_wait;	/* wait queues */
 	struct wait_queue *write_wait;
 	struct wait_queue *ex_wait;
+
+	/* this is used to remove the printer when it's gone */
+	struct timer_list lpt_timer;
+	void (*timeout) (unsigned long data);
+
+	void (*do_event) (struct irlpt_cb *self, IRLPT_EVENT event, 
+			  struct sk_buff *skb,
+			  struct irlpt_info *info);
 
 	/* this is used by the server side of the system */
 

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