Zachary Russell / USBHost_Modified

USBHost library with fixes

Dependencies:   mbed-rtos FATFileSystem

Dependents:   mbedica

USBHost3GModule/WANDongleSerialPort.cpp@0:b176d95bb38f, 2018-12-13 (annotated)

Committer:
zrussell3
Date:
Thu Dec 13 19:24:21 2018 +0000
Revision:
0:b176d95bb38f
Modified USBHost library to fix modifier input

Who changed what in which revision?

UserRevisionLine numberNew contents of line
zrussell3 0:b176d95bb38f 1 /* Copyright (c) 2010-2012 mbed.org, MIT License
zrussell3 0:b176d95bb38f 2 *
zrussell3 0:b176d95bb38f 3 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
zrussell3 0:b176d95bb38f 4 * and associated documentation files (the "Software"), to deal in the Software without
zrussell3 0:b176d95bb38f 5 * restriction, including without limitation the rights to use, copy, modify, merge, publish,
zrussell3 0:b176d95bb38f 6 * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
zrussell3 0:b176d95bb38f 7 * Software is furnished to do so, subject to the following conditions:
zrussell3 0:b176d95bb38f 8 *
zrussell3 0:b176d95bb38f 9 * The above copyright notice and this permission notice shall be included in all copies or
zrussell3 0:b176d95bb38f 10 * substantial portions of the Software.
zrussell3 0:b176d95bb38f 11 *
zrussell3 0:b176d95bb38f 12 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
zrussell3 0:b176d95bb38f 13 * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
zrussell3 0:b176d95bb38f 14 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
zrussell3 0:b176d95bb38f 15 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
zrussell3 0:b176d95bb38f 16 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
zrussell3 0:b176d95bb38f 17 */
zrussell3 0:b176d95bb38f 18
zrussell3 0:b176d95bb38f 19 #include "USBHostConf.h"
zrussell3 0:b176d95bb38f 20
zrussell3 0:b176d95bb38f 21 #ifdef USBHOST_3GMODULE
zrussell3 0:b176d95bb38f 22
zrussell3 0:b176d95bb38f 23 #define __DEBUG__ 0
zrussell3 0:b176d95bb38f 24 #ifndef __MODULE__
zrussell3 0:b176d95bb38f 25 #define __MODULE__ "WANDongleSerialPort.cpp"
zrussell3 0:b176d95bb38f 26 #endif
zrussell3 0:b176d95bb38f 27
zrussell3 0:b176d95bb38f 28 #include "dbg.h"
zrussell3 0:b176d95bb38f 29 #include <stdint.h>
zrussell3 0:b176d95bb38f 30 #include "rtos.h"
zrussell3 0:b176d95bb38f 31
zrussell3 0:b176d95bb38f 32 #include "WANDongleSerialPort.h"
zrussell3 0:b176d95bb38f 33
zrussell3 0:b176d95bb38f 34 WANDongleSerialPort::WANDongleSerialPort() : cb_tx_en(false), cb_rx_en(false), listener(NULL)
zrussell3 0:b176d95bb38f 35 {
zrussell3 0:b176d95bb38f 36 reset();
zrussell3 0:b176d95bb38f 37 }
zrussell3 0:b176d95bb38f 38
zrussell3 0:b176d95bb38f 39 void WANDongleSerialPort::init(USBHost* pHost)
zrussell3 0:b176d95bb38f 40 {
zrussell3 0:b176d95bb38f 41 host = pHost;
zrussell3 0:b176d95bb38f 42 }
zrussell3 0:b176d95bb38f 43
zrussell3 0:b176d95bb38f 44 void WANDongleSerialPort::reset()
zrussell3 0:b176d95bb38f 45 {
zrussell3 0:b176d95bb38f 46 tx_mtx.lock();
zrussell3 0:b176d95bb38f 47 rx_mtx.lock();
zrussell3 0:b176d95bb38f 48
zrussell3 0:b176d95bb38f 49 bulk_in = NULL;
zrussell3 0:b176d95bb38f 50 bulk_out = NULL;
zrussell3 0:b176d95bb38f 51
zrussell3 0:b176d95bb38f 52 buf_out_len = 0;
zrussell3 0:b176d95bb38f 53 max_out_size = 0;
zrussell3 0:b176d95bb38f 54 lock_tx = false;
zrussell3 0:b176d95bb38f 55 cb_tx_pending = false;
zrussell3 0:b176d95bb38f 56
zrussell3 0:b176d95bb38f 57 buf_in_len = 0;
zrussell3 0:b176d95bb38f 58 buf_in_read_pos = 0;
zrussell3 0:b176d95bb38f 59 lock_rx = false;
zrussell3 0:b176d95bb38f 60 cb_rx_pending = false;
zrussell3 0:b176d95bb38f 61
zrussell3 0:b176d95bb38f 62 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 63 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 64 }
zrussell3 0:b176d95bb38f 65
zrussell3 0:b176d95bb38f 66 int WANDongleSerialPort::readPacket()
zrussell3 0:b176d95bb38f 67 {
zrussell3 0:b176d95bb38f 68 USB_DBG("Read packet on %p", this);
zrussell3 0:b176d95bb38f 69 rx_mtx.lock();
zrussell3 0:b176d95bb38f 70 if(lock_rx)
zrussell3 0:b176d95bb38f 71 {
zrussell3 0:b176d95bb38f 72 USB_ERR("Fail");
zrussell3 0:b176d95bb38f 73 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 74 return -1;
zrussell3 0:b176d95bb38f 75 }
zrussell3 0:b176d95bb38f 76
zrussell3 0:b176d95bb38f 77 if( bulk_in == NULL )
zrussell3 0:b176d95bb38f 78 {
zrussell3 0:b176d95bb38f 79 USB_WARN("Port is disconnected");
zrussell3 0:b176d95bb38f 80 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 81 return -1;
zrussell3 0:b176d95bb38f 82 }
zrussell3 0:b176d95bb38f 83
zrussell3 0:b176d95bb38f 84 lock_rx = true; //Receiving
zrussell3 0:b176d95bb38f 85 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 86 // USB_DBG("readPacket");
zrussell3 0:b176d95bb38f 87 //lock_rx.lock();
zrussell3 0:b176d95bb38f 88 USB_TYPE res = host->bulkRead(dev, (USBEndpoint *)bulk_in, buf_in, ((USBEndpoint *)bulk_in)->getSize(), false); //Queue transfer
zrussell3 0:b176d95bb38f 89 if(res != USB_TYPE_PROCESSING)
zrussell3 0:b176d95bb38f 90 {
zrussell3 0:b176d95bb38f 91 //lock_rx.unlock();
zrussell3 0:b176d95bb38f 92 USB_ERR("host->bulkRead() returned %d", res);
zrussell3 0:b176d95bb38f 93 Thread::wait(100);
zrussell3 0:b176d95bb38f 94 return -1;
zrussell3 0:b176d95bb38f 95 }
zrussell3 0:b176d95bb38f 96 return 0;
zrussell3 0:b176d95bb38f 97 }
zrussell3 0:b176d95bb38f 98
zrussell3 0:b176d95bb38f 99 int WANDongleSerialPort::writePacket()
zrussell3 0:b176d95bb38f 100 {
zrussell3 0:b176d95bb38f 101 tx_mtx.lock();
zrussell3 0:b176d95bb38f 102 if(lock_tx)
zrussell3 0:b176d95bb38f 103 {
zrussell3 0:b176d95bb38f 104 USB_ERR("Fail");
zrussell3 0:b176d95bb38f 105 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 106 return -1;
zrussell3 0:b176d95bb38f 107 }
zrussell3 0:b176d95bb38f 108
zrussell3 0:b176d95bb38f 109 if( bulk_out == NULL )
zrussell3 0:b176d95bb38f 110 {
zrussell3 0:b176d95bb38f 111 USB_WARN("Port is disconnected");
zrussell3 0:b176d95bb38f 112 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 113 return -1;
zrussell3 0:b176d95bb38f 114 }
zrussell3 0:b176d95bb38f 115
zrussell3 0:b176d95bb38f 116 lock_tx = true; //Transmitting
zrussell3 0:b176d95bb38f 117 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 118 // USB_DBG("writePacket");
zrussell3 0:b176d95bb38f 119
zrussell3 0:b176d95bb38f 120 //lock_tx.lock();
zrussell3 0:b176d95bb38f 121 USB_TYPE res = host->bulkWrite(dev, (USBEndpoint *)bulk_out, buf_out, buf_out_len, false); //Queue transfer
zrussell3 0:b176d95bb38f 122 if(res != USB_TYPE_PROCESSING)
zrussell3 0:b176d95bb38f 123 {
zrussell3 0:b176d95bb38f 124 //lock_tx.unlock();
zrussell3 0:b176d95bb38f 125 USB_ERR("host->bulkWrite() returned %d", res);
zrussell3 0:b176d95bb38f 126 Thread::wait(100);
zrussell3 0:b176d95bb38f 127 return -1;
zrussell3 0:b176d95bb38f 128 }
zrussell3 0:b176d95bb38f 129 return 0;
zrussell3 0:b176d95bb38f 130 }
zrussell3 0:b176d95bb38f 131
zrussell3 0:b176d95bb38f 132 int WANDongleSerialPort::putc(int c)
zrussell3 0:b176d95bb38f 133 {
zrussell3 0:b176d95bb38f 134 tx_mtx.lock();
zrussell3 0:b176d95bb38f 135 if(!lock_tx)
zrussell3 0:b176d95bb38f 136 {
zrussell3 0:b176d95bb38f 137 if(buf_out_len < max_out_size)
zrussell3 0:b176d95bb38f 138 {
zrussell3 0:b176d95bb38f 139 buf_out[buf_out_len] = (uint8_t)c;
zrussell3 0:b176d95bb38f 140 buf_out_len++;
zrussell3 0:b176d95bb38f 141 }
zrussell3 0:b176d95bb38f 142 }
zrussell3 0:b176d95bb38f 143 else
zrussell3 0:b176d95bb38f 144 {
zrussell3 0:b176d95bb38f 145 USB_ERR("CAN'T WRITE!");
zrussell3 0:b176d95bb38f 146 }
zrussell3 0:b176d95bb38f 147 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 148 return c;
zrussell3 0:b176d95bb38f 149 }
zrussell3 0:b176d95bb38f 150
zrussell3 0:b176d95bb38f 151 int WANDongleSerialPort::getc()
zrussell3 0:b176d95bb38f 152 {
zrussell3 0:b176d95bb38f 153 rx_mtx.lock();
zrussell3 0:b176d95bb38f 154 int c = 0;
zrussell3 0:b176d95bb38f 155 if(!lock_rx)
zrussell3 0:b176d95bb38f 156 {
zrussell3 0:b176d95bb38f 157 if(buf_in_read_pos < buf_in_len)
zrussell3 0:b176d95bb38f 158 {
zrussell3 0:b176d95bb38f 159 c = (int)buf_in[buf_in_read_pos];
zrussell3 0:b176d95bb38f 160 buf_in_read_pos++;
zrussell3 0:b176d95bb38f 161 }
zrussell3 0:b176d95bb38f 162 }
zrussell3 0:b176d95bb38f 163 else
zrussell3 0:b176d95bb38f 164 {
zrussell3 0:b176d95bb38f 165 USB_ERR("CAN'T READ!");
zrussell3 0:b176d95bb38f 166 }
zrussell3 0:b176d95bb38f 167 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 168 return c;
zrussell3 0:b176d95bb38f 169 }
zrussell3 0:b176d95bb38f 170
zrussell3 0:b176d95bb38f 171 int WANDongleSerialPort::readable()
zrussell3 0:b176d95bb38f 172 {
zrussell3 0:b176d95bb38f 173 rx_mtx.lock();
zrussell3 0:b176d95bb38f 174 if (lock_rx)
zrussell3 0:b176d95bb38f 175 {
zrussell3 0:b176d95bb38f 176 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 177 return 0;
zrussell3 0:b176d95bb38f 178 }
zrussell3 0:b176d95bb38f 179
zrussell3 0:b176d95bb38f 180 /* if( !lock_rx.trylock() )
zrussell3 0:b176d95bb38f 181 {
zrussell3 0:b176d95bb38f 182 return 0;
zrussell3 0:b176d95bb38f 183 }*/
zrussell3 0:b176d95bb38f 184 int res = buf_in_len - buf_in_read_pos;
zrussell3 0:b176d95bb38f 185 //lock_rx.unlock();
zrussell3 0:b176d95bb38f 186 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 187 return res;
zrussell3 0:b176d95bb38f 188 }
zrussell3 0:b176d95bb38f 189
zrussell3 0:b176d95bb38f 190 int WANDongleSerialPort::writeable()
zrussell3 0:b176d95bb38f 191 {
zrussell3 0:b176d95bb38f 192 tx_mtx.lock();
zrussell3 0:b176d95bb38f 193 if (lock_tx)
zrussell3 0:b176d95bb38f 194 {
zrussell3 0:b176d95bb38f 195 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 196 return 0;
zrussell3 0:b176d95bb38f 197 }
zrussell3 0:b176d95bb38f 198
zrussell3 0:b176d95bb38f 199 /*if( !lock_tx.trylock() )
zrussell3 0:b176d95bb38f 200 {
zrussell3 0:b176d95bb38f 201 return 0;
zrussell3 0:b176d95bb38f 202 }*/
zrussell3 0:b176d95bb38f 203 int res = max_out_size - buf_out_len;
zrussell3 0:b176d95bb38f 204 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 205 //lock_tx.unlock();
zrussell3 0:b176d95bb38f 206 return res;
zrussell3 0:b176d95bb38f 207 }
zrussell3 0:b176d95bb38f 208
zrussell3 0:b176d95bb38f 209 void WANDongleSerialPort::attach(IUSBHostSerialListener* pListener)
zrussell3 0:b176d95bb38f 210 {
zrussell3 0:b176d95bb38f 211 if(pListener == NULL)
zrussell3 0:b176d95bb38f 212 {
zrussell3 0:b176d95bb38f 213 setupIrq(false, RxIrq);
zrussell3 0:b176d95bb38f 214 setupIrq(false, TxIrq);
zrussell3 0:b176d95bb38f 215 }
zrussell3 0:b176d95bb38f 216 listener = pListener;
zrussell3 0:b176d95bb38f 217 if(pListener != NULL)
zrussell3 0:b176d95bb38f 218 {
zrussell3 0:b176d95bb38f 219 setupIrq(true, RxIrq);
zrussell3 0:b176d95bb38f 220 setupIrq(true, TxIrq);
zrussell3 0:b176d95bb38f 221 }
zrussell3 0:b176d95bb38f 222 }
zrussell3 0:b176d95bb38f 223
zrussell3 0:b176d95bb38f 224 void WANDongleSerialPort::setupIrq(bool en, IrqType irq /*= RxIrq*/)
zrussell3 0:b176d95bb38f 225 {
zrussell3 0:b176d95bb38f 226 switch(irq)
zrussell3 0:b176d95bb38f 227 {
zrussell3 0:b176d95bb38f 228 case RxIrq:
zrussell3 0:b176d95bb38f 229 rx_mtx.lock();
zrussell3 0:b176d95bb38f 230 cb_rx_en = en;
zrussell3 0:b176d95bb38f 231 if(en && cb_rx_pending)
zrussell3 0:b176d95bb38f 232 {
zrussell3 0:b176d95bb38f 233 cb_rx_pending = false;
zrussell3 0:b176d95bb38f 234 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 235 listener->readable(); //Process the interrupt that was raised
zrussell3 0:b176d95bb38f 236 }
zrussell3 0:b176d95bb38f 237 else
zrussell3 0:b176d95bb38f 238 {
zrussell3 0:b176d95bb38f 239 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 240 }
zrussell3 0:b176d95bb38f 241 break;
zrussell3 0:b176d95bb38f 242 case TxIrq:
zrussell3 0:b176d95bb38f 243 tx_mtx.lock();
zrussell3 0:b176d95bb38f 244 cb_tx_en = en;
zrussell3 0:b176d95bb38f 245 if(en && cb_tx_pending)
zrussell3 0:b176d95bb38f 246 {
zrussell3 0:b176d95bb38f 247 cb_tx_pending = false;
zrussell3 0:b176d95bb38f 248 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 249 listener->writeable(); //Process the interrupt that was raised
zrussell3 0:b176d95bb38f 250 }
zrussell3 0:b176d95bb38f 251 else
zrussell3 0:b176d95bb38f 252 {
zrussell3 0:b176d95bb38f 253 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 254 }
zrussell3 0:b176d95bb38f 255 break;
zrussell3 0:b176d95bb38f 256 }
zrussell3 0:b176d95bb38f 257 }
zrussell3 0:b176d95bb38f 258
zrussell3 0:b176d95bb38f 259
zrussell3 0:b176d95bb38f 260 void WANDongleSerialPort::connect( USBDeviceConnected* pDev, USBEndpoint* pInEp, USBEndpoint* pOutEp )
zrussell3 0:b176d95bb38f 261 {
zrussell3 0:b176d95bb38f 262 dev = pDev;
zrussell3 0:b176d95bb38f 263 bulk_in = pInEp;
zrussell3 0:b176d95bb38f 264 bulk_out = pOutEp;
zrussell3 0:b176d95bb38f 265 max_out_size = bulk_out->getSize();
zrussell3 0:b176d95bb38f 266 if( max_out_size > WANDONGLE_MAX_OUTEP_SIZE )
zrussell3 0:b176d95bb38f 267 {
zrussell3 0:b176d95bb38f 268 max_out_size = WANDONGLE_MAX_OUTEP_SIZE;
zrussell3 0:b176d95bb38f 269 }
zrussell3 0:b176d95bb38f 270 bulk_in->attach(this, &WANDongleSerialPort::rxHandler);
zrussell3 0:b176d95bb38f 271 bulk_out->attach(this, &WANDongleSerialPort::txHandler);
zrussell3 0:b176d95bb38f 272 readPacket(); //Start receiving data
zrussell3 0:b176d95bb38f 273 }
zrussell3 0:b176d95bb38f 274
zrussell3 0:b176d95bb38f 275 void WANDongleSerialPort::disconnect( )
zrussell3 0:b176d95bb38f 276 {
zrussell3 0:b176d95bb38f 277 reset();
zrussell3 0:b176d95bb38f 278 }
zrussell3 0:b176d95bb38f 279
zrussell3 0:b176d95bb38f 280 //Private methods
zrussell3 0:b176d95bb38f 281
zrussell3 0:b176d95bb38f 282
zrussell3 0:b176d95bb38f 283 void WANDongleSerialPort::rxHandler()
zrussell3 0:b176d95bb38f 284 {
zrussell3 0:b176d95bb38f 285 if (((USBEndpoint *) bulk_in)->getState() == USB_TYPE_IDLE) //Success
zrussell3 0:b176d95bb38f 286 {
zrussell3 0:b176d95bb38f 287 buf_in_read_pos = 0;
zrussell3 0:b176d95bb38f 288 buf_in_len = ((USBEndpoint *) bulk_in)->getLengthTransferred(); //Update length
zrussell3 0:b176d95bb38f 289 //lock_rx.unlock();
zrussell3 0:b176d95bb38f 290 rx_mtx.lock();
zrussell3 0:b176d95bb38f 291 lock_rx = false; //Transmission complete
zrussell3 0:b176d95bb38f 292 if(cb_rx_en)
zrussell3 0:b176d95bb38f 293 {
zrussell3 0:b176d95bb38f 294 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 295 listener->readable(); //Call handler from the IRQ context
zrussell3 0:b176d95bb38f 296 //readPacket() should be called by the handler subsequently once the buffer has been emptied
zrussell3 0:b176d95bb38f 297 }
zrussell3 0:b176d95bb38f 298 else
zrussell3 0:b176d95bb38f 299 {
zrussell3 0:b176d95bb38f 300 cb_rx_pending = true; //Queue the callback
zrussell3 0:b176d95bb38f 301 rx_mtx.unlock();
zrussell3 0:b176d95bb38f 302 }
zrussell3 0:b176d95bb38f 303
zrussell3 0:b176d95bb38f 304 }
zrussell3 0:b176d95bb38f 305 else //Error, try reading again
zrussell3 0:b176d95bb38f 306 {
zrussell3 0:b176d95bb38f 307 //lock_rx.unlock();
zrussell3 0:b176d95bb38f 308 USB_DBG("Trying again");
zrussell3 0:b176d95bb38f 309 readPacket();
zrussell3 0:b176d95bb38f 310 }
zrussell3 0:b176d95bb38f 311 }
zrussell3 0:b176d95bb38f 312
zrussell3 0:b176d95bb38f 313 void WANDongleSerialPort::txHandler()
zrussell3 0:b176d95bb38f 314 {
zrussell3 0:b176d95bb38f 315 if (((USBEndpoint *) bulk_out)->getState() == USB_TYPE_IDLE) //Success
zrussell3 0:b176d95bb38f 316 {
zrussell3 0:b176d95bb38f 317 tx_mtx.lock();
zrussell3 0:b176d95bb38f 318 buf_out_len = 0; //Reset length
zrussell3 0:b176d95bb38f 319 lock_tx = false; //Transmission complete
zrussell3 0:b176d95bb38f 320 //lock_tx.unlock();
zrussell3 0:b176d95bb38f 321 if(cb_tx_en)
zrussell3 0:b176d95bb38f 322 {
zrussell3 0:b176d95bb38f 323 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 324 listener->writeable(); //Call handler from the IRQ context
zrussell3 0:b176d95bb38f 325 //writePacket() should be called by the handler subsequently once the buffer has been filled
zrussell3 0:b176d95bb38f 326 }
zrussell3 0:b176d95bb38f 327 else
zrussell3 0:b176d95bb38f 328 {
zrussell3 0:b176d95bb38f 329 cb_tx_pending = true; //Queue the callback
zrussell3 0:b176d95bb38f 330 tx_mtx.unlock();
zrussell3 0:b176d95bb38f 331 }
zrussell3 0:b176d95bb38f 332 }
zrussell3 0:b176d95bb38f 333 else //Error, try reading again
zrussell3 0:b176d95bb38f 334 {
zrussell3 0:b176d95bb38f 335 //lock_tx.unlock();
zrussell3 0:b176d95bb38f 336 writePacket();
zrussell3 0:b176d95bb38f 337 }
zrussell3 0:b176d95bb38f 338 }
zrussell3 0:b176d95bb38f 339
zrussell3 0:b176d95bb38f 340 #endif /* USBHOST_3GMODULE */