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

Side by Side Diff: components/usb_service/usb_device_handle_impl.cc

Issue 278633003: Extracted UsbDeviceHandle as interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/usb_service/usb_device_handle.h" 5 #include "components/usb_service/usb_device_handle_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "components/usb_service/usb_context.h" 14 #include "components/usb_service/usb_context.h"
15 #include "components/usb_service/usb_device.h" 15 #include "components/usb_service/usb_device_impl.h"
16 #include "components/usb_service/usb_interface.h" 16 #include "components/usb_service/usb_interface.h"
17 #include "components/usb_service/usb_service.h" 17 #include "components/usb_service/usb_service.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "third_party/libusb/src/libusb/libusb.h" 19 #include "third_party/libusb/src/libusb/libusb.h"
20 20
21 using content::BrowserThread; 21 using content::BrowserThread;
22 22
23 namespace usb_service { 23 namespace usb_service {
24 24
25 typedef libusb_device* PlatformUsbDevice; 25 typedef libusb_device* PlatformUsbDevice;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 PlatformTransferCompletionCallback(PlatformUsbTransferHandle transfer) { 106 PlatformTransferCompletionCallback(PlatformUsbTransferHandle transfer) {
107 BrowserThread::PostTask(BrowserThread::FILE, 107 BrowserThread::PostTask(BrowserThread::FILE,
108 FROM_HERE, 108 FROM_HERE,
109 base::Bind(HandleTransferCompletion, transfer)); 109 base::Bind(HandleTransferCompletion, transfer));
110 } 110 }
111 111
112 } // namespace 112 } // namespace
113 113
114 void HandleTransferCompletion(PlatformUsbTransferHandle transfer) { 114 void HandleTransferCompletion(PlatformUsbTransferHandle transfer) {
115 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 115 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
116 UsbDeviceHandle* const device_handle = 116 UsbDeviceHandleImpl* const device_handle =
117 reinterpret_cast<UsbDeviceHandle*>(transfer->user_data); 117 reinterpret_cast<UsbDeviceHandleImpl*>(transfer->user_data);
118 CHECK(device_handle) << "Device handle is closed before transfer finishes."; 118 CHECK(device_handle) << "Device handle is closed before transfer finishes.";
119 device_handle->TransferComplete(transfer); 119 device_handle->TransferComplete(transfer);
120 libusb_free_transfer(transfer); 120 libusb_free_transfer(transfer);
121 } 121 }
122 122
123 class UsbDeviceHandle::InterfaceClaimer 123 class UsbDeviceHandleImpl::InterfaceClaimer
124 : public base::RefCountedThreadSafe<UsbDeviceHandle::InterfaceClaimer> { 124 : public base::RefCountedThreadSafe<UsbDeviceHandleImpl::InterfaceClaimer> {
125 public: 125 public:
126 InterfaceClaimer(const scoped_refptr<UsbDeviceHandle> handle, 126 InterfaceClaimer(const scoped_refptr<UsbDeviceHandleImpl> handle,
127 const int interface_number); 127 const int interface_number);
128 128
129 bool Claim() const; 129 bool Claim() const;
130 130
131 int alternate_setting() const { return alternate_setting_; } 131 int alternate_setting() const { return alternate_setting_; }
132 void set_alternate_setting(const int alternate_setting) { 132 void set_alternate_setting(const int alternate_setting) {
133 alternate_setting_ = alternate_setting; 133 alternate_setting_ = alternate_setting;
134 } 134 }
135 135
136 private: 136 private:
137 friend class UsbDevice; 137 friend class UsbDevice;
138 friend class base::RefCountedThreadSafe<InterfaceClaimer>; 138 friend class base::RefCountedThreadSafe<InterfaceClaimer>;
139 ~InterfaceClaimer(); 139 ~InterfaceClaimer();
140 140
141 const scoped_refptr<UsbDeviceHandle> handle_; 141 const scoped_refptr<UsbDeviceHandleImpl> handle_;
142 const int interface_number_; 142 const int interface_number_;
143 int alternate_setting_; 143 int alternate_setting_;
144 144
145 DISALLOW_COPY_AND_ASSIGN(InterfaceClaimer); 145 DISALLOW_COPY_AND_ASSIGN(InterfaceClaimer);
146 }; 146 };
147 147
148 UsbDeviceHandle::InterfaceClaimer::InterfaceClaimer( 148 UsbDeviceHandleImpl::InterfaceClaimer::InterfaceClaimer(
149 const scoped_refptr<UsbDeviceHandle> handle, 149 const scoped_refptr<UsbDeviceHandleImpl> handle,
150 const int interface_number) 150 const int interface_number)
151 : handle_(handle), 151 : handle_(handle),
152 interface_number_(interface_number), 152 interface_number_(interface_number),
153 alternate_setting_(0) { 153 alternate_setting_(0) {
154 } 154 }
155 155
156 UsbDeviceHandle::InterfaceClaimer::~InterfaceClaimer() { 156 UsbDeviceHandleImpl::InterfaceClaimer::~InterfaceClaimer() {
157 libusb_release_interface(handle_->handle(), interface_number_); 157 libusb_release_interface(handle_->handle(), interface_number_);
158 } 158 }
159 159
160 bool UsbDeviceHandle::InterfaceClaimer::Claim() const { 160 bool UsbDeviceHandleImpl::InterfaceClaimer::Claim() const {
161 return libusb_claim_interface(handle_->handle(), interface_number_) == 0; 161 return libusb_claim_interface(handle_->handle(), interface_number_) == 0;
162 } 162 }
163 163
164 struct UsbDeviceHandle::Transfer { 164 struct UsbDeviceHandleImpl::Transfer {
165 Transfer(); 165 Transfer();
166 ~Transfer(); 166 ~Transfer();
167 167
168 UsbTransferType transfer_type; 168 UsbTransferType transfer_type;
169 scoped_refptr<net::IOBuffer> buffer; 169 scoped_refptr<net::IOBuffer> buffer;
170 scoped_refptr<UsbDeviceHandle::InterfaceClaimer> claimed_interface; 170 scoped_refptr<UsbDeviceHandleImpl::InterfaceClaimer> claimed_interface;
171 scoped_refptr<base::MessageLoopProxy> message_loop_proxy; 171 scoped_refptr<base::MessageLoopProxy> message_loop_proxy;
172 size_t length; 172 size_t length;
173 UsbTransferCallback callback; 173 UsbTransferCallback callback;
174 }; 174 };
175 175
176 UsbDeviceHandle::Transfer::Transfer() 176 UsbDeviceHandleImpl::Transfer::Transfer()
177 : transfer_type(USB_TRANSFER_CONTROL), length(0) { 177 : transfer_type(USB_TRANSFER_CONTROL), length(0) {
178 } 178 }
179 179
180 UsbDeviceHandle::Transfer::~Transfer() { 180 UsbDeviceHandleImpl::Transfer::~Transfer() {
181 } 181 }
182 182
183 UsbDeviceHandle::UsbDeviceHandle(scoped_refptr<UsbContext> context, 183 UsbDeviceHandleImpl::UsbDeviceHandleImpl(
184 UsbDevice* device, 184 scoped_refptr<UsbContext> context,
185 PlatformUsbDeviceHandle handle, 185 UsbDeviceImpl* device,
186 scoped_refptr<UsbConfigDescriptor> interfaces) 186 PlatformUsbDeviceHandle handle,
187 scoped_refptr<UsbConfigDescriptor> interfaces)
187 : device_(device), 188 : device_(device),
188 handle_(handle), 189 handle_(handle),
189 interfaces_(interfaces), 190 interfaces_(interfaces),
190 context_(context) { 191 context_(context) {
191 DCHECK(thread_checker_.CalledOnValidThread()); 192 DCHECK(thread_checker_.CalledOnValidThread());
192 DCHECK(handle) << "Cannot create device with NULL handle."; 193 DCHECK(handle) << "Cannot create device with NULL handle.";
193 DCHECK(interfaces_) << "Unabled to list interfaces"; 194 DCHECK(interfaces_) << "Unabled to list interfaces";
194 } 195 }
195 196
196 UsbDeviceHandle::UsbDeviceHandle() : device_(NULL), handle_(NULL) { 197 UsbDeviceHandleImpl::~UsbDeviceHandleImpl() {
197 }
198
199 UsbDeviceHandle::~UsbDeviceHandle() {
200 DCHECK(thread_checker_.CalledOnValidThread()); 198 DCHECK(thread_checker_.CalledOnValidThread());
201 199
202 libusb_close(handle_); 200 libusb_close(handle_);
203 handle_ = NULL; 201 handle_ = NULL;
204 } 202 }
205 203
206 scoped_refptr<UsbDevice> UsbDeviceHandle::device() const { 204 scoped_refptr<UsbDevice> UsbDeviceHandleImpl::GetDevice() const {
207 return device_; 205 return static_cast<UsbDevice*>(device_);
208 } 206 }
209 207
210 void UsbDeviceHandle::Close() { 208 void UsbDeviceHandleImpl::Close() {
211 DCHECK(thread_checker_.CalledOnValidThread()); 209 DCHECK(thread_checker_.CalledOnValidThread());
212 if (device_) 210 if (device_)
213 device_->Close(this); 211 device_->Close(this);
214 } 212 }
215 213
216 void UsbDeviceHandle::TransferComplete(PlatformUsbTransferHandle handle) { 214 void UsbDeviceHandleImpl::TransferComplete(PlatformUsbTransferHandle handle) {
217 DCHECK(ContainsKey(transfers_, handle)) << "Missing transfer completed"; 215 DCHECK(ContainsKey(transfers_, handle)) << "Missing transfer completed";
218 216
219 Transfer transfer = transfers_[handle]; 217 Transfer transfer = transfers_[handle];
220 transfers_.erase(handle); 218 transfers_.erase(handle);
221 219
222 DCHECK_GE(handle->actual_length, 0) << "Negative actual length received"; 220 DCHECK_GE(handle->actual_length, 0) << "Negative actual length received";
223 size_t actual_length = 221 size_t actual_length =
224 static_cast<size_t>(std::max(handle->actual_length, 0)); 222 static_cast<size_t>(std::max(handle->actual_length, 0));
225 223
226 DCHECK(transfer.length >= actual_length) 224 DCHECK(transfer.length >= actual_length)
227 << "data too big for our buffer (libusb failure?)"; 225 << "data too big for our buffer (libusb failure?)";
228 226
229 scoped_refptr<net::IOBuffer> buffer = transfer.buffer; 227 scoped_refptr<net::IOBuffer> buffer = transfer.buffer;
230 switch (transfer.transfer_type) { 228 switch (transfer.transfer_type) {
231 case USB_TRANSFER_CONTROL: 229 case USB_TRANSFER_CONTROL:
232 // If the transfer is a control transfer we do not expose the control 230 // If the transfer is a control transfer we do not expose the control
233 // setup header to the caller. This logic strips off the header if 231 // setup header to the caller. This logic strips off the header if
234 // present before invoking the callback provided with the transfer. 232 // present before invoking the callback provided with the transfer.
235 if (actual_length > 0) { 233 if (actual_length > 0) {
236 CHECK(transfer.length >= LIBUSB_CONTROL_SETUP_SIZE) 234 CHECK(transfer.length >= LIBUSB_CONTROL_SETUP_SIZE)
237 << "buffer was not correctly set: too small for the control header"; 235 << "buffer was not correctly set: too small for the control header";
238 236
239 if (transfer.length >= (LIBUSB_CONTROL_SETUP_SIZE + actual_length)) { 237 if (transfer.length >= (LIBUSB_CONTROL_SETUP_SIZE + actual_length)) {
240 // If the payload is zero bytes long, pad out the allocated buffer 238 // If the payload is zero bytes long, pad out the allocated buffer
241 // size to one byte so that an IOBuffer of that size can be allocated. 239 // size to one byte so that an IOBuffer of that size can be allocated.
242 scoped_refptr<net::IOBuffer> resized_buffer = 240 scoped_refptr<net::IOBuffer> resized_buffer =
243 new net::IOBuffer(static_cast<int>( 241 new net::IOBuffer(static_cast<int>(
244 std::max(actual_length, static_cast<size_t>(1)))); 242 std::max(actual_length, static_cast<size_t>(1))));
245 memcpy(resized_buffer->data(), 243 memcpy(resized_buffer->data(),
246 buffer->data() + LIBUSB_CONTROL_SETUP_SIZE, 244 buffer->data() + LIBUSB_CONTROL_SETUP_SIZE,
247 actual_length); 245 actual_length);
248 buffer = resized_buffer; 246 buffer = resized_buffer;
249 } 247 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 FROM_HERE, 288 FROM_HERE,
291 base::Bind(transfer.callback, 289 base::Bind(transfer.callback,
292 ConvertTransferStatus(handle->status), 290 ConvertTransferStatus(handle->status),
293 buffer, 291 buffer,
294 actual_length)); 292 actual_length));
295 293
296 // Must release interface first before actually delete this. 294 // Must release interface first before actually delete this.
297 transfer.claimed_interface = NULL; 295 transfer.claimed_interface = NULL;
298 } 296 }
299 297
300 bool UsbDeviceHandle::ClaimInterface(const int interface_number) { 298 bool UsbDeviceHandleImpl::ClaimInterface(const int interface_number) {
301 DCHECK(thread_checker_.CalledOnValidThread()); 299 DCHECK(thread_checker_.CalledOnValidThread());
302 if (!device_) 300 if (!device_)
303 return false; 301 return false;
304 if (ContainsKey(claimed_interfaces_, interface_number)) 302 if (ContainsKey(claimed_interfaces_, interface_number))
305 return true; 303 return true;
306 304
307 scoped_refptr<InterfaceClaimer> claimer = 305 scoped_refptr<InterfaceClaimer> claimer =
308 new InterfaceClaimer(this, interface_number); 306 new InterfaceClaimer(this, interface_number);
309 307
310 if (claimer->Claim()) { 308 if (claimer->Claim()) {
311 claimed_interfaces_[interface_number] = claimer; 309 claimed_interfaces_[interface_number] = claimer;
312 RefreshEndpointMap(); 310 RefreshEndpointMap();
313 return true; 311 return true;
314 } 312 }
315 return false; 313 return false;
316 } 314 }
317 315
318 bool UsbDeviceHandle::ReleaseInterface(const int interface_number) { 316 bool UsbDeviceHandleImpl::ReleaseInterface(const int interface_number) {
319 DCHECK(thread_checker_.CalledOnValidThread()); 317 DCHECK(thread_checker_.CalledOnValidThread());
320 if (!device_) 318 if (!device_)
321 return false; 319 return false;
322 if (!ContainsKey(claimed_interfaces_, interface_number)) 320 if (!ContainsKey(claimed_interfaces_, interface_number))
323 return false; 321 return false;
324 322
325 // Cancel all the transfers on that interface. 323 // Cancel all the transfers on that interface.
326 InterfaceClaimer* interface_claimer = 324 InterfaceClaimer* interface_claimer =
327 claimed_interfaces_[interface_number].get(); 325 claimed_interfaces_[interface_number].get();
328 for (TransferMap::iterator it = transfers_.begin(); it != transfers_.end(); 326 for (TransferMap::iterator it = transfers_.begin(); it != transfers_.end();
329 ++it) { 327 ++it) {
330 if (it->second.claimed_interface.get() == interface_claimer) 328 if (it->second.claimed_interface.get() == interface_claimer)
331 libusb_cancel_transfer(it->first); 329 libusb_cancel_transfer(it->first);
332 } 330 }
333 claimed_interfaces_.erase(interface_number); 331 claimed_interfaces_.erase(interface_number);
334 332
335 RefreshEndpointMap(); 333 RefreshEndpointMap();
336 return true; 334 return true;
337 } 335 }
338 336
339 bool UsbDeviceHandle::SetInterfaceAlternateSetting( 337 bool UsbDeviceHandleImpl::SetInterfaceAlternateSetting(
340 const int interface_number, 338 const int interface_number,
341 const int alternate_setting) { 339 const int alternate_setting) {
342 DCHECK(thread_checker_.CalledOnValidThread()); 340 DCHECK(thread_checker_.CalledOnValidThread());
343 if (!device_) 341 if (!device_)
344 return false; 342 return false;
345 if (!ContainsKey(claimed_interfaces_, interface_number)) 343 if (!ContainsKey(claimed_interfaces_, interface_number))
346 return false; 344 return false;
347 const int rv = libusb_set_interface_alt_setting( 345 const int rv = libusb_set_interface_alt_setting(
348 handle_, interface_number, alternate_setting); 346 handle_, interface_number, alternate_setting);
349 if (rv == 0) { 347 if (rv == 0) {
350 claimed_interfaces_[interface_number]->set_alternate_setting( 348 claimed_interfaces_[interface_number]->set_alternate_setting(
351 alternate_setting); 349 alternate_setting);
352 RefreshEndpointMap(); 350 RefreshEndpointMap();
353 return true; 351 return true;
354 } 352 }
355 return false; 353 return false;
356 } 354 }
357 355
358 bool UsbDeviceHandle::ResetDevice() { 356 bool UsbDeviceHandleImpl::ResetDevice() {
359 DCHECK(thread_checker_.CalledOnValidThread()); 357 DCHECK(thread_checker_.CalledOnValidThread());
360 if (!device_) 358 if (!device_)
361 return false; 359 return false;
362 360
363 return libusb_reset_device(handle_) == 0; 361 return libusb_reset_device(handle_) == 0;
364 } 362 }
365 363
366 bool UsbDeviceHandle::GetSerial(base::string16* serial) { 364 bool UsbDeviceHandleImpl::GetSerial(base::string16* serial) {
367 DCHECK(thread_checker_.CalledOnValidThread()); 365 DCHECK(thread_checker_.CalledOnValidThread());
368 PlatformUsbDevice device = libusb_get_device(handle_); 366 PlatformUsbDevice device = libusb_get_device(handle_);
369 libusb_device_descriptor desc; 367 libusb_device_descriptor desc;
370 368
371 if (libusb_get_device_descriptor(device, &desc) != LIBUSB_SUCCESS) 369 if (libusb_get_device_descriptor(device, &desc) != LIBUSB_SUCCESS)
372 return false; 370 return false;
373 371
374 if (desc.iSerialNumber == 0) 372 if (desc.iSerialNumber == 0)
375 return false; 373 return false;
376 374
(...skipping 27 matching lines...) Expand all
404 if ((text[0] & 255) > size) 402 if ((text[0] & 255) > size)
405 continue; 403 continue;
406 404
407 size = size / 2 - 1; 405 size = size / 2 - 1;
408 *serial = base::string16(text + 1, size); 406 *serial = base::string16(text + 1, size);
409 return true; 407 return true;
410 } 408 }
411 return false; 409 return false;
412 } 410 }
413 411
414 void UsbDeviceHandle::ControlTransfer(const UsbEndpointDirection direction, 412 void UsbDeviceHandleImpl::ControlTransfer(
415 const TransferRequestType request_type, 413 const UsbEndpointDirection direction,
416 const TransferRecipient recipient, 414 const TransferRequestType request_type,
417 const uint8 request, 415 const TransferRecipient recipient,
418 const uint16 value, 416 const uint8 request,
419 const uint16 index, 417 const uint16 value,
420 net::IOBuffer* buffer, 418 const uint16 index,
421 const size_t length, 419 net::IOBuffer* buffer,
422 const unsigned int timeout, 420 const size_t length,
423 const UsbTransferCallback& callback) { 421 const unsigned int timeout,
422 const UsbTransferCallback& callback) {
424 if (!device_) { 423 if (!device_) {
425 callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0); 424 callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0);
426 return; 425 return;
427 } 426 }
428 427
429 const size_t resized_length = LIBUSB_CONTROL_SETUP_SIZE + length; 428 const size_t resized_length = LIBUSB_CONTROL_SETUP_SIZE + length;
430 scoped_refptr<net::IOBuffer> resized_buffer( 429 scoped_refptr<net::IOBuffer> resized_buffer(
431 new net::IOBufferWithSize(static_cast<int>(resized_length))); 430 new net::IOBufferWithSize(static_cast<int>(resized_length)));
432 if (!resized_buffer) { 431 if (!resized_buffer) {
433 callback.Run(USB_TRANSFER_ERROR, buffer, 0); 432 callback.Run(USB_TRANSFER_ERROR, buffer, 0);
(...skipping 14 matching lines...) Expand all
448 static_cast<int16>(length)); 447 static_cast<int16>(length));
449 libusb_fill_control_transfer(transfer, 448 libusb_fill_control_transfer(transfer,
450 handle_, 449 handle_,
451 reinterpret_cast<uint8*>(resized_buffer->data()), 450 reinterpret_cast<uint8*>(resized_buffer->data()),
452 PlatformTransferCompletionCallback, 451 PlatformTransferCompletionCallback,
453 this, 452 this,
454 timeout); 453 timeout);
455 454
456 BrowserThread::PostTask(BrowserThread::FILE, 455 BrowserThread::PostTask(BrowserThread::FILE,
457 FROM_HERE, 456 FROM_HERE,
458 base::Bind(&UsbDeviceHandle::SubmitTransfer, 457 base::Bind(&UsbDeviceHandleImpl::SubmitTransfer,
459 this, 458 this,
460 transfer, 459 transfer,
461 USB_TRANSFER_CONTROL, 460 USB_TRANSFER_CONTROL,
462 resized_buffer, 461 resized_buffer,
463 resized_length, 462 resized_length,
464 base::MessageLoopProxy::current(), 463 base::MessageLoopProxy::current(),
465 callback)); 464 callback));
466 } 465 }
467 466
468 void UsbDeviceHandle::BulkTransfer(const UsbEndpointDirection direction, 467 void UsbDeviceHandleImpl::BulkTransfer(const UsbEndpointDirection direction,
469 const uint8 endpoint, 468 const uint8 endpoint,
470 net::IOBuffer* buffer, 469 net::IOBuffer* buffer,
471 const size_t length, 470 const size_t length,
472 const unsigned int timeout, 471 const unsigned int timeout,
473 const UsbTransferCallback& callback) { 472 const UsbTransferCallback& callback) {
474 if (!device_) { 473 if (!device_) {
475 callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0); 474 callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0);
476 return; 475 return;
477 } 476 }
478 477
479 PlatformUsbTransferHandle const transfer = libusb_alloc_transfer(0); 478 PlatformUsbTransferHandle const transfer = libusb_alloc_transfer(0);
480 const uint8 new_endpoint = ConvertTransferDirection(direction) | endpoint; 479 const uint8 new_endpoint = ConvertTransferDirection(direction) | endpoint;
481 libusb_fill_bulk_transfer(transfer, 480 libusb_fill_bulk_transfer(transfer,
482 handle_, 481 handle_,
483 new_endpoint, 482 new_endpoint,
484 reinterpret_cast<uint8*>(buffer->data()), 483 reinterpret_cast<uint8*>(buffer->data()),
485 static_cast<int>(length), 484 static_cast<int>(length),
486 PlatformTransferCompletionCallback, 485 PlatformTransferCompletionCallback,
487 this, 486 this,
488 timeout); 487 timeout);
489 488
490 BrowserThread::PostTask(BrowserThread::FILE, 489 BrowserThread::PostTask(BrowserThread::FILE,
491 FROM_HERE, 490 FROM_HERE,
492 base::Bind(&UsbDeviceHandle::SubmitTransfer, 491 base::Bind(&UsbDeviceHandleImpl::SubmitTransfer,
493 this, 492 this,
494 transfer, 493 transfer,
495 USB_TRANSFER_BULK, 494 USB_TRANSFER_BULK,
496 make_scoped_refptr(buffer), 495 make_scoped_refptr(buffer),
497 length, 496 length,
498 base::MessageLoopProxy::current(), 497 base::MessageLoopProxy::current(),
499 callback)); 498 callback));
500 } 499 }
501 500
502 void UsbDeviceHandle::InterruptTransfer(const UsbEndpointDirection direction, 501 void UsbDeviceHandleImpl::InterruptTransfer(
503 const uint8 endpoint, 502 const UsbEndpointDirection direction,
504 net::IOBuffer* buffer, 503 const uint8 endpoint,
505 const size_t length, 504 net::IOBuffer* buffer,
506 const unsigned int timeout, 505 const size_t length,
507 const UsbTransferCallback& callback) { 506 const unsigned int timeout,
507 const UsbTransferCallback& callback) {
508 if (!device_) { 508 if (!device_) {
509 callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0); 509 callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0);
510 return; 510 return;
511 } 511 }
512 512
513 PlatformUsbTransferHandle const transfer = libusb_alloc_transfer(0); 513 PlatformUsbTransferHandle const transfer = libusb_alloc_transfer(0);
514 const uint8 new_endpoint = ConvertTransferDirection(direction) | endpoint; 514 const uint8 new_endpoint = ConvertTransferDirection(direction) | endpoint;
515 libusb_fill_interrupt_transfer(transfer, 515 libusb_fill_interrupt_transfer(transfer,
516 handle_, 516 handle_,
517 new_endpoint, 517 new_endpoint,
518 reinterpret_cast<uint8*>(buffer->data()), 518 reinterpret_cast<uint8*>(buffer->data()),
519 static_cast<int>(length), 519 static_cast<int>(length),
520 PlatformTransferCompletionCallback, 520 PlatformTransferCompletionCallback,
521 this, 521 this,
522 timeout); 522 timeout);
523 BrowserThread::PostTask(BrowserThread::FILE, 523 BrowserThread::PostTask(BrowserThread::FILE,
524 FROM_HERE, 524 FROM_HERE,
525 base::Bind(&UsbDeviceHandle::SubmitTransfer, 525 base::Bind(&UsbDeviceHandleImpl::SubmitTransfer,
526 this, 526 this,
527 transfer, 527 transfer,
528 USB_TRANSFER_INTERRUPT, 528 USB_TRANSFER_INTERRUPT,
529 make_scoped_refptr(buffer), 529 make_scoped_refptr(buffer),
530 length, 530 length,
531 base::MessageLoopProxy::current(), 531 base::MessageLoopProxy::current(),
532 callback)); 532 callback));
533 } 533 }
534 534
535 void UsbDeviceHandle::IsochronousTransfer(const UsbEndpointDirection direction, 535 void UsbDeviceHandleImpl::IsochronousTransfer(
536 const uint8 endpoint, 536 const UsbEndpointDirection direction,
537 net::IOBuffer* buffer, 537 const uint8 endpoint,
538 const size_t length, 538 net::IOBuffer* buffer,
539 const unsigned int packets, 539 const size_t length,
540 const unsigned int packet_length, 540 const unsigned int packets,
541 const unsigned int timeout, 541 const unsigned int packet_length,
542 const UsbTransferCallback& callback) { 542 const unsigned int timeout,
543 const UsbTransferCallback& callback) {
543 if (!device_) { 544 if (!device_) {
544 callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0); 545 callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0);
545 return; 546 return;
546 } 547 }
547 548
548 const uint64 total_length = packets * packet_length; 549 const uint64 total_length = packets * packet_length;
549 CHECK(packets <= length && total_length <= length) 550 CHECK(packets <= length && total_length <= length)
550 << "transfer length is too small"; 551 << "transfer length is too small";
551 552
552 PlatformUsbTransferHandle const transfer = libusb_alloc_transfer(packets); 553 PlatformUsbTransferHandle const transfer = libusb_alloc_transfer(packets);
553 const uint8 new_endpoint = ConvertTransferDirection(direction) | endpoint; 554 const uint8 new_endpoint = ConvertTransferDirection(direction) | endpoint;
554 libusb_fill_iso_transfer(transfer, 555 libusb_fill_iso_transfer(transfer,
555 handle_, 556 handle_,
556 new_endpoint, 557 new_endpoint,
557 reinterpret_cast<uint8*>(buffer->data()), 558 reinterpret_cast<uint8*>(buffer->data()),
558 static_cast<int>(length), 559 static_cast<int>(length),
559 packets, 560 packets,
560 PlatformTransferCompletionCallback, 561 PlatformTransferCompletionCallback,
561 this, 562 this,
562 timeout); 563 timeout);
563 libusb_set_iso_packet_lengths(transfer, packet_length); 564 libusb_set_iso_packet_lengths(transfer, packet_length);
564 565
565 BrowserThread::PostTask(BrowserThread::FILE, 566 BrowserThread::PostTask(BrowserThread::FILE,
566 FROM_HERE, 567 FROM_HERE,
567 base::Bind(&UsbDeviceHandle::SubmitTransfer, 568 base::Bind(&UsbDeviceHandleImpl::SubmitTransfer,
568 this, 569 this,
569 transfer, 570 transfer,
570 USB_TRANSFER_ISOCHRONOUS, 571 USB_TRANSFER_ISOCHRONOUS,
571 make_scoped_refptr(buffer), 572 make_scoped_refptr(buffer),
572 length, 573 length,
573 base::MessageLoopProxy::current(), 574 base::MessageLoopProxy::current(),
574 callback)); 575 callback));
575 } 576 }
576 577
577 void UsbDeviceHandle::RefreshEndpointMap() { 578 void UsbDeviceHandleImpl::RefreshEndpointMap() {
578 DCHECK(thread_checker_.CalledOnValidThread()); 579 DCHECK(thread_checker_.CalledOnValidThread());
579 endpoint_map_.clear(); 580 endpoint_map_.clear();
580 for (ClaimedInterfaceMap::iterator it = claimed_interfaces_.begin(); 581 for (ClaimedInterfaceMap::iterator it = claimed_interfaces_.begin();
581 it != claimed_interfaces_.end(); 582 it != claimed_interfaces_.end();
582 ++it) { 583 ++it) {
583 scoped_refptr<const UsbInterfaceAltSettingDescriptor> interface_desc = 584 scoped_refptr<const UsbInterfaceAltSettingDescriptor> interface_desc =
584 interfaces_->GetInterface(it->first) 585 interfaces_->GetInterface(it->first)
585 ->GetAltSetting(it->second->alternate_setting()); 586 ->GetAltSetting(it->second->alternate_setting());
586 for (size_t i = 0; i < interface_desc->GetNumEndpoints(); i++) { 587 for (size_t i = 0; i < interface_desc->GetNumEndpoints(); i++) {
587 scoped_refptr<const UsbEndpointDescriptor> endpoint = 588 scoped_refptr<const UsbEndpointDescriptor> endpoint =
588 interface_desc->GetEndpoint(i); 589 interface_desc->GetEndpoint(i);
589 endpoint_map_[endpoint->GetAddress()] = it->first; 590 endpoint_map_[endpoint->GetAddress()] = it->first;
590 } 591 }
591 } 592 }
592 } 593 }
593 594
594 scoped_refptr<UsbDeviceHandle::InterfaceClaimer> 595 scoped_refptr<UsbDeviceHandleImpl::InterfaceClaimer>
595 UsbDeviceHandle::GetClaimedInterfaceForEndpoint(unsigned char endpoint) { 596 UsbDeviceHandleImpl::GetClaimedInterfaceForEndpoint(unsigned char endpoint) {
596 unsigned char address = endpoint & LIBUSB_ENDPOINT_ADDRESS_MASK; 597 unsigned char address = endpoint & LIBUSB_ENDPOINT_ADDRESS_MASK;
597 if (ContainsKey(endpoint_map_, address)) 598 if (ContainsKey(endpoint_map_, address))
598 return claimed_interfaces_[endpoint_map_[address]]; 599 return claimed_interfaces_[endpoint_map_[address]];
599 return NULL; 600 return NULL;
600 } 601 }
601 602
602 void UsbDeviceHandle::SubmitTransfer( 603 void UsbDeviceHandleImpl::SubmitTransfer(
603 PlatformUsbTransferHandle handle, 604 PlatformUsbTransferHandle handle,
604 UsbTransferType transfer_type, 605 UsbTransferType transfer_type,
605 net::IOBuffer* buffer, 606 net::IOBuffer* buffer,
606 const size_t length, 607 const size_t length,
607 scoped_refptr<base::MessageLoopProxy> message_loop_proxy, 608 scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
608 const UsbTransferCallback& callback) { 609 const UsbTransferCallback& callback) {
609 DCHECK(thread_checker_.CalledOnValidThread()); 610 DCHECK(thread_checker_.CalledOnValidThread());
610 if (!device_) { 611 if (!device_) {
611 message_loop_proxy->PostTask( 612 message_loop_proxy->PostTask(
612 FROM_HERE, 613 FROM_HERE,
(...skipping 15 matching lines...) Expand all
628 if (libusb_submit_transfer(handle) == LIBUSB_SUCCESS) { 629 if (libusb_submit_transfer(handle) == LIBUSB_SUCCESS) {
629 transfers_[handle] = transfer; 630 transfers_[handle] = transfer;
630 } else { 631 } else {
631 message_loop_proxy->PostTask( 632 message_loop_proxy->PostTask(
632 FROM_HERE, 633 FROM_HERE,
633 base::Bind( 634 base::Bind(
634 callback, USB_TRANSFER_ERROR, make_scoped_refptr(buffer), 0)); 635 callback, USB_TRANSFER_ERROR, make_scoped_refptr(buffer), 0));
635 } 636 }
636 } 637 }
637 638
638 void UsbDeviceHandle::InternalClose() { 639 void UsbDeviceHandleImpl::InternalClose() {
639 DCHECK(thread_checker_.CalledOnValidThread()); 640 DCHECK(thread_checker_.CalledOnValidThread());
640 if (!device_) 641 if (!device_)
641 return; 642 return;
642 643
643 // Cancel all the transfers. 644 // Cancel all the transfers.
644 for (TransferMap::iterator it = transfers_.begin(); it != transfers_.end(); 645 for (TransferMap::iterator it = transfers_.begin(); it != transfers_.end();
645 ++it) { 646 ++it) {
646 // The callback will be called some time later. 647 // The callback will be called some time later.
647 libusb_cancel_transfer(it->first); 648 libusb_cancel_transfer(it->first);
648 } 649 }
649 650
650 // Attempt-release all the interfaces. 651 // Attempt-release all the interfaces.
651 // It will be retained until the transfer cancellation is finished. 652 // It will be retained until the transfer cancellation is finished.
652 claimed_interfaces_.clear(); 653 claimed_interfaces_.clear();
653 654
654 // Cannot close device handle here. Need to wait for libusb_cancel_transfer to 655 // Cannot close device handle here. Need to wait for libusb_cancel_transfer to
655 // finish. 656 // finish.
656 device_ = NULL; 657 device_ = NULL;
657 } 658 }
658 659
659 } // namespace usb_service 660 } // namespace usb_service
OLDNEW
« no previous file with comments | « components/usb_service/usb_device_handle_impl.h ('k') | components/usb_service/usb_device_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698