make the module safe

[tinyos-2.x.git] / apps / tests / TestPrintf / TestPrintfC.nc

diff --git a/apps/tests/TestPrintf/TestPrintfC.nc b/apps/tests/TestPrintf/TestPrintfC.nc
index 47fe191bed1fb170210cb9262f2831b8573d07ec..5d970f329866d5a05d7a1e8d2627da8ff7e79683 100644 (file)
--- a/apps/tests/TestPrintf/TestPrintfC.nc
+++ b/apps/tests/TestPrintf/TestPrintfC.nc
@@ -19,15 +19,13 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
  * MODIFICATIONS."
  */
- 
+
 /**
  *
- * This application is used to test the basic functionality of the printf service.  
- * It is initiated by calling the start() command of the SplitControl interface 
- * provided by the PrintfC component.  After starting the printf service, calls to 
- * the standard c-style printf command are made to print various strings of text 
- * over the serial line.  Only upon calling PrintfFlush.flush() does the data 
- * actually get sent out over the serial line.
+ * This application is used to test the basic functionality of the printf service.
+ * Calls to the standard c-style printf command are made to print various strings
+ * of text over the serial line.  Only upon calling printfflush() does the
+ * data actually get sent out over the serial line.
  *
  * @author Kevin Klues (klueska@cs.wustl.edu)
  * @version $Revision$
@@ -35,54 +33,23 @@
  */
 
 #include "printf.h"
-module TestPrintfC {
+module TestPrintfC @safe() {
   uses {
-    interface Boot;  
-    interface Leds;
-    interface SplitControl as PrintfControl;
-    interface PrintfFlush;
+    interface Boot;
   }
 }
 implementation {
-       
-  #define NUM_TIMES_TO_PRINT   5
-  uint16_t counter=0;
+
   uint8_t dummyVar1 = 123;
   uint16_t dummyVar2 = 12345;
   uint32_t dummyVar3 = 1234567890;
 
   event void Boot.booted() {
-    call PrintfControl.start();
-  }
-  
-  event void PrintfControl.startDone(error_t error) {
        printf("Hi I am writing to you from my TinyOS application!!\n");
        printf("Here is a uint8: %u\n", dummyVar1);
        printf("Here is a uint16: %u\n", dummyVar2);
        printf("Here is a uint32: %ld\n", dummyVar3);
-       call PrintfFlush.flush();
-  }
-
-  event void PrintfControl.stopDone(error_t error) {
-       counter = 0;
-    call Leds.led2Toggle();
-       printf("This should not be printed...");
-       call PrintfFlush.flush();
-  }
-  
-  event void PrintfFlush.flushDone(error_t error) {
-       if(counter < NUM_TIMES_TO_PRINT) {
-      printf("I am now iterating: %d\n", counter);
-         call PrintfFlush.flush();
-    }
-    else if(counter == NUM_TIMES_TO_PRINT) {
-      printf("This is a really short string...\n");
-      printf("I am generating this string to have just less than 250\ncharacters since that is the limit of the size I put on my\nmaximum buffer when I instantiated the PrintfC component.\n");
-      printf("Only part of this line should get printed because by writing\nthis sentence, I go over my character limit that the internal Printf buffer can hold.\n");
-      call PrintfFlush.flush();
-    }
-    else call PrintfControl.stop();
-    counter++;
+       printfflush();
   }
 }