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

Merge pull request #42 from phomes/memory-offset2

Browse Source 
Fix dumping memory pages
This commit is contained in:
Peter Hutterer
2015-10-19 08:07:59 +10:00
parent ca395e849c 123254c737
commit 983c830ff3
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/hidpp10.c
View File

@@ -541,7 +541,7 @@ hidpp10_get_profile(struct hidpp10_device *dev, int8_t number, struct hidpp10_pr
for (i = 0; i < sizeof(data); i += 16) {
/* each sector contains 16 bytes of data */
res = hidpp10_read_memory(dev, number, i / 2, &data.data[i]);
res = hidpp10_read_memory(dev, number, i, &data.data[i]);
if (res)
return res;
}
@@ -1011,13 +1011,18 @@ hidpp10_set_usb_refresh_rate(struct hidpp10_device *dev,
}
int
hidpp10_read_memory(struct hidpp10_device *dev, uint8_t page, uint8_t offset,
hidpp10_read_memory(struct hidpp10_device *dev, uint8_t page, uint16_t offset,
uint8_t bytes[16])
{
unsigned idx = dev->index;
union hidpp10_message readmem = CMD_READ_MEMORY(idx, page, offset);
union hidpp10_message readmem = CMD_READ_MEMORY(idx, page, offset / 2);
int res;
if (offset % 2 != 0) {
hidpp_log_error(&dev->base, "Reading memory with odd offset is not supported.\n");
return -EINVAL;
}
if (page > 31)
return -EINVAL;

2
src/hidpp10.h
View File

@@ -462,7 +462,7 @@ hidpp10_set_usb_refresh_rate(struct hidpp10_device *dev,
int
hidpp10_read_memory(struct hidpp10_device *dev,
uint8_t page,
uint8_t offset,
uint16_t offset,
uint8_t bytes[16]);
/* -------------------------------------------------------------------------- */

4
tools/hidpp10-dump-page.c
View File

@@ -35,8 +35,8 @@ dump_page(struct hidpp10_device *dev, size_t page, size_t offset)
int rc = 0;
uint8_t bytes[16];
while (offset < 256) {
hidpp_log_info(&dev->base, "page 0x%02zx off 0x%02zx: ", page, offset);
while (offset < 512) {
hidpp_log_info(&dev->base, "page 0x%02zx off 0x%03zx: ", page, offset);
rc = hidpp10_read_memory(dev, page, offset, bytes);
if (rc != 0)
break;