Updates for GCC 4.5.3

[tinyos-2.x.git] / tos / platforms / tmirws / MotePlatformC.nc

diff --git a/tos/platforms/tmirws/MotePlatformC.nc b/tos/platforms/tmirws/MotePlatformC.nc
index 1b981ed3643bd30ad608bc88f77f6efa880bf52c..39b45c96caa561d455733975abfcdc1557c819ce 100644 (file)
--- a/tos/platforms/tmirws/MotePlatformC.nc
+++ b/tos/platforms/tmirws/MotePlatformC.nc
@@ -26,11 +26,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
  /**
  * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
+
 module MotePlatformC @safe() {
   provides interface Init;
 }
@@ -39,11 +39,6 @@ implementation {
     /* reset all of the ports to be input and using i/o functionality */
     atomic
       {
-#ifdef __MSP430_HAS_WDT__
-       /* Stop the watchdog, if running.  Should be somewhere in chips/msp430... */
-       WDTCTL = WDTPW + WDTHOLD;
-#endif
-
        /* Port 1: 7:BQSTAT2, 6:BQSTAT1, 5:RAIN, 4:-, 3:CP_CTS, 2:CP_RTS,
         * 1:BSL_TX, 0:WSPEED
         */
@@ -51,7 +46,7 @@ implementation {
        P1OUT = 0x10;   /* 0 0 0 1 0 0 0 0 */
        P1DIR = 0x08;   /* 0 0 0 0 1 0 0 0 */
        P1REN = 0x14;   /* 0 0 0 1 0 1 0 0 */
- 
+
        /* Port 2:
         * 7:SHT_DATA, 6:SCP_DRDY, 5:BUTTONn, 4:USB_SUSPENDn, 3:GM_PWRMON,
         * 2:BSL_RX, 1:USBPGn, 0:SOLARPGn