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

Merge pull request #94 from whot/master

Browse Source 
hidpp10: fix fetching of serial number
This commit is contained in:
bentiss
2016-07-27 11:00:44 +02:00
committed by GitHub
parent e2ae29efdc 01876023bb
commit 045a46aa9d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/hidpp-generic.h
View File

@@ -200,4 +200,10 @@ hidpp_cpu_to_le_u16(uint16_t data)
return result;
}
static inline uint32_t
hidpp_get_unaligned_be_u32(uint8_t *buf)
{
return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
}
#endif /* HIDPP_GENERIC_H */

3
src/hidpp10.c
View File

@@ -2555,8 +2555,7 @@ hidpp10_get_extended_pairing_information(struct hidpp10_device *dev,
if (res)
return -1;
*serial = hidpp_get_unaligned_be_u16(&info.msg.string[2]) << 16;
*serial |= hidpp_get_unaligned_be_u16(&info.msg.string[4]);
*serial = hidpp_get_unaligned_be_u32(&info.msg.string[1]);
return 0;
}