[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430 msp430hardware.h, 1.6, 1.7

[Vlado Handziski]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30178

Modified Files:
	msp430hardware.h 
Log Message:
Redefinitions for safe tinyos. With this patch, it so no longer necessary to modify the msp430 toolchain. All changes are contained in the tinyos source.

Similar modification needs to be applied to atm128hardware.h for the Atmel platforms

Index: msp430hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/msp430hardware.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** msp430hardware.h	13 Mar 2008 15:18:49 -0000	1.6
--- msp430hardware.h	23 Jun 2008 18:35:36 -0000	1.7
***************
*** 124,127 ****
--- 124,138 ----
  #endif
  
+ 
+ // Re-definitions for safe tinyOS
+ // These rely on io.h being included at the top of this file
+ // thus pulling the affected header files before the re-definitions
+ #ifdef SAFE_TINYOS
+ #undef ADC12MEM
+ #define ADC12MEM            TCAST(int* ONE, ADC12MEM_) /* ADC12 Conversion Memory (for C) */
+ #undef ADC12MCTL
+ #define ADC12MCTL           TCAST(char * ONE, ADC12MCTL_)
+ #endif
+ 
  // define platform constants that can be changed for different compilers
  // these are all msp430-gcc specific (add as necessary)