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/usb/UsbEndpoint.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 "UsbEndpoint.h" |
| andrewbonney | 0:ec559500a63f | 25 | |
| andrewbonney | 0:ec559500a63f | 26 | #include "UsbDevice.h" |
| andrewbonney | 0:ec559500a63f | 27 | |
| andrewbonney | 0:ec559500a63f | 28 | #include "usb_mem.h" |
| andrewbonney | 0:ec559500a63f | 29 | |
| andrewbonney | 0:ec559500a63f | 30 | #include "netCfg.h" |
| andrewbonney | 0:ec559500a63f | 31 | #if NET_USB |
| andrewbonney | 0:ec559500a63f | 32 | |
| andrewbonney | 0:ec559500a63f | 33 | //#define __DEBUG |
| andrewbonney | 0:ec559500a63f | 34 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 35 | |
| andrewbonney | 0:ec559500a63f | 36 | UsbEndpoint::UsbEndpoint( UsbDevice* pDevice, uint8_t ep, bool dir, UsbEndpointType type, uint16_t size, int addr /*= -1*/ ) : m_pDevice(pDevice), m_result(true), m_status((int)USBERR_OK), m_len(0), m_pBufStartPtr(NULL), |
| andrewbonney | 0:ec559500a63f | 37 | m_pCbItem(NULL), m_pCbMeth(NULL), m_pNextEp(NULL) |
| andrewbonney | 0:ec559500a63f | 38 | { |
| andrewbonney | 0:ec559500a63f | 39 | //Insert into Eps list |
| andrewbonney | 0:ec559500a63f | 40 | //FIXME: Assert that no USB interrupt is triggered meanwhile |
| andrewbonney | 0:ec559500a63f | 41 | if(m_pHeadEp) |
| andrewbonney | 0:ec559500a63f | 42 | { |
| andrewbonney | 0:ec559500a63f | 43 | m_pNextEp = m_pHeadEp; |
| andrewbonney | 0:ec559500a63f | 44 | m_pHeadEp = this; |
| andrewbonney | 0:ec559500a63f | 45 | } |
| andrewbonney | 0:ec559500a63f | 46 | else |
| andrewbonney | 0:ec559500a63f | 47 | { |
| andrewbonney | 0:ec559500a63f | 48 | m_pNextEp = NULL; |
| andrewbonney | 0:ec559500a63f | 49 | m_pHeadEp = this; |
| andrewbonney | 0:ec559500a63f | 50 | } |
| andrewbonney | 0:ec559500a63f | 51 | |
| andrewbonney | 0:ec559500a63f | 52 | m_pEd = (volatile HCED*)usb_get_ed(); |
| andrewbonney | 0:ec559500a63f | 53 | |
| andrewbonney | 0:ec559500a63f | 54 | m_pTdHead = (volatile HCTD*)usb_get_td(); |
| andrewbonney | 0:ec559500a63f | 55 | m_pTdTail = (volatile HCTD*)usb_get_td(); |
| andrewbonney | 0:ec559500a63f | 56 | |
| andrewbonney | 0:ec559500a63f | 57 | //printf("\r\n--m_pEd = %p--\r\n", m_pEd); |
| andrewbonney | 0:ec559500a63f | 58 | DBG("m_pEd = %p\n", m_pEd); |
| andrewbonney | 0:ec559500a63f | 59 | DBG("m_pTdHead = %p\n", m_pTdHead); |
| andrewbonney | 0:ec559500a63f | 60 | DBG("m_pTdTail = %p\n", m_pTdTail); |
| andrewbonney | 0:ec559500a63f | 61 | |
| andrewbonney | 0:ec559500a63f | 62 | //Init Ed & Td |
| andrewbonney | 0:ec559500a63f | 63 | //printf("\r\n--Ep Init--\r\n"); |
| andrewbonney | 0:ec559500a63f | 64 | memset((void*)m_pEd, 0, sizeof(HCED)); |
| andrewbonney | 0:ec559500a63f | 65 | //printf("\r\n--Td Init--\r\n"); |
| andrewbonney | 0:ec559500a63f | 66 | |
| andrewbonney | 0:ec559500a63f | 67 | memset((void*)m_pTdHead, 0, sizeof(HCTD)); |
| andrewbonney | 0:ec559500a63f | 68 | memset((void*)m_pTdTail, 0, sizeof(HCTD)); |
| andrewbonney | 0:ec559500a63f | 69 | |
| andrewbonney | 0:ec559500a63f | 70 | if(addr == -1) |
| andrewbonney | 0:ec559500a63f | 71 | addr = pDevice->m_addr; |
| andrewbonney | 0:ec559500a63f | 72 | |
| andrewbonney | 0:ec559500a63f | 73 | //Setup Ed |
| andrewbonney | 0:ec559500a63f | 74 | //printf("\r\n--Ep Setup--\r\n"); |
| andrewbonney | 0:ec559500a63f | 75 | m_pEd->Control = addr | /* USB address */ |
| andrewbonney | 0:ec559500a63f | 76 | ((ep & 0x7F) << 7) | /* Endpoint address */ |
| andrewbonney | 0:ec559500a63f | 77 | (type!=USB_CONTROL?((dir?2:1) << 11):0) | /* direction : Out = 1, 2 = In */ |
| andrewbonney | 0:ec559500a63f | 78 | (size << 16); /* MaxPkt Size */ |
| andrewbonney | 0:ec559500a63f | 79 | |
| andrewbonney | 0:ec559500a63f | 80 | m_dir = dir; |
| andrewbonney | 0:ec559500a63f | 81 | m_setup = false; |
| andrewbonney | 0:ec559500a63f | 82 | m_type = type; |
| andrewbonney | 0:ec559500a63f | 83 | |
| andrewbonney | 0:ec559500a63f | 84 | m_pEd->TailTd = m_pEd->HeadTd = (uint32_t) m_pTdTail; //Empty TD list |
| andrewbonney | 0:ec559500a63f | 85 | |
| andrewbonney | 0:ec559500a63f | 86 | DBG("Before link\n"); |
| andrewbonney | 0:ec559500a63f | 87 | |
| andrewbonney | 0:ec559500a63f | 88 | //printf("\r\n--Ep Reg--\r\n"); |
| andrewbonney | 0:ec559500a63f | 89 | //Append Ed to Ed list |
| andrewbonney | 0:ec559500a63f | 90 | volatile HCED* prevEd; |
| andrewbonney | 0:ec559500a63f | 91 | switch( m_type ) |
| andrewbonney | 0:ec559500a63f | 92 | { |
| andrewbonney | 0:ec559500a63f | 93 | case USB_CONTROL: |
| andrewbonney | 0:ec559500a63f | 94 | prevEd = (volatile HCED*) LPC_USB->HcControlHeadED; |
| andrewbonney | 0:ec559500a63f | 95 | break; |
| andrewbonney | 0:ec559500a63f | 96 | case USB_BULK: |
| andrewbonney | 0:ec559500a63f | 97 | default: |
| andrewbonney | 0:ec559500a63f | 98 | prevEd = (volatile HCED*) LPC_USB->HcBulkHeadED; |
| andrewbonney | 0:ec559500a63f | 99 | break; |
| andrewbonney | 0:ec559500a63f | 100 | } |
| andrewbonney | 0:ec559500a63f | 101 | |
| andrewbonney | 0:ec559500a63f | 102 | DBG("prevEd is %p\n", prevEd); |
| andrewbonney | 0:ec559500a63f | 103 | |
| andrewbonney | 0:ec559500a63f | 104 | if(prevEd) |
| andrewbonney | 0:ec559500a63f | 105 | { |
| andrewbonney | 0:ec559500a63f | 106 | DBG("prevEd set\n") |
| andrewbonney | 0:ec559500a63f | 107 | |
| andrewbonney | 0:ec559500a63f | 108 | while(prevEd->Next) |
| andrewbonney | 0:ec559500a63f | 109 | { |
| andrewbonney | 0:ec559500a63f | 110 | DBG("prevEd->Next = %08x\n", prevEd->Next); |
| andrewbonney | 0:ec559500a63f | 111 | prevEd = (volatile HCED*) prevEd->Next; |
| andrewbonney | 0:ec559500a63f | 112 | } |
| andrewbonney | 0:ec559500a63f | 113 | prevEd->Next = (uint32_t) m_pEd; |
| andrewbonney | 0:ec559500a63f | 114 | |
| andrewbonney | 0:ec559500a63f | 115 | } |
| andrewbonney | 0:ec559500a63f | 116 | else |
| andrewbonney | 0:ec559500a63f | 117 | { |
| andrewbonney | 0:ec559500a63f | 118 | switch( m_type ) |
| andrewbonney | 0:ec559500a63f | 119 | { |
| andrewbonney | 0:ec559500a63f | 120 | case USB_CONTROL: |
| andrewbonney | 0:ec559500a63f | 121 | LPC_USB->HcControlHeadED = (uint32_t) m_pEd; |
| andrewbonney | 0:ec559500a63f | 122 | break; |
| andrewbonney | 0:ec559500a63f | 123 | case USB_BULK: |
| andrewbonney | 0:ec559500a63f | 124 | default: |
| andrewbonney | 0:ec559500a63f | 125 | LPC_USB->HcBulkHeadED = (uint32_t) m_pEd; |
| andrewbonney | 0:ec559500a63f | 126 | break; |
| andrewbonney | 0:ec559500a63f | 127 | } |
| andrewbonney | 0:ec559500a63f | 128 | } |
| andrewbonney | 0:ec559500a63f | 129 | |
| andrewbonney | 0:ec559500a63f | 130 | DBG("Ep init\n"); |
| andrewbonney | 0:ec559500a63f | 131 | } |
| andrewbonney | 0:ec559500a63f | 132 | |
| andrewbonney | 0:ec559500a63f | 133 | UsbEndpoint::~UsbEndpoint() |
| andrewbonney | 0:ec559500a63f | 134 | { |
| andrewbonney | 0:ec559500a63f | 135 | //Remove from Eps list |
| andrewbonney | 0:ec559500a63f | 136 | //FIXME: Assert that no USB interrupt is triggered meanwhile |
| andrewbonney | 0:ec559500a63f | 137 | if(m_pHeadEp != this) |
| andrewbonney | 0:ec559500a63f | 138 | { |
| andrewbonney | 0:ec559500a63f | 139 | UsbEndpoint* prevEp = m_pHeadEp; |
| andrewbonney | 0:ec559500a63f | 140 | while(prevEp->m_pNextEp != this) |
| andrewbonney | 0:ec559500a63f | 141 | prevEp = prevEp->m_pNextEp; |
| andrewbonney | 0:ec559500a63f | 142 | prevEp->m_pNextEp = m_pNextEp; |
| andrewbonney | 0:ec559500a63f | 143 | } |
| andrewbonney | 0:ec559500a63f | 144 | else |
| andrewbonney | 0:ec559500a63f | 145 | { |
| andrewbonney | 0:ec559500a63f | 146 | m_pHeadEp = m_pNextEp; |
| andrewbonney | 0:ec559500a63f | 147 | } |
| andrewbonney | 0:ec559500a63f | 148 | |
| andrewbonney | 0:ec559500a63f | 149 | m_pEd->Control |= ED_SKIP; //Skip this Ep in queue |
| andrewbonney | 0:ec559500a63f | 150 | |
| andrewbonney | 0:ec559500a63f | 151 | //Remove from queue |
| andrewbonney | 0:ec559500a63f | 152 | volatile HCED* prevEd; |
| andrewbonney | 0:ec559500a63f | 153 | switch( m_type ) |
| andrewbonney | 0:ec559500a63f | 154 | { |
| andrewbonney | 0:ec559500a63f | 155 | case USB_CONTROL: |
| andrewbonney | 0:ec559500a63f | 156 | prevEd = (volatile HCED*) LPC_USB->HcControlHeadED; |
| andrewbonney | 0:ec559500a63f | 157 | break; |
| andrewbonney | 0:ec559500a63f | 158 | case USB_BULK: |
| andrewbonney | 0:ec559500a63f | 159 | default: |
| andrewbonney | 0:ec559500a63f | 160 | prevEd = (volatile HCED*) LPC_USB->HcBulkHeadED; |
| andrewbonney | 0:ec559500a63f | 161 | break; |
| andrewbonney | 0:ec559500a63f | 162 | } |
| andrewbonney | 0:ec559500a63f | 163 | if( m_pEd == prevEd ) |
| andrewbonney | 0:ec559500a63f | 164 | { |
| andrewbonney | 0:ec559500a63f | 165 | switch( m_type ) |
| andrewbonney | 0:ec559500a63f | 166 | { |
| andrewbonney | 0:ec559500a63f | 167 | case USB_CONTROL: |
| andrewbonney | 0:ec559500a63f | 168 | LPC_USB->HcControlHeadED = m_pEd->Next; |
| andrewbonney | 0:ec559500a63f | 169 | break; |
| andrewbonney | 0:ec559500a63f | 170 | case USB_BULK: |
| andrewbonney | 0:ec559500a63f | 171 | default: |
| andrewbonney | 0:ec559500a63f | 172 | LPC_USB->HcBulkHeadED = m_pEd->Next; |
| andrewbonney | 0:ec559500a63f | 173 | break; |
| andrewbonney | 0:ec559500a63f | 174 | } |
| andrewbonney | 0:ec559500a63f | 175 | LPC_USB->HcBulkHeadED = m_pEd->Next; |
| andrewbonney | 0:ec559500a63f | 176 | } |
| andrewbonney | 0:ec559500a63f | 177 | else |
| andrewbonney | 0:ec559500a63f | 178 | { |
| andrewbonney | 0:ec559500a63f | 179 | while( prevEd->Next != (uint32_t) m_pEd ) |
| andrewbonney | 0:ec559500a63f | 180 | { |
| andrewbonney | 0:ec559500a63f | 181 | prevEd = (volatile HCED*) prevEd->Next; |
| andrewbonney | 0:ec559500a63f | 182 | } |
| andrewbonney | 0:ec559500a63f | 183 | prevEd->Next = m_pEd->Next; |
| andrewbonney | 0:ec559500a63f | 184 | } |
| andrewbonney | 0:ec559500a63f | 185 | |
| andrewbonney | 0:ec559500a63f | 186 | // |
| andrewbonney | 0:ec559500a63f | 187 | usb_free_ed((volatile byte*)m_pEd); |
| andrewbonney | 0:ec559500a63f | 188 | |
| andrewbonney | 0:ec559500a63f | 189 | usb_free_td((volatile byte*)m_pTdHead); |
| andrewbonney | 0:ec559500a63f | 190 | usb_free_td((volatile byte*)m_pTdTail); |
| andrewbonney | 0:ec559500a63f | 191 | } |
| andrewbonney | 0:ec559500a63f | 192 | |
| andrewbonney | 0:ec559500a63f | 193 | void UsbEndpoint::setNextToken(uint32_t token) //Only for control Eps |
| andrewbonney | 0:ec559500a63f | 194 | { |
| andrewbonney | 0:ec559500a63f | 195 | switch(token) |
| andrewbonney | 0:ec559500a63f | 196 | { |
| andrewbonney | 0:ec559500a63f | 197 | case TD_SETUP: |
| andrewbonney | 0:ec559500a63f | 198 | m_dir = false; |
| andrewbonney | 0:ec559500a63f | 199 | m_setup = true; |
| andrewbonney | 0:ec559500a63f | 200 | break; |
| andrewbonney | 0:ec559500a63f | 201 | case TD_IN: |
| andrewbonney | 0:ec559500a63f | 202 | m_dir = true; |
| andrewbonney | 0:ec559500a63f | 203 | m_setup = false; |
| andrewbonney | 0:ec559500a63f | 204 | break; |
| andrewbonney | 0:ec559500a63f | 205 | case TD_OUT: |
| andrewbonney | 0:ec559500a63f | 206 | m_dir = false; |
| andrewbonney | 0:ec559500a63f | 207 | m_setup = false; |
| andrewbonney | 0:ec559500a63f | 208 | break; |
| andrewbonney | 0:ec559500a63f | 209 | } |
| andrewbonney | 0:ec559500a63f | 210 | } |
| andrewbonney | 0:ec559500a63f | 211 | |
| andrewbonney | 0:ec559500a63f | 212 | UsbErr UsbEndpoint::transfer(volatile uint8_t* buf, uint32_t len) |
| andrewbonney | 0:ec559500a63f | 213 | { |
| andrewbonney | 0:ec559500a63f | 214 | if(!m_result) |
| andrewbonney | 0:ec559500a63f | 215 | return USBERR_BUSY; //The previous trasnfer is not completed |
| andrewbonney | 0:ec559500a63f | 216 | //FIXME: We should be able to queue the next transfer, still needs to be implemented |
| andrewbonney | 0:ec559500a63f | 217 | |
| andrewbonney | 0:ec559500a63f | 218 | if( !m_pDevice->connected() ) |
| andrewbonney | 0:ec559500a63f | 219 | return USBERR_DISCONNECTED; |
| andrewbonney | 0:ec559500a63f | 220 | |
| andrewbonney | 0:ec559500a63f | 221 | m_result = false; |
| andrewbonney | 0:ec559500a63f | 222 | |
| andrewbonney | 0:ec559500a63f | 223 | volatile uint32_t token = (m_setup?TD_SETUP:(m_dir?TD_IN:TD_OUT)); |
| andrewbonney | 0:ec559500a63f | 224 | |
| andrewbonney | 0:ec559500a63f | 225 | volatile uint32_t td_toggle; |
| andrewbonney | 0:ec559500a63f | 226 | if (m_type == USB_CONTROL) |
| andrewbonney | 0:ec559500a63f | 227 | { |
| andrewbonney | 0:ec559500a63f | 228 | if (m_setup) |
| andrewbonney | 0:ec559500a63f | 229 | { |
| andrewbonney | 0:ec559500a63f | 230 | td_toggle = TD_TOGGLE_0; |
| andrewbonney | 0:ec559500a63f | 231 | } |
| andrewbonney | 0:ec559500a63f | 232 | else |
| andrewbonney | 0:ec559500a63f | 233 | { |
| andrewbonney | 0:ec559500a63f | 234 | td_toggle = TD_TOGGLE_1; |
| andrewbonney | 0:ec559500a63f | 235 | } |
| andrewbonney | 0:ec559500a63f | 236 | } |
| andrewbonney | 0:ec559500a63f | 237 | else |
| andrewbonney | 0:ec559500a63f | 238 | { |
| andrewbonney | 0:ec559500a63f | 239 | td_toggle = 0; |
| andrewbonney | 0:ec559500a63f | 240 | } |
| andrewbonney | 0:ec559500a63f | 241 | |
| andrewbonney | 0:ec559500a63f | 242 | //Swap Tds |
| andrewbonney | 0:ec559500a63f | 243 | volatile HCTD* pTdSwap; |
| andrewbonney | 0:ec559500a63f | 244 | pTdSwap = m_pTdTail; |
| andrewbonney | 0:ec559500a63f | 245 | m_pTdTail = m_pTdHead; |
| andrewbonney | 0:ec559500a63f | 246 | m_pTdHead = pTdSwap; |
| andrewbonney | 0:ec559500a63f | 247 | |
| andrewbonney | 0:ec559500a63f | 248 | m_pTdHead->Control = (TD_ROUNDING | |
| andrewbonney | 0:ec559500a63f | 249 | token | |
| andrewbonney | 0:ec559500a63f | 250 | TD_DELAY_INT(0) |//7 |
| andrewbonney | 0:ec559500a63f | 251 | td_toggle | |
| andrewbonney | 0:ec559500a63f | 252 | TD_CC); |
| andrewbonney | 0:ec559500a63f | 253 | |
| andrewbonney | 0:ec559500a63f | 254 | m_pTdTail->Control = 0; |
| andrewbonney | 0:ec559500a63f | 255 | m_pTdHead->CurrBufPtr = (uint32_t) buf; |
| andrewbonney | 0:ec559500a63f | 256 | m_pBufStartPtr = buf; |
| andrewbonney | 0:ec559500a63f | 257 | m_pTdTail->CurrBufPtr = 0; |
| andrewbonney | 0:ec559500a63f | 258 | m_pTdHead->Next = (uint32_t) m_pTdTail; |
| andrewbonney | 0:ec559500a63f | 259 | m_pTdTail->Next = 0; |
| andrewbonney | 0:ec559500a63f | 260 | m_pTdHead->BufEnd = (uint32_t)(buf + (len - 1)); |
| andrewbonney | 0:ec559500a63f | 261 | m_pTdTail->BufEnd = 0; |
| andrewbonney | 0:ec559500a63f | 262 | |
| andrewbonney | 0:ec559500a63f | 263 | m_pEd->HeadTd = (uint32_t)m_pTdHead | ((m_pEd->HeadTd) & 0x00000002); //Carry bit |
| andrewbonney | 0:ec559500a63f | 264 | m_pEd->TailTd = (uint32_t)m_pTdTail; |
| andrewbonney | 0:ec559500a63f | 265 | |
| andrewbonney | 0:ec559500a63f | 266 | //DBG("m_pEd->HeadTd = %08x\n", m_pEd->HeadTd); |
| andrewbonney | 0:ec559500a63f | 267 | |
| andrewbonney | 0:ec559500a63f | 268 | if(m_type == USB_CONTROL) |
| andrewbonney | 0:ec559500a63f | 269 | { |
| andrewbonney | 0:ec559500a63f | 270 | LPC_USB->HcCommandStatus = LPC_USB->HcCommandStatus | OR_CMD_STATUS_CLF; |
| andrewbonney | 0:ec559500a63f | 271 | LPC_USB->HcControl = LPC_USB->HcControl | OR_CONTROL_CLE; //Enable control list |
| andrewbonney | 0:ec559500a63f | 272 | } |
| andrewbonney | 0:ec559500a63f | 273 | else //USB_BULK |
| andrewbonney | 0:ec559500a63f | 274 | { |
| andrewbonney | 0:ec559500a63f | 275 | LPC_USB->HcCommandStatus = LPC_USB->HcCommandStatus | OR_CMD_STATUS_BLF; |
| andrewbonney | 0:ec559500a63f | 276 | LPC_USB->HcControl = LPC_USB->HcControl | OR_CONTROL_BLE; //Enable bulk list |
| andrewbonney | 0:ec559500a63f | 277 | } |
| andrewbonney | 0:ec559500a63f | 278 | |
| andrewbonney | 0:ec559500a63f | 279 | //m_done = false; |
| andrewbonney | 0:ec559500a63f | 280 | m_len = len; |
| andrewbonney | 0:ec559500a63f | 281 | |
| andrewbonney | 0:ec559500a63f | 282 | return USBERR_PROCESSING; |
| andrewbonney | 0:ec559500a63f | 283 | |
| andrewbonney | 0:ec559500a63f | 284 | } |
| andrewbonney | 0:ec559500a63f | 285 | |
| andrewbonney | 0:ec559500a63f | 286 | int UsbEndpoint::status() |
| andrewbonney | 0:ec559500a63f | 287 | { |
| andrewbonney | 0:ec559500a63f | 288 | if( !m_pDevice->connected() ) |
| andrewbonney | 0:ec559500a63f | 289 | { |
| andrewbonney | 0:ec559500a63f | 290 | if(!m_result) |
| andrewbonney | 0:ec559500a63f | 291 | onCompletion(); |
| andrewbonney | 0:ec559500a63f | 292 | m_result = true; |
| andrewbonney | 0:ec559500a63f | 293 | return (int)USBERR_DISCONNECTED; |
| andrewbonney | 0:ec559500a63f | 294 | } |
| andrewbonney | 0:ec559500a63f | 295 | else if( !m_result ) |
| andrewbonney | 0:ec559500a63f | 296 | { |
| andrewbonney | 0:ec559500a63f | 297 | return (int)USBERR_PROCESSING; |
| andrewbonney | 0:ec559500a63f | 298 | } |
| andrewbonney | 0:ec559500a63f | 299 | /*else if( m_done ) |
| andrewbonney | 0:ec559500a63f | 300 | { |
| andrewbonney | 0:ec559500a63f | 301 | return (int)USBERR_OK; |
| andrewbonney | 0:ec559500a63f | 302 | }*/ |
| andrewbonney | 0:ec559500a63f | 303 | else |
| andrewbonney | 0:ec559500a63f | 304 | { |
| andrewbonney | 0:ec559500a63f | 305 | return m_status; |
| andrewbonney | 0:ec559500a63f | 306 | } |
| andrewbonney | 0:ec559500a63f | 307 | } |
| andrewbonney | 0:ec559500a63f | 308 | |
| andrewbonney | 0:ec559500a63f | 309 | void UsbEndpoint::updateAddr(int addr) |
| andrewbonney | 0:ec559500a63f | 310 | { |
| andrewbonney | 0:ec559500a63f | 311 | DBG("m_pEd->Control = %08x\n", m_pEd->Control); |
| andrewbonney | 0:ec559500a63f | 312 | m_pEd->Control &= ~0x7F; |
| andrewbonney | 0:ec559500a63f | 313 | m_pEd->Control |= addr; |
| andrewbonney | 0:ec559500a63f | 314 | DBG("m_pEd->Control = %08x\n", m_pEd->Control); |
| andrewbonney | 0:ec559500a63f | 315 | } |
| andrewbonney | 0:ec559500a63f | 316 | |
| andrewbonney | 0:ec559500a63f | 317 | void UsbEndpoint::updateSize(uint16_t size) |
| andrewbonney | 0:ec559500a63f | 318 | { |
| andrewbonney | 0:ec559500a63f | 319 | DBG("m_pEd->Control = %08x\n", m_pEd->Control); |
| andrewbonney | 0:ec559500a63f | 320 | m_pEd->Control &= ~0x3FF0000; |
| andrewbonney | 0:ec559500a63f | 321 | m_pEd->Control |= (size << 16); |
| andrewbonney | 0:ec559500a63f | 322 | DBG("m_pEd->Control = %08x\n", m_pEd->Control); |
| andrewbonney | 0:ec559500a63f | 323 | } |
| andrewbonney | 0:ec559500a63f | 324 | |
| andrewbonney | 0:ec559500a63f | 325 | #if 0 //For doc only |
| andrewbonney | 0:ec559500a63f | 326 | template <class T> |
| andrewbonney | 0:ec559500a63f | 327 | void UsbEndpoint::setOnCompletion( T* pCbItem, void (T::*pCbMeth)() ) |
| andrewbonney | 0:ec559500a63f | 328 | { |
| andrewbonney | 0:ec559500a63f | 329 | m_pCbItem = (CDummy*) pCbItem; |
| andrewbonney | 0:ec559500a63f | 330 | m_pCbMeth = (void (CDummy::*)()) pCbMeth; |
| andrewbonney | 0:ec559500a63f | 331 | } |
| andrewbonney | 0:ec559500a63f | 332 | #endif |
| andrewbonney | 0:ec559500a63f | 333 | |
| andrewbonney | 0:ec559500a63f | 334 | void UsbEndpoint::onCompletion() |
| andrewbonney | 0:ec559500a63f | 335 | { |
| andrewbonney | 0:ec559500a63f | 336 | //DBG("Transfer completed\n"); |
| andrewbonney | 0:ec559500a63f | 337 | if( m_pTdHead->Control >> 28 ) |
| andrewbonney | 0:ec559500a63f | 338 | { |
| andrewbonney | 0:ec559500a63f | 339 | DBG("TD Failed with condition code %01x\n", m_pTdHead->Control >> 28 ); |
| andrewbonney | 0:ec559500a63f | 340 | m_status = (int)USBERR_TDFAIL; |
| andrewbonney | 0:ec559500a63f | 341 | } |
| andrewbonney | 0:ec559500a63f | 342 | else if( m_pEd->HeadTd & 0x1 ) |
| andrewbonney | 0:ec559500a63f | 343 | { |
| andrewbonney | 0:ec559500a63f | 344 | m_pEd->HeadTd = m_pEd->HeadTd & ~0x1; |
| andrewbonney | 0:ec559500a63f | 345 | DBG("\r\nHALTED!!\r\n"); |
| andrewbonney | 0:ec559500a63f | 346 | m_status = (int)USBERR_HALTED; |
| andrewbonney | 0:ec559500a63f | 347 | } |
| andrewbonney | 0:ec559500a63f | 348 | else if( (m_pEd->HeadTd & ~0xF) == (uint32_t) m_pTdTail ) |
| andrewbonney | 0:ec559500a63f | 349 | { |
| andrewbonney | 0:ec559500a63f | 350 | //Done |
| andrewbonney | 0:ec559500a63f | 351 | int len; |
| andrewbonney | 0:ec559500a63f | 352 | //DBG("m_pTdHead->CurrBufPtr = %08x, m_pBufStartPtr=%08x\n", m_pTdHead->CurrBufPtr, (uint32_t) m_pBufStartPtr); |
| andrewbonney | 0:ec559500a63f | 353 | if(m_pTdHead->CurrBufPtr) |
| andrewbonney | 0:ec559500a63f | 354 | len = m_pTdHead->CurrBufPtr - (uint32_t) m_pBufStartPtr; |
| andrewbonney | 0:ec559500a63f | 355 | else |
| andrewbonney | 0:ec559500a63f | 356 | len = m_len; |
| andrewbonney | 0:ec559500a63f | 357 | /*if(len == 0) //Packet transfered completely |
| andrewbonney | 0:ec559500a63f | 358 | len = m_len;*/ |
| andrewbonney | 0:ec559500a63f | 359 | //m_done = true; |
| andrewbonney | 0:ec559500a63f | 360 | DBG("Transfered %d bytes\n", len); |
| andrewbonney | 0:ec559500a63f | 361 | m_status = len; |
| andrewbonney | 0:ec559500a63f | 362 | } |
| andrewbonney | 0:ec559500a63f | 363 | else |
| andrewbonney | 0:ec559500a63f | 364 | { |
| andrewbonney | 0:ec559500a63f | 365 | DBG("Unknown error...\n"); |
| andrewbonney | 0:ec559500a63f | 366 | m_status = (int)USBERR_ERROR; |
| andrewbonney | 0:ec559500a63f | 367 | } |
| andrewbonney | 0:ec559500a63f | 368 | m_result = true; |
| andrewbonney | 0:ec559500a63f | 369 | if(m_pCbItem && m_pCbMeth) |
| andrewbonney | 0:ec559500a63f | 370 | (m_pCbItem->*m_pCbMeth)(); |
| andrewbonney | 0:ec559500a63f | 371 | } |
| andrewbonney | 0:ec559500a63f | 372 | |
| andrewbonney | 0:ec559500a63f | 373 | void UsbEndpoint::sOnCompletion(uint32_t pTd) |
| andrewbonney | 0:ec559500a63f | 374 | { |
| andrewbonney | 0:ec559500a63f | 375 | if(!m_pHeadEp) |
| andrewbonney | 0:ec559500a63f | 376 | return; |
| andrewbonney | 0:ec559500a63f | 377 | do |
| andrewbonney | 0:ec559500a63f | 378 | { |
| andrewbonney | 0:ec559500a63f | 379 | //DBG("sOnCompletion (pTd = %08x)\n", pTd); |
| andrewbonney | 0:ec559500a63f | 380 | UsbEndpoint* pEp = m_pHeadEp; |
| andrewbonney | 0:ec559500a63f | 381 | do |
| andrewbonney | 0:ec559500a63f | 382 | { |
| andrewbonney | 0:ec559500a63f | 383 | if((uint32_t)pEp->m_pTdHead == pTd) |
| andrewbonney | 0:ec559500a63f | 384 | { |
| andrewbonney | 0:ec559500a63f | 385 | pEp->onCompletion(); |
| andrewbonney | 0:ec559500a63f | 386 | break; |
| andrewbonney | 0:ec559500a63f | 387 | } |
| andrewbonney | 0:ec559500a63f | 388 | } while(pEp = pEp->m_pNextEp); |
| andrewbonney | 0:ec559500a63f | 389 | } while( pTd = (uint32_t)( ((HCTD*)pTd)->Next ) ); //Go around the Done queue |
| andrewbonney | 0:ec559500a63f | 390 | } |
| andrewbonney | 0:ec559500a63f | 391 | |
| andrewbonney | 0:ec559500a63f | 392 | UsbEndpoint* UsbEndpoint::m_pHeadEp = NULL; |
| andrewbonney | 0:ec559500a63f | 393 | |
| andrewbonney | 0:ec559500a63f | 394 | #endif |