openbt-commit Mailing List for AXIS OpenBT Stack (Page 22)

Status: Inactive

Brought to you by: anderstj, pkj, wesen

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

Flat | Threaded

<< < 1 .. 20 21 22 23 24 .. 48 > >> (Page 22 of 48)

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

From: Mattias A. <mat...@us...> - 2001-08-22 17:48:13

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bttest.c        1.18            1.19=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* parse command string in kernel instead


The diff of the modified file(s):

--- bttest.c	2001/08/21 14:40:50	1.18
+++ bttest.c	2001/08/22 17:48:12	1.19
@@ -458,7 +458,6 @@
   else if(sscanf(buf, "sdp_conn %x:%x:%x:%x:%x:%x",
 		 &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]) =3D=3D 6)
   {
-=20=20=20=20
     for (i =3D 0; i < 6; i++)
     {
       bd[i] =3D (unsigned char)tmp[i];
@@ -486,7 +485,6 @@
   else if (sscanf(buf, "test_case_reject %x:%x:%x:%x:%x:%x",
                   &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]) =
=3D=3D 6)
   {
-    sprintf(buf, "test_case_reject %03d%03d%03d%03d%03d%03d\0", tmp[0], tm=
p[1], tmp[2], tmp[3], tmp[4], tmp[5]);=20
     bt_testcmd(bt_cfd, buf);
     }
   else if (sscanf(buf, "test_disc %x", &tmp[0]) =3D=3D 1)
@@ -497,7 +495,6 @@
   else if(sscanf(buf, "bb_conn %x:%x:%x:%x:%x:%x",
 		 &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]) =3D=3D 6)
   {
-    sprintf(buf, "bb_conn %03d%03d%03d%03d%03d%03d\0", tmp[5], tmp[4], tmp=
[3], tmp[2], tmp[1], tmp[0]);=20
     bt_testcmd(bt_cfd, buf);
   }
   else if(sscanf(buf, "bb_disc %d", &i) =3D=3D 1)

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

From: Mattias A. <mat...@us...> - 2001-08-22 17:46:38

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
sdp_server.c    1.29            1.30=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* fixed bug when handling MaximumServiceRecordCount in service search
* changed some debug printouts
* corrected spelling
* added comments



The diff of the modified file(s):

--- sdp_server.c	2001/06/19 08:19:37	1.29
+++ sdp_server.c	2001/08/22 17:46:37	1.30
@@ -124,7 +124,7 @@
 void set_sdp_hdr(unsigned char *hdr, unsigned char pkt_type,
                  unsigned short trans_id, unsigned short len);
