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

Use the logging module (Main)

This commit is contained in:
George Oikonomou 2017-10-18 00:17:12 +01:00 committed by George Oikonomou
parent e9509be98c
commit 66aa99d78e
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
os/contiki-main.c
View File

@ -55,6 +55,11 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Log configuration */
#include "sys/log.h"
#define LOG_MODULE "Main"
#define LOG_LEVEL LOG_LEVEL_MAIN
/*---------------------------------------------------------------------------*/
int int
#if PLATFORM_MAIN_ACCEPTS_ARGS #if PLATFORM_MAIN_ACCEPTS_ARGS
main(int argc, char **argv) main(int argc, char **argv)
@ -78,28 +83,37 @@ main(void)
platform_init_stage_two(); platform_init_stage_two();
#if PLATFORM_STARTUP_VERBOSE LOG_INFO("Starting " CONTIKI_VERSION_STRING "\n");
printf("Starting " CONTIKI_VERSION_STRING "\n");
printf(" Net: "); LOG_INFO(" Net: ");
printf("%s\n", NETSTACK_NETWORK.name); LOG_INFO_("%s\n", NETSTACK_NETWORK.name);
printf(" MAC: "); LOG_INFO(" MAC: ");
printf("%s\n", NETSTACK_MAC.name); LOG_INFO_("%s\n", NETSTACK_MAC.name);
#endif
netstack_init(); netstack_init();
#if NETSTACK_CONF_WITH_IPV6 #if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &linkaddr_node_addr, sizeof(uip_lladdr.addr)); memcpy(&uip_lladdr.addr, &linkaddr_node_addr, sizeof(uip_lladdr.addr));
process_start(&tcpip_process, NULL); process_start(&tcpip_process, NULL);
LOG_INFO("Contiki configured with address ");
LOG_INFO_LLADDR(&linkaddr_node_addr);
LOG_INFO_("\n");
LOG_INFO("Tentative link-local IPv6 address ");
LOG_INFO_6ADDR(&uip_ds6_get_link_local(-1)->ipaddr);
LOG_INFO_("\n");
#endif /* NETSTACK_CONF_WITH_IPV6 */ #endif /* NETSTACK_CONF_WITH_IPV6 */
#if BUILD_WITH_ORCHESTRA #if BUILD_WITH_ORCHESTRA
orchestra_init(); orchestra_init();
LOG_DBG("With Orchestra\n");
#endif /* BUILD_WITH_ORCHESTRA */ #endif /* BUILD_WITH_ORCHESTRA */
#if BUILD_WITH_SHELL #if BUILD_WITH_SHELL
serial_shell_init(); serial_shell_init();
LOG_DBG("With Shell\n");
#endif /* BUILD_WITH_SHELL */ #endif /* BUILD_WITH_SHELL */
platform_init_stage_three(); platform_init_stage_three();