[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/imote2 BluSHM.nc, 1.6, 1.7

[Robbie Adler]

Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25340

Modified Files:
	BluSHM.nc 
Log Message:
trace definition cleanup

Index: BluSHM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/BluSHM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BluSHM.nc	2 Sep 2005 23:37:39 -0000	1.6
--- BluSHM.nc	6 Sep 2005 18:12:13 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----
   */
  #define USE_USB 1
+ includes trace;
  
  module BluSHM {
***************
*** 31,43 ****
  #include "cmdlinetools.c"
  #include "BluSH_types.h"
-   //#include <stdio.h>  something is wrong with stdio.h
  #include <stdarg.h>
!   
! #ifdef __GNUC__
! #define __VALIST __gnuc_va_list
! #else
! #define __VALIST char*
! #endif
!   
  #include "PXA27Xdynqueue.c"
    
--- 32,37 ----
  #include "cmdlinetools.c"
  #include "BluSH_types.h"
  #include <stdarg.h>
!     
  #include "PXA27Xdynqueue.c"
    
***************
*** 53,57 ****
    
    void generalSend(uint8_t *buf, uint32_t buflen);  
-   int vsnprintf(char *, size_t, const char *, __VALIST) __attribute__ ((C, spontaneous));
    task void processIn();
    void clearOut();
--- 47,50 ----
***************
*** 131,135 ****
  history - Display the command history\r\n\
  prompt - Allows you to change the prompt\r\n",
! 		  strlen("Blue Shell v1.0 (BluSH)\r\n\
  help - Display this list\r\n\
  ls - Display all application commands\r\n\
--- 124,128 ----
  history - Display the command history\r\n\
  prompt - Allows you to change the prompt\r\n",
! 		  strlen("Blue Shell v1.1 (BluSH)\r\n\
  help - Display this list\r\n\
  ls - Display all application commands\r\n\