stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge && test for master

Browse source
This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 14:53:41 +02:00
parent 015f425075
commit 2d34553c2c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/mmnif.c
View file

@ -771,7 +771,8 @@ retry: mmnif_lock_rx_hdr(dest_ip);
pending++;
mmnif_write_rx_pending(dest_ip,pending);
/* and unlock the dest_ip mm_rx_buffer_hdr */
/* and unlock the dest_ip mm_rx_buffer_hdr */
mmnif_unlock_rx_hdr(dest_ip);
/* check if there is a space in the queue without overwriting another packet */

4
kernel/tests.c
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,7 +411,7 @@ int test_init(void)
sleep(10);
SHELLDEBUGPRINTF("hello World! I AM CORE NO. %d =) \n",RCCE_ue());
if (RCCE_ue())
if (!RCCE_ue())
create_kernel_task(NULL,server_task,NULL);
else
create_kernel_task(NULL,client_task,NULL);