Menu
▾
▴
openbt-commit — CVS commits to the AXIS OpenBT Stack
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
(44) |
Mar
(202) |
Apr
(134) |
May
(89) |
Jun
(94) |
Jul
(58) |
Aug
(58) |
Sep
(56) |
Oct
(75) |
Nov
(26) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(24) |
Feb
(30) |
Mar
(15) |
Apr
(49) |
May
(12) |
Jun
(6) |
Jul
(11) |
Aug
(20) |
Sep
(19) |
Oct
(3) |
Nov
(13) |
Dec
(1) |
| 2003 |
Jan
(7) |
Feb
(4) |
Mar
(7) |
Apr
(5) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(2) |
Nov
(51) |
Dec
(1) |
| 2004 |
Jan
(11) |
Feb
(5) |
Mar
|
Apr
(5) |
May
(2) |
Jun
|
Jul
(21) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Mattias ?g. <mat...@us...> - 2001-03-02 14:29:15
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
bt_misc.c 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
added 921,6 kbps option int translate_speed
The diff of the modified file(s):
--- bt_misc.c 2001/03/02 10:59:57 1.1
+++ bt_misc.c 2001/03/02 14:30:32 1.2
@@ -280,6 +280,13 @@
case 460800:
speed_c =3D B460800;
break;
+
+#ifdef __CRIS__
+ case 921600:
+ speed_c =3D B921600;
+ break;
+#endif
+
default:
printf("Bad baudrate %d.\n", spd);
break;
|
|
From: Mattias ?g. <mat...@us...> - 2001-03-02 14:28:15
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
bt_vendor.c 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
added baudrate setting call for CSR
removed unused code
minor changes
The diff of the modified file(s):
--- bt_vendor.c 2001/03/02 10:59:57 1.1
+++ bt_vendor.c 2001/03/02 14:29:32 1.2
@@ -321,6 +321,7 @@
/* Set the phys device to CSR default, 115200 */=20
void init_phys(int fd)
{
+ syslog(LOG_INFO, "Setting default baud 115200");
fd_setup(fd, 115200, USE_FLOW_CTRL);
}
=20
@@ -349,6 +350,17 @@
perror("HCIWRITESCANENABLE");
exit(1);
}
+
+ sleep(1);
+
+ syslog(LOG_INFO, "Setting baudrate in CSR module!\n");=20=20
+
+ bt_set_baudrate(bt_cfd, spd);
+=20=20
+ /* Now set phys device speed to whatever HW was set to use */
+ fd_setup(phys_fd, spd, USE_FLOW_CTRL);
+ tcflush(phys_fd, TCIOFLUSH);
+
#else
printf("Setting write_scan_enable in CSR module!\n");
hci_write_scan_enable(PAGE_SCAN_ENABLE|INQUIRY_SCAN_ENABLE);
@@ -367,14 +379,6 @@
=20
}
=20=20
-void
-reset_hw(void)
-{
- printf("ERROR! Do not know how to reset hardware.\n");
-}
-
-
-
#elif HW_USED(HW_GENERIC)
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
/* Generic specific commands */
@@ -404,13 +408,6 @@
#endif
}
=20
-void
-reset_hw(void)
-{
- printf("ERROR! Do not know how to reset hardware.\n");
-}
-
-
#elif HW_USED(HW_NOINIT)
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
/* HW No init commands */
@@ -427,12 +424,6 @@
printf("No hw init done\n");
}
=20
-void
-reset_hw(void)
-{
- printf("ERROR! No hardware.\n");
-}
-
#else
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
/* Default */
@@ -448,11 +439,6 @@
printf("ERROR: init_hw() not implemented!\n");
}
=20
-void
-reset_hw(void)
-{
- printf("ERROR: reset_hw() not implemented!\n");
-}
=20
#endif /* HW_USED() */
=20
|
|
From: Mattias ?g. <mat...@us...> - 2001-03-02 13:53:40
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_conf.h 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Changed default setting for IPA The diff of the modified file(s): --- bt_conf.h 2001/03/02 10:59:57 1.1 +++ bt_conf.h 2001/03/02 13:54:57 1.2 @@ -70,6 +70,6 @@ /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D*/ /* IPA server */ =20 -#define USE_IPASSIGN +//#define USE_IPASSIGN =20 #endif /* __BT_CONF_H__ */ |
|
From: Mattias ?g. <mat...@us...> - 2001-03-02 13:13:11
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.1 Added The accompanying log: Initial version |
|
From: Mattias ?g. <mat...@us...> - 2001-03-02 12:34:24
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- btd.c 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: fixed typo The diff of the modified file(s): --- btd.c 2001/03/02 10:59:57 1.1 +++ btd.c 2001/03/02 12:35:41 1.2 @@ -46,7 +46,7 @@ =20 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -= =20 =20 -Syntax: ./bti [options] +Syntax: ./btdm [options] =20=09=20=20=20=20=20 options:=20 =20=20=20 @@ -73,7 +73,7 @@ default: 115200 baud=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 =20=09 e.g - ./bti --reset --speed 460800 --physdev /dev/ttyS0 --local-name OpenBT + ./btdm --reset --speed 460800 --physdev /dev/ttyS0 --local-name OpenBT =20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - */ =20 |
|
From: Mattias ?g. <mat...@us...> - 2001-03-02 11:02:37
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- README.txt 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: corrected modem emulation option The diff of the modified file(s): --- README.txt 2001/03/02 11:00:49 1.1 +++ README.txt 2001/03/02 11:03:54 1.2 @@ -67,8 +67,8 @@ Same options as btinit except for=20 =20 -m, --modem-emul <1/0> - Use modem emulation (used when emulate modem in windows dialup.=20 - Can also be done from command line mode.=20 + Switch modem emulation on/off (used when emulate modem in=20 + windows dialup).=20 default: on =20 bttest.c |
|
From: Mattias ?g. <mat...@us...> - 2001-03-02 10:59:32
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- README.txt 1.1 Added The accompanying log: Initial version |
|
From: Mattias ?g. <mat...@us...> - 2001-03-02 10:58:40
|
The following files were modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_conf.h 1.1 Added bt_if.c 1.1 Added bt_if.h 1.1 Added bt_ipa.c 1.1 Added bt_ipa.h 1.1 Added bt_misc.c 1.1 Added bt_misc.h 1.1 Added bt_vendor.c 1.1 Added bt_vendor.h 1.1 Added btcon.c 1.1 Added btd.c 1.1 Added btd.h 1.1 Added btdisc.c 1.1 Added btinit.c 1.1 Added btinq.c 1.1 Added btsend.c 1.1 Added bttest.c 1.1 Added bttest.h 1.1 Added modememul.c 1.1 Added The accompanying log: Initial version |
|
From: David L. <dli...@us...> - 2001-03-02 10:53:46
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.64 1.65=20=20=20=20=20=20=20=20=20=20=20=20 btconfig.h 1.15 1.16=20=20=20=20=20=20=20=20=20=20=20=20 btdebug.h 1.33 1.34=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.45 1.46=20=20=20=20=20=20=20=20=20=20=20=20 hci_internal.h 1.9 1.10=20=20=20=20=20=20=20=20=20=20=20=20 l2cap.h 1.35 1.36=20=20=20=20=20=20=20=20=20=20=20=20 rfcomm.h 1.33 1.34=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Alignement fixes for RISC processors by David LIBAULT from Gordon McNutt's= =20 patch |
|
From: David L. <dli...@us...> - 2001-03-02 10:49:29
|
The following files were modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.12 1.13=20=20=20=20=20=20=20=20=20=20=20=20 hci.c 1.120 1.121=20=20=20=20=20=20=20=20=20=20=20 hci_vendor.c 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20 l2cap.c 1.85 1.86=20=20=20=20=20=20=20=20=20=20=20=20 rfcomm.c 1.89 1.90=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Alignement fixes for RISC processors by David LIBAULT from Gordon McNutt's= =20 patch |
|
From: Greg Kroah-H. <kr...@us...> - 2001-03-01 18:34:22
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: added INCLUDEDIR variable to allow LSB compliant distros to be able to compile the module correctly (use 'make INCLUDEDIR=3D/usr/src/linux/include= ') The diff of the modified file(s): --- Makefile 2001/02/28 19:01:25 1.11 +++ Makefile 2001/03/01 18:35:24 1.12 @@ -2,6 +2,8 @@ # Makefile for the Bluetooth device driver. # =20 +INCLUDEDIR =3D /usr/include + O_TARGET :=3D bt.o O_OBJS =3D bluetooth.o btdebug.o btmem.o hci.o l2cap.o rfcomm.o sdp.o t= cs.o bt_proc.o hci_vendor.o l2cap_con.o sec_client.o l2cap_sec.o rfcomm_sec= .o M_OBJS =3D $(O_TARGET) @@ -12,8 +14,8 @@ =20 else =20 -MODFLAGS =3D -DMODVERSIONS -include /usr/include/linux/modversions.h -CFLAGS =3D -D__KERNEL__ -DMODULE -I../../../include -Wall -Wstrict-proto= types -O2 -fomit-frame-pointer -fno-strength-reduce $(MODFLAGS) +MODFLAGS =3D -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h +CFLAGS =3D -D__KERNEL__ -DMODULE -I../../../include -I$(INCLUDEDIR) -Wal= l -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce $(MODFL= AGS) =20 all: $(O_TARGET) =20 |
|
From: Mattias ?g. <mat...@us...> - 2001-03-01 10:35:09
|
The following file was modified in apps/bluetooth/btd: Name Old version New version Comment ---- ----------- ----------- ------- btd.c 1.80 1.81=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * fixed auto detect of ppp frames in modem emulator i.e modem emulator can always be running for both dialup and real LAN profile clients. * fixed erroneous calculation of total nbr bytes to send in rf_send * minor changes * removed 10 ms sleep after setting baudrate on ericsson HW |
|
From: Marcus A. S. <mar...@us...> - 2001-03-01 00:29:53
|
The following file was modified in apps/bluetooth/btd:
Name Old version New version Comment
---- ----------- ----------- -------
btd.c 1.79 1.80=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added SDP client support.
The diff of the modified file(s):
--- btd.c 2001/02/27 16:41:46 1.79
+++ btd.c 2001/03/01 00:31:05 1.80
@@ -1472,7 +1472,7 @@
tmp_bd[0], tmp_bd[1], tmp_bd[2],
tmp_bd[3], tmp_bd[4], tmp_bd[5]);
=20
- sdp_connect_req(tmp_bd);
+ sdp_connect_req(tmp_bd, 0);
}
else if(sscanf(buf, "test_conn %x:%x:%x:%x:%x:%x %x",
&bd[0], &bd[1], &bd[2], &bd[3], &bd[4], &bd[5], &tmp[0]) =3D=3D 7)
@@ -2312,6 +2312,16 @@
test_rfcomm =3D rfcomm;
test_dlci =3D dlci;
return 0;
+}
+
+int bt_register_sdp(u8 line)
+{
+ return 0;
+}
+=20
+int bt_unregister_sdp(u8 line)
+{
+ return 0;
}
=20
int bt_initiated(void)
|
|
From: Marcus A. S. <mar...@us...> - 2001-03-01 00:29:53
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.h 1.35 1.36=20=20=20=20=20=20=20=20=20=20=20=20 btcommon.h 1.63 1.64=20=20=20=20=20=20=20=20=20=20=20=20 btdebug.h 1.32 1.33=20=20=20=20=20=20=20=20=20=20=20=20 sdp.h 1.23 1.24=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added SDP client support. |
|
From: Marcus A. S. <mar...@us...> - 2001-03-01 00:29:52
|
The following files were modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.c 1.129 1.130=20=20=20=20=20=20=20=20=20=20=20 sdp.c 1.61 1.62=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added SDP client support. |
|
From: Marcus A. S. <mar...@us...> - 2001-02-28 23:40:55
|
The following file was modified in apps/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Fixed the build system. It was very screwed up! You can now to: 1. ./init_env 2. make and all the code will be built. The diff of the modified file(s): --- Makefile 2001/02/18 12:35:43 1.1 +++ Makefile 2001/02/28 23:42:08 1.2 @@ -1,3 +1,3 @@ include $(APPS)/Rules.elinux =20 -SUBDIRS =3D btd sdp_server +SUBDIRS =3D btd sdp_server userstack |
|
From: Marcus A. S. <mar...@us...> - 2001-02-28 23:40:55
|
The following file was modified in apps: Name Old version New version Comment ---- ----------- ----------- ------- Rules.elinux 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Fixed the build system. It was very screwed up! You can now to: 1. ./init_env 2. make and all the code will be built. The diff of the modified file(s): --- Rules.elinux 2001/02/18 12:35:43 1.1 +++ Rules.elinux 2001/02/28 23:42:08 1.2 @@ -80,7 +80,7 @@ =20 endif =20 -INSTALL =3D install_elinux +INSTALL =3D install =20 ########################################################################### =20 |
|
From: Marcus A. S. <mar...@us...> - 2001-02-28 23:40:55
|
The following files were modified in : Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.1 Added init_env 1.1 Added The accompanying log: Fixed the build system. It was very screwed up! You can now to: 1. ./init_env 2. make and all the code will be built. |
|
From: Marcus A. S. <mar...@us...> - 2001-02-28 19:29:58
|
The following file was modified in apps/bluetooth/userstack:
Name Old version New version Comment
---- ----------- ----------- -------
unplug_test.c 1.13 1.14=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Fixed some compile errors.
The diff of the modified file(s):
--- unplug_test.c 2001/02/27 15:33:54 1.13
+++ unplug_test.c 2001/02/28 19:31:10 1.14
@@ -484,8 +484,7 @@
{
flow qos;
init_flow(&qos);
- qos.type =3D 0x3;
- qos.len =3D 0x16;
+ qos.bucket_size =3D 0x16;
qos.flags =3D 0;
qos.service =3D 0x2;
=20
|
|
From: Marcus A. S. <mar...@us...> - 2001-02-28 19:28:31
|
The following file was modified in apps/bluetooth/userstack: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.14 1.15=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Modified to properly make links. The diff of the modified file(s): --- Makefile 2000/12/20 14:56:54 1.14 +++ Makefile 2001/02/28 19:29:43 1.15 @@ -16,8 +16,8 @@ LDFLAGS +=3D -L$(prefix)/lib else # In stand-alone tarball -srcdir =3D ../../src -incdir =3D ../../include/linux/bluetooth +srcdir =3D ../../../linux/drivers/char/bluetooth +incdir =3D ../../../linux/include/linux/bluetooth endif =20 ifneq ($(wildcard /usr/lib/libutil.a),) @@ -46,7 +46,7 @@ =20 CFLAGS +=3D -DBTD_USERSTACK =20 -all: $(PROGS) +all: links $(PROGS) =20 btduser: $(OBJS) $(CC) -pthread $(LDFLAGS) $^ $(LDLIBS) -o $@ |
|
From: Marcus A. S. <mar...@us...> - 2001-02-28 19:00:15
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.h 1.34 1.35=20=20=20=20=20=20=20=20=20=20=20=20
btcommon.h 1.62 1.63=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added 2.4 kernel support.
The diff of the modified file(s):
--- bluetooth.h 2001/02/27 17:15:32 1.34
+++ bluetooth.h 2001/02/28 19:01:26 1.35
@@ -86,11 +86,15 @@
s32 bt_sprint_status(u8 *buf);
=20
/* 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,
+ u32 timeout, wait_queue_head_t *wq);
+#else
void start_wq_timer(struct timer_list *wq_timer,
u32 timeout, struct wait_queue **wq);
-static void release_wq_timer(struct timer_list *wq_timer);
-static void wq_timeout(unsigned long ptr);
+#endif /* LINUX_VERSION_CODE */
+#endif /* __KERNEL__ */
=20
#endif
/****************** END OF FILE bluetooth.h ******************************=
***/
--- btcommon.h 2001/02/28 13:31:00 1.62
+++ btcommon.h 2001/02/28 19:01:26 1.63
@@ -50,6 +50,10 @@
#include <linux/bluetooth/btdebug.h>
#include <linux/bluetooth/btconfig.h>
#include <linux/timer.h>
+#include <linux/module.h>
+#include <linux/config.h>
+#include <linux/sched.h>
+#include <linux/version.h>
#else
#include "local.h"
#include "btdebug.h"
@@ -421,6 +425,20 @@
#define ANY_LINE 255
#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];
+ 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
@@ -432,6 +450,8 @@
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
{
|
|
From: Marcus A. S. <mar...@us...> - 2001-02-28 19:00:15
|
The following files were modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20 bluetooth.c 1.128 1.129=20=20=20=20=20=20=20=20=20=20=20 bt_proc.c 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20 hci.c 1.119 1.120=20=20=20=20=20=20=20=20=20=20=20 hci_vendor.c 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20 l2cap.c 1.84 1.85=20=20=20=20=20=20=20=20=20=20=20=20 rfcomm.c 1.88 1.89=20=20=20=20=20=20=20=20=20=20=20=20 sdp.c 1.60 1.61=20=20=20=20=20=20=20=20=20=20=20=20 sec_client.c 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added 2.4 kernel support. |
|
From: Mattias ?g. <mat...@us...> - 2001-02-28 13:29:48
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btcommon.h 1.61 1.62=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* fixed incorrect flow structure, used type/len in option data
* minor changes
The diff of the modified file(s):
--- btcommon.h 2001/02/27 15:07:36 1.61
+++ btcommon.h 2001/02/28 13:31:00 1.62
@@ -249,8 +249,6 @@
typedef u16 CID;
=20
typedef struct flow {
- u8 type; /* =3D 0x3 or 0x4 ??? */
- u8 len; /* =3D 22 (0x16) */
u8 flags; /* default 0 */
u8 service; /* default 0x01 (best effort) */
u32 token_rate;
|
|
From: Mattias ?g. <mat...@us...> - 2001-02-28 13:29:48
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.83 1.84=20=20=20=20=20=20=20=20=20=20=20=20
l2cap_con.c 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* fixed incorrect flow structure, used type/len in option data
* minor changes
The diff of the modified file(s):
--- l2cap.c 2001/02/27 15:00:16 1.83
+++ l2cap.c 2001/02/28 13:30:59 1.84
@@ -211,16 +211,16 @@
protocol_layer* get_upper(u32 psm);
void remove_all_upper(void);
=20
+#ifdef __KERNEL__
+static struct wait_queue *l2cap_disconnect_wq =3D NULL;
+#endif
+
#ifdef L2CAP_USETIMERS
#define MAX_NO_RTX 0
#define RTX_TIMEOUT 5 /* sec */
#define ERTX_TIMEOUT 60 /* sec */
=20
#ifdef __KERNEL__
-static struct wait_queue *l2cap_disconnect_wq =3D NULL;
-#endif
-
-#ifdef __KERNEL__
void start_rtx(l2cap_con *con, unsigned short timeout);
void disable_rtx(l2cap_con *con);
void start_ertx(l2cap_con *con, unsigned short timeout);
@@ -2789,6 +2789,7 @@
=20=20=20
/* FIXME -- send l2ca_timeoutind() */
=20
+#ifdef L2CAP_USETIMERS
if (MAX_NO_RTX =3D=3D 0)
{
/* no retransmissions, shutdown connection */
@@ -2812,6 +2813,7 @@
delete_con(con);
return;
}
+#endif
=20
/* now resend command */
switch(con->last_cmd.type) {
@@ -3103,7 +3105,6 @@
=20
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -=
- */
=20
-
void=20
print_flow(flow *f)
{
@@ -3115,8 +3116,8 @@
} else {
=20=09=09
printk("flow:\n");
- printk("type:%d flags:%d service:%d token_rate:%d\n",
- f->type, f->flags, f->service, (int) f->token_rate);
+ printk("flags:%d service:%d token_rate:%d\n",
+ f->flags, f->service, (int) f->token_rate);
printk("bucket_size:%d bytes peak:%d bps latency:%d ms delay:%d ms\n",
(int)f->bucket_size, (int)f->peak, (int)f->latency,=20
(int)f->delay);
--- l2cap_con.c 2001/02/15 16:27:33 1.3
+++ l2cap_con.c 2001/02/28 13:31:00 1.4
@@ -559,8 +559,6 @@
init_flow(flow *f)
{
D_MISC("init_flow\n");
- f->type =3D 0x3;
- f->len =3D 22;
f->flags =3D 0;
f->service =3D 0x01;
f->token_rate =3D 0x00000000; /* No token rate specified, default */
|
|
From: Mattias ?g. <mat...@us...> - 2001-02-27 17:14:23
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.h 1.33 1.34=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * added bt_disconnect_cfm * added generic waitqueue timer used to wake up 'failed' blocking function calls The diff of the modified file(s): --- bluetooth.h 2001/02/15 16:28:46 1.33 +++ bluetooth.h 2001/02/27 17:15:32 1.34 @@ -75,6 +75,7 @@ =20 void bt_connect_ind(u32 con_id); void bt_disconnect_ind(u32 con_id); +void bt_disconnect_cfm(u32 con_id, s32 status); =20 /******************/ /* Misc functions */ @@ -83,6 +84,13 @@ s32 bt_initiated(void); void bt_connect_cfm(u32 con_id, s32 status); s32 bt_sprint_status(u8 *buf); + +/* Handles wakeup of failed blocking function calls */ + +void start_wq_timer(struct timer_list *wq_timer, + u32 timeout, struct wait_queue **wq); +static void release_wq_timer(struct timer_list *wq_timer); +static void wq_timeout(unsigned long ptr); =20 #endif /****************** END OF FILE bluetooth.h ******************************= ***/ |
2 messages has been excluded from this view by a project administrator.
