Conflicts:

	src/events.c
	src/io.c
	src/wiiuse.c
	src/wiiuse.h
This commit is contained in:
Jan Ciger
2011-09-14 09:04:58 -05:00
committed by Ryan Pavlik
parent 9b5ef23276
commit 80e8fa37ac
4 changed files with 93 additions and 3 deletions

View File

@@ -714,7 +714,8 @@ typedef struct wiimote_t {
WCONST int flags; /**< options flag */
WCONST byte handshake_state; /**< the state of the connection handshake */
WCONST unsigned char expansion_state; /**< the state of the expansion handshake */
WCONST byte expansion_state; /**< the state of the expansion handshake */
WCONST byte expansion_dattempts; /**< how many times did we wait already */
WCONST struct data_req_t* data_req; /**< list of data read requests */
WCONST struct read_req_t* read_req; /**< list of data read requests */