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.

Committer:
andrewbonney
Date:
Fri Apr 08 14:39:41 2011 +0000
Revision:
0:ec559500a63f

        

Who changed what in which revision?

UserRevisionLine numberNew 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 "usb_mem.h"
andrewbonney 0:ec559500a63f 25
andrewbonney 0:ec559500a63f 26 #include "string.h" //For memcpy, memmove, memset
andrewbonney 0:ec559500a63f 27
andrewbonney 0:ec559500a63f 28 #include "netCfg.h"
andrewbonney 0:ec559500a63f 29 #if NET_USB
andrewbonney 0:ec559500a63f 30
andrewbonney 0:ec559500a63f 31 #define EDS_COUNT 4
andrewbonney 0:ec559500a63f 32 #define TDS_COUNT 8
andrewbonney 0:ec559500a63f 33
andrewbonney 0:ec559500a63f 34 #define HCCA_SIZE 0x100
andrewbonney 0:ec559500a63f 35 #define ED_SIZE 0x10
andrewbonney 0:ec559500a63f 36 #define TD_SIZE 0x10
andrewbonney 0:ec559500a63f 37
andrewbonney 0:ec559500a63f 38 #define TOTAL_SIZE (HCCA_SIZE + (EDS_COUNT*ED_SIZE) + (TDS_COUNT*TD_SIZE))
andrewbonney 0:ec559500a63f 39
andrewbonney 0:ec559500a63f 40
andrewbonney 0:ec559500a63f 41 static volatile __align(256) byte usb_buf[TOTAL_SIZE] __attribute((section("AHBSRAM1"),aligned)); //256 bytes aligned!
andrewbonney 0:ec559500a63f 42
andrewbonney 0:ec559500a63f 43 static volatile byte* usb_hcca; //256 bytes aligned!
andrewbonney 0:ec559500a63f 44
andrewbonney 0:ec559500a63f 45 static volatile byte* usb_edBuf; //4 bytes aligned!
andrewbonney 0:ec559500a63f 46 static volatile byte* usb_tdBuf; //4 bytes aligned!
andrewbonney 0:ec559500a63f 47
andrewbonney 0:ec559500a63f 48 static byte usb_edBufAlloc[EDS_COUNT] __attribute((section("AHBSRAM1"),aligned));
andrewbonney 0:ec559500a63f 49 static byte usb_tdBufAlloc[TDS_COUNT] __attribute((section("AHBSRAM1"),aligned));
andrewbonney 0:ec559500a63f 50
andrewbonney 0:ec559500a63f 51 void usb_mem_init()
andrewbonney 0:ec559500a63f 52 {
andrewbonney 0:ec559500a63f 53 usb_hcca = usb_buf;
andrewbonney 0:ec559500a63f 54 usb_edBuf = usb_buf + HCCA_SIZE;
andrewbonney 0:ec559500a63f 55 usb_tdBuf = usb_buf + HCCA_SIZE + (EDS_COUNT*ED_SIZE);
andrewbonney 0:ec559500a63f 56 memset(usb_edBufAlloc, 0, EDS_COUNT);
andrewbonney 0:ec559500a63f 57 memset(usb_tdBufAlloc, 0, TDS_COUNT);
andrewbonney 0:ec559500a63f 58 }
andrewbonney 0:ec559500a63f 59
andrewbonney 0:ec559500a63f 60 volatile byte* usb_get_hcca()
andrewbonney 0:ec559500a63f 61 {
andrewbonney 0:ec559500a63f 62 return usb_hcca;
andrewbonney 0:ec559500a63f 63 }
andrewbonney 0:ec559500a63f 64
andrewbonney 0:ec559500a63f 65 volatile byte* usb_get_ed()
andrewbonney 0:ec559500a63f 66 {
andrewbonney 0:ec559500a63f 67 int i;
andrewbonney 0:ec559500a63f 68 for(i = 0; i < EDS_COUNT; i++)
andrewbonney 0:ec559500a63f 69 {
andrewbonney 0:ec559500a63f 70 if( !usb_edBufAlloc[i] )
andrewbonney 0:ec559500a63f 71 {
andrewbonney 0:ec559500a63f 72 usb_edBufAlloc[i] = 1;
andrewbonney 0:ec559500a63f 73 return usb_edBuf + i*ED_SIZE;
andrewbonney 0:ec559500a63f 74 }
andrewbonney 0:ec559500a63f 75 }
andrewbonney 0:ec559500a63f 76 return NULL; //Could not alloc ED
andrewbonney 0:ec559500a63f 77 }
andrewbonney 0:ec559500a63f 78
andrewbonney 0:ec559500a63f 79 volatile byte* usb_get_td()
andrewbonney 0:ec559500a63f 80 {
andrewbonney 0:ec559500a63f 81 int i;
andrewbonney 0:ec559500a63f 82 for(i = 0; i < TDS_COUNT; i++)
andrewbonney 0:ec559500a63f 83 {
andrewbonney 0:ec559500a63f 84 if( !usb_tdBufAlloc[i] )
andrewbonney 0:ec559500a63f 85 {
andrewbonney 0:ec559500a63f 86 usb_tdBufAlloc[i] = 1;
andrewbonney 0:ec559500a63f 87 return usb_tdBuf + i*TD_SIZE;
andrewbonney 0:ec559500a63f 88 }
andrewbonney 0:ec559500a63f 89 }
andrewbonney 0:ec559500a63f 90 return NULL; //Could not alloc TD
andrewbonney 0:ec559500a63f 91 }
andrewbonney 0:ec559500a63f 92
andrewbonney 0:ec559500a63f 93 void usb_free_ed(volatile byte* ed)
andrewbonney 0:ec559500a63f 94 {
andrewbonney 0:ec559500a63f 95 int i;
andrewbonney 0:ec559500a63f 96 i = (ed - usb_edBuf) / ED_SIZE;
andrewbonney 0:ec559500a63f 97 usb_edBufAlloc[i] = 0;
andrewbonney 0:ec559500a63f 98 }
andrewbonney 0:ec559500a63f 99
andrewbonney 0:ec559500a63f 100 void usb_free_td(volatile byte* td)
andrewbonney 0:ec559500a63f 101 {
andrewbonney 0:ec559500a63f 102 int i;
andrewbonney 0:ec559500a63f 103 i = (td - usb_tdBuf) / TD_SIZE;
andrewbonney 0:ec559500a63f 104 usb_tdBufAlloc[i] = 0;
andrewbonney 0:ec559500a63f 105 }
andrewbonney 0:ec559500a63f 106
andrewbonney 0:ec559500a63f 107
andrewbonney 0:ec559500a63f 108 #endif