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: Peter K. <pk...@us...> - 2002-09-27 12:59:35
|
The following file was modified in libs/expat/xmlparse: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 21 Sep 2001 15:33:07 -0000 1.2 +++ Makefile 27 Sep 2002 12:59:03 -0000 1.3 @@ -1,5 +1,5 @@ AXIS_USABLE_LIBS =3D UCLIBC GLIBC -include $(APPS)/Rules.elinux +include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 LIB =3D libxmlparse.a =20 |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:35
|
The following file was modified in libs: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 18 Feb 2001 12:35:44 -0000 1.1 +++ Makefile 27 Sep 2002 12:59:03 -0000 1.2 @@ -1,3 +1,3 @@ -include $(APPS)/Rules.elinux +include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 SUBDIRS =3D expat |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:35
|
The following file was modified in libs/expat/xmltok: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 21 Sep 2001 15:33:07 -0000 1.2 +++ Makefile 27 Sep 2002 12:59:03 -0000 1.3 @@ -1,5 +1,5 @@ AXIS_USABLE_LIBS =3D UCLIBC GLIBC -include $(APPS)/Rules.elinux +include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 LIB =3D libxmltok.a =20 |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:35
|
The following file was modified in apps/bluetooth/sdp_server: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.12 1.13=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 18 Oct 2001 15:56:25 -0000 1.12 +++ Makefile 27 Sep 2002 12:59:03 -0000 1.13 @@ -1,9 +1,7 @@ # $Id$ =20 -ifdef APPS AXIS_USABLE_LIBS =3D UCLIBC GLIBC -include $(APPS)/Rules.elinux -endif +-include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 PROGS =3D sdp_server =20 |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:34
|
The following file was modified in apps/bluetooth/pan: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 15 Apr 2002 11:38:06 -0000 1.1 +++ Makefile 27 Sep 2002 12:59:02 -0000 1.2 @@ -1,8 +1,6 @@ =20 -ifdef APPS AXIS_USABLE_LIBS =3D UCLIBC GLIBC -include $(APPS)/Rules.elinux -endif +-include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 BUILT_PROGS =3D bnep PROGS =3D $(BUILT_PROGS) |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:34
|
The following file was modified in apps/bluetooth/btd: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 18 Oct 2001 15:56:25 -0000 1.11 +++ Makefile 27 Sep 2002 12:59:02 -0000 1.12 @@ -1,9 +1,7 @@ # $Id$ =20 -ifdef APPS AXIS_USABLE_LIBS =3D UCLIBC -include $(APPS)/Rules.elinux -endif +-include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 PROGS =3D btd =20 |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:34
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.14 1.15=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 23 Apr 2002 09:05:16 -0000 1.14 +++ Makefile 27 Sep 2002 12:59:02 -0000 1.15 @@ -1,9 +1,7 @@ # $Id$ =20 -ifdef APPS AXIS_USABLE_LIBS =3D UCLIBC GLIBC -include $(APPS)/Rules.elinux -endif +-include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 PROGS =3D btdm memul bti btinq btcon btdisc btconfig btping btsec # bt= send bttest =20 |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:33
|
The following file was modified in apps/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 21 Oct 2001 09:15:36 -0000 1.3 +++ Makefile 27 Sep 2002 12:59:02 -0000 1.4 @@ -1,3 +1,3 @@ -include $(APPS)/Rules.elinux +include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 -SUBDIRS =3D experimental sdp_server userstack btd +SUBDIRS =3D experimental pan sdp_server userstack btd |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:33
|
The following files were modified in apps: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 Rules.elinux 1.5 Removed The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 18 Feb 2001 12:35:43 -0000 1.1 +++ Makefile 27 Sep 2002 12:59:02 -0000 1.2 @@ -1,3 +1,3 @@ -include $(APPS)/Rules.elinux +include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 SUBDIRS =3D bluetooth |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:33
|
The following files were modified in : Name Old version New version Tag Comment ---- ----------- ----------- --- ------- .cvsignore 1.1 Added Makefile 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. The diff of the modified file(s): --- Makefile 15 Nov 2001 11:23:44 -0000 1.2 +++ Makefile 27 Sep 2002 12:59:02 -0000 1.3 @@ -1,4 +1,4 @@ -include $(APPS)/Rules.elinux +include $(AXIS_TOP_DIR)/tools/build/Rules.axis =20 #SUBDIRS =3D src libs apps =20 @@ -12,7 +12,7 @@ make -C apps/bluetooth make -C apps/bluetooth/sdp_server sdp_user =20 -install: +install: all install apps/bluetooth/btd/btd $(INSTDIR) install apps/bluetooth/userstack/btduser $(INSTDIR) install apps/bluetooth/sdp_server/sdp_server $(INSTDIR) |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:59:05
|
The following file was modified in tools/build: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Rules.axis 1.1 Added The accompanying log: Moved and renamed apps/Rules.elinux to tools/build/Rules.axis. |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:56:47
|
The following file was modified in : Name Old version New version Tag Comment ---- ----------- ----------- --- ------- init_env 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Setup the correct variables. The diff of the modified file(s): --- init_env 21 Oct 2001 10:40:11 -0000 1.2 +++ init_env 27 Sep 2002 12:56:46 -0000 1.3 @@ -2,9 +2,4 @@ # Run using '. init_env' or 'source init_env' =20 export AXIS_TOP_DIR=3D`pwd` - -#export AX_PRODUCTDIR=3D$AXIS_TOP_DIR -#export ELINUXDIR=3D$AXIS_TOP_DIR/elinux -export ELIBSDIR=3D$AXIS_TOP_DIR/libs -export APPS=3D$AXIS_TOP_DIR/apps -#export AX_PACKAGES=3D$AXIS_TOP_DIR/packages +export AXIS_KERNEL_DIR=3D$AXIS_TOP_DIR/linux |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:56:06
|
The following file was modified in apps/bluetooth/userstack:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
Makefile 1.26 1.27=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made the user stack compile again (I am pretty sure it does not
work, but at least it compiles).
The diff of the modified file(s):
--- Makefile 21 Oct 2001 09:39:13 -0000 1.26
+++ Makefile 27 Sep 2002 12:56:05 -0000 1.27
@@ -1,5 +1,6 @@
# $Id$
=20
+AXIS_USABLE_LIBS =3D UCLIBC
ifdef APPS
AXIS_USABLE_LIBS =3D UCLIBC
include $(APPS)/Rules.elinux
@@ -17,17 +18,12 @@
HAVE_READLINE_READLINE =3D 1
#HAVE_READLINE =3D 1
=20
-ifdef ELINUXDIR # works for now...
-# In elinux tree...
-srcdir =3D $(ELINUXDIR)/drivers/char/bluetooth
-incdir =3D $(ELINUXDIR)/include/linux/bluetooth
-
-CFLAGS +=3D -I$(prefix)/include -MMD
-LDFLAGS +=3D -L$(prefix)/lib
+ifneq ($(wildcard $(AXIS_KERNEL_DIR)/arch/cris/drivers/bluetooth/src/bluet=
ooth.c),)
+srcdir =3D $(AXIS_KERNEL_DIR)/arch/cris/drivers/bluetooth/src
+incdir =3D $(AXIS_KERNEL_DIR)/arch/cris/drivers/bluetooth/include
else
-# In stand-alone tarball
-srcdir =3D ../../../linux/drivers/char/bluetooth
-incdir =3D ../../../linux/include/linux/bluetooth
+srcdir =3D $(AXIS_KERNEL_DIR)/drivers/char/bluetooth
+incdir =3D $(AXIS_KERNEL_DIR)/include/linux/bluetooth
endif
=20
ifneq ($(wildcard /usr/lib/libutil.a),)
@@ -62,7 +58,7 @@
test.c bt_proc.c hci_vendor.c sec_client.c l2cap_sec.c \
rfcomm_sec.c unplug_test.c
=20
-CFLAGS +=3D -DBTD_USERSTACK
+CFLAGS +=3D -DBTD_USERSTACK -MMD
=20
ifeq ($(INCLUDE_UNPLUG_TEST),1)
OBJS +=3D unplug_test.o
|
|
From: Peter K. <pk...@us...> - 2002-09-27 12:54:43
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
l2cap.c 1.133 1.134=20=20=20=20=20=20=20=20=20=20=20=20=20
l2cap_con.c 1.14 1.15=20=20=20=20=20=20=20=20=20=20=20=20=20=20
rfcomm.c 1.136 1.137=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made the user stack compile again (I am pretty sure it does not
work, but at least it compiles).
The diff of the modified file(s):
--- l2cap.c 11 Apr 2002 10:17:38 -0000 1.133
+++ l2cap.c 27 Sep 2002 12:54:11 -0000 1.134
@@ -3116,7 +3116,7 @@
add_timer(&con->timers.ertx.timer);
#else
/* fixme */
- con->timer.ertx_inuse =3D 1;
+ con->timers.ertx.inuse =3D 1;
#endif
}
=20
--- l2cap_con.c 1 Aug 2002 16:19:28 -0000 1.14
+++ l2cap_con.c 27 Sep 2002 12:54:11 -0000 1.15
@@ -445,11 +445,15 @@
this connection */
if(con->timers.rtx.inuse) {
wake_up_interruptible(&con->wq);
+#ifdef __KERNEL__
del_timer(&con->timers.rtx.timer);
+#endif
}
if(con->timers.ertx.inuse) {
wake_up_interruptible(&con->wq);
+#ifdef __KERNEL__
del_timer(&con->timers.ertx.timer);
+#endif
}
=20
if (con_list.count =3D=3D 1) {
--- rfcomm.c 9 Aug 2002 09:03:36 -0000 1.136
+++ rfcomm.c 27 Sep 2002 12:54:11 -0000 1.137
@@ -526,9 +526,7 @@
/* One RFCOMM connection for each ttyBTx */
rfcomm_con rfcomm_con_list[BT_NBR_DATAPORTS];
=20
-#ifdef __KERNEL__
static struct bt_timer_obj rfcomm_timer;
-#endif
=20
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
struct wait_queue *rfcomm_disconnect_wq;
@@ -675,8 +673,10 @@
=20=20=20
DSYS("Shutting down RFCOMM\n");
=20
+#ifdef __KERNEL__
/* Make sure we don't have any outstanding timers */
release_wq_timer(&rfcomm_timer);
+#endif
=20
/* First try disconnecting */
for (i =3D 0; i < BT_NBR_DATAPORTS; i++) {
@@ -723,7 +723,6 @@
tmp_dlci =3D (server_chn << 1) | (~rfcomm->initiator & 0x1);
=20=09
if (!(rfcomm->l2cap)) {
-
rfcomm->dlci[0].state =3D CONNECTING;=20=20=20=20
=20
/* we don't have a l2cap connection yet */
@@ -732,12 +731,10 @@
return retval;
}
} else if (!((rfcomm->l2cap)->current_state =3D=3D OPEN)) {
-=09=09
D_ERR(FNC"L2CAP_CON exists but is not in OPEN state (yet?)\n");
/* FIXME: Should we really return no error here? */
return 0;
} else if (rfcomm->dlci[0].state !=3D CONNECTED) {
-
/* we have an l2cap channel (server ch) */
D_CTRL(FNC"we already have an l2cap channel)\n");
=20
@@ -751,7 +748,6 @@
return send_sabm(rfcomm, 0);
}
} else if (rfcomm->dlci[tmp_dlci].state !=3D DISCONNECTED) {
-
D_ERR(FNC"trying to connect a non DISCONNECTED server channel (%d)\n",se=
rver_chn);
return -MSGCODE(MSG_LAYER_RFCOMM, RFCOMM_SRVCHN_CONNECTED);
} else {
@@ -805,7 +801,9 @@
/* FIXME -- check that we haven't already received=20
disconnect 'acknowledge' */=09
interruptible_sleep_on(&rfcomm_disconnect_wq);
+#ifdef __KERNEL__
release_wq_timer(&rfcomm_timer);
+#endif
=20
/* Check that rfcomm session really disconnected */
/* FIXME -- add timer obj with status in rfcomm obj */
@@ -831,7 +829,6 @@
return 0;
}
=20=09
-
/* The lower protocol layer, L2CAP, indicates that a new connection has be=
en
established at a lower layer. RFCOMM should ask the control block wheth=
er
to accept or reject the connection and then reply to L2CAP with
@@ -849,7 +846,6 @@
=20
return;
} else {
-=20=20=20=20=20=20=20=20=20=20
if (l2ca_connect_rsp(l2cap, RES_SUCCESS, STAT_NOINFO)) {
D_ERR("rfcomm_connect_ind: l2ca_connect_rsp failed\n");
return;
@@ -913,7 +909,6 @@
} else {
D_ERR(FNC"couldn't find the correct rfcomm_con object\n");
}
-
}
=20
=20
@@ -975,8 +970,8 @@
else if (!rfcomm->initiator &&=20
((l2cap->remote_mtu-5) < DEF_RFCOMM_MTU) )
{
-=09=09=09
s32 j;
+
DSYS(FNC"Setting RFCOMM frame size to %d\n",=20
l2cap->remote_mtu-5);
=20=09=09=09
@@ -985,7 +980,7 @@
}
}
} else {
- DSYS(FNC": configuration not done yet\n");
+ DSYS(FNC"configuration not done yet\n");
}
}
=20
@@ -1024,7 +1019,6 @@
void=20
rfcomm_disconnect_cfm(l2cap_con *l2cap)
{
-
rfcomm_con *rfcomm;
=20=20=20
D_CTRL(FNC"disconnected\n");
@@ -1044,8 +1038,6 @@
l2cap->c_result);
#endif=09
rfcomm_reset_con(rfcomm->line);
-=09
-
}
=20
/* This function should be called from the L2CAP layer data should pos32 at
@@ -1064,8 +1056,7 @@
=20
RF_DATA(FNC"rfcomm_receive_data:",data,len);
=20=09
- D_REC(FNC"%d bytes, our cid is %d\n",len,=20
- l2cap->remote_cid);
+ D_REC(FNC"%d bytes, our cid is %d\n", len, l2cap->remote_cid);
short_pkt =3D (short_frame*) data;
=20
tmp_dlci =3D (((short_pkt->h.addr.server_chn & 0x1f) << 1) |
@@ -1110,7 +1101,6 @@
tmp_dlci, rfcomm);
=20
/* fixme -- check result and send neg response if not allowed */
-=09=09=09
#else
bt_connect_ind(CREATE_RFCOMM_ID(rfcomm->line, tmp_dlci));
rfcomm->dlci[tmp_dlci].state =3D CONNECTED;
@@ -1126,7 +1116,6 @@
send_ua(rfcomm, tmp_dlci);
#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
} else {
-
D_CTRL(FNC"no server on channel %d, sending DM\n",
tmp_dlci);
=20=20=20=20=20=20=20
@@ -1177,7 +1166,6 @@
rfcomm->dlci[tmp_dlci].initiator =3D TRUE;
=20
} else if (rfcomm->dlci[tmp_dlci].state =3D=3D DISCONNECTING) {
-=09=09=20=20
if (tmp_dlci =3D=3D 0) {
/* Control channel */
#ifdef __KERNEL__
@@ -1198,9 +1186,11 @@
new_con_srv_channel =3D tmp_dlci >> 1;
new_con_line =3D rfcomm->line;
new_con_connected =3D 0; // Disconnection
+#ifdef __KERNEL__
/* Wake up if someone reads the proc file */
wake_up_interruptible(&channel_con_wq);=09=09
#endif=09
+#endif
=20
if (tmp >=3D 0) {
rfcomm->dlci[tmp].state =3D DISCONNECTING;
@@ -1208,7 +1198,6 @@
} else {
D_ERR("Could not find connected DLCI\n");
}
-=09=09=09=09
}
} else if (rfcomm->dlci[tmp_dlci].state =3D=3D DISCONNECTED) {
rfcomm->dlci[tmp_dlci].state =3D CONNECTED;
@@ -1249,9 +1238,11 @@
new_con_srv_channel =3D tmp_dlci >> 1;
new_con_line =3D rfcomm->line;
new_con_connected =3D 0; // Disconnection
+#ifdef __KERNEL__
/* Wake up if someone reads the proc file */
wake_up_interruptible(&channel_con_wq);=09=09
#endif
+#endif
=20
send_ua(rfcomm, 0);
} else {
@@ -1291,16 +1282,15 @@
D_REC(FNC"long packet length %d\n",
uih_len);
if (uih_len > (len - 5)) {
- D_WARN(FNC", Long packet length doesn't match, setting length to l2cap=
len - 5\n");
+ D_WARN(FNC"Long packet length doesn't match, setting length to l2cap l=
en - 5\n");
uih_len =3D len - 5;
}
-=09=09=09
} else {
D_REC(FNC"Short UIH pkt received\n");
uih_len =3D short_pkt->h.length.len;
uih_data_start =3D short_pkt->data;
if (uih_len > (len - 4)) {
- D_WARN(FNC", Short packet length doesn't match, setting length to l2ca=
p len - 4\n");
+ D_WARN(FNC"Short packet length doesn't match, setting length to l2cap =
len - 4\n");
uih_len =3D len - 4;
}
}
@@ -1320,7 +1310,6 @@
}
=20=09=09=09
/* feed uih data to tty if any */
-
}
=20
if (crc_check(data, SHORT_CRC_CHECK,
@@ -1340,7 +1329,7 @@
--rfcomm->dlci[tmp_dlci].remote_credits;
}
=20=09=09=09=09
- D_CTRL(FNC": Remote credits: %d\n",rfcomm->dlci[tmp_dlci].remote_credi=
ts);
+ D_CTRL(FNC"Remote credits: %d\n",rfcomm->dlci[tmp_dlci].remote_credits=
);
/* Send new credits in packet only if we totally run out of them. When=
we send
data to the other side we usually send credits needed together with=
the data
(piggy-backed) */
@@ -1349,7 +1338,6 @@
rfcomm->dlci[tmp_dlci].remote_credits +=3D newcredits;
rfcomm_send_credits(rfcomm, tmp_dlci, newcredits);
D_SND(FNC"Remote credits: %d\n",rfcomm->dlci[tmp_dlci].remote_credits=
);
-=09=09=09=09=09
}
}=09=09=09
bt_receive_top(con_id, uih_data_start, uih_len);
@@ -1921,12 +1909,13 @@
if (send_credit) {
l_pkt->h.control =3D SET_PF(UIH);
l_pkt->data[0] =3D (newcredits);
- D_SND(FNC": Remote credits: %d\n",rfcomm->dlci[dlci].remote_credits);
+ D_SND(FNC"Remote credits: %d\n", rfcomm->dlci[dlci].remote_credits);
memcpy(l_pkt->data + 1, data, len);
} else {
memcpy(l_pkt->data, data, len);
}
- l_pkt->data[len + send_credit] =3D crc_calc((u8*) l_pkt, SHORT_CRC_CHECK=
);
+ l_pkt->data[len + send_credit] =3D
+ crc_calc((u8*) l_pkt, SHORT_CRC_CHECK);
swap_long_frame(l_pkt);
} else {
short_frame *s_pkt;
@@ -1952,12 +1941,13 @@
if (send_credit) {
s_pkt->h.control =3D SET_PF(UIH);
s_pkt->data[0] =3D (newcredits);
- D_SND(FNC": Remote credits: %d\n",rfcomm->dlci[dlci].remote_credits);
+ D_SND(FNC"Remote credits: %d\n",rfcomm->dlci[dlci].remote_credits);
memcpy(s_pkt->data + 1, data, len);
} else {
memcpy(s_pkt->data, data, len);
}
- s_pkt->data[len + send_credit] =3D crc_calc((u8*) s_pkt, SHORT_CRC_CHECK=
);
+ s_pkt->data[len + send_credit] =3D
+ crc_calc((u8*) s_pkt, SHORT_CRC_CHECK);
}
=20
/* FIXME - How should we propagate result up to higher layers ?
@@ -2028,8 +2018,8 @@
=20=20=20=20=20
set_uih_hdr((short_frame*) uih_pkt, CTRL_CHAN, len +=20
sizeof(mcc_long_frame), rfcomm->initiator);
- uih_pkt->data[uih_pkt->h.length.bits.len] =3D crc_calc((u8*) uih_pkt,=20
- SHORT_CRC_CHECK);
+ uih_pkt->data[uih_pkt->h.length.bits.len] =3D
+ crc_calc((u8*) uih_pkt, SHORT_CRC_CHECK);
mcc_pkt =3D (mcc_long_frame*) uih_pkt->data;
=20
/* Always one in the TEST messages */
@@ -2062,8 +2052,8 @@
=20=20=20=20=20
set_uih_hdr((short_frame*) uih_pkt, CTRL_CHAN, len +
sizeof(mcc_short_frame), rfcomm->initiator);
- uih_pkt->data[uih_pkt->h.length.bits.len] =3D crc_calc((u8*) uih_pkt,=20
- SHORT_CRC_CHECK);
+ uih_pkt->data[uih_pkt->h.length.bits.len] =3D
+ crc_calc((u8*) uih_pkt, SHORT_CRC_CHECK);
mcc_pkt =3D (mcc_short_frame*) uih_pkt->data;
=20
/* Always one in the TEST messages */
@@ -2095,8 +2085,8 @@
=20=20=20=20=20
set_uih_hdr((void*) uih_pkt, CTRL_CHAN, len
+ sizeof(mcc_short_frame), rfcomm->initiator);
- uih_pkt->data[uih_pkt->h.length.len] =3D crc_calc((u8*) uih_pkt,=20
- SHORT_CRC_CHECK);
+ uih_pkt->data[uih_pkt->h.length.len] =3D
+ crc_calc((u8*) uih_pkt, SHORT_CRC_CHECK);
mcc_pkt =3D (mcc_short_frame*) uih_pkt->data;
=20=20=20=20=20
/* Always one in the TEST messages */
@@ -2136,8 +2126,8 @@
uih_pkt =3D (short_frame*) (tx_buf->data + sizeof(rfcomm_tx_buf));
set_uih_hdr(uih_pkt, CTRL_CHAN, sizeof(mcc_short_frame),
rfcomm->initiator);
- uih_pkt->data[sizeof(mcc_short_frame)] =3D crc_calc((u8*) uih_pkt,=20
- SHORT_CRC_CHECK);
+ uih_pkt->data[sizeof(mcc_short_frame)] =3D
+ crc_calc((u8*) uih_pkt, SHORT_CRC_CHECK);
mcc_pkt =3D (mcc_short_frame*) (uih_pkt->data);
=20=20=20
mcc_pkt->h.type.ea =3D EA;
@@ -2173,8 +2163,8 @@
uih_pkt =3D (short_frame*) (tx_buf->data + sizeof(rfcomm_tx_buf));
set_uih_hdr(uih_pkt, CTRL_CHAN, sizeof(mcc_short_frame),
rfcomm->initiator);
- uih_pkt->data[sizeof(mcc_short_frame)] =3D crc_calc((u8*) uih_pkt,=20
- SHORT_CRC_CHECK);
+ uih_pkt->data[sizeof(mcc_short_frame)] =3D
+ crc_calc((u8*) uih_pkt, SHORT_CRC_CHECK);
mcc_pkt =3D (mcc_short_frame*) (uih_pkt->data);
=20
mcc_pkt->h.type.ea =3D 1;
@@ -2575,7 +2565,6 @@
=20=09=09
for (j =3D 0; j < 62; j++){=09
if (rfcomm_con_list[i].dlci[j].state !=3D DISCONNECTED){
-=09=09=09=09
len+=3Dsprintf(buf+len, "line[%d] mtu[%d] ",
rfcomm_con_list[i].line,=20
rfcomm_con_list[i].dlci[j].mtu);
@@ -2592,6 +2581,7 @@
}
}
}
+
return len;
}
=20
@@ -2599,8 +2589,10 @@
s32 rfcomm_sprint_status(u8 *buf)
{
s32 len=3D0;
+
len+=3Dsprintf(buf+len, "\n[RFCOMM]\n\n");
len+=3Drfcomm_sprint_con(buf+len);
+
return len;
}
=20
@@ -2632,7 +2624,6 @@
data[5] =3D 0x70;
=20
return l2cap_send_data(tx_buf, rfcomm->l2cap);
-=20=20
}
=20
s32
@@ -2651,7 +2642,6 @@
} else {
return send_pn_msg(rfcomm, 0, frame_size, 0, 0, dlci, TRUE);
}
-=09
}
=20
s32
|
|
From: Peter K. <pk...@us...> - 2002-09-27 12:54:13
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btcommon.h 1.96 1.97=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made the user stack compile again (I am pretty sure it does not
work, but at least it compiles).
The diff of the modified file(s):
--- btcommon.h 6 Aug 2002 17:53:30 -0000 1.96
+++ btcommon.h 27 Sep 2002 12:54:12 -0000 1.97
@@ -358,16 +358,9 @@
=20
typedef struct l2cap_timer_obj
{
-#ifdef __KERNEL__
struct bt_timer_obj rtx;
struct bt_timer_obj ertx;
struct bt_timer_obj crtx; /* Maximum negotiation time 120 sec */
-#else
- /* dummy */
- int rtx;
- int ertx;
- int crtx; /* Maximum negotiation time 120 sec */
-#endif
u16 rtx_no; /* nbr retries */
} __attribute__ ((packed)) l2cap_timer_obj;
=20
|
|
From: Peter K. <pk...@us...> - 2002-09-27 12:52:49
|
The following file was modified in apps/bluetooth/btd:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btd.c 1.106 1.107=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added dummy bt_handle_hw_error().
The diff of the modified file(s):
--- btd.c 10 May 2002 12:29:51 -0000 1.106
+++ btd.c 27 Sep 2002 12:52:48 -0000 1.107
@@ -2486,6 +2486,12 @@
return 0;
}
=20
+void
+bt_handle_hw_error(u8 error)
+{
+ printf(__FUNCTION__ ": Received error with code 0x%02X, ignoring\n", err=
or);
+}
+
/* TCP socket */
static int open_tcpsocket(char *addrstr, int role)
{
|
|
From: Peter K. <pk...@us...> - 2002-09-18 18:30:29
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- .cvsignore 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Ignore btsec. The diff of the modified file(s): --- .cvsignore 8 Mar 2002 13:18:18 -0000 1.4 +++ .cvsignore 18 Sep 2002 18:30:27 -0000 1.5 @@ -3,6 +3,7 @@ bti btinq btcon +btsec btsend btdisc bttest |
|
From: Alain P. <apa...@us...> - 2002-08-26 15:12:50
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
hci.c 1.201 1.202=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added example how to allow the module to be in sniff and hold mode.
Added error handling for Mode change event.
The diff of the modified file(s):
--- hci.c 15 May 2002 13:29:41 -0000 1.201
+++ hci.c 26 Aug 2002 15:12:48 -0000 1.202
@@ -907,6 +907,10 @@
=20
/* enable m/s switch */=20
hci_write_link_policy_settings(hci_hdl, 0x01);
+ /* Uncomment next line (and comment previous) to enable */
+ /* sniff and hold mode in your module */
+ // hci_write_link_policy_settings(hci_hdl, 0x07);
+
/* we demand role switch as server */
if (force_msswitch && !i_am_initiator) {
/* FIXME -- check return code */
@@ -1141,8 +1145,15 @@
break;
=20
case MODE_CHANGE:
+ if (buf[0]) {=20
+ D_ERR(__FUNCTION__ ": Mode changed failed due to %s\n",
+ get_err_msg(buf[0]));
+ }
+ else {
D_CMD(__FUNCTION__ ": MODE_CHANGE on hci_hdl %d\n",
hci_handle(&buf[1]));
+ printk("Mode : 0x%02x ", buf[3]);
+ }
break;
=20
case RETURN_LINK_KEYS:
|
|
From: Alain P. <apa...@us...> - 2002-08-26 15:07:42
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
bt_if.c 1.52 1.53=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Just add an example how to set the module as a heaset to that phones find t=
hem when
searching for headsets.
The diff of the modified file(s):
--- bt_if.c 12 Aug 2002 12:07:58 -0000 1.52
+++ bt_if.c 26 Aug 2002 15:07:28 -0000 1.53
@@ -88,6 +88,8 @@
{
/* fixme<3> -- read these parameters from config file ? */
bt_set_classofdevice(bt_cfd, 0x90, 0x3, 0x0, 0x0);
+ /* Test : uncomment next line (and comment previous) to set your devic=
e as a headset */
+// bt_set_classofdevice(bt_cfd, 0xFFE, 0x4, 0x1, 0x0);
=20
#ifndef __CRIS__
if (!local_name)
|
|
From: Alain P. <apa...@us...> - 2002-08-19 15:18:59
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btinit.c 1.24 1.25=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Because the DTR signal is automatically set to 0 when we open the serial po=
rt, it was stupid to suppose that the module could be reseted when DTR is o=
n 0. So I assume that DTR should be to 1 for reseting the module.
The diff of the modified file(s):
--- btinit.c 16 Aug 2002 15:23:01 -0000 1.24
+++ btinit.c 19 Aug 2002 15:18:57 -0000 1.25
@@ -158,19 +158,19 @@
if (ioctl (phys_fd, TIOCMGET, &iosettings) !=3D 0) {
fprintf(stderr, "btinit : Error for ioctl TIOCMGET\n");
}
- printf("Set DTR to 1\n");
- iosettings &=3D ~TIOCM_DTR;
+ printf("Set DTR to 1\n"); /* Output of PC */
+ iosettings |=3D TIOCM_DTR;
if (ioctl (phys_fd, TIOCMSET, &iosettings) !=3D 0) {
fprintf(stderr, "btinit : Error for ioctl TIOCMSET\n");
}
usleep(500000);=09
printf("Set DTR to 0\n");
- iosettings |=3D TIOCM_DTR;
+ iosettings &=3D ~TIOCM_DTR;
ioctl (phys_fd, TIOCMSET, &iosettings);
=20
usleep(200000); /*Sleep 200 ms for reset*/
printf("Set DTR to 1 again\n");
- iosettings &=3D ~TIOCM_DTR;
+ iosettings |=3D TIOCM_DTR;
ioctl (phys_fd, TIOCMSET, &iosettings);
=20
D(syslogprintf("btinit : DTR set to HIGH\n"));
|
|
From: Alain P. <apa...@us...> - 2002-08-16 15:23:01
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btinit.c 1.23 1.24=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Invert again the signals for reset... sorry.
The diff of the modified file(s):
--- btinit.c 16 Aug 2002 14:24:22 -0000 1.23
+++ btinit.c 16 Aug 2002 15:23:01 -0000 1.24
@@ -158,19 +158,19 @@
if (ioctl (phys_fd, TIOCMGET, &iosettings) !=3D 0) {
fprintf(stderr, "btinit : Error for ioctl TIOCMGET\n");
}
- printf("Set DTR to 0\n");
- iosettings |=3D TIOCM_DTR;
+ printf("Set DTR to 1\n");
+ iosettings &=3D ~TIOCM_DTR;
if (ioctl (phys_fd, TIOCMSET, &iosettings) !=3D 0) {
fprintf(stderr, "btinit : Error for ioctl TIOCMSET\n");
}
usleep(500000);=09
- printf("Set DTR to 1\n");
- iosettings &=3D ~TIOCM_DTR;
+ printf("Set DTR to 0\n");
+ iosettings |=3D TIOCM_DTR;
ioctl (phys_fd, TIOCMSET, &iosettings);
=20
usleep(200000); /*Sleep 200 ms for reset*/
- printf("Set DTR to 0 again\n");
- iosettings |=3D TIOCM_DTR;
+ printf("Set DTR to 1 again\n");
+ iosettings &=3D ~TIOCM_DTR;
ioctl (phys_fd, TIOCMSET, &iosettings);
=20
D(syslogprintf("btinit : DTR set to HIGH\n"));
|
|
From: Alain P. <apa...@us...> - 2002-08-16 14:24:24
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btinit.c 1.22 1.23=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Changed the value of reset on DTR port : Reset is active high.
The diff of the modified file(s):
--- btinit.c 22 Jul 2002 17:22:13 -0000 1.22
+++ btinit.c 16 Aug 2002 14:24:22 -0000 1.23
@@ -152,25 +152,27 @@
/* Normally, the RTS should be LOW after having opened the serial port */
/* Wait 200 ms to be sure to have a valid reset */
=20
+ /* If we set the bit to 1 in the DTR register, this will result */
+ /* in a value of 0 on the port. So make &=3D to put the output to 1 */
=20=09
if (ioctl (phys_fd, TIOCMGET, &iosettings) !=3D 0) {
fprintf(stderr, "btinit : Error for ioctl TIOCMGET\n");
}
printf("Set DTR to 0\n");
- iosettings &=3D ~TIOCM_DTR;
+ iosettings |=3D TIOCM_DTR;
if (ioctl (phys_fd, TIOCMSET, &iosettings) !=3D 0) {
fprintf(stderr, "btinit : Error for ioctl TIOCMSET\n");
}
usleep(500000);=09
printf("Set DTR to 1\n");
- iosettings |=3D TIOCM_DTR;
+ iosettings &=3D ~TIOCM_DTR;
ioctl (phys_fd, TIOCMSET, &iosettings);
- //DBG ("Resetting the module");
+
usleep(200000); /*Sleep 200 ms for reset*/
printf("Set DTR to 0 again\n");
- iosettings &=3D ~TIOCM_DTR;
+ iosettings |=3D TIOCM_DTR;
ioctl (phys_fd, TIOCMSET, &iosettings);
- //DBG ("End of reset");
+
D(syslogprintf("btinit : DTR set to HIGH\n"));
sleep(2); /* Wait that module boot. 1 second is too short */
=20=09
|
|
From: Alain P. <apa...@us...> - 2002-08-12 12:52:41
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
bluetooth.c 1.232 1.233=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added license definition to avoid warning when inserting module in 2.4 kern=
els.
The diff of the modified file(s):
--- bluetooth.c 6 Aug 2002 17:52:14 -0000 1.232
+++ bluetooth.c 12 Aug 2002 12:52:39 -0000 1.233
@@ -441,6 +441,12 @@
=20
*/
=20
+/* Added GPL license to avoid warning messages at every insmod */
+#ifdef __KERNEL__
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 9)
+ MODULE_LICENSE("GPL");
+ #endif
+#endif
=20
/***********************************/
/* STACK TOP (TTY DRIVER FUNCTIONS)*/
|
|
From: Alain P. <apa...@us...> - 2002-08-12 12:08:00
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
bt_if.c 1.51 1.52=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Corrected a missing \0 missing at the end of the name to send to the module
Corrected a "char" to "signed char" so that there is no more warning.
The diff of the modified file(s):
--- bt_if.c 9 Aug 2002 14:54:45 -0000 1.51
+++ bt_if.c 12 Aug 2002 12:07:58 -0000 1.52
@@ -871,7 +871,7 @@
}
else
{
- if ((char)con_hdl[2] >=3D 0)
+ if ((signed char)con_hdl[2] >=3D 0)
printf("CLOCK OFFSET =3D 0x%X%X\n", con_hdl[1], con_hdl[0]);
else
printf("Not valid CLOCK OFFSET value !!!\n");
@@ -895,7 +895,7 @@
}
else
{
- if ( (char)num_rtx[1] >=3D 0 )
+ if ( (signed char)num_rtx[1] >=3D 0 )
printf("read num broadcast rtx =3D 0x%X\n", num_rtx[0]);
else
printf("Not valid BROADCAST RTX value =3D 0x%X !!!\n",num_rtx[1]);
@@ -1383,8 +1383,8 @@
{
buf[len++] =3D ' ';
buf[len++] =3D '(';
- buf[len] =3D '\0';
}
+ buf[len] =3D '\0';
}
=20
if (add_host)
|
|
From: Alain P. <apa...@us...> - 2002-08-09 14:54:47
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
bt_if.c 1.50 1.51=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added Object Transfer Service Class by default.
The diff of the modified file(s):
--- bt_if.c 6 Aug 2002 17:56:15 -0000 1.50
+++ bt_if.c 9 Aug 2002 14:54:45 -0000 1.51
@@ -87,7 +87,7 @@
if (!bt_dfu_mode(bt_cfd, -1))
{
/* fixme<3> -- read these parameters from config file ? */
- bt_set_classofdevice(bt_cfd, 0x10, 0x3, 0x0, 0x0);
+ bt_set_classofdevice(bt_cfd, 0x90, 0x3, 0x0, 0x0);
=20
#ifndef __CRIS__
if (!local_name)
|
2 messages has been excluded from this view by a project administrator.