=20
-unsigned int* remove_dublicated_rec_hdl(unsigned int *rec_hdl_list_in,
+unsigned int* remove_duplicated_rec_hdl(unsigned int *rec_hdl_list_in,
 					unsigned int cnt_in);
 unsigned int* get_all_rec_hdl(unsigned int *service_class_list,
 			      unsigned int service_class_cnt);
@@ -276,11 +276,14 @@
   int value_string_pos =3D 0;
   static char tmp_list[256];
   char tmp_len =3D 0;
-  char *des_pos[DES_HDR_DEPTH]; /* des stands for Data Elemet Sequence */
+  char *des_pos[DES_HDR_DEPTH]; /* des stands for Data Element Sequence */
   int des_len[DES_HDR_DEPTH];
   char c_des_len[3][DES_HDR_DEPTH];
   int i;
=20
+  D_MISC(__FUNCTION__" value_string _%s_, valstrlen:%d\n",=20
+         value_string, value_string_len);
+
   i =3D 0;
   while (i < value_string_len)
   {
@@ -299,6 +302,8 @@
     /* If we found a hex value instead of a string */
     if (strncmp(value_string + value_string_pos, "0x", 2) =3D=3D 0)
     {
+      D_MISC("Found HEX val\n");
+
       strcpy(tmp_list + tmp_len, value_string + value_string_pos + 2);
       tmp_len +=3D strlen(value_string + value_string_pos) - 2;
=20
@@ -314,6 +319,7 @@
=20
         /* Now we found a data element sequence header inside another
            data element sequence */
+
         if (des_pos[pos])
         {
           sprintf(c_des_len[pos], "%02x", des_len[pos]);
@@ -321,8 +327,10 @@
           strncpy(des_pos[pos], c_des_len[pos], 2);
           D_MISC("des_pos[%d]: %s", pos, des_pos[pos]);
         }
+
         des_pos[pos] =3D tmp_list + tmp_len - 2;
         des_len[pos] =3D 0;
+
         for (j =3D pos; j > 0; j--)
         {
           des_len[0] +=3D (strlen(value_string + value_string_pos) - 2) / =
2;
@@ -339,6 +347,9 @@
     {
       char *tmp_code;
=20
+      D_MISC("Searching xml file : TAG SDPTranslationRegister\n");
+      D_MISC("String : _%s_\n", value_string+value_string_pos);
+=20=20=20=20=20=20
       /* Get the hex code for the attribute from the xml file */
       tmp_code =3D get_from_xml(fd, "SDPTranslationRegister",
                               value_string + value_string_pos, NULL);
@@ -401,7 +412,7 @@
 }
=20
 unsigned int*
-remove_dublicated_rec_hdl(unsigned int *rec_hdl_list_in, unsigned int cnt_=
in)=20=20
+remove_duplicated_rec_hdl(unsigned int *rec_hdl_list_in, unsigned int cnt_=
in)=20=20
 {
     static unsigned int rec_hdl_list_out[128];
     unsigned int i, j, cnt_out =3D 0;
@@ -420,7 +431,7 @@
       if(!existing)
       {
 	rec_hdl_list_out[cnt_out] =3D rec_hdl_list_in[i];
-	D_RHDL(__FUNCTION__": Found record_handle 0x%08x", rec_hdl_list_out[cnt_o=
ut]);
+	D_RHDL(__FUNCTION__": |||=A0Keeping record_handle 0x%08x |||", rec_hdl_li=
st_out[cnt_out]);
 	cnt_out++;
       }
       existing =3D FALSE;
@@ -439,14 +450,14 @@
   unsigned int rec_hdl_cnt =3D 0;
   int i, j;
=20=20=20
-  D_RHDL(__FUNCTION__": service_class_cnt:%d", service_class_cnt);
+  D_RHDL(__FUNCTION__": Searching for %d UUID:s...", service_class_cnt);
=20
   for (i =3D 0; i < service_class_cnt; i++)
   {
-    D_RHDL(__FUNCTION__": Service Class:0x%08x", service_class_list[i]);
+    D_RHDL(__FUNCTION__": Now search for UUID : 0x%08x", service_class_lis=
t[i]);
     if ((rec_hdl_list[rec_hdl_cnt] =3D get_record_handle(service_class_lis=
t[i], xml_fd)) !=3D NO_REC_HDL)
     {
-      D_REC("Got Record handle1: 0x%08x", rec_hdl_list[rec_hdl_cnt]);
+      D_REC("Found record handle : 0x%08x", rec_hdl_list[rec_hdl_cnt]);
       rec_hdl_cnt++;
     }
=20=20=20=20=20=20=20=20=20
@@ -465,22 +476,30 @@
       while (tmp_hdl_list[j] !=3D NO_REC_HDL)
       {
 	rec_hdl_list[rec_hdl_cnt] =3D tmp_hdl_list[j];
-	D_REC("Got Record handle2: 0x%08x", rec_hdl_list[rec_hdl_cnt]);
+	D_REC("Found record handle : 0x%08x", rec_hdl_list[rec_hdl_cnt]);
 	rec_hdl_cnt++;
 	j++;
       }
=20=20=20=20=20=20=20
+      D_RHDL("Found %d record handles using get_more_rec_hdl\n", j);
+=20=20=20=20=20=20
       D_MEM("<--- free%d 0x%8p", --malloc_dbg, tmp_hdl_list);
       free(tmp_hdl_list);
     }
=20=20=20=20=20
   }
=20=20=20
-  tmp_hdl_list =3D remove_dublicated_rec_hdl(rec_hdl_list, rec_hdl_cnt);
+  D_RHDL("Now __remove__ duplicated entries ?!?!?\n");
+=20
+  tmp_hdl_list =3D remove_duplicated_rec_hdl(rec_hdl_list, rec_hdl_cnt);
=20=20
   return tmp_hdl_list;
 }
=20
+
+/*=20
+ * Searches for "ServiceClasses" entries in database=20
+ */
 unsigned int
 get_record_handle(unsigned short service_class, int fd)
 {
@@ -489,11 +508,14 @@
   char *service_class_id =3D NULL;
   char tmp[12];
=20
+  D_RHDL("Looking for service class %0x\n", service_class);
+
   /* Before we can get the recordhandle we have to find the name of the
      service class, so we can search for it in the database. When we search
      the service class id, have to be converted to characters. All service
      classes are stored as 16 bits UUIDs*/
=20
+  /* Search for UUID as a string among ServiceClasses TAG */
   sprintf(tmp, "0x%04x", service_class);
   service_class_name =3D get_from_xml(fd, "ServiceClasses", NULL, tmp);=20
=20
@@ -504,9 +526,9 @@
     return NO_REC_HDL;
   }
=20
-  /* Otherwise we got the name for the service class, and we can contiue
-     searching for the record handle */
+  D_RHDL("Found service class name %s\n", service_class_name);
=20
+  /* We found service class name, now search for record handle */
   service_class_id =3D get_from_xml(fd, service_class_name,
                                   "ServiceRecordHandle", NULL);
=20
@@ -516,9 +538,9 @@
   /* If we found the record handle we convert it to an unsigned int */
   if (service_class_id !=3D NULL)
   {
-    D_RHDL("Found %s", service_class_id);
+    D_RHDL("Found service_class_id : 0x%x\n", service_class_id);
     record_handle =3D strtoul(service_class_id, NULL, 16);
-    D_RHDL("Record handle converted to int 0x%08x", record_handle);
+    D_RHDL("Service class id conv to rec hdl 0x%08x", record_handle);
     D_MEM("<--- free%d 0x%8p", --malloc_dbg, service_class_id);
     free(service_class_id);
   }
@@ -581,6 +603,9 @@
 {
 }
=20
+/*=20
+ * Searches for Attributes in database=20
+ */
 unsigned int*
 get_more_rec_hdl(unsigned short service_class, int fd)
 {
@@ -591,6 +616,9 @@
   XML_Parser p;
=20
   sprintf(tmp_ch, "0x%04x", service_class);
+
+  /* Search for UUID among "Protocols" TAG */
+
   s_hdl.uuid =3D get_from_xml(fd, "Protocols", NULL, tmp_ch);=20
=20
   /* If we didn't find the service class among the protocols we look for it
@@ -1351,12 +1379,28 @@
     }
   }
=20=20=20
+  D_MISC("Found %d rec handles in database\n", rec_hdl_cnt);
+
+  /* Calculate how many records we can fit into response */
+  /* SdpHdrSize[5] + TotSrvCnt[2] + CurSrvRevCnt[2] + possibl ContState[2]=
=20
+     =3D> 11 bytes. Each rec hdl is 4 bytes */
+
+  max_rec_cnt =3D MIN(db_hdl->max_rec_cnt, (db_hdl->db.l2cap_mtu - 11)/4);
+
+  if (rec_hdl_cnt > max_rec_cnt)=20
+  {
+    D_REC("Only send %d out of %d record handles\n", max_rec_cnt, rec_hdl_=
cnt);
+    rec_hdl_cnt =3D max_rec_cnt;
+  }
+=20=20
   rsp_pkt_len =3D SDP_HDR_SIZE;=20=20
=20=20=20
   /* Set the total service record count */
   rsp_pkt[rsp_pkt_len++] =3D SHORT2CHAR_MS(rec_hdl_cnt);
   rsp_pkt[rsp_pkt_len++] =3D SHORT2CHAR_LS(rec_hdl_cnt);
=20=20=20
+  /* fixme -- total/current should probably differ sometimes... */
+=20=20
   /* Set the current service record count */
   rsp_pkt[rsp_pkt_len++] =3D SHORT2CHAR_MS(rec_hdl_cnt);
   rsp_pkt[rsp_pkt_len++] =3D SHORT2CHAR_LS(rec_hdl_cnt);
@@ -1375,11 +1419,19 @@
   set_sdp_hdr(rsp_pkt, SDP_SERVICESEARCH_RSP, db_hdl->db.trans_id,
               rsp_pkt_len - SDP_HDR_SIZE);
=20
-  max_rec_cnt =3D MIN(db_hdl->max_rec_cnt, db_hdl->db.l2cap_mtu - 11);
-  /* 11 comes from SDP_HDR_SIZE + tot+cur-rec cnt fiel + 2 bytes for cont
+  D_REC("l2cap_mtu:%d, mrc:%d, db->mrc:%d\n", db_hdl->db.l2cap_mtu, max_re=
c_cnt, db_hdl->max_rec_cnt);
+
+  /* If Max Service Record Count is set to a value less than the number of
+     available records in database we should not set cont state */
+
+  /* set_cont_state_search searches rsp_pkt for currently set rec cnt=20
+     and we compare that with max_rec_cnt. If current is larger than
+     max rec cnt, we set continuation state and change headers in rsp
+     packet. If not we simply put a 0 in the end to indicate no cont=20
      state */
=20
-  D_REC("l2cap_mtu:%d, mrc:%d, db->mrc:%d\n", db_hdl->db.l2cap_mtu, max_re=
c_cnt, db_hdl->max_rec_cnt);
+  /* fixme -- as of today we can only handle continuation state for=20
+     1 client at a time */
=20=20=20
   rsp_pkt_len =3D set_cont_state_search(rsp_pkt, rsp_pkt_len, max_rec_cnt);
=20
@@ -1616,8 +1668,10 @@
   }
   else
   {
+    D_MISC("No continuation state set\n");
     pkt[len++] =3D 0;
   }
+=20=20
=20=20=20
   /* Change the length field */
   pkt[SDP_HDR_LENGTH_MS] =3D SHORT2CHAR_MS(len - SDP_HDR_SIZE);

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

From: Mattias A. <mat...@us...> - 2001-08-21 14:40:51

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bttest.c        1.17            1.18=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* simply forward rest of string when typing upt <string>


The diff of the modified file(s):

--- bttest.c	2001/08/21 10:17:34	1.17
+++ bttest.c	2001/08/21 14:40:50	1.18
@@ -406,18 +406,9 @@
 #ifdef CONFIG_BLUETOOTH_UNPLUG_TEST
   else if (strncmp(buf, "upt", 3) =3D=3D 0)
   {
-    if (sscanf(buf+4, "t %d", &i) =3D=3D 1)
-    {
-      syslog(LOG_INFO, "testcommand : %s", buf + 4);
       bt_testcmd(bt_cfd, buf+4);
     }
-    else
-    {
-      /* fixme */
-    }
-  }
 #endif
-
   else if (sscanf(buf, "getinfo %x:%x:%x:%x:%x:%x %x",
 		  &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5],=20
 		  &tmp[6]) =3D=3D 7)

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

From: Anders J. <and...@us...> - 2001-08-21 10:17:36

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bttest.c        1.16            1.17=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Added "hotlist" to keep bd-addresses in.


The diff of the modified file(s):

--- bttest.c	2001/08/17 09:23:25	1.16
+++ bttest.c	2001/08/21 10:17:34	1.17
@@ -118,11 +118,17 @@
   "  bb_disc  <hci handle>", /* disconnect baseband */
   "  lcid_disconnect <lcid>", /* Disconnects a connection with lcid =3D lc=
id */
   "                               ",
+  "-------- Hotlist -------",
+  "(Use !<num> to expand the bdaddr from the list in any command)",
+  "  hotlist_set <pos> <xx:xx:xx:xx:xx:xx>",
+  "  hotlist_show",=20
   "",
=20
   NULL
 };
=20
+static unsigned char hotlist[10][6];
+
 #if !defined(HAVE_READLINE) && !defined(HAVE_READLINE_READLINE)
 static void read_history(char *hist_file_name);
 static void write_history(char *hist_file_name);
@@ -146,7 +152,8 @@
 int
 main(void)
 {
-  int bt_cfd;
+  int bt_cfd, i , j;
+  FILE *hotlist_fd;
=20
   /* Open BT ctrl device */=20=20
   if ((bt_cfd =3D bt_openctrl()) < 0)
@@ -162,6 +169,29 @@
     exit(1);
   }
=20
+  if(hotlist_fd =3D fopen("/etc/.hotlist", "rb"))
+  {
+    for (i =3D 0; i < 10 ; i++)=20
+    {
+      for (j =3D 0 ; j < 6 ; j++)=20
+      {
+        hotlist[i][j] =3D fgetc(hotlist_fd);
+      }
+    }
+    fclose(hotlist_fd);
+  }
+  else
+  {
+    for (i =3D 0; i < 10 ; i++)=20
+    {
+      for (j =3D 0 ; j < 6 ; j++)=20
+      {
+        hotlist[i][j] =3D 0;
+      }
+    }
+  }
+=20=20
+
   read_history(BTD_HISTORY_FILE);=20=20
=20
   show_menu();
@@ -169,10 +199,32 @@
   while (1)
   {
     int tmp;
+    char *tmp_char, hotlist_entry;
+    char tmp_line[200];
     char *line =3D (char*) readline("> ");
     add_history(line);
=20=20=20=20=20
+    if((tmp_char =3D strstr(line, "!")))
+    {
+      if(*(tmp_char + 1) >=3D '0' && *(tmp_char + 1) <=3D '9')
+      {
+        hotlist_entry =3D *(tmp_char + 1) - '0';
+        memcpy(&tmp_line[0], line, tmp_char - line);
+        sprintf(&tmp_line[tmp_char - line], "%02X:%02X:%02X:%02X:%02X:%02X=
%s\0",=20
+                hotlist[hotlist_entry][0],
+                hotlist[hotlist_entry][1],
+                hotlist[hotlist_entry][2],
+                hotlist[hotlist_entry][3],
+                hotlist[hotlist_entry][4],
+                hotlist[hotlist_entry][5],
+                tmp_char + 2);
+        tmp =3D process_cmd(&tmp_line[0], bt_cfd);
+      }
+    }
+    else
+    {=20=20=20
     tmp =3D process_cmd(line, bt_cfd);
+    }
=20=20=20=20=20
     if (tmp =3D=3D QUIT_BTD)
     {
@@ -466,6 +518,46 @@
   {
     printf("Disconnecting lcid %d", i);
     bt_testcmd(bt_cfd, buf);
+  }
+  else if(sscanf(buf, "hotlist_set %d %x:%x:%x:%x:%x:%x",=20
+                 &tmp[6], &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tm=
p[5]))
+  {
+    FILE *hotlist_fd;
+    int i, j;
+=20=20=20=20
+    if(tmp[6] > 9)
+    {
+      printf("Max number in hotlist is 9.\n");
+    }
+    else
+    {
+      hotlist[tmp[6]][0] =3D tmp[0];
+      hotlist[tmp[6]][1] =3D tmp[1];
+      hotlist[tmp[6]][2] =3D tmp[2];
+      hotlist[tmp[6]][3] =3D tmp[3];
+      hotlist[tmp[6]][4] =3D tmp[4];
+      hotlist[tmp[6]][5] =3D tmp[5];
+      if(hotlist_fd =3D fopen("/etc/.hotlist", "wb"))
+      {
+        for (i =3D 0; i < 10 ; i++)=20
+        {
+          for (j =3D 0 ; j < 6 ; j++)=20
+          {
+            fputc(hotlist[i][j], hotlist_fd);
+          }
+        }
+        fclose(hotlist_fd);
+      }
+    }
+  }
+  else if(strcmp(buf, "hotlist_show") =3D=3D 0)
+  {
+    int i, j;
+    for(i =3D 0 ; i < 10 ; i++)
+    {
+      printf("%d: %02X:%02X:%02X:%02X:%02X:%02X\n", i,=20
+             hotlist[i][0], hotlist[i][1], hotlist[i][2], hotlist[i][3], h=
otlist[i][4], hotlist[i][5]);
+    }
   }
   else
   {

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

From: Peter K. <pk...@us...> - 2001-08-17 16:23:52

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bt_misc.c       1.11            1.12=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Need to set ifr.ifr_addr.sa_family before calling the SIOCGIFADDR ioctl


The diff of the modified file(s):

--- bt_misc.c	2001/06/08 09:44:58	1.11
+++ bt_misc.c	2001/08/17 16:23:21	1.12
@@ -267,6 +267,7 @@
     return "0.0.0.0";
   }
=20=20=20
+  ifr.ifr_addr.sa_family =3D AF_INET;
   strcpy(ifr.ifr_name, "eth0");
   if (ioctl(fd, SIOCGIFADDR, (int)&ifr) < 0)
   {

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

From: Peter K. <pk...@us...> - 2001-08-17 16:23:23

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
btd.c           1.102           1.103=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Need to set ifr.ifr_addr.sa_family before calling the SIOCGIFADDR ioctl


The diff of the modified file(s):

--- btd.c	2001/07/31 09:03:34	1.102
+++ btd.c	2001/08/17 16:23:21	1.103
@@ -1644,6 +1644,8 @@
   char *local_address =3D NULL;
   int fd =3D socket(AF_INET, SOCK_DGRAM, 0);
   struct ifreq ifr;
+
+  ifr.ifr_addr.sa_family =3D AF_INET;
   strcpy(ifr.ifr_name, "eth0");
   ioctl(fd, SIOCGIFADDR, (int)&ifr);
   close_device(fd);

CVS: 2 files have been modified in apps/bluetooth/experimental.

From: Anders J. <and...@us...> - 2001-08-17 09:23:26

The following files were modified in apps/bluetooth/experimental:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bt_if.c         1.27            1.28=20=20=20=20=20=20=20=20=20=20=20=20
bttest.c        1.15            1.16=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Added missing PSM in bt_if.c
* Changed parameters to sdp_send in bttest.c


The diff of the modified file(s):

--- bt_if.c	2001/08/02 13:02:40	1.27
+++ bt_if.c	2001/08/17 09:23:25	1.28
@@ -234,6 +234,7 @@
   con.id =3D con_id;
   switch(GET_PSM(con_id))
   {
+   case SDP_LAYER:
     case RFCOMM_LAYER:
     case TCS_LAYER:
     case L2CAP_TEST_LAYER:
--- bttest.c	2001/08/02 13:01:36	1.15
+++ bttest.c	2001/08/17 09:23:25	1.16
@@ -107,7 +107,7 @@
=20
   "",
   "--- Test commands ------",
-  "  sdp_conn  <xx:xx:xx:xx:xx:xx> <profile>",
+  "  sdp_conn  <xx:xx:xx:xx:xx:xx>",
   "  tcs_conn  <xx:xx:xx:xx:xx:xx>",
   "                               ",
   "  test_conn  <xx:xx:xx:xx:xx:xx> <psm> <line>", /* l2cap test using PSM=
 psm */
@@ -412,8 +412,8 @@
     printf("RFCOMM server channel is %d\n", srv_ch);
     bt_connect(bt_cfd, bd, CREATE_RFCOMM_ID(0, srv_ch << 1));
   }
-  else if(sscanf(buf, "sdp_conn %x:%x:%x:%x:%x:%x %d",
-		 &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5], &profile) =3D=3D7)
+  else if(sscanf(buf, "sdp_conn %x:%x:%x:%x:%x:%x",
+		 &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]) =3D=3D 6)
   {
=20=20=20=20=20
     for (i =3D 0; i < 6; i++)

CVS: The file 'linux/drivers/char/bluetooth/test.c' has been modified.

From: Anders J. <and...@us...> - 2001-08-17 09:20:46

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
test.c          1.24            1.25=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Reset dont_send_config after it is used.


The diff of the modified file(s):

--- test.c	2001/08/06 11:12:32	1.24
+++ test.c	2001/08/17 09:20:46	1.25
@@ -280,10 +280,17 @@
 	D_STATE("test_connect_cfm\n");
 	PRINTPSM(l2cap);
=20=09
+	if(status) {
+	  D_STATE("Connect failed: Status %d\n", status);
+	  return;
+	}
+=09
+
 	if (!l2ca_local_conf_done(l2cap)) {
 		if (dont_send_config_req) {
 			printk("Don't send back config_req...\n");
 			printk("Now waiting for initator to shutdown link...\n");
+			dont_send_config_req =3D 0;
 			return;
 		}
=20
@@ -336,6 +343,7 @@
 		if (dont_send_config_req) {
 			printk("Don't send back config_req...\n");
 			printk("Now waiting for initator to shutdown link...\n");
+			dont_send_config_req =3D 0;
 			return;
 		}
=20=09=09

CVS: 4 files have been modified in linux/include/linux/bluetooth.

From: Anders J. <and...@us...> - 2001-08-17 09:19:01

The following files were modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btcommon.h      1.80            1.81=20=20=20=20=20=20=20=20=20=20=20=20
btmem.h         1.19            1.20=20=20=20=20=20=20=20=20=20=20=20=20
hci.h           1.66            1.67=20=20=20=20=20=20=20=20=20=20=20=20
l2cap.h         1.38            1.39=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Added crtx timer.
* Increased buffer size in hci and btmem when compiling for Unplug Tests



The diff of the modified file(s):

--- btcommon.h	2001/08/01 09:50:15	1.80
+++ btcommon.h	2001/08/17 09:19:00	1.81
@@ -318,10 +318,12 @@
 #ifdef __KERNEL__
 	struct timer_list rtx;
 	struct timer_list ertx;
+	struct timer_list 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 */
 	u16 rtx_action; /* preferred action when rtx expires */=09
@@ -329,6 +331,8 @@
=20
 	u16 ertx_action; /* preferred action when ertx expires */=09
 	u16 ertx_inuse;
+
+=20=20
=20
 	//struct timeval caller_id; /* used to identify caller */
 } __attribute__ ((packed)) l2cap_timer_obj;
--- btmem.h	2001/06/19 06:13:01	1.19
+++ btmem.h	2001/08/17 09:19:00	1.20
@@ -53,7 +53,11 @@
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
+#ifdef CONFIG_BLUETOOTH_UNPLUG_TEST=20
+#define BT_BUF_SIZE 20000
+#else
 #define BT_BUF_SIZE 2500
+#endif
=20
 /* There should be less than this amomunt of data in the buffer before we =
wake
    up the ldisc */
--- hci.h	2001/08/06 14:59:57	1.66
+++ hci.h	2001/08/17 09:19:00	1.67
@@ -68,8 +68,11 @@
 #define PAGE_SCAN_ENABLE 2
=20
 /* check in l2cap that MTU doesn't exceed this value */
+#ifdef CONFIG_BLUETOOTH_UNPLUG_TEST
+#define HCI_IN_SIZE 16386
+#else
 #define HCI_IN_SIZE 800
-
+#endif
 /* Struct defining a HCI command packet, the meaning of the type field is
    decribed in part H:4 chapter 2 in the baseband core specification. The
    other fields are described in section H:1 chapter 4.4.1 in the baseband
--- l2cap.h	2001/04/27 10:16:09	1.38
+++ l2cap.h	2001/08/17 09:19:00	1.39
@@ -75,7 +75,7 @@
=20
 #define L2CAP_TEST_LAYER 0x1231
 #define L2CAP_TEST2_LAYER 0x1233
-#define L2CAP_TEST3_LAYER 0x4561
+#define L2CAP_TEST3_LAYER 0x4461
=20
 #define MIN_DYNAMIC_PSM 0x1001
 #define MAX_DYNAMIC_PSM 0xFFFF

CVS: The file 'apps/Rules.elinux' has been modified.

From: Peter K. <pk...@us...> - 2001-08-16 13:12:47

The following file was modified in apps:

Name            Old version     New version     Comment
----            -----------     -----------     -------
Rules.elinux    1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Synchronised with our latest version of this file.


The diff of the modified file(s):

--- Rules.elinux	2001/05/07 11:23:57	1.3
+++ Rules.elinux	2001/08/16 13:12:46	1.4
@@ -79,6 +79,14 @@
 TARGET_TYPE =3D elinux
 CRIS        =3D 1
=20
+# This is for compatibility with cris-dist-1.7, where a.out was the
+# default, but which does not understand -mcrisaout.  We'll only do the
+# costly assignment if we don't inherit the value, which is a " " or
+# -mcrisaout.
+ifndef AXIS_LD_OUTPUT_FORMAT_OPTION
+AXIS_LD_OUTPUT_FORMAT_OPTION :=3D $(shell `gcc-cris -print-prog-name=3Dld`=
 -V | sed -n -e 's/.* crisaout/-mcrisaout/p') #
+endif
+
 # ELINUX always uses uclibc.  Though a check that the app can use uclibc
 # is in order.
 ifndef USE_UCLIBC
@@ -148,7 +156,11 @@
 CPP =3D gcc_cris -mlinux -DCRISMMU -E
 CXX =3D gcc_cris -mlinux -DCRISMMU -xc++
=20
-LDFLAGS =3D -s -static
+LDFLAGS =3D -static
+ifneq ($(AXIS_DEBUG),debug)
+# Add -s flag for stripping if not building for debug.
+LDFLAGS +=3D -s
+endif # AXIS_DEBUG !=3D debug
 endif # AXIS_WILL_USE_LIB =3D UCLIBC
=20
 ifeq ($(AXIS_WILL_USE_LIB),GLIBC)
@@ -156,17 +168,27 @@
=20
 # We prefer getting <asm/...> and <linux/...> from the kernel we compile,
 # rather than what was installed with the compiler, so put it first in the
-# system include path.
+# system include path.  Though we have to go through a separate directory
+# with just the linux and asm dirs, rather than use $(ELINUXDIR)/include,
+# lest we also drag in the other subdirs, which collide with the normal
+# gcc-cris -mlinux system-includes, for example <net/...>.
=20
-CC  =3D gcc-cris -mlinux -isystem $(ELINUXDIR)/include
-CPP =3D gcc-cris -mlinux -E -isystem $(ELINUXDIR)/include
-CXX =3D g++-cris -mlinux -xc++ -isystem $(ELINUXDIR)/include
-LDFLAGS =3D -s -L$(prefix)/lib
+CC  =3D gcc-cris -mlinux -isystem $(prefix)/include
+CPP =3D gcc-cris -mlinux -E -isystem $(prefix)/include
+CXX =3D g++-cris -mlinux -xc++ -isystem $(prefix)/include
+
+LDFLAGS =3D -L$(prefix)/lib
+ifneq ($(AXIS_DEBUG),debug)
+# Add -s flag for stripping if not building for debug.
+LDFLAGS +=3D -s
+endif # AXIS_DEBUG !=3D debug
 endif # AXIS_WILL_USE_LIB !=3D GLIBC
=20
 TARGET_TYPE =3D clinux
 CRIS        =3D 1
=20
+AXIS_LD_OUTPUT_FORMAT_OPTION =3D -mcrislinux
+
 endif # CLINUX
=20
 ifdef CRIS
@@ -174,7 +196,7 @@
 # This is for building for the CRIS architecture.
=20
 OBJCOPY =3D objcopy-cris
-LD      =3D ld-cris
+LD      =3D ld-cris $(AXIS_LD_OUTPUT_FORMAT_OPTION)
 AR      =3D ar-cris
 RANLIB  =3D ranlib-cris
=20
@@ -212,6 +234,12 @@
=20
 ifdef CRIS
 CFLAGS   +=3D -O2
+
+ifeq ($(AXIS_DEBUG),debug)
+# Add suitable compiler flags for debugging.
+CFLAGS +=3D -g -fno-omit-frame-pointer
+endif
+=20
 ifdef ELINUX
 CFLAGS   +=3D -DELINUX
 endif
@@ -283,8 +311,22 @@
 endif
 endif # !ROOT_MAKEFRAG
=20
+nodebug:
+	grep -v AXIS_DEBUG $(makefrag_name) > $(makefrag_name).tmp
+	mv -f $(makefrag_name).tmp $(makefrag_name)
+	-$(MAKE) clean
+
+debug:
+	grep -v AXIS_DEBUG $(makefrag_name) >$(makefrag_name).tmp
+	echo AXIS_DEBUG=3Ddebug >>$(makefrag_name).tmp
+	mv -f $(makefrag_name).tmp $(makefrag_name)
+	-$(MAKE) clean
+
 cris-axis-linux-gnu elinux clinux host:
 	echo AXIS_BUILDTYPE=3D$@ > .tmp$(makefrag_name)
+        ifeq ($(AXIS_DEBUG),debug)
+		echo AXIS_DEBUG=3D$(AXIS_DEBUG) >> .tmp$(makefrag_name)
+        endif
 	-$(MAKE) configsubs AXIS_BUILDTYPE=3D$@ ROOT_MAKEFRAG=3D$(shell echo `pwd=
`/.tmp$(makefrag_name))
 	@rm -f .tmp$(makefrag_name)
=20

CVS: The file 'linux/drivers/char/bluetooth/hci_vendor.c' has been modified.

From: Peter K. <pk...@us...> - 2001-08-16 13:05:56

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci_vendor.c    1.49            1.50=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* Rewrote the Eicsson version of hci_set_bd_addr() to create the
  hci packet just like all the other functions do.
* Use defines instead of hardcoded values.


The diff of the modified file(s):

--- hci_vendor.c	2001/07/05 21:45:08	1.49
+++ hci_vendor.c	2001/08/16 13:05:55	1.50
@@ -71,9 +71,9 @@
=20
 #ifdef CONFIG_BLUETOOTH_ERICSSON
 /* Ericsson defines */
-#define ERICSSON_SET_UART_BAUD_RATE 0x9
-#define ERICSSON_WRITE_BD_ADDR 0xd
-#define ERICSSON_READ_REVISION_INFORMATION 0xF
+#define ERICSSON_SET_UART_BAUD_RATE        0x09
+#define ERICSSON_WRITE_BD_ADDR             0x0D
+#define ERICSSON_READ_REVISION_INFORMATION 0x0F
=20
 #define ERICSSON_ENTER_TEST_MODE 0x11
 #define ERICSSON_TEST_CONTROL 0x12
@@ -115,7 +115,6 @@
 s32=20
 hci_set_bd_addr(u8 bd[6])
 {
-	u8 pkt[10];
 	u8 tmp_bd[6];
 	s32 i;
=20=20=20
@@ -126,13 +125,12 @@
 	}
=20=20=20
 	PRINTPKT(__FUNCTION__ VENDOR ":", bd, 6);
-	pkt[0] =3D CMD_PKT;
-	pkt[1] =3D 0x0d;
-	pkt[2] =3D 0xfc;
-	pkt[3] =3D 0x06;
-	memcpy(pkt + 4, tmp_bd, 6);
+	c_pkt.type =3D CMD_PKT;
+	c_pkt.opcode =3D hci_put_opcode(ERICSSON_WRITE_BD_ADDR, MANUFACTURER_SPEC=
);
+	c_pkt.len =3D 6;
+	memcpy(c_pkt.data, tmp_bd, 6);
=20=20=20
-	return send_cmd_block(pkt, 10, DEFAULT_TIMEOUT);
+	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
, DEFAULT_TIMEOUT);
 }
=20=20
 s32
@@ -140,7 +138,7 @@
 {
 	D_CMD(__FUNCTION__ VENDOR "\n");
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0xf, 0x3f) ;
+	c_pkt.opcode =3D hci_put_opcode(ERICSSON_READ_REVISION_INFORMATION, MANUF=
ACTURER_SPEC);
 	c_pkt.len =3D 0;
=20
 	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
, DEFAULT_TIMEOUT);
@@ -155,7 +153,7 @@
=20
 	D_CMD(__FUNCTION__ VENDOR " (%u baud)\n", baudrate);
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(ERICSSON_SET_UART_BAUD_RATE, 0x3f) ;
+	c_pkt.opcode =3D hci_put_opcode(ERICSSON_SET_UART_BAUD_RATE, MANUFACTURER=
_SPEC);
 	c_pkt.len =3D 1;
 	switch (baudrate) {
 	case 57600:
@@ -664,7 +662,7 @@
=20
 	/* HCI Manufacturer specific header */
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0x00, 0x3f);
+	c_pkt.opcode =3D hci_put_opcode(0x00, MANUFACTURER_SPEC);
 	c_pkt.len =3D 1 + cmd->len * 2;
