Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2563)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/hid/hid_connection_win.cc

Issue 161823002: Clean up HID backend and API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Many cleanup, such device ID, woww. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« device/hid/hid_connection_mac.cc ('K') | « device/hid/hid_connection_win.h ('k') | device/hid/hid_device_info.h » ('j') | device/hid/hid_device_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/hid/hid_connection_win.cc
diff --git a/device/hid/hid_connection_win.cc b/device/hid/hid_connection_win.cc
index bbb158f557b347dc544d6f01e738e5bb9bac1554..6f04bd3486042825234a4bb53330614807b2b975 100644
--- a/device/hid/hid_connection_win.cc
+++ b/device/hid/hid_connection_win.cc
@@ -11,7 +11,6 @@
#include "base/threading/thread_restrictions.h"
#include "device/hid/hid_service.h"
#include "device/hid/hid_service_win.h"
-#include "net/base/io_buffer.h"
#if defined(OS_WIN)
@@ -36,8 +35,8 @@ namespace device {
HidConnectionWin::PendingTransfer::PendingTransfer(
scoped_refptr<HidConnectionWin> conn,
- scoped_refptr<net::IOBuffer> target,
- scoped_refptr<net::IOBuffer> receiving,
+ scoped_refptr<net::IOBufferWithSize> target,
+ scoped_refptr<net::IOBufferWithSize> receiving,
bool is_input,
IOCallback callback)
: conn_(conn),
@@ -49,6 +48,7 @@ HidConnectionWin::PendingTransfer::PendingTransfer(
memset(&overlapped_, 0, sizeof(OVERLAPPED));
overlapped_.hEvent = event_.Get();
}
+
HidConnectionWin::PendingTransfer::~PendingTransfer() {
base::MessageLoop::current()->RemoveDestructionObserver(this);
}
@@ -73,109 +73,82 @@ void HidConnectionWin::PendingTransfer::WillDestroyCurrentMessageLoop() {
conn_->OnTransferCanceled(this);
}
-void HidConnectionWin::OnTransferFinished(
- scoped_refptr<PendingTransfer> transfer) {
- DWORD bytes_transfered;
- transfers_.erase(transfer);
- if (GetOverlappedResult(file_,
- transfer->GetOverlapped(),
- &bytes_transfered,
- FALSE)) {
- if (transfer->is_input_ && !device_info_.has_report_id) {
- // Move one byte forward.
- --bytes_transfered;
- memcpy(transfer->target_->data(),
- transfer->receiving_->data() + 1,
- bytes_transfered);
- }
- transfer->callback_.Run(true, bytes_transfered);
- } else {
- transfer->callback_.Run(false, 0);
- }
-}
-
-void HidConnectionWin::OnTransferCanceled(
- scoped_refptr<PendingTransfer> transfer) {
- transfers_.erase(transfer);
- transfer->callback_.Run(false, 0);
-}
-
-HidConnectionWin::HidConnectionWin(HidDeviceInfo device_info)
- : HidConnection(device_info),
- available_(false) {
+HidConnectionWin::HidConnectionWin(HidDeviceInfo device_info,
+ const std::string& device_path)
+ : HidConnection(device_info) {
DCHECK(thread_checker_.CalledOnValidThread());
- file_.Set(CreateFileA(device_info.device_id.c_str(),
+ file_.Set(CreateFileA(device_path.c_str(),
GENERIC_WRITE | GENERIC_READ,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
FILE_FLAG_OVERLAPPED,
NULL));
- available_ = file_.IsValid();
}
+bool HidConnectionWin::available() const { return file_.IsValid(); }
+
HidConnectionWin::~HidConnectionWin() {
DCHECK(thread_checker_.CalledOnValidThread());
CancelIo(file_.Get());
}
-void HidConnectionWin::Read(scoped_refptr<net::IOBuffer> buffer,
- size_t size,
+void HidConnectionWin::Read(scoped_refptr<net::IOBufferWithSize> buffer,
const HidConnection::IOCallback& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
- size_t report_size = device_info_.input_report_size;
+ int report_size = device_info().input_report_size;
if (report_size == 0) {
- // The device does not supoort input reports.
+ // The device does not support input reports.
callback.Run(false, 0);
return;
}
- if (size + !device_info_.has_report_id < report_size) {
+ int size = buffer->size();
+ if (size + !device_info().has_report_id < report_size) {
// Buffer too short.
callback.Run(false, 0);
return;
}
- scoped_refptr<net::IOBuffer> expanded_buffer;
- if (!device_info_.has_report_id) {
+ scoped_refptr<net::IOBufferWithSize> expanded_buffer;
+ if (!device_info().has_report_id) {
++size;
- expanded_buffer = new net::IOBuffer(static_cast<int>(size));
+ expanded_buffer = new net::IOBufferWithSize(size);
}
scoped_refptr<PendingTransfer> transfer(
new PendingTransfer(this, buffer, expanded_buffer, true, callback));
transfers_.insert(transfer);
- transfer->TakeResultFromWindowsAPI(ReadFile(file_.Get(),
- device_info_.has_report_id ?
- buffer->data() :
- expanded_buffer->data(),
- static_cast<DWORD>(size),
- NULL,
- transfer->GetOverlapped()));
+ transfer->TakeResultFromWindowsAPI(ReadFile(
+ file_.Get(),
+ device_info().has_report_id ? buffer->data() : expanded_buffer->data(),
+ static_cast<DWORD>(size),
+ NULL,
+ transfer->GetOverlapped()));
}
-void HidConnectionWin::Write(scoped_refptr<net::IOBuffer> buffer,
- size_t size,
+void HidConnectionWin::Write(scoped_refptr<net::IOBufferWithSize> buffer,
const HidConnection::IOCallback& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
- size_t report_size = device_info_.output_report_size;
+ int report_size = device_info().output_report_size;
if (report_size == 0) {
- // The device does not supoort output reports.
+ // The device does not support output reports.
callback.Run(false, 0);
return;
}
- if (size + !device_info_.has_report_id > report_size) {
+ int size = buffer->size();
+ if (size + !device_info().has_report_id > report_size) {
// Size of report too long.
callback.Run(false, 0);
return;
}
- scoped_refptr<net::IOBuffer> expanded_buffer;
- if (!device_info_.has_report_id) {
- expanded_buffer = new net::IOBuffer(
- static_cast<int>(device_info_.output_report_size));
- memset(expanded_buffer->data(), 0, device_info_.output_report_size);
+ scoped_refptr<net::IOBufferWithSize> expanded_buffer;
+ if (!device_info().has_report_id) {
+ expanded_buffer =
+ new net::IOBufferWithSize(device_info().output_report_size);
+ memset(expanded_buffer->data(), 0, device_info().output_report_size);
memcpy(expanded_buffer->data() + 1,
buffer->data(),
size);
@@ -185,76 +158,75 @@ void HidConnectionWin::Write(scoped_refptr<net::IOBuffer> buffer,
scoped_refptr<PendingTransfer> transfer(
new PendingTransfer(this, buffer, expanded_buffer, false, callback));
transfers_.insert(transfer);
- transfer->TakeResultFromWindowsAPI(
- WriteFile(file_.Get(),
- device_info_.has_report_id ?
- buffer->data() : expanded_buffer->data(),
- static_cast<DWORD>(device_info_.output_report_size),
- NULL,
- transfer->GetOverlapped()));
+ transfer->TakeResultFromWindowsAPI(WriteFile(
+ file_.Get(),
+ device_info().has_report_id ? buffer->data() : expanded_buffer->data(),
+ static_cast<DWORD>(device_info().output_report_size),
+ NULL,
+ transfer->GetOverlapped()));
}
-void HidConnectionWin::GetFeatureReport(scoped_refptr<net::IOBuffer> buffer,
- size_t size,
- const IOCallback& callback) {
+void HidConnectionWin::GetFeatureReport(
+ scoped_refptr<net::IOBufferWithSize> buffer,
+ const IOCallback& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
- size_t report_size = device_info_.feature_report_size;
+ int report_size = device_info().feature_report_size;
if (report_size == 0) {
- // The device does not supoort input reports.
+ // The device does not support input reports.
callback.Run(false, 0);
return;
}
- if (size + !device_info_.has_report_id < report_size) {
+ int size = buffer->size();
+ if (size + !device_info().has_report_id < report_size) {
// Buffer too short.
callback.Run(false, 0);
return;
}
- scoped_refptr<net::IOBuffer> expanded_buffer;
- if (!device_info_.has_report_id) {
+ scoped_refptr<net::IOBufferWithSize> expanded_buffer;
+ if (!device_info().has_report_id) {
++size;
- expanded_buffer = new net::IOBuffer(static_cast<int>(size));
+ expanded_buffer = new net::IOBufferWithSize(size);
}
scoped_refptr<PendingTransfer> transfer(
new PendingTransfer(this, buffer, expanded_buffer, true, callback));
transfers_.insert(transfer);
- transfer->TakeResultFromWindowsAPI(
- DeviceIoControl(file_.Get(),
- IOCTL_HID_GET_FEATURE,
- NULL,
- 0,
- device_info_.has_report_id ?
- buffer->data() :
- expanded_buffer->data(),
- static_cast<DWORD>(size),
- NULL,
- transfer->GetOverlapped()));
+ transfer->TakeResultFromWindowsAPI(DeviceIoControl(
+ file_.Get(),
+ IOCTL_HID_GET_FEATURE,
+ NULL,
+ 0,
+ device_info().has_report_id ? buffer->data() : expanded_buffer->data(),
+ static_cast<DWORD>(size),
+ NULL,
+ transfer->GetOverlapped()));
}
-void HidConnectionWin::SendFeatureReport(scoped_refptr<net::IOBuffer> buffer,
- size_t size,
- const IOCallback& callback) {
+void HidConnectionWin::SendFeatureReport(
+ scoped_refptr<net::IOBufferWithSize> buffer,
+ const IOCallback& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
- size_t report_size = device_info_.feature_report_size;
+ int report_size = device_info().feature_report_size;
if (report_size == 0) {
- // The device does not supoort output reports.
+ // The device does not support output reports.
callback.Run(false, 0);
return;
}
- if (size + !device_info_.has_report_id > report_size) {
+ int size = buffer->size();
+ if (size + !device_info().has_report_id > report_size) {
// Size of report too long.
callback.Run(false, 0);
return;
}
- scoped_refptr<net::IOBuffer> expanded_buffer;
- if (!device_info_.has_report_id) {
- expanded_buffer = new net::IOBuffer(
- static_cast<int>(device_info_.feature_report_size));
- memset(expanded_buffer->data(), 0, device_info_.feature_report_size);
+ scoped_refptr<net::IOBufferWithSize> expanded_buffer;
+ if (!device_info().has_report_id) {
+ expanded_buffer =
+ new net::IOBufferWithSize(device_info().feature_report_size);
+ memset(expanded_buffer->data(), 0, device_info().feature_report_size);
memcpy(expanded_buffer->data() + 1,
buffer->data(),
size);
@@ -263,17 +235,40 @@ void HidConnectionWin::SendFeatureReport(scoped_refptr<net::IOBuffer> buffer,
scoped_refptr<PendingTransfer> transfer(
new PendingTransfer(this, buffer, expanded_buffer, false, callback));
- transfer->TakeResultFromWindowsAPI(
- DeviceIoControl(file_.Get(),
- IOCTL_HID_SET_FEATURE,
- device_info_.has_report_id ?
- buffer->data() :
- expanded_buffer->data(),
- static_cast<DWORD>(device_info_.output_report_size),
- NULL,
- 0,
- NULL,
- transfer->GetOverlapped()));
+ transfer->TakeResultFromWindowsAPI(DeviceIoControl(
+ file_.Get(),
+ IOCTL_HID_SET_FEATURE,
+ device_info().has_report_id ? buffer->data() : expanded_buffer->data(),
+ static_cast<DWORD>(device_info().output_report_size),
+ NULL,
+ 0,
+ NULL,
+ transfer->GetOverlapped()));
+}
+
+void HidConnectionWin::OnTransferFinished(
+ scoped_refptr<PendingTransfer> transfer) {
+ DWORD bytes_transfered;
+ transfers_.erase(transfer);
+ if (GetOverlappedResult(
+ file_, transfer->GetOverlapped(), &bytes_transfered, FALSE)) {
+ if (transfer->is_input_ && !device_info().has_report_id) {
+ // Move one byte forward.
+ --bytes_transfered;
+ memcpy(transfer->target_->data(),
+ transfer->receiving_->data() + 1,
+ bytes_transfered);
+ }
+ transfer->callback_.Run(true, bytes_transfered);
+ } else {
+ transfer->callback_.Run(false, 0);
+ }
+}
+
+void HidConnectionWin::OnTransferCanceled(
+ scoped_refptr<PendingTransfer> transfer) {
+ transfers_.erase(transfer);
+ transfer->callback_.Run(false, 0);
}
} // namespace device
« device/hid/hid_connection_mac.cc ('K') | « device/hid/hid_connection_win.h ('k') | device/hid/hid_device_info.h » ('j') | device/hid/hid_device_info.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698