mirror of
https://github.com/libretro/RetroArch
synced 2025-01-30 21:32:45 +00:00
Start implementing HID polling thread
== DETAILS Looking at the other HID USB drivers, it looks like the typical implementation is to start up a background thread to do the polling, rather than wait for RA to invoke the poll() method. This commit sets up the skeleton of the background thread: - The thread gets created in init() - The thread gets stopped in free() Right now the body of the thread is a 10ms sleep. == TESTING It compiles cleanly, and links. Don't know if it actually works.
This commit is contained in:
parent
7e56881b88
commit
1657079c45
@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <malloc.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <wiiu/os.h>
|
#include <wiiu/os.h>
|
||||||
#include <wiiu/syshid.h>
|
#include <wiiu/syshid.h>
|
||||||
@ -23,10 +25,18 @@
|
|||||||
#include "../input_defines.h"
|
#include "../input_defines.h"
|
||||||
#include "../input_driver.h"
|
#include "../input_driver.h"
|
||||||
|
|
||||||
|
#define POLL_THREAD_SLEEP 10000
|
||||||
|
|
||||||
|
#define DEVICE_UNUSED 0
|
||||||
|
#define DEVICE_USED 1
|
||||||
|
|
||||||
typedef struct wiiu_hid
|
typedef struct wiiu_hid
|
||||||
{
|
{
|
||||||
void *empty;
|
|
||||||
HIDClient *client;
|
HIDClient *client;
|
||||||
|
OSThread *polling_thread;
|
||||||
|
// memory accounting; keep a pointer to the stack buffer so we can clean up later.
|
||||||
|
void *polling_thread_stack;
|
||||||
|
volatile bool polling_thread_quit;
|
||||||
} wiiu_hid_t;
|
} wiiu_hid_t;
|
||||||
|
|
||||||
typedef struct wiiu_hid_user
|
typedef struct wiiu_hid_user
|
||||||
@ -41,7 +51,11 @@ static void delete_wiiu_hid_t(wiiu_hid_t *hid);
|
|||||||
static HIDClient *new_hidclient(void);
|
static HIDClient *new_hidclient(void);
|
||||||
static void delete_hidclient(HIDClient *hid);
|
static void delete_hidclient(HIDClient *hid);
|
||||||
|
|
||||||
int32_t wiiu_attach_callback(HIDClient *client, HIDDevice *device, uint32_t attach);
|
static int32_t wiiu_attach_callback(HIDClient *client, HIDDevice *device, uint32_t attach);
|
||||||
|
static void start_polling_thread(wiiu_hid_t *hid);
|
||||||
|
static void stop_polling_thread(wiiu_hid_t *hid);
|
||||||
|
static int wiiu_hid_polling_thread(int argc, const char **argv);
|
||||||
|
static void wiiu_hid_do_poll(wiiu_hid_t *hid);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HID driver entrypoints registered with hid_driver_t
|
* HID driver entrypoints registered with hid_driver_t
|
||||||
@ -102,14 +116,20 @@ static void *wiiu_hid_init(void)
|
|||||||
if(!hid || !client)
|
if(!hid || !client)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
|
start_polling_thread(hid);
|
||||||
|
if(hid->polling_thread == NULL)
|
||||||
|
goto error;
|
||||||
|
|
||||||
HIDAddClient(client, wiiu_attach_callback);
|
HIDAddClient(client, wiiu_attach_callback);
|
||||||
hid->client = client;
|
hid->client = client;
|
||||||
|
|
||||||
return hid;
|
return hid;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
if(hid)
|
if(hid) {
|
||||||
|
stop_polling_thread(hid);
|
||||||
delete_wiiu_hid_t(hid);
|
delete_wiiu_hid_t(hid);
|
||||||
|
}
|
||||||
if(client)
|
if(client)
|
||||||
free(client);
|
free(client);
|
||||||
|
|
||||||
@ -121,22 +141,92 @@ static void wiiu_hid_free(void *data)
|
|||||||
wiiu_hid_t *hid = (wiiu_hid_t*)data;
|
wiiu_hid_t *hid = (wiiu_hid_t*)data;
|
||||||
|
|
||||||
if (hid) {
|
if (hid) {
|
||||||
|
stop_polling_thread(hid);
|
||||||
delete_wiiu_hid_t(hid);
|
delete_wiiu_hid_t(hid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is a no-op because polling is done with a worker thread.
|
||||||
|
*/
|
||||||
static void wiiu_hid_poll(void *data)
|
static void wiiu_hid_poll(void *data)
|
||||||
{
|
{
|
||||||
(void)data;
|
(void)data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation functions
|
||||||
|
*/
|
||||||
|
|
||||||
|
static void start_polling_thread(wiiu_hid_t *hid) {
|
||||||
|
OSThreadAttributes attributes = OS_THREAD_ATTRIB_AFFINITY_CPU2 |
|
||||||
|
OS_THREAD_ATTRIB_DETACHED |
|
||||||
|
OS_THREAD_ATTRIB_STACK_USAGE;
|
||||||
|
int32_t stack_size = 0x8000;
|
||||||
|
// wild-ass guess. the patcher thread used 28 for the network threads (10 for BOTW).
|
||||||
|
int32_t priority = 19;
|
||||||
|
OSThread *thread = memalign(8, sizeof(OSThread));
|
||||||
|
void *stack = memalign(32, stack_size);
|
||||||
|
|
||||||
|
if(!thread || !stack)
|
||||||
|
goto error;
|
||||||
|
|
||||||
|
if(!OSCreateThread(thread, wiiu_hid_polling_thread, 1, (char *)hid, stack, stack_size, priority, attributes))
|
||||||
|
goto error;
|
||||||
|
|
||||||
|
hid->polling_thread = thread;
|
||||||
|
hid->polling_thread_stack = stack;
|
||||||
|
return;
|
||||||
|
|
||||||
|
error:
|
||||||
|
if(stack)
|
||||||
|
free(stack);
|
||||||
|
if(thread)
|
||||||
|
free(thread);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void stop_polling_thread(wiiu_hid_t *hid) {
|
||||||
|
int thread_result = 0;
|
||||||
|
|
||||||
|
if(hid == NULL || hid->polling_thread == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
hid->polling_thread_quit = true;
|
||||||
|
OSJoinThread(hid->polling_thread, &thread_result);
|
||||||
|
|
||||||
|
free(hid->polling_thread);
|
||||||
|
free(hid->polling_thread_stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Entrypoint for the polling thread.
|
||||||
|
*/
|
||||||
|
static int wiiu_hid_polling_thread(int argc, const char **argv) {
|
||||||
|
wiiu_hid_t *hid = (wiiu_hid_t *)argv;
|
||||||
|
while(!hid->polling_thread_quit) {
|
||||||
|
wiiu_hid_do_poll(hid);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Only call this from the polling thread.
|
||||||
|
*/
|
||||||
|
static void wiiu_hid_do_poll(wiiu_hid_t *hid) {
|
||||||
|
usleep(POLL_THREAD_SLEEP);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Callbacks
|
* Callbacks
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int32_t wiiu_attach_callback(HIDClient *client, HIDDevice *device, uint32_t attach) {
|
int32_t wiiu_attach_callback(HIDClient *client, HIDDevice *device, uint32_t attach) {
|
||||||
switch(attach) {
|
|
||||||
int32_t result = DEVICE_UNUSED;
|
int32_t result = DEVICE_UNUSED;
|
||||||
|
|
||||||
|
switch(attach) {
|
||||||
case HID_DEVICE_ATTACH:
|
case HID_DEVICE_ATTACH:
|
||||||
// TODO: new device attached! Register it.
|
// TODO: new device attached! Register it.
|
||||||
break;
|
break;
|
||||||
@ -207,10 +297,10 @@ static void delete_hidclient(HIDClient *client) {
|
|||||||
static wiiu_hid_user_t *new_wiiu_hid_user_t(void) {
|
static wiiu_hid_user_t *new_wiiu_hid_user_t(void) {
|
||||||
wiiu_hid_user_t *user = calloc(1, sizeof(wiiu_hid_user_t));
|
wiiu_hid_user_t *user = calloc(1, sizeof(wiiu_hid_user_t));
|
||||||
if(user != NULL) {
|
if(user != NULL) {
|
||||||
memset(client, 0, sizeof(wiiu_hid_user_t));
|
memset(user, 0, sizeof(wiiu_hid_user_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
return client;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void delete_wiiu_hid_user_t(wiiu_hid_user_t *user) {
|
static void delete_wiiu_hid_user_t(wiiu_hid_user_t *user) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user