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 12:46:41 +02:00
parent 5bef5eb03b
commit 3310c8b987
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/net/mmnif.c
View file

@ -52,7 +52,6 @@ extern HANDLE hProc;
#include <metalsvm/semaphore.h>
#include <metalsvm/spinlock.h>
#include <asm/RCCE_lib.h>
#include <asm/RCCE.h>
#include <asm/RCCE_lib.h>
#include <asm/iRCCE.h>
@ -229,6 +228,19 @@ typedef struct mmnif
}mmnif_t;
#ifdef WIN32
__inline int RCCE_ue(void)
{
#ifndef RECV
return 1;
#else
return 0;
#endif
}
#endif
/*
* memory maped interface helper functions
*/
@ -940,7 +952,7 @@ err_t mmnif_init(struct netif* netif)
/* Generate MAC address */
mmnif_dev->hwaddr[0] = 0x11;mmnif_dev->hwaddr[1] = 0x22;mmnif_dev->hwaddr[2] = 0x33;
mmnif_dev->hwaddr[3] = 0x44;mmnif_dev->hwaddr[4] = 0x55;mmnif_dev->hwaddr[5] = RCCE_UE()*0x11 +0x66;
mmnif_dev->hwaddr[3] = 0x44;mmnif_dev->hwaddr[4] = 0x55;mmnif_dev->hwaddr[5] = RCCE_ue()*0x11 +0x66;
/*
* Initialize the snmp variables and counters inside the struct netif.
@ -1288,10 +1300,10 @@ int mmnif_open()
* Note: core 1 is the router core
*/
IP4_ADDR(&gw, 0,0,0,0);
IP4_ADDR(&ipaddr, 192,168,0,RCCE_UE() +1);
IP4_ADDR(&ipaddr, 192,168,0,RCCE_ue() +1);
IP4_ADDR(&netmask, 255,255,255,0);
own_ip_address+= RCCE_UE() +1;
own_ip_address+= RCCE_ue() +1;
#ifdef WIN32
mmnif_dev = malloc(sizeof(struct netif));