From: smckown <smckown@4bc1554a-c7f2-4f65-a403-e0be01f0239c>
Date: Thu, 30 Apr 2009 20:53:36 +0000 (+0000)
Subject: Revert "Remove the NO_REN_ON_SPI define."
X-Git-Tag: release/2.1.0-1~9
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=e40462f2112327c1cc2ce8be8c0f497cc4ddbeba

Revert "Remove the NO_REN_ON_SPI define."

This reverts commit 50fa36081d963e9da0c4544d753e77c53c1b0ac8 (svn r152).  With
PxREN manipulation in usci/Msp430SpiP, the phase2 app does not send packets to
the gateway.
---

diff --git a/tos/chips/msp430/usci/Msp430SpiP.nc b/tos/chips/msp430/usci/Msp430SpiP.nc
index 9f3fd177..dad8e824 100644
--- a/tos/chips/msp430/usci/Msp430SpiP.nc
+++ b/tos/chips/msp430/usci/Msp430SpiP.nc
@@ -32,6 +32,8 @@
  *
  * TODO: Implement error checking via UCxxSTAT
  *
+ * NOTE: Define NO_REN_ON_SPI to disable PxREN bits when SPI is acquired.
+ *
  * @author R. Steve McKown <rsmckown@gmail.com>
  */
  
@@ -61,7 +63,9 @@ implementation {
     PINS_SOMI,
     PINS_SIMO,
     PINS_CLK,
+#ifdef NO_REN_ON_SPI
     PINS_RENADDR,	/* This gets added to store the PxREN bit */
+#endif
   };
 
   uint8_t m_pins;
@@ -108,6 +112,7 @@ implementation {
 
       /* Configure pins for SPI, saving prior pin states */
       m_pins = 0;
+#ifdef NO_REN_ON_SPI
       /* - First save off and disable PxREN bits */
       if (is4pin() && call STE.isRen()) {
 	m_pins |= (1 << (PINS_STE + PINS_RENADDR));
@@ -125,6 +130,7 @@ implementation {
 	m_pins |= (1 << (PINS_CLK + PINS_RENADDR));
 	call CLK.disableRen();
       }
+#endif
       /* - Then save off IOFunc state and enable ModuleFunc */
       if (is4pin() && call STE.isIOFunc()) {
 	m_pins |= (1 << PINS_STE);
@@ -173,6 +179,7 @@ implementation {
       if (m_pins & (1 << PINS_CLK))
 	call CLK.selectIOFunc();
       /* - Then restore PxREN bits */
+#ifdef NO_REN_ON_SPI
       if (is4pin() && (m_pins & (1 << (PINS_STE + PINS_RENADDR))))
 	call STE.enableRen();
       if (m_pins & (1 << (PINS_SIMO + PINS_RENADDR)))
@@ -181,6 +188,7 @@ implementation {
 	call SOMI.enableRen();
       if (m_pins & (1 << (PINS_CLK + PINS_RENADDR)))
 	call CLK.enableRen();
+#endif
     }
   }