Library to allo USB PTP device to be hosted by the mbed platform
Dependents: class_project_main
USBHostPTP.cpp@7:c3a16a61643f, 2013-08-29 (annotated)
- Committer:
- jakowisp
- Date:
- Thu Aug 29 23:59:17 2013 +0000
- Revision:
- 7:c3a16a61643f
- Parent:
- 6:124a01eaf569
- Child:
- 8:5f6024e68aa7
Fixed issue where previous fix got lost in reponse container handling when included in data transfer.
;
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
jakowisp | 7:c3a16a61643f | 1 | /** |
jakowisp | 7:c3a16a61643f | 2 | * @file USBHostPTP.cpp |
jakowisp | 7:c3a16a61643f | 3 | * @brief USBHostPTP class function definitions |
jakowisp | 7:c3a16a61643f | 4 | * @author Dwayne Dilbeck |
jakowisp | 7:c3a16a61643f | 5 | * @date 8/23/2013 |
jakowisp | 7:c3a16a61643f | 6 | * |
jakowisp | 7:c3a16a61643f | 7 | * mbed USBHostPTP Library |
jakowisp | 7:c3a16a61643f | 8 | * |
jakowisp | 7:c3a16a61643f | 9 | * @par Copyright: |
jakowisp | 7:c3a16a61643f | 10 | * Copyright (c) 2013 Dwayne Dilbeck |
jakowisp | 7:c3a16a61643f | 11 | * @par License: |
jakowisp | 7:c3a16a61643f | 12 | * This software is distributed under the terms of the GNU Lesser General Public License |
jakowisp | 7:c3a16a61643f | 13 | */ |
jakowisp | 7:c3a16a61643f | 14 | |
jakowisp | 0:98cf19bcd828 | 15 | |
jakowisp | 0:98cf19bcd828 | 16 | #include "USBHostPTP.h" |
jakowisp | 0:98cf19bcd828 | 17 | |
jakowisp | 0:98cf19bcd828 | 18 | #if 1 |
jakowisp | 0:98cf19bcd828 | 19 | //USBHOST_PTP |
jakowisp | 0:98cf19bcd828 | 20 | |
jakowisp | 0:98cf19bcd828 | 21 | #include "dbg.h" |
jakowisp | 0:98cf19bcd828 | 22 | |
jakowisp | 0:98cf19bcd828 | 23 | #define DEVICE_TO_HOST 0x80 |
jakowisp | 0:98cf19bcd828 | 24 | #define HOST_TO_DEVICE 0x00 |
jakowisp | 0:98cf19bcd828 | 25 | |
jakowisp | 0:98cf19bcd828 | 26 | |
jakowisp | 0:98cf19bcd828 | 27 | USBHostPTP::USBHostPTP( void ) |
jakowisp | 0:98cf19bcd828 | 28 | { |
jakowisp | 0:98cf19bcd828 | 29 | host = USBHost::getHostInst(); |
jakowisp | 0:98cf19bcd828 | 30 | initializeClassData(); |
jakowisp | 0:98cf19bcd828 | 31 | } |
jakowisp | 0:98cf19bcd828 | 32 | |
jakowisp | 0:98cf19bcd828 | 33 | void USBHostPTP::initializeClassData() { |
jakowisp | 5:728b5d58e135 | 34 | deviceConnected = false; |
jakowisp | 5:728b5d58e135 | 35 | pointerToDevice = NULL; |
jakowisp | 5:728b5d58e135 | 36 | bulk_in = NULL; |
jakowisp | 5:728b5d58e135 | 37 | bulk_out = NULL; |
jakowisp | 5:728b5d58e135 | 38 | int_in = NULL; |
jakowisp | 5:728b5d58e135 | 39 | deviceFound = false; |
jakowisp | 5:728b5d58e135 | 40 | deviceConnected = false; |
jakowisp | 5:728b5d58e135 | 41 | ptp_intf = -1; |
jakowisp | 5:728b5d58e135 | 42 | numberOfEndpoints = 0; |
jakowisp | 5:728b5d58e135 | 43 | transactionCnt = 0; |
jakowisp | 5:728b5d58e135 | 44 | commandContainer.type = PIMA_CONTAINER_COMMAND; |
jakowisp | 5:728b5d58e135 | 45 | sessionID = 1; |
jakowisp | 5:728b5d58e135 | 46 | dataLeftToTransfer = 0; |
jakowisp | 7:c3a16a61643f | 47 | memset(buffer,0,1024); |
jakowisp | 0:98cf19bcd828 | 48 | } |
jakowisp | 0:98cf19bcd828 | 49 | |
jakowisp | 0:98cf19bcd828 | 50 | |
jakowisp | 0:98cf19bcd828 | 51 | bool USBHostPTP::connected() |
jakowisp | 0:98cf19bcd828 | 52 | { |
jakowisp | 0:98cf19bcd828 | 53 | return deviceConnected; |
jakowisp | 0:98cf19bcd828 | 54 | } |
jakowisp | 0:98cf19bcd828 | 55 | |
jakowisp | 0:98cf19bcd828 | 56 | bool USBHostPTP::connect() |
jakowisp | 0:98cf19bcd828 | 57 | { |
jakowisp | 0:98cf19bcd828 | 58 | |
jakowisp | 0:98cf19bcd828 | 59 | if (deviceConnected) { |
jakowisp | 0:98cf19bcd828 | 60 | return true; |
jakowisp | 0:98cf19bcd828 | 61 | } |
jakowisp | 0:98cf19bcd828 | 62 | |
jakowisp | 0:98cf19bcd828 | 63 | for (uint8_t i = 0; i < MAX_DEVICE_CONNECTED; i++) { |
jakowisp | 0:98cf19bcd828 | 64 | if ((pointerToDevice = host->getDevice(i)) != NULL) { |
jakowisp | 0:98cf19bcd828 | 65 | |
jakowisp | 0:98cf19bcd828 | 66 | USB_DBG("Trying to connect PTP device\r\n"); |
jakowisp | 0:98cf19bcd828 | 67 | |
jakowisp | 0:98cf19bcd828 | 68 | if(host->enumerate(pointerToDevice, this)) |
jakowisp | 0:98cf19bcd828 | 69 | break; |
jakowisp | 0:98cf19bcd828 | 70 | |
jakowisp | 0:98cf19bcd828 | 71 | if (deviceFound) { |
jakowisp | 0:98cf19bcd828 | 72 | bulk_in = pointerToDevice->getEndpoint(ptp_intf, BULK_ENDPOINT, IN); |
jakowisp | 0:98cf19bcd828 | 73 | bulk_out = pointerToDevice->getEndpoint(ptp_intf, BULK_ENDPOINT, OUT); |
jakowisp | 0:98cf19bcd828 | 74 | int_in = pointerToDevice->getEndpoint(ptp_intf, INTERRUPT_ENDPOINT, IN); |
jakowisp | 0:98cf19bcd828 | 75 | |
jakowisp | 0:98cf19bcd828 | 76 | if (!bulk_in || !bulk_out || !int_in) |
jakowisp | 0:98cf19bcd828 | 77 | continue; |
jakowisp | 0:98cf19bcd828 | 78 | |
jakowisp | 0:98cf19bcd828 | 79 | USB_INFO("New PTP device: VID:%04x PID:%04x [dev: %p - intf: %d]", pointerToDevice->getVid(), |
jakowisp | 0:98cf19bcd828 | 80 | pointerToDevice->getPid(), |
jakowisp | 0:98cf19bcd828 | 81 | pointerToDevice, ptp_intf); |
jakowisp | 0:98cf19bcd828 | 82 | pointerToDevice->setName("PTP", ptp_intf); |
jakowisp | 0:98cf19bcd828 | 83 | host->registerDriver(pointerToDevice, ptp_intf, this, &USBHostPTP::initializeClassData); |
jakowisp | 0:98cf19bcd828 | 84 | |
jakowisp | 0:98cf19bcd828 | 85 | deviceConnected = true; |
jakowisp | 0:98cf19bcd828 | 86 | return true; |
jakowisp | 0:98cf19bcd828 | 87 | } |
jakowisp | 0:98cf19bcd828 | 88 | } //if() |
jakowisp | 0:98cf19bcd828 | 89 | } //for() |
jakowisp | 0:98cf19bcd828 | 90 | initializeClassData(); |
jakowisp | 0:98cf19bcd828 | 91 | return false; |
jakowisp | 0:98cf19bcd828 | 92 | } |
jakowisp | 0:98cf19bcd828 | 93 | |
jakowisp | 0:98cf19bcd828 | 94 | /*virtual*/ void USBHostPTP::setVidPid(uint16_t vid, uint16_t pid) |
jakowisp | 0:98cf19bcd828 | 95 | { |
jakowisp | 0:98cf19bcd828 | 96 | // we don't check VID/PID for PTP driver |
jakowisp | 0:98cf19bcd828 | 97 | } |
jakowisp | 0:98cf19bcd828 | 98 | |
jakowisp | 0:98cf19bcd828 | 99 | /*virtual*/ bool USBHostPTP::parseInterface(uint8_t intf_nb, uint8_t intf_class, uint8_t intf_subclass, uint8_t intf_protocol) //Must return true if the interface should be parsed |
jakowisp | 0:98cf19bcd828 | 100 | { |
jakowisp | 0:98cf19bcd828 | 101 | if ((ptp_intf == -1) && |
jakowisp | 0:98cf19bcd828 | 102 | (intf_class == USB_PTP_CLASS_CODE) && |
jakowisp | 0:98cf19bcd828 | 103 | (intf_subclass == 0x01) && |
jakowisp | 0:98cf19bcd828 | 104 | (intf_protocol == 0x01)) { |
jakowisp | 0:98cf19bcd828 | 105 | ptp_intf = intf_nb; |
jakowisp | 0:98cf19bcd828 | 106 | return true; |
jakowisp | 0:98cf19bcd828 | 107 | } |
jakowisp | 0:98cf19bcd828 | 108 | return false; |
jakowisp | 0:98cf19bcd828 | 109 | } |
jakowisp | 0:98cf19bcd828 | 110 | |
jakowisp | 0:98cf19bcd828 | 111 | /*virtual*/ bool USBHostPTP::useEndpoint(uint8_t intf_nb, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir) //Must return true if the endpoint will be used |
jakowisp | 0:98cf19bcd828 | 112 | { |
jakowisp | 0:98cf19bcd828 | 113 | |
jakowisp | 0:98cf19bcd828 | 114 | if (intf_nb == ptp_intf) { |
jakowisp | 0:98cf19bcd828 | 115 | if (type == INTERRUPT_ENDPOINT) { |
jakowisp | 0:98cf19bcd828 | 116 | numberOfEndpoints++; |
jakowisp | 0:98cf19bcd828 | 117 | } |
jakowisp | 0:98cf19bcd828 | 118 | if (type == BULK_ENDPOINT) { |
jakowisp | 0:98cf19bcd828 | 119 | numberOfEndpoints++; |
jakowisp | 0:98cf19bcd828 | 120 | } |
jakowisp | 0:98cf19bcd828 | 121 | if (numberOfEndpoints == 3) |
jakowisp | 0:98cf19bcd828 | 122 | deviceFound = true; |
jakowisp | 0:98cf19bcd828 | 123 | return true; |
jakowisp | 0:98cf19bcd828 | 124 | } |
jakowisp | 0:98cf19bcd828 | 125 | return false; |
jakowisp | 0:98cf19bcd828 | 126 | } |
jakowisp | 0:98cf19bcd828 | 127 | |
jakowisp | 0:98cf19bcd828 | 128 | |
jakowisp | 0:98cf19bcd828 | 129 | |
jakowisp | 0:98cf19bcd828 | 130 | |
jakowisp | 0:98cf19bcd828 | 131 | |
jakowisp | 0:98cf19bcd828 | 132 | |
jakowisp | 0:98cf19bcd828 | 133 | |
jakowisp | 0:98cf19bcd828 | 134 | |
jakowisp | 0:98cf19bcd828 | 135 | bool USBHostPTP::CancelRequest(unsigned int TransactionID) { |
jakowisp | 0:98cf19bcd828 | 136 | unsigned char buffer[6]; |
jakowisp | 0:98cf19bcd828 | 137 | int res = 0; |
jakowisp | 0:98cf19bcd828 | 138 | |
jakowisp | 0:98cf19bcd828 | 139 | buffer[0] =0x01; //Cancellation Code 0x4001 |
jakowisp | 0:98cf19bcd828 | 140 | buffer[1] =0x40; |
jakowisp | 0:98cf19bcd828 | 141 | buffer[2]= TransactionID & 0xff; |
jakowisp | 0:98cf19bcd828 | 142 | buffer[3]= (TransactionID>>8) & 0xff; |
jakowisp | 0:98cf19bcd828 | 143 | buffer[4]= (TransactionID>>16) & 0xff;; |
jakowisp | 0:98cf19bcd828 | 144 | buffer[5]= (TransactionID>>24) & 0xff;; |
jakowisp | 0:98cf19bcd828 | 145 | |
jakowisp | 0:98cf19bcd828 | 146 | res = host->controlWrite( pointerToDevice, |
jakowisp | 0:98cf19bcd828 | 147 | USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD, |
jakowisp | 0:98cf19bcd828 | 148 | USB_PTP_CLASS_REQUEST_CANCELREQEUST, |
jakowisp | 0:98cf19bcd828 | 149 | 0, 0, buffer, 6); |
jakowisp | 0:98cf19bcd828 | 150 | return res==0?true:false; |
jakowisp | 0:98cf19bcd828 | 151 | } |
jakowisp | 0:98cf19bcd828 | 152 | |
jakowisp | 0:98cf19bcd828 | 153 | bool USBHostPTP::DeviceResetRequest(void) { |
jakowisp | 0:98cf19bcd828 | 154 | |
jakowisp | 0:98cf19bcd828 | 155 | int res = 0; |
jakowisp | 0:98cf19bcd828 | 156 | |
jakowisp | 0:98cf19bcd828 | 157 | res = host->controlWrite( pointerToDevice, |
jakowisp | 0:98cf19bcd828 | 158 | USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD, |
jakowisp | 0:98cf19bcd828 | 159 | USB_PTP_CLASS_REQUEST_DEVICE_RESET, |
jakowisp | 0:98cf19bcd828 | 160 | 0, 0, NULL, 0); |
jakowisp | 0:98cf19bcd828 | 161 | return res==0?true:false; |
jakowisp | 0:98cf19bcd828 | 162 | } |
jakowisp | 0:98cf19bcd828 | 163 | |
jakowisp | 0:98cf19bcd828 | 164 | |
jakowisp | 0:98cf19bcd828 | 165 | bool USBHostPTP::GetDeviceStatus(void) { |
jakowisp | 0:98cf19bcd828 | 166 | unsigned char buffer[6]; |
jakowisp | 0:98cf19bcd828 | 167 | int res = 0; |
jakowisp | 0:98cf19bcd828 | 168 | |
jakowisp | 0:98cf19bcd828 | 169 | //TODO: DetermineBuffer size |
jakowisp | 0:98cf19bcd828 | 170 | |
jakowisp | 0:98cf19bcd828 | 171 | res = host->controlWrite( pointerToDevice, |
jakowisp | 0:98cf19bcd828 | 172 | USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD, |
jakowisp | 0:98cf19bcd828 | 173 | USB_PTP_CLASS_REQUEST_GET_DEVICE_STATUS, |
jakowisp | 0:98cf19bcd828 | 174 | 0, 0, buffer, sizeof(buffer)); |
jakowisp | 0:98cf19bcd828 | 175 | return res==0?true:false; |
jakowisp | 0:98cf19bcd828 | 176 | } |
jakowisp | 0:98cf19bcd828 | 177 | |
jakowisp | 0:98cf19bcd828 | 178 | bool USBHostPTP::GetExtendedEventData(void) { |
jakowisp | 0:98cf19bcd828 | 179 | unsigned char buffer[6]; |
jakowisp | 0:98cf19bcd828 | 180 | int res = 0; |
jakowisp | 0:98cf19bcd828 | 181 | |
jakowisp | 5:728b5d58e135 | 182 | ///TODO: DetermineBuffer size |
jakowisp | 0:98cf19bcd828 | 183 | |
jakowisp | 0:98cf19bcd828 | 184 | res = host->controlWrite( pointerToDevice, |
jakowisp | 0:98cf19bcd828 | 185 | USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD, |
jakowisp | 0:98cf19bcd828 | 186 | USB_PTP_CLASS_REQUEST_GET_EXTENDED_EVENT_DATA, |
jakowisp | 0:98cf19bcd828 | 187 | 0, 0, buffer, sizeof(buffer)); |
jakowisp | 0:98cf19bcd828 | 188 | return res==0?true:false; |
jakowisp | 0:98cf19bcd828 | 189 | } |
jakowisp | 0:98cf19bcd828 | 190 | |
jakowisp | 0:98cf19bcd828 | 191 | bool USBHostPTP::CheckEvent(){ |
jakowisp | 0:98cf19bcd828 | 192 | int res=0; |
jakowisp | 0:98cf19bcd828 | 193 | |
jakowisp | 0:98cf19bcd828 | 194 | memset(&eventContainer, 0, sizeof(PIMAContainer)); |
jakowisp | 0:98cf19bcd828 | 195 | |
jakowisp | 0:98cf19bcd828 | 196 | res = host->interruptRead(pointerToDevice, int_in,(uint8_t *)&eventContainer, sizeof(PIMAContainer)); |
jakowisp | 0:98cf19bcd828 | 197 | |
jakowisp | 0:98cf19bcd828 | 198 | if(res!=USB_TYPE_OK) |
jakowisp | 0:98cf19bcd828 | 199 | return false; |
jakowisp | 0:98cf19bcd828 | 200 | |
jakowisp | 0:98cf19bcd828 | 201 | return true; |
jakowisp | 0:98cf19bcd828 | 202 | } |
jakowisp | 0:98cf19bcd828 | 203 | |
jakowisp | 0:98cf19bcd828 | 204 | int USBHostPTP::checkResult(uint8_t res, USBEndpoint * ep) { |
jakowisp | 0:98cf19bcd828 | 205 | // if ep stalled: send clear feature |
jakowisp | 0:98cf19bcd828 | 206 | if (res == USB_TYPE_STALL_ERROR) { |
jakowisp | 0:98cf19bcd828 | 207 | res = host->controlWrite( pointerToDevice, |
jakowisp | 0:98cf19bcd828 | 208 | USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD, |
jakowisp | 0:98cf19bcd828 | 209 | CLEAR_FEATURE, |
jakowisp | 0:98cf19bcd828 | 210 | 0, ep->getAddress(), NULL, 0); |
jakowisp | 0:98cf19bcd828 | 211 | // set state to IDLE if clear feature successful |
jakowisp | 0:98cf19bcd828 | 212 | if (res == USB_TYPE_OK) { |
jakowisp | 0:98cf19bcd828 | 213 | ep->setState(USB_TYPE_IDLE); |
jakowisp | 0:98cf19bcd828 | 214 | } |
jakowisp | 0:98cf19bcd828 | 215 | } |
jakowisp | 0:98cf19bcd828 | 216 | |
jakowisp | 0:98cf19bcd828 | 217 | if (res != USB_TYPE_OK) |
jakowisp | 0:98cf19bcd828 | 218 | return -1; |
jakowisp | 0:98cf19bcd828 | 219 | |
jakowisp | 0:98cf19bcd828 | 220 | return 0; |
jakowisp | 0:98cf19bcd828 | 221 | } |
jakowisp | 0:98cf19bcd828 | 222 | |
jakowisp | 5:728b5d58e135 | 223 | void USBHostPTP::PrepareControlContainer(uint16_t operationCode, |
jakowisp | 5:728b5d58e135 | 224 | OperFlags *operationFlags, |
jakowisp | 5:728b5d58e135 | 225 | uint32_t *parameters) { |
jakowisp | 5:728b5d58e135 | 226 | |
jakowisp | 5:728b5d58e135 | 227 | this->commandContainer.length = PIMA_CONTAINER_HEADER_LENGTH + operationFlags->opParams*4; |
jakowisp | 5:728b5d58e135 | 228 | this->commandContainer.code = operationCode; |
jakowisp | 5:728b5d58e135 | 229 | this->commandContainer.transactionID = this->transactionCnt++; |
jakowisp | 5:728b5d58e135 | 230 | for (int i=0; i<operationFlags->opParams; i++) |
jakowisp | 5:728b5d58e135 | 231 | this->commandContainer.payload[i]=parameters[i]; |
jakowisp | 5:728b5d58e135 | 232 | |
jakowisp | 5:728b5d58e135 | 233 | #ifdef USDBPTPDEBUG |
jakowisp | 5:728b5d58e135 | 234 | printf("PTPCommandContainer:\r\n"); |
jakowisp | 5:728b5d58e135 | 235 | DumpBuffer((uint8_t *)&(this->commandContainer),this->commandContainer.length); |
jakowisp | 5:728b5d58e135 | 236 | #endif |
jakowisp | 5:728b5d58e135 | 237 | |
jakowisp | 5:728b5d58e135 | 238 | } |
jakowisp | 5:728b5d58e135 | 239 | |
jakowisp | 5:728b5d58e135 | 240 | bool USBHostPTP::RecieveDataContainer(void *dataHandlerFunctionCastToVoid, uint16_t *responseCode){ |
jakowisp | 5:728b5d58e135 | 241 | int i=0; |
jakowisp | 5:728b5d58e135 | 242 | int transferResult=0; |
jakowisp | 5:728b5d58e135 | 243 | bool firstDataBlockReceived=true; |
jakowisp | 5:728b5d58e135 | 244 | uint8_t *pointerToUint8tData; |
jakowisp | 5:728b5d58e135 | 245 | uint32_t bytesReceived=0; |
jakowisp | 5:728b5d58e135 | 246 | uint32_t bytesRemaining=0; |
jakowisp | 5:728b5d58e135 | 247 | uint32_t dataToBeHandled=0; |
jakowisp | 5:728b5d58e135 | 248 | |
jakowisp | 5:728b5d58e135 | 249 | DataHandler dataHandler1 = (DataHandler) dataHandlerFunctionCastToVoid; |
jakowisp | 5:728b5d58e135 | 250 | |
jakowisp | 7:c3a16a61643f | 251 | if( responseCode==NULL) |
jakowisp | 7:c3a16a61643f | 252 | return false; |
jakowisp | 7:c3a16a61643f | 253 | |
jakowisp | 7:c3a16a61643f | 254 | *responseCode=PIMA_RETURN_CODE_Undefined; |
jakowisp | 6:124a01eaf569 | 255 | |
jakowisp | 5:728b5d58e135 | 256 | do { |
jakowisp | 5:728b5d58e135 | 257 | ///TODO: Magic number needs to be replaced with DEFINE |
jakowisp | 5:728b5d58e135 | 258 | transferResult = host->bulkRead(this->pointerToDevice, this->bulk_in, this->buffer, 1024); |
jakowisp | 5:728b5d58e135 | 259 | if ( checkResult(transferResult, this->bulk_in)) |
jakowisp | 5:728b5d58e135 | 260 | return PIMA_RETURN_CODE_IncompleteTransfer; |
jakowisp | 5:728b5d58e135 | 261 | #ifdef USDBPTPDEBUG |
jakowisp | 5:728b5d58e135 | 262 | printf("Data stage bulkRead result: %d\r\n",transferResult); |
jakowisp | 5:728b5d58e135 | 263 | #endif |
jakowisp | 5:728b5d58e135 | 264 | bytesReceived = bulk_in->getLengthTransferred(); |
jakowisp | 5:728b5d58e135 | 265 | if(firstDataBlockReceived==true) { |
jakowisp | 5:728b5d58e135 | 266 | pointerToUint8tData=(uint8_t *)&dataContainer; |
jakowisp | 5:728b5d58e135 | 267 | for(i=0; i<PIMA_CONTAINER_HEADER_LENGTH; i++){ |
jakowisp | 5:728b5d58e135 | 268 | pointerToUint8tData[i]=buffer[i]; |
jakowisp | 5:728b5d58e135 | 269 | } |
jakowisp | 5:728b5d58e135 | 270 | #ifdef USDBPTPDEBUG |
jakowisp | 5:728b5d58e135 | 271 | DumpBuffer(pointerToUint8tData,PIMA_CONTAINER_HEADER_LENGTH); |
jakowisp | 5:728b5d58e135 | 272 | #endif |
jakowisp | 5:728b5d58e135 | 273 | firstDataBlockReceived = false; |
jakowisp | 5:728b5d58e135 | 274 | pointerToUint8tData = buffer + PIMA_CONTAINER_HEADER_LENGTH; |
jakowisp | 5:728b5d58e135 | 275 | bytesRemaining = dataContainer.length - PIMA_CONTAINER_HEADER_LENGTH; |
jakowisp | 5:728b5d58e135 | 276 | this->totalDataToTransfer = bytesRemaining; |
jakowisp | 5:728b5d58e135 | 277 | if(dataContainer.type==PIMA_CONTAINER_DATA) |
jakowisp | 5:728b5d58e135 | 278 | bytesReceived -= PIMA_CONTAINER_HEADER_LENGTH; |
jakowisp | 5:728b5d58e135 | 279 | #ifdef USDBPTPDEBUG |
jakowisp | 5:728b5d58e135 | 280 | DumpBuffer(pointerToUint8tData,bytesReceived); |
jakowisp | 5:728b5d58e135 | 281 | #endif |
jakowisp | 5:728b5d58e135 | 282 | } else { |
jakowisp | 5:728b5d58e135 | 283 | pointerToUint8tData=buffer; |
jakowisp | 5:728b5d58e135 | 284 | } |
jakowisp | 5:728b5d58e135 | 285 | |
jakowisp | 5:728b5d58e135 | 286 | if(bytesReceived<=bytesRemaining) |
jakowisp | 5:728b5d58e135 | 287 | dataToBeHandled=bytesReceived; |
jakowisp | 5:728b5d58e135 | 288 | else { |
jakowisp | 5:728b5d58e135 | 289 | dataToBeHandled=bytesRemaining; |
jakowisp | 5:728b5d58e135 | 290 | } |
jakowisp | 5:728b5d58e135 | 291 | |
jakowisp | 5:728b5d58e135 | 292 | #ifdef USDBPTPDEBUG |
jakowisp | 5:728b5d58e135 | 293 | printf("Calling Datahandler\r\n"); |
jakowisp | 5:728b5d58e135 | 294 | printf("DataToBeHandled: %ld\r\n",dataToBeHandled); |
jakowisp | 5:728b5d58e135 | 295 | #endif |
jakowisp | 5:728b5d58e135 | 296 | if( dataHandler1!=NULL && dataToBeHandled !=0 ) |
jakowisp | 5:728b5d58e135 | 297 | (*dataHandler1)(this,pointerToUint8tData,dataToBeHandled); |
jakowisp | 5:728b5d58e135 | 298 | |
jakowisp | 5:728b5d58e135 | 299 | #ifdef USDBPTPDEBUG |
jakowisp | 5:728b5d58e135 | 300 | DumpBuffer(buffer,bytesReceived); |
jakowisp | 5:728b5d58e135 | 301 | #endif |
jakowisp | 5:728b5d58e135 | 302 | |
jakowisp | 5:728b5d58e135 | 303 | //IF the Response got appended to Data block |
jakowisp | 5:728b5d58e135 | 304 | if(bytesReceived<=bytesRemaining) { |
jakowisp | 5:728b5d58e135 | 305 | bytesRemaining-=bytesReceived; |
jakowisp | 5:728b5d58e135 | 306 | } else { |
jakowisp | 5:728b5d58e135 | 307 | #ifdef USDBPTPDEBUG |
jakowisp | 5:728b5d58e135 | 308 | printf("Handling Response Packet in data container\r\n"); |
jakowisp | 5:728b5d58e135 | 309 | #endif |
jakowisp | 5:728b5d58e135 | 310 | if(bytesReceived-bytesRemaining==responseContainer.length) { |
jakowisp | 5:728b5d58e135 | 311 | pointerToUint8tData=(uint8_t *)&responseContainer; |
jakowisp | 5:728b5d58e135 | 312 | for(i=0;i<responseContainer.length;i++){ |
jakowisp | 5:728b5d58e135 | 313 | pointerToUint8tData[i]=buffer[bytesRemaining+i]; |
jakowisp | 5:728b5d58e135 | 314 | } |
jakowisp | 5:728b5d58e135 | 315 | *responseCode = responseContainer.code; |
jakowisp | 7:c3a16a61643f | 316 | bytesRemaining=0; |
jakowisp | 7:c3a16a61643f | 317 | |
jakowisp | 5:728b5d58e135 | 318 | } else { |
jakowisp | 5:728b5d58e135 | 319 | return false; |
jakowisp | 5:728b5d58e135 | 320 | } |
jakowisp | 5:728b5d58e135 | 321 | } |
jakowisp | 5:728b5d58e135 | 322 | this->dataLeftToTransfer = bytesRemaining; |
jakowisp | 5:728b5d58e135 | 323 | #ifdef USDBPTPDEBUG |
jakowisp | 5:728b5d58e135 | 324 | printf("Loopcheck: %ld\r\n",bytesRemaining); |
jakowisp | 5:728b5d58e135 | 325 | #endif |
jakowisp | 5:728b5d58e135 | 326 | } while( bytesRemaining>0 ); |
jakowisp | 5:728b5d58e135 | 327 | return true; |
jakowisp | 5:728b5d58e135 | 328 | } |
jakowisp | 0:98cf19bcd828 | 329 | |
jakowisp | 0:98cf19bcd828 | 330 | uint16_t USBHostPTP::Transaction(uint16_t operationCode, |
jakowisp | 0:98cf19bcd828 | 331 | OperFlags *operationFlags, |
jakowisp | 0:98cf19bcd828 | 332 | uint32_t *parameters, |
jakowisp | 0:98cf19bcd828 | 333 | void *dataHandlerFunctionCastToVoid){ |
jakowisp | 0:98cf19bcd828 | 334 | |
jakowisp | 5:728b5d58e135 | 335 | |
jakowisp | 5:728b5d58e135 | 336 | uint16_t responseCode=0; |
jakowisp | 0:98cf19bcd828 | 337 | int transferResult=0; |
jakowisp | 0:98cf19bcd828 | 338 | |
jakowisp | 0:98cf19bcd828 | 339 | if(IsCommandSupported(operationCode)==false) |
jakowisp | 1:71c0e9dc153d | 340 | return PIMA_RETURN_CODE_OperationNotSupported; |
jakowisp | 0:98cf19bcd828 | 341 | |
jakowisp | 5:728b5d58e135 | 342 | responseContainer.length = PIMA_CONTAINER_HEADER_LENGTH + operationFlags->rsParams*4; |
jakowisp | 5:728b5d58e135 | 343 | |
jakowisp | 5:728b5d58e135 | 344 | PrepareControlContainer(operationCode,operationFlags,parameters); |
jakowisp | 0:98cf19bcd828 | 345 | |
jakowisp | 5:728b5d58e135 | 346 | transferResult = this->host->bulkWrite(this->pointerToDevice, this->bulk_out,(uint8_t *)&(this->commandContainer), this->commandContainer.length); |
jakowisp | 5:728b5d58e135 | 347 | if (checkResult(transferResult, this->bulk_out)) |
jakowisp | 5:728b5d58e135 | 348 | return PIMA_RETURN_CODE_GeneralError; |
jakowisp | 0:98cf19bcd828 | 349 | #ifdef USDBPTPDEBUG |
jakowisp | 0:98cf19bcd828 | 350 | printf("Command bulkWrite result: %d\r\n",transferResult); |
jakowisp | 0:98cf19bcd828 | 351 | #endif |
jakowisp | 5:728b5d58e135 | 352 | |
jakowisp | 5:728b5d58e135 | 353 | if (operationFlags->dataStage==1) { |
jakowisp | 5:728b5d58e135 | 354 | if (operationFlags->txOperation==0) { |
jakowisp | 6:124a01eaf569 | 355 | if ( RecieveDataContainer(dataHandlerFunctionCastToVoid,&responseCode) != true ) { |
jakowisp | 5:728b5d58e135 | 356 | return PIMA_RETURN_CODE_GeneralError; |
jakowisp | 6:124a01eaf569 | 357 | } else { |
jakowisp | 5:728b5d58e135 | 358 | if (responseCode != PIMA_RETURN_CODE_Undefined) |
jakowisp | 5:728b5d58e135 | 359 | return responseCode; |
jakowisp | 6:124a01eaf569 | 360 | } |
jakowisp | 0:98cf19bcd828 | 361 | } else { |
jakowisp | 0:98cf19bcd828 | 362 | printf("DataOut not coded\r\n"); |
jakowisp | 0:98cf19bcd828 | 363 | } |
jakowisp | 0:98cf19bcd828 | 364 | } |
jakowisp | 0:98cf19bcd828 | 365 | transferResult = host->bulkRead(pointerToDevice, bulk_in,(uint8_t *)&responseContainer, sizeof(responseContainer)); |
jakowisp | 7:c3a16a61643f | 366 | #ifdef USDBPTPDEBUG |
jakowisp | 7:c3a16a61643f | 367 | printf("Response bulkRead result: %d\r\n",transferResult); |
jakowisp | 7:c3a16a61643f | 368 | DumpResponseContainer(); |
jakowisp | 7:c3a16a61643f | 369 | #endif |
jakowisp | 0:98cf19bcd828 | 370 | if (checkResult(transferResult, bulk_in)) |
jakowisp | 5:728b5d58e135 | 371 | return PIMA_RETURN_CODE_GeneralError; |
jakowisp | 3:1fcb46ab18df | 372 | return responseContainer.code; |
jakowisp | 0:98cf19bcd828 | 373 | } |
jakowisp | 0:98cf19bcd828 | 374 | |
jakowisp | 0:98cf19bcd828 | 375 | |
jakowisp | 0:98cf19bcd828 | 376 | |
jakowisp | 0:98cf19bcd828 | 377 | |
jakowisp | 0:98cf19bcd828 | 378 | |
jakowisp | 0:98cf19bcd828 | 379 | uint16_t USBHostPTP::Operation(uint16_t opcode, uint8_t nparams, uint32_t *params){ |
jakowisp | 0:98cf19bcd828 | 380 | OperFlags flags = {0,0,0,0,0,0}; |
jakowisp | 0:98cf19bcd828 | 381 | flags.opParams = nparams; |
jakowisp | 0:98cf19bcd828 | 382 | |
jakowisp | 0:98cf19bcd828 | 383 | return Transaction(opcode,&flags,params); |
jakowisp | 0:98cf19bcd828 | 384 | } |
jakowisp | 0:98cf19bcd828 | 385 | |
jakowisp | 0:98cf19bcd828 | 386 | uint16_t USBHostPTP::OpenSession(void) { |
jakowisp | 0:98cf19bcd828 | 387 | OperFlags flags = {1,0,0,0,0,0}; |
jakowisp | 0:98cf19bcd828 | 388 | |
jakowisp | 1:71c0e9dc153d | 389 | return Transaction(PIMA_OPERATION_CODE_OpenSession,&flags,&sessionID); |
jakowisp | 0:98cf19bcd828 | 390 | } |
jakowisp | 0:98cf19bcd828 | 391 | |
jakowisp | 0:98cf19bcd828 | 392 | uint16_t USBHostPTP::CloseSession(void) { |
jakowisp | 0:98cf19bcd828 | 393 | OperFlags flags = {1,0,0,0,0,0}; |
jakowisp | 0:98cf19bcd828 | 394 | |
jakowisp | 1:71c0e9dc153d | 395 | return Transaction(PIMA_OPERATION_CODE_CloseSession,&flags,&sessionID); |
jakowisp | 0:98cf19bcd828 | 396 | } |
jakowisp | 0:98cf19bcd828 | 397 | |
jakowisp | 0:98cf19bcd828 | 398 | uint16_t USBHostPTP::GetDeviceInfo(void) |
jakowisp | 0:98cf19bcd828 | 399 | { |
jakowisp | 0:98cf19bcd828 | 400 | OperFlags flags = { 0, 0, 0, 1, 1, 0 }; |
jakowisp | 1:71c0e9dc153d | 401 | return Transaction(PIMA_OPERATION_CODE_GetDeviceInfo, &flags,NULL,(void*)&USBHostPTP::ParseDeviceInfoDataBlock); |
jakowisp | 0:98cf19bcd828 | 402 | } |
jakowisp | 0:98cf19bcd828 | 403 | |
jakowisp | 0:98cf19bcd828 | 404 | |
jakowisp | 0:98cf19bcd828 | 405 | uint16_t USBHostPTP::PowerDown() |
jakowisp | 0:98cf19bcd828 | 406 | { |
jakowisp | 0:98cf19bcd828 | 407 | OperFlags flags = { 0, 0, 0, 0, 0, 0 }; |
jakowisp | 1:71c0e9dc153d | 408 | return Transaction(PIMA_OPERATION_CODE_PowerDown, &flags); |
jakowisp | 0:98cf19bcd828 | 409 | } |
jakowisp | 0:98cf19bcd828 | 410 | |
jakowisp | 0:98cf19bcd828 | 411 | uint16_t USBHostPTP::SelfTest(uint16_t type) |
jakowisp | 0:98cf19bcd828 | 412 | { |
jakowisp | 0:98cf19bcd828 | 413 | OperFlags flags = { 1, 0, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 414 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 415 | params[0] = type; |
jakowisp | 0:98cf19bcd828 | 416 | |
jakowisp | 1:71c0e9dc153d | 417 | return Transaction(PIMA_OPERATION_CODE_SelfTest, &flags, params); |
jakowisp | 0:98cf19bcd828 | 418 | } |
jakowisp | 0:98cf19bcd828 | 419 | |
jakowisp | 0:98cf19bcd828 | 420 | uint16_t USBHostPTP::GetObjectHandles(uint32_t storage_id, uint16_t format, uint16_t assoc, void *parser) |
jakowisp | 0:98cf19bcd828 | 421 | { |
jakowisp | 0:98cf19bcd828 | 422 | OperFlags flags = { 3, 0, 0, 1, 1, 0 }; |
jakowisp | 0:98cf19bcd828 | 423 | uint32_t params[3]; |
jakowisp | 0:98cf19bcd828 | 424 | |
jakowisp | 0:98cf19bcd828 | 425 | params[0] = storage_id; |
jakowisp | 0:98cf19bcd828 | 426 | params[1] = (uint32_t)format; |
jakowisp | 0:98cf19bcd828 | 427 | params[2] = (uint32_t)assoc; |
jakowisp | 0:98cf19bcd828 | 428 | |
jakowisp | 1:71c0e9dc153d | 429 | return Transaction(PIMA_OPERATION_CODE_GetObjectHandles, &flags, params, parser); |
jakowisp | 0:98cf19bcd828 | 430 | } |
jakowisp | 0:98cf19bcd828 | 431 | |
jakowisp | 0:98cf19bcd828 | 432 | uint16_t USBHostPTP::GetNumObjects(uint32_t *retval, uint32_t storage_id, uint16_t format, uint32_t assoc) |
jakowisp | 0:98cf19bcd828 | 433 | { |
jakowisp | 1:71c0e9dc153d | 434 | uint16_t ptp_error = PIMA_RETURN_CODE_GeneralError; |
jakowisp | 0:98cf19bcd828 | 435 | OperFlags flags = { 3, 1, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 436 | uint32_t params[3]; |
jakowisp | 0:98cf19bcd828 | 437 | |
jakowisp | 0:98cf19bcd828 | 438 | params[0] = storage_id; |
jakowisp | 0:98cf19bcd828 | 439 | params[1] = (uint32_t)format; |
jakowisp | 0:98cf19bcd828 | 440 | params[2] = (uint32_t)assoc; |
jakowisp | 0:98cf19bcd828 | 441 | |
jakowisp | 1:71c0e9dc153d | 442 | if ( (ptp_error = Transaction(PIMA_OPERATION_CODE_GetNumObjects, &flags, params)) == PIMA_RETURN_CODE_OK) |
jakowisp | 3:1fcb46ab18df | 443 | *retval = responseContainer.payload[0]; |
jakowisp | 0:98cf19bcd828 | 444 | |
jakowisp | 0:98cf19bcd828 | 445 | return ptp_error; |
jakowisp | 0:98cf19bcd828 | 446 | } |
jakowisp | 0:98cf19bcd828 | 447 | |
jakowisp | 0:98cf19bcd828 | 448 | uint16_t USBHostPTP::GetObjectInfo(uint32_t handle) |
jakowisp | 0:98cf19bcd828 | 449 | { |
jakowisp | 0:98cf19bcd828 | 450 | OperFlags flags = { 1, 0, 0, 1, 1, 0 }; |
jakowisp | 0:98cf19bcd828 | 451 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 452 | params[0] = handle; |
jakowisp | 0:98cf19bcd828 | 453 | |
jakowisp | 0:98cf19bcd828 | 454 | //Clear any previous data, incase a Reponse packet is returned instead of a data packet |
jakowisp | 7:c3a16a61643f | 455 | ///TODO:Magic number issue |
jakowisp | 7:c3a16a61643f | 456 | //No buffer overun issue: See ParseObjectInfoDataBlock |
jakowisp | 0:98cf19bcd828 | 457 | memset((uint8_t *)&objectInfo,0,0x34); |
jakowisp | 0:98cf19bcd828 | 458 | |
jakowisp | 1:71c0e9dc153d | 459 | return Transaction(PIMA_OPERATION_CODE_GetObjectInfo, &flags, params, (void*)&USBHostPTP::ParseObjectInfoDataBlock); |
jakowisp | 0:98cf19bcd828 | 460 | } |
jakowisp | 0:98cf19bcd828 | 461 | |
jakowisp | 0:98cf19bcd828 | 462 | uint16_t USBHostPTP::GetThumb(uint32_t handle, void *parser) |
jakowisp | 0:98cf19bcd828 | 463 | { |
jakowisp | 0:98cf19bcd828 | 464 | OperFlags flags = { 1, 0, 0, 1, 1, 0 }; |
jakowisp | 0:98cf19bcd828 | 465 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 466 | |
jakowisp | 0:98cf19bcd828 | 467 | params[0] = handle; |
jakowisp | 0:98cf19bcd828 | 468 | |
jakowisp | 1:71c0e9dc153d | 469 | return Transaction(PIMA_OPERATION_CODE_GetThumb, &flags, params, parser); |
jakowisp | 0:98cf19bcd828 | 470 | } |
jakowisp | 0:98cf19bcd828 | 471 | |
jakowisp | 0:98cf19bcd828 | 472 | |
jakowisp | 0:98cf19bcd828 | 473 | uint16_t USBHostPTP::GetObject(uint32_t handle, void *parser) |
jakowisp | 0:98cf19bcd828 | 474 | { |
jakowisp | 0:98cf19bcd828 | 475 | OperFlags flags = { 1, 0, 0, 1, 1, 0 }; |
jakowisp | 0:98cf19bcd828 | 476 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 477 | |
jakowisp | 0:98cf19bcd828 | 478 | params[0] = handle; |
jakowisp | 0:98cf19bcd828 | 479 | |
jakowisp | 1:71c0e9dc153d | 480 | return Transaction(PIMA_OPERATION_CODE_GetObject, &flags, params, parser); |
jakowisp | 0:98cf19bcd828 | 481 | } |
jakowisp | 0:98cf19bcd828 | 482 | |
jakowisp | 0:98cf19bcd828 | 483 | uint16_t USBHostPTP::GetStorageIDs(void *parser) |
jakowisp | 0:98cf19bcd828 | 484 | { |
jakowisp | 0:98cf19bcd828 | 485 | OperFlags flags = { 0, 0, 0, 1, 1, 0 }; |
jakowisp | 1:71c0e9dc153d | 486 | return Transaction(PIMA_OPERATION_CODE_GetStorageIDs, &flags, NULL, parser); |
jakowisp | 0:98cf19bcd828 | 487 | } |
jakowisp | 0:98cf19bcd828 | 488 | |
jakowisp | 4:9c6f5867f050 | 489 | uint16_t USBHostPTP::GetStorageInfo(uint32_t storage_id) |
jakowisp | 0:98cf19bcd828 | 490 | { |
jakowisp | 0:98cf19bcd828 | 491 | OperFlags flags = { 1, 0, 0, 1, 1, 0 }; |
jakowisp | 0:98cf19bcd828 | 492 | |
jakowisp | 0:98cf19bcd828 | 493 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 494 | params[0] = storage_id; |
jakowisp | 0:98cf19bcd828 | 495 | |
jakowisp | 4:9c6f5867f050 | 496 | return Transaction(PIMA_OPERATION_CODE_GetStorageInfo, &flags, params, (void*)&USBHostPTP::ParseStorageInfoDataBlock); |
jakowisp | 0:98cf19bcd828 | 497 | } |
jakowisp | 0:98cf19bcd828 | 498 | |
jakowisp | 0:98cf19bcd828 | 499 | uint16_t USBHostPTP::CopyObject(uint32_t handle, uint32_t storage_id, uint32_t parent, uint32_t *new_handle) |
jakowisp | 0:98cf19bcd828 | 500 | { |
jakowisp | 1:71c0e9dc153d | 501 | uint16_t ptp_error = PIMA_RETURN_CODE_GeneralError; |
jakowisp | 0:98cf19bcd828 | 502 | OperFlags flags = { 3, 1, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 503 | uint32_t params[3]; |
jakowisp | 0:98cf19bcd828 | 504 | |
jakowisp | 0:98cf19bcd828 | 505 | params[0] = handle; |
jakowisp | 0:98cf19bcd828 | 506 | params[1] = storage_id; |
jakowisp | 0:98cf19bcd828 | 507 | params[2] = parent; |
jakowisp | 0:98cf19bcd828 | 508 | |
jakowisp | 1:71c0e9dc153d | 509 | if ( (ptp_error = Transaction(PIMA_OPERATION_CODE_CopyObject, &flags, params)) == PIMA_RETURN_CODE_OK) |
jakowisp | 3:1fcb46ab18df | 510 | *new_handle = responseContainer.payload[0]; |
jakowisp | 0:98cf19bcd828 | 511 | |
jakowisp | 0:98cf19bcd828 | 512 | return ptp_error; |
jakowisp | 0:98cf19bcd828 | 513 | } |
jakowisp | 0:98cf19bcd828 | 514 | |
jakowisp | 0:98cf19bcd828 | 515 | |
jakowisp | 0:98cf19bcd828 | 516 | uint16_t USBHostPTP::DeleteObject(uint32_t handle, uint16_t format) |
jakowisp | 0:98cf19bcd828 | 517 | { |
jakowisp | 0:98cf19bcd828 | 518 | OperFlags flags = { 2, 0, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 519 | uint32_t params[2]; |
jakowisp | 0:98cf19bcd828 | 520 | |
jakowisp | 0:98cf19bcd828 | 521 | params[0] = handle; |
jakowisp | 0:98cf19bcd828 | 522 | params[1] = (uint32_t)format; |
jakowisp | 0:98cf19bcd828 | 523 | |
jakowisp | 1:71c0e9dc153d | 524 | return Transaction(PIMA_OPERATION_CODE_DeleteObject, &flags, params); |
jakowisp | 0:98cf19bcd828 | 525 | } |
jakowisp | 0:98cf19bcd828 | 526 | |
jakowisp | 0:98cf19bcd828 | 527 | |
jakowisp | 0:98cf19bcd828 | 528 | uint16_t USBHostPTP::SetObjectProtection(uint32_t handle, uint16_t attrib) |
jakowisp | 0:98cf19bcd828 | 529 | { |
jakowisp | 0:98cf19bcd828 | 530 | OperFlags flags = { 2, 0, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 531 | uint32_t params[2]; |
jakowisp | 0:98cf19bcd828 | 532 | |
jakowisp | 0:98cf19bcd828 | 533 | params[0] = handle; |
jakowisp | 0:98cf19bcd828 | 534 | params[1] = (uint32_t)attrib; |
jakowisp | 0:98cf19bcd828 | 535 | |
jakowisp | 1:71c0e9dc153d | 536 | return Transaction(PIMA_OPERATION_CODE_SetObjectProtection, &flags, params); |
jakowisp | 0:98cf19bcd828 | 537 | } |
jakowisp | 0:98cf19bcd828 | 538 | |
jakowisp | 0:98cf19bcd828 | 539 | |
jakowisp | 0:98cf19bcd828 | 540 | uint16_t USBHostPTP::MoveObject(uint32_t handle, uint32_t storage_id, uint32_t parent) |
jakowisp | 0:98cf19bcd828 | 541 | { |
jakowisp | 0:98cf19bcd828 | 542 | OperFlags flags = { 3, 0, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 543 | uint32_t params[3]; |
jakowisp | 0:98cf19bcd828 | 544 | |
jakowisp | 0:98cf19bcd828 | 545 | params[0] = handle; |
jakowisp | 0:98cf19bcd828 | 546 | params[1] = storage_id; |
jakowisp | 0:98cf19bcd828 | 547 | params[2] = parent; |
jakowisp | 0:98cf19bcd828 | 548 | |
jakowisp | 1:71c0e9dc153d | 549 | return Transaction(PIMA_OPERATION_CODE_MoveObject, &flags, params); |
jakowisp | 0:98cf19bcd828 | 550 | } |
jakowisp | 0:98cf19bcd828 | 551 | |
jakowisp | 0:98cf19bcd828 | 552 | |
jakowisp | 0:98cf19bcd828 | 553 | uint16_t USBHostPTP::GetDevicePropDesc(const uint16_t pcode, void *parser) |
jakowisp | 0:98cf19bcd828 | 554 | { |
jakowisp | 0:98cf19bcd828 | 555 | OperFlags flags = { 1, 0, 0, 1, 1, 0 }; |
jakowisp | 0:98cf19bcd828 | 556 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 557 | |
jakowisp | 0:98cf19bcd828 | 558 | params[0] = (uint32_t)pcode; |
jakowisp | 0:98cf19bcd828 | 559 | |
jakowisp | 0:98cf19bcd828 | 560 | if(IsPropertySupported(pcode)==false) |
jakowisp | 1:71c0e9dc153d | 561 | return PIMA_RETURN_CODE_DevicePropertyNotSupported; |
jakowisp | 0:98cf19bcd828 | 562 | |
jakowisp | 1:71c0e9dc153d | 563 | return Transaction(PIMA_OPERATION_CODE_GetDevicePropDesc, &flags, params, parser); |
jakowisp | 0:98cf19bcd828 | 564 | } |
jakowisp | 0:98cf19bcd828 | 565 | |
jakowisp | 0:98cf19bcd828 | 566 | |
jakowisp | 0:98cf19bcd828 | 567 | uint16_t USBHostPTP::GetDevicePropValue(const uint16_t pcode, void *parser) |
jakowisp | 0:98cf19bcd828 | 568 | { |
jakowisp | 0:98cf19bcd828 | 569 | OperFlags flags = { 1, 0, 0, 1, 1, 0 }; |
jakowisp | 0:98cf19bcd828 | 570 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 571 | |
jakowisp | 0:98cf19bcd828 | 572 | params[0] = (uint32_t)pcode; |
jakowisp | 0:98cf19bcd828 | 573 | if(IsPropertySupported(pcode)==false) |
jakowisp | 1:71c0e9dc153d | 574 | return PIMA_RETURN_CODE_DevicePropertyNotSupported; |
jakowisp | 0:98cf19bcd828 | 575 | |
jakowisp | 1:71c0e9dc153d | 576 | return Transaction(PIMA_OPERATION_CODE_GetDevicePropValue, &flags, params, parser); |
jakowisp | 0:98cf19bcd828 | 577 | } |
jakowisp | 0:98cf19bcd828 | 578 | |
jakowisp | 0:98cf19bcd828 | 579 | |
jakowisp | 0:98cf19bcd828 | 580 | uint16_t USBHostPTP::SetDevicePropValue(uint16_t pcode, uint32_t val) |
jakowisp | 0:98cf19bcd828 | 581 | { |
jakowisp | 0:98cf19bcd828 | 582 | OperFlags flags = { 1, 0, 1, 1, 3, 4 }; |
jakowisp | 0:98cf19bcd828 | 583 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 584 | uint32_t value; |
jakowisp | 0:98cf19bcd828 | 585 | |
jakowisp | 0:98cf19bcd828 | 586 | params[0] = (uint32_t)pcode; |
jakowisp | 0:98cf19bcd828 | 587 | value = val; |
jakowisp | 0:98cf19bcd828 | 588 | |
jakowisp | 0:98cf19bcd828 | 589 | if(IsPropertySupported(pcode)==false) |
jakowisp | 1:71c0e9dc153d | 590 | return PIMA_RETURN_CODE_DevicePropertyNotSupported; |
jakowisp | 0:98cf19bcd828 | 591 | |
jakowisp | 1:71c0e9dc153d | 592 | return Transaction(PIMA_OPERATION_CODE_SetDevicePropValue, &flags, params, (void*)&value); |
jakowisp | 0:98cf19bcd828 | 593 | } |
jakowisp | 0:98cf19bcd828 | 594 | |
jakowisp | 0:98cf19bcd828 | 595 | |
jakowisp | 0:98cf19bcd828 | 596 | uint16_t USBHostPTP::ResetDevicePropValue(const uint16_t pcode) |
jakowisp | 0:98cf19bcd828 | 597 | { |
jakowisp | 0:98cf19bcd828 | 598 | OperFlags flags = { 1, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 599 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 600 | |
jakowisp | 0:98cf19bcd828 | 601 | params[0] = (uint32_t)pcode; |
jakowisp | 0:98cf19bcd828 | 602 | |
jakowisp | 0:98cf19bcd828 | 603 | if(IsPropertySupported(pcode)==false) |
jakowisp | 1:71c0e9dc153d | 604 | return PIMA_RETURN_CODE_DevicePropertyNotSupported; |
jakowisp | 0:98cf19bcd828 | 605 | |
jakowisp | 1:71c0e9dc153d | 606 | return Transaction(PIMA_OPERATION_CODE_ResetDevicePropValue, &flags, params); |
jakowisp | 0:98cf19bcd828 | 607 | } |
jakowisp | 0:98cf19bcd828 | 608 | |
jakowisp | 0:98cf19bcd828 | 609 | |
jakowisp | 0:98cf19bcd828 | 610 | uint16_t USBHostPTP::FormatStore(uint32_t storage_id, uint32_t fsformat) |
jakowisp | 0:98cf19bcd828 | 611 | { |
jakowisp | 0:98cf19bcd828 | 612 | OperFlags flags = { 2, 0, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 613 | |
jakowisp | 0:98cf19bcd828 | 614 | uint32_t params[2]; |
jakowisp | 0:98cf19bcd828 | 615 | params[0] = storage_id; |
jakowisp | 0:98cf19bcd828 | 616 | params[1] = fsformat; |
jakowisp | 0:98cf19bcd828 | 617 | |
jakowisp | 1:71c0e9dc153d | 618 | return Transaction(PIMA_OPERATION_CODE_FormatStore, &flags, params); |
jakowisp | 0:98cf19bcd828 | 619 | } |
jakowisp | 0:98cf19bcd828 | 620 | |
jakowisp | 0:98cf19bcd828 | 621 | uint16_t USBHostPTP::InitiateCapture(uint32_t storage_id, uint16_t format) |
jakowisp | 0:98cf19bcd828 | 622 | { |
jakowisp | 1:71c0e9dc153d | 623 | uint16_t ptp_error = PIMA_RETURN_CODE_GeneralError; |
jakowisp | 0:98cf19bcd828 | 624 | OperFlags flags = { 2, 0, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 625 | uint32_t params[2]; |
jakowisp | 0:98cf19bcd828 | 626 | |
jakowisp | 0:98cf19bcd828 | 627 | params[0] = storage_id; |
jakowisp | 0:98cf19bcd828 | 628 | params[1] = (uint32_t)format; |
jakowisp | 0:98cf19bcd828 | 629 | |
jakowisp | 1:71c0e9dc153d | 630 | if ( (ptp_error = Transaction(PIMA_OPERATION_CODE_InitiateCapture, &flags, params)) == PIMA_RETURN_CODE_OK){ |
jakowisp | 0:98cf19bcd828 | 631 | } |
jakowisp | 0:98cf19bcd828 | 632 | |
jakowisp | 0:98cf19bcd828 | 633 | return ptp_error; |
jakowisp | 0:98cf19bcd828 | 634 | } |
jakowisp | 0:98cf19bcd828 | 635 | |
jakowisp | 0:98cf19bcd828 | 636 | uint16_t USBHostPTP::InitiateOpenCapture(uint32_t storage_id, uint16_t format) |
jakowisp | 0:98cf19bcd828 | 637 | { |
jakowisp | 1:71c0e9dc153d | 638 | uint16_t ptp_error = PIMA_RETURN_CODE_GeneralError; |
jakowisp | 0:98cf19bcd828 | 639 | OperFlags flags = { 2, 0, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 640 | uint32_t params[2]; |
jakowisp | 0:98cf19bcd828 | 641 | |
jakowisp | 0:98cf19bcd828 | 642 | params[0] = storage_id; |
jakowisp | 0:98cf19bcd828 | 643 | params[1] = (uint32_t)format; |
jakowisp | 0:98cf19bcd828 | 644 | |
jakowisp | 1:71c0e9dc153d | 645 | if ( (ptp_error = Transaction(PIMA_OPERATION_CODE_InitiateOpenCapture, &flags, params)) == PIMA_RETURN_CODE_OK){ |
jakowisp | 0:98cf19bcd828 | 646 | } |
jakowisp | 0:98cf19bcd828 | 647 | |
jakowisp | 0:98cf19bcd828 | 648 | return ptp_error; |
jakowisp | 0:98cf19bcd828 | 649 | } |
jakowisp | 0:98cf19bcd828 | 650 | |
jakowisp | 0:98cf19bcd828 | 651 | uint16_t USBHostPTP::TerminateOpenCapture(uint32_t trans_id) |
jakowisp | 0:98cf19bcd828 | 652 | { |
jakowisp | 0:98cf19bcd828 | 653 | OperFlags flags = { 1, 0, 0, 0, 0, 0 }; |
jakowisp | 0:98cf19bcd828 | 654 | uint32_t params[1]; |
jakowisp | 0:98cf19bcd828 | 655 | |
jakowisp | 0:98cf19bcd828 | 656 | params[0] = trans_id; |
jakowisp | 0:98cf19bcd828 | 657 | |
jakowisp | 1:71c0e9dc153d | 658 | return Transaction(PIMA_OPERATION_CODE_TerminateOpenCapture, &flags, params); |
jakowisp | 0:98cf19bcd828 | 659 | } |
jakowisp | 0:98cf19bcd828 | 660 | |
jakowisp | 0:98cf19bcd828 | 661 | |
jakowisp | 0:98cf19bcd828 | 662 | |
jakowisp | 0:98cf19bcd828 | 663 | void USBHostPTP::ParseDeviceInfoDataBlock(void *ptp,uint8_t *buffer,uint16_t length){ |
jakowisp | 0:98cf19bcd828 | 664 | uint8_t *currentPtr; |
jakowisp | 0:98cf19bcd828 | 665 | USBHostPTP *dev=(USBHostPTP *)ptp; |
jakowisp | 0:98cf19bcd828 | 666 | |
jakowisp | 0:98cf19bcd828 | 667 | currentPtr=buffer; |
jakowisp | 0:98cf19bcd828 | 668 | dev->deviceInfo.standardVersion=*((uint16_t *)currentPtr); |
jakowisp | 0:98cf19bcd828 | 669 | currentPtr+=2; |
jakowisp | 0:98cf19bcd828 | 670 | dev->deviceInfo.vendorExtensionID=*((uint32_t *)currentPtr); |
jakowisp | 0:98cf19bcd828 | 671 | currentPtr+=4; |
jakowisp | 0:98cf19bcd828 | 672 | dev->deviceInfo.vendorExtensionVersion=*((uint16_t *)currentPtr); |
jakowisp | 0:98cf19bcd828 | 673 | currentPtr+=2; |
jakowisp | 0:98cf19bcd828 | 674 | |
jakowisp | 0:98cf19bcd828 | 675 | currentPtr+=dev->deviceInfo.vendorExtensionDesc.FillString(currentPtr); |
jakowisp | 0:98cf19bcd828 | 676 | |
jakowisp | 0:98cf19bcd828 | 677 | dev->deviceInfo.functionMode=*((uint16_t *)currentPtr); |
jakowisp | 0:98cf19bcd828 | 678 | currentPtr+=2; |
jakowisp | 0:98cf19bcd828 | 679 | |
jakowisp | 0:98cf19bcd828 | 680 | currentPtr+=dev->deviceInfo.operationsSupported.FillArray(currentPtr); |
jakowisp | 0:98cf19bcd828 | 681 | currentPtr+=dev->deviceInfo.eventsSupported.FillArray(currentPtr); |
jakowisp | 0:98cf19bcd828 | 682 | currentPtr+=dev->deviceInfo.devicePropertiesSupported.FillArray(currentPtr); |
jakowisp | 0:98cf19bcd828 | 683 | currentPtr+=dev->deviceInfo.captureFormats.FillArray(currentPtr); |
jakowisp | 0:98cf19bcd828 | 684 | currentPtr+=dev->deviceInfo.imageFormats.FillArray(currentPtr); |
jakowisp | 0:98cf19bcd828 | 685 | |
jakowisp | 0:98cf19bcd828 | 686 | currentPtr+=dev->deviceInfo.manufacturer.FillString(currentPtr); |
jakowisp | 0:98cf19bcd828 | 687 | currentPtr+=dev->deviceInfo.model.FillString(currentPtr); |
jakowisp | 0:98cf19bcd828 | 688 | currentPtr+=dev->deviceInfo.deviceVersion.FillString(currentPtr); |
jakowisp | 0:98cf19bcd828 | 689 | currentPtr+=dev->deviceInfo.serialNumber.FillString(currentPtr); |
jakowisp | 0:98cf19bcd828 | 690 | |
jakowisp | 0:98cf19bcd828 | 691 | } |
jakowisp | 0:98cf19bcd828 | 692 | |
jakowisp | 0:98cf19bcd828 | 693 | void USBHostPTP::ParseObjectInfoDataBlock(void *ptp,uint8_t *buffer,uint16_t length){ |
jakowisp | 7:c3a16a61643f | 694 | //TEST: PASS |
jakowisp | 7:c3a16a61643f | 695 | // iterated thru getObjectInfo for all 789 objects on phone in a loop 200 times |
jakowisp | 7:c3a16a61643f | 696 | // memory dumps show no buffer over runs on objectInfo |
jakowisp | 0:98cf19bcd828 | 697 | uint8_t *ptr,*structptr; |
jakowisp | 0:98cf19bcd828 | 698 | USBHostPTP *obj=(USBHostPTP *)ptp; |
jakowisp | 0:98cf19bcd828 | 699 | |
jakowisp | 0:98cf19bcd828 | 700 | structptr=(uint8_t *) &(obj->objectInfo); |
jakowisp | 0:98cf19bcd828 | 701 | ptr=buffer; |
jakowisp | 7:c3a16a61643f | 702 | ////TODO: MAGIC number issue |
jakowisp | 0:98cf19bcd828 | 703 | for(int i=0;i<0x34;i++) |
jakowisp | 0:98cf19bcd828 | 704 | structptr[i]=ptr[i]; |
jakowisp | 0:98cf19bcd828 | 705 | ptr+=0x34; |
jakowisp | 0:98cf19bcd828 | 706 | ptr+=obj->objectInfo.filename.FillString(ptr); |
jakowisp | 0:98cf19bcd828 | 707 | ptr+=obj->objectInfo.captureDate.FillString(ptr); |
jakowisp | 0:98cf19bcd828 | 708 | ptr+=obj->objectInfo.modificationDate.FillString(ptr); |
jakowisp | 0:98cf19bcd828 | 709 | ptr+=obj->objectInfo.keywords.FillString(ptr); |
jakowisp | 0:98cf19bcd828 | 710 | #ifdef USDBPTPDEBUG |
jakowisp | 0:98cf19bcd828 | 711 | obj->DumpObjectInfo(); |
jakowisp | 0:98cf19bcd828 | 712 | #endif |
jakowisp | 0:98cf19bcd828 | 713 | } |
jakowisp | 0:98cf19bcd828 | 714 | |
jakowisp | 4:9c6f5867f050 | 715 | void USBHostPTP::ParseStorageInfoDataBlock(void *ptp,uint8_t *buffer,uint16_t length){ |
jakowisp | 4:9c6f5867f050 | 716 | uint8_t *ptr,*structptr; |
jakowisp | 4:9c6f5867f050 | 717 | USBHostPTP *obj=(USBHostPTP *)ptp; |
jakowisp | 4:9c6f5867f050 | 718 | |
jakowisp | 4:9c6f5867f050 | 719 | structptr=(uint8_t *) &(obj->storageInfo); |
jakowisp | 4:9c6f5867f050 | 720 | ptr=buffer; |
jakowisp | 4:9c6f5867f050 | 721 | for(int i=0;i<0x1a;i++) |
jakowisp | 4:9c6f5867f050 | 722 | structptr[i]=ptr[i]; |
jakowisp | 4:9c6f5867f050 | 723 | ptr+=0x1a; |
jakowisp | 4:9c6f5867f050 | 724 | ptr+=obj->storageInfo.storageDescription.FillString(ptr); |
jakowisp | 4:9c6f5867f050 | 725 | obj->storageInfo.volumeLabel.FillString(ptr); |
jakowisp | 4:9c6f5867f050 | 726 | } |
jakowisp | 4:9c6f5867f050 | 727 | |
jakowisp | 0:98cf19bcd828 | 728 | |
jakowisp | 0:98cf19bcd828 | 729 | bool USBHostPTP::IsCommandSupported(uint16_t opcode){ |
jakowisp | 0:98cf19bcd828 | 730 | bool res=false; |
jakowisp | 0:98cf19bcd828 | 731 | |
jakowisp | 1:71c0e9dc153d | 732 | if(opcode==PIMA_OPERATION_CODE_OpenSession || opcode==PIMA_OPERATION_CODE_GetDeviceInfo) |
jakowisp | 0:98cf19bcd828 | 733 | res=true; |
jakowisp | 0:98cf19bcd828 | 734 | else |
jakowisp | 0:98cf19bcd828 | 735 | res = CheckValueInArray(&deviceInfo.operationsSupported,opcode); |
jakowisp | 0:98cf19bcd828 | 736 | return res; |
jakowisp | 0:98cf19bcd828 | 737 | } |
jakowisp | 0:98cf19bcd828 | 738 | |
jakowisp | 0:98cf19bcd828 | 739 | bool USBHostPTP::IsPropertySupported(uint16_t code){ |
jakowisp | 0:98cf19bcd828 | 740 | |
jakowisp | 0:98cf19bcd828 | 741 | return CheckValueInArray(&deviceInfo.devicePropertiesSupported, code); |
jakowisp | 0:98cf19bcd828 | 742 | |
jakowisp | 0:98cf19bcd828 | 743 | } |
jakowisp | 0:98cf19bcd828 | 744 | |
jakowisp | 0:98cf19bcd828 | 745 | bool USBHostPTP::CheckValueInArray(PIMAArray *array, uint16_t code) { |
jakowisp | 0:98cf19bcd828 | 746 | bool res=false; |
jakowisp | 0:98cf19bcd828 | 747 | for(int i=0; i<array->numberOfElements;i++) |
jakowisp | 0:98cf19bcd828 | 748 | if(code == array->codes[i]) |
jakowisp | 0:98cf19bcd828 | 749 | res=true; |
jakowisp | 0:98cf19bcd828 | 750 | return res; |
jakowisp | 0:98cf19bcd828 | 751 | } |
jakowisp | 0:98cf19bcd828 | 752 | |
jakowisp | 0:98cf19bcd828 | 753 | |
jakowisp | 0:98cf19bcd828 | 754 | void USBHostPTP::DumpBuffer(uint8_t *buffer,uint32_t length){ |
jakowisp | 0:98cf19bcd828 | 755 | for(int i=0;i<length;i++) { |
jakowisp | 0:98cf19bcd828 | 756 | printf("%02x ",buffer[i]); |
jakowisp | 0:98cf19bcd828 | 757 | if(i % 16 == 15 ) |
jakowisp | 0:98cf19bcd828 | 758 | printf("\r\n"); |
jakowisp | 0:98cf19bcd828 | 759 | } |
jakowisp | 0:98cf19bcd828 | 760 | printf("\r\n"); |
jakowisp | 0:98cf19bcd828 | 761 | } |
jakowisp | 0:98cf19bcd828 | 762 | |
jakowisp | 0:98cf19bcd828 | 763 | |
jakowisp | 0:98cf19bcd828 | 764 | void USBHostPTP::DumpDeviceInfo(){ |
jakowisp | 0:98cf19bcd828 | 765 | int i; |
jakowisp | 0:98cf19bcd828 | 766 | |
jakowisp | 0:98cf19bcd828 | 767 | printf("PIMA standard version: %x\r\n",deviceInfo.standardVersion); |
jakowisp | 0:98cf19bcd828 | 768 | printf("Vendor Extension ID: %x\r\n",deviceInfo.vendorExtensionID); |
jakowisp | 0:98cf19bcd828 | 769 | printf("Vendor Extension Version: %x\r\n",deviceInfo.vendorExtensionVersion); |
jakowisp | 0:98cf19bcd828 | 770 | printf("Vendor Extension Description: \r\n"); |
jakowisp | 0:98cf19bcd828 | 771 | printf("%s\r\n",(deviceInfo.vendorExtensionDesc.getString())); |
jakowisp | 0:98cf19bcd828 | 772 | printf("Functional Mode: %x\r\n",deviceInfo.functionMode); |
jakowisp | 0:98cf19bcd828 | 773 | printf("Supported Operations: \r\n"); |
jakowisp | 0:98cf19bcd828 | 774 | for(i=0;i<deviceInfo.operationsSupported.numberOfElements;i++) { |
jakowisp | 0:98cf19bcd828 | 775 | printf("0x%04x\r\n",deviceInfo.operationsSupported.codes[i]); |
jakowisp | 0:98cf19bcd828 | 776 | } |
jakowisp | 0:98cf19bcd828 | 777 | printf("Supported Events: \r\n"); |
jakowisp | 0:98cf19bcd828 | 778 | for(i=0;i<deviceInfo.eventsSupported.numberOfElements;i++) { |
jakowisp | 0:98cf19bcd828 | 779 | printf("0x%04x\r\n",deviceInfo.eventsSupported.codes[i]); |
jakowisp | 0:98cf19bcd828 | 780 | } |
jakowisp | 0:98cf19bcd828 | 781 | printf("Supported Device Properties: \r\n"); |
jakowisp | 0:98cf19bcd828 | 782 | for(i=0;i<deviceInfo.devicePropertiesSupported.numberOfElements;i++) { |
jakowisp | 0:98cf19bcd828 | 783 | printf("0x%04x\r\n",deviceInfo.devicePropertiesSupported.codes[i]); |
jakowisp | 0:98cf19bcd828 | 784 | } |
jakowisp | 0:98cf19bcd828 | 785 | printf("Supported Capture Formats: \r\n"); |
jakowisp | 0:98cf19bcd828 | 786 | for(i=0;i<deviceInfo.captureFormats.numberOfElements;i++) { |
jakowisp | 0:98cf19bcd828 | 787 | printf("0x%04x\r\n",deviceInfo.captureFormats.codes[i]); |
jakowisp | 0:98cf19bcd828 | 788 | } |
jakowisp | 0:98cf19bcd828 | 789 | printf("Supported Image Formats: \r\n"); |
jakowisp | 0:98cf19bcd828 | 790 | for(i=0;i<deviceInfo.imageFormats.numberOfElements;i++) { |
jakowisp | 0:98cf19bcd828 | 791 | printf("0x%04x\r\n",deviceInfo.imageFormats.codes[i]); |
jakowisp | 0:98cf19bcd828 | 792 | } |
jakowisp | 0:98cf19bcd828 | 793 | |
jakowisp | 0:98cf19bcd828 | 794 | printf("Manufacturer: \r\n"); |
jakowisp | 0:98cf19bcd828 | 795 | printf("%s\r\n",deviceInfo.manufacturer.getString()); |
jakowisp | 0:98cf19bcd828 | 796 | printf("Model: \r\n"); |
jakowisp | 0:98cf19bcd828 | 797 | printf("%s\r\n",deviceInfo.model.getString()); |
jakowisp | 0:98cf19bcd828 | 798 | printf("Device Version: \r\n"); |
jakowisp | 0:98cf19bcd828 | 799 | printf("%s\r\n",deviceInfo.deviceVersion.getString()); |
jakowisp | 0:98cf19bcd828 | 800 | printf("Serial Number: \r\n"); |
jakowisp | 0:98cf19bcd828 | 801 | printf("%s\r\n",deviceInfo.serialNumber.getString()); |
jakowisp | 0:98cf19bcd828 | 802 | |
jakowisp | 0:98cf19bcd828 | 803 | } |
jakowisp | 0:98cf19bcd828 | 804 | |
jakowisp | 0:98cf19bcd828 | 805 | void USBHostPTP::DumpObjectInfo(){ |
jakowisp | 0:98cf19bcd828 | 806 | |
jakowisp | 0:98cf19bcd828 | 807 | |
jakowisp | 0:98cf19bcd828 | 808 | printf("-----------------------ObjectInfo--------------\r\n"); |
jakowisp | 0:98cf19bcd828 | 809 | printf("Storage ID: %08x\r\n",objectInfo.storageID); |
jakowisp | 0:98cf19bcd828 | 810 | printf("Object Format: %04x\r\n",objectInfo.objectFormat); |
jakowisp | 0:98cf19bcd828 | 811 | printf("Protection Status: %04x\r\n",objectInfo.protectionStatus); |
jakowisp | 0:98cf19bcd828 | 812 | printf("Compressed Size: %ld\r\n",objectInfo.objectCompressSize); |
jakowisp | 0:98cf19bcd828 | 813 | printf("Thumbnail format: %04x\r\n",objectInfo.thumbFormat); |
jakowisp | 0:98cf19bcd828 | 814 | printf("Thumbnail Compressed size: %04x\r\n",objectInfo.thumbCompressedSize); |
jakowisp | 0:98cf19bcd828 | 815 | printf("Thumbnail Width %ld\r\n",objectInfo.thumbPixWidth); |
jakowisp | 0:98cf19bcd828 | 816 | printf("Thumbnail Height: %ld\r\n",objectInfo.thumbPixHeight); |
jakowisp | 0:98cf19bcd828 | 817 | printf("Image Width: %ld\r\n",objectInfo.imagePixWidth); |
jakowisp | 0:98cf19bcd828 | 818 | printf("Image Height: %ld\r\n",objectInfo.imagePixHeight); |
jakowisp | 0:98cf19bcd828 | 819 | printf("Image BitDepth: %ld\r\n",objectInfo.imageBitDepth); |
jakowisp | 0:98cf19bcd828 | 820 | printf("Parent Object: %04x\r\n",objectInfo.parentObject); |
jakowisp | 0:98cf19bcd828 | 821 | printf("Assosiaction Type: %02x\r\n",objectInfo.associationType); |
jakowisp | 0:98cf19bcd828 | 822 | printf("Assosiaction Description: %04x\r\n",objectInfo.associationDesc); |
jakowisp | 0:98cf19bcd828 | 823 | printf("Sequence Number: %ld\r\n",objectInfo.sequenceNumber); |
jakowisp | 0:98cf19bcd828 | 824 | |
jakowisp | 0:98cf19bcd828 | 825 | printf("Filename: \r\n"); |
jakowisp | 0:98cf19bcd828 | 826 | printf("%s\r\n",objectInfo.filename.getString()); |
jakowisp | 0:98cf19bcd828 | 827 | printf("Capture Date: \r\n"); |
jakowisp | 0:98cf19bcd828 | 828 | printf("%s\r\n",objectInfo.captureDate.getString()); |
jakowisp | 0:98cf19bcd828 | 829 | printf("Modification Date: \r\n"); |
jakowisp | 0:98cf19bcd828 | 830 | printf("%s\r\n",objectInfo.modificationDate.getString()); |
jakowisp | 0:98cf19bcd828 | 831 | printf("Keywords: \r\n"); |
jakowisp | 0:98cf19bcd828 | 832 | printf("%s\r\n",objectInfo.keywords.getString()); |
jakowisp | 0:98cf19bcd828 | 833 | } |
jakowisp | 0:98cf19bcd828 | 834 | |
jakowisp | 7:c3a16a61643f | 835 | void USBHostPTP::DumpResponseContainer(){ |
jakowisp | 7:c3a16a61643f | 836 | printf("PTPResponseContainer:\r\n"); |
jakowisp | 7:c3a16a61643f | 837 | this->DumpBuffer((uint8_t *)&responseContainer,responseContainer.length); |
jakowisp | 7:c3a16a61643f | 838 | if (responseContainer.code==PIMA_RETURN_CODE_OK) { |
jakowisp | 7:c3a16a61643f | 839 | printf("PIMA_RETURN_CODE_OK\r\n"); |
jakowisp | 7:c3a16a61643f | 840 | } else { |
jakowisp | 7:c3a16a61643f | 841 | printf("Response Length: %x\r\n",responseContainer.length); |
jakowisp | 7:c3a16a61643f | 842 | printf("Response type: %x\r\n",responseContainer.type); |
jakowisp | 7:c3a16a61643f | 843 | printf("Response code: %x\r\n",responseContainer.code); |
jakowisp | 7:c3a16a61643f | 844 | printf("Response ID: %d\r\n",responseContainer.transactionID); |
jakowisp | 7:c3a16a61643f | 845 | } |
jakowisp | 0:98cf19bcd828 | 846 | |
jakowisp | 7:c3a16a61643f | 847 | } |
jakowisp | 0:98cf19bcd828 | 848 | |
jakowisp | 0:98cf19bcd828 | 849 | #endif |
jakowisp | 0:98cf19bcd828 | 850 | |
jakowisp | 4:9c6f5867f050 | 851 | |
jakowisp | 7:c3a16a61643f | 852 |