diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index 27d7317d5..dd2564fae 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -24,7 +24,9 @@ #endif /* Verbose Startup? Turning this off saves plenty of bytes of CODE in HOME */ +#ifndef STARTUP_CONF_VERBOSE #define STARTUP_CONF_VERBOSE 0 +#endif /* More CODE space savings by turning off process names */ #define PROCESS_CONF_NO_PROCESS_NAMES 1 diff --git a/platform/cc2530dk/contiki-main.c b/platform/cc2530dk/contiki-main.c index 63d42eaab..88e15020a 100644 --- a/platform/cc2530dk/contiki-main.c +++ b/platform/cc2530dk/contiki-main.c @@ -27,22 +27,16 @@ PROCESS_NAME(viztool_process); #endif /*---------------------------------------------------------------------------*/ -#ifdef STARTUP_CONF_VERBOSE -#define STARTUP_VERBOSE STARTUP_CONF_VERBOSE -#else -#define STARTUP_VERBOSE 0 -#endif - -#if STARTUP_VERBOSE +#if STARTUP_CONF_VERBOSE #define PUTSTRING(...) putstring(__VA_ARGS__) #define PUTHEX(...) puthex(__VA_ARGS__) #define PUTBIN(...) putbin(__VA_ARGS__) #define PUTCHAR(...) putchar(__VA_ARGS__) #else -#define PUTSTRING(...) do {} while(0) -#define PUTHEX(...) do {} while(0) -#define PUTBIN(...) do {} while(0) -#define PUTCHAR(...) do {} while(0) +#define PUTSTRING(...) +#define PUTHEX(...) +#define PUTBIN(...) +#define PUTCHAR(...) #endif /*---------------------------------------------------------------------------*/ #if CLOCK_CONF_STACK_FRIENDLY @@ -104,7 +98,7 @@ set_rime_addr(void) } /* Now the address is stored MSB first */ -#if STARTUP_VERBOSE +#if STARTUP_CONF_VERBOSE PUTSTRING("Rime configured with address "); for(i = 0; i < RIMEADDR_SIZE - 1; i++) { PUTHEX(rimeaddr_node_addr.u8[i]); @@ -185,7 +179,7 @@ main(void) putstring("KB SRAM\n"); PUTSTRING("\nSDCC Build:\n"); -#if STARTUP_VERBOSE +#if STARTUP_CONF_VERBOSE #ifdef HAVE_SDCC_BANKING PUTSTRING(" With Banking.\n"); #endif /* HAVE_SDCC_BANKING */