mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-09 23:54:32 +00:00
Merge pull request #122 from oliverschmidt/master
There's no point in ctk_restore() for standalone GUI builds.
This commit is contained in:
commit
19c8f9ffdd
@ -112,19 +112,19 @@ main(void)
|
|||||||
#if !UIP_CONF_IPV6
|
#if !UIP_CONF_IPV6
|
||||||
{
|
{
|
||||||
uip_ipaddr_t addr;
|
uip_ipaddr_t addr;
|
||||||
uip_ipaddr(&addr, 10,1,1,1);
|
uip_ipaddr(&addr, 192,168,0,111);
|
||||||
uip_sethostaddr(&addr);
|
uip_sethostaddr(&addr);
|
||||||
log_message("IP Address: ", inet_ntoa(*(struct in_addr*)&addr));
|
log_message("IP Address: ", inet_ntoa(*(struct in_addr*)&addr));
|
||||||
|
|
||||||
uip_ipaddr(&addr, 255,0,0,0);
|
uip_ipaddr(&addr, 255,255,255,0);
|
||||||
uip_setnetmask(&addr);
|
uip_setnetmask(&addr);
|
||||||
log_message("Subnet Mask: ", inet_ntoa(*(struct in_addr*)&addr));
|
log_message("Subnet Mask: ", inet_ntoa(*(struct in_addr*)&addr));
|
||||||
|
|
||||||
uip_ipaddr(&addr, 10,1,1,100);
|
uip_ipaddr(&addr, 192,168,0,1);
|
||||||
uip_setdraddr(&addr);
|
uip_setdraddr(&addr);
|
||||||
log_message("Def. Router: ", inet_ntoa(*(struct in_addr*)&addr));
|
log_message("Def. Router: ", inet_ntoa(*(struct in_addr*)&addr));
|
||||||
|
|
||||||
uip_ipaddr(&addr, 10,1,1,100);
|
uip_ipaddr(&addr, 192,168,0,1);
|
||||||
resolv_conf(&addr);
|
resolv_conf(&addr);
|
||||||
log_message("DNS Server: ", inet_ntoa(*(struct in_addr*)&addr));
|
log_message("DNS Server: ", inet_ntoa(*(struct in_addr*)&addr));
|
||||||
}
|
}
|
||||||
@ -159,11 +159,11 @@ main(void)
|
|||||||
/* Allow user-mode APC to execute. */
|
/* Allow user-mode APC to execute. */
|
||||||
SleepEx(10, TRUE);
|
SleepEx(10, TRUE);
|
||||||
|
|
||||||
#if WITH_GUI
|
#ifdef PLATFORM_BUILD
|
||||||
if(console_resize()) {
|
if(console_resize()) {
|
||||||
ctk_restore();
|
ctk_restore();
|
||||||
}
|
}
|
||||||
#endif /* WITH_GUI */
|
#endif /* PLATFORM_BUILD */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
|
Loading…
Reference in New Issue
Block a user