[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/mica2 hardware.h, 1.1.2.12, 1.1.2.13

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica2
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16767

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	hardware.h 
Log Message:
head merge


Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica2/hardware.h,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** hardware.h	20 Jun 2006 17:14:29 -0000	1.1.2.12
--- hardware.h	22 Sep 2006 19:22:19 -0000	1.1.2.13
***************
*** 42,47 ****
--- 42,54 ----
  #define HARDWARE_H
  
+ #ifndef MHZ
+ /* Clock rate is ~8MHz except if specified by user 
+    (this value must be a power of 2, see MicaTimer.h and MeasureClockC.nc) */
+ #define MHZ 8
+ #endif
+ 
  #include <atm128hardware.h>
  #include <Atm128Adc.h>
+ #include <MicaTimer.h>
  
  // A/D channels
***************
*** 52,61 ****
  };
  
- #ifndef MHZ
- /* Clock rate is ~8MHz except if specified by user 
-    (this value must be a power of 2, see MicaTimer.h and MeasureClockC.nc) */
- #define MHZ 8
- #endif
- 
  enum {
    PLATFORM_BAUDRATE = 57600L
--- 59,62 ----