=20=09
 	msg =3D (csr_msg *)c_pkt.data;
@@ -717,7 +715,7 @@
=20
 	/* HCI Manufacturer specific header */
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0x00, 0x3f);
+	c_pkt.opcode =3D hci_put_opcode(0x00, MANUFACTURER_SPEC);
 	c_pkt.len =3D 1 + 5*sizeof(u16) + 3*sizeof(u16) + n_pars*sizeof(u16);
=20
 	msg =3D (csr_msg *)c_pkt.data;
@@ -772,7 +770,7 @@
=20
 	/* HCI Manufacturer specific header */
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0x00, 0x3f);
+	c_pkt.opcode =3D hci_put_opcode(0x00, MANUFACTURER_SPEC);
 	c_pkt.len =3D 1 + 5*sizeof(u16) + 3*sizeof(u16) + 4*sizeof(u16);
=20
 	msg =3D (csr_msg *)c_pkt.data;
@@ -816,7 +814,7 @@
=20
 	/* HCI Manufacturer specific header */
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0x00, 0x3f);
+	c_pkt.opcode =3D hci_put_opcode(0x00, MANUFACTURER_SPEC);
 	c_pkt.len =3D 1 + 5*sizeof(u16) + 3*sizeof(u16) + 1*sizeof(u16);
