From 867b91fff298b45855cbe646a9ace576146377e9 Mon Sep 17 00:00:00 2001 From: David Krepsky Date: Wed, 15 Jul 2015 03:11:36 -0300 Subject: [PATCH] under work --- CHANGELOG.md | 6 ++++ examples/FreeRTOS/Debug/FreeRTOS.bin | Bin 33760 -> 33760 bytes examples/FreeRTOS/Debug/FreeRTOS.elf | Bin 298138 -> 297906 bytes examples/FreeRTOS/Debug/FreeRTOS.map | 42 +++++++++++++-------------- examples/FreeRTOS/openocd.log | 17 +++++------ lib/libdriver.a | Bin 329138 -> 329138 bytes lib/libemail.a | Bin 30546 -> 30546 bytes lib/libjson.a | Bin 10218 -> 10218 bytes lib/libmiddleware.a | Bin 273440 -> 273440 bytes lib/libmiddleware_nonos.a | Bin 273440 -> 273440 bytes lib/libmqtt.a | Bin 395552 -> 395552 bytes lib/libosi.a | Bin 28660 -> 28660 bytes lib/libsimplelink.a | Bin 251336 -> 251336 bytes lib/libsimplelink_nonos.a | Bin 254002 -> 254002 bytes lib/libsimplelink_nonos_tiny.a | Bin 168512 -> 168512 bytes lib/libtftp.a | Bin 27672 -> 27672 bytes lib/libwebclient.a | Bin 64714 -> 64714 bytes lib/libwebserver.a | Bin 130280 -> 130280 bytes lib/libxmpp.a | Bin 34738 -> 34738 bytes src/driverlib/utils.c | 3 +- src/oslib/osi.h | 2 ++ src/simplelink/include/simplelink.h | 6 ---- 22 files changed, 39 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 503a24b..5220d6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGES +### 07/2015 - 1.0.3 + +- Fix utils delay in driver lib. +- Fixed size_t error in osilib (added #include ). +- Fixed c++ compiling in simplelink.cpp (remove #ifdef __cplusplus block from line 371). + ### 07/2015 - 1.0.2 - Fix utils delay in driver lib. diff --git a/examples/FreeRTOS/Debug/FreeRTOS.bin b/examples/FreeRTOS/Debug/FreeRTOS.bin index a24d5b1687e7511ca5f494105fe20e99d4de8166..8827f93daf9552e194294516f2f06718c01f9b1b 100755 GIT binary patch delta 40 ycmV+@0N4NEhXUY-0X8a7VKUEZA3g!V>ua diff --git a/examples/FreeRTOS/Debug/FreeRTOS.elf b/examples/FreeRTOS/Debug/FreeRTOS.elf index 4b9fba80cead6b10cc1c42b62970bfd172bc8946..247816548ac4c3b34a636785550a9a10a07f7565 100755 GIT binary patch delta 3538 zcmY*b32;=$5&b>?Yj=eXc2|qem3F1o3ZV<#2Lfck5e^a{$y_D|D`12P7(@v$SgDAk z97r4&CLlKuVPdG_u(^Z@3vw!e!GuB-0b!kx#K?|=Q=Aq@%1)7V&+L+9tEB0E{rYv! z{F(WG`!@Sgw7=^X{~F(#6#E+7_;}Q7Cw2S10qg2H$4?DR-gs(Y$;SHen)b0}(XZZv z>)0&dXsUk9s%eHJL(??<^Sxxo{(#L34P?4!lW8)(rvJgXLU^LFqFa$!K1lj}6XfePQ&skpX>=LOe0K!c7>`qu?ot%;)a3oFnxv9b#f+TfSsvo0*LLn2JX zAK76X4Lj|SEB?@h*X%Hp+^h(2iKSgQIfB}lh^rzXlZL$!kV3;{H9S&-(*gV8B|Pr{ zZ}b?d2d}K4R)Tcv3C$ffmCTUVF4TuWTGJYiu00{6+>wk%?;})<98G@oPBu%~jM>EI zb6*iRmVGUHE(2xKz7WJyEwVqGs;gT~^_G9CmkQ-nDIp`9a&@pwdRf!(zz~RZdzm}) zO@b>1QJYUmR=JDFHT8F4{}9NsNme7Xdi`)>BzRQvL59miDA~eV(w$E(C%+mALsjw> zW_|95TPQhQYCdFmOsJ+=tepICEj>G^w%p=29!aN$b^Z|vY1uL%A2{O*WrW%|L-|l0 z@(rgH$mj!#hEdk@QQ)=9te;7|A&gf4X%{v|!OIHYDe-nc{!J9jR`_X&d%_j}rRV^^ zU*e5^{EyG@Ai-T-^Wz0E0e*_a(+4Y^-GnE}e##}jPT|zI^4r)S=)%NUC|7+fmOMM{ zV(xoYER0k528mDca%*N>ETf*diZZqh7DO9$f8& zp)eiyIpJ07K~Ap+PKTdq66`4R9d|=GD15NN>TftC-kAvV!M>mQlMSBT=plr+_4p=vpd4}za@X(3 zga;I$cAojJNFtu&_(p>_RR#NH_*pXC5^X(r*bApccQ-CgfoS&MPNB)J=*FWd(9Gix zhr$lqIi77v5U1xxlYALI849z-xo(`E3ioX_Ty0Abw_6<})n^QYtqMLN;eG`}8f*^F?qMzER9jB> zVmUFgBtr+Lv{N&o-AvMgDTk)EEFZjzwetU1%DYCa zaAKXzr(09t&3xMQ0z(TRWw2Df9>^)fF$FTV=vgd9_g5{$4^-@u8lI>jsZb_NEQB1= zY$DGtH6O^l(H>gFhCckH5Ik0iyX1+7Dn{=TsyY}KK*WLl(hEG~w6RqacEwU8S0 z6$chU$h(C0L=E094$Q(W!K)+?`du%kmIV5(@{>braApZ4E7@fMg1O za;ff6jGA?ffOMFK&y9dOuRJbq@)YT~6w`+W|9(1_j?3TsX~q@z7iw-3wo}FnlKNXe z^#womcTD9ELCBq;k~O-YXs@!TZ)bMC3>fN_EH?Jx=u(JklA+ZyB>0;W&anNM%BlR{ zJj*{TNkQ#=bA{3YqZOe)Xfg3eClpD9zHA8Tp#SEzT(bx`392*;e~7|d=@O#xCnvN7 zZx3eHJchAq6hxzQ4CMJzM?y_9ed#yW(gHp9?X88mVdC*Z46TFMAa2d%OJ58-wwia- zZV=j;<_E%oUz$XnF}z__1HNt+@%Z|6u;5~|n2O(Chd4ZI7I_%?1%%^*8{kBjMO1;s zS8oyPtf9IF&`kXZ&8gw0K8QejjL3t>>&s(=uRKPFYk1?fo{U%T>CMOQ=vRfW?!Mk> z;75=2G+)mnz1Bm$F0~p_SQTR=Q^U(+jM5yKgsl?{kLgH^(Dw9U-vlEmXxc+vt4F9X zJVEElOv4Wlt|9uE7EX(p$&5nAJuF;{bFV+K@xn9e-49EIE_XtRKrf3W(5yi#dTH~0sq1yR#;ED(czFVY^9p*J4xOd*boj; zMSoNC?;Ix>uZ03l+^5py%3fX&l-~dau3e{p6f_tqOTRk>iXtpN{3slLE$V$(VuNJp z#h=<>0u8%tkT0hBu+0Yb1al%FNf>=t6G3hC;))2!reR+MxM{eo4+Hw(u*3Us7eBW{ zTFecec;4&Oib1uWP@K^-C=9Ofp&AJptD=0AU2{Taxg(j48B44fQ${$ZfWuM_W8EA+ zbBnZbjFp%{vKHfHe8Ip=EwT+Q^%xsd{yYCt4~&varGl(ns#U=}We#1;1CbErJjL4j zl|)wsQJY(a;9`QtPOL#W|LKKO8zwq?fw=YHb=u8o!=$-i+=v^(J)u%&q&@Cs_SRR1oXX< zZ}#(l8sZItyK3|Eg|Pv>Tk@GbhY@GUrZ;!Y}!&pgJyCj(jZJb z=h9iQ(6*^re4h*bSZG=l9CYjMx{SIkGc{OoHleU%y zGhT{^a8c8N-^4>|d=2-p+{8u0ZXKjctH(-+y$cf^5Dh&z$^lN1*oCtk;1+S6_?82P zLm%#U!1LDeT;2p+4z;oKJJ68;X*%2Te{5X>jL4DN1Cp%|SCpX4E~-5!v3(8u9Fp;e zl(P@-!2RT8lQlh(?;$=;rM43wTjzrW&nxJ*vTx|b#6(ETJ|oYVDpPI4O#RvpK&}<3m-&xE()Bh3`a7Cmu?JGh%TEE_Fi;V_5`Cl806 z;j?+QB?d0fk0JYZd^{ZHirF1FGac@S-)8r%25z@5R=Up`0o!!?grs|Q8Zuy;eM>4N_Qh{k+Kb;wkQo-)16Ivv!RXLMl& zDRQJj1(sZ-WmvYjpHqatL0>c!#WU zI?1u;DTZmG-HclG+8LHFG1Nn^cEmytq|#7N!+2?5Dkam&K%YRzZ!=!c7Gq@I%eeO` z{tscxye>TBfl9IqE|9LdG&rT}6rt}$@EcsCqpitQLrYs$0BO4F7e7$xsEt&iq&itZ zPff(00y^}FA%)-$lg{0NnszKNl)1%2Ik)PcwH@EnbC>ktu|A}Xk_A5*1$pGTijYlu zK9F@~F4{zMH-0h-Tvo{^$vYlunY~M_-ob?9( z^uc16UJJRk$mL!5dJ#Bjb}XWA!*28zK~uOC9F`6-skBMmSX>NE`fT6&XA8cK-r~R} z2>C3bGjSXHiUX@~O7bchglz1>^pZfowSIBPZLBYWRNZ!2z~NooP!h1+`jq^%L~hj` z%2BiS(U1xM#AilBW175O!n$dRbh{MOhX()VjHlb>b}y~C>i$cL(~K9XVv>{=`lXZn z(iWEThaluv>ct8@pXjVIQb)47KqfT(l`K-bv8)uLSIN{{G9~z%63%iwNYm-{zZGXyaCh^VED&hJ_0%Du{f?I-+1jIM%FLTyF z5&)_=XTpynaPRI55hMYL%}+jkGDQ*)-~L&Hake&!$m$TrW=$j!vF%=Uj3QzX5i^k6 z#I{#WVSJN z*ak^NYJEzmBir=bcUYs55CWO@6RXZ2P%KEF4Tgd#^uXIgae8?Yo|`{E!C#WHYi9 diff --git a/lib/libemail.a b/lib/libemail.a index 848b581ec4dcf1e603b40cf41030b77c1c954498..96ced34927153fd4410ba743af4ff0a2fa9c2c30 100644 GIT binary patch delta 43 mcmccgj`7kv#tAZPmL>*<1|}PoT$rKE%{k1!1mSGaXNdqg_YIi< delta 43 mcmccgj`7kv#tAZPCg#TGW|kY3T$rKE%{k1!1mSGaXNdqk+YQeE diff --git a/lib/libjson.a b/lib/libjson.a index 0a243ca52695ad28bd98c06d05f5e7273f73f9cd..64d7b4fd150f1ab1adebd47d61ab72ff828d7e8c 100644 GIT binary patch delta 27 dcmaFm|H^-Y44b8ifuVuXM5PEQYhy!}IskwU2v`6B delta 27 ecmaFm|H^-Y44a9$vALPWM5PD_%Y0))mO21|p$L5d diff --git a/lib/libmiddleware.a b/lib/libmiddleware.a index 4dc2194c5fc8990414344de49381d9b41a06bdac..4aadf5a27952907e2da79c1d0d6e345079fd3bc3 100644 GIT binary patch delta 592 zcmY+BKP*F06vpp)@6iUOMH!T0&_$#~BGpFwny8R8K`{9fAr^lUU4%rVV!-f%if1r9 zU2GaU+(;UUM3^N85~+!SNX**7Ij?;Z%gOJ2?>qN>_a5!Zsy$iv9L1hace~qt(R^7- z==ONx%3MwAyL7>B^bMKX)M`^jZ=p{qbGs`BH)Nu6fz_ohp_X4c;m8C&b}3z4)S`yFApjj*>4qRc zQho43b+8C%;-Us8>g{Ngx3QIMx_bYo1_mssrpfw3qJDUwk*puw<%9L`zw9?Vkd!d{ zvO?L<@L2K0gx--g!Yw^}jPR9kkv}SMYI8ilqjX)#SP2zomU39V0& zZ%+ODY*B@(nSw$a<-Q-G3Gi~0SwV)7s%3>b*x>1`&<1e8KXbyD%{VPnE{;WvS=>G! Yiivgl`tk2^5_axHXUMRhmq`)lFIwP_MF0Q* delta 592 zcmY+BKS%;`6vuz>?kLI3{#iq&C4oysP$_AYC;g#7D50kQ426pkz~%9I-}}DD_uWr>t=3+v6ZW!hZf{*=0%&)J2H)_)mH0}-lvqv?ux;VOkCDkUGfTz{MreJ<=|7t-5|RLO#)+O z6DG!_@B%};7ZK;8gh2^0%2RHL*Vq#5kxUPP%)4f!Adom}xj5a3LG z@uX+T?9)C2K)_{8s~G7F5$@eIv23JkUbcPwwu6^-wXprG?7F^jLyCpN?; U{rNrnB*Lb zb0s&M-b;6cb0xO#kY}9E&S*0|K%LQ1$&G`Ffq^ZMgMoo1B!vOUJi-iQCT4?}PAouX z?)J^|A;U!@Ph~jUY1xO-_a7tWKo;$YsKimXtcf0iqVOYasBj*){G)f ztc)NX8^wS+WJQ6>96Nwq7D2G+ak!|17cWqB4@l`9kRaG_2L+JQSKHNX7;AlzTz;UF zaRUp`<%NA9moEnz$~=c1s4}Dq#B2e(yb;8_4`SwSztYFJP*CRPGoa8uAqEC65W&E~ z@&`y-^8pE<%O@^ivGq2l zMH%-@4_(A)$M|adltqj)oRFOA@sv>^2pV_W^URr=;-Q@BK#ur!-sw!j$xxBWeQ9Fb zZGJH+G6KC8_nXO)(QW#I-%Qes4cqtpX3}G1oV5M*AEvj0Fw^ewF^3hw^vc~6-yYb= VEbWRc(0Pnm-VLUF9S=*9JODwFl9~Vj delta 593 zcmZ2*Ltw!TfeA8fCg#Q#M&=upHgQ9kW|RBU#5RB6&Jl(261>NbqEz9?=# z*vYt_1?cv|K9Jj&1C3>#!wys%R0U$TfZg5*V%`Tav$tRAV_YaGbNv}mXrB-R0~d&3 z;9&U!B(3>?1kmjh7cklb-F|Ta(Cs>FK`LW_9)zg0W(2v8nGqyf1QNXu(r@hx_Q`bn zMU0}1yQYUOVzgs?v3<%S#u-j1j`e)XC?5nB*$xc)rg#)--sw!j$xsncjBdC2#iYmx z^jzF;CPzk>=?i`{Ni)`M-}9SEkCAc0_Sb)y-U_mS(!%rw@{E$(zw$BL7lHYc6BMPl c2RAZHy27|p+q;f2%ele065EgPu*Ap%0OKH!nE(I) diff --git a/lib/libmqtt.a b/lib/libmqtt.a index e7ad0a022de1e3d5e8ee9e56c149095d2f9bbac0..1d19e1cf752224c2b1ad51c767a4456ed34bc906 100644 GIT binary patch delta 531 zcmZ25Nn*hyi3u`nmL>*<1|}PoChR-?_uI{mvcc3NvKU?FGUtDyLCIHr!*GVhs^7ftZyb z#j2o%A~MH?btXHb&2%##R!1eb=?n}EEcRRs49p=ZAf_q@keOHpVt!=;GIOWT^kJ3e zsbgXUilnmxMVhuB@L}~9WqdWACy6zHQEhr`603ra5#u$Wo=;*74BXd%1cNIJH&E>< zkRZD_P_P9os17o6{q&Vdtl5lvri&)C8Zxp@cTZ-mVGNsoB$+ipTo7zbrv%Ix&yyhc zByHDDVdacR@kYR5R$gYHH{y=5I@-C-135UD4X764jT1oUGUt{7McG(bfNXAlAi)FT zGq4ncd{Org#4KP2GMl#FJ;qwaEo;Ph7bv!x2dEH40Cj!_lA0TU1hd-ol1r@1fR2^E W%-RKX?6S+OE{uZPUteZ5H3a}Rpm?+Z delta 531 zcmZ25Nn*hyi3u`nCg#TGW|kY3ChfW;JAFp6;H^TEiGJ{YWxvfH*(cm`(|pF`g$u?n&6L zox;i)kK&Dh!>qi_KySnyV|BE1nFq9oC72DU7UGQ)K<6@NmjOlDSXh8;Zhj!a1L8BV z6oY(G^AE%)UmX;fpw3wmH%|Xl@tc*63qd6Sw-KH}#Ffgk!Gca)ZOlJTx z-?9LiA*~>$IunqY2o{Y2F>}F8F`x#ns!t#V%h-X;Ixw>Uq@ZB|NOT5Bv45 nDHbRrm3| nDHbRrmP29yPEah z-KTc72ZLRmPa9wA|76I?&6w+=mH@`N=bysr>+b6Lq<6e5^|HGOtBF& ztiv-le;^Mq=?n+jVZxaXbnMF9+)c>QCL~Gdo^aiFz68$0E7o&prMq+;^NhtQUUe-I zsg2Gdsa?dYq!fFd@X3&IzF%&DNv2+TyuWP7&D6+fSbi9(J(~~)MHu2t%cuZr%=2iu zx3m>|zi~!K^x#&cC3+iCbyh`m;INSW3d&-Dn!+`txX4oL1dwD?TQQOKb-Tmr+zD@S za;J`vYH<)nUdPiO(vZxH(GxKe2adjpQA`y2+B+Fa8QZN`E?Rw~Fj(MaJ#erUQ?+RO2bnS6F0CbY^2gZJd%qXxF?Ujlr! zG^QxiJJ4HPSNSFC7S~m-7XKH&u>@fW)_DFo^!uRM^%kHWO9TrLgE^ioK=Q)>@p_b| z0c`G`pc{KD1Ji9eE}i7-!_+Rf;YUVjK|)j-rLA@aHF#f^ZdYN&zC~JkJmoiFuQ-3O jNIz37ljL+NU9p%P)5pufxVOPSbW35(;5DbE7vp~c!F{!5 delta 711 zcmYk3QAkr!7{||d&b@c0vRw*xX|<_KsYQm?=HfPj!7Nu8vbP>&4-y0;Tq`P8i4n}A zg25%P39F2dXtate9vT+*wuqvKMF>F!Jrw9u(35H3nY*l)!=L;8{{QcP?x_@Am7*)Z zT?vNwhx26@Vqn`Jg;# zqaRjIsEF=bi+0CuA*#$Mh$i+3nUGP|0+eyQ21|)7rA+`At;w~x$ojS(@*Z%(JDl8Z zBcxdzM3$EEj3gaMmc{6?7>NT%-^C~{3Vk*Qz0d(?%~3B5!%y?Q7q+@9f*)?T`GdWp zM5npx1rPL?nh*B5p9*BLft(bL7*G13>$?3!&a}p7X5prz@xjdpO7O`6y6KyTs6Up& z6nSbBdTZB}e~Y@c>&lmE|BGLp2c5wZUw8=#4|JNYDzsyXo+`xQ3C~s`d*=Um^)Sr= z=-fO)SGF|*q_c Y2-B2Sn5qk&%=4hOn?qCuGOy?Z09cDzI{*Lx delta 253 zcmdmVfPd2g{s}T{Cg#Q#MrIq86a*nm)5!;>iEoY<{2T@4PhU{UB)&O6$6E_3u=&8W zr!0&&H!qvr;D^v7w%O@bgCJ1&@bBG=khN}~J&&=Q9ZBJKr)7-yxfpM5SK7$PEzP)U zyWSZ_i2`H=Nj6M2P?v$6Bes241k*!CppH3FO#kGdDz^jOb*<#>N|!o!WoEp* zdCKH7<_INXn`=%t2m*!w-r2nfD!hGPJ>w#FC}%p5BeA`%ozaJl@$&Z5y^NQ58JBFI zH=EJR5~lp!6@+q-E4Ht>!}yR9sJibS<3BlsUEhv;hNJ8fSpmyc zG#zX1Fg|1i>gc=2_)iW=<@5_(Og`Jc{AIL&TCg4Hem5?l$_jp_8O2cVP2SfpzFoJO Ushu53VEW3xjNaR2x|vki0lRlqvj6}9 diff --git a/lib/libtftp.a b/lib/libtftp.a index 9deda8eaf0c361607ac2c4586870d5a07ae382b3..033b81539df305fb0e3ba6516a6ef4ae8dd608db 100644 GIT binary patch delta 41 ncmbPngK@?U#tAZPmL>*<1|}1gW*<28J7zo-jk1n|WBaZHBQ=Y)=z~u}#iS(+2*<21Xl|R&hd@hSTHt8O1ig;A9a*5)j|aDV@%aBp|lAM@d&(-%P(tD#1A~*!;2y?j6oqz;>Y7O9!RF^_SFB9a>M?Y##Wqiq1*G(GeH diff --git a/lib/libxmpp.a b/lib/libxmpp.a index 799efe33dd0657673bbda18029f24c4cff67bfa8..14412e46cd4ebb2ebc41034c5aeae85b36e26348 100644 GIT binary patch delta 43 qcmdng&$OwZX@U%!rHO%|f$2u28B7qS$>sx0zXYMen-7S5Dgpo@5Dm2e delta 43 mcmdng&$OwZX@U%!iMg@4xxq%I8B9>-<^xQ>1mSFvPelMDEDg~B diff --git a/src/driverlib/utils.c b/src/driverlib/utils.c index daeacbf..337b13c 100644 --- a/src/driverlib/utils.c +++ b/src/driverlib/utils.c @@ -75,7 +75,8 @@ void __attribute__((naked)) UtilsDelay(unsigned long ulCount) { __asm(" subs r0, #1\n" - " bne UtilsDelay\n"); + " bne UtilsDelay\n" + " bx lr\n"); } #endif diff --git a/src/oslib/osi.h b/src/oslib/osi.h index 58c4d0d..e3c6eeb 100644 --- a/src/oslib/osi.h +++ b/src/oslib/osi.h @@ -43,6 +43,8 @@ extern "C" { #endif +#include + #define OSI_WAIT_FOREVER (0xFFFFFFFF) #define OSI_NO_WAIT (0) diff --git a/src/simplelink/include/simplelink.h b/src/simplelink/include/simplelink.h index 46b7535..4ae800a 100644 --- a/src/simplelink/include/simplelink.h +++ b/src/simplelink/include/simplelink.h @@ -368,12 +368,6 @@ typedef _u8 _SlArgSize_t; typedef _i16 _SlDataSize_t; typedef _i16 _SlReturnVal_t; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - - /* * This event status used to block or continue the event propagation * through all the registered external libs/user application