Revert 281133 "chrome.hid: enrich model with report IDs"

trunk/src/device/hid/hid_service_win.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/hid/hid_service_win.h"
 
 #include <cstdlib>
 
 #include "base/files/file.h"
 #include "base/stl_util.h"
@@ skipping 169 matching lines @@
   device_info.product_id = attrib.ProductID;
 
   for (ULONG i = 32;
       HidD_SetNumInputBuffers(device_handle.Get(), i);
       i <<= 1);
 
   // Get usage and usage page (optional).
   PHIDP_PREPARSED_DATA preparsed_data;
   if (HidD_GetPreparsedData(device_handle.Get(), &preparsed_data) &&
       preparsed_data) {
-    HIDP_CAPS capabilities = {0};
+    HIDP_CAPS capabilities;
     if (HidP_GetCaps(preparsed_data, &capabilities) == HIDP_STATUS_SUCCESS) {
-      device_info.max_input_report_size = capabilities.InputReportByteLength;
-      device_info.max_output_report_size = capabilities.OutputReportByteLength;
-      device_info.max_feature_report_size =
-          capabilities.FeatureReportByteLength;
-      HidCollectionInfo collection_info;
-      collection_info.usage = HidUsageAndPage(
-          capabilities.Usage,
-          static_cast<HidUsageAndPage::Page>(capabilities.UsagePage));
+      device_info.input_report_size = capabilities.InputReportByteLength;
+      device_info.output_report_size = capabilities.OutputReportByteLength;
+      device_info.feature_report_size = capabilities.FeatureReportByteLength;
+      device_info.usages.push_back(HidUsageAndPage(
+        capabilities.Usage,
+        static_cast<HidUsageAndPage::Page>(capabilities.UsagePage)));
+    }
+    // Detect if the device supports report ids.
+    if (capabilities.NumberInputValueCaps > 0) {
+      scoped_ptr<HIDP_VALUE_CAPS[]> value_caps(
+          new HIDP_VALUE_CAPS[capabilities.NumberInputValueCaps]);
+      USHORT value_caps_length = capabilities.NumberInputValueCaps;
+      if (HidP_GetValueCaps(HidP_Input, &value_caps[0], &value_caps_length,
+                            preparsed_data) == HIDP_STATUS_SUCCESS) {
+        device_info.has_report_id = (value_caps[0].ReportID != 0);
+      }
+    }
+    if (!device_info.has_report_id && capabilities.NumberInputButtonCaps > 0)
+    {
+      scoped_ptr<HIDP_BUTTON_CAPS[]> button_caps(
+        new HIDP_BUTTON_CAPS[capabilities.NumberInputButtonCaps]);
       USHORT button_caps_length = capabilities.NumberInputButtonCaps;
-      if (button_caps_length > 0) {
-        scoped_ptr<HIDP_BUTTON_CAPS[]> button_caps(
-            new HIDP_BUTTON_CAPS[button_caps_length]);
-        if (HidP_GetButtonCaps(HidP_Input,
-                               &button_caps[0],
-                               &button_caps_length,
-                               preparsed_data) == HIDP_STATUS_SUCCESS) {
-          for (int i = 0; i < button_caps_length; i++) {
-            int report_id = button_caps[i].ReportID;
-            if (report_id != 0) {
-              collection_info.report_ids.insert(report_id);
-            }
-          }
-        }
+      if (HidP_GetButtonCaps(HidP_Input,
+                             &button_caps[0],
+                             &button_caps_length,
+                             preparsed_data) == HIDP_STATUS_SUCCESS) {
+        device_info.has_report_id = (button_caps[0].ReportID != 0);
       }
-      USHORT value_caps_length = capabilities.NumberInputValueCaps;
-      if (value_caps_length > 0) {
-        scoped_ptr<HIDP_VALUE_CAPS[]> value_caps(
-            new HIDP_VALUE_CAPS[value_caps_length]);
-        if (HidP_GetValueCaps(HidP_Input,
-                              &value_caps[0],
-                              &value_caps_length,
-                              preparsed_data) == HIDP_STATUS_SUCCESS) {
-          for (int i = 0; i < value_caps_length; i++) {
-            int report_id = value_caps[i].ReportID;
-            if (report_id != 0) {
-              collection_info.report_ids.insert(report_id);
-            }
-          }
-        }
-      }
-      device_info.collections.push_back(collection_info);
     }
+
     HidD_FreePreparsedData(preparsed_data);
   }
 
   AddDevice(device_info);
 }
 
 void HidServiceWin::PlatformRemoveDevice(const std::string& device_path) {
   RemoveDevice(device_path);
 }
 
 void HidServiceWin::GetDevices(std::vector<HidDeviceInfo>* devices) {
   Enumerate();
   HidService::GetDevices(devices);
 }
 
 scoped_refptr<HidConnection> HidServiceWin::Connect(
     const HidDeviceId& device_id) {
   HidDeviceInfo device_info;
   if (!GetDeviceInfo(device_id, &device_info))
     return NULL;
   scoped_refptr<HidConnectionWin> connection(new HidConnectionWin(device_info));
   if (!connection->available()) {
     PLOG(ERROR) << "Failed to open device.";
     return NULL;
   }
   return connection;
 }
 
 }  // namespace device