OLD | NEW |
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 "device/serial/serial_connection_factory.h" | 5 #include "device/serial/serial_connection_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "device/serial/serial_connection.h" | 9 #include "device/serial/serial_connection.h" |
10 #include "device/serial/serial_io_handler.h" | 10 #include "device/serial/serial_io_handler.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 } | 28 } |
29 | 29 |
30 } // namespace | 30 } // namespace |
31 | 31 |
32 class SerialConnectionFactory::ConnectTask | 32 class SerialConnectionFactory::ConnectTask |
33 : public base::RefCountedThreadSafe<SerialConnectionFactory::ConnectTask> { | 33 : public base::RefCountedThreadSafe<SerialConnectionFactory::ConnectTask> { |
34 public: | 34 public: |
35 ConnectTask(scoped_refptr<SerialConnectionFactory> factory, | 35 ConnectTask(scoped_refptr<SerialConnectionFactory> factory, |
36 const std::string& path, | 36 const std::string& path, |
37 serial::ConnectionOptionsPtr options, | 37 serial::ConnectionOptionsPtr options, |
38 mojo::InterfaceRequest<serial::Connection> connection_request); | 38 mojo::InterfaceRequest<serial::Connection> connection_request, |
| 39 mojo::InterfaceRequest<serial::DataSink> sink, |
| 40 mojo::InterfaceRequest<serial::DataSource> source); |
39 void Run(); | 41 void Run(); |
40 | 42 |
41 private: | 43 private: |
42 friend class base::RefCountedThreadSafe<SerialConnectionFactory::ConnectTask>; | 44 friend class base::RefCountedThreadSafe<SerialConnectionFactory::ConnectTask>; |
43 virtual ~ConnectTask(); | 45 virtual ~ConnectTask(); |
44 void Connect(); | 46 void Connect(); |
45 void OnConnected(bool success); | 47 void OnConnected(bool success); |
46 | 48 |
47 scoped_refptr<SerialConnectionFactory> factory_; | 49 scoped_refptr<SerialConnectionFactory> factory_; |
48 const std::string path_; | 50 const std::string path_; |
49 serial::ConnectionOptionsPtr options_; | 51 serial::ConnectionOptionsPtr options_; |
50 mojo::InterfaceRequest<serial::Connection> connection_request_; | 52 mojo::InterfaceRequest<serial::Connection> connection_request_; |
| 53 mojo::InterfaceRequest<serial::DataSink> sink_; |
| 54 mojo::InterfaceRequest<serial::DataSource> source_; |
51 scoped_refptr<SerialIoHandler> io_handler_; | 55 scoped_refptr<SerialIoHandler> io_handler_; |
52 | 56 |
53 DISALLOW_COPY_AND_ASSIGN(ConnectTask); | 57 DISALLOW_COPY_AND_ASSIGN(ConnectTask); |
54 }; | 58 }; |
55 | 59 |
56 SerialConnectionFactory::SerialConnectionFactory( | 60 SerialConnectionFactory::SerialConnectionFactory( |
57 const IoHandlerFactory& io_handler_factory, | 61 const IoHandlerFactory& io_handler_factory, |
58 scoped_refptr<base::MessageLoopProxy> connect_message_loop) | 62 scoped_refptr<base::MessageLoopProxy> connect_message_loop) |
59 : io_handler_factory_(io_handler_factory), | 63 : io_handler_factory_(io_handler_factory), |
60 connect_message_loop_(connect_message_loop) { | 64 connect_message_loop_(connect_message_loop) { |
61 } | 65 } |
62 | 66 |
63 void SerialConnectionFactory::CreateConnection( | 67 void SerialConnectionFactory::CreateConnection( |
64 const std::string& path, | 68 const std::string& path, |
65 serial::ConnectionOptionsPtr options, | 69 serial::ConnectionOptionsPtr options, |
66 mojo::InterfaceRequest<serial::Connection> connection_request) { | 70 mojo::InterfaceRequest<serial::Connection> connection_request, |
67 scoped_refptr<ConnectTask> task( | 71 mojo::InterfaceRequest<serial::DataSink> sink, |
68 new ConnectTask(this, path, options.Pass(), connection_request.Pass())); | 72 mojo::InterfaceRequest<serial::DataSource> source) { |
| 73 scoped_refptr<ConnectTask> task(new ConnectTask(this, |
| 74 path, |
| 75 options.Pass(), |
| 76 connection_request.Pass(), |
| 77 sink.Pass(), |
| 78 source.Pass())); |
69 task->Run(); | 79 task->Run(); |
70 } | 80 } |
71 | 81 |
72 SerialConnectionFactory::~SerialConnectionFactory() { | 82 SerialConnectionFactory::~SerialConnectionFactory() { |
73 } | 83 } |
74 | 84 |
75 SerialConnectionFactory::ConnectTask::ConnectTask( | 85 SerialConnectionFactory::ConnectTask::ConnectTask( |
76 scoped_refptr<SerialConnectionFactory> factory, | 86 scoped_refptr<SerialConnectionFactory> factory, |
77 const std::string& path, | 87 const std::string& path, |
78 serial::ConnectionOptionsPtr options, | 88 serial::ConnectionOptionsPtr options, |
79 mojo::InterfaceRequest<serial::Connection> connection_request) | 89 mojo::InterfaceRequest<serial::Connection> connection_request, |
| 90 mojo::InterfaceRequest<serial::DataSink> sink, |
| 91 mojo::InterfaceRequest<serial::DataSource> source) |
80 : factory_(factory), | 92 : factory_(factory), |
81 path_(path), | 93 path_(path), |
82 options_(options.Pass()), | 94 options_(options.Pass()), |
83 connection_request_(connection_request.Pass()) { | 95 connection_request_(connection_request.Pass()), |
| 96 sink_(sink.Pass()), |
| 97 source_(source.Pass()) { |
84 } | 98 } |
85 | 99 |
86 void SerialConnectionFactory::ConnectTask::Run() { | 100 void SerialConnectionFactory::ConnectTask::Run() { |
87 factory_->connect_message_loop_->PostTask( | 101 factory_->connect_message_loop_->PostTask( |
88 FROM_HERE, | 102 FROM_HERE, |
89 base::Bind(&SerialConnectionFactory::ConnectTask::Connect, this)); | 103 base::Bind(&SerialConnectionFactory::ConnectTask::Connect, this)); |
90 } | 104 } |
91 | 105 |
92 SerialConnectionFactory::ConnectTask::~ConnectTask() { | 106 SerialConnectionFactory::ConnectTask::~ConnectTask() { |
93 } | 107 } |
94 | 108 |
95 void SerialConnectionFactory::ConnectTask::Connect() { | 109 void SerialConnectionFactory::ConnectTask::Connect() { |
96 io_handler_ = factory_->io_handler_factory_.Run(); | 110 io_handler_ = factory_->io_handler_factory_.Run(); |
97 io_handler_->Open( | 111 io_handler_->Open( |
98 path_, | 112 path_, |
99 base::Bind(&SerialConnectionFactory::ConnectTask::OnConnected, this)); | 113 base::Bind(&SerialConnectionFactory::ConnectTask::OnConnected, this)); |
100 } | 114 } |
101 | 115 |
102 void SerialConnectionFactory::ConnectTask::OnConnected(bool success) { | 116 void SerialConnectionFactory::ConnectTask::OnConnected(bool success) { |
103 DCHECK(io_handler_); | 117 DCHECK(io_handler_); |
104 if (!success) | 118 if (!success) |
105 return; | 119 return; |
106 if (!options_) | 120 if (!options_) |
107 options_ = serial::ConnectionOptions::New(); | 121 options_ = serial::ConnectionOptions::New(); |
108 FillDefaultConnectionOptions(options_.get()); | 122 FillDefaultConnectionOptions(options_.get()); |
109 if (!io_handler_->ConfigurePort(*options_)) | 123 if (!io_handler_->ConfigurePort(*options_)) |
110 return; | 124 return; |
111 mojo::BindToRequest(new SerialConnection(io_handler_), &connection_request_); | 125 mojo::BindToRequest( |
| 126 new SerialConnection(io_handler_, sink_.Pass(), source_.Pass()), |
| 127 &connection_request_); |
112 } | 128 } |
113 | 129 |
114 } // namespace device | 130 } // namespace device |
OLD | NEW |