giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the logging module (Native)

This commit is contained in:
George Oikonomou 2017-10-18 00:18:40 +01:00 committed by George Oikonomou
parent 2430dd9f5a
commit edaa0c29cd
1 changed files with 6 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
arch/platform/native/platform.c
View File

@ -69,6 +69,10 @@
#include "net/ipv6/uip-ds6.h"
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* Log configuration */
#include "sys/log.h"
#define LOG_MODULE "Native"
#define LOG_LEVEL LOG_LEVEL_MAIN
#ifdef SELECT_CONF_MAX
#define SELECT_MAX SELECT_CONF_MAX
@ -142,13 +146,13 @@ static void
set_lladdr(void)
{
linkaddr_t addr;
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, serial_id, sizeof(addr.u8));
#else
if(node_id == 0) {
int i;
for(i = 0; i < sizeof(linkaddr_t); ++i) {
addr.u8[i] = serial_id[7 - i];
}
@ -158,22 +162,13 @@ set_lladdr(void)
}
#endif
linkaddr_set_node_addr(&addr);
printf("Contiki starting with address ");
for(i = 0; i < sizeof(addr.u8) - 1; i++) {
printf("%d.", addr.u8[i]);
}
printf("%d\n", addr.u8[i]);
}
/*---------------------------------------------------------------------------*/
static void
set_global_address(void)
{
static uip_ipaddr_t ipaddr;
static uip_ipaddr_t *prefix = NULL;
int i;
uint8_t state;
/* Assign a unique local address (RFC4193,
http://tools.ietf.org/html/rfc4193). */
@ -189,18 +184,7 @@ set_global_address(void)
/* set the PREFIX::1 address to the IF */
uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
uip_ds6_defrt_add(&ipaddr, 0);
printf("IPv6 addresses: ");
for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
state = uip_ds6_if.addr_list[i].state;
if(uip_ds6_if.addr_list[i].isused &&
(state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr);
printf("\n");
}
}
}
/*---------------------------------------------------------------------------*/
int contiki_argc = 0;
char **contiki_argv;
@ -228,15 +212,7 @@ platform_process_args(int argc, char**argv)
void
platform_init_stage_one()
{
#if NETSTACK_CONF_WITH_IPV6
#if UIP_CONF_IPV6_RPL
printf(CONTIKI_VERSION_STRING " starting with IPV6, RPL\n");
#else
printf(CONTIKI_VERSION_STRING " starting with IPV6\n");
#endif
#else
printf(CONTIKI_VERSION_STRING " starting\n");
#endif
return;
}
/*---------------------------------------------------------------------------*/
void
@ -248,28 +224,11 @@ platform_init_stage_two()
void
platform_init_stage_three()
{
printf("MAC %s NETWORK %s\n", NETSTACK_MAC.name, NETSTACK_NETWORK.name);
#if NETSTACK_CONF_WITH_IPV6
#ifdef __CYGWIN__
process_start(&wpcap_process, NULL);
#endif
printf("Tentative link-local IPv6 address ");
{
uip_ds6_addr_t *lladdr;
int i;
lladdr = uip_ds6_get_link_local(-1);
for(i = 0; i < 7; ++i) {
printf("%02x%02x:", lladdr->ipaddr.u8[i * 2],
lladdr->ipaddr.u8[i * 2 + 1]);
}
/* make it hardcoded... */
lladdr->state = ADDR_AUTOCONF;
printf("%02x%02x\n", lladdr->ipaddr.u8[14], lladdr->ipaddr.u8[15]);
}
set_global_address();
#endif /* NETSTACK_CONF_WITH_IPV6 */