Ticket #79: guitar.diff

trunk/libcwiid/cwiid_internal.h

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

trunk/libcwiid/thread.c

@@ -192 +192 @@
 
                 if (status_mesg->ext_type == CWIID_EXT_UNKNOWN) {
                         if (wiimote->state.ext_type == CWIID_EXT_NONE) {
-                                buf = 0x00;
+                                buf = 0x55;
                                 /* Initialize extension register space */
-                                if (cwiid_write(wiimote, CWIID_RW_REG, 0xA40040, 1, &buf)) {
+                                if (cwiid_write(wiimote, CWIID_RW_REG, 0xA400F0, 1, &buf)) {
                                         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)) {
-                                        cwiid_err(wiimote, "Read error (extension error)");
-                                        status_mesg->ext_type = CWIID_EXT_UNKNOWN;
-                                }
                                 else {
-                                        switch (buf) {
-                                        case EXT_NONE:
-                                        case EXT_PARTIAL:
-                                                status_mesg->ext_type = CWIID_EXT_NONE;
-                                                break;
-                                        case EXT_NUNCHUK:
-                                                status_mesg->ext_type = CWIID_EXT_NUNCHUK;
-                                                break;
-                                        case EXT_CLASSIC:
-                                                status_mesg->ext_type = CWIID_EXT_CLASSIC;
-                                                break;
-                                        default:
+                                        buf=0x00; 
+                                        if (cwiid_write(wiimote, CWIID_RW_REG, 0xA400FB, 1, &buf)) {
+                                                cwiid_err(wiimote, "Extension initialization error");
                                                 status_mesg->ext_type = CWIID_EXT_UNKNOWN;
-                                                break;
                                         }
+                                        /* Read extension ID */
+                                        else if (cwiid_read(wiimote, CWIID_RW_REG | CWIID_RW_DECODE,
+                                                            0xA400FE, 1, &buf)) {
+                                                cwiid_err(wiimote, "Read error (extension error)");
+                                                status_mesg->ext_type = CWIID_EXT_UNKNOWN;
+                                        }
+                                        else {
+                                                switch (buf) {
+                                                case EXT_NONE:
+                                                case EXT_PARTIAL:
+                                                        status_mesg->ext_type = CWIID_EXT_NONE;
+                                                        break;
+                                                case EXT_NUNCHUK:
+                                                        status_mesg->ext_type = CWIID_EXT_NUNCHUK;
+                                                        break;
+                                                case EXT_CLASSIC:
+                                                        status_mesg->ext_type = CWIID_EXT_CLASSIC;
+                                                        break;
+                                                default:
+                                                        status_mesg->ext_type = CWIID_EXT_UNKNOWN;
+                                                        break;
+                                                }
+                                        }
                                 }
                         }
                         else {