merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 13:10:15 +02:00
parent 5ef210c469
commit 8bf03aaa61

View file

@ -158,7 +158,7 @@ void srv_on_conn(ServerEventArgs* e)
void* server_task(void* e)
{
int i = 0;
int i = 0, err = 0;
int tmp1,tmp2;
char buff[32];
@ -177,10 +177,11 @@ void* server_task(void* e)
tmp1 = get_clock_tick();
for (i = 0; i < 1024*4*4*4; i++)
{
udelay(1000);
sleep(1);
if (srv_sendBuffer(&srv,0,buff,sizeof(buff))< 0)
SHELLDEBUGPRINTF("err");
err = srv_sendBuffer(&srv,0,buff,sizeof(buff));
if ( err < 0)
SHELLDEBUGPRINTF("err: % d", err);
if (!(i%100))
SHELLDEBUGPRINTF("\r-%d-",i);