From 93942949560bcea4d00bed6881781b992b02fcae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 12 Dec 2015 18:30:17 +0100 Subject: [PATCH] (joypad_connection) Stub Wii U Pro implementation - untested --- Makefile.common | 3 +- griffin/griffin.c | 1 + input/connect/connect_wiiupro.c | 200 ++++++++++++++++++++++++++++++ input/connect/joypad_connection.c | 4 +- input/connect/joypad_connection.h | 1 + 5 files changed, 205 insertions(+), 4 deletions(-) create mode 100644 input/connect/connect_wiiupro.c diff --git a/Makefile.common b/Makefile.common index 0878272c7b..8794ec6f03 100644 --- a/Makefile.common +++ b/Makefile.common @@ -552,7 +552,8 @@ ifeq ($(HAVE_HID), 1) OBJ += input/connect/joypad_connection.o \ input/connect/connect_ps3.o \ input/connect/connect_ps4.o \ - input/connect/connect_wii.o + input/connect/connect_wii.o \ + input/connect/connect_wiiupro.o endif ifeq ($(HAVE_PARPORT), 1) diff --git a/griffin/griffin.c b/griffin/griffin.c index 7a0244108a..a73b483b1d 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -421,6 +421,7 @@ INPUT (HID) #include "../input/connect/connect_ps3.c" #include "../input/connect/connect_ps4.c" #include "../input/connect/connect_wii.c" +#include "../input/connect/connect_wiiupro.c" #endif /*============================================================ diff --git a/input/connect/connect_wiiupro.c b/input/connect/connect_wiiupro.c new file mode 100644 index 0000000000..f6c3ff60cf --- /dev/null +++ b/input/connect/connect_wiiupro.c @@ -0,0 +1,200 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2013-2014 - Jason Fetters + * Copyright (C) 2014-2015 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include +#include +#include + +#include + +#include "../../driver.h" +#include "joypad_connection.h" + +struct wiiupro_buttons +{ + uint8_t a; + uint8_t b; + uint8_t x; + uint8_t y; + uint8_t l; + uint8_t r; + uint8_t zl; + uint8_t zr; + uint8_t minus; + uint8_t plus; + uint8_t l3; + uint8_t r3; + uint8_t home; + + /* D-Pad */ + uint8_t left; + uint8_t right; + uint8_t up; + uint8_t down; +}__attribute__((packed)); + +struct wiiupro +{ + uint8_t hatvalue[4]; + struct wiiupro_buttons btn; +}; + +struct hidpad_wiiupro_data +{ + struct pad_connection* connection; + send_control_t send_control; + struct wiiupro data; + uint32_t slot; + bool have_led; + uint16_t motors[2]; +}; + +static void hidpad_wiiupro_send_control(struct hidpad_wiiupro_data* device) +{ + /* 0x15 - Request status */ + static uint8_t report_buffer[4] = { 0xA2, 0x15, 0x00 }; + device->send_control(device->connection, report_buffer, sizeof(report_buffer)); +} + +static void* hidpad_wiiupro_init(void *data, uint32_t slot, send_control_t ptr) +{ + struct pad_connection* connection = (struct pad_connection*)data; + struct hidpad_wiiupro_data* device = (struct hidpad_wiiupro_data*) + calloc(1, sizeof(struct hidpad_wiiupro_data)); + + if (!device) + goto error; + + if (!connection) + goto error; + + device->connection = connection; + device->slot = slot; + device->send_control = ptr; + + /* Without this, the digital buttons won't be reported. */ + hidpad_wiiupro_send_control(device); + + return device; + +error: + if (device) + free(device); + return NULL; +} + +static void hidpad_wiiupro_deinit(void *data) +{ + struct hidpad_wiiupro_data *device = (struct hidpad_wiiupro_data*)data; + + if (device) + free(device); +} + +static uint64_t hidpad_wiiupro_get_buttons(void *data) +{ + uint64_t buttonstate = 0; + struct hidpad_wiiupro_data *device = (struct hidpad_wiiupro_data*)data; + struct wiiupro *rpt = device ? (struct wiiupro*)&device->data : NULL; + + if (!device || !rpt) + return 0; + + buttonstate |= (rpt->btn.r3 ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R3) : 0); + buttonstate |= (rpt->btn.l3 ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L3) : 0); + buttonstate |= (rpt->btn.plus ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_START) : 0); + buttonstate |= (rpt->btn.minus ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_SELECT) : 0); + buttonstate |= (rpt->btn.zr ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R2) : 0); + buttonstate |= (rpt->btn.zl ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L2) : 0); + buttonstate |= (rpt->btn.r ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R) : 0); + buttonstate |= (rpt->btn.l ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L) : 0); + + buttonstate |= (rpt->btn.x ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_X) : 0); + buttonstate |= (rpt->btn.a ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_A) : 0); + buttonstate |= (rpt->btn.b ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_B) : 0); + buttonstate |= (rpt->btn.y ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_Y) : 0); + buttonstate |= (rpt->btn.left ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0); + buttonstate |= (rpt->btn.right ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0); + buttonstate |= (rpt->btn.up ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_UP) : 0); + buttonstate |= (rpt->btn.down ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0); + buttonstate |= (rpt->btn.home ? (UINT64_C(1) << RARCH_MENU_TOGGLE) : 0); + + return buttonstate; +} + +static int16_t hidpad_wiiupro_get_axis(void *data, unsigned axis) +{ + /* stub out for now */ + + return 0; +} + +static void hidpad_wiiupro_packet_handler(void *data, uint8_t *packet, uint16_t size) +{ + struct hidpad_wiiupro_data *device = (struct hidpad_wiiupro_data*)data; + + if (!device) + return; + +#if 0 + if (!device->have_led) + { + hidpad_wiiupro_send_control(device); + device->have_led = true; + } +#endif + + packet[0x0C] ^= 0xFF; + packet[0x0D] ^= 0xFF; + packet[0x0E] ^= 0xFF; + + memset(&device->data, 0, sizeof(struct wiiupro)); + + device->data.btn.b = (packet[0x0D] & 0x40); + device->data.btn.a = (packet[0x0D] & 0x10); + device->data.btn.y = (packet[0x0D] & 0x20); + device->data.btn.x = (packet[0x0D] & 0x08); + device->data.btn.l = (packet[0x0C] & 0x20); + device->data.btn.r = (packet[0x0C] & 0x02); + device->data.btn.zl = (packet[0x0D] & 0x80); + device->data.btn.zr = (packet[0x0D] & 0x04); + device->data.btn.minus = (packet[0x0C] & 0x10); + device->data.btn.plus = (packet[0x0C] & 0x04); + device->data.btn.l3 = (packet[0x0E] & 0x02); + device->data.btn.r3 = (packet[0x0E] & 0x01); + + device->data.btn.left = (packet[0x0D] & 0x02); + device->data.btn.right = (packet[0x0C] & 0x80); + device->data.btn.up = (packet[0x0D] & 0x01); + device->data.btn.down = (packet[0x0C] & 0x40); + + device->data.btn.home = (packet[0x0C] & 0x8); +} + +static void hidpad_wiiupro_set_rumble(void *data, + enum retro_rumble_effect effect, uint16_t strength) +{ + /* TODO */ +} + +pad_connection_interface_t pad_connection_wiiupro = { + hidpad_wiiupro_init, + hidpad_wiiupro_deinit, + hidpad_wiiupro_packet_handler, + hidpad_wiiupro_set_rumble, + hidpad_wiiupro_get_buttons, + hidpad_wiiupro_get_axis, +}; diff --git a/input/connect/joypad_connection.c b/input/connect/joypad_connection.c index d9d24e1a28..6a971df3fa 100644 --- a/input/connect/joypad_connection.c +++ b/input/connect/joypad_connection.c @@ -82,9 +82,7 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn, } pad_map[] = { { "Nintendo RVL-CNT-01", 1406, 816, &pad_connection_wii }, -#if 0 - { "Nintendo RVL-CNT-01-UC", 0, 0, &pad_connection_wii_u }, -#endif + { "Nintendo RVL-CNT-01-UC", 0, 0, &pad_connection_wiiupro }, { "Wireless Controller", 1356, 1476, &pad_connection_ps4 }, { "PLAYSTATION(R)3 Controller", 1356, 616, &pad_connection_ps3 }, { 0, 0} diff --git a/input/connect/joypad_connection.h b/input/connect/joypad_connection.h index 60afc1bc04..8db8ba9b35 100644 --- a/input/connect/joypad_connection.h +++ b/input/connect/joypad_connection.h @@ -45,6 +45,7 @@ typedef struct pad_connection_interface typedef struct joypad_connection joypad_connection_t; extern pad_connection_interface_t pad_connection_wii; +extern pad_connection_interface_t pad_connection_wiiupro; extern pad_connection_interface_t pad_connection_ps3; extern pad_connection_interface_t pad_connection_ps4;