=20
 	msg =3D (csr_msg *)c_pkt.data;
@@ -864,7 +862,7 @@
=20=09
 	/* HCI Manufacturer specific header */
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0x00, 0x3f);
+	c_pkt.opcode =3D hci_put_opcode(0x00, MANUFACTURER_SPEC);
 	c_pkt.len =3D 1 + 5*sizeof(u16) + 6*sizeof(u16);
=20
 	msg =3D (csr_msg *)c_pkt.data;
@@ -945,7 +943,7 @@
=20
 	/* HCI Manufacturer specific header */
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0x00, 0x3f);
+	c_pkt.opcode =3D hci_put_opcode(0x00, MANUFACTURER_SPEC);
 	c_pkt.len =3D 1 + 5*sizeof(u16) + 4*sizeof(u16);
=20
 	msg =3D (csr_msg *)c_pkt.data;
@@ -1190,7 +1188,7 @@
 {
 	D_CMD(__FUNCTION__ VENDOR "\n");
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0x0005, 0x3f);
+	c_pkt.opcode =3D hci_put_opcode(0x05, MANUFACTURER_SPEC);
 	c_pkt.len =3D 0;
=20
 	return send_cmd_block((u8*) &c_pkt,

CVS: 6 files have been modified in linux/drivers/char/bluetooth.

From: Peter K. <pk...@us...> - 2001-08-16 13:01:53

The following files were modified in linux/drivers/char/bluetooth:

Name             Old version     New version     Comment
----             -----------     -----------     -------
bcsp.c           1.16            1.17=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_datagram.c  1.8             1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_integrity.c 1.6             1.7=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_mux.c       1.8             1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_sequence.c  1.16            1.17=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_slip.c      1.5             1.6=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made the BCSP files at least compile for user mode.


The diff of the modified file(s):

--- bcsp.c	2001/07/06 06:48:54	1.16
+++ bcsp.c	2001/08/16 13:01:22	1.17
@@ -43,22 +43,36 @@
=20
 #define __NO_VERSION__ /* don't define kernel_version in module.h */
=20
+#ifdef __KERNEL__
 #include <linux/malloc.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/delay.h>
+
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
=20
-
 #include <linux/bluetooth/sysdep-2.1.h>
 #include <linux/bluetooth/btcommon.h>
+#include <linux/bluetooth/bluetooth.h>
+#include <linux/bluetooth/hci.h>
 #include <linux/bluetooth/btmem.h>
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
-#include <linux/bluetooth/bluetooth.h>
-#include <linux/bluetooth/hci.h>
+#else
+#include <stdlib.h>
+#include <errno.h>
+
+#include <asm/unaligned.h>
=20
+#include "btcommon.h"
+#include "bluetooth.h"
+#include "hci.h"
+#include "btmem.h"
+#include "bcsp.h"
+#include "bcsp_debug.h"
+#endif
+
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
 #if BCSP_DEBUG
@@ -89,7 +103,9 @@
=20
 /****************** LOCAL VARIABLE DECLARATION SECTION *******************=
***/
=20
+#ifdef __KERNEL__
 static struct timer_list bcsp_sync_timer;
+#endif
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 static wait_queue_head_t bcsp_sync_wq;
 #else
--- bcsp_datagram.c	2001/07/31 18:06:40	1.8
+++ bcsp_datagram.c	2001/08/16 13:01:22	1.9
@@ -44,15 +44,23 @@
=20
 #define __NO_VERSION__ /* don't define kernel_version in module.h */
=20
+#ifdef __KERNEL__
 #include <linux/malloc.h>
+
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
=20
-
 #include <linux/bluetooth/sysdep-2.1.h>
+#include <linux/bluetooth/btcommon.h>
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
-#include <linux/bluetooth/btcommon.h>
+#else
+#include <asm/unaligned.h>
+
+#include "btcommon.h"
+#include "bcsp.h"
+#include "bcsp_debug.h"
+#endif
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
--- bcsp_integrity.c	2001/05/30 09:47:00	1.6
+++ bcsp_integrity.c	2001/08/16 13:01:22	1.7
@@ -44,13 +44,21 @@
=20
 #define __NO_VERSION__ /* don't define kernel_version in module.h */
=20
+#ifdef __KERNEL__
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
=20
 #include <linux/bluetooth/sysdep-2.1.h>
+#include <linux/bluetooth/btcommon.h>
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
-#include <linux/bluetooth/btcommon.h>
+#else
+#include <asm/unaligned.h>
+
+#include "btcommon.h"
+#include "bcsp.h"
+#include "bcsp_debug.h"
+#endif
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
--- bcsp_mux.c	2001/07/20 06:41:00	1.8
+++ bcsp_mux.c	2001/08/16 13:01:22	1.9
@@ -43,10 +43,15 @@
=20
 #define __NO_VERSION__ /* don't define kernel_version in module.h */
=20
+#ifdef __KERNEL__
 #include <linux/malloc.h>
=20
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
+#else
+#include "bcsp.h"
+#include "bcsp_debug.h"
+#endif
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
--- bcsp_sequence.c	2001/07/31 17:59:25	1.16
+++ bcsp_sequence.c	2001/08/16 13:01:22	1.17
@@ -44,6 +44,7 @@
=20
 #define __NO_VERSION__ /* don't define kernel_version in module.h */
=20
+#ifdef __KERNEL__
 #include <linux/malloc.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
@@ -54,6 +55,12 @@
 #include <linux/bluetooth/hci.h>
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
+#else
+#include "btmem.h"
+#include "hci.h"
+#include "bcsp.h"
+#include "bcsp_debug.h"
+#endif
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
@@ -89,8 +96,10 @@
=20
 /****************** LOCAL VARIABLE DECLARATION SECTION *******************=
***/
=20
+#ifdef __KERNEL__
 static struct tq_struct resend_data_task;
 static struct tq_struct send_ack_task;
+#endif
=20
 #if BCSP_PARSELOWER
 u8 txseq;
@@ -108,7 +117,9 @@
=20
 static u8 rtx_count =3D BCSP_RTX_MAX;
=20
+#ifdef __KERNEL__
 static struct timer_list resend_timer;
+#endif
=20
 static u8 resend_timer_active =3D FALSE;
=20
@@ -119,11 +130,13 @@
 void
 bcsp_sequence_init(void)
 {
+#ifdef __KERNEL__
 	resend_data_task.routine =3D (void*)sequence_resend;
 	resend_data_task.data =3D NULL;
=20
 	send_ack_task.routine =3D (void*)send_ack;
 	send_ack_task.data =3D NULL;
+#endif
=20
 	txseq =3D 0;
 	txack =3D 0;
@@ -311,7 +324,6 @@
 	}
 }
