Thread: CVS: 2 files have been modified in libs/openbt.

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

The following files were modified in libs/openbt:

Name     Old version  New version  Tag  Comment
----     -----------  -----------  ---  -------
bt_if.c  1.1          1.2=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
bt_if.h  1.1          1.2=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* Changed bt_inquiry call to return a list of found devices.
* Changed bt_read_remote_name to use HCIREMOTENAME_REQUEST.
* All output from inquiry shall be done from the calling application.


The diff of the modified file(s):

--- bt_if.c	2003/11/04 10:59:39	1.1
+++ bt_if.c	2003/11/04 15:24:30	1.2
@@ -393,7 +393,6 @@ void bt_showstatus(void)
 #endif
 }
=20
-/* fixme<1> --  add usermode stack version */
 int
 bt_send(int fd, int len, int repeat)
 {
@@ -989,8 +988,8 @@ bt_write_page_scan_activity(int bt_cfd,=20
 #endif
 }
=20
-int
-bt_inquiry(int bt_cfd, int nbr_rsp, int t, int get_name)
+inquiry_results *
+bt_inquiry(int bt_cfd, int nbr_rsp, int t)
 {
   int retval =3D 0;
 #ifdef BTD_USERSTACK
@@ -1004,13 +1003,12 @@ bt_inquiry(int bt_cfd, int nbr_rsp, int=20
=20
   retval =3D hci_inquiry(inq_lap, t, nbr_rsp);
 #else
-  int i;
   inquiry_results *inq_res;
=20
   if (!(inq_res =3D malloc(sizeof *inq_res + nbr_rsp * 6)))
   {
-    fprintf(stderr, "%s: Failed to allocate result structure!\n", __FUNCTI=
ON__);
-    return -ENOMEM;
+    fprintf(stderr, "Inquiry failed: %s\n", strerror(errno));
+    return NULL;
   }
=20
   inq_res->nbr_of_units =3D nbr_rsp;
@@ -1020,75 +1018,12 @@ bt_inquiry(int bt_cfd, int nbr_rsp, int=20
   {
     fprintf(stderr, "Inquiry failed [%s (%d)]\n", error_msg(retval), MSG_G=
ET_CODE(-retval));
     free(inq_res);
-    return retval;
-  }
-
-  if (get_name)
-  {
-    unsigned char name_device[255];
-    /* First print the number of units found */
-    printf("%d", inq_res->nbr_of_units);
-
-    for (i =3D 0; i < inq_res->nbr_of_units; i++)
-    {
-      /* Copy BD_ADDR to send in ioctl */
-      memcpy(name_device,inq_res->bd_addr + 6*i, 6);
-
-      if ((retval =3D ioctl(bt_cfd, HCIREMOTENAME_REQUEST, name_device)) <=
 0)
-      {
-        fprintf (stderr, "Remote name request failed [%s (%d)]\n", error_m=
sg(retval), MSG_GET_CODE(-retval));
-        /* Test if the problem is that the IOCTL doesn't exist */
-        if (errno =3D=3D EINVAL)
-          fprintf(stderr, "btinq: error: the ioctl HCIREMOTENAME_REQUEST d=
oesn't exist in the driver");
-        /* Print a default name */
-        printf("\nDevice with unknown name");
-      }
-      else
-      {
-        switch (retval)
-        {
-         case 0x04:  /* Page timeout */
-          printf("\nDevice with unknown name");
-          break;
-
-         case 0x00:
-          if (name_device[0] =3D=3D '\0')
-          {
-            printf("Device with empty name\n");
-          }
-          else
-          {
-            printf("\n%s", name_device);
-          }
-          break;
-
-         default:
-          printf("\nDevice with unrecoverable name");
-          break;
-        }  /* Switch */
+    return NULL;
       }
=20
-      /* Print BD address */
-      printf("\n%02x:%02x:%02x:%02x:%02x:%02x",
-             inq_res->bd_addr[0+6*i], inq_res->bd_addr[1+6*i],
-             inq_res->bd_addr[2+6*i], inq_res->bd_addr[3+6*i],
-             inq_res->bd_addr[4+6*i], inq_res->bd_addr[5+6*i]);
-    } /* End of loop on every addresses founded */
-  } /* End of if get_name */
-  else
-  {
-    /* Just write addresses as it was historically done */
-    for (i =3D 0; i < inq_res->nbr_of_units; i++)
-    {
-      printf("BD %d: %02x:%02x:%02x:%02x:%02x:%02x\n",i,
-             inq_res->bd_addr[0+6*i], inq_res->bd_addr[1+6*i],
-             inq_res->bd_addr[2+6*i], inq_res->bd_addr[3+6*i],
-             inq_res->bd_addr[4+6*i], inq_res->bd_addr[5+6*i]);
-    }
-  }
-  free(inq_res);
+  return inq_res;
 #endif
-  return retval;
+  return inq_res;
 }
=20
 void
@@ -1235,18 +1170,25 @@ read_remote_bd(int bt_cfd, int line, uns
 }
=20
 int
-read_remote_name(int bt_cfd, int line, unsigned char *name, unsigned int l=
ength)
+read_remote_name(int bt_cfd, unsigned char *buf, unsigned int length)
 {
-#ifndef BT_USERSTACK
-  *(int*)name =3D line;
-  *((int*)name+1) =3D length;
+  unsigned char tmpbuf[255];
+  int cpylen =3D length - 1;
+  memcpy(tmpbuf, buf, 6);
+  if(cpylen > 254)
+  {
+    cpylen =3D 254;
+  }
=20
-  if (ioctl(bt_cfd, BTREADREMOTENAME, name) < 0)
+#ifndef BT_USERSTACK
+  if (ioctl(bt_cfd, HCIREMOTENAME_REQUEST, tmpbuf) < 0)
   {
     perror(__FUNCTION__);
     return -1;
   }
=20
+  memcpy(buf, tmpbuf, cpylen);
+  buf[cpylen] =3D 0;
   return 0;
 #else
   fprintf(stderr, __FUNCTION__ ": Not yet implemented...\n");
--- bt_if.h	2003/11/04 10:59:39	1.1
+++ bt_if.h	2003/11/04 15:24:30	1.2
@@ -356,13 +356,13 @@ int bt_ping(int bt_cfd, unsigned char bd
 int bt_getinfo(int bt_cfd, unsigned char bd[6], unsigned short type);
 int bt_testcmd(int bt_cfd, unsigned char *cmd);
=20
-int bt_inquiry(int bt_cfd, int nbr_rsp, int t, int get_name);
+inquiry_results *bt_inquiry(int bt_cfd, int nbr_rsp, int t);
 int bt_set_baudrate(int bt_cfd, const char *speedstr);
 void bt_set_bd_addr(int bt_cfd, unsigned char *bd);
 void read_local_bd(int bt_cfd, unsigned char *bd_addr);
 void read_remote_bd(int bt_cfd, int line, unsigned char *bd_addr);
 void read_remote_class(int bt_cfd, unsigned char *bd_addr, unsigned char *=
remote_class);
-int read_remote_name(int bt_cfd, int line, unsigned char *name, unsigned i=
nt length);
+int read_remote_name(int bt_cfd, unsigned char *buf, unsigned int length);
 void role_switch(int bt_cfd, unsigned char *bd_addr, int role);
=20
 int bt_set_event_filter(int bt_cfd, unsigned char *filter, int len);




Thread: CVS: 2 files have been modified in libs/openbt.

openbt-commit