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

Side by Side Diff: chrome/browser/usb/usb_device_handle.h

Issue 16316004: Separate usb device handle from usb device. (deprecate) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the threading mess Created 7 years, 5 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
« no previous file with comments | « chrome/browser/usb/usb_device.cc ('k') | chrome/browser/usb/usb_device_handle.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_USB_USB_DEVICE_H_ 5 #ifndef CHROME_BROWSER_USB_USB_DEVICE_HANDLE_H_
6 #define CHROME_BROWSER_USB_USB_DEVICE_H_ 6 #define CHROME_BROWSER_USB_USB_DEVICE_HANDLE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/synchronization/lock.h" 12 #include "base/threading/thread_checker.h"
13 #include "chrome/browser/usb/usb_interface.h" 13 #include "chrome/browser/usb/usb_interface.h"
14 #include "net/base/completion_callback.h" 14 #include "net/base/completion_callback.h"
15 #include "net/base/io_buffer.h" 15 #include "net/base/io_buffer.h"
16 #include "third_party/libusb/src/libusb/libusb.h"
16 17
17 struct libusb_device; 18 typedef struct libusb_device_handle* PlatformUsbDeviceHandle;
18 struct libusb_device_handle; 19 typedef struct libusb_iso_packet_descriptor* PlatformUsbIsoPacketDescriptor;
19 struct libusb_iso_packet_descriptor; 20 typedef struct libusb_transfer* PlatformUsbTransferHandle;
20 struct libusb_transfer;
21
22 typedef libusb_device* PlatformUsbDevice;
23 typedef libusb_device_handle* PlatformUsbDeviceHandle;
24 typedef libusb_iso_packet_descriptor* PlatformUsbIsoPacketDescriptor;
25 typedef libusb_transfer* PlatformUsbTransferHandle;
26 21
27 class UsbService; 22 class UsbService;
28 23
29 namespace net { 24 namespace net {
30 class IOBuffer; 25 class IOBuffer;
31 } // namespace net 26 } // namespace net
32 27
33 enum UsbTransferStatus { 28 enum UsbTransferStatus {
34 USB_TRANSFER_COMPLETED = 0, 29 USB_TRANSFER_COMPLETED = 0,
35 USB_TRANSFER_ERROR, 30 USB_TRANSFER_ERROR,
36 USB_TRANSFER_TIMEOUT, 31 USB_TRANSFER_TIMEOUT,
37 USB_TRANSFER_CANCELLED, 32 USB_TRANSFER_CANCELLED,
38 USB_TRANSFER_STALLED, 33 USB_TRANSFER_STALLED,
39 USB_TRANSFER_DISCONNECT, 34 USB_TRANSFER_DISCONNECT,
40 USB_TRANSFER_OVERFLOW, 35 USB_TRANSFER_OVERFLOW,
41 USB_TRANSFER_LENGTH_SHORT, 36 USB_TRANSFER_LENGTH_SHORT,
42 }; 37 };
43 38
44 typedef base::Callback<void(UsbTransferStatus, scoped_refptr<net::IOBuffer>, 39 typedef base::Callback<void(UsbTransferStatus, scoped_refptr<net::IOBuffer>,
45 size_t)> UsbTransferCallback; 40 size_t)> UsbTransferCallback;
46 typedef base::Callback<void(bool)> UsbInterfaceCallback; 41 typedef base::Callback<void(bool)> UsbInterfaceCallback;
47 42
48 // A UsbDevice wraps the platform's underlying representation of what a USB 43 // A UsbDevice wraps the platform's underlying representation of what a USB
49 // device actually is, and provides accessors for performing many of the 44 // device actually is, and provides accessors for performing many of the
50 // standard USB operations. 45 // standard USB operations.
51 class UsbDevice : public base::RefCounted<UsbDevice> { 46 //
47 // This class should be used on FILE thread.
48 class UsbDeviceHandle : public base::RefCountedThreadSafe<UsbDeviceHandle> {
52 public: 49 public:
53 enum TransferRequestType { STANDARD, CLASS, VENDOR, RESERVED }; 50 enum TransferRequestType {
54 enum TransferRecipient { DEVICE, INTERFACE, ENDPOINT, OTHER }; 51 STANDARD,
55 52 CLASS,
56 // Usually you will not want to directly create a UsbDevice, favoring to let 53 VENDOR,
57 // the UsbService take care of the logistics of getting a platform device 54 RESERVED
58 // handle and handling events for it. 55 };
59 UsbDevice(UsbService* service, PlatformUsbDeviceHandle handle); 56 enum TransferRecipient {
57 DEVICE,
58 INTERFACE,
59 ENDPOINT,
60 OTHER
61 };
60 62
61 PlatformUsbDeviceHandle handle() { return handle_; } 63 PlatformUsbDeviceHandle handle() { return handle_; }
64 int device() const { return device_; }
65 uint16 vendor_id() const { return vendor_id_; }
66 uint16 product_id() const { return product_id_; }
62 67
63 // Close the USB device and release the underlying platform device. |callback| 68 // Close the USB device and release the underlying platform device. |callback|
64 // is invoked after the device has been closed. 69 // is invoked after the device has been closed.
65 virtual void Close(const base::Callback<void()>& callback); 70 virtual void Close(const base::Callback<void()>& callback);
66 71
67 virtual void ListInterfaces(UsbConfigDescriptor* config, 72 virtual void ListInterfaces(UsbConfigDescriptor* config,
68 const UsbInterfaceCallback& callback); 73 const UsbInterfaceCallback& callback);
69 74
70 virtual void ClaimInterface(const int interface_number, 75 virtual void ClaimInterface(const int interface_number,
71 const UsbInterfaceCallback& callback); 76 const UsbInterfaceCallback& callback);
72 77
73 virtual void ReleaseInterface(const int interface_number, 78 virtual void ReleaseInterface(const int interface_number,
74 const UsbInterfaceCallback& callback); 79 const UsbInterfaceCallback& callback);
75 80
76 virtual void SetInterfaceAlternateSetting( 81 virtual void SetInterfaceAlternateSetting(
77 const int interface_number, 82 const int interface_number, const int alternate_setting,
78 const int alternate_setting,
79 const UsbInterfaceCallback& callback); 83 const UsbInterfaceCallback& callback);
80 84
85 // The following four methods can be called on any thread.
81 virtual void ControlTransfer(const UsbEndpointDirection direction, 86 virtual void ControlTransfer(const UsbEndpointDirection direction,
82 const TransferRequestType request_type, 87 const TransferRequestType request_type,
83 const TransferRecipient recipient, 88 const TransferRecipient recipient,
84 const uint8 request, 89 const uint8 request, const uint16 value,
85 const uint16 value, 90 const uint16 index, net::IOBuffer* buffer,
86 const uint16 index, 91 const size_t length, const unsigned int timeout,
87 net::IOBuffer* buffer,
88 const size_t length,
89 const unsigned int timeout,
90 const UsbTransferCallback& callback); 92 const UsbTransferCallback& callback);
91 93
92 virtual void BulkTransfer(const UsbEndpointDirection direction, 94 virtual void BulkTransfer(const UsbEndpointDirection direction,
93 const uint8 endpoint, 95 const uint8 endpoint, net::IOBuffer* buffer,
94 net::IOBuffer* buffer, 96 const size_t length, const unsigned int timeout,
95 const size_t length,
96 const unsigned int timeout,
97 const UsbTransferCallback& callback); 97 const UsbTransferCallback& callback);
98 98
99 virtual void InterruptTransfer(const UsbEndpointDirection direction, 99 virtual void InterruptTransfer(const UsbEndpointDirection direction,
100 const uint8 endpoint, 100 const uint8 endpoint, net::IOBuffer* buffer,
101 net::IOBuffer* buffer,
102 const size_t length, 101 const size_t length,
103 const unsigned int timeout, 102 const unsigned int timeout,
104 const UsbTransferCallback& callback); 103 const UsbTransferCallback& callback);
105 104
106 virtual void IsochronousTransfer(const UsbEndpointDirection direction, 105 virtual void IsochronousTransfer(const UsbEndpointDirection direction,
107 const uint8 endpoint, 106 const uint8 endpoint, net::IOBuffer* buffer,
108 net::IOBuffer* buffer,
109 const size_t length, 107 const size_t length,
110 const unsigned int packets, 108 const unsigned int packets,
111 const unsigned int packet_length, 109 const unsigned int packet_length,
112 const unsigned int timeout, 110 const unsigned int timeout,
113 const UsbTransferCallback& callback); 111 const UsbTransferCallback& callback);
114 112
115 virtual void ResetDevice(const base::Callback<void(bool)>& callback); 113 virtual void ResetDevice(const base::Callback<void(bool)>& callback);
116 114
117 // Normal code should not call this function. It is called by the platform's
118 // callback mechanism in such a way that it cannot be made private. Invokes
119 // the callbacks associated with a given transfer, and removes it from the
120 // in-flight transfer set.
121 void TransferComplete(PlatformUsbTransferHandle transfer);
122
123 protected: 115 protected:
124 // This constructor variant is for use in testing only. 116 // This constructor variant is for use in testing only.
125 UsbDevice(); 117 UsbDeviceHandle();
126 118
127 friend class base::RefCounted<UsbDevice>; 119 friend class base::RefCountedThreadSafe<UsbDeviceHandle>;
128 virtual ~UsbDevice(); 120 virtual ~UsbDeviceHandle();
129 121
130 private: 122 private:
131 struct Transfer { 123 struct Transfer {
132 Transfer(); 124 Transfer();
133 ~Transfer(); 125 ~Transfer();
134 126
135 UsbTransferType transfer_type; 127 UsbTransferType transfer_type;
136 scoped_refptr<net::IOBuffer> buffer; 128 scoped_refptr<net::IOBuffer> buffer;
137 size_t length; 129 size_t length;
138 UsbTransferCallback callback; 130 UsbTransferCallback callback;
139 }; 131 };
140 132
141 // Checks that the device has not yet been closed. 133 // UsbDeviceHandle should only be created from UsbDevice class.
142 void CheckDevice(); 134 UsbDeviceHandle(UsbService* service, int device, const uint16 vendor_id,
135 const uint16 product_id, PlatformUsbDeviceHandle handle);
136
137 friend class UsbDevice;
138
139 static void HandleTransferCompletionFileThread(
140 PlatformUsbTransferHandle transfer);
141
142 static void LIBUSB_CALL HandleTransferCompletion(
143 PlatformUsbTransferHandle transfer);
144
145 void TransferComplete(PlatformUsbTransferHandle transfer);
146
147 // This only called from UsbDevice, thus always from FILE thread.
148 void InternalClose();
143 149
144 // Submits a transfer and starts tracking it. Retains the buffer and copies 150 // Submits a transfer and starts tracking it. Retains the buffer and copies
145 // the completion callback until the transfer finishes, whereupon it invokes 151 // the completion callback until the transfer finishes, whereupon it invokes
146 // the callback then releases the buffer. 152 // the callback then releases the buffer.
147 void SubmitTransfer(PlatformUsbTransferHandle handle, 153 void SubmitTransfer(PlatformUsbTransferHandle handle,
148 UsbTransferType transfer_type, 154 UsbTransferType transfer_type, net::IOBuffer* buffer,
149 net::IOBuffer* buffer, 155 const size_t length, const UsbTransferCallback& callback);
150 const size_t length,
151 const UsbTransferCallback& callback);
152 156
153 // The UsbService isn't referenced here to prevent a dependency cycle between 157 // The UsbService isn't referenced here to prevent a dependency cycle between
154 // the service and the devices. Since a service owns every device, and is 158 // the service and the devices. Since a service owns every device, and is
155 // responsible for its destruction, there is no case where a UsbDevice can 159 // responsible for its destruction, there is no case where a UsbDevice can
156 // have outlived its originating UsbService. 160 // have outlived its originating UsbService.
157 UsbService* const service_; 161 UsbService* const service_;
162 const int device_;
163 const uint16 vendor_id_;
164 const uint16 product_id_;
165
158 PlatformUsbDeviceHandle handle_; 166 PlatformUsbDeviceHandle handle_;
159 167
160 // transfers_ tracks all in-flight transfers associated with this device, 168 // transfers_ tracks all in-flight transfers associated with this device,
161 // allowing the device to retain the buffer and callback associated with a 169 // allowing the device to retain the buffer and callback associated with a
162 // transfer until such time that it completes. It is protected by lock_. 170 // transfer until such time that it completes.
163 base::Lock lock_;
164 std::map<PlatformUsbTransferHandle, Transfer> transfers_; 171 std::map<PlatformUsbTransferHandle, Transfer> transfers_;
165 172
166 DISALLOW_COPY_AND_ASSIGN(UsbDevice); 173 base::ThreadChecker thread_checker_;
174 DISALLOW_COPY_AND_ASSIGN(UsbDeviceHandle);
167 }; 175 };
168 176
169 #endif // CHROME_BROWSER_USB_USB_DEVICE_H_ 177 #endif // CHROME_BROWSER_USB_USB_DEVICE_HANDLE_H_
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_device.cc ('k') | chrome/browser/usb/usb_device_handle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698