=20
-
 void
 send_ack(void)
 {
@@ -329,6 +341,7 @@
 		release_resend_timer();
 	}
=20=09
+#ifdef __KERNEL__
 	init_timer(&resend_timer);
 	resend_timer.function =3D (void*)sequence_resend;
 	resend_timer.data =3D 0;
@@ -337,6 +350,7 @@
 	resend_timer_active =3D TRUE;
=20=09
 	add_timer(&resend_timer);
+#endif
 }
=20
 void
@@ -344,7 +358,9 @@
 {
 	if (resend_timer_active) {
 		resend_timer_active =3D FALSE;
+#ifdef __KERNEL__
 		del_timer(&resend_timer);
+#endif
 	}
 }
=20
--- bcsp_slip.c	2001/05/30 09:47:00	1.5
+++ bcsp_slip.c	2001/08/16 13:01:22	1.6
@@ -43,10 +43,19 @@
=20
 #define __NO_VERSION__ /* don't define kernel_version in module.h */
=20
+#ifdef __KERNEL__
 #include <linux/malloc.h>
=20
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
+#else
+#include <stdlib.h>
+#include <errno.h>
+
+#include "btcommon.h"
+#include "bcsp.h"
+#include "bcsp_debug.h"
+#endif
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20

CVS: 2 files have been modified in linux/include/linux/bluetooth.

From: Peter K. <pk...@us...> - 2001-08-16 13:01:23

The following files were modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bcsp.h          1.7             1.8=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_debug.h    1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made the BCSP files at least compile for user mode.


The diff of the modified file(s):

