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

hidpp: Distinguish 1.0 and 2.0 error codes

Browse Source
This commit is contained in:
Clément Vuchener
2017-08-17 10:56:05 +02:00
committed by Peter Hutterer
parent 804d8f7969
commit 468787601e
5 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver-hidpp20.c
View File

@@ -305,7 +305,7 @@ hidpp20drv_write_button_1b04(struct ratbag_button *button,
control->reporting.updated = 1;
rc = hidpp20_special_key_mouse_set_control(drv_data->dev, control);
if (rc == ERR_INVALID_ADDRESS)
if (rc == HIDPP20_ERR_INVALID_ARGUMENT)
return -EINVAL;
if (rc)

16
src/hidpp-generic.c
View File

@@ -36,7 +36,7 @@
#include "libratbag-private.h"
const char *hidpp_errors[0xFF] = {
const char *hidpp10_errors[0xFF] = {
[0x00] = "ERR_SUCCESS",
[0x01] = "ERR_INVALID_SUBID",
[0x02] = "ERR_INVALID_ADDRESS",
@@ -53,6 +53,20 @@ const char *hidpp_errors[0xFF] = {
[0x0D ... 0xFE] = NULL,
};
const char *hidpp20_errors[0xFF] = {
[0x00] = "ERR_NO_ERROR",
[0x01] = "ERR_UNKNOWN",
[0x02] = "ERR_INVALID_ARGUMENT",
[0x03] = "ERR_OUT_OF_RANGE",
[0x04] = "ERR_HARDWARE_ERROR",
[0x05] = "ERR_LOGITECH_INTERNAL",
[0x06] = "ERR_INVALID_FEATURE_INDEX",
[0x07] = "ERR_INVALID_FUNCTION_ID",
[0x08] = "ERR_BUSY",
[0x09] = "ERR_UNSUPPORTED",
[0x0A ... 0xFE] = NULL,
};
struct hidpp20_1b04_action_mapping {
uint16_t value;
const char *name;

40
src/hidpp-generic.h
View File

@@ -51,19 +51,30 @@
#define GET_LONG_REGISTER_RSP 0x83
#define __ERROR_MSG 0x8F
#define ERR_SUCCESS 0x00
#define ERR_INVALID_SUBID 0x01
#define ERR_INVALID_ADDRESS 0x02
#define ERR_INVALID_VALUE 0x03
#define ERR_CONNECT_FAIL 0x04
#define ERR_TOO_MANY_DEVICES 0x05
#define ERR_ALREADY_EXISTS 0x06
#define ERR_BUSY 0x07
#define ERR_UNKNOWN_DEVICE 0x08
#define ERR_RESOURCE_ERROR 0x09
#define ERR_REQUEST_UNAVAILABLE 0x0A
#define ERR_INVALID_PARAM_VALUE 0x0B
#define ERR_WRONG_PIN_CODE 0x0C
#define HIDPP10_ERR_SUCCESS 0x00
#define HIDPP10_ERR_INVALID_SUBID 0x01
#define HIDPP10_ERR_INVALID_ADDRESS 0x02
#define HIDPP10_ERR_INVALID_VALUE 0x03
#define HIDPP10_ERR_CONNECT_FAIL 0x04
#define HIDPP10_ERR_TOO_MANY_DEVICES 0x05
#define HIDPP10_ERR_ALREADY_EXISTS 0x06
#define HIDPP10_ERR_BUSY 0x07
#define HIDPP10_ERR_UNKNOWN_DEVICE 0x08
#define HIDPP10_ERR_RESOURCE_ERROR 0x09
#define HIDPP10_ERR_REQUEST_UNAVAILABLE 0x0A
#define HIDPP10_ERR_INVALID_PARAM_VALUE 0x0B
#define HIDPP10_ERR_WRONG_PIN_CODE 0x0C
#define HIDPP20_ERR_NO_ERROR 0x00
#define HIDPP20_ERR_UNKNOWN 0x01
#define HIDPP20_ERR_INVALID_ARGUMENT 0x02
#define HIDPP20_ERR_OUT_OF_RANGE 0x03
#define HIDPP20_ERR_HARDWARE_ERROR 0x04
#define HIDPP20_ERR_LOGITECH_INTERNAL 0x05
#define HIDPP20_ERR_INVALID_FEATURE_INDEX 0x06
#define HIDPP20_ERR_INVALID_FUNCTION_ID 0x07
#define HIDPP20_ERR_BUSY 0x08
#define HIDPP20_ERR_UNSUPPORTED 0x09
/* Keep this in sync with ratbag_log_priority */
enum hidpp_log_priority {
@@ -97,7 +108,8 @@ hidpp_device_set_log_handler(struct hidpp_device *dev,
enum hidpp_log_priority priority,
void *userdata);
extern const char *hidpp_errors[0xFF];
extern const char *hidpp10_errors[0xFF];
extern const char *hidpp20_errors[0xFF];
const char *
hidpp20_1b04_get_physical_mapping_name(uint16_t value);

2
src/hidpp10.c
View File

@@ -268,7 +268,7 @@ hidpp10_request_command(struct hidpp10_device *dev, union hidpp10_message *msg)
" HID++ error from the %s (%d): %s (%02x)\n",
read_buffer.msg.device_idx == HIDPP_RECEIVER_IDX ? "receiver" : "device",
read_buffer.msg.device_idx,
hidpp_errors[hidpp_err] ? hidpp_errors[hidpp_err] : "Undocumented error code",
hidpp10_errors[hidpp_err] ? hidpp10_errors[hidpp_err] : "Undocumented error code",
hidpp_err);
break;
}

6
src/hidpp20.c
View File

@@ -130,13 +130,13 @@ hidpp20_request_command_allow_error(struct hidpp20_device *device, union hidpp20
hidpp_log_debug(&device->base,
" HID++ error from the device (%d): %s (%02x)\n",
read_buffer.msg.device_idx,
hidpp_errors[hidpp_err] ? hidpp_errors[hidpp_err] : "Undocumented error code",
hidpp20_errors[hidpp_err] ? hidpp20_errors[hidpp_err] : "Undocumented error code",
hidpp_err);
else
hidpp_log_error(&device->base,
" HID++ error from the device (%d): %s (%02x)\n",
read_buffer.msg.device_idx,
hidpp_errors[hidpp_err] ? hidpp_errors[hidpp_err] : "Undocumented error code",
hidpp20_errors[hidpp_err] ? hidpp20_errors[hidpp_err] : "Undocumented error code",
hidpp_err);
break;
}
@@ -241,7 +241,7 @@ hidpp20_root_get_protocol_version(struct hidpp20_device *device,
rc = hidpp20_request_command_allow_error(device, &msg, true);
if (rc == ERR_INVALID_SUBID) {
if (rc == HIDPP10_ERR_INVALID_SUBID) {
*major = 1;
*minor = 0;
return 0;