Changeset 116 for trunk/libcwiid

Timestamp:

05/16/07 19:40:30 (2 years ago)

Author:

dsmith

Message:

deprecated cwiid_{connect,disconnect,command}, added cwiid_{open,close,request_status,set_led,set_rumble,set_rpt_mode}

Files:

• trunk/libcwiid/command.c (modified) (3 diffs)
• trunk/libcwiid/connect.c (modified) (4 diffs)
• trunk/libcwiid/cwiid.h (modified) (3 diffs)

trunk/libcwiid/command.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * added cwiid_request_status, cwiid_set_let, cwiid_set_rumble,
+ *    cwiid_set_rpt_mode
+ *
- *  2007-04-24 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * rewrite for API overhaul
@@ -45 +49 @@
-#include "cwiid_internal.h"
-
-#define CMD_BUF_LEN     21
-int cwiid_command(struct wiimote *wiimote, enum cwiid_command command,
-                  int flags) {
-
-
-
-
+
+
-        switch (command) {
-        case CWIID_CMD_STATUS:
-
-
-
-
-
+
-                break;
-        case CWIID_CMD_LED:
-
-
-
-
-
-
+
-                break;
-        case CWIID_CMD_RUMBLE:
-
-
-
-
-
-
+
-                break;
-        case CWIID_CMD_RPT_MODE:
-update
+ret = cwiid_set
-                break;
-        default:
@@ -85 +72 @@
-
-        return ret;
+}
+
+int cwiid_request_status(cwiid_wiimote_t *wiimote)
+{
+        unsigned char data;
+
+        data = 0;
+        if (send_report(wiimote, 0, RPT_STATUS_REQ, 1, &data)) {
+                cwiid_err(wiimote, "Status request error");
+                return -1;
+        }
+
+        return 0;
+}
+
+int cwiid_set_led(cwiid_wiimote_t *wiimote, uint8_t led)
+{
+        unsigned char data;
+
+        /* TODO: assumption: char assignments are atomic, no mutex lock needed */
+        wiimote->state.led = led & 0x0F;
+        data = wiimote->state.led << 4;
+        if (send_report(wiimote, 0, RPT_LED_RUMBLE, 1, &data)) {
+                cwiid_err(wiimote, "Report send error (led)");
+                return -1;
+        }
+
+        return 0;
+}
+
+int cwiid_set_rumble(cwiid_wiimote_t *wiimote, uint8_t rumble)
+{
+        unsigned char data;
+
+        /* TODO: assumption: char assignments are atomic, no mutex lock needed */
+        wiimote->state.rumble = rumble ? 1 : 0;
+        data = wiimote->state.led << 4;
+        if (send_report(wiimote, 0, RPT_LED_RUMBLE, 1, &data)) {
+                cwiid_err(wiimote, "Report send error (led)");
+                return -1;
+        }
+
+        return 0;
+}
+
+int cwiid_set_rpt_mode(cwiid_wiimote_t *wiimote, uint8_t rpt_mode)
+{
+        return update_rpt_mode(wiimote, rpt_mode);
-}
-

trunk/libcwiid/connect.c

@@ -18 +18 @@
- *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * remove error_pipe init and destruct
+ *  * renamed connect and disconnect to open and close
- *
- *  2007-04-24 L. Donnie Smith <cwiid@abstrakraft.org>
@@ -58 +59 @@
-static int wiimote_id = 0;
-
-connect
+open
-{
-        struct wiimote *wiimote = NULL;
@@ -194 +195 @@
-        memset(&wiimote->state, 0, sizeof wiimote->state);
-        wiimote->mesg_callback = NULL;
-command(wiimote, CWIID_CMD_LED
-command(wiimote, CWIID_CMD_STATUS, 0
+set_led(wiimote
+request_status(wiimote
-
-        return wiimote;
@@ -272 +273 @@
-}
-
-disconnect
+close
-{
-        void *pthread_ret;

trunk/libcwiid/cwiid.h

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed cwiid_connect, cwiid_disconnect to cwiid_open, cwiid_close
+ *  * added cwiid_request_status, cwiid_set_let, cwiid_set_rumble,
+ *    cwiid_set_rpt_mode
+ *
- *  2007-05-14 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * added timestamp to message functions
@@ -298 +303 @@
-
-/* Connection */
-
-
+
+
+
+
-
-int cwiid_get_id(cwiid_wiimote_t *wiimote);
@@ -319 +326 @@
-int cwiid_command(cwiid_wiimote_t *wiimote, enum cwiid_command command,
-                  int flags);
+int cwiid_request_status(cwiid_wiimote_t *wiimote);
+int cwiid_set_led(cwiid_wiimote_t *wiimote, uint8_t led);
+int cwiid_set_rumble(cwiid_wiimote_t *wiimote, uint8_t rumble);
+int cwiid_set_rpt_mode(cwiid_wiimote_t *wiimote, uint8_t rpt_mode);
-int cwiid_read(cwiid_wiimote_t *wiimote, uint8_t flags, uint32_t offset,
-               uint16_t len, void *data);