Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / device / hid / hid_connection_linux.cc

diff --git a/src/device/hid/hid_connection_linux.cc b/src/device/hid/hid_connection_linux.cc
index 75c9e07..212a601 100644 (file)
--- a/src/device/hid/hid_connection_linux.cc
+++ b/src/device/hid/hid_connection_linux.cc
@@ -42,32 +42,33 @@ scoped_refptr<net::IOBufferWithSize> CopyBufferWithReportId(
   return new_buffer;
 }
 
-const char kHidrawSubsystem[] = "hidraw";
-
 }  // namespace
 
 HidConnectionLinux::HidConnectionLinux(HidDeviceInfo device_info,
-                                       ScopedUdevDevicePtr udev_raw_device)
+                                       std::string dev_node)
     : HidConnection(device_info) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  udev_device* dev = udev_raw_device.get();
-  std::string dev_node;
-  if (!FindHidrawDevNode(dev, &dev_node)) {
-    LOG(ERROR) << "Cannot open HID device as hidraw device.";
-    return;
-  }
-
   int flags = base::File::FLAG_OPEN |
               base::File::FLAG_READ |
-              base::File::FLAG_WRITE |
-              base::File::FLAG_EXCLUSIVE_READ |
-              base::File::FLAG_EXCLUSIVE_WRITE;
+              base::File::FLAG_WRITE;
 
   base::File device_file(base::FilePath(dev_node), flags);
   if (!device_file.IsValid()) {
-    LOG(ERROR) << device_file.error_details();
-    return;
+    base::File::Error file_error = device_file.error_details();
+
+    if (file_error == base::File::FILE_ERROR_ACCESS_DENIED) {
+      flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
+
+      base::File device_file(base::FilePath(dev_node), flags);
+      if (!device_file.IsValid()) {
+        LOG(ERROR) << device_file.error_details();
+        return;
+      }
+    } else {
+      LOG(ERROR) << file_error;
+      return;
+    }
   }
   if (fcntl(device_file.GetPlatformFile(), F_SETFL,
             fcntl(device_file.GetPlatformFile(), F_GETFL) | O_NONBLOCK)) {
@@ -206,40 +207,4 @@ void HidConnectionLinux::ProcessReadQueue() {
   }
 }
 
-bool HidConnectionLinux::FindHidrawDevNode(udev_device* parent,
-                                           std::string* result) {
-  udev* udev = udev_device_get_udev(parent);
-  if (!udev) {
-      return false;
-  }
-  ScopedUdevEnumeratePtr enumerate(udev_enumerate_new(udev));
-  if (!enumerate) {
-    return false;
-  }
-  if (udev_enumerate_add_match_subsystem(enumerate.get(), kHidrawSubsystem)) {
-    return false;
-  }
-  if (udev_enumerate_scan_devices(enumerate.get())) {
-    return false;
-  }
-  std::string parent_path(udev_device_get_devpath(parent));
-  if (parent_path.length() == 0 || *parent_path.rbegin() != '/')
-    parent_path += '/';
-  udev_list_entry* devices = udev_enumerate_get_list_entry(enumerate.get());
-  for (udev_list_entry* i = devices; i != NULL;
-       i = udev_list_entry_get_next(i)) {
-    ScopedUdevDevicePtr hid_dev(
-        udev_device_new_from_syspath(udev, udev_list_entry_get_name(i)));
-    const char* raw_path = udev_device_get_devnode(hid_dev.get());
-    std::string device_path = udev_device_get_devpath(hid_dev.get());
-    if (raw_path &&
-        !device_path.compare(0, parent_path.length(), parent_path)) {
-      *result = raw_path;
-      return true;
-    }
-  }
-
-  return false;
-}
-
 }  // namespace device