Menu
▾
▴
openbt-commit
|
From: Peter K. <pk...@us...> - 2001-03-06 11:05:59
|
The following file was modified in apps/bluetooth/sdp_server:
Name Old version New version Comment
---- ----------- ----------- -------
sdp_parser.c 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
The sdp_server no longer needs to wait for the bluetooth stack
to be initialised.
The diff of the modified file(s):
--- sdp_parser.c 2001/03/04 15:46:08 1.10
+++ sdp_parser.c 2001/03/06 11:07:37 1.11
@@ -121,9 +121,6 @@
#define UUID32_HDR 0x1a
#define UUID128_HDR 0x1c
=20
-#define BT_IOC_MAGIC 'B'
-#define BTISINITIATED _IOR(BT_IOC_MAGIC, 0x09, unsigned int)
-
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
/****************** LOCAL FUNCTION DECLARATION SECTION *******************=
***/
@@ -830,39 +827,9 @@
}
=20
#ifndef BTD_USERSTACK
-static void
-wait_till_stack_is_initiated()
-{
- int bt_cfd;
- int stack_initiated =3D 0;
-
- if ((bt_cfd =3D open("/dev/ttyBTC", O_RDWR, 0)) < 0)
- {
- perror("Can't open TTY");
- exit(1);
- }
-=20=20
- while (!stack_initiated)
- {
- if (ioctl(bt_cfd, BTISINITIATED, &stack_initiated) < 0)
- {
- perror("Checking BT stack initiated");
- exit(1);
- }
- if (!stack_initiated)
- {
- sleep(1);
- }
- }
-
- close(bt_cfd);
-}
-
void
start_srvsock(char *name)
{
- wait_till_stack_is_initiated();
-=20=20
stack_if_fd =3D open(name, O_RDWR);
if (stack_if_fd < 0)
{
|
|
From: Mattias A. <mat...@us...> - 2001-03-21 17:17:39
|
The following file was modified in apps/bluetooth/sdp_server:
Name Old version New version Comment
---- ----------- ----------- -------
sdp_parser.c 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
added debug when server starts
The diff of the modified file(s):
--- sdp_parser.c 2001/03/06 11:07:37 1.11
+++ sdp_parser.c 2001/03/21 17:17:38 1.12
@@ -949,6 +949,8 @@
exit(1);
}
=20=20=20
+ syslog(LOG_INFO, "SDP Server starting");=20=20
+
xml_file =3D (argc >=3D 2 ? argv[1] : SDP_XML_FILE);
proc_file =3D (argc >=3D 3 ? argv[2] : SDP_PROC_FILE);
=20=20=20
|
|
From: Peter K. <pk...@us...> - 2001-06-18 14:45:09
|
The following file was modified in apps/bluetooth/sdp_server:
Name Old version New version Comment
---- ----------- ----------- -------
sdp_parser.c 1.19 1.20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made it compile with debug enabled.
The diff of the modified file(s):
--- sdp_parser.c 2001/06/14 10:30:42 1.19
+++ sdp_parser.c 2001/06/18 14:45:08 1.20
@@ -186,7 +186,7 @@
return;
}
=20
- D_REC("id: 0x%x, trans_id: 0x%x, par_len: %d", id, trans_id, par_len);
+ D_REC("id: 0x%x, trans_id: 0x%x, par_len: %d", id, db.trans_id, par_len);
=20
switch (id)
{
|
|
From: Mattias A. <mat...@us...> - 2001-08-27 15:09:00
|
The following file was modified in apps/bluetooth/sdp_server:
Name Old version New version Comment
---- ----------- ----------- -------
sdp_parser.c 1.20 1.21=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* minor change
The diff of the modified file(s):
--- sdp_parser.c 2001/06/18 14:45:08 1.20
+++ sdp_parser.c 2001/08/27 15:08:58 1.21
@@ -324,7 +324,7 @@
cur_pos +=3D 2;
service_search_uuid[i] =3D CHAR2INT16(data[cur_pos + 1],
data[cur_pos + 2]);
- D_MISC("Got Service class 0x%08x", service_search_uuid[i]);
+ D_MISC("Found UUID128 0x%08x", service_search_uuid[i]);
i++;
tmp_pos +=3D 17;
cur_pos +=3D 15;
@@ -340,7 +340,9 @@
service_search_uuid_cnt =3D i;
=20
max_rec_cnt =3D CHAR2INT16(data[cur_pos], data[cur_pos + 1]);
+
D_MISC("max_rec_cnt: %d", max_rec_cnt);
+
cur_pos +=3D 2;
=20
cont_state_len =3D data[cur_pos++];
|
|
From: Alain P. <apa...@us...> - 2002-04-24 12:47:21
|
The following file was modified in apps/bluetooth/sdp_server:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
sdp_parser.c 1.22 1.23=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Replaced writev by write, because writev is not present in every expat libr=
aries.
The diff of the modified file(s):
--- sdp_parser.c 7 Mar 2002 21:23:19 -0000 1.22
+++ sdp_parser.c 24 Apr 2002 12:46:49 -0000 1.23
@@ -786,19 +786,14 @@
write2stack(int sdp_con_id, char *data, int len)
{
data_struct db_hdl;
- struct iovec vec[2];
=20
D_XMIT("Writing %d bytes to sdp_con_id %d", len, sdp_con_id);
=20=20=20
db_hdl.sdp_con_id =3D sdp_con_id;
db_hdl.len =3D len;
=20
- vec[0].iov_base =3D &db_hdl;
- vec[0].iov_len =3D sizeof db_hdl;
- vec[1].iov_base =3D data;
- vec[1].iov_len =3D len;
-=20=20
- writev(stack_if_fd, vec, 2);
+ write( stack_if_fd, &db_hdl, sizeof db_hdl );
+ write( stack_if_fd, data, len );
}
=20
#ifndef BTD_USERSTACK
|
|
From: Alain P. <apa...@us...> - 2002-05-01 08:07:36
|
The following file was modified in apps/bluetooth/sdp_server:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
sdp_parser.c 1.23 1.24=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
OK, because writev is a system call, I implemented it in uClibc.
So I go back with my changes, and commit the state before my latest commit.
The diff of the modified file(s):
--- sdp_parser.c 24 Apr 2002 12:46:49 -0000 1.23
+++ sdp_parser.c 1 May 2002 08:07:35 -0000 1.24
@@ -786,14 +786,19 @@
write2stack(int sdp_con_id, char *data, int len)
{
data_struct db_hdl;
+ struct iovec vec[2];
=20
D_XMIT("Writing %d bytes to sdp_con_id %d", len, sdp_con_id);
=20=20=20
db_hdl.sdp_con_id =3D sdp_con_id;
db_hdl.len =3D len;
=20
- write( stack_if_fd, &db_hdl, sizeof db_hdl );
- write( stack_if_fd, data, len );
+ vec[0].iov_base =3D &db_hdl;
+ vec[0].iov_len =3D sizeof db_hdl;
+ vec[1].iov_base =3D data;
+ vec[1].iov_len =3D len;
+=20=20
+ writev(stack_if_fd, vec, 2);
}
=20
#ifndef BTD_USERSTACK
|
Thanks for helping keep SourceForge clean.
X