drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 15:14:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from phomes/master

Browse Source 
A few cleanups
This commit is contained in:
Peter Hutterer
2015-09-03 07:50:27 +10:00
parent d2d5566156 9011876d1b
commit 3afc1ffdd8
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hidpp-generic.c
View File

@@ -146,7 +146,7 @@ hidpp20_1b04_get_logical_mapping(uint16_t value)
return &map->action;
}
return RATBAG_BUTTON_TYPE_UNKNOWN;
return NULL;
}
uint16_t

3
src/hidpp10.c
View File

@@ -294,8 +294,7 @@ hidpp10_set_individual_feature(struct hidpp10_device *dev,
log_raw(dev->ratbag_device->ratbag, "Setting individual features\n");
if (dev)
mode.msg.device_idx = dev->index;
mode.msg.device_idx = dev->index;
mode.msg.parameters[0] = feature_bit_r0;
mode.msg.parameters[1] = feature_bit_r2;

2
src/hidpp20.c
View File

@@ -779,7 +779,7 @@ hidpp20_adjustable_dpi_get_dpi_list(struct ratbag_device *device,
sensor->dpi_min = 0xffff;
sensor->index = msg.msg.parameters[0];
while (i < LONG_MESSAGE_LENGTH - 1 &&
while (i < LONG_MESSAGE_LENGTH - 4U &&
hidpp20_get_unaligned_u16(&msg.msg.parameters[i]) != 0) {
uint16_t value = hidpp20_get_unaligned_u16(&msg.msg.parameters[i]);