Changeset d2323a579f283ed7393c20b762697766d2d01e1f

Timestamp:

04/01/07 20:46:16 (6 years ago)

Author:

dsmith <dsmith@…>

Children:

cc418bb14a0cf2615e57971f52b2a2f07868e3a7

Parents:

d7c9be1302a434adc8e9472e1bb70ec5eded1b61

git-author:

L. Donnie Smith <donnie.smith@…> (04/01/07 20:46:16)

git-committer:

dsmith <dsmith@…> (04/01/07 20:46:16)

Message:

Added struct wiimote info and info retrieval functions

git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@47 918edb2d-ff29-0410-9de2-eb38e7f22bc7

Files:

• ChangeLog (modified) (1 diff)
• wiimote/Makefile.in (modified) (1 diff)
• wiimote/bluetooth.c (added)
• wiimote/connect.c (modified) (2 diffs)
• wiimote/util.c (modified) (3 diffs)
• wiimote/wiimote.h (modified) (3 diffs)
• wiimote/wiimote_internal.h (modified) (3 diffs)

ChangeLog

@@ -2 +2 @@
         wmdemo
         * renamed main.c to wmdemo.c
+
+        wiimote
+        * created bluetooth.c
+        * moved wiimote_findfirst to bluetooth.c, renamed to wiimote_find_wiimote,
+          added timeout argument
+        * defined struct wiimote_info
+        * wrote wiimote_get_info_array
 
 2007-03-27 L. Donnie Smith <cwiid@abstrakraft.org>

wiimote/Makefile.in

@@ -7 +7 @@
 MAJOR_VER = 0
 MINOR_VER = 1
-SOURCES = connect.c command.c event.c rw.c util.c queue.c
+SOURCES = connect.c command.c event.c rw.c bluetooth.c util.c queue.c
 LDLIBS += -lbluetooth -lpthread -lrt
 LIB_INST_DIR = @libdir@

wiimote/connect.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  04/01/2007: L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed wiimote_findfirst to wiimote_find_wiimote
+ *
  *  03/14/2007: L. Donnie Smith <cwiid@abstrakraft.org>
  *  * changed memcpy to bacmp
@@ -79 +82 @@
         /* If BDADDR_ANY is given, find available wiimote */
         if (bacmp(&bdaddr, BDADDR_ANY) == 0) {
-                if (wiimote_findfirst(&bdaddr)) {
+                if (wiimote_find_wiimote(&bdaddr, 2)) {
                         /* TODO: wiimote functions should print their own errors */
                         wiimote_err(wiimote, "Unable to find wiimote");

wiimote/util.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  04/01/2007: L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * removed wiimote_findfirst (moved to bluetooth.c)
+ *
+ *  03/27/2007: L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * moved wiimote_findfirst to bluetooth.c
+ *
  *  03/14/2007: L. Donnie Smith <cwiid@abstrakraft.org>
  *  * audited error checking (coda and error handler sections)
@@ -35 +41 @@
 #include <string.h>
 #include <unistd.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include "wiimote_internal.h"
 
@@ -160 +163 @@
 }
 
-#define MAX_RSP 256
-int wiimote_findfirst(bdaddr_t *bdaddr)
-{
-        /* TODO: I suppose we'll have to sift through BlueZ source to properly
-         * check errors here...
-         */
-        int dev_id;
-        int sock = -1;
-        inquiry_info *dev_list = NULL;
-        int i;
-        int dev_count;
-        int ret = -1;
-        char dev_name[WIIMOTE_CMP_LEN];
-
-        /* Get the first available Bluetooth device */
-        if ((dev_id = hci_get_route(NULL)) == -1) {
-                wiimote_err(NULL, "No Bluetooth device found");
-                ret = -1;
-                goto CODA;
-        }
-        if ((sock = hci_open_dev(dev_id)) == -1) {
-                wiimote_err(NULL, "Error opening Bluetooth device");
-                ret = -1;
-                goto CODA;
-        }
-
-        /* Get Device List */
-        if ((dev_count = hci_inquiry(dev_id, 2, MAX_RSP, NULL, &dev_list,
-                                     IREQ_CACHE_FLUSH)) == -1) {
-                wiimote_err(NULL, "Error on device inquiry");
-                ret = -1;
-                goto CODA;
-        }
-
-        /* Check class and name for Wiimotes */
-        for (i=0; i < dev_count; i++) {
-                if ((dev_list[i].dev_class[0] == WIIMOTE_CLASS_0) &&
-                  (dev_list[i].dev_class[1] == WIIMOTE_CLASS_1) &&
-                  (dev_list[i].dev_class[2] == WIIMOTE_CLASS_2)) {
-                        if (hci_remote_name(sock, &dev_list[i].bdaddr, WIIMOTE_CMP_LEN,
-                                            dev_name, 5000)) {
-                                wiimote_err(NULL, "Error reading device name");
-                        }
-                        else if (strncmp(dev_name, WIIMOTE_NAME, WIIMOTE_CMP_LEN) == 0) {
-                                *bdaddr = dev_list[i].bdaddr;
-                                ret = 0;
-                                break;
-                        }
-                }
-        }
-
-CODA:
-        if (sock != -1) {
-                hci_close_dev(sock);
-        }
-        if (dev_list) {
-                free(dev_list);
-        }
-        return ret;
-}
-

wiimote/wiimote.h

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  04/01/2007: L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added wiimote_info definition and macros
+ *  * added wiimote_get_info_array prototype
+ *  * changed wiimote_findfirst to wiimote_find_wiimote
+ *
  *  03/05/2007: L. Donnie Smith <cwiid@abstrakraft.org>
  *  * added wiimote_err_t definition
@@ -195 +200 @@
 typedef void wiimote_err_t(int, const char *, ...);
 
+/* getinfo flags */
+#define BT_NO_WIIMOTE_FILTER 0x01
+#define BT_WM_NAME_LEN 32
+
+struct wiimote_info {
+        bdaddr_t bdaddr;
+        uint8_t class[3];
+        char name[BT_WM_NAME_LEN];
+};
+
 #ifdef __cplusplus
 extern "C" {
@@ -211 +226 @@
                   uint16_t len, const void *data);
 /* int wiimote_beep(wiimote_t *wiimote); */
-int wiimote_findfirst(bdaddr_t *bdaddr);
+int wiimote_get_info_array(int dev_id, unsigned int timeout, int max_wm,
+                           struct wiimote_info **wm, uint8_t flags);
+int wiimote_find_wiimote(bdaddr_t *bdaddr, int timeout);
 
 #ifdef __cplusplus

wiimote/wiimote_internal.h

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  04/01/2007: L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * removed WIIMOTE_CMP_LEN macro and wiimote_findfirst prototype
+ *
  *  03/05/2007: L. Donnie Smith <cwiid@abstrakraft.org>
  *  * added wiimote parameter to wiimote_err prototype
@@ -54 +57 @@
 /* Wiimote specific magic numbers */
 #define WIIMOTE_NAME "Nintendo RVL-CNT-01"
-#define WIIMOTE_CMP_LEN sizeof(WIIMOTE_NAME)
 #define WIIMOTE_CLASS_0 0x04
 #define WIIMOTE_CLASS_1 0x25
@@ -174 +176 @@
                    struct write_seq *seq);
 void free_mesg_array(struct mesg_array *array);
-int wiimote_findfirst(bdaddr_t *bdaddr);
 
 #endif