improve net init code

This commit is contained in:
dborth 2010-08-20 22:33:54 +00:00
parent e7829d2d24
commit d3231ba4ef

View File

@ -185,8 +185,9 @@ static u8 netstack[8192] ATTRIBUTE_ALIGN (32);
static void * netcb (void *arg) static void * netcb (void *arg)
{ {
s32 res = 0; s32 res;
int retry; int retry;
int wait;
while(netHalt != 2) while(netHalt != 2)
{ {
@ -194,14 +195,19 @@ static void * netcb (void *arg)
while (retry) while (retry)
{ {
if (net_init_async(NULL, NULL) != 0) net_deinit();
res = net_init_async(NULL, NULL);
if(res != 0)
break; // failed break; // failed
res = net_get_status(); res = net_get_status();
while (res == -EBUSY) wait = 500; // only wait 10 sec
while (res == -EBUSY && wait > 0)
{ {
usleep(20000); usleep(20000);
res = net_get_status(); res = net_get_status();
wait--;
} }
if (res != -EAGAIN && res != -ETIMEDOUT) if (res != -EAGAIN && res != -ETIMEDOUT)
@ -212,7 +218,7 @@ static void * netcb (void *arg)
continue; continue;
} }
if (res >= 0) if (res == 0)
{ {
networkInit = true; networkInit = true;
@ -221,7 +227,6 @@ static void * netcb (void *arg)
if (hostip.s_addr) if (hostip.s_addr)
strcpy(wiiIP, inet_ntoa(hostip)); strcpy(wiiIP, inet_ntoa(hostip));
} }
LWP_SuspendThread(networkthread); LWP_SuspendThread(networkthread);
} }
return NULL; return NULL;