From 05333fcc0a21afabb107e05d400acd091765bac7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 7 Jan 2013 04:40:39 +0100 Subject: [PATCH] (Wiiuse) comment out some checks --- wii/wiiuse/events.c | 6 +----- wii/wiiuse/wiiuse.c | 4 ++-- wii/wiiuse/wpad.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/wii/wiiuse/events.c b/wii/wiiuse/events.c index 85b1768040..94671c6956 100644 --- a/wii/wiiuse/events.c +++ b/wii/wiiuse/events.c @@ -80,14 +80,10 @@ static void event_ack(struct wiimote_t *wm,ubyte *msg) wiiuse_pressed_buttons(wm,msg); - if(!cmd || cmd->state!=CMD_SENT || cmd->data[0]==WM_CMD_READ_DATA || cmd->data[0]==WM_CMD_CTRL_STATUS || cmd->data[0]!=msg[2]) { + if(!cmd || cmd->state!=CMD_SENT || cmd->data[0]==WM_CMD_READ_DATA || cmd->data[0]==WM_CMD_CTRL_STATUS || cmd->data[0]!=msg[2] || msg[3]) { //WIIUSE_WARNING("Unsolicited event ack: report %02x status %02x", msg[2], msg[3]); return; } - if(msg[3]) { - //WIIUSE_WARNING("Command %02x %02x failed: status %02x", cmd->data[0], cmd->data[1], msg[3]); - return; - } //WIIUSE_DEBUG("Received ack for command %02x %02x", cmd->data[0], cmd->data[1]); diff --git a/wii/wiiuse/wiiuse.c b/wii/wiiuse/wiiuse.c index 43d43f0118..659b3892f7 100644 --- a/wii/wiiuse/wiiuse.c +++ b/wii/wiiuse/wiiuse.c @@ -26,11 +26,11 @@ void wiiuse_send_next_command(struct wiimote_t *wm) cmd->state = CMD_SENT; if(WIIMOTE_IS_SET(wm,WIIMOTE_STATE_RUMBLE)) cmd->data[1] |= 0x01; - WIIUSE_DEBUG("Sending command: %02x %02x", cmd->data[0], cmd->data[1]); + //WIIUSE_DEBUG("Sending command: %02x %02x", cmd->data[0], cmd->data[1]); wiiuse_io_write(wm,cmd->data,cmd->len); } -static __inline__ void __wiiuse_push_command(struct wiimote_t *wm,struct cmd_blk_t *cmd) +static inline void __wiiuse_push_command(struct wiimote_t *wm,struct cmd_blk_t *cmd) { uint level; diff --git a/wii/wiiuse/wpad.c b/wii/wiiuse/wpad.c index 1f1c067114..b017af6689 100644 --- a/wii/wiiuse/wpad.c +++ b/wii/wiiuse/wpad.c @@ -657,7 +657,7 @@ s32 WPAD_ReadEvent(s32 chan, WPADData *data) struct _wpad_cb *wpdcb = NULL; WPADData *lstate = NULL,*wpadd = NULL; - if(chan=WPAD_MAX_WIIMOTES) return WPAD_ERR_BAD_CHANNEL; + //if(chan=WPAD_MAX_WIIMOTES) return WPAD_ERR_BAD_CHANNEL; _CPU_ISR_Disable(level); if(__wpads_inited==WPAD_STATE_DISABLED) {