p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HID: expose country code in sysfs 

This commit exposes in sysfs the HID country code that is stored in the country
member of hid_device structure. It identifies the country code of localized
hardware.

For example some keyboards use it to exhibit the language of the key layout. It
helps the upper layer to identify the localized hardware and setup the correct
language to use.

For USB HID devices the country code comes for the HID descriptor and for
Bluetooth HID devices it is the HIDCountryCode attribute from the SDP database.

Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Olivier Gay 2015-02-17 14:00:03 +01:00 committed by Jiri Kosina
parent 870fd0f5df
commit a877417ed4
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/ABI/testing/sysfs-driver-hid
View File

@ -8,3 +8,13 @@ Description: When read, this file returns the device's raw binary HID
report descriptor. report descriptor.
This file cannot be written. This file cannot be written.
Users: HIDAPI library (http://www.signal11.us/oss/hidapi) Users: HIDAPI library (http://www.signal11.us/oss/hidapi)
What: For USB devices : /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/country
For BT devices : /sys/class/bluetooth/hci<addr>/<hid-bus>:<vendor-id>:<product-id>.<num>/country
Symlink : /sys/class/hidraw/hidraw<num>/device/country
Date: February 2015
KernelVersion: 3.19
Contact: Olivier Gay <ogay@logitech.com>
Description: When read, this file returns the hex integer value in ASCII
of the device's HID country code (e.g. 21 for US).
This file cannot be written.

20
drivers/hid/hid-core.c
View File

@ -1562,12 +1562,26 @@ read_report_descriptor(struct file *filp, struct kobject *kobj,
return count; return count;
} }
static ssize_t
show_country(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct hid_device *hdev = container_of(dev, struct hid_device, dev);
return sprintf(buf, "%02x\n", hdev->country & 0xff);
}
static struct bin_attribute dev_bin_attr_report_desc = { static struct bin_attribute dev_bin_attr_report_desc = {
.attr = { .name = "report_descriptor", .mode = 0444 }, .attr = { .name = "report_descriptor", .mode = 0444 },
.read = read_report_descriptor, .read = read_report_descriptor,
.size = HID_MAX_DESCRIPTOR_SIZE, .size = HID_MAX_DESCRIPTOR_SIZE,
}; };
static struct device_attribute dev_attr_country = {
.attr = { .name = "country", .mode = 0444 },
.show = show_country,
};
int hid_connect(struct hid_device *hdev, unsigned int connect_mask) int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
{ {
static const char *types[] = { "Device", "Pointer", "Mouse", "Device", static const char *types[] = { "Device", "Pointer", "Mouse", "Device",
@ -1646,6 +1660,11 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
bus = "<UNKNOWN>"; bus = "<UNKNOWN>";
} }
ret = device_create_file(&hdev->dev, &dev_attr_country);
if (ret)
hid_warn(hdev,
"can't create sysfs country code attribute err: %d\n", ret);
ret = device_create_bin_file(&hdev->dev, &dev_bin_attr_report_desc); ret = device_create_bin_file(&hdev->dev, &dev_bin_attr_report_desc);
if (ret) if (ret)
hid_warn(hdev, hid_warn(hdev,
@ -1661,6 +1680,7 @@ EXPORT_SYMBOL_GPL(hid_connect);
void hid_disconnect(struct hid_device *hdev) void hid_disconnect(struct hid_device *hdev)
{ {
device_remove_file(&hdev->dev, &dev_attr_country);
device_remove_bin_file(&hdev->dev, &dev_bin_attr_report_desc); device_remove_bin_file(&hdev->dev, &dev_bin_attr_report_desc);
if (hdev->claimed & HID_CLAIMED_INPUT) if (hdev->claimed & HID_CLAIMED_INPUT)
hidinput_disconnect(hdev); hidinput_disconnect(hdev);