mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-10 16:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input/connect) Use calloc for setting DualShock3 struct

Browse Source
This commit is contained in:
LibretroAdmin 2022-09-09 19:21:56 +02:00
parent a665498775
commit 4cd63c20f4
7 changed files with 77 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
input/connect/connect_ps2adapter.c
View File

@ -30,7 +30,8 @@ struct hidpad_ps2adapter_data
uint32_t buttons; uint32_t buttons;
}; };
static void* hidpad_ps2adapter_init(void *data, uint32_t slot, hid_driver_t *driver) static void* hidpad_ps2adapter_init(void *data, uint32_t slot,
hid_driver_t *driver)
{ {
struct pad_connection* connection = (struct pad_connection*)data; struct pad_connection* connection = (struct pad_connection*)data;
struct hidpad_ps2adapter_data* device = (struct hidpad_ps2adapter_data*) struct hidpad_ps2adapter_data* device = (struct hidpad_ps2adapter_data*)
@ -45,8 +46,8 @@ static void* hidpad_ps2adapter_init(void *data, uint32_t slot, hid_driver_t *dri
return NULL; return NULL;
} }
device->connection = connection;
device->slot = slot; device->slot = slot;
device->connection = connection;
return device; return device;
} }

106
input/connect/connect_ps3.c
View File

