diff options
| author | jracle@logitech.com <jracle@logitech.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 02:53:23 +0000 |
|---|---|---|
| committer | jracle@logitech.com <jracle@logitech.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 02:53:23 +0000 |
| commit | 9ff38235dcea4a3a95e25b602c347f5646bdf4bb (patch) | |
| tree | 8b3c0b46ea6699591de7e55e760b73b4753610ae /device/hid/hid_device_info.h | |
| parent | 5a43fe6ffbd21cc9a494fa6ed841f877fa09e243 (diff) | |
| download | chromium_src-9ff38235dcea4a3a95e25b602c347f5646bdf4bb.zip chromium_src-9ff38235dcea4a3a95e25b602c347f5646bdf4bb.tar.gz chromium_src-9ff38235dcea4a3a95e25b602c347f5646bdf4bb.tar.bz2 | |
chrome.hid: enrich model with report IDs
- add report IDs and max report size
- don't expose sensitive usages
BUG=364423
R=rockot@chromium.org
TESTS=run device_unittests (HidReportDescriptorTest)
Review URL: https://codereview.chromium.org/317783010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/hid/hid_device_info.h')
| -rw-r--r-- | device/hid/hid_device_info.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/device/hid/hid_device_info.h b/device/hid/hid_device_info.h index 1b143c2..2ed51ac 100644 --- a/device/hid/hid_device_info.h +++ b/device/hid/hid_device_info.h @@ -9,7 +9,7 @@ #include <vector> #include "build/build_config.h" -#include "device/hid/hid_usage_and_page.h" +#include "device/hid/hid_collection_info.h" #if defined(OS_MACOSX) #include <IOKit/hid/IOHIDDevice.h> @@ -34,20 +34,19 @@ struct HidDeviceInfo { HidDeviceInfo(); ~HidDeviceInfo(); + // Device identification. HidDeviceId device_id; - - HidBusType bus_type; uint16_t vendor_id; uint16_t product_id; - - int input_report_size; - int output_report_size; - int feature_report_size; - std::vector<HidUsageAndPage> usages; - bool has_report_id; - std::string product_name; std::string serial_number; + HidBusType bus_type; + + // Top-Level Collections information. + std::vector<HidCollectionInfo> collections; + int max_input_report_size; + int max_output_report_size; + int max_feature_report_size; }; } // namespace device |