Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / intelmote2 / hardware.h

diff --git a/tos/platforms/intelmote2/hardware.h b/tos/platforms/intelmote2/hardware.h
index 87f9ba52b017a287dc8b2edc9d8c90721291deaa..3ff83b7b96a38a131f632be55b48996b00ea6afa 100644 (file)
--- a/tos/platforms/intelmote2/hardware.h
+++ b/tos/platforms/intelmote2/hardware.h
@@ -27,7 +27,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  */
-/*                                                                     tab:4
+/*
  *
  *
  * "Copyright (c) 2000-2002 The Regents of the University  of California.  
@@ -50,7 +50,7 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
  *
  */
-/*                                                                     tab:4
+/*
  *  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.  By
  *  downloading, copying, installing or using the software you agree to
  *  this license.  If you do not agree to this license, do not download,
@@ -100,6 +100,15 @@
 #include "pxa27xhardware.h"
 //#include "AM.h"
 
+// enum so components can override power saving,
+// as per TEP 112.
+// Note that currently the pxa27x does not support
+// McuPowerOverride, so SLEEP_NONE is defined to
+// be 0.
+enum {
+  TOS_SLEEP_NONE = 0,
+};
+
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 /* Watchdog Prescaler
@@ -119,7 +128,7 @@ enum {
  *    Table is indexed by the Peripheral ID (PPID). Priorities are 0 - 39
  *    where 0 is the highest.  Priorities MUST be unique. 0XFF = invalid/unassigned
  */
-const uint8_t TOSH_IRP_TABLE[] = { 0xFF, // PPID  0 SSP_3 Service Req
+const uint8_t TOSH_IRP_TABLE[] = { 0x05, // PPID  0 SSP_3 Service Req
                                   0xFF, // PPID  1 MSL
                                   0xFF, // PPID  2 USBH2
                                   0xFF, // PPID  3 USBH1
@@ -143,7 +152,7 @@ const uint8_t TOSH_IRP_TABLE[] = { 0xFF, // PPID  0 SSP_3 Service Req
                                   0xFF, // PPID 21 TX/RX ERROR BTUART
                                   0x06, // PPID 22 TX/RX ERROR FFUART
                                   0xFF, // PPID 23 Flash Card status/Error Detect
-                                  0x05, // PPID 24 SSP_1 Service Req
+                                  0x0A, // PPID 24 SSP_1 Service Req
                                   0x00, // PPID 25 DMA Channel Service Req
                                   0xFF, // PPID 26 OST equals Match Register 0
                                   0xFF, // PPID 27 OST equals Match Register 1
@@ -228,6 +237,7 @@ const uint8_t TOSH_IRP_TABLE[] = { 0xFF, // PPID  0 SSP_3 Service Req
 #define I2C_SDA (118)
 #define I2C_SDA_ALTFN (1)
 
+#define DS2745_SLAVE_ADDR (0x48)
 
 #if 0
 TOSH_ASSIGN_PIN(CC_VREN,A,CC_VREN_PIN);