turn on safe compilation for some modules

[tinyos-2.x.git] / tos / chips / msp430 / dma / HplMsp430DmaXP.nc

diff --git a/tos/chips/msp430/dma/HplMsp430DmaXP.nc b/tos/chips/msp430/dma/HplMsp430DmaXP.nc
index aced3ed30f55739cc085ac7c8114dc8259ead020..82930f9a242b7358a81794ce291b30407a7bd239 100644 (file)
--- a/tos/chips/msp430/dma/HplMsp430DmaXP.nc
+++ b/tos/chips/msp430/dma/HplMsp430DmaXP.nc
@@ -54,6 +54,7 @@
  * @author Ben Greenstein <ben@cs.ucla.edu>
  * @author Jonathan Hui <jhui@archrock.com>
  * @author Joe Polastre <info@moteiv.com>
+ * @author Mark Hays
  * @version $Revision$ $Date$
  */
 
@@ -62,7 +63,7 @@ generic module HplMsp430DmaXP( uint16_t DMAxCTL_addr,
                               uint16_t DMAxDA_addr,
                               uint16_t DMAxSZ_addr,
                               uint16_t DMAxTSEL_mask,
-                              uint16_t DMAxTSEL_shift ) {
+                              uint16_t DMAxTSEL_shift ) @safe() {
   
   provides interface HplMsp430DmaChannel as DMA;
   uses interface HplMsp430DmaInterrupt as Interrupt;
@@ -105,69 +106,79 @@ implementation {
 
   async command void DMA.setSingleMode() {
     DMAxCTL &= ~( DMADT0 | DMADT1 | DMADT2 );
+    DMAxCTL |= DMA_SINGLE_TRANSFER;
   }
 
   async command void DMA.setBlockMode() {
     DMAxCTL &= ~( DMADT0 | DMADT1 | DMADT2 );
-    DMAxCTL |= DMADT0;
+    DMAxCTL |= DMA_BLOCK_TRANSFER;
   }
 
   async command void DMA.setBurstMode() {
     DMAxCTL &= ~( DMADT0 | DMADT1 | DMADT2 );
-    DMAxCTL |= DMADT1;
+    DMAxCTL |= DMA_BURST_BLOCK_TRANSFER;
   }
 
   async command void DMA.setRepeatedSingleMode() {
     DMAxCTL &= ~( DMADT0 | DMADT1 | DMADT2 );
-    DMAxCTL |= DMADT2;
+    DMAxCTL |= DMA_REPEATED_SINGLE_TRANSFER;
   }
 
   async command void DMA.setRepeatedBlockMode() {
     DMAxCTL &= ~( DMADT0 | DMADT1 | DMADT2 );
-    DMAxCTL |= ( DMADT2 | DMADT0 );
+    DMAxCTL |= DMA_REPEATED_BLOCK_TRANSFER;
   }
 
   async command void DMA.setRepeatedBurstMode() {
     DMAxCTL &= ~( DMADT0 | DMADT1 | DMADT2 );
-    DMAxCTL |= ( DMADT2 | DMADT1 );
+    DMAxCTL |= DMA_REPEATED_BURST_BLOCK_TRANSFER;
   }
 
   async command void DMA.setSrcNoIncrement() {
     DMAxCTL &= ~( DMASRCINCR0 | DMASRCINCR1 );
+    DMAxCTL |= DMA_ADDRESS_UNCHANGED;
   }
 
   async command void DMA.setSrcDecrement() {
-    DMAxCTL |= DMASRCINCR1;
+    DMAxCTL &= ~( DMASRCINCR0 | DMASRCINCR1 );
+    DMAxCTL |= DMA_ADDRESS_DECREMENTED;
   }
 
   async command void DMA.setSrcIncrement() {
-    DMAxCTL |= ( DMASRCINCR0 | DMASRCINCR1 );
+    DMAxCTL &= ~( DMASRCINCR0 | DMASRCINCR1 );
+    DMAxCTL |= DMA_ADDRESS_INCREMENTED;
   }
 
   async command void DMA.setDstNoIncrement() {
     DMAxCTL &= ~( DMADSTINCR0 | DMADSTINCR1 );
+    DMAxCTL |= DMA_ADDRESS_UNCHANGED;
   }          
 
   async command void DMA.setDstDecrement() {
-    DMAxCTL |= DMADSTINCR1;
+    DMAxCTL &= ~( DMADSTINCR0 | DMADSTINCR1 );
+    DMAxCTL |= DMA_ADDRESS_DECREMENTED;
   }
 
   async command void DMA.setDstIncrement() {
-    DMAxCTL |= ( DMADSTINCR0 | DMADSTINCR1 );
+    DMAxCTL &= ~( DMADSTINCR0 | DMADSTINCR1 );
+    DMAxCTL |= DMA_ADDRESS_INCREMENTED;
   }
 
   async command void DMA.setWordToWord() {
     DMAxCTL &= ~(DMASRCBYTE | DMADSTBYTE);
     DMAxCTL |= DMASWDW;
   }
+
   async command void DMA.setByteToWord() {
     DMAxCTL &= ~(DMASRCBYTE | DMADSTBYTE);
     DMAxCTL |= DMASBDW;
   }
+
   async command void DMA.setWordToByte() {
     DMAxCTL &= ~(DMASRCBYTE | DMADSTBYTE);
     DMAxCTL |= DMASWDB;
   }
+
   async command void DMA.setByteToByte() {
     DMAxCTL &= ~(DMASRCBYTE | DMADSTBYTE);
     DMAxCTL |= DMASBDB;
@@ -190,11 +201,11 @@ implementation {
   }
 
   async command void DMA.enableInterrupt() {
-    DMAxCTL  |= DMAIE;
+    DMAxCTL |= DMAIE;
   }
 
   async command void DMA.disableInterrupt() {
-    DMAxCTL  &= ~DMAIE;
+    DMAxCTL &= ~DMAIE;
   }
 
   async command bool DMA.interruptPending() {
@@ -235,7 +246,7 @@ implementation {
     DMAxSA = (uint16_t)src;
     DMAxDA = (uint16_t)dest;
     DMAxSZ = size;
-    DMACTL0 = ( DMACTL0 & ~DMAxTSEL_mask ) | ( t << DMAxTSEL_shift );
+    call DMA.setTrigger((dma_trigger_t) t);
     DMAxCTL = s;
   }
 
@@ -268,7 +279,5 @@ implementation {
     DMAxDA = 0;
     DMAxSZ = 0;
   }
-
-
 }