--- bcsp.h	2001/06/06 15:01:11	1.7
+++ bcsp.h	2001/08/16 13:01:22	1.8
@@ -44,7 +44,11 @@
=20
 /****************** INCLUDE FILES SECTION ********************************=
***/
=20
+#ifdef __KERNEL__
 #include <linux/types.h>
+#else
+#include "local.h"
+#endif
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
--- bcsp_debug.h	2001/06/13 12:14:44	1.4
+++ bcsp_debug.h	2001/08/16 13:01:22	1.5
@@ -44,7 +44,11 @@
=20
 /****************** INCLUDE FILES SECTION ********************************=
***/
=20
+#ifdef __KERNEL__
 #include <linux/bluetooth/btdebug.h>
+#else
+#include "btdebug.h"
+#endif
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20

Undeliverable Message

From: <MAI...@te...> - 2001-08-15 19:11:17

To:            SMTP@Ma...@Te...[<ope...@li...>]
Cc:            
Subject:       openbt-commit digest, Vol 1 #124 - 2 msgs

Message not delivered to recipients below.  Press F1 for help with VNM
error codes.               

	VNM3043:  John Kaasgaard@SW...@Te...



VNM3043 -- MAILBOX IS FULL

   The message cannot be delivered because the
   recipient's mailbox contains the maximum number of 
   messages, as set by the system administrator.  The
   recipient must delete some messages before any
   other messages can be delivered.
    The maximum message limit for a user's mailbox is 
   10,000.  The default message limit is 1000 messages.  
   Administrators can set message limits using the 
   Mailbox  Settings function available in the 
   Manage User menu  (MUSER). 

   When a user's mailbox reaches the limit, the 
   user must delete some of the messages before 
   the mailbox can accept any more incoming messages.

----------------------  Original Message Follows  ----------------------

Send openbt-commit mailing list submissions to
	ope...@li...

To subscribe or unsubscribe via the World Wide Web, visit
	http://lists.sourceforge.net/lists/listinfo/openbt-commit
or, via email, send a message with subject or body 'help' to
	ope...@li...

You can reach the person managing the list at
	ope...@li...

When replying, please edit your Subject line so it is more specific
than "Re: Contents of openbt-commit digest..."


Today's Topics:

   1. (no subject) (=?iso-8859-1?Q?Torbj=F6rn_Sandstr=F6m?=)
   2. Insmod problem: unresolved symbol hci_receive_acl (=?iso-8859-1?Q?Torbj=F6rn_Sandstr=F6m?=)

--__--__--

Message: 1
From: =?iso-8859-1?Q?Torbj=F6rn_Sandstr=F6m?=
	 <tor...@se...>
To: "'ope...@li...'"
	 <ope...@li...>
Date: Wed, 15 Aug 2001 10:49:44 +0200
Subject: (no subject)

confirm 518791


--__--__--

Message: 2
From: =?iso-8859-1?Q?Torbj=F6rn_Sandstr=F6m?=
	 <tor...@se...>
To: "'ope...@li...'"
	 <ope...@li...>
Subject: Insmod problem: unresolved symbol hci_receive_acl
Date: Wed, 15 Aug 2001 11:00:12 +0200

Hello,

I get the following message when I try to insmod 'bt.o' into the kernel
(RedHat 7.1):

bt.o: unresolved symbol hci_receive_acl
bt.o: unresolved symbol hci_receive_bcsp
bt.o: unresolved symbol hci_receive_event
bt.o: unresolved symbol csr_waitcmdnum
bt.o: unresolved symbol hci_receive_hq
bt.o: unresolved symbol bt_write_lower_driver_real

What to do?

best regards

/T




--__--__--

_______________________________________________
openbt-commit mailing list
ope...@li...
http://lists.sourceforge.net/lists/listinfo/openbt-commit


End of openbt-commit Digest

Insmod problem: unresolved symbol hci_receive_acl

From: <tor...@se...> - 2001-08-15 08:58:03

Hello,

I get the following message when I try to insmod 'bt.o' into the kernel
(RedHat 7.1):

bt.o: unresolved symbol hci_receive_acl
bt.o: unresolved symbol hci_receive_bcsp
bt.o: unresolved symbol hci_receive_event
bt.o: unresolved symbol csr_waitcmdnum
bt.o: unresolved symbol hci_receive_hq
bt.o: unresolved symbol bt_write_lower_driver_real

What to do?

best regards

/T

(no subject)

From: <tor...@se...> - 2001-08-15 08:47:41

confirm 518791

CVS: The file 'linux/drivers/char/bluetooth/hci.c' has been modified.

From: Peter K. <pk...@us...> - 2001-08-06 15:52:06

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.173           1.174=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Minor clean-up in command_handler().


The diff of the modified file(s):

--- hci.c	2001/08/06 15:38:18	1.173
+++ hci.c	2001/08/06 15:52:05	1.174
@@ -3612,13 +3612,10 @@
 	u8 o_event[256];
 	u32 o_len;
