CVS: The file 'apps/bluetooth/btd/btd.c' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/btd:

Name   Old version  New version  Tag  Comment
----   -----------  -----------  ---  -------
btd.c  1.107        1.108=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made the user mode stack build again after the latest changes.
If it actually works? I have no idea, but I would not bet on it...


The diff of the modified file(s):

--- btd.c	2002/09/27 12:52:48	1.107
+++ btd.c	2003/05/05 10:43:49	1.108
@@ -1611,6 +1611,8 @@
   else if(sscanf(buf, "bb_conn %x:%x:%x:%x:%x:%x",
 		 &bd[5], &bd[4], &bd[3], &bd[2], &bd[1], &bd[0]) =3D=3D 6)
   {
+    unsigned char class_of_dev[3] =3D { 0, 0, 0 };
+
     for (i =3D 0; i < 6; i++)
     {
       tmp_bd[i] =3D (unsigned char)bd[i];
@@ -1621,13 +1623,13 @@
=20
     /* we must store bd address in l2cap con to keep track of peer */
=20
-    l2cap_create_con(tmp_bd);
+    l2cap_create_con(tmp_bd, class_of_dev);
     lp_connect_req(tmp_bd);
   }
   else if(sscanf(buf, "bb_disc %d", &i) =3D=3D 1)
   {
     printf("Disconnecting hci handle %d\n", i);
-    lp_disconnect((unsigned short)i);
+    lp_disconnect((unsigned short)i, TRUE);
   }
=20=20=20
 #endif /* BTD_USERSTACK */
@@ -2574,6 +2576,11 @@
   }
=20
   return client_sockfd;
+}
+
+unsigned long min(unsigned long a, unsigned long b)
+{
+  return a < b ? a : b;
 }
=20
 #endif /* BTD_USERSTACK */