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: Anders J. <and...@us...> - 2002-01-15 11:02:28
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
sdp.c 1.83 1.84=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Make sure we don't send another configure request as long we have an outs=
tanding one.
The diff of the modified file(s):
--- sdp.c 2001/11/15 11:20:26 1.83
+++ sdp.c 2002/01/15 11:02:28 1.84
@@ -541,7 +541,7 @@
/*-----------------------------------------------------------*/
bt_register_sdp(sdp->line, sdp->id);
=20
- if (!l2ca_local_conf_done(l2cap)) {
+ if (!l2ca_local_conf_done(l2cap) && !l2cap->conf_req_sent) {
/* still haven't sent config request yet */
if (l2ca_config_req(l2cap, 0, NULL, 0, 0)) {
D_ERR(__FUNCTION__ " Configuration request failed\n");
@@ -580,7 +580,7 @@
=20
/* check if we received a pos response on a=20
previous config req */=20
- if (!l2ca_local_conf_done(l2cap)) {
+ if (!l2ca_local_conf_done(l2cap) && !l2cap->conf_req_sent) {
/* FIXME -- use real options not static values */
=20=09=09
if (l2ca_config_req(l2cap, 0, NULL, 0, 0)) {
|
|
From: Anders J. <and...@us...> - 2002-01-15 11:01:57
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.217 1.218=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Don't use the len variable in the BNEPTEST ioctl.
The diff of the modified file(s):
--- bluetooth.c 2002/01/06 19:49:40 1.217
+++ bluetooth.c 2002/01/15 11:01:56 1.218
@@ -1196,7 +1196,7 @@
case BNEPTEST:
{
s8 temp[5];
- copy_from_user(&temp, (s32*)arg, size);
+ copy_from_user(&temp, (s32*)arg, 5);
printk("BNEP TEST %i\n", temp[0]);=20=20=20
return bnep_test(&temp[0]);
}
|
|
From: Anu D. <anu...@ya...> - 2002-01-15 10:46:51
|
Hello All, I am working on the latest openbt code on redhat 7.0 and linux 2.2.18.I tried to establish the connection between two CSR bluetooth devices.I found that it does not work for rf_conn in kernel mode while it works in usermode. I am running btd as ./btd on the server side and ./btd -r client on the client side. then I get the command mode on the client side. Now I gave command as, rf_conn <BD> 1 0. I get the message "l2ca_connect_req: wait baseband, sleep on wq 0xc1132bd8" in /var/log/messages. I observed that I don't get any response from the h/w.It just stops there and if I tried to close the application,my pc gets hang. I don't understand what is the problem.Please help me. Thanks & regards, Anagha __________________________________________________ Do You Yahoo!? Send FREE video emails in Yahoo! Mail! http://promo.yahoo.com/videomail/ |
|
From: Anders J. <and...@us...> - 2002-01-09 10:57:16
|
The following file was modified in apps/bluetooth/sdp_server:
Name Old version New version Comment
---- ----------- ----------- -------
sdp_unpl.xml 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Updated for UPF-7
The diff of the modified file(s):
--- sdp_unpl.xml 2000/11/02 11:04:52 1.1
+++ sdp_unpl.xml 2002/01/09 10:57:15 1.2
@@ -1,26 +1,6 @@
<?xml version=3D"1.0"?>
<root>
<bluetoothSDP>
- <PublicBrowseGroup ServiceRecordHandle =3D "0x0001ffff">
- <ServiceRecordHandle Parameter0 =3D "0x0a0001ffff">
- </ServiceRecordHandle>=20=20=20
- <ServiceClassIDList NbrOfEntities =3D "1">
- <PublicBrowseGroup>
- </PublicBrowseGroup>>
- </ServiceClassIDList>
- <ServiceName>AXIS Bluetooth SDP server</ServiceName>
- <BrowseGroupList NbrOfEntities =3D "4">
- <SerialPort>
- </SerialPort>
- <LANAccessUsingPPP>
- </LANAccessUsingPPP>
- <DialupNetworking>
- </DialupNetworking>
- <CordlessTelephony>
- </CordlessTelephony>
- </BrowseGroupList>
- </PublicBrowseGroup>
-
<DialupNetworking ServiceRecordHandle =3D "0x00010000">
<ServiceRecordHandle Parameter0 =3D "0x0a00010000">
</ServiceRecordHandle>=20=20=20
|
|
From: Anders J. <and...@us...> - 2002-01-09 10:55:59
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
unplug_test.c 1.8 1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Added some SDP tests.
* Corrected Unplug SDP tests.
The diff of the modified file(s):
--- unplug_test.c 2001/11/13 10:42:03 1.8
+++ unplug_test.c 2002/01/09 10:55:58 1.9
@@ -79,7 +79,7 @@
extern s32 use_multiple_conf_params;
extern s32 disable_testpsm;
s32 test_role;
-
+s32 emulate_hw_error =3D 0;
/* =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=3D=3D=3D=3D=3D=3D=3D=3D=3D */=
=20
/* Unplug Test Cases 1-13 */
=20
@@ -148,8 +148,21 @@
0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x35, 0x09, 0x09,
0x00, 0x06, 0x09, 0x00, 0x11, 0x09, 0x01, 0x00, 0x00};
=20
+/* =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 PAN =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 */
+
+/* [pan_1] Service search request for UUID 0x1116 (PAN Profile) */
+unsigned char pan_1[] =3D {0x02, 0x77, 0x77, 0x00, 0x08,
+ 0x35, 0x03, 0x19, 0x11, 0x16, 0x00, 0xff, 0x00};
+
+unsigned char pan_2[] =3D {0x04, 0x88, 0x88, 0x00, 0x0e,
+ 0x00, 0x01, 0x00, 0x00,=20=20
+ 0x00, 0xff,=20
+ 0x35, 0x05, 0x0a, 0x00, 0x00, 0xff, 0xff,=20
+ 0x00 };
+
/* =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=3D=3D=3D=3D=3D=3D=3D=3D=3D */=
=20
=20
+
/* UUID 16 */
unsigned char sdp_data_52111_1[] =3D { 0x02, 0x77, 0x77, 0x00, 0x08,
0x35, 0x03, 0x19, 0x00, 0x01, 0x00, 0xff,
@@ -664,13 +677,13 @@
static s32 test_2_8_3(void)
{
printk("Client sends 350 bytes on testcon 2\n");
- return test_send_data(testcon2, testdata, 350);
+ return test_send_data(testcon3, testdata, 350);
}
=20
static s32 test_2_8_4(void)
{
printk("Server sends 350 bytes on testcon 2\n");
- return test_send_data(testcon2, testdata, 350);
+ return test_send_data(testcon3, testdata, 350);
}
=20
static s32 test_2_9_1(void)
@@ -1745,6 +1758,7 @@
case 210: return test_2_10();
=20
case 2131 : return test_2_13_1();
+ case 2135 : return test_2_13_5();
=20
case 52111: return sdp_test_52111();
case 52113: return sdp_test_52113();
@@ -1845,6 +1859,12 @@
case 56: return test_5_6();
case 57: return test_5_7();
case 100: return test_gateway_call();
+ case 9001: return sdp_send_data(&sdp_con_list[0], pan_1, pan_1[4] =
+ 5);
+ case 9002: return sdp_send_data(&sdp_con_list[0], pan_2, pan_2[4] + 5);=
=20=20
+=20=20=20=20=20=20=20=20
+ case 99999:=20
+ emulate_hw_error =3D 1;
+ break;
default:
printk("Unknown test case\n");
return -1;
|
|
From: Anders J. <and...@us...> - 2002-01-09 10:07:36
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- l2cap.h 1.42 1.43=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Changed PSM of BNEP from 0x09 -> 0x0f according to the specifications. The diff of the modified file(s): --- l2cap.h 2001/12/04 10:01:27 1.42 +++ l2cap.h 2002/01/09 10:07:35 1.43 @@ -69,10 +69,10 @@ =20 /* Valid PSM values */ #define MAX_PSM 20 -#define SDP_LAYER 1 -#define RFCOMM_LAYER 3 -#define TCS_LAYER 5 -#define BNEP_LAYER 9 +#define SDP_LAYER 0x01 +#define RFCOMM_LAYER 0x03 +#define TCS_LAYER 0x05 +#define BNEP_LAYER 0x0f =20 #define L2CAP_TEST_LAYER 0x1231 #define L2CAP_TEST2_LAYER 0x1233 |
|
From: Anders J. <and...@us...> - 2002-01-06 19:49:42
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.216 1.217=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Made GETINFO work.
The diff of the modified file(s):
--- bluetooth.c 2001/12/07 17:45:06 1.216
+++ bluetooth.c 2002/01/06 19:49:40 1.217
@@ -50,7 +50,6 @@
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/timer.h>
-
/* Make sure KERNEL_VERSION() is defined */
#ifndef KERNEL_VERSION
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
@@ -1066,11 +1065,13 @@
case BTGETINFO:
{
u8 bd[6];
- u16 type;
+ u8 tmp[2];
+ u16 type =3D 0;
=20
/* first byte contains length of whole hci message */
copy_from_user(&bd, (u8*)arg, 6);
- copy_from_user(&type, (u8*)arg + 6, 2);
+ copy_from_user(&tmp, (u8*)arg + 6, 2);
+ type =3D ((tmp[0] << 8) & 0xff00) | (tmp[1] & 0xff);
=20
BT_DRIVER("BTGETINFO: Type %d\n", type);
=20
|
|
From: Anders J. <and...@us...> - 2002-01-06 17:33:05
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.126 1.127=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Corrected return values when receiving PSM not supported.
* Updated PSM-value for UPF-7
The diff of the modified file(s):
--- l2cap.c 2001/11/30 13:08:07 1.126
+++ l2cap.c 2002/01/06 17:33:04 1.127
@@ -997,12 +997,12 @@
return;
}
=20=20=20=20=20=20=20=20=20=20
- con->c_status =3D conrsp->result;=09=09
+ con->c_result =3D conrsp->result;=09=09
+ con->c_status =3D CSTATUS_FAILED;
=20
switch (conrsp->result) {
case RES_SUCCESS:
-
- con->c_result =3D RES_SUCCESS;
+ con->c_status =3D CSTATUS_SUCCESS;
l2ca_wakeup("l2cap con rsp", con);
=20
#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
@@ -1054,7 +1054,7 @@
disable_ertx(con);
#endif
=20
- l2ca_connect_cfm(con, MSGCODE(MSG_LAYER_L2CAP, conrsp->result));
+ l2ca_connect_cfm(con, conrsp->result);
=20
l2ca_wakeup("Got connect rsp neg", con);
=20=09=09=09
@@ -1626,7 +1626,7 @@
} while (con->c_status =3D=3D CSTATUS_RTX_TIMEOUT);
=20=09
=20
- if (con->c_status !=3D RES_SUCCESS) {
+ if (con->c_status !=3D CSTATUS_SUCCESS) {
if(con->c_status =3D=3D CSTATUS_ERTX_TIMEOUT) {
l2ca_disconnect_ind(con);
}
@@ -1641,7 +1641,7 @@
break;
=20=09=09=09
default:=20=20=20
- retval =3D -MSGCODE(MSG_LAYER_L2CAP, con->c_status);
+ retval =3D -MSGCODE(MSG_LAYER_L2CAP, con->c_result);
}
=20=09=09
ENTERSTATE(con, CLOSED);
@@ -3311,7 +3311,7 @@
case 0x1233:
return "TEST-2";
=20
- case 0x4561:
+ case 0x4461:
return "TEST-3";
=20
default:
|
|
From: tall b. <tal...@ya...> - 2002-01-02 10:47:07
|
Hi!! All, I am new to bluetooth.I want to develop some profiles..I want to ask one question..it may be silly.... isn't necessary to develop basic profiles first..like Generic Access profile,Serial Port profile..then only we should develop other profiles.... so my question .. does this freeware supports for Generic access profile and SERIAL PORT profile.. in the stack itself,... does it provides sufficient ioctl's to implement generic accress profile and serial port profile.. Please answer... regards, Alok __________________________________________________ Do You Yahoo!? Send your FREE holiday greetings online! http://greetings.yahoo.com |
|
From: Fredrik S. <fre...@us...> - 2001-12-21 12:17:09
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btdebug.c 1.23 1.24=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Fixed ifdef for BT_USE_TIMESTAMPS
The diff of the modified file(s):
--- btdebug.c 2001/11/15 11:18:00 1.23
+++ btdebug.c 2001/12/21 12:17:08 1.24
@@ -66,7 +66,7 @@
u8*
bt_log_time(void)
{
-#if defined(__KERNEL__) && defined(BT_USE_TIMESTAMPS)
+#if defined(__KERNEL__) && BT_USE_TIMESTAMPS
s32 diff;
struct timeval tv;=20=20
static struct timeval tv_old =3D {0, 0};
|
|
From: Fredrik S. <fre...@us...> - 2001-12-21 12:06:35
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Makefile 1.27 1.28=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Only include bnep_test.o when UNPLUG and PAN is configured.
The diff of the modified file(s):
--- Makefile 2001/12/18 09:35:13 1.27
+++ Makefile 2001/12/21 12:06:33 1.28
@@ -6,7 +6,11 @@
l2cap.o l2cap_con.o l2cap_sec.o rfcomm.o rfcomm_sec.o \
sec_client.o sdp.o tcs.o test.o
=20
-TOBJS =3D unplug_test.o bnep_test.o
+TOBJS =3D unplug_test.o
+
+ifdef CONFIG_BLUETOOTH_PAN
+TOBJS +=3D bnep_test.o
+endif
=20
BOBJS =3D bcsp.o bcsp_datagram.o bcsp_integrity.o bcsp_mux.o \
bcsp_sequence.o bcsp_slip.o
|
|
From: Peter K. <pk...@us...> - 2001-12-20 14:47:42
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
btd.c 1.36 1.37=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Do not wait for children to die when we tell them to.
The diff of the modified file(s):
--- btd.c 2001/12/20 12:35:59 1.36
+++ btd.c 2001/12/20 14:47:41 1.37
@@ -924,9 +924,6 @@
{
D(syslog(LOG_INFO, "Killing pppd/memul on line %d", line));
kill(PEER(line).pppd_pid, SIGTERM);
- if (waitpid(PEER(line).pppd_pid, NULL, 0) < 0)
- perror("waitpid pppd");
- PEER(line).pppd_pid =3D 0;
}
}
}
|
|
From: Peter K. <pk...@us...> - 2001-12-20 12:36:01
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
btd.c 1.35 1.36=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Need to set the BCSP mode before initialising the physical device.
The diff of the modified file(s):
--- btd.c 2001/12/07 18:42:24 1.35
+++ btd.c 2001/12/20 12:35:59 1.36
@@ -329,6 +329,13 @@
exit(1);
}
=20
+ bt_cfd =3D bt_openctrl();
+
+ if (use_bcsp >=3D 0)
+ {
+ bt_bcsp_mode(bt_cfd, use_bcsp);
+ }
+
/* Sets initial HW baudrate */
if (init_hw_speedstr !=3D NULL)
fd_setup(phys_fd, init_hw_speedstr, flow_control);
@@ -338,18 +345,11 @@
/* Set the current tty to the bluetooth discpline */
set_bt_line_disc(phys_fd, bt_disc, physdev);
=20
- bt_cfd =3D bt_openctrl();
-
tcflush(phys_fd, TCIOFLUSH);
=20
/* Hardreset of BT hardware */
if (do_reset)
reset_hw();
-
- if (use_bcsp >=3D 0)
- {
- bt_bcsp_mode(bt_cfd, use_bcsp);
- }
=20
if (init_stack(bt_cfd) < 0)
{
|
|
From: Fredrik S. <fre...@us...> - 2001-12-18 09:35:14
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Makefile 1.26 1.27=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added PAN files.
The diff of the modified file(s):
--- Makefile 2001/07/31 19:43:08 1.26
+++ Makefile 2001/12/18 09:35:13 1.27
@@ -6,11 +6,13 @@
l2cap.o l2cap_con.o l2cap_sec.o rfcomm.o rfcomm_sec.o \
sec_client.o sdp.o tcs.o test.o
=20
-TOBJS =3D unplug_test.o
+TOBJS =3D unplug_test.o bnep_test.o
=20
BOBJS =3D bcsp.o bcsp_datagram.o bcsp_integrity.o bcsp_mux.o \
bcsp_sequence.o bcsp_slip.o
=20
+POBJS =3D bnep.o # bnep_proc.o bnep_status_proc.o
+
ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
#---------------------------------------------------------------------
@@ -24,6 +26,7 @@
obj-$(CONFIG_BLUETOOTH) +=3D $(OBJS)
obj-$(CONFIG_BLUETOOTH_UNPLUG_TEST) +=3D $(TOBJS)
obj-$(CONFIG_BLUETOOTH_SUPPORT_BCSP) +=3D $(BOBJS)
+obj-$(CONFIG_BLUETOOTH_PAN) +=3D $(POBJS)
=20
# For 2.0.x and 2.2.x
O_OBJS =3D $(OBJS)
@@ -32,6 +35,9 @@
endif
ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
O_OBJS +=3D $(BOBJS)
+endif
+ifdef CONFIG_BLUETOOTH_PAN
+O_OBJS +=3D $(POBJS)
endif
M_OBJS =3D $(O_TARGET)
=20
|
|
From: Fredrik S. <fre...@us...> - 2001-12-18 09:33:21
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Config.in 1.20 1.21=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added option for PAN profile.
The diff of the modified file(s):
--- Config.in 2001/10/30 15:04:52 1.20
+++ Config.in 2001/12/18 09:33:20 1.21
@@ -58,6 +58,9 @@
else
define_bool CONFIG_BLUETOOTH_RESET_ACTIVE_HIGH n
fi
+
+ bool ' Enable PAN Profile' CONFIG_BLUETOOTH_PAN
+
fi
=20
endmenu
|
|
From: Peter K. <pk...@us...> - 2001-12-10 16:18:15
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
sec_client.c 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Do not treat originator =3D=3D KERNEL specially in sec_man_read()
(there was no reason for it, and it should never be KERNEL at
that location anyway, so it should not change anything in
reality either).
The diff of the modified file(s):
--- sec_client.c 2001/04/26 13:58:18 1.18
+++ sec_client.c 2001/12/10 16:18:14 1.19
@@ -339,7 +339,7 @@
=20=20=20
/* Allocate new element */
if ((link_key =3D kmalloc(sizeof *link_key, GFP_ATOMIC)) < 0) {
- D_ERR(__FUNCTION__ ": could not allocate new link key element\n");
+ D_ERR(__FUNCTION__ ": Could not allocate new link key element\n");
return NULL;
}
=20=09
@@ -494,8 +494,6 @@
sec_man_check(enum security_requests user, BD_ADDR bd_addr, u32 service_da=
ta,
u32 user_data)
{
-#define FNC "sec_man_check: "
-
#ifndef __KERNEL__
if (sec_man_sock < 0) {
/* What to do if no security manager present?? */
@@ -526,16 +524,12 @@
#else
sec_man_doquery(sec_man_sock, (u8*) &security_query);
#endif
-=09
-#undef FNC
}
=20
void
sec_man_event(enum security_requests user, BD_ADDR bd_addr, u8 event,
u8 *param, u8 param_len)
{
-#define FNC "sec_man_event: "
-=09
if (event =3D=3D HCI_VALUE_RETURN_LINK_KEYS)
{
/* Ok, link key has to be stored locally */
@@ -578,7 +572,6 @@
sec_man_doquery(sec_man_sock, (u8*) &security_query);
#endif
}
-#undef FNC=09
}
=20
void sec_man_get_cached_link_key(u8 *param)
@@ -646,15 +639,11 @@
s32 sec_man_proc_dir_entry_read(char *buf, char **start, off_t offset,
s32 len, s32 unused)
{
-#define FNC "sec_proc_dir_entry_read: "
-
#ifdef USE_NEW_PROC
return sec_man_read(NULL, buf, len, 0);
#else
return sec_man_read(NULL, NULL, buf, len);
#endif
-
-#undef FNC
}
=20
#ifdef USE_NEW_PROC
@@ -665,33 +654,24 @@
char * buf, s32 count)
#endif
{
-#define FNC "sec_man_read: "
-=09
s32 tmp;
=20=09
- D_PROC(FNC" Someone is trying to read % d bytes from sec proc-file\n",
- count);
-
- if (security_query.originator =3D=3D KERNEL) {
- D_PROC(FNC"Shutdown of stack in progress, nothing to read!\n");
- return 1;
- }
+ D_PROC(__FUNCTION__ ": Someone is trying to read %d bytes from sec proc-f=
ile\n", count);
=20
cli();
if (security_query.originator !=3D BT_SEC_MAN) {
- D_PROC(FNC"No response yet, going to sleep\n");
+ D_PROC(__FUNCTION__ ": No response yet, going to sleep\n");
interruptible_sleep_on(&sec_man_wq);
}
sti();
- tmp =3D sizeof(struct security_query);
+
+ tmp =3D sizeof security_query;
memcpy(buf, &security_query, tmp);
=20=09
- D_PROC(FNC"Returning %d bytes\n", tmp);
+ D_PROC(__FUNCTION__ ": Returning %d bytes\n", tmp);
security_query.originator =3D SEC_CLIENT; /* Change so we lock aga=
in */
=20=20=20=20=20=20=20=20=20
return tmp;
-=09
-#undef FNC
}
=20
#ifdef USE_NEW_PROC
@@ -702,14 +682,13 @@
const char * buf, s32 count)
#endif
{
-#define FNC "sec_man_write: "=09
struct security_query *sec_hdl;
=20=09
sec_hdl =3D (struct security_query *)(buf);
=20=09
- D_PROC(FNC"Someone wrote %d bytes to sec proc-file\n",count);
+ D_PROC(__FUNCTION__ ": Someone wrote %d bytes to sec proc-file\n", count);
=20=09
-/* D_XMIT(FNC"preparing to send data to sec_con[%d]\n", secb_hdl->sec_con_=
id); */
+/* D_XMIT(__FUNCTION__ ": Preparing to send data to sec_con[%d]\n", secb_h=
dl->sec_con_id); */
if (sec_hdl->originator =3D=3D BT_SEC_MAN) /* o.k. new request */
{
/* Change so we do not receive old data */
@@ -717,13 +696,13 @@
=20=09=09
switch (sec_hdl->request_type) {
case L2CAP:
- D_PROC(FNC"Message to L2CAP\n");
+ D_PROC(__FUNCTION__ ": Message to L2CAP\n");
l2cap_process_sec_man_response(sec_hdl->request_result,
sec_hdl->originator_data);
break;
=20
case RFCOMM:
- D_PROC(FNC"Message to RFCOMM\n");
+ D_PROC(__FUNCTION__ ": Message to RFCOMM\n");
rfcomm_process_sec_man_response(sec_hdl->request_result,
sec_hdl->originator_data,
sec_hdl->request_value);
@@ -735,9 +714,7 @@
}
}
=20=09
-=09
return count;
-#undef FNC
}
=20
#else /* __KERNEL__ */
|
|
From: Peter K. <pk...@us...> - 2001-12-07 18:42:26
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
btd.c 1.34 1.35=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Kill all memul children when restarting/exiting (just like we
do with pppd).
* Added options --use-uart and --use-bcsp.
The diff of the modified file(s):
--- btd.c 2001/11/22 15:31:30 1.34
+++ btd.c 2001/12/07 18:42:24 1.35
@@ -84,6 +84,14 @@
enable use of ipa
default: not enabled
=20
+ -U, --use-uart
+ use the UART protocol to communicate with the Bluetooth module
+ default: whatever the kernel defaults to
+
+ -B, --use-bcsp
+ use the BCSP protocol to communicate with the Bluetooth module
+ default: whatever the kernel defaults to
+
e.g
./btdm --reset --speed 460800 --physdev /dev/ttyS0 --local-name OpenBT
./btdm --reset --speed 1000000/1 --physdev /dev/ttyS0 --local-name Open=
BT
@@ -193,6 +201,7 @@
static sigjmp_buf jmpbuffer; /* used to jump back in program after doing r=
eset */
=20
static int use_ipa =3D 0;=20
+static int use_bcsp =3D -1;
=20
/* long option list */
static struct option long_options[] =3D
@@ -205,6 +214,8 @@
{ "reset", 0, NULL, 'R' }, /* reset BT HW */
{ "speed", 1, NULL, 's' }, /* uart speed towards hw */
{ "use-ipa", 0, NULL, 'I' },
+ { "use-uart", 0, NULL, 'U' },
+ { "use-bcsp", 0, NULL, 'B' },
{ 0, 0, 0, 0 }
};
=20
@@ -237,7 +248,7 @@
}
=20=20=20
/* now parse options */
- while ((opt =3D getopt_long(argc, argv, "fi:m:nRs:u:I",
+ while ((opt =3D getopt_long(argc, argv, "fi:m:nRs:u:IUB",
long_options, &option_index)) !=3D -1)
{
switch(opt)
@@ -282,11 +293,22 @@
D(syslog(LOG_INFO, "phys dev: %s", optarg));
physdev =3D optarg;
break;
+
case 'I':
D(syslog(LOG_INFO, "using IPA"));
use_ipa =3D 1;
break;
=20
+ case 'U':
+ D(syslog(LOG_INFO, "using UART"));
+ use_bcsp =3D 0;
+ break;
+
+ case 'B':
+ D(syslog(LOG_INFO, "using BCSP"));
+ use_bcsp =3D 1;
+ break;
+
default:
break;
}
@@ -324,6 +346,11 @@
if (do_reset)
reset_hw();
=20
+ if (use_bcsp >=3D 0)
+ {
+ bt_bcsp_mode(bt_cfd, use_bcsp);
+ }
+
if (init_stack(bt_cfd) < 0)
{
/* For some reason, the stack sometimes fails to initialize the first
@@ -893,9 +920,9 @@
/* Kill all pppd:s */
for (line =3D 0; line < BT_NBR_DATAPORTS; line++)
{
- if (STATE(line) =3D=3D PPPD_STARTED)
+ if (STATE(line) =3D=3D PPPD_STARTED || STATE(line) =3D=3D MODEM_STARTE=
D)
{
- D(syslog(LOG_INFO, "Killing pppd on line %d", line));
+ D(syslog(LOG_INFO, "Killing pppd/memul on line %d", line));
kill(PEER(line).pppd_pid, SIGTERM);
if (waitpid(PEER(line).pppd_pid, NULL, 0) < 0)
perror("waitpid pppd");
|
|
From: Peter K. <pk...@us...> - 2001-12-07 17:45:08
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.215 1.216=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Do not disable page scanning when shutting down the stack if it
has been started in DFU mode.
The diff of the modified file(s):
--- bluetooth.c 2001/12/04 12:27:02 1.215
+++ bluetooth.c 2001/12/07 17:45:06 1.216
@@ -3022,14 +3022,16 @@
{
s32 i;
struct bt_session *bt;
- DSYS("Shutting down bluetooth stack\n");
=20
- /* Disable page scan as we don't want any new connections now */
- DSYS("Disabling page scan\n");
+ DSYS("Shutting down bluetooth stack\n");
=20
- hci_write_scan_enable(0x00);
if (bt_stack_initiated) {
if (!bt_dfu_mode(-1)) {
+ /* Disable page scan as we don't want any new
+ connections now */
+ DSYS("Disabling page scan\n");
+ hci_write_scan_enable(0x00);
+
/* disconnect all active connections */
for (i =3D 0; i < BT_NBR_DATAPORTS;i++) {
bt =3D &bt_ctrl.session[i];
|
|
From: Peter K. <pk...@us...> - 2001-12-06 11:21:21
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci.c 1.189 1.190=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Corrected copy-paste error.
The diff of the modified file(s):
--- hci.c 2001/11/15 15:00:36 1.189
+++ hci.c 2001/12/06 11:21:21 1.190
@@ -1402,9 +1402,9 @@
break;
=20=09=09=09
case WRITE_ENCRYPTION_MODE:
- D_CMD(__FUNCTION__ ": WRITE_AUTHENTICATION_ENABLE\n");
+ D_CMD(__FUNCTION__ ": WRITE_ENCRYPTION_MODE\n");
if(r_val[0]) {
- D_ERR(__FUNCTION__ ": WRITE_AUTHENTICATION_ENABLE: %s\n",
+ D_ERR(__FUNCTION__ ": WRITE_ENCRYPTION_MODE: %s\n",
get_err_msg(r_val[0]));
result_param =3D -r_val[0];
}
|
|
From: Fredrik S. <fre...@us...> - 2001-12-04 12:27:03
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.214 1.215=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added ioctl handling for BNEP, init of BNEP.
The diff of the modified file(s):
--- bluetooth.c 2001/11/22 14:02:41 1.214
+++ bluetooth.c 2001/12/04 12:27:02 1.215
@@ -255,6 +255,14 @@
void bt_linebuf_send(s32 line);
#endif
=20
+#ifdef CONFIG_BLUETOOTH_PAN
+void bnep_init(void);
+u32 bnep_connect_req(u8 *bd_addr);
+u32 bnep_test(u8 *p);
+u32 bnep_set_multicast_filter(u8 *filter);
+u32 bnep_set_protocol_filter(u16 *filter);
+#endif
+
/****************** GLOBAL VARIABLE DECLARATION SECTION ******************=
***/
=20
extern hci_controller hci_ctrl;
@@ -1174,6 +1182,41 @@
}
#endif /* CONFIG_BLUETOOTH_SUPPORT_BCSP */
=20
+#ifdef CONFIG_BLUETOOTH_PAN
+ case BNEPCONNECT:
+ {
+ copy_from_user(&bd_addr, (s32*)arg, size);
+ BT_DRIVER("BNEP connection to %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
+ bd_addr[0],bd_addr[1],bd_addr[2],bd_addr[3],bd_addr[4],bd_addr[5]);
+ return bnep_connect_req(bd_addr);
+ }
+
+#ifdef CONFIG_BLUETOOTH_UNPLUG_TEST
+ case BNEPTEST:
+ {
+ s8 temp[5];
+ copy_from_user(&temp, (s32*)arg, size);
+ printk("BNEP TEST %i\n", temp[0]);=20=20=20
+ return bnep_test(&temp[0]);
+ }
+
+ case BNEPADDPROTOCOLFILTER:
+ {
+ u16 temp[2];
+ copy_from_user(&temp, (s32*)arg, size);
+ return bnep_set_protocol_filter(&temp[0]);
+ }
+
+ case BNEPADDMULTICASTFILTER:
+ {
+ u8 temp[12];
+ copy_from_user(&temp, (s32*)arg, size);
+ return bnep_set_multicast_filter(&temp[0]);
+ }
+#endif /* CONFIG_BLUETOOTH_UNPLUG_TEST */
+
+#endif /* CONFIG_BLUETOOTH_PAN */
+
default:=09=09
return -ENOIOCTLCMD;
}
@@ -2608,6 +2651,9 @@
rfcomm_init();
sdp_init(1); /* For now always init as server */
tcs_init();
+#ifdef CONFIG_BLUETOOTH_PAN
+ bnep_init();
+#endif
test_init();
#endif
}
|
|
From: Fredrik S. <fre...@us...> - 2001-12-04 10:19:55
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.28 1.29=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added BNEP defines. The diff of the modified file(s): --- bt_if.h 2001/10/15 08:48:53 1.28 +++ bt_if.h 2001/12/04 10:19:54 1.29 @@ -152,6 +152,12 @@ =20 #define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, unsigned char[7]) =20 +/* BNEP Control Commands */ +#define BNEPCONNECT _IOW(BT_IOC_MAGIC, 0x29, unsigned char[6]) +#define BNEPTEST _IOW(BT_IOC_MAGIC, 0x2a, unsigned char[5]) +#define BNEPADDPROTOCOLFILTER _IOW(BT_IOC_MAGIC, 0x2b, unsigned int[2]) +#define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, unsigned int[2]) + /* Host Controller & Baseband Commands */ =20 #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) |
|
From: Fredrik S. <fre...@us...> - 2001-12-04 10:01:27
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.90 1.91=20=20=20=20=20=20=20=20=20=20=20=20 btdebug.h 1.42 1.43=20=20=20=20=20=20=20=20=20=20=20=20 l2cap.h 1.41 1.42=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added defines for BNEP. The diff of the modified file(s): --- btcommon.h 2001/11/22 14:06:20 1.90 +++ btcommon.h 2001/12/04 10:01:27 1.91 @@ -159,6 +159,12 @@ /* Link Policy Commands */ #define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, u8[7]) =20 +/* BNEP Control Commands */ +#define BNEPCONNECT _IOW(BT_IOC_MAGIC, 0x29, u8[6]) +#define BNEPTEST _IOW(BT_IOC_MAGIC, 0x2a, u8[5]) +#define BNEPADDPROTOCOLFILTER _IOW(BT_IOC_MAGIC, 0x2b, u32[2]) +#define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, u32[2]) + /* Host Controller & Baseband Commands */ #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) #define HCIFLUSH _IO(BT_IOC_MAGIC, 0x31) @@ -183,6 +189,7 @@ #define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, u8[6]) =20 /* Status Parameters */ +#define HCIREADRSSI _IOWR(BT_IOC_MAGIC, 0x50, u32) =20 /* Testing Commands */ #define HCIENABLEDUT _IO(BT_IOC_MAGIC, 0x65) --- btdebug.h 2001/11/15 11:18:14 1.42 +++ btdebug.h 2001/12/04 10:01:27 1.43 @@ -168,6 +168,15 @@ #define TCS_PRINT_DATA 0 #define TCS_DEBUG_REC 0 =20 +/***************** BNEP Debug defines ************************************= ***/ + +#define BNEP_DEBUG_MISC 0 +#define BNEP_DEBUG_XMIT 0 +#define BNEP_PRINT_DATA 0 +#define BNEP_DEBUG_REC 0 +#define BNEP_DEBUG_PROC 0 +#define BNEP_DBG_STR " BNEP " + /***************** BTMEM Debug defines ***********************************= ****/ =20 #define BTMEM_DEBUG 0 --- l2cap.h 2001/10/22 12:57:13 1.41 +++ l2cap.h 2001/12/04 10:01:27 1.42 @@ -68,10 +68,11 @@ #define MAX_CMD_ID 255 =20 /* Valid PSM values */ -#define MAX_PSM 8 +#define MAX_PSM 20 #define SDP_LAYER 1 #define RFCOMM_LAYER 3 #define TCS_LAYER 5 +#define BNEP_LAYER 9 =20 #define L2CAP_TEST_LAYER 0x1231 #define L2CAP_TEST2_LAYER 0x1233 |
|
From: Anders J. <and...@us...> - 2001-12-03 11:31:32
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
rfcomm.c 1.129 1.130=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Decrease length by one when sending creditinformation to keep=20
the l2cap payload constant.
The diff of the modified file(s):
--- rfcomm.c 2001/11/22 14:02:41 1.129
+++ rfcomm.c 2001/12/03 11:31:31 1.130
@@ -1861,6 +1861,11 @@
send_credit =3D 1;
newcredits =3D MAX_CREDITS - rfcomm->dlci[dlci].remote_credits;
rfcomm->dlci[dlci].remote_credits +=3D newcredits;
+ /* Decrease length by one to compensate for the creditfield and
+ keep the l2cap payload size constant */
+ if(len) {
+ len -=3D 1;
+ }
}
=20=09
if (len > SHORT_PAYLOAD_SIZE) {
|
|
From: Peter K. <pk...@us...> - 2001-11-30 13:08:10
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.125 1.126=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Handle receiving a disconnection request while already waiting
for a disconnection response.
The diff of the modified file(s):
--- l2cap.c 2001/11/22 14:02:41 1.125
+++ l2cap.c 2001/11/30 13:08:07 1.126
@@ -832,8 +832,20 @@
con->sig_id_rcv =3D req->id;
=20
/* if already closed, simply acknowledge */
- if ((con->current_state =3D=3D CLOSED)) {
+ if (con->current_state =3D=3D CLOSED) {
D_STATE(__FUNCTION__ ": connection closed, send disc rsp\n");
+ l2cap_disconnect_rsp(con);
+ return;
+ }
+
+ /* Special case, if we send a disconnection request to the
+ other side and receive a disconnect indication while
+ waiting for the response, we can't send the upper layers
+ a disconnect indication as it may destroy the connection
+ object before we receive the response to our disconnection
+ request. */
+ if (con->current_state =3D=3D W4_L2CAP_DISCONNECT_RSP) {
+ D_STATE(__FUNCTION__ ": Waiting for an outstanding disconnect_req, send=
disconnect_rsp\n");
l2cap_disconnect_rsp(con);
return;
}
|
|
From: Peter K. <pk...@us...> - 2001-11-27 14:24:12
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
bt_ipa.c 1.5 1.6=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* ipa_read() only reads one response at a time now (as it was
supposed to do).
* ipa_write() can now handle EINTR.
The diff of the modified file(s):
--- bt_ipa.c 2001/06/08 09:55:47 1.5
+++ bt_ipa.c 2001/11/27 14:24:09 1.6
@@ -60,6 +60,8 @@
=20
#define D(x) //x
=20
+#define IPA_MSG_MAXSIZE 256
+
int ipa_open(void)
{
int ipa_fd;
@@ -85,46 +87,58 @@
D(syslog(LOG_INFO, __FUNCTION__ ": Sending ipa request (type: %d) len %d=
",
msg->type, msg->len));
=20
- return write(ipa_fd, msg, msg->len + sizeof(struct ipa_msg));
+ while (1)
+ {
+ int len =3D write(ipa_fd, msg, msg->len + sizeof(struct ipa_msg));
+
+ if (len >=3D 0 || errno !=3D EINTR)
+ {
+ return len;
+ }
+ }
}
=20
/* Copies received response into msg */
=20
int ipa_read(int ipa_fd, ipa_msg *msg)
{
- char ipa_buf[256];
- int offset =3D 0, all_read =3D 0, msg_len =3D -1, c;
- ipa_msg *tmp;
+ ipa_msg *tmp =3D NULL;
+ char ipa_buf[IPA_MSG_MAXSIZE];
+ int offset =3D 0;
+ int to_read =3D sizeof *msg;
=20
D(syslog(LOG_INFO, __FUNCTION__ ": Reading response"));
=20
- while (!all_read)
+ while (offset < to_read)
{
- c =3D read(ipa_fd, &ipa_buf+offset, 256-offset);=20=20
+ int c =3D read(ipa_fd, ipa_buf + offset, to_read - offset);
=20
- D(syslog(LOG_INFO, __FUNCTION__ ": Got %d bytes", c));
+ if (c <=3D 0)
+ {
+ if (c < 0 && errno =3D=3D EINTR)
+ {
+ /* Try again */
+ continue;
+ }
=20
- if (c < 0)
return c;
+ }
=20
offset +=3D c;
=20
/* Have we got whole header ? */
- if (offset > sizeof(struct ipa_msg))
+ if (!tmp && offset >=3D sizeof *msg)
{
- tmp =3D (struct ipa_msg*)(ipa_buf);
- msg_len =3D tmp->len;
+ tmp =3D (struct ipa_msg*)ipa_buf;
+ to_read +=3D tmp->len;
}
-=20=20=20=20
- if ((msg_len > 0) && (offset =3D=3D (msg_len + sizeof(struct ipa_msg))=
))
- all_read =3D 1;
}
=20=20=20
- memcpy(msg, ipa_buf, offset);
+ D(syslog(LOG_INFO, __FUNCTION__ ": Read %d bytes", to_read));=20=20
=20
- D(syslog(LOG_INFO, __FUNCTION__ ": Got %d bytes total", offset));
+ memcpy(msg, ipa_buf, offset);
=20
- return msg_len;=20=20
+ return to_read;
}
=20
void show_ipset(struct ip_set* set, int line)
|
2 messages has been excluded from this view by a project administrator.
