From 977bc548f37593d5af3323a7a3f7614529d44908 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Mon, 2 Apr 2012 00:22:58 +0100 Subject: [PATCH] Renamed sensinode-debug to debug --- examples/sensinode/energy-scan/energy-scan.c | 2 +- examples/sensinode/sensors-ipv6/sensors-driver.c | 2 +- examples/sensinode/sensors-ipv6/sensors-ipv6.c | 2 +- examples/sensinode/sensors/sensors-example.c | 2 +- examples/sensinode/serial-flash/flash.c | 2 +- examples/sensinode/udp-ipv6/client.c | 2 +- examples/sensinode/udp-ipv6/ping6.c | 2 +- examples/sensinode/udp-ipv6/server.c | 2 +- platform/sensinode/Makefile.sensinode | 2 +- platform/sensinode/contiki-sensinode-main.c | 2 +- platform/sensinode/{sensinode-debug.c => debug.c} | 2 +- platform/sensinode/{sensinode-debug.h => debug.h} | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) rename platform/sensinode/{sensinode-debug.c => debug.c} (97%) rename platform/sensinode/{sensinode-debug.h => debug.h} (95%) diff --git a/examples/sensinode/energy-scan/energy-scan.c b/examples/sensinode/energy-scan/energy-scan.c index 07393d507..bb73f18a1 100644 --- a/examples/sensinode/energy-scan/energy-scan.c +++ b/examples/sensinode/energy-scan/energy-scan.c @@ -40,7 +40,7 @@ #include "contiki.h" #include "cc2430_sfr.h" -#include "sensinode-debug.h" +#include "debug.h" #include "dev/cc2430_rf.h" #include diff --git a/examples/sensinode/sensors-ipv6/sensors-driver.c b/examples/sensinode/sensors-ipv6/sensors-driver.c index 01e118eb2..148d2b3a4 100644 --- a/examples/sensinode/sensors-ipv6/sensors-driver.c +++ b/examples/sensinode/sensors-ipv6/sensors-driver.c @@ -46,7 +46,7 @@ #include "dev/leds.h" #if CONTIKI_TARGET_SENSINODE #include "dev/sensinode-sensors.h" -#include "sensinode-debug.h" +#include "debug.h" #endif #define DEBUG 0 diff --git a/examples/sensinode/sensors-ipv6/sensors-ipv6.c b/examples/sensinode/sensors-ipv6/sensors-ipv6.c index ca9589fb4..bf07a595c 100644 --- a/examples/sensinode/sensors-ipv6/sensors-ipv6.c +++ b/examples/sensinode/sensors-ipv6/sensors-ipv6.c @@ -58,7 +58,7 @@ #include #if CONTIKI_TARGET_SENSINODE -#include "sensinode-debug.h" +#include "debug.h" #include "dev/sensinode-sensors.h" #else #define putstring(s) diff --git a/examples/sensinode/sensors/sensors-example.c b/examples/sensinode/sensors/sensors-example.c index ecbaddb17..33277b77d 100644 --- a/examples/sensinode/sensors/sensors-example.c +++ b/examples/sensinode/sensors/sensors-example.c @@ -96,7 +96,7 @@ #if DEBUG #include #if CONTIKI_TARGET_SENSINODE -#include "sensinode-debug.h" +#include "debug.h" #endif /* CONTIKI_TARGET_SENSINODE */ #define PRINTF(...) printf(__VA_ARGS__) #else /* DEBUG */ diff --git a/examples/sensinode/serial-flash/flash.c b/examples/sensinode/serial-flash/flash.c index 6593de3ee..a796b7513 100644 --- a/examples/sensinode/serial-flash/flash.c +++ b/examples/sensinode/serial-flash/flash.c @@ -49,7 +49,7 @@ #define DEBUG 1 #if DEBUG #include -#include "sensinode-debug.h" +#include "debug.h" #define PRINTF(...) printf(__VA_ARGS__) #define PUTBIN(b) putbin(b) #else diff --git a/examples/sensinode/udp-ipv6/client.c b/examples/sensinode/udp-ipv6/client.c index c20643c54..0cb13e3f6 100644 --- a/examples/sensinode/udp-ipv6/client.c +++ b/examples/sensinode/udp-ipv6/client.c @@ -36,7 +36,7 @@ #if CONTIKI_TARGET_SENSINODE #include "dev/sensinode-sensors.h" -#include "sensinode-debug.h" +#include "debug.h" #else #define putstring(s) #define puthex(s) diff --git a/examples/sensinode/udp-ipv6/ping6.c b/examples/sensinode/udp-ipv6/ping6.c index 48ec952f9..396edbc94 100644 --- a/examples/sensinode/udp-ipv6/ping6.c +++ b/examples/sensinode/udp-ipv6/ping6.c @@ -35,7 +35,7 @@ #if CONTIKI_TARGET_SENSINODE #include "dev/sensinode-sensors.h" -#include "sensinode-debug.h" +#include "debug.h" #endif #define DEBUG DEBUG_NONE diff --git a/examples/sensinode/udp-ipv6/server.c b/examples/sensinode/udp-ipv6/server.c index 62ea84939..ebe0f590f 100644 --- a/examples/sensinode/udp-ipv6/server.c +++ b/examples/sensinode/udp-ipv6/server.c @@ -41,7 +41,7 @@ #if CONTIKI_TARGET_SENSINODE #include "dev/sensinode-sensors.h" -#include "sensinode-debug.h" +#include "debug.h" #else #define putstring(s) #endif diff --git a/platform/sensinode/Makefile.sensinode b/platform/sensinode/Makefile.sensinode index a1daf96e6..133e6fdde 100644 --- a/platform/sensinode/Makefile.sensinode +++ b/platform/sensinode/Makefile.sensinode @@ -40,7 +40,7 @@ CONTIKI_TARGET_SOURCEFILES = contiki-sensinode-main.c CONTIKI_TARGET_SOURCEFILES += leds.c leds-arch.c serial-line.c sensors.c CONTIKI_TARGET_SOURCEFILES += sensinode-sensors.c button-sensor.c adc-sensor.c CONTIKI_TARGET_SOURCEFILES += n740.c models.c m25p16.c slip-arch.c slip.c -CONTIKI_TARGET_SOURCEFILES += putchar.c sensinode-debug.c +CONTIKI_TARGET_SOURCEFILES += putchar.c debug.c CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES) diff --git a/platform/sensinode/contiki-sensinode-main.c b/platform/sensinode/contiki-sensinode-main.c index 5d6267c94..dbe481900 100644 --- a/platform/sensinode/contiki-sensinode-main.c +++ b/platform/sensinode/contiki-sensinode-main.c @@ -15,7 +15,7 @@ #include "net/rime.h" #include "net/netstack.h" #include "net/mac/frame802154.h" -#include "sensinode-debug.h" +#include "debug.h" #include "dev/watchdog-cc2430.h" #include "dev/sensinode-sensors.h" #include "disco.h" diff --git a/platform/sensinode/sensinode-debug.c b/platform/sensinode/debug.c similarity index 97% rename from platform/sensinode/sensinode-debug.c rename to platform/sensinode/debug.c index 031e0ccb5..b1e3a2710 100644 --- a/platform/sensinode/sensinode-debug.c +++ b/platform/sensinode/debug.c @@ -13,7 +13,7 @@ #include "cc2430_sfr.h" #include "8051def.h" -#include "sensinode-debug.h" +#include "debug.h" static const char hexconv[] = "0123456789abcdef"; static const char binconv[] = "01"; diff --git a/platform/sensinode/sensinode-debug.h b/platform/sensinode/debug.h similarity index 95% rename from platform/sensinode/sensinode-debug.h rename to platform/sensinode/debug.h index 683f1ba44..4c5dc135b 100644 --- a/platform/sensinode/sensinode-debug.h +++ b/platform/sensinode/debug.h @@ -40,8 +40,8 @@ * George Oikonomou - */ -#ifndef SENSINODE_DEBUG_H_ -#define SENSINODE_DEBUG_H_ +#ifndef DEBUG_H_ +#define DEBUG_H_ #include "8051def.h" #include "dev/uart1.h" @@ -51,4 +51,4 @@ void putstring(char *s); void puthex(uint8_t c); void putbin(uint8_t c); -#endif /* SENSINODE_DEBUG_H_ */ +#endif /* DEBUG_H_ */