(input/connect) Cleanups

This commit is contained in:
twinaphex 2015-04-02 18:48:44 +02:00
parent 33509d8600
commit 6433cdf2e7
3 changed files with 185 additions and 201 deletions

View File

@ -158,15 +158,6 @@ static uint64_t hidpad_ps4_get_buttons(void *data)
if (!device || !rpt)
return 0;
//RARCH_LOG("Left stick X: %d\n", rpt_ptr[0]);
//RARCH_LOG("Left stick Y: %d\n", rpt_ptr[1]);
//RARCH_LOG("Right stick X: %d\n", rpt_ptr[2]);
//RARCH_LOG("Right stick Y: %d\n", rpt_ptr[3]);
//RARCH_LOG("Digital buttons: %d\n", rpt_ptr[4]);
//RARCH_LOG("Start/share: %d\n", rpt_ptr[5]);
//RARCH_LOG("Test: %d\n", rpt_ptr[6] & 0x01);
//RARCH_LOG("L2 button: %d\n", rpt_ptr[7]);
//RARCH_LOG("R2 button: %d\n", rpt_ptr[8]);
buttonstate |= (rpt->btn.r3 ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R3) : 0);
buttonstate |= (rpt->btn.l3 ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L3) : 0);
buttonstate |= (rpt->btn.options ? (1ULL << RETRO_DEVICE_ID_JOYPAD_START) : 0);

View File

@ -169,13 +169,11 @@ typedef struct wiimote_t
#define WIIMOTE_TOGGLE_STATE(wm, s) ((wm->state & (s)) ? WIIMOTE_DISABLE_STATE(wm, s) : WIIMOTE_ENABLE_STATE(wm, s))
#define WIIMOTE_IS_CONNECTED(wm) (WIIMOTE_IS_SET(wm, WIIMOTE_STATE_CONNECTED))
#ifndef NO_BAKED_IN_WIIMOTE
/*
* Send a packet to the wiimote.
*
* This function should replace any write()s directly to the wiimote device.
*/
static int wiimote_send(struct wiimote_t* wm,
uint8_t report_type, uint8_t* msg, int len)
{
@ -606,11 +604,6 @@ static int wiimote_handshake(struct wiimote_t* wm, uint8_t event, uint8_t* data
} while(1);
}
#endif
static void* hidpad_wii_init(void *data, uint32_t slot,
send_control_t ptr)
{