[Tinyos-commits] CVS: tinyos-1.x/tos/lib/Deluge/TOSBoot/msp430 HPLUSART0M.nc, 1.3, 1.4

[Joe Polastre]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/TOSBoot/msp430
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7008

Modified Files:
	HPLUSART0M.nc 
Log Message:
U0MCTL not used for SPI, safely removed from init proc


Index: HPLUSART0M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/TOSBoot/msp430/HPLUSART0M.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HPLUSART0M.nc	19 Sep 2005 21:56:20 -0000	1.3
--- HPLUSART0M.nc	19 Sep 2005 22:14:29 -0000	1.4
***************
*** 35,38 ****
--- 35,41 ----
  
    command void HPLUSARTControl.disableSPI() {
+     // USART0 SPI module disable
+     //ME1 &= ~USPIE0;
+ 
      // set to PUC values
      ME1 = 0;
***************
*** 43,46 ****
--- 46,52 ----
    
    command void HPLUSARTControl.setModeSPI() {
+ 
+     //U0CTL = SWRST;
+ 
      // 8-bit char, SPI-mode, USART as master
      U0CTL = SWRST | CHAR | SYNC | MM;
***************
*** 52,56 ****
      U0BR0 = 0x02;
      U0BR1 = 0;
-     U0MCTL = 0;
  
      // enable SPI
--- 58,61 ----
***************
*** 65,68 ****
--- 70,78 ----
  
    command void HPLUSARTControl.disableI2C() {
+     /*
+     U0CTL = 1;
+     U0TCTL = 1;
+     I2CTCTL = 0;
+     */
      U0CTL &= ~I2CEN;
      U0CTL &= ~I2C;
***************
*** 72,75 ****
--- 82,86 ----
  
    command void HPLUSARTControl.setModeI2C() {
+    
      // Recommended init procedure
      U0CTL = I2C + SYNC + MST;