ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(connect_wii.c) Dehardcode some magic numbers

This commit is contained in:
twinaphex 2015-04-03 02:56:37 +02:00
parent 7665226f4c
commit e7c7b55004
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
input/connect/connect_wii.c
View File

@ -95,6 +95,9 @@
#define EXP_NONE 0 #define EXP_NONE 0
#define EXP_CLASSIC 2 #define EXP_CLASSIC 2
#define IDENT_NUNCHUK 0xA4200000
#define IDENT_CC 0xA4200101
typedef struct axis_t typedef struct axis_t
{ {
bool has_center; bool has_center;
@ -309,7 +312,7 @@ static void classic_ctrl_event(struct classic_ctrl_t* cc, uint8_t* msg)
wiimote_process_axis(&cc->ljs.x, (msg[0] & 0x3F)); wiimote_process_axis(&cc->ljs.x, (msg[0] & 0x3F));
wiimote_process_axis(&cc->ljs.y, (msg[1] & 0x3F)); wiimote_process_axis(&cc->ljs.y, (msg[1] & 0x3F));
wiimote_process_axis(&cc->rjs.x, ((msg[0] & 0xC0) >> 3) | wiimote_process_axis(&cc->rjs.x, ((msg[0] & 0xC0) >> 3) |
((msg[1] & 0xC0) >> 5) | ((msg[2] & 0x80) >> 7)); ((msg[1] & 0xC0) >> 5) | ((msg[2] & 0x80) >> 7));
wiimote_process_axis(&cc->rjs.y, (msg[2] & 0x1F)); wiimote_process_axis(&cc->rjs.y, (msg[2] & 0x1F));
} }
@ -554,20 +557,20 @@ static int wiimote_handshake(struct wiimote_t* wm,
#endif #endif
/* EXP_ID_CODE_CLASSIC_CONTROLLER */ /* EXP_ID_CODE_CLASSIC_CONTROLLER */
if(id != 0xa4200101) switch (id)
{ {
wm->handshake_state = 2; case IDENT_CC:
rarch_sleep(100);
/* pedimos datos de calibracion del JOY! */
wiimote_read_data(wm, WM_EXP_MEM_CALIBR, 16);
wm->handshake_state = 5;
break;
default:
wm->handshake_state = 2;
#if 0 #if 0
WIIMOTE_DISABLE_STATE(wm, WIIMOTE_STATE_EXP); WIIMOTE_DISABLE_STATE(wm, WIIMOTE_STATE_EXP);
#endif #endif
continue; continue;
}
else
{
rarch_sleep(100);
/* pedimos datos de calibracion del JOY! */
wiimote_read_data(wm, WM_EXP_MEM_CALIBR, 16);
wm->handshake_state = 5;
} }
} }
return 0; return 0;