From 1df24b5c5a58e2086d86d1142d478be706261517 Mon Sep 17 00:00:00 2001
From: Lysann Schlegel <lysann.kessler@gmail.com>
Date: Sat, 8 Dec 2012 18:01:29 +0100
Subject: [PATCH] conditionally compile handshake_state field

---
 src/io.c     | 3 +--
 src/wiiuse.c | 4 ++++
 src/wiiuse.h | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/io.c b/src/io.c
index 1641386..e7bb83d 100644
--- a/src/io.c
+++ b/src/io.c
@@ -205,8 +205,7 @@ void wiiuse_read(struct wiimote_t *wm, byte memory, unsigned addr, unsigned shor
  *	with this data.
  */
 
-#define SYNC_HANDSHAKE 1
-#ifdef SYNC_HANDSHAKE
+#ifndef WIIUSE_SYNC_HANDSHAKE
 
 void wiiuse_handshake(struct wiimote_t* wm, byte* data, uint16_t len)
 {
diff --git a/src/wiiuse.c b/src/wiiuse.c
index 6dc5347..062e1fd 100644
--- a/src/wiiuse.c
+++ b/src/wiiuse.c
@@ -181,7 +181,9 @@ void wiiuse_disconnected(struct wiimote_t* wm) {
 	wm->leds = 0;
 	wm->state = WIIMOTE_INIT_STATES;
 	wm->read_req = NULL;
+#ifdef WIIUSE_SYNC_HANDSHAKE
 	wm->handshake_state = 0;
+#endif
 	wm->btns = 0;
 	wm->btns_held = 0;
 	wm->btns_released = 0;
@@ -795,7 +797,9 @@ void wiiuse_set_accel_threshold(struct wiimote_t* wm, int threshold) {
 void wiiuse_resync(struct wiimote_t* wm) {
 	if (!wm)	return;
 
+#ifdef WIIUSE_SYNC_HANDSHAKE
 	wm->handshake_state = 0;
+#endif
 	wiiuse_handshake(wm, NULL, 0);
 }
 
diff --git a/src/wiiuse.h b/src/wiiuse.h
index 71b7537..9822020 100644
--- a/src/wiiuse.h
+++ b/src/wiiuse.h
@@ -322,6 +322,9 @@ typedef enum ir_position_t {
 	#define WIIMOTE_EXP_TIMEOUT			10
 #endif
 
+#define WIIUSE_SYNC_HANDSHAKE
+
+
 typedef unsigned char byte;
 typedef char sbyte;
 
@@ -756,7 +759,9 @@ typedef struct wiimote_t {
 
 	WCONST int flags;						/**< options flag							*/
 
+#ifdef WIIUSE_SYNC_HANDSHAKE
 	WCONST byte handshake_state;			/**< the state of the connection handshake	*/
+#endif
 	WCONST byte expansion_state;            /**< the state of the expansion handshake	*/
 	WCONST struct data_req_t* data_req;		/**< list of data read requests				*/