Swapping HEAD and DEVEL branches

[tinyos-2.x.git] / tos / chips / msp430 / usart / HplMsp430Usart.nc

diff --git a/tos/chips/msp430/usart/HplMsp430Usart.nc b/tos/chips/msp430/usart/HplMsp430Usart.nc
index fb937871d964a3126fc33e387fb34c49195713f5..835b536957dae61b642a6172bf991fe1a2a7112f 100644 (file)
--- a/tos/chips/msp430/usart/HplMsp430Usart.nc
+++ b/tos/chips/msp430/usart/HplMsp430Usart.nc
@@ -165,25 +165,13 @@ interface HplMsp430Usart {
   /**
    * Switches USART to Spi mode.
    */
-  async command void setModeSpi(msp430_spi_config_t* config);
-  
-  /**
-   * Switches USART to Uart TX mode (RX pins disabled).
-   * Interrupts disabled by default.
-   */
-  async command void setModeUartTx(msp430_uart_config_t* config);
-  
-  /**
-   * Switches USART to Uart RX mode (TX pins disabled)..
-   * Interrupts disabled by default.
-   */
-  async command void setModeUartRx(msp430_uart_config_t* config);
+  async command void setModeSpi(msp430_spi_union_config_t* config);
   
   /**
    * Switches USART to Uart mode (RX and TX enabled)
    * Interrupts disabled by default.
    */
-  async command void setModeUart(msp430_uart_config_t* config);
+  async command void setModeUart(msp430_uart_union_config_t* config);
   
   /* Dis/enabling of UTXIFG / URXIFG */
   async command void disableRxIntr();