X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusart%2FMsp430SpiDmaP.nc;h=c72a054487e03a4b215969c7e9cffd09891cf8ed;hb=337d0b13acf569c2640b3ed7b7f5c7cec35d7ddd;hp=a1025dc877f740dae598b62a1b5176905acd504d;hpb=1a329382c4f4556fd52d85f4e3f4a67e54911682;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usart/Msp430SpiDmaP.nc b/tos/chips/msp430/usart/Msp430SpiDmaP.nc
index a1025dc8..c72a0544 100644
--- a/tos/chips/msp430/usart/Msp430SpiDmaP.nc
+++ b/tos/chips/msp430/usart/Msp430SpiDmaP.nc
@@ -96,7 +96,7 @@ implementation {
   default async command error_t UsartResource.request[ uint8_t id ]() { return FAIL; }
   default async command error_t UsartResource.immediateRequest[ uint8_t id ]() { return FAIL; }
   default async command error_t UsartResource.release[ uint8_t id ]() { return FAIL; }
-  default async command msp430_spi_config_t* Msp430SpiConfigure.getConfig[uint8_t id]() {
+  default async command msp430_spi_union_config_t* Msp430SpiConfigure.getConfig[uint8_t id]() {
     return &msp430_spi_default_config;
   }
 
@@ -106,6 +106,7 @@ implementation {
 
     call Usart.tx( tx );
     while( !call Usart.isRxIntrPending() );
+    call Usart.clrRxIntr();
     return call Usart.rx();
 
   }