=20
-	cmd_pkt *cmd;
-	event_struct *out_event;
-
-	PRINTPKT(__FUNCTION__, data, data[3] + CMD_HDR_LEN);
+	cmd_pkt *cmd =3D (cmd_pkt *)data;
+	event_struct *out_event =3D (event_struct *)o_event;
=20
-	cmd =3D (cmd_pkt*) data; /* Skip the packet type byte */
-	out_event =3D (event_struct*) o_event;
+	PRINTPKT(__FUNCTION__, data, cmd->len + CMD_HDR_LEN + HCI_HDR_LEN);
=20
 	switch (hci_get_ogf(cmd->opcode)) {
=20

CVS: The file 'linux/drivers/char/bluetooth/hci.c' has been modified.

From: Peter K. <pk...@us...> - 2001-08-06 15:38:20

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.172           1.173=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Moved the case for READ_COUNTRY_CODE to process_return_param()
(it had accidentally ended up in command_handler() which is
part of the HCI emulation; this is why a diff is a much better
way to send a patch...)


The diff of the modified file(s):

--- hci.c	2001/08/06 11:03:00	1.172
+++ hci.c	2001/08/06 15:38:18	1.173
@@ -1496,6 +1496,19 @@
=20
 		switch (ocf) {
=20
+		case READ_COUNTRY_CODE:
+			if (r_val[0]) {
+				D_ERR(__FUNCTION__ ": READ_COUNTRY_CODE : %s\n",
+				      get_err_msg(r_val[0]));
+				result_param =3D -r_val[0];
+			} else {
+				result_param =3D r_val[1];
+				D_CMD(__FUNCTION__ ": READ_COUNTRY_CODE : %d\n",
+				      result_param);
+			}
+			break;
+=09=09=09
+
 		case READ_LOCAL_VERSION_INFORMATION:
 			D_CMD(__FUNCTION__ ": READ_LOCAL_VERSION_INFORMATION\n");
 			if (r_val[0]) {
@@ -3617,7 +3630,6 @@
 			D_CMD(__FUNCTION__ ": CREATE_CONNECTION->connection request\n");
 			o_len =3D set_con_req_event(out_event, cmd->data, 1);
 			bt_write_lower_driver(o_event, o_len);
-=09=09=09
 			break;
=20=09=09=09
 		case DISCONNECT:
@@ -3663,20 +3675,6 @@
 	case HCI_IP:                 /* Informational parameters */
 		switch (hci_get_ocf(cmd->opcode)) {
=20=09=09=09
-		case HCIREADCOUNTRYCODE:
-
-			if (r_val[0]) {
-				D_ERR(__FUNCTION__": READ_COUNTRY_CODE : %s\n",=20
-				      get_err_msg(r_val[0]));
-				result_param =3D -r_val[0];
-			} else {
-				result_param =3D r_val[1];
-				D_CMD(__FUNCTION__": READ_COUNTRY_CODE : %d\n",=20
-				      result_param);
-			}
-			break;
-=09=09=09
-
 		case READ_BUFFER_SIZE:
 			D_CMD(__FUNCTION__ ": READ_BUFFER_SIZE->setting buffer size\n");
 			hci_ctrl.hc_buf.acl_num =3D ACL_NUM;

CVS: The file 'linux/include/linux/bluetooth/hci.h' has been modified.

From: Peter K. <pk...@us...> - 2001-08-06 14:59:59

The following file was modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.h           1.65            1.66=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Minor correction to indentation.

CVS: The file 'linux/drivers/char/bluetooth/test.c' has been modified.

From: Peter K. <pk...@us...> - 2001-08-06 11:12:33

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
test.c          1.23            1.24=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made it compile for the user stack.


The diff of the modified file(s):

--- test.c	2001/08/06 10:50:18	1.23
+++ test.c	2001/08/06 11:12:32	1.24
@@ -185,8 +185,6 @@
 	return 0;
 }
=20
-static struct timer_list test_timer;
-
 static void
 test_timeout(unsigned long ptr)
 {
@@ -209,6 +207,10 @@
=20
 void test_connect_ind(l2cap_con *l2cap)=20
 {
+#ifdef __KERNEL__
+	static struct timer_list test_timer;
+#endif
+
 	D_STATE("test_connect_ind : remote cid : %d\n", l2cap->remote_cid);
 	PRINTPSM(l2cap);
=20
@@ -220,9 +222,7 @@
 		}
=20
 		/* start 5 sec timer */=09=09
-#ifndef __KERNEL__
-
-#else
+#ifdef __KERNEL__
 		init_timer(&test_timer);
 		test_timer.function =3D test_timeout;
 		test_timer.data =3D (unsigned long)l2cap;

CVS: The file 'linux/drivers/char/bluetooth/hci.c' has been modified.

From: Peter K. <pk...@us...> - 2001-08-06 11:03:02

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.171           1.172=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Use READ_COUNTRY_CODE as op-code in hci_read_country_code(),
instead of HCIREADCOUNTRYCODE (which is the name of the ioctl...)


The diff of the modified file(s):

--- hci.c	2001/08/02 16:06:48	1.171
+++ hci.c	2001/08/06 11:03:00	1.172
@@ -2961,8 +2961,7 @@
 	D_CMD(__FUNCTION__ "\n");
=20=09
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.ocf =3D READ_LOCAL_VERSION_INFORMATION;
-	c_pkt.ogf =3D HCI_IP;
+	c_pkt.opcode =3D hci_put_opcode(READ_LOCAL_VERSION_INFORMATION, HCI_IP);
 	c_pkt.len =3D 0;
=20
         if (block)
@@ -2975,19 +2974,17 @@
 s32 hci_read_country_code(void)
 {
 	s32 tmp;
+
 	D_CMD(__FUNCTION__"\n");
+
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(HCIREADCOUNTRYCODE, HCI_IP);
+	c_pkt.opcode =3D hci_put_opcode(READ_COUNTRY_CODE, HCI_IP);
 	c_pkt.len =3D 0;
=20=09
 	tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N,
 			     DEFAULT_TIMEOUT);
=20
-	if (tmp < 0) {
-		return tmp;
-	} else {
-		return result_param;
-	}
+	return tmp < 0 ? tmp : result_param;
 }
=20
 /*

CVS: The file 'linux/drivers/char/bluetooth/test.c' has been modified.

From: Peter K. <pk...@us...> - 2001-08-06 10:50:19

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
test.c          1.22            1.23=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Fixed a compiler warning.


The diff of the modified file(s):

--- test.c	2001/08/02 16:04:48	1.22
+++ test.c	2001/08/06 10:50:18	1.23
@@ -225,7 +225,7 @@
 #else
 		init_timer(&test_timer);
 		test_timer.function =3D test_timeout;
-		test_timer.data =3D l2cap;
+		test_timer.data =3D (unsigned long)l2cap;
 		test_timer.expires =3D jiffies + 5*HZ;
 		add_timer(&test_timer);
 #endif

CVS: The file 'linux/drivers/char/bluetooth/hci.c' has been modified.

From: Mattias A. <mat...@us...> - 2001-08-02 16:07:30

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.170           1.171=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* made disconnect() blocking



The diff of the modified file(s):

--- hci.c	2001/08/01 09:48:36	1.170
+++ hci.c	2001/08/02 16:06:48	1.171
@@ -894,11 +894,17 @@
=20
 	case DISCONNECTION_COMPLETE:
 		DSYS(__FUNCTION__ ": DISCONNECTION_COMPLETE %s\n", get_err_msg(buf[3]));
+
+		release_cmd_timer();
+		wake_up_interruptible(&hci_wq);
+
 		lp_disconnect_ind(CHAR2INT12(buf[2], buf[1]));
+
 		/* FIXME: No more NBR_OF_COMPLETE_PACKETS will arrive for this
 		   connection handle, if we only support point-to-point
 		   connections we can acl_num by reading the buffersizes again,
 		   but this will not work in a multipoint connection. */
+
 		hci_ctrl.nbr_of_connections--;
 		hci_update_load_factor();
 		reset_hci_con_bd(CHAR2INT12(buf[2], buf[1]));
@@ -1910,6 +1916,11 @@
 void=20
 hci_shutdown(void)
 {
+=20=20
+	/* take down any open acl links */
+
+=09
+
 #ifdef USE_NCPTIMER
 	release_ncp_timer();
 #endif
@@ -2028,7 +2039,8 @@
 	c_pkt.data[2] =3D reason;
 	c_pkt.len =3D 3;
=20
-	return send_cmd((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
+	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
,=20
+			      DEFAULT_TIMEOUT);
 }
=20
 /* A positive response to a previous connection request, role =3D 0 sets m=
aster,

CVS: 2 files have been modified in linux/drivers/char/bluetooth.

From: Mattias A. <mat...@us...> - 2001-08-02 16:05:08

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
test.c          1.21            1.22=20=20=20=20=20=20=20=20=20=20=20=20
unplug_test.c   1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* fixed some errors for unplug tests
* cleanup



The diff of the modified file(s):

--- test.c	2001/08/01 10:20:07	1.21
+++ test.c	2001/08/02 16:04:48	1.22
@@ -128,7 +128,7 @@
 l2cap_con *testcon2;
 l2cap_con *testcon3;
 s32 emulate_pending =3D 0;
-s32 test_assymmetric_mtu =3D 0;
+s32 test_inmtu =3D 0;
 s32 dont_send_config_req =3D 0;
 s32 use_multiple_conf_params =3D 0;
 s32 disable_testpsm =3D 0;
@@ -154,7 +154,6 @@
 	l2cap_register_upper(L2CAP_TEST_LAYER, &this_layer);
 	l2cap_register_upper(L2CAP_TEST2_LAYER, &this_layer);
 	l2cap_register_upper(L2CAP_TEST3_LAYER, &this_layer);
-	//l2cap_register_upper(7, &this_layer);
 }
=20
 void test_shutdown(void)
@@ -186,44 +185,51 @@
 	return 0;
 }
=20
-void test_connect_ind(l2cap_con *l2cap)=20
+static struct timer_list test_timer;
+
+static void
+test_timeout(unsigned long ptr)
 {
-#ifdef __KERNEL__
-	struct tq_struct test_task;
-	static s32 t_init =3D -1;
+	struct l2cap_con *con =3D (struct l2cap_con *)ptr;
+	printk("Test timeout\n");
=20
-	if (t_init < 0)
-		t_init =3D jiffies;
-#endif
+	if (emulate_pending) {
+
+		printk("Now sending config rsp non-pending...\n");
+		emulate_pending =3D 0;
+=09=09
+		if (l2ca_connect_rsp(con, RES_SUCCESS, STAT_NOINFO)) {
+			D_ERR("test_connect_ind: l2ca_connect_rsp failed\n");=20
+			return;
+		}
+		emulate_pending =3D 0;
+	}
+}
+
+
+void test_connect_ind(l2cap_con *l2cap)=20
+{
 	D_STATE("test_connect_ind : remote cid : %d\n", l2cap->remote_cid);
 	PRINTPSM(l2cap);
=20
-	if (emulate_pending)
-        {
+	if (emulate_pending) {
+		printk("Sending connect rsp pending and waiting 5 secs\n");
 		if (l2ca_connect_rsp(l2cap, RES_PENDING, STAT_AUTHENTPEND)) {
 			D_ERR("test_connect_ind: l2ca_connect_rsp failed\n");=20
 			return;
 		}
+
+		/* start 5 sec timer */=09=09
 #ifndef __KERNEL__
-		printk("'Authorization' pending for 5 secs...\n");
-		sleep(5);
-#else
-		while ((jiffies - t_init) < 5*HZ) {
-			test_task.routine =3D (void*)test_connect_ind;
-			test_task.data =3D l2cap;
=20=09=09=09
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-			queue_task(&test_task, &tq_scheduler);
 #else
-			queue_task(&test_task, &tq_immediate);
-			mark_bh(IMMEDIATE_BH);
-#endif
-		}
+		init_timer(&test_timer);
+		test_timer.function =3D test_timeout;
+		test_timer.data =3D l2cap;
+		test_timer.expires =3D jiffies + 5*HZ;
+		add_timer(&test_timer);
 #endif
-
-		printk("Shutting off authorization pending.\n");
-		emulate_pending =3D 0;
-		printk("Sending connect rsp with result =3D success back\n");
+		return;
         }
=20=09
 	if (disable_testpsm =3D=3D 1)
@@ -238,6 +244,7 @@
 		return;
 	}
=20=09
+	printk("now sending back result success !\n");
 	if (l2ca_connect_rsp(l2cap, RES_SUCCESS, STAT_NOINFO)) {
 		D_ERR("test_connect_ind: l2ca_connect_rsp failed\n");=20
 		return;
@@ -251,8 +258,6 @@
 		testcon2 =3D l2cap;
 	else if (l2cap->psm =3D=3D L2CAP_TEST3_LAYER)
 		testcon3 =3D l2cap;
-//	else
-//		testcon =3D l2cap;
 }
=20
 /* only client receives connect pnd */
@@ -267,8 +272,6 @@
 		testcon2 =3D l2cap;
 	else if (l2cap->psm =3D=3D L2CAP_TEST3_LAYER)
 		testcon3 =3D l2cap;
-//	else
-//		testcon =3D l2cap;
 }
=20
 /* only client receives connect cfm */
@@ -294,15 +297,12 @@
 		}
=20=09=09
 		/* store connection */
-
 		if (l2cap->psm =3D=3D L2CAP_TEST_LAYER)
 			testcon =3D l2cap;
 		else if (l2cap->psm =3D=3D L2CAP_TEST2_LAYER)
 			testcon2 =3D l2cap;
 		else if (l2cap->psm =3D=3D L2CAP_TEST3_LAYER)
 			testcon3 =3D l2cap;
