CVS: 2 files have been modified in linux/include/linux/bluetooth.

[Anders J. <and...@us...>]

The following files were modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.h     1.47            1.48=20=20=20=20=20=20=20=20=20=20=20=20
btcommon.h      1.89            1.90=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Added bt_timer_obj.
* Removed some not used vars in l2cap_con-obj.
* All structures which use timers should now use the new bt_timer_obj.


The diff of the modified file(s):

--- bluetooth.h	2001/11/15 15:02:37	1.47
+++ bluetooth.h	2001/11/22 14:06:20	1.48
@@ -101,14 +101,14 @@
 /* Handles wakeup of failed blocking function calls */
 #ifdef __KERNEL__
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
-void start_wq_timer(struct timer_list *wq_timer,
+void start_wq_timer(struct bt_timer_obj *wq_bt_timer,
 		    u32 timeout, wait_queue_head_t *wq);
 #else
-void start_wq_timer(struct timer_list *wq_timer,
+void start_wq_timer(struct bt_timer_obj *wq_bt_timer,
 		    u32 timeout, struct wait_queue **wq);
=20
 #endif /* LINUX_VERSION_CODE */
-void release_wq_timer(struct timer_list *wq_timer);
+void release_wq_timer(struct bt_timer_obj *wq_bt_timer);
 #endif /* __KERNEL__ */
=20
 #endif
--- btcommon.h	2001/10/22 12:57:13	1.89
+++ btcommon.h	2001/11/22 14:06:20	1.90
@@ -299,6 +299,17 @@
 #define RFCOMM_TX_HDRSIZE sizeof(rfcomm_tx_buf)
 #define SDP_TX_HDRSIZE sizeof(sdp_tx_buf)
=20
+/****************** Definitiion of common bt_timer_obj struct ************=
***/
+typedef struct bt_timer_obj=20
+{
+	u8 inuse;
+#ifdef __KERNEL__
+	struct timer_list timer;
+#else
+	int timer;
+#endif
+} bt_timer_obj;
+
 /****************** Some typedefs used in the l2cap_con struct ***********=
***/
=20
 typedef u8 BD_ADDR[6];
@@ -320,20 +331,12 @@
 /* FIXME -- move all layer specific structs into each layers .h file=20
    and fix include order ! */
=20
-/* RTX Actions */
-#define RTX_ACTION_DISCONNECT 0 /* default */
-#define RTX_ACTION_START_ERTX 1  /* during con*/
-#define RTX_ACTION_TERMINATE 2 /* if we tried to disconnect and got no res=
p */
-
-#define ERTX_ACTION_DISCONNECT 0xf0 /* default */
-#define ERTX_ACTION_TERMINATE 0xf1
-
 typedef struct l2cap_timer_obj
 {
 #ifdef __KERNEL__
-	struct timer_list rtx;
-	struct timer_list ertx;
-	struct timer_list crtx; /* Maximum negotiation time 120 sec */
+	struct bt_timer_obj rtx;
+	struct bt_timer_obj ertx;
+	struct bt_timer_obj crtx; /* Maximum negotiation time 120 sec */
 #else
 	/* dummy */
 	int rtx;
@@ -341,15 +344,6 @@
 	int crtx; /* Maximum negotiation time 120 sec */
 #endif
 	u16 rtx_no; /* nbr retries */
-	u16 rtx_action; /* preferred action when rtx expires */=09
-	u16 rtx_inuse; /* to avoid concurrent use */
-
-	u16 ertx_action; /* preferred action when ertx expires */=09
-	u16 ertx_inuse;
-
-=20=20
-
-	//struct timeval caller_id; /* used to identify caller */
 } __attribute__ ((packed)) l2cap_timer_obj;
=20
 typedef struct l2cap_con {
@@ -385,7 +379,7 @@
 	s32 conf_rsp_ready; /* indicates if we replied pos on a config req */
=20
 	/* Fixme -- fix multicall */
-	struct l2cap_timer_obj timer;
+	struct l2cap_timer_obj timers;
=20
 	/* Fixme -- fix all return values according this system */
 	s32 c_result; /* returns result to higher layers, used together with
@@ -521,23 +515,16 @@
 #define NO_LINE 256
=20
 #ifdef __KERNEL__
-#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 typedef struct bt_ctrl_struct {
 	struct bt_session session[BT_NBR_PORTS];
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 	wait_queue_head_t connect_wq[BT_NBR_PORTS];=20
 	wait_queue_head_t any_wq;
-	s32 nbr_active;
-	s32 nbr_upper;
-	s32 ctrl_tty_count; /* number of open file descriptors to ttyBTC */
-	s32 tty_last_unthrottled; /* indicated which line that was woken=20
-				     up last time buffers were below the=20
-				     unthrottle level */
-} bt_ctrl_struct;
 #else
-typedef struct bt_ctrl_struct {
-	struct bt_session session[BT_NBR_PORTS];
 	struct wait_queue *connect_wq[BT_NBR_PORTS];=20
 	struct wait_queue *any_wq;
+#endif
+	struct bt_timer_obj bt_timer[BT_NBR_PORTS];
 	s32 nbr_active;
 	s32 nbr_upper;
 	s32 ctrl_tty_count; /* number of open file descriptors to ttyBTC */
@@ -545,7 +532,6 @@
 				     up last time buffers were below the=20
 				     unthrottle level */
 } bt_ctrl_struct;
-#endif /* LINUX_VERSION_CODE */
 #endif /* __KERNEL__ */
=20
 typedef struct bt_stat_struct
@@ -574,6 +560,9 @@
 	u32 serport_name_length;
 	u8 serport_name[64];
 } serport_profile_info;
+
+
+
=20
 #endif
 /****************** END OF FILE btcommon.h *******************************=
***/