DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

hidpp20: reorder profile initialization

Browse Source 
Spec says the profile count is stored in byte 3 of
CMD_ONBOARD_PROFILES_GET_PROFILES_DESCR, so use this to allocate the proper
number of profiles.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2016-03-01 14:15:15 +01:00
parent f58b91a9b2
commit 6cba2abd8e
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/hidpp20.c
View File

@@ -1130,11 +1130,12 @@ hidpp20_onboard_profiles_set_current_profile(struct hidpp20_device *device,
static int
hidpp20_onboard_profiles_initialize(struct hidpp20_device *device,
unsigned profile_count,
struct hidpp20_profiles *profiles_list)
struct hidpp20_profiles **profiles_list)
{
uint8_t feature_index;
uint8_t profiles_count;
int rc;
struct hidpp20_profiles *profiles;
union hidpp20_message msg = {
.msg.report_id = REPORT_ID_SHORT,
.msg.device_idx = device->index,
@@ -1152,10 +1153,16 @@ hidpp20_onboard_profiles_initialize(struct hidpp20_device *device,
if (rc)
return rc;
profiles_list->num_buttons = msg.msg.parameters[5] <= 16 ? msg.msg.parameters[5] : 16;
profiles_list->num_profiles = profile_count;
/* FIXME: actually retrieve the correct values */
profiles_list->num_modes = 5;
profiles_count = msg.msg.parameters[3];
profiles = zalloc(sizeof(struct hidpp20_profiles) +
profiles_count * sizeof(struct hidpp20_profile));
profiles->num_profiles = profiles_count;
profiles->num_buttons = msg.msg.parameters[5] <= 16 ? msg.msg.parameters[5] : 16;
profiles->num_modes = HIDPP20_DPI_COUNT;
*profiles_list = profiles;
return 0;
}
@@ -1327,8 +1334,14 @@ hidpp20_onboard_profiles_allocate(struct hidpp20_device *device,
unsigned i;
int rc;
uint8_t data[16] = {0};
struct hidpp20_profiles *profiles;
unsigned profile_count = 0;
struct hidpp20_profiles *profiles = NULL;
rc = hidpp20_onboard_profiles_initialize(device,
&profiles);
if (rc < 0)
return rc;
assert(profiles);
rc = hidpp20_onboard_profiles_read_memory(device,
0x00,
@@ -1338,26 +1351,19 @@ hidpp20_onboard_profiles_allocate(struct hidpp20_device *device,
if (rc < 0)
return rc;
profiles = zalloc(sizeof(struct hidpp20_profiles));
for (i = 0; i < 3; i++) {
for (i = 0; i < profiles->num_profiles; i++) {
uint8_t *d = data + 4 * i;
if (d[0] == 0xFF && d[1] == 0xFF)
break;
profile_count++;
profiles->profiles[i].index = d[1];
profiles->profiles[i].enabled = d[2];
}
hidpp20_onboard_profiles_initialize(device,
profile_count,
profiles);
*profiles_list = profiles;
return profile_count;
return profiles->num_profiles;
}
void

6
src/hidpp20.h
View File

@@ -275,6 +275,8 @@ int hidpp20_adjustable_dpi_set_sensor_dpi(struct hidpp20_device *device,
#define HIDPP20_MODIFIER_KEY_CTRL 0x01
#define HIDPP20_MODIFIER_KEY_SHIFT 0x02
#define HIDPP20_DPI_COUNT 5
union hidpp20_button_binding {
struct {
uint8_t type;
@@ -353,7 +355,7 @@ struct hidpp20_profile {
unsigned report_rate;
unsigned default_dpi;
unsigned switched_dpi;
uint16_t dpi[5];
uint16_t dpi[HIDPP20_DPI_COUNT];
union hidpp20_button_binding buttons[32];
union hidpp20_macro_data *macros[32];
};
@@ -362,7 +364,7 @@ struct hidpp20_profiles {
uint8_t num_profiles;
uint8_t num_buttons;
uint8_t num_modes;
struct hidpp20_profile profiles[5];
struct hidpp20_profile profiles[0];
};
/**