merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 15:35:57 +02:00
parent a44c26c6ce
commit 5e33d9c1a3

View file

@ -177,7 +177,7 @@ void srv_on_conn(ServerEventArgs* e)
kprintf("send with %f kb/s", ((float)i*sizeof(buff))/(tmp2-tmp1));
}
//#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__);
#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__);
void* server_task(void* e)
{
@ -411,10 +411,10 @@ int test_init(void)
#if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
shell_init(RCCE_ue());
// shell_init(RCCE_ue());
sleep(10);
SHELLDEBUGPRINTF("hello World! I AM CORE NO. %d =) \n",RCCE_ue());
// sleep(10);
// SHELLDEBUGPRINTF("hello World! I AM CORE NO. %d =) \n",RCCE_ue());
if (!RCCE_ue())
create_kernel_task(NULL,server_task,NULL);