From 08502eb3447131cf5c2dad23567cbafe99cca322 Mon Sep 17 00:00:00 2001 From: fros4943 Date: Fri, 3 Oct 2008 09:39:38 +0000 Subject: [PATCH] removed refences to printf2log.h --- platform/cooja/testapps/hello-world.c | 5 ++--- platform/cooja/testapps/testbutton.c | 3 +-- platform/cooja/testapps/testcfs.c | 7 +++---- platform/cooja/testapps/testctimer.c | 3 +-- platform/cooja/testapps/testetimer.c | 3 +-- platform/cooja/testapps/testsensors.c | 5 ++--- platform/cooja/testapps/testserial.c | 5 ++--- platform/cooja/testapps/testuaodv.c | 5 ++--- platform/cooja/testapps/testuip.c | 3 +-- 9 files changed, 15 insertions(+), 24 deletions(-) diff --git a/platform/cooja/testapps/hello-world.c b/platform/cooja/testapps/hello-world.c index 8f84afbf7..47e17440a 100644 --- a/platform/cooja/testapps/hello-world.c +++ b/platform/cooja/testapps/hello-world.c @@ -28,14 +28,13 @@ * * This file is part of the Contiki operating system. * - * $Id: hello-world.c,v 1.1 2008/04/22 13:07:49 fros4943 Exp $ + * $Id: hello-world.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include "contiki.h" -#include "printf2log.h" +#include -#include /* For printf() */ /*---------------------------------------------------------------------------*/ PROCESS(hello_world_process, "Hello world process"); AUTOSTART_PROCESSES(&hello_world_process); diff --git a/platform/cooja/testapps/testbutton.c b/platform/cooja/testapps/testbutton.c index a98d69a55..7d7401bef 100644 --- a/platform/cooja/testapps/testbutton.c +++ b/platform/cooja/testapps/testbutton.c @@ -26,14 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: testbutton.c,v 1.1 2007/11/25 22:46:14 fros4943 Exp $ + * $Id: testbutton.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include "contiki.h" #include "dev/button-sensor.h" #include -#include "printf2log.h" /* COOJA specific: Transforms printf() to log_message() */ PROCESS(test_button_process, "Test button process"); AUTOSTART_PROCESSES(&test_button_process); diff --git a/platform/cooja/testapps/testcfs.c b/platform/cooja/testapps/testcfs.c index 4a97e84e8..c72239e5d 100644 --- a/platform/cooja/testapps/testcfs.c +++ b/platform/cooja/testapps/testcfs.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: testcfs.c,v 1.1 2007/11/25 22:46:14 fros4943 Exp $ + * $Id: testcfs.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include "contiki.h" @@ -35,7 +35,6 @@ #include "cfs/cfs.h" #include -#include "printf2log.h" /* COOJA specific: Transforms printf() to log_message() */ PROCESS(test_cfs_process, "Test CFS process"); AUTOSTART_PROCESSES(&test_cfs_process); @@ -46,7 +45,7 @@ PROCESS_THREAD(test_cfs_process, ev, data) static int fd; static u16_t counter; static char buf[30]; - + PROCESS_BEGIN(); printf("Starting CFS test process\n"); @@ -63,7 +62,7 @@ PROCESS_THREAD(test_cfs_process, ev, data) cfs_close(fd); printf("Wrote to filesystem: '%s'\n", buf); counter++; - + etimer_set(&et, CLOCK_SECOND); PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et)); diff --git a/platform/cooja/testapps/testctimer.c b/platform/cooja/testapps/testctimer.c index f2c66439f..9a6c6e8de 100644 --- a/platform/cooja/testapps/testctimer.c +++ b/platform/cooja/testapps/testctimer.c @@ -26,14 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: testctimer.c,v 1.1 2007/11/25 22:46:14 fros4943 Exp $ + * $Id: testctimer.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include "contiki.h" #include "net/rime/ctimer.h" #include -#include "printf2log.h" /* COOJA specific: Transforms printf() to log_message() */ PROCESS(test_ctimer_process, "Callback timer test process"); AUTOSTART_PROCESSES(&test_ctimer_process); diff --git a/platform/cooja/testapps/testetimer.c b/platform/cooja/testapps/testetimer.c index 8fa670f5b..1672649ff 100644 --- a/platform/cooja/testapps/testetimer.c +++ b/platform/cooja/testapps/testetimer.c @@ -26,14 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: testetimer.c,v 1.1 2007/11/25 22:46:14 fros4943 Exp $ + * $Id: testetimer.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include "contiki.h" #include "sys/etimer.h" #include -#include "printf2log.h" /* COOJA specific: Transforms printf() to log_message() */ PROCESS(test_etimer_process, "Event timer test process"); AUTOSTART_PROCESSES(&test_etimer_process); diff --git a/platform/cooja/testapps/testsensors.c b/platform/cooja/testapps/testsensors.c index b4eea6ce0..7999f268b 100644 --- a/platform/cooja/testapps/testsensors.c +++ b/platform/cooja/testapps/testsensors.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: testsensors.c,v 1.1 2007/11/25 22:46:14 fros4943 Exp $ + * $Id: testsensors.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include "contiki.h" @@ -36,7 +36,6 @@ #include "dev/radio-sensor.h" #include -#include "printf2log.h" /* COOJA specific: Transforms printf() to log_message() */ PROCESS(test_sensors_process, "Test sensors process"); AUTOSTART_PROCESSES(&test_sensors_process); @@ -50,7 +49,7 @@ PROCESS_THREAD(test_sensors_process, ev, data) pir_sensor.activate(); vib_sensor.activate(); radio_sensor.activate(); - + while(1) { PROCESS_WAIT_EVENT(); diff --git a/platform/cooja/testapps/testserial.c b/platform/cooja/testapps/testserial.c index 1b367050b..3cb339a84 100644 --- a/platform/cooja/testapps/testserial.c +++ b/platform/cooja/testapps/testserial.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: testserial.c,v 1.1 2007/11/25 22:46:14 fros4943 Exp $ + * $Id: testserial.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include "contiki.h" @@ -34,7 +34,6 @@ #include "dev/rs232.h" #include -#include "printf2log.h" /* COOJA specific: Transforms printf() to log_message() */ PROCESS(test_serial_process, "Serial test process"); AUTOSTART_PROCESSES(&test_serial_process); @@ -54,7 +53,7 @@ PROCESS_THREAD(test_serial_process, ev, data) while(1) { PROCESS_WAIT_EVENT(); - + if (etimer_expired(&et)) { printf("Sending serial data now\n"); rs232_print("GNU's not Unix\n"); diff --git a/platform/cooja/testapps/testuaodv.c b/platform/cooja/testapps/testuaodv.c index c26ebc5c4..2bb190f10 100644 --- a/platform/cooja/testapps/testuaodv.c +++ b/platform/cooja/testapps/testuaodv.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: testuaodv.c,v 1.1 2007/11/25 22:46:14 fros4943 Exp $ + * $Id: testuaodv.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include @@ -38,7 +38,6 @@ #include "net/uaodv-rt.h" #include -#include "printf2log.h" /* COOJA specific: Transforms printf() to log_message() */ #define COOJA_PORT 1234 @@ -87,7 +86,7 @@ PROCESS_THREAD(test_uaodv_process, ev, data) if(ev == tcpip_event && uip_newdata()) { ((char*) uip_appdata)[uip_datalen()] = 0; printf("data received from %d.%d.%d.%d: %s\n", - uip_ipaddr_to_quad(&((struct uip_udpip_hdr *)&uip_buf[UIP_LLH_LEN])->srcipaddr), + uip_ipaddr_to_quad(&((struct uip_udpip_hdr *)&uip_buf[UIP_LLH_LEN])->srcipaddr), (char *)uip_appdata); leds_toggle(LEDS_ALL); } diff --git a/platform/cooja/testapps/testuip.c b/platform/cooja/testapps/testuip.c index 03d592897..3d3cb09a2 100644 --- a/platform/cooja/testapps/testuip.c +++ b/platform/cooja/testapps/testuip.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: testuip.c,v 1.1 2007/11/25 22:46:14 fros4943 Exp $ + * $Id: testuip.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ */ #include @@ -35,7 +35,6 @@ #include "dev/leds.h" #include -#include "printf2log.h" /* COOJA specific: Transforms printf() to log_message() */ #define COOJA_PORT 1234