merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 12:51:56 +02:00
parent 3310c8b987
commit e20d3482fd
2 changed files with 2 additions and 2 deletions

View file

@ -17,7 +17,7 @@ char shellbuffer[512];
void shelldebugprint(char* x)
{
kprintf("debugprinting");
kprintf("debugprinting : %s",x);
if (iamsrv)
srv_sendBuffer(&srv,emac_id,x,strlen(x));
else

View file

@ -164,7 +164,7 @@ void* server_task(void* e)
Server srv;
server_init(&srv,5555,2);
SHELLDEBUGPRINTF("created server\n");
kprintf("created server\n");
srv._OnRead = srv_on_read;
srv._OnDisconnect = srv_on_disc;
srv._OnConnect = srv_on_conn;