@ -30,7 +30,7 @@
typedef struct ds3_instance typedef struct ds3_instance
{ {
hid_driver_t *hid_driver; hid_driver_t *driver;
void *handle; void *handle;
int slot; int slot;
bool led_set; bool led_set;
@ -40,7 +40,8 @@ typedef struct ds3_instance
uint8_t data[64]; uint8_t data[64];
} ds3_instance_t; } ds3_instance_t;
struct __attribute__((__packed__)) sixaxis_led { struct __attribute__((__packed__)) sixaxis_led
{
uint8_t time_enabled; /* the total time the led is active (0xff means forever) */ uint8_t time_enabled; /* the total time the led is active (0xff means forever) */
uint8_t duty_length; /* how long a cycle is in deciseconds (0 means "really fast") */ uint8_t duty_length; /* how long a cycle is in deciseconds (0 means "really fast") */
uint8_t enabled; uint8_t enabled;
@ -48,14 +49,16 @@ struct __attribute__((__packed__)) sixaxis_led {
uint8_t duty_on; /* % of duty_length the led is on (0xff mean 100%) */ uint8_t duty_on; /* % of duty_length the led is on (0xff mean 100%) */
}; };
struct __attribute__((__packed__)) sixaxis_rumble { struct __attribute__((__packed__)) sixaxis_rumble
{
uint8_t right_duration; /* Right motor duration (0xff means forever) */ uint8_t right_duration; /* Right motor duration (0xff means forever) */
uint8_t right_motor_on; /* Right (small) motor on/off, only supports values of 0 or 1 (off/on) */ uint8_t right_motor_on; /* Right (small) motor on/off, only supports values of 0 or 1 (off/on) */
uint8_t left_duration; /* Left motor duration (0xff means forever) */ uint8_t left_duration; /* Left motor duration (0xff means forever) */
uint8_t left_motor_force; /* left (large) motor, supports force values from 0 to 255 */ uint8_t left_motor_force; /* left (large) motor, supports force values from 0 to 255 */
}; };
struct __attribute__((__packed__)) sixaxis_output_report { struct __attribute__((__packed__)) sixaxis_output_report
{
uint8_t report_id; uint8_t report_id;
uint8_t padding1; uint8_t padding1;
struct sixaxis_rumble rumble; struct sixaxis_rumble rumble;
@ -66,17 +69,20 @@ struct __attribute__((__packed__)) sixaxis_output_report {
uint8_t unknown[13]; uint8_t unknown[13];
}; };
struct __attribute__((__packed__)) sixaxis_activation_report { struct __attribute__((__packed__)) sixaxis_activation_report
{
uint8_t report_id; uint8_t report_id;
uint8_t unknown[4]; uint8_t unknown[4];
}; };
union sixaxis_activation_report_f4 { union sixaxis_activation_report_f4
{
uint8_t buf[5]; uint8_t buf[5];
struct sixaxis_activation_report data; struct sixaxis_activation_report data;
}; };
union sixaxis_output_report_01 { union sixaxis_output_report_01
{
uint8_t buf[49]; uint8_t buf[49];
struct sixaxis_output_report data; struct sixaxis_output_report data;
}; };
@ -112,16 +118,16 @@ static void ds3_update_analog_state(ds3_instance_t *instance);
static void *ds3_init(void *handle, uint32_t slot, hid_driver_t *driver) static void *ds3_init(void *handle, uint32_t slot, hid_driver_t *driver)
{ {
ds3_instance_t *instance = (ds3_instance_t *)malloc(sizeof(ds3_instance_t)); ds3_instance_t *instance = (ds3_instance_t *)calloc(1, sizeof(ds3_instance_t));
if(!instance) if(!instance)
return NULL; return NULL;
instance->handle = handle; instance->handle = handle;
instance->hid_driver = driver; instance->driver = driver;
instance->slot = slot; instance->slot = slot;
if(instance->hid_driver->set_protocol) if(instance->driver->set_protocol)
instance->hid_driver->set_protocol(instance->handle, 1); instance->driver->set_protocol(instance->handle, 1);
if (ds3_send_output_report(instance) < 0) if (ds3_send_output_report(instance) < 0)
{ {
@ -135,21 +141,22 @@ static void *ds3_init(void *handle, uint32_t slot, hid_driver_t *driver)
goto error; goto error;
} }
return instance; return instance;
error: error:
free(instance); free(instance);
return NULL; return NULL;
} }
static void ds3_deinit(void *device_data) { static void ds3_deinit(void *device_data)
if(device_data) { {
if(device_data)
free(device_data); free(device_data);
}
} }
static void ds3_packet_handler(void *device_data, uint8_t *packet, uint16_t size) { static void ds3_packet_handler(void *device_data,
ds3_instance_t *device = (ds3_instance_t *)device_data; uint8_t *packet, uint16_t size)
{
ds3_instance_t *device = (ds3_instance_t *)device_data;
static long packet_count = 0; static long packet_count = 0;
if(!device) if(!device)
@ -164,7 +171,7 @@ static void ds3_packet_handler(void *device_data, uint8_t *packet, uint16_t size
if (size > sizeof(device->data)) if (size > sizeof(device->data))
{ {
RARCH_ERR("[ds3]: Expecting packet to be %ld but was %d\n", RARCH_ERR("[ds3]: Expecting packet to be %ld but was %d\n",
(long)sizeof(device->data), size); (long)sizeof(device->data), size);
return; return;
} }
packet_count++; packet_count++;
@ -179,11 +186,12 @@ static void ds3_packet_handler(void *device_data, uint8_t *packet, uint16_t size
ds3_update_analog_state(device); ds3_update_analog_state(device);
} }
static void ds3_set_rumble(void *device_data, enum retro_rumble_effect effect, uint16_t strength) { static void ds3_set_rumble(void *device_data, enum retro_rumble_effect effect, uint16_t strength)
{
} }
static void ds3_get_buttons(void *device_data, input_bits_t *state) { static void ds3_get_buttons(void *device_data, input_bits_t *state)
{
ds3_instance_t *device = (ds3_instance_t *)device_data; ds3_instance_t *device = (ds3_instance_t *)device_data;
if (device) if (device)
{ {
@ -194,32 +202,34 @@ static void ds3_get_buttons(void *device_data, input_bits_t *state) {
BIT256_CLEAR_ALL_PTR(state); BIT256_CLEAR_ALL_PTR(state);
} }
static int16_t ds3_get_axis(void *device_data, unsigned axis) { static int16_t ds3_get_axis(void *device_data, unsigned axis)
union joyaxis { {
union joyaxis
{
uint32_t encoded; uint32_t encoded;
int16_t axis[2]; int16_t axis[2];
} joyaxis; } joyaxis;
axis_data axis_data = {0}; axis_data axis_data = {0};
ds3_instance_t *device = (ds3_instance_t *)device_data; ds3_instance_t *device = (ds3_instance_t *)device_data;
joyaxis.encoded = axis; joyaxis.encoded = axis;
gamepad_read_axis_data(axis, &axis_data); gamepad_read_axis_data(axis, &axis_data);
if (!device || axis_data.axis >= 4) if (!device || axis_data.axis >= 4)
return 0; return 0;
if(joyaxis.axis[0] < 0 || joyaxis.axis[1] < 0) { if(joyaxis.axis[0] < 0 || joyaxis.axis[1] < 0)
return gamepad_get_axis_value(device->analog_state, &axis_data); return gamepad_get_axis_value(device->analog_state, &axis_data);
} else { return gamepad_get_axis_value_raw(device->analog_state, &axis_data, false);
return gamepad_get_axis_value_raw(device->analog_state, &axis_data, false);
}
} }
static const char *ds3_get_name(void *device_data) { static const char *ds3_get_name(void *device_data)
{
return "PLAYSTATION(R)3 Controller"; return "PLAYSTATION(R)3 Controller";
} }
static int32_t ds3_button(void *device_data, uint16_t joykey) { static int32_t ds3_button(void *device_data, uint16_t joykey)
{
ds3_instance_t *device = (ds3_instance_t *)device_data; ds3_instance_t *device = (ds3_instance_t *)device_data;
if (!device || joykey > 31) if (!device || joykey > 31)
@ -231,12 +241,12 @@ static int ds3_set_operational(ds3_instance_t *instance)
{ {
int ret; int ret;
const int buf_size = SIXAXIS_REPORT_0xF2_SIZE; const int buf_size = SIXAXIS_REPORT_0xF2_SIZE;
uint8_t *buf = (uint8_t *)malloc(buf_size); uint8_t *buf = (uint8_t *)malloc(buf_size);
if(!buf) if(!buf)
return -1; return -1;
ret = instance->hid_driver->set_report(instance->handle, HID_REPORT_FEATURE, ds3_activation_packet.data.report_id, (uint8_t*)ds3_activation_packet.buf, sizeof(ds3_activation_packet)); ret = instance->driver->set_report(instance->handle, HID_REPORT_FEATURE, ds3_activation_packet.data.report_id, (uint8_t*)ds3_activation_packet.buf, sizeof(ds3_activation_packet));
if(ret < 0) if(ret < 0)
RARCH_LOG("Failed to send activation packet\n"); RARCH_LOG("Failed to send activation packet\n");
@ -244,9 +254,11 @@ static int ds3_set_operational(ds3_instance_t *instance)
return ret; return ret;
} }
static uint8_t get_leds(unsigned slot) { static uint8_t get_leds(unsigned slot)
{
unsigned pad_number = slot+1; unsigned pad_number = slot+1;
switch(pad_number) { switch(pad_number)
{
case 1: case 1:
case 2: case 2:
case 3: case 3:
@ -268,15 +280,16 @@ static uint8_t get_leds(unsigned slot) {
} }
} }
static int ds3_send_output_report(ds3_instance_t *instance) { static int ds3_send_output_report(ds3_instance_t *instance)
{
struct sixaxis_output_report report = {0}; struct sixaxis_output_report report = {0};
uint8_t *packet = (uint8_t *)&report; uint8_t *packet = (uint8_t *)&report;
/* Initialize the report with default values */ /* Initialize the report with default values */
memcpy(&report, &default_report, sizeof(struct sixaxis_output_report)); memcpy(&report, &default_report, sizeof(struct sixaxis_output_report));
report.leds_bitmap = get_leds(instance->slot); report.leds_bitmap = get_leds(instance->slot);
return instance->hid_driver->set_report(instance->handle, HID_REPORT_OUTPUT, report.report_id, packet, sizeof(report)); return instance->driver->set_report(instance->handle, HID_REPORT_OUTPUT, report.report_id, packet, sizeof(report));
} }
static void ds3_update_pad_state(ds3_instance_t *instance) static void ds3_update_pad_state(ds3_instance_t *instance)
@ -306,9 +319,10 @@ static void ds3_update_pad_state(ds3_instance_t *instance)
instance->buttons = 0; instance->buttons = 0;
pressed_keys = instance->data[2] | pressed_keys =
(instance->data[3] << 8) | instance->data[2]
((instance->data[4] & 0x01) << 16); | (instance->data[3] << 8)
| ((instance->data[4] & 0x01) << 16);
for (i = 0; i < 17; i++) for (i = 0; i < 17; i++)
instance->buttons |= (pressed_keys & (1 << i)) ? instance->buttons |= (pressed_keys & (1 << i)) ?
@ -318,17 +332,15 @@ static void ds3_update_pad_state(ds3_instance_t *instance)
static void ds3_update_analog_state(ds3_instance_t *instance) static void ds3_update_analog_state(ds3_instance_t *instance)
{ {
int pad_axis; int pad_axis;
int16_t interpolated;
unsigned stick, axis;
for (pad_axis = 0; pad_axis < 4; pad_axis++) for (pad_axis = 0; pad_axis < 4; pad_axis++)
{ {
axis = (pad_axis % 2) ? 0 : 1; unsigned axis = (pad_axis % 2) ? 0 : 1;
stick = pad_axis / 2; unsigned stick = pad_axis / 2;
interpolated = instance->data[6 + pad_axis]; int16_t interpolated = instance->data[6 + pad_axis];
/* libretro requires "up" to be negative, so we invert the y axis */ /* libretro requires "up" to be negative, so we invert the y axis */
interpolated = (axis) ? interpolated = (axis) ?
((interpolated - 128) * 256) : ((interpolated - 128) * 256) :
((interpolated - 128) * -256); ((interpolated - 128) * -256);
instance->analog_state[stick][axis] = interpolated; instance->analog_state[stick][axis] = interpolated;

6
input/connect/connect_ps4.c
View File

@ -142,8 +142,12 @@ static void* hidpad_ps4_init(void *data, uint32_t slot, hid_driver_t *driver)
goto error; goto error;
device->connection = connection; device->connection = connection;
device->slot = slot;
device->driver = driver; device->driver = driver;
device->slot = slot;
driver->motors[0] = 0;
driver->motors[1] = 0;
driver->data = 0;
driver->have_led = false;
#if 0 #if 0
/* TODO - unsure of this */ /* TODO - unsure of this */

3
input/connect/connect_ps4_hori_mini.c
View File

@ -30,7 +30,8 @@ struct hidpad_ps4_hori_mini_data
uint8_t data[512]; uint8_t data[512];
}; };
static void* hidpad_ps4_hori_mini_init(void *data, uint32_t slot, hid_driver_t *driver) static void* hidpad_ps4_hori_mini_init(void *data, uint32_t slot,
hid_driver_t *driver)
{ {
struct pad_connection *connection = (struct pad_connection*)data; struct pad_connection *connection = (struct pad_connection*)data;
struct hidpad_ps4_hori_mini_data *device = struct hidpad_ps4_hori_mini_data *device =

4
input/connect/connect_snesusb.c
View File

@ -33,8 +33,8 @@ struct hidpad_snesusb_data
static void* hidpad_snesusb_init(void *data, uint32_t slot, hid_driver_t *driver) static void* hidpad_snesusb_init(void *data, uint32_t slot, hid_driver_t *driver)
{ {
struct pad_connection* connection = (struct pad_connection*)data; struct pad_connection* connection = (struct pad_connection*)data;
struct hidpad_snesusb_data* device = (struct hidpad_snesusb_data*) struct hidpad_snesusb_data* device = (struct hidpad_snesusb_data*)
calloc(1, sizeof(struct hidpad_snesusb_data)); calloc(1, sizeof(struct hidpad_snesusb_data));
if (!device) if (!device)

2
input/connect/connect_wii.c
View File

@ -580,7 +580,7 @@ static void hidpad_wii_deinit(void *data)
static void* hidpad_wii_init(void *data, uint32_t slot, static void* hidpad_wii_init(void *data, uint32_t slot,
hid_driver_t *driver) hid_driver_t *driver)
{ {
struct pad_connection *connection = (struct pad_connection*)data; struct pad_connection *connection = (struct pad_connection*)data;
struct connect_wii_wiimote_t *device = (struct connect_wii_wiimote_t*) struct connect_wii_wiimote_t *device = (struct connect_wii_wiimote_t*)
calloc(1, sizeof(struct connect_wii_wiimote_t)); calloc(1, sizeof(struct connect_wii_wiimote_t));

11
input/connect/connect_wiiupro.c
View File

@ -53,7 +53,6 @@ struct wiiupro
struct wiiupro_buttons btn; struct wiiupro_buttons btn;
}; };
struct hidpad_wiiupro_data struct hidpad_wiiupro_data
{ {
struct pad_connection* connection; struct pad_connection* connection;
@ -80,8 +79,8 @@ static void hidpad_wiiupro_send_control(struct hidpad_wiiupro_data* device)
static void* hidpad_wiiupro_init(void *data, static void* hidpad_wiiupro_init(void *data,
uint32_t slot, hid_driver_t *driver) uint32_t slot, hid_driver_t *driver)
{ {
struct pad_connection* connection = (struct pad_connection*)data; struct pad_connection* connection = (struct pad_connection*)data;
struct hidpad_wiiupro_data* device = (struct hidpad_wiiupro_data*) struct hidpad_wiiupro_data* device = (struct hidpad_wiiupro_data*)
calloc(1, sizeof(struct hidpad_wiiupro_data)); calloc(1, sizeof(struct hidpad_wiiupro_data));
if (!device) if (!device)
@ -90,9 +89,9 @@ static void* hidpad_wiiupro_init(void *data,
if (!connection) if (!connection)
goto error; goto error;
device->connection = connection; device->connection = connection;
device->slot = slot; device->slot = slot;
device->driver = driver; device->driver = driver;
device->calib.calib_round = 0; device->calib.calib_round = 0;
/* Without this, the digital buttons won't be reported. */ /* Without this, the digital buttons won't be reported. */