Andrew Bonney
Modified version of NetServices. Fixes an issue where connections failed should the HTTP response status line be received in a packet on its own prior to any further headers. Changes are made to the HTTPClient.cpp file's readHeaders method.
drv/umtsstick/UMTSStick.cpp@0:ec559500a63f, 2011-04-08 (annotated)
- Committer:
- andrewbonney
- Date:
- Fri Apr 08 14:39:41 2011 +0000
- Revision:
- 0:ec559500a63f
Who changed what in which revision?
| User | Revision | Line number | New contents of line |
|---|---|---|---|
| andrewbonney | 0:ec559500a63f | 1 | |
| andrewbonney | 0:ec559500a63f | 2 | /* |
| andrewbonney | 0:ec559500a63f | 3 | Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com) |
| andrewbonney | 0:ec559500a63f | 4 | |
| andrewbonney | 0:ec559500a63f | 5 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| andrewbonney | 0:ec559500a63f | 6 | of this software and associated documentation files (the "Software"), to deal |
| andrewbonney | 0:ec559500a63f | 7 | in the Software without restriction, including without limitation the rights |
| andrewbonney | 0:ec559500a63f | 8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| andrewbonney | 0:ec559500a63f | 9 | copies of the Software, and to permit persons to whom the Software is |
| andrewbonney | 0:ec559500a63f | 10 | furnished to do so, subject to the following conditions: |
| andrewbonney | 0:ec559500a63f | 11 | |
| andrewbonney | 0:ec559500a63f | 12 | The above copyright notice and this permission notice shall be included in |
| andrewbonney | 0:ec559500a63f | 13 | all copies or substantial portions of the Software. |
| andrewbonney | 0:ec559500a63f | 14 | |
| andrewbonney | 0:ec559500a63f | 15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| andrewbonney | 0:ec559500a63f | 16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| andrewbonney | 0:ec559500a63f | 17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| andrewbonney | 0:ec559500a63f | 18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| andrewbonney | 0:ec559500a63f | 19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| andrewbonney | 0:ec559500a63f | 20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| andrewbonney | 0:ec559500a63f | 21 | THE SOFTWARE. |
| andrewbonney | 0:ec559500a63f | 22 | */ |
| andrewbonney | 0:ec559500a63f | 23 | |
| andrewbonney | 0:ec559500a63f | 24 | #include "netCfg.h" |
| andrewbonney | 0:ec559500a63f | 25 | #if NET_UMTS |
| andrewbonney | 0:ec559500a63f | 26 | |
| andrewbonney | 0:ec559500a63f | 27 | #include "UMTSStick.h" |
| andrewbonney | 0:ec559500a63f | 28 | |
| andrewbonney | 0:ec559500a63f | 29 | #define __DEBUG |
| andrewbonney | 0:ec559500a63f | 30 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 31 | |
| andrewbonney | 0:ec559500a63f | 32 | UMTSStick::UMTSStick() : m_host(), m_pDev(NULL) |
| andrewbonney | 0:ec559500a63f | 33 | { |
| andrewbonney | 0:ec559500a63f | 34 | |
| andrewbonney | 0:ec559500a63f | 35 | } |
| andrewbonney | 0:ec559500a63f | 36 | |
| andrewbonney | 0:ec559500a63f | 37 | UMTSStick::~UMTSStick() |
| andrewbonney | 0:ec559500a63f | 38 | { |
| andrewbonney | 0:ec559500a63f | 39 | |
| andrewbonney | 0:ec559500a63f | 40 | } |
| andrewbonney | 0:ec559500a63f | 41 | |
| andrewbonney | 0:ec559500a63f | 42 | |
| andrewbonney | 0:ec559500a63f | 43 | UMTSStickErr UMTSStick::getSerial(UsbSerial** ppUsbSerial) |
| andrewbonney | 0:ec559500a63f | 44 | { |
| andrewbonney | 0:ec559500a63f | 45 | m_host.init(); |
| andrewbonney | 0:ec559500a63f | 46 | |
| andrewbonney | 0:ec559500a63f | 47 | UMTSStickErr rc; |
| andrewbonney | 0:ec559500a63f | 48 | |
| andrewbonney | 0:ec559500a63f | 49 | rc = waitForDevice(); |
| andrewbonney | 0:ec559500a63f | 50 | if(rc) |
| andrewbonney | 0:ec559500a63f | 51 | return rc; |
| andrewbonney | 0:ec559500a63f | 52 | |
| andrewbonney | 0:ec559500a63f | 53 | //Device is now enumerated, read table |
| andrewbonney | 0:ec559500a63f | 54 | |
| andrewbonney | 0:ec559500a63f | 55 | uint16_t vid = m_pDev->getVid(); |
| andrewbonney | 0:ec559500a63f | 56 | uint16_t pid = m_pDev->getPid(); |
| andrewbonney | 0:ec559500a63f | 57 | |
| andrewbonney | 0:ec559500a63f | 58 | DBG("Configuration set: vid:%04x pid:%04x\n", vid, pid); |
| andrewbonney | 0:ec559500a63f | 59 | |
| andrewbonney | 0:ec559500a63f | 60 | bool handled = false; |
| andrewbonney | 0:ec559500a63f | 61 | bool cdfs = false; |
| andrewbonney | 0:ec559500a63f | 62 | const UMTSSwitchingInfo* pInfo; |
| andrewbonney | 0:ec559500a63f | 63 | for(int i = 0; i < UMTS_SWITCHING_COUNT; i++) |
| andrewbonney | 0:ec559500a63f | 64 | { |
| andrewbonney | 0:ec559500a63f | 65 | pInfo = &UMTSwitchingTable[i]; |
| andrewbonney | 0:ec559500a63f | 66 | if( !checkDeviceState(pInfo, &cdfs) ) |
| andrewbonney | 0:ec559500a63f | 67 | { |
| andrewbonney | 0:ec559500a63f | 68 | handled = true; |
| andrewbonney | 0:ec559500a63f | 69 | break; |
| andrewbonney | 0:ec559500a63f | 70 | } |
| andrewbonney | 0:ec559500a63f | 71 | |
| andrewbonney | 0:ec559500a63f | 72 | } //for(int i = 0; i < UMTS_SWITCHING_COUNT; i++) |
| andrewbonney | 0:ec559500a63f | 73 | |
| andrewbonney | 0:ec559500a63f | 74 | if(!handled) |
| andrewbonney | 0:ec559500a63f | 75 | { |
| andrewbonney | 0:ec559500a63f | 76 | DBG("Don't know this device!\n"); |
| andrewbonney | 0:ec559500a63f | 77 | return UMTSERR_NOTIMPLEMENTED; |
| andrewbonney | 0:ec559500a63f | 78 | } |
| andrewbonney | 0:ec559500a63f | 79 | |
| andrewbonney | 0:ec559500a63f | 80 | //Check if the device is in CDFS mode, in this case switch |
| andrewbonney | 0:ec559500a63f | 81 | if(cdfs) |
| andrewbonney | 0:ec559500a63f | 82 | { |
| andrewbonney | 0:ec559500a63f | 83 | DBG("Switching the device by sending a magic packet\n"); |
| andrewbonney | 0:ec559500a63f | 84 | |
| andrewbonney | 0:ec559500a63f | 85 | rc = switchMode(pInfo); |
| andrewbonney | 0:ec559500a63f | 86 | if(rc) |
| andrewbonney | 0:ec559500a63f | 87 | return rc; |
| andrewbonney | 0:ec559500a63f | 88 | |
| andrewbonney | 0:ec559500a63f | 89 | DBG("Now wait for device to reconnect\n"); |
| andrewbonney | 0:ec559500a63f | 90 | |
| andrewbonney | 0:ec559500a63f | 91 | m_host.releaseDevice(m_pDev); |
| andrewbonney | 0:ec559500a63f | 92 | |
| andrewbonney | 0:ec559500a63f | 93 | //Wait for device to reconnect |
| andrewbonney | 0:ec559500a63f | 94 | wait(3); |
| andrewbonney | 0:ec559500a63f | 95 | rc = waitForDevice(); |
| andrewbonney | 0:ec559500a63f | 96 | if(rc) |
| andrewbonney | 0:ec559500a63f | 97 | return rc; |
| andrewbonney | 0:ec559500a63f | 98 | } |
| andrewbonney | 0:ec559500a63f | 99 | |
| andrewbonney | 0:ec559500a63f | 100 | rc = findSerial(ppUsbSerial); |
| andrewbonney | 0:ec559500a63f | 101 | if(rc) |
| andrewbonney | 0:ec559500a63f | 102 | return rc; |
| andrewbonney | 0:ec559500a63f | 103 | |
| andrewbonney | 0:ec559500a63f | 104 | return UMTSERR_OK; |
| andrewbonney | 0:ec559500a63f | 105 | } |
| andrewbonney | 0:ec559500a63f | 106 | |
| andrewbonney | 0:ec559500a63f | 107 | UMTSStickErr UMTSStick::waitForDevice() |
| andrewbonney | 0:ec559500a63f | 108 | { |
| andrewbonney | 0:ec559500a63f | 109 | bool ready = false; |
| andrewbonney | 0:ec559500a63f | 110 | while(!ready) |
| andrewbonney | 0:ec559500a63f | 111 | { |
| andrewbonney | 0:ec559500a63f | 112 | while(!m_host.devicesCount()) |
| andrewbonney | 0:ec559500a63f | 113 | {} |
| andrewbonney | 0:ec559500a63f | 114 | wait(1); |
| andrewbonney | 0:ec559500a63f | 115 | if(m_host.devicesCount()) |
| andrewbonney | 0:ec559500a63f | 116 | ready = true; |
| andrewbonney | 0:ec559500a63f | 117 | } |
| andrewbonney | 0:ec559500a63f | 118 | |
| andrewbonney | 0:ec559500a63f | 119 | wait(2); //Wait for device to be initialized |
| andrewbonney | 0:ec559500a63f | 120 | |
| andrewbonney | 0:ec559500a63f | 121 | if(!m_host.devicesCount()) |
| andrewbonney | 0:ec559500a63f | 122 | return UMTSERR_DISCONNECTED; |
| andrewbonney | 0:ec559500a63f | 123 | |
| andrewbonney | 0:ec559500a63f | 124 | m_pDev = m_host.getDevice(0); |
| andrewbonney | 0:ec559500a63f | 125 | |
| andrewbonney | 0:ec559500a63f | 126 | while(!m_pDev->enumerated()) |
| andrewbonney | 0:ec559500a63f | 127 | { |
| andrewbonney | 0:ec559500a63f | 128 | m_host.poll(); |
| andrewbonney | 0:ec559500a63f | 129 | if(!m_host.devicesCount()) |
| andrewbonney | 0:ec559500a63f | 130 | return UMTSERR_DISCONNECTED; |
| andrewbonney | 0:ec559500a63f | 131 | } |
| andrewbonney | 0:ec559500a63f | 132 | |
| andrewbonney | 0:ec559500a63f | 133 | return UMTSERR_OK; |
| andrewbonney | 0:ec559500a63f | 134 | } |
| andrewbonney | 0:ec559500a63f | 135 | |
| andrewbonney | 0:ec559500a63f | 136 | UMTSStickErr UMTSStick::checkDeviceState(const UMTSSwitchingInfo* pInfo, bool* pCdfs) |
| andrewbonney | 0:ec559500a63f | 137 | { |
| andrewbonney | 0:ec559500a63f | 138 | uint16_t vid = m_pDev->getVid(); |
| andrewbonney | 0:ec559500a63f | 139 | uint16_t pid = m_pDev->getPid(); |
| andrewbonney | 0:ec559500a63f | 140 | bool handled = false; |
| andrewbonney | 0:ec559500a63f | 141 | if( (vid == pInfo->cdfsVid) && (pid == pInfo->cdfsPid) ) |
| andrewbonney | 0:ec559500a63f | 142 | { |
| andrewbonney | 0:ec559500a63f | 143 | DBG("Match on dongles list\n"); |
| andrewbonney | 0:ec559500a63f | 144 | if( !pInfo->targetClass ) //No specific interface to check, vid/pid couple is specific to CDFS mode |
| andrewbonney | 0:ec559500a63f | 145 | { |
| andrewbonney | 0:ec559500a63f | 146 | DBG("Found device in CDFS mode\n"); |
| andrewbonney | 0:ec559500a63f | 147 | handled = true; |
| andrewbonney | 0:ec559500a63f | 148 | *pCdfs = true; |
| andrewbonney | 0:ec559500a63f | 149 | } |
| andrewbonney | 0:ec559500a63f | 150 | else //if( !pInfo->targetClass ) |
| andrewbonney | 0:ec559500a63f | 151 | { |
| andrewbonney | 0:ec559500a63f | 152 | //Has to check if there is an interface of class targetClass |
| andrewbonney | 0:ec559500a63f | 153 | byte* desc = NULL; |
| andrewbonney | 0:ec559500a63f | 154 | int c = 0; |
| andrewbonney | 0:ec559500a63f | 155 | |
| andrewbonney | 0:ec559500a63f | 156 | while( !m_pDev->getInterfaceDescriptor(1, c++, &desc) ) |
| andrewbonney | 0:ec559500a63f | 157 | { |
| andrewbonney | 0:ec559500a63f | 158 | if( desc[5] == pInfo->targetClass ) |
| andrewbonney | 0:ec559500a63f | 159 | { |
| andrewbonney | 0:ec559500a63f | 160 | DBG("Found device in Serial mode\n"); |
| andrewbonney | 0:ec559500a63f | 161 | handled = true; |
| andrewbonney | 0:ec559500a63f | 162 | *pCdfs = false; |
| andrewbonney | 0:ec559500a63f | 163 | break; |
| andrewbonney | 0:ec559500a63f | 164 | } |
| andrewbonney | 0:ec559500a63f | 165 | } |
| andrewbonney | 0:ec559500a63f | 166 | |
| andrewbonney | 0:ec559500a63f | 167 | if(!handled) |
| andrewbonney | 0:ec559500a63f | 168 | { |
| andrewbonney | 0:ec559500a63f | 169 | //All interfaces were tried, so we are in CDFS mode |
| andrewbonney | 0:ec559500a63f | 170 | DBG("Found device in CDFS mode\n"); |
| andrewbonney | 0:ec559500a63f | 171 | handled = true; |
| andrewbonney | 0:ec559500a63f | 172 | *pCdfs = true; |
| andrewbonney | 0:ec559500a63f | 173 | } |
| andrewbonney | 0:ec559500a63f | 174 | } //if( !pInfo->targetClass ) |
| andrewbonney | 0:ec559500a63f | 175 | } //if( (vid == pInfo->cdfsVid) && (pid == pInfo->cdfsPid) ) |
| andrewbonney | 0:ec559500a63f | 176 | else |
| andrewbonney | 0:ec559500a63f | 177 | { |
| andrewbonney | 0:ec559500a63f | 178 | //Try every vid/pid couple of the serial list |
| andrewbonney | 0:ec559500a63f | 179 | for( int i = 0; i < 16 ; i++) |
| andrewbonney | 0:ec559500a63f | 180 | { |
| andrewbonney | 0:ec559500a63f | 181 | if(!pInfo->serialPidList[i]) |
| andrewbonney | 0:ec559500a63f | 182 | break; |
| andrewbonney | 0:ec559500a63f | 183 | if( (pInfo->serialVid == vid) && (pInfo->serialPidList[i] == pid) ) |
| andrewbonney | 0:ec559500a63f | 184 | { |
| andrewbonney | 0:ec559500a63f | 185 | DBG("Found device in Serial mode\n"); |
| andrewbonney | 0:ec559500a63f | 186 | handled = true; |
| andrewbonney | 0:ec559500a63f | 187 | *pCdfs = false; |
| andrewbonney | 0:ec559500a63f | 188 | break; |
| andrewbonney | 0:ec559500a63f | 189 | } |
| andrewbonney | 0:ec559500a63f | 190 | } |
| andrewbonney | 0:ec559500a63f | 191 | } //if( (vid == pInfo->cdfsVid) && (pid == pInfo->cdfsPid) ) |
| andrewbonney | 0:ec559500a63f | 192 | |
| andrewbonney | 0:ec559500a63f | 193 | if(!handled) |
| andrewbonney | 0:ec559500a63f | 194 | return UMTSERR_NOTFOUND; |
| andrewbonney | 0:ec559500a63f | 195 | |
| andrewbonney | 0:ec559500a63f | 196 | return UMTSERR_OK; |
| andrewbonney | 0:ec559500a63f | 197 | } |
| andrewbonney | 0:ec559500a63f | 198 | |
| andrewbonney | 0:ec559500a63f | 199 | UMTSStickErr UMTSStick::switchMode(const UMTSSwitchingInfo* pInfo) |
| andrewbonney | 0:ec559500a63f | 200 | { |
| andrewbonney | 0:ec559500a63f | 201 | if(!pInfo->huaweiPacket) //Send SCSI packet on first bulk ep |
| andrewbonney | 0:ec559500a63f | 202 | { |
| andrewbonney | 0:ec559500a63f | 203 | //Find first bulk ep |
| andrewbonney | 0:ec559500a63f | 204 | byte* desc = NULL; |
| andrewbonney | 0:ec559500a63f | 205 | int c = 0; |
| andrewbonney | 0:ec559500a63f | 206 | |
| andrewbonney | 0:ec559500a63f | 207 | UsbEndpoint *pEpOut = NULL; |
| andrewbonney | 0:ec559500a63f | 208 | |
| andrewbonney | 0:ec559500a63f | 209 | while( !m_pDev->getInterfaceDescriptor(1, c++, &desc) ) |
| andrewbonney | 0:ec559500a63f | 210 | { |
| andrewbonney | 0:ec559500a63f | 211 | byte* p = desc; |
| andrewbonney | 0:ec559500a63f | 212 | int epNum = 0; |
| andrewbonney | 0:ec559500a63f | 213 | p = p + p[0]; //Move to next descriptor (which should be an ep descriptor) |
| andrewbonney | 0:ec559500a63f | 214 | while (epNum < desc[4]) //Eps count in this if |
| andrewbonney | 0:ec559500a63f | 215 | { |
| andrewbonney | 0:ec559500a63f | 216 | if (p[1] != USB_DESCRIPTOR_TYPE_ENDPOINT) |
| andrewbonney | 0:ec559500a63f | 217 | break; |
| andrewbonney | 0:ec559500a63f | 218 | |
| andrewbonney | 0:ec559500a63f | 219 | if( (p[3] == 0x02) && !(p[2] & 0x80) ) //Bulk endpoint, out |
| andrewbonney | 0:ec559500a63f | 220 | { |
| andrewbonney | 0:ec559500a63f | 221 | DBG("Found bulk ep %02x\n", p[2]); |
| andrewbonney | 0:ec559500a63f | 222 | pEpOut = new UsbEndpoint( m_pDev, p[2], false, USB_BULK, *((uint16_t*)&p[4]) ); |
| andrewbonney | 0:ec559500a63f | 223 | break; |
| andrewbonney | 0:ec559500a63f | 224 | } |
| andrewbonney | 0:ec559500a63f | 225 | |
| andrewbonney | 0:ec559500a63f | 226 | p = p + p[0]; //Move to next ep desc |
| andrewbonney | 0:ec559500a63f | 227 | epNum++; |
| andrewbonney | 0:ec559500a63f | 228 | } |
| andrewbonney | 0:ec559500a63f | 229 | if(pEpOut) |
| andrewbonney | 0:ec559500a63f | 230 | break; |
| andrewbonney | 0:ec559500a63f | 231 | } |
| andrewbonney | 0:ec559500a63f | 232 | |
| andrewbonney | 0:ec559500a63f | 233 | if(!pEpOut) |
| andrewbonney | 0:ec559500a63f | 234 | return UMTSERR_NOTFOUND; |
| andrewbonney | 0:ec559500a63f | 235 | |
| andrewbonney | 0:ec559500a63f | 236 | //Send SCSI packet |
| andrewbonney | 0:ec559500a63f | 237 | |
| andrewbonney | 0:ec559500a63f | 238 | DBG("Sending SCSI Packet to switch\n"); |
| andrewbonney | 0:ec559500a63f | 239 | byte ramCdfsBuf[31]; |
| andrewbonney | 0:ec559500a63f | 240 | memcpy(ramCdfsBuf, pInfo->cdfsPacket, 31); |
| andrewbonney | 0:ec559500a63f | 241 | pEpOut->transfer((volatile byte*)ramCdfsBuf, 31); |
| andrewbonney | 0:ec559500a63f | 242 | while(pEpOut->status() == USBERR_PROCESSING); |
| andrewbonney | 0:ec559500a63f | 243 | int ret = pEpOut->status(); |
| andrewbonney | 0:ec559500a63f | 244 | if((ret < 0) && (ret !=USBERR_DISCONNECTED)) //Packet was not transfered |
| andrewbonney | 0:ec559500a63f | 245 | { |
| andrewbonney | 0:ec559500a63f | 246 | DBG("Usb error %d\n", ret); |
| andrewbonney | 0:ec559500a63f | 247 | delete pEpOut; |
| andrewbonney | 0:ec559500a63f | 248 | return UMTSERR_USBERR; |
| andrewbonney | 0:ec559500a63f | 249 | } |
| andrewbonney | 0:ec559500a63f | 250 | |
| andrewbonney | 0:ec559500a63f | 251 | delete pEpOut; |
| andrewbonney | 0:ec559500a63f | 252 | } |
| andrewbonney | 0:ec559500a63f | 253 | else |
| andrewbonney | 0:ec559500a63f | 254 | { |
| andrewbonney | 0:ec559500a63f | 255 | UsbErr usbErr; |
| andrewbonney | 0:ec559500a63f | 256 | //Send the Huawei-specific control packet |
| andrewbonney | 0:ec559500a63f | 257 | usbErr = m_pDev->controlSend(0, 0x03, 1, 0, NULL, 0); |
| andrewbonney | 0:ec559500a63f | 258 | if(usbErr && (usbErr != USBERR_DISCONNECTED)) |
| andrewbonney | 0:ec559500a63f | 259 | return UMTSERR_USBERR; |
| andrewbonney | 0:ec559500a63f | 260 | } |
| andrewbonney | 0:ec559500a63f | 261 | |
| andrewbonney | 0:ec559500a63f | 262 | DBG("The stick should be switching in serial mode now\n"); |
| andrewbonney | 0:ec559500a63f | 263 | |
| andrewbonney | 0:ec559500a63f | 264 | return UMTSERR_OK; |
| andrewbonney | 0:ec559500a63f | 265 | } |
| andrewbonney | 0:ec559500a63f | 266 | |
| andrewbonney | 0:ec559500a63f | 267 | UMTSStickErr UMTSStick::findSerial(UsbSerial** ppUsbSerial) |
| andrewbonney | 0:ec559500a63f | 268 | { |
| andrewbonney | 0:ec559500a63f | 269 | byte* desc = NULL; |
| andrewbonney | 0:ec559500a63f | 270 | int c = 0; |
| andrewbonney | 0:ec559500a63f | 271 | |
| andrewbonney | 0:ec559500a63f | 272 | int epOut = 0; |
| andrewbonney | 0:ec559500a63f | 273 | int epIn = 0; |
| andrewbonney | 0:ec559500a63f | 274 | |
| andrewbonney | 0:ec559500a63f | 275 | while( !m_pDev->getInterfaceDescriptor(1, c++, &desc) ) |
| andrewbonney | 0:ec559500a63f | 276 | { |
| andrewbonney | 0:ec559500a63f | 277 | byte* p = desc; |
| andrewbonney | 0:ec559500a63f | 278 | int epNum = 0; |
| andrewbonney | 0:ec559500a63f | 279 | |
| andrewbonney | 0:ec559500a63f | 280 | DBG("Interface of type %02x\n", desc[5]); |
| andrewbonney | 0:ec559500a63f | 281 | |
| andrewbonney | 0:ec559500a63f | 282 | if(desc[5] != 0xFF) //Not a serial-like if |
| andrewbonney | 0:ec559500a63f | 283 | continue; |
| andrewbonney | 0:ec559500a63f | 284 | |
| andrewbonney | 0:ec559500a63f | 285 | p = p + p[0]; //Move to next descriptor (which should be an ep descriptor) |
| andrewbonney | 0:ec559500a63f | 286 | while (epNum < desc[4]) //Eps count in this if |
| andrewbonney | 0:ec559500a63f | 287 | { |
| andrewbonney | 0:ec559500a63f | 288 | if (p[1] == USB_DESCRIPTOR_TYPE_ENDPOINT) |
| andrewbonney | 0:ec559500a63f | 289 | { |
| andrewbonney | 0:ec559500a63f | 290 | if( (p[3] == 0x02) && !(p[2] & 0x80) && !epOut ) //Bulk endpoint, out |
| andrewbonney | 0:ec559500a63f | 291 | { |
| andrewbonney | 0:ec559500a63f | 292 | DBG("Found bulk out ep %02x of payload size %04x\n", p[2], *((uint16_t*)&p[4])); |
| andrewbonney | 0:ec559500a63f | 293 | epOut = p[2] & 0x7F; |
| andrewbonney | 0:ec559500a63f | 294 | } |
| andrewbonney | 0:ec559500a63f | 295 | |
| andrewbonney | 0:ec559500a63f | 296 | if( (p[3] == 0x02) && (p[2] & 0x80) && !epIn ) //Bulk endpoint, in |
| andrewbonney | 0:ec559500a63f | 297 | { |
| andrewbonney | 0:ec559500a63f | 298 | DBG("Found bulk in ep %02x of payload size %04x\n", p[2], *((uint16_t*)&p[4])); |
| andrewbonney | 0:ec559500a63f | 299 | epIn = p[2] & 0x7F; |
| andrewbonney | 0:ec559500a63f | 300 | } |
| andrewbonney | 0:ec559500a63f | 301 | |
| andrewbonney | 0:ec559500a63f | 302 | if(epOut && epIn) |
| andrewbonney | 0:ec559500a63f | 303 | break; |
| andrewbonney | 0:ec559500a63f | 304 | } |
| andrewbonney | 0:ec559500a63f | 305 | |
| andrewbonney | 0:ec559500a63f | 306 | p = p + p[0]; //Move to next ep desc |
| andrewbonney | 0:ec559500a63f | 307 | epNum++; |
| andrewbonney | 0:ec559500a63f | 308 | } |
| andrewbonney | 0:ec559500a63f | 309 | |
| andrewbonney | 0:ec559500a63f | 310 | if(epOut && epIn) |
| andrewbonney | 0:ec559500a63f | 311 | break; |
| andrewbonney | 0:ec559500a63f | 312 | } |
| andrewbonney | 0:ec559500a63f | 313 | |
| andrewbonney | 0:ec559500a63f | 314 | if(!epOut || !epIn) |
| andrewbonney | 0:ec559500a63f | 315 | return UMTSERR_NOTFOUND; |
| andrewbonney | 0:ec559500a63f | 316 | |
| andrewbonney | 0:ec559500a63f | 317 | DBG("Endpoints found, create serial object\n"); |
| andrewbonney | 0:ec559500a63f | 318 | |
| andrewbonney | 0:ec559500a63f | 319 | *ppUsbSerial = new UsbSerial(m_pDev, epIn, epOut); |
| andrewbonney | 0:ec559500a63f | 320 | |
| andrewbonney | 0:ec559500a63f | 321 | DBG("UsbSerial object created\n"); |
| andrewbonney | 0:ec559500a63f | 322 | |
| andrewbonney | 0:ec559500a63f | 323 | return UMTSERR_OK; |
| andrewbonney | 0:ec559500a63f | 324 | } |
| andrewbonney | 0:ec559500a63f | 325 | |
| andrewbonney | 0:ec559500a63f | 326 | #endif |