-//		else
-//			testcon =3D l2cap;
 	} else=20=09=20=20=20=20=20=20=20
 		D_RCV("test_config_cfm : already have sent config request\n");
 }
@@ -327,7 +327,6 @@
=20
 	/* check if we received a pos response on a previous config req */=20
 	if (!l2ca_local_conf_done(l2cap)) {
-		u16 tmp_mtu;
=20
 		/* still haven't sent config request yet */
=20
@@ -346,13 +345,14 @@
 				D_ERR("test_config_cfm : Configuration request failed\n");
 			}
 		} else {
-			if (test_assymmetric_mtu)=20=09
-				tmp_mtu =3D 8192;
-			else
-				tmp_mtu =3D 0; /* use default */
-=09=09=09
-			if (l2ca_config_req(l2cap, tmp_mtu, NULL, 0, 0))
+			if (l2ca_config_req(l2cap, test_inmtu, NULL, 0, 0))
 				D_ERR("test_config_ind : configuration request failed\n");
+
+			if (test_inmtu)
+			{
+				printk("Set back our test_inmtu to default\n");
+				test_inmtu =3D 0;
+			}
 		}
=20
 	} else=20
--- unplug_test.c	2001/07/31 19:28:55	1.3
+++ unplug_test.c	2001/08/02 16:04:47	1.4
@@ -35,7 +35,8 @@
  * the executable file might be covered by the provisions of the GNU
  * General Public License.
  *
- * $Id$
+ * $Id: unplug_test.c,v 1.
+3 2001/07/31 19:28:55 pkj Exp $
  *
  */
=20
@@ -63,7 +64,6 @@
 #include "include/btcommon.h"
 #endif
=20
-
 extern rfcomm_con rfcomm_con_list[7];
=20
 extern rpn_values rpn_val;
@@ -74,7 +74,7 @@
=20
 extern l2cap_con *testcon; /* is set in test.c */
 extern s32 emulate_pending; /* is set in test.c */
-extern s32 test_assymmetric_mtu;
+extern s32 test_inmtu;
 extern s32 dont_send_config_req;
 extern s32 use_multiple_conf_params;
 extern s32 disable_testpsm;
@@ -287,15 +287,13 @@
=20
=20
 /*
- * Test case : Opening of a Connection-Oriented Channel,=20
- * Device B Initiator (L2CAP Test 1)
- * (see btd.c, issue command 'test_conn <bd addr>')
+ * Test case 1 : Opening of a Connection-Oriented Channel,=20
+ *
+ * (see bttest.c, issue command 'test_conn <bd addr> <psm>')
  */
=20
 /*
- * Test case : Opening of a Connection-Oriented Channel,=20
- * Device A Initiator (L2CAP Test 2)
- * (see test.c, handled automatically as server)
+ * Test case : Data transfer via Open L2CAP Channel (L2CAP Test 2)
  */
=20
 /*
@@ -346,17 +344,17 @@
=20
 /*
  * Test case : Disconnection of a Connection Oriented Channel
- * Device B Initiator (L2CAP Test 4)
- * (see btd.c, issue command 'test_disc')
+ * Device B Initiator (L2CAP Test 3)
+ * (see btd.c, issue command 'test_disc <local CID>')
  */
=20
=20=20
 /*
- * Test case : Disconnection of a Connection-Oriented Channel,=20
- * Device A Initiator (L2CAP Test 5)
- * (see test.c, handled automatically as server)
+ * Test case : Echo
+ * Device A Initiator (L2CAP Test 4)
+ *
  */
-/*  test_conn 00:e0:03:78:b0:db */
+/*  upt t 241 */
=20
 /*
=20
@@ -364,38 +362,48 @@
  * Data Transferred (L2CAP Test 5)
  */
=20
+#define OPTION_MTU1 4096
+#define OPTION_MTU2 8192
=20
 static void test_2_5_1(void)
 {
-	/* FIXME - Client sends configure request with MTU 4096 */
-	if (l2ca_config_req(testcon, 48, NULL, 0, 0)) {
+	printk("[Client] Sending config req for mtu =3D %d\n", OPTION_MTU1);
+	if (l2ca_config_req(testcon, OPTION_MTU1, NULL, 0, 0)) {
 		D_ERR("l2ca_connect_cfm : Configuration request failed\n");
 	}
 }
=20
+static void test_2_5_2(void)
+{
+	printk("[Server] Set our in_mtu to :%d\n", OPTION_MTU2);
+	test_inmtu =3D OPTION_MTU2;
+}
+
+
 static void test_2_5_3(void)
 {
-       /* FIXME - Server sends configure request with MTU 16384 */
-      if (l2ca_config_req(testcon, 16384, NULL, 0xffff, 0)) {
+	printk("[Client] Sending config req for mtu =3D %d\n", OPTION_MTU2);
+	if (l2ca_config_req(testcon, OPTION_MTU2, NULL, 0xffff, 0)) {
               D_ERR("l2ca_connect_cfm : Configuration request failed\n");
       }
 }
=20
 static void test_2_5_4(void)
 {
-  /* FIXME - Client responds success in configure response */
+	printk("[Server] Set our in_mtu to :%d\n", OPTION_MTU1);
+	test_inmtu =3D OPTION_MTU1;
 }
=20
 static void test_2_5_5(void)
 {
 	/* Client sends 8192 bytes of data */
-	printk("test_2_5_6, client sends 8192 bytes\n");
+	printk("Sends 8192 bytes\n");
 	test_send_data(testcon, tmpdata, 8192);
 }
=20
 static void test_2_5_6(void)
 {
-	printk("test_2_5_6, server sends 4096 bytes\n");
+	printk("Sending 4096 bytes\n");
 	/* Server sends 4096 bytes of data */
 	test_send_data(testcon, tmpdata, 4096);
 }
@@ -1391,6 +1399,8 @@
 	case 226: test_2_2_6();
 		break;
 	case 251: test_2_5_1();
+		break;
+	case 252: test_2_5_2();
 		break;
 	case 253: test_2_5_3();
 		break;

CVS: The file 'linux/drivers/char/bluetooth/rfcomm.c' has been modified.

From: Mattias A. <mat...@us...> - 2001-08-02 16:03:59

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
rfcomm.c        1.117           1.118=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* call bt_unregister_rfcomm when a data channel is disconnected
* changed some debug



The diff of the modified file(s):

--- rfcomm.c	2001/08/02 15:45:15	1.117
+++ rfcomm.c	2001/08/02 16:03:28	1.118
@@ -818,7 +818,7 @@
 		/* check control channel */
 		if (rfcomm->dlci[0].state !=3D DISCONNECTED)
 		{
-			printk("Rfcomm disconnect failed, reset session\n");
+			D_ERR("Rfcomm disconnect failed, reset session\n");
 #ifdef __KERNEL__=09=09=09
 			bt_unregister_rfcomm(rfcomm->line);
 			bt_disconnect_cfm(CREATE_RFCOMM_ID(rfcomm->line, 0),=20
@@ -1261,17 +1261,18 @@
 		} else if ((short_pkt->h.addr.server_chn) =3D=3D 0) {
 			rfcomm->dlci[0].state =3D DISCONNECTED;
=20
-			printk("RFCOMM control ch disconnected (remotely)\n");
+			DSYS("RFCOMM control ch disconnected (remotely) [line:%d]\n",=20
+			       rfcomm->line);
 			send_ua(rfcomm, 0);
-#ifdef __KERNEL__
-			bt_unregister_rfcomm(rfcomm->line);
-#endif
 		} else {
 			rfcomm->dlci[tmp_dlci].state =3D DISCONNECTED;
 			send_ua(rfcomm, tmp_dlci);
 			D_CTRL("dlci %d was disconnected\n", tmp_dlci);
 			bt_disconnect_ind(CREATE_RFCOMM_ID(rfcomm->line,=20
 							   tmp_dlci));
+#ifdef __KERNEL__
+			bt_unregister_rfcomm(rfcomm->line);
+#endif
 		}
 		break;
=20=20=20=20=20
@@ -1661,7 +1662,7 @@
 			rfcomm->dlci[tmp_dlci].mtu  =3D pn_pkt->frame_size;
=20=09=09=09
 			if (pn_pkt->credit_flow =3D=3D 0xe) {
-				printk(FNC"Credit flow control used\n");
+				DSYS(FNC"Credit flow control used\n");
 				rfcomm->credit_flow =3D TRUE;
 				rfcomm->dlci[tmp_dlci].local_credits =3D pn_pkt->credits;
 				D_CTRL(FNC"Local credits:%d\n", rfcomm->dlci[tmp_dlci].local_credits);=
=20
@@ -2624,7 +2625,7 @@
 rfcomm_pn_msg(rfcomm_con *rfcomm, u8 dlci, u8 credits, u32 frame_size)
 {
 	if (credits) {
-		printk(FNC"using %d credits\n", credits);
+		DSYS(FNC"using %d credits\n", credits);
 		return send_pn_msg(rfcomm, 0, frame_size, 0xf, credits, dlci,
 				   TRUE);
 	} else {

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 20 21 22 23 24 .. 48 > >> (Page 22 of 48)

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