ACKme / WiConnect

Host library for controlling a WiConnect enabled Wi-Fi module.

Dependents:   wiconnect-ota_example wiconnect-web_setup_example wiconnect-test-console wiconnect-tcp_server_example ... more

WiconnectFile.cpp@42:8ffb253b09e7, 2015-09-28 (annotated)

Committer:
aymangrais
Date:
Mon Sep 28 03:38:43 2015 +0000
Revision:
42:8ffb253b09e7
Parent:
29:b6af04b77a56 
increase ota timeout to be 5 seconds (instead of 1.5 sec)

Who changed what in which revision?

UserRevisionLine numberNew contents of line
dan_ackme 29:b6af04b77a56 1 /**
dan_ackme 29:b6af04b77a56 2 * ACKme WiConnect Host Library is licensed under the BSD licence:
dan_ackme 29:b6af04b77a56 3 *
dan_ackme 29:b6af04b77a56 4 * Copyright (c)2014 ACKme Networks.
dan_ackme 29:b6af04b77a56 5 * All rights reserved.
dan_ackme 29:b6af04b77a56 6 *
dan_ackme 29:b6af04b77a56 7 * Redistribution and use in source and binary forms, with or without modification,
dan_ackme 29:b6af04b77a56 8 * are permitted provided that the following conditions are met:
dan_ackme 29:b6af04b77a56 9 *
dan_ackme 29:b6af04b77a56 10 * 1. Redistributions of source code must retain the above copyright notice,
dan_ackme 29:b6af04b77a56 11 * this list of conditions and the following disclaimer.
dan_ackme 29:b6af04b77a56 12 * 2. Redistributions in binary form must reproduce the above copyright notice,
dan_ackme 29:b6af04b77a56 13 * this list of conditions and the following disclaimer in the documentation
dan_ackme 29:b6af04b77a56 14 * and/or other materials provided with the distribution.
dan_ackme 29:b6af04b77a56 15 * 3. The name of the author may not be used to endorse or promote products
dan_ackme 29:b6af04b77a56 16 * derived from this software without specific prior written permission.
dan_ackme 29:b6af04b77a56 17 *
dan_ackme 29:b6af04b77a56 18 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED
dan_ackme 29:b6af04b77a56 19 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
dan_ackme 29:b6af04b77a56 20 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
dan_ackme 29:b6af04b77a56 21 * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
dan_ackme 29:b6af04b77a56 22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
dan_ackme 29:b6af04b77a56 23 * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
dan_ackme 29:b6af04b77a56 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
dan_ackme 29:b6af04b77a56 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
dan_ackme 29:b6af04b77a56 26 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
dan_ackme 29:b6af04b77a56 27 * OF SUCH DAMAGE.
dan_ackme 29:b6af04b77a56 28 */
dan_ackme 29:b6af04b77a56 29
dan_ackme 29:b6af04b77a56 30 #include "Wiconnect.h"
dan_ackme 29:b6af04b77a56 31 #include "internal/common.h"
dan_ackme 29:b6af04b77a56 32
dan_ackme 29:b6af04b77a56 33 #define CHECK_OPENED_FOR_READING() if(!readEnabled) return WICONNECT_NOT_OPENED_FOR_READING
dan_ackme 29:b6af04b77a56 34
dan_ackme 29:b6af04b77a56 35
dan_ackme 29:b6af04b77a56 36
dan_ackme 29:b6af04b77a56 37
dan_ackme 29:b6af04b77a56 38 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 39 WiconnectFile::WiconnectFile(int rxBufferLen, void *rxBuffer_)
dan_ackme 29:b6af04b77a56 40 {
dan_ackme 29:b6af04b77a56 41 wiconnect = Wiconnect::getInstance();
dan_ackme 29:b6af04b77a56 42
dan_ackme 29:b6af04b77a56 43 memset(&rxBuffer, 0, sizeof(Buffer));
dan_ackme 29:b6af04b77a56 44
dan_ackme 29:b6af04b77a56 45 rxBuffer.size = rxBufferLen - 4;
dan_ackme 29:b6af04b77a56 46 rxBuffer.buffer = (uint8_t*)rxBuffer_;
dan_ackme 29:b6af04b77a56 47
dan_ackme 29:b6af04b77a56 48 if(rxBuffer.size > 0)
dan_ackme 29:b6af04b77a56 49 {
dan_ackme 29:b6af04b77a56 50 if(rxBuffer_ == NULL)
dan_ackme 29:b6af04b77a56 51 {
dan_ackme 29:b6af04b77a56 52 #ifdef WICONNECT_ENABLE_MALLOC
dan_ackme 29:b6af04b77a56 53 wiconnect_assert(wiconnect, "File(), malloc not defined", wiconnect->_malloc != NULL);
dan_ackme 29:b6af04b77a56 54 rxBuffer.buffer = (uint8_t*)wiconnect->_malloc(rxBufferLen);
dan_ackme 29:b6af04b77a56 55 wiconnect_assert(wiconnect, "File(), failed to malloc buffer", rxBuffer.buffer != NULL);
dan_ackme 29:b6af04b77a56 56 rxBuffer.allocated = true;
dan_ackme 29:b6af04b77a56 57 #else
dan_ackme 29:b6af04b77a56 58 wiconnect_assert(wiconnect, "must specify buffer", 0);
dan_ackme 29:b6af04b77a56 59 #endif
dan_ackme 29:b6af04b77a56 60 }
dan_ackme 29:b6af04b77a56 61 rxBuffer.size -= 4;
dan_ackme 29:b6af04b77a56 62 }
dan_ackme 29:b6af04b77a56 63
dan_ackme 29:b6af04b77a56 64 previous = next = NULL;
dan_ackme 29:b6af04b77a56 65 handle = 0xff;
dan_ackme 29:b6af04b77a56 66 readEnabled = false;
dan_ackme 29:b6af04b77a56 67 *name = 0;
dan_ackme 29:b6af04b77a56 68 size = 0;
dan_ackme 29:b6af04b77a56 69 type = FILE_TYPE_UNKNOWN;
dan_ackme 29:b6af04b77a56 70 version = 0;
dan_ackme 29:b6af04b77a56 71 flags = FILE_FLAG_NONE;
dan_ackme 29:b6af04b77a56 72 }
dan_ackme 29:b6af04b77a56 73
dan_ackme 29:b6af04b77a56 74 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 75 WiconnectFile::~WiconnectFile()
dan_ackme 29:b6af04b77a56 76 {
dan_ackme 29:b6af04b77a56 77 while(close() == WICONNECT_PROCESSING)
dan_ackme 29:b6af04b77a56 78 {
dan_ackme 29:b6af04b77a56 79 }
dan_ackme 29:b6af04b77a56 80
dan_ackme 29:b6af04b77a56 81 #ifdef WICONNECT_ENABLE_MALLOC
dan_ackme 29:b6af04b77a56 82 if(rxBuffer.allocated && rxBuffer.size > 0)
dan_ackme 29:b6af04b77a56 83 {
dan_ackme 29:b6af04b77a56 84 wiconnect_assert(wiconnect, "~File(), free not defined", wiconnect->_free != NULL);
dan_ackme 29:b6af04b77a56 85 wiconnect->_free(rxBuffer.buffer);
dan_ackme 29:b6af04b77a56 86 }
dan_ackme 29:b6af04b77a56 87 #endif
dan_ackme 29:b6af04b77a56 88 }
dan_ackme 29:b6af04b77a56 89
dan_ackme 29:b6af04b77a56 90 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 91 WiconnectResult WiconnectFile::openForRead(uint8_t handle_, const char *filename)
dan_ackme 29:b6af04b77a56 92 {
dan_ackme 29:b6af04b77a56 93 handle = handle_;
dan_ackme 29:b6af04b77a56 94 readEnabled = true;
dan_ackme 29:b6af04b77a56 95 strcpy(name, filename);
dan_ackme 29:b6af04b77a56 96
dan_ackme 29:b6af04b77a56 97 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 98 }
dan_ackme 29:b6af04b77a56 99
dan_ackme 29:b6af04b77a56 100 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 101 WiconnectResult WiconnectFile::initWithListing(const char *typeStr, const char *flagsStr, const char* sizeStr, const char *versionStr, const char *nameStr)
dan_ackme 29:b6af04b77a56 102 {
dan_ackme 29:b6af04b77a56 103 uint32_t tmp;
dan_ackme 29:b6af04b77a56 104
dan_ackme 29:b6af04b77a56 105 if(!StringUtil::strHexToUint32(&typeStr[2], &tmp))
dan_ackme 29:b6af04b77a56 106 {
dan_ackme 29:b6af04b77a56 107 return WICONNECT_RESPONSE_PARSE_ERROR;
dan_ackme 29:b6af04b77a56 108 }
dan_ackme 29:b6af04b77a56 109 type = (FileType)tmp;
dan_ackme 29:b6af04b77a56 110
dan_ackme 29:b6af04b77a56 111 if(!StringUtil::strHexToUint32(flagsStr, &tmp))
dan_ackme 29:b6af04b77a56 112 {
dan_ackme 29:b6af04b77a56 113 return WICONNECT_RESPONSE_PARSE_ERROR;
dan_ackme 29:b6af04b77a56 114 }
dan_ackme 29:b6af04b77a56 115 flags = (FileFlags)tmp;
dan_ackme 29:b6af04b77a56 116
dan_ackme 29:b6af04b77a56 117 if(!StringUtil::strToUint32(sizeStr, &tmp))
dan_ackme 29:b6af04b77a56 118 {
dan_ackme 29:b6af04b77a56 119 return WICONNECT_RESPONSE_PARSE_ERROR;
dan_ackme 29:b6af04b77a56 120 }
dan_ackme 29:b6af04b77a56 121 size = (uint32_t)tmp;
dan_ackme 29:b6af04b77a56 122
dan_ackme 29:b6af04b77a56 123 if(!FileInterface::fileVersionStrToInt(versionStr, &version))
dan_ackme 29:b6af04b77a56 124 {
dan_ackme 29:b6af04b77a56 125 return WICONNECT_RESPONSE_PARSE_ERROR;
dan_ackme 29:b6af04b77a56 126 }
dan_ackme 29:b6af04b77a56 127
dan_ackme 29:b6af04b77a56 128 strcpy(name, nameStr);
dan_ackme 29:b6af04b77a56 129
dan_ackme 29:b6af04b77a56 130 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 131 }
dan_ackme 29:b6af04b77a56 132
dan_ackme 29:b6af04b77a56 133 #ifdef WICONNECT_ENABLE_MALLOC
dan_ackme 29:b6af04b77a56 134 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 135 void* WiconnectFile::operator new(size_t size)
dan_ackme 29:b6af04b77a56 136 {
dan_ackme 29:b6af04b77a56 137 Wiconnect *wiconnect = Wiconnect::getInstance();
dan_ackme 29:b6af04b77a56 138 wiconnect_assert(wiconnect, "File:new, malloc not defined", wiconnect->_malloc != NULL);
dan_ackme 29:b6af04b77a56 139 return Wiconnect::getInstance()->_malloc(size);
dan_ackme 29:b6af04b77a56 140 }
dan_ackme 29:b6af04b77a56 141
dan_ackme 29:b6af04b77a56 142 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 143 void WiconnectFile::operator delete(void* ptr)
dan_ackme 29:b6af04b77a56 144 {
dan_ackme 29:b6af04b77a56 145 Wiconnect *wiconnect = Wiconnect::getInstance();
dan_ackme 29:b6af04b77a56 146 wiconnect_assert(wiconnect, "File:delete, free not defined", wiconnect->_free != NULL);
dan_ackme 29:b6af04b77a56 147 Wiconnect::getInstance()->_free(ptr);
dan_ackme 29:b6af04b77a56 148 }
dan_ackme 29:b6af04b77a56 149 #endif
dan_ackme 29:b6af04b77a56 150
dan_ackme 29:b6af04b77a56 151 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 152 WiconnectResult WiconnectFile::close()
dan_ackme 29:b6af04b77a56 153 {
dan_ackme 29:b6af04b77a56 154 WiconnectResult result;
dan_ackme 29:b6af04b77a56 155 CHECK_OPENED_FOR_READING();
dan_ackme 29:b6af04b77a56 156 CHECK_OTHER_COMMAND_EXECUTING();
dan_ackme 29:b6af04b77a56 157
dan_ackme 29:b6af04b77a56 158 if(WICONNECT_SUCCEEDED(result, wiconnect->sendCommand("close %d", handle)))
dan_ackme 29:b6af04b77a56 159 {
dan_ackme 29:b6af04b77a56 160 readEnabled = false;
dan_ackme 29:b6af04b77a56 161 }
dan_ackme 29:b6af04b77a56 162
dan_ackme 29:b6af04b77a56 163 CHECK_CLEANUP_COMMAND();
dan_ackme 29:b6af04b77a56 164
dan_ackme 29:b6af04b77a56 165 return result;
dan_ackme 29:b6af04b77a56 166 }
dan_ackme 29:b6af04b77a56 167
dan_ackme 29:b6af04b77a56 168 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 169 const char* WiconnectFile::getName() const
dan_ackme 29:b6af04b77a56 170 {
dan_ackme 29:b6af04b77a56 171 return name;
dan_ackme 29:b6af04b77a56 172 }
dan_ackme 29:b6af04b77a56 173
dan_ackme 29:b6af04b77a56 174 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 175 uint32_t WiconnectFile::getSize() const
dan_ackme 29:b6af04b77a56 176 {
dan_ackme 29:b6af04b77a56 177 return size;
dan_ackme 29:b6af04b77a56 178 }
dan_ackme 29:b6af04b77a56 179
dan_ackme 29:b6af04b77a56 180 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 181 FileType WiconnectFile::getType() const
dan_ackme 29:b6af04b77a56 182 {
dan_ackme 29:b6af04b77a56 183 return type;
dan_ackme 29:b6af04b77a56 184 }
dan_ackme 29:b6af04b77a56 185
dan_ackme 29:b6af04b77a56 186 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 187 FileFlags WiconnectFile::getFlags() const
dan_ackme 29:b6af04b77a56 188 {
dan_ackme 29:b6af04b77a56 189 return flags;
dan_ackme 29:b6af04b77a56 190 }
dan_ackme 29:b6af04b77a56 191
dan_ackme 29:b6af04b77a56 192 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 193 uint32_t WiconnectFile::getVersion() const
dan_ackme 29:b6af04b77a56 194 {
dan_ackme 29:b6af04b77a56 195 return version;
dan_ackme 29:b6af04b77a56 196 }
dan_ackme 29:b6af04b77a56 197
dan_ackme 29:b6af04b77a56 198 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 199 const char* WiconnectFile::getVersionStr(char *buffer) const
dan_ackme 29:b6af04b77a56 200 {
dan_ackme 29:b6af04b77a56 201 return FileInterface::fileVersionIntToStr(version, true, buffer);
dan_ackme 29:b6af04b77a56 202 }
dan_ackme 29:b6af04b77a56 203
dan_ackme 29:b6af04b77a56 204 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 205 const WiconnectFile* WiconnectFile::getNext() const
dan_ackme 29:b6af04b77a56 206 {
dan_ackme 29:b6af04b77a56 207 return next;
dan_ackme 29:b6af04b77a56 208 }
dan_ackme 29:b6af04b77a56 209
dan_ackme 29:b6af04b77a56 210 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 211 const WiconnectFile* WiconnectFile::getPrevious() const
dan_ackme 29:b6af04b77a56 212 {
dan_ackme 29:b6af04b77a56 213 return previous;
dan_ackme 29:b6af04b77a56 214 }
dan_ackme 29:b6af04b77a56 215
dan_ackme 29:b6af04b77a56 216
dan_ackme 29:b6af04b77a56 217 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 218 WiconnectResult WiconnectFile::read(void* buffer, uint16_t maxLength, uint16_t *bytesReadPtr)
dan_ackme 29:b6af04b77a56 219 {
dan_ackme 29:b6af04b77a56 220 WiconnectResult result;
dan_ackme 29:b6af04b77a56 221
dan_ackme 29:b6af04b77a56 222 CHECK_OPENED_FOR_READING();
dan_ackme 29:b6af04b77a56 223
dan_ackme 29:b6af04b77a56 224 if(rxBuffer.size > 0)
dan_ackme 29:b6af04b77a56 225 {
dan_ackme 29:b6af04b77a56 226 uint16_t bytesToRead = 0;
dan_ackme 29:b6af04b77a56 227 const uint16_t bufferedBytes = (&rxBuffer.buffer[rxBuffer.bytesPending] - rxBuffer.ptr);
dan_ackme 29:b6af04b77a56 228 if(bufferedBytes > 0)
dan_ackme 29:b6af04b77a56 229 {
dan_ackme 29:b6af04b77a56 230 bytesToRead = MIN(bufferedBytes, maxLength);
dan_ackme 29:b6af04b77a56 231 memcpy(buffer, rxBuffer.ptr, bytesToRead);
dan_ackme 29:b6af04b77a56 232 rxBuffer.ptr += bytesToRead;
dan_ackme 29:b6af04b77a56 233 *bytesReadPtr = bytesToRead;
dan_ackme 29:b6af04b77a56 234 }
dan_ackme 29:b6af04b77a56 235 if(rxBuffer.ptr >= &rxBuffer.buffer[rxBuffer.bytesPending])
dan_ackme 29:b6af04b77a56 236 {
dan_ackme 29:b6af04b77a56 237 clearRxBuffer();
dan_ackme 29:b6af04b77a56 238 }
dan_ackme 29:b6af04b77a56 239 if(bytesToRead > 0)
dan_ackme 29:b6af04b77a56 240 {
dan_ackme 29:b6af04b77a56 241 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 242 }
dan_ackme 29:b6af04b77a56 243 }
dan_ackme 29:b6af04b77a56 244
dan_ackme 29:b6af04b77a56 245 CHECK_OTHER_COMMAND_EXECUTING();
dan_ackme 29:b6af04b77a56 246
dan_ackme 29:b6af04b77a56 247 if(WICONNECT_SUCCEEDED(result, wiconnect->sendCommand((char*)buffer, maxLength, "read %d %d", handle, maxLength)))
dan_ackme 29:b6af04b77a56 248 {
dan_ackme 29:b6af04b77a56 249 *bytesReadPtr = wiconnect->getLastCommandResponseLength();
dan_ackme 29:b6af04b77a56 250 }
dan_ackme 29:b6af04b77a56 251
dan_ackme 29:b6af04b77a56 252 CHECK_CLEANUP_COMMAND();
dan_ackme 29:b6af04b77a56 253
dan_ackme 29:b6af04b77a56 254 return result;
dan_ackme 29:b6af04b77a56 255 }
dan_ackme 29:b6af04b77a56 256
dan_ackme 29:b6af04b77a56 257 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 258 WiconnectResult WiconnectFile::read(uint8_t **bufferPtr, uint16_t *bytesReadPtr)
dan_ackme 29:b6af04b77a56 259 {
dan_ackme 29:b6af04b77a56 260 WiconnectResult result = WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 261
dan_ackme 29:b6af04b77a56 262 CHECK_OPENED_FOR_READING();
dan_ackme 29:b6af04b77a56 263
dan_ackme 29:b6af04b77a56 264 if(rxBuffer.size == 0)
dan_ackme 29:b6af04b77a56 265 {
dan_ackme 29:b6af04b77a56 266 return WICONNECT_UNSUPPORTED;
dan_ackme 29:b6af04b77a56 267 }
dan_ackme 29:b6af04b77a56 268 else if(bufferPtr != NULL && bytesReadPtr == NULL)
dan_ackme 29:b6af04b77a56 269 {
dan_ackme 29:b6af04b77a56 270 return WICONNECT_BAD_ARG;
dan_ackme 29:b6af04b77a56 271 }
dan_ackme 29:b6af04b77a56 272
dan_ackme 29:b6af04b77a56 273 if(rxBuffer.ptr >= &rxBuffer.buffer[rxBuffer.bytesPending])
dan_ackme 29:b6af04b77a56 274 {
dan_ackme 29:b6af04b77a56 275 clearRxBuffer();
dan_ackme 29:b6af04b77a56 276 }
dan_ackme 29:b6af04b77a56 277
dan_ackme 29:b6af04b77a56 278
dan_ackme 29:b6af04b77a56 279 if(rxBuffer.bytesPending < rxBuffer.size)
dan_ackme 29:b6af04b77a56 280 {
dan_ackme 29:b6af04b77a56 281 const int bytesToRead = rxBuffer.size - rxBuffer.bytesPending;
dan_ackme 29:b6af04b77a56 282 char* ptr = (char*)&rxBuffer.buffer[rxBuffer.bytesPending];
dan_ackme 29:b6af04b77a56 283
dan_ackme 29:b6af04b77a56 284 CHECK_OTHER_COMMAND_EXECUTING();
dan_ackme 29:b6af04b77a56 285
dan_ackme 29:b6af04b77a56 286 loop:
dan_ackme 29:b6af04b77a56 287 if(bytesToRead > 0 && WICONNECT_SUCCEEDED(result, wiconnect->sendCommand(ptr, bytesToRead, "read %d %d", handle, bytesToRead)))
dan_ackme 29:b6af04b77a56 288 {
dan_ackme 29:b6af04b77a56 289 const uint16_t bytesRead = wiconnect->getLastCommandResponseLength();
dan_ackme 29:b6af04b77a56 290 rxBuffer.bytesPending += bytesRead;
dan_ackme 29:b6af04b77a56 291 }
dan_ackme 29:b6af04b77a56 292
dan_ackme 29:b6af04b77a56 293 // if still processing and in non-blocking mode,
dan_ackme 29:b6af04b77a56 294 // then this api call must block until the command completes
dan_ackme 29:b6af04b77a56 295 if(result == WICONNECT_PROCESSING && wiconnect->nonBlocking)
dan_ackme 29:b6af04b77a56 296 {
dan_ackme 29:b6af04b77a56 297 goto loop;
dan_ackme 29:b6af04b77a56 298 }
dan_ackme 29:b6af04b77a56 299
dan_ackme 29:b6af04b77a56 300 CHECK_CLEANUP_COMMAND();
dan_ackme 29:b6af04b77a56 301 }
dan_ackme 29:b6af04b77a56 302
dan_ackme 29:b6af04b77a56 303 if(bufferPtr != NULL)
dan_ackme 29:b6af04b77a56 304 {
dan_ackme 29:b6af04b77a56 305 *bufferPtr = rxBuffer.buffer;
dan_ackme 29:b6af04b77a56 306 *bytesReadPtr = rxBuffer.bytesPending;
dan_ackme 29:b6af04b77a56 307 clearRxBuffer();
dan_ackme 29:b6af04b77a56 308 }
dan_ackme 29:b6af04b77a56 309
dan_ackme 29:b6af04b77a56 310 return result;
dan_ackme 29:b6af04b77a56 311 }
dan_ackme 29:b6af04b77a56 312
dan_ackme 29:b6af04b77a56 313 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 314 WiconnectResult WiconnectFile::getc(uint8_t *c)
dan_ackme 29:b6af04b77a56 315 {
dan_ackme 29:b6af04b77a56 316 WiconnectResult result;
dan_ackme 29:b6af04b77a56 317
dan_ackme 29:b6af04b77a56 318 if(rxBuffer.size == 0)
dan_ackme 29:b6af04b77a56 319 {
dan_ackme 29:b6af04b77a56 320 return WICONNECT_UNSUPPORTED;
dan_ackme 29:b6af04b77a56 321 }
dan_ackme 29:b6af04b77a56 322
dan_ackme 29:b6af04b77a56 323 if(rxBuffer.bytesPending == 0 &&
dan_ackme 29:b6af04b77a56 324 WICONNECT_FAILED(result, read()))
dan_ackme 29:b6af04b77a56 325 {
dan_ackme 29:b6af04b77a56 326 return result;
dan_ackme 29:b6af04b77a56 327 }
dan_ackme 29:b6af04b77a56 328 else if(rxBuffer.ptr < &rxBuffer.buffer[rxBuffer.bytesPending])
dan_ackme 29:b6af04b77a56 329 {
dan_ackme 29:b6af04b77a56 330 *c = *rxBuffer.ptr;
dan_ackme 29:b6af04b77a56 331 ++rxBuffer.ptr;
dan_ackme 29:b6af04b77a56 332 return WICONNECT_SUCCESS;
dan_ackme 29:b6af04b77a56 333 }
dan_ackme 29:b6af04b77a56 334 else
dan_ackme 29:b6af04b77a56 335 {
dan_ackme 29:b6af04b77a56 336 clearRxBuffer();
dan_ackme 29:b6af04b77a56 337 return WICONNECT_ERROR;
dan_ackme 29:b6af04b77a56 338 }
dan_ackme 29:b6af04b77a56 339 }
dan_ackme 29:b6af04b77a56 340
dan_ackme 29:b6af04b77a56 341 /*************************************************************************************************/
dan_ackme 29:b6af04b77a56 342 void WiconnectFile::clearRxBuffer()
dan_ackme 29:b6af04b77a56 343 {
dan_ackme 29:b6af04b77a56 344 rxBuffer.bytesPending = 0;
dan_ackme 29:b6af04b77a56 345 rxBuffer.ptr = rxBuffer.buffer;
dan_ackme 29:b6af04b77a56 346 }