Changeset 2aa9b55d44c652444a33d2d0afa5d04c13f4efe6

Timestamp:

09/29/09 02:05:03 (3 years ago)

Author:

L. Donnie Smith <donnie.smith@…>

git-author:

L. Donnie Smith <donnie.smith@gatech.edu> / 2009-06-15T00:05:28Z+0000

Parents:

2174214bc2caca51aa49a47025ccb80b3f75e53f

Children:

8df4b195a65ed76283cd18f6d1e2373f01431cff

git-committer:

L. Donnie Smith <donnie.smith@gatech.edu> / 2009-09-28T22:05:03Z-0400

Message:

Alternate extension initialization, remove decoded reads (#79)

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

Files:

• libcwiid/command.c (modified) (2 diffs)
• libcwiid/cwiid.h (modified) (1 diff)
• libcwiid/cwiid_internal.h (modified) (1 diff)
• libcwiid/interface.c (modified) (1 diff)
• libcwiid/process.c (modified) (2 diffs)
• libcwiid/thread.c (modified) (2 diffs)
• python/cwiidmodule.c (modified) (1 diff)

libcwiid/command.c

@@ -130 +130 @@
         unsigned char *cursor;
         int ret = 0;
-        int i;
 
         /* Compose read request packet */
@@ -195 +194 @@
         if (pthread_mutex_unlock(&wiimote->rw_mutex)) {
                 cwiid_err(wiimote, "Mutex unlock error (rw_mutex) - deadlock warning");
-        }
-
-        /* Decode (only for register reads) */
-        if ((ret == 0) && (flags & CWIID_RW_DECODE) && (flags & CWIID_RW_REG)) {
-                for (i=0; i < len; i++) {
-                        ((unsigned char *)data)[i] = DECODE(((unsigned char *)data)[i]);
-                }
         }
 

libcwiid/cwiid.h

@@ -120 +120 @@
 #define CWIID_RW_EEPROM 0x00
 #define CWIID_RW_REG    0x04
-#define CWIID_RW_DECODE 0x01
 
 /* Maximum Data Read Length */

libcwiid/cwiid_internal.h

@@ -127 +127 @@
 #define CLIFF_IR_BLOCK_2        "\x63\x03"
 
-/* Extension Decode */
-#define DECODE(a)       (((a ^ 0x17)+0x17)&0xFF)
-
 /* Write Sequences */
 enum write_seq_type {

libcwiid/interface.c

@@ -158 +158 @@
                 break;
         case CWIID_EXT_NUNCHUK:
-                flags = CWIID_RW_REG | CWIID_RW_DECODE;
+                flags = CWIID_RW_REG;
                 offset = 0xA40020;
                 err_str = "nunchuk ";

libcwiid/process.c

@@ -196 +196 @@
                         nunchuk_mesg = &ma->array[ma->count++].nunchuk_mesg;
                         nunchuk_mesg->type = CWIID_MESG_NUNCHUK;
-                        nunchuk_mesg->stick[CWIID_X] = DECODE(data[0]);
-                        nunchuk_mesg->stick[CWIID_Y] = DECODE(data[1]);
-                        nunchuk_mesg->acc[CWIID_X] = DECODE(data[2]);
-                        nunchuk_mesg->acc[CWIID_Y] = DECODE(data[3]);
-                        nunchuk_mesg->acc[CWIID_Z] = DECODE(data[4]);
-                        nunchuk_mesg->buttons = ~DECODE(data[5]) & NUNCHUK_BTN_MASK;
+                        nunchuk_mesg->stick[CWIID_X] = data[0];
+                        nunchuk_mesg->stick[CWIID_Y] = data[1];
+                        nunchuk_mesg->acc[CWIID_X] = data[2];
+                        nunchuk_mesg->acc[CWIID_Y] = data[3];
+                        nunchuk_mesg->acc[CWIID_Z] = data[4];
+                        nunchuk_mesg->buttons = ~data[5] & NUNCHUK_BTN_MASK;
                 }
                 break;
@@ -210 +210 @@
 
                         for (i=0; i < 6; i++) {
-                                data[i] = DECODE(data[i]);
+                                data[i] = data[i];
                         }
 

libcwiid/thread.c

@@ -173 +173 @@
         struct mesg_array ma;
         struct cwiid_status_mesg *status_mesg;
-        unsigned char buf;
+        unsigned char buf[2];
 
         ma.count = 1;
@@ -193 +193 @@
                 if (status_mesg->ext_type == CWIID_EXT_UNKNOWN) {
                         if (wiimote->state.ext_type == CWIID_EXT_NONE) {
-                                buf = 0x00;
+                                buf[0] = 0x55;
+                                buf[1] = 0x00;
                                 /* Initialize extension register space */
-                                if (cwiid_write(wiimote, CWIID_RW_REG, 0xA40040, 1, &buf)) {
+                                if (cwiid_write(wiimote, CWIID_RW_REG, 0xA400F0, 1, &buf[0])) {
                                         cwiid_err(wiimote, "Extension initialization error");
                                         status_mesg->ext_type = CWIID_EXT_UNKNOWN;
                                 }
+                                else if (cwiid_write(wiimote, CWIID_RW_REG, 0xA400FB, 1, &buf[1])) {
+                                                cwiid_err(wiimote, "Extension initialization error");
+                                                status_mesg->ext_type = CWIID_EXT_UNKNOWN;
+                                }
                                 /* Read extension ID */
-                                else if (cwiid_read(wiimote, CWIID_RW_REG | CWIID_RW_DECODE,
-                                                    0xA400FE, 1, &buf)) {
+                                else if (cwiid_read(wiimote, CWIID_RW_REG, 0xA400FE, 1, &buf[0])) {
                                         cwiid_err(wiimote, "Read error (extension error)");
                                         status_mesg->ext_type = CWIID_EXT_UNKNOWN;
                                 }
                                 else {
-                                        switch (buf) {
+                                        switch (buf[0]) {
                                         case EXT_NONE:
                                         case EXT_PARTIAL:

python/cwiidmodule.c

@@ -133 +133 @@
         CWIID_CONST_MACRO(RW_EEPROM),
         CWIID_CONST_MACRO(RW_REG),
-        CWIID_CONST_MACRO(RW_DECODE),
         CWIID_CONST_MACRO(MAX_READ_LEN),
         CWIID_CONST_MACRO(X),