[Tinyos-commits] CVS: tinyos-1.x/tos/platform/msp430 MSP430InterruptM.nc, 1.11, 1.12

[Robert Szewczyk]

Update of /cvsroot/tinyos/tinyos-1.x/tos/platform/msp430
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8319

Modified Files:
	MSP430InterruptM.nc 
Log Message:
Constants MNIIFG, OFIFG and ACCVIFG are bitmasks rather than bit positions.  This addresses bug 1371869 


Index: MSP430InterruptM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/msp430/MSP430InterruptM.nc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MSP430InterruptM.nc	3 Aug 2005 03:56:40 -0000	1.11
--- MSP430InterruptM.nc	4 May 2006 21:20:36 -0000	1.12
***************
*** 215,221 ****
    async command bool Port27.getValue() { bool b; atomic b=(P2IN >> 7) & 1; return b; }
  
!   async command bool NMI.getValue() { bool b; atomic b=(IFG1 >> NMIIFG) & 0x01; return b; }
!   async command bool OF.getValue() { bool b; atomic b=(IFG1 >> OFIFG) & 0x01; return b; }
!   async command bool ACCV.getValue() { bool b; atomic b=(FCTL3 >> ACCVIFG) & 0x01; return b; }
  
    async command void Port10.edge(bool l2h) { 
--- 215,222 ----
    async command bool Port27.getValue() { bool b; atomic b=(P2IN >> 7) & 1; return b; }
  
!   async command bool NMI.getValue() { return (IFG1 & NMIIFG) ? 1 : 0; }
! 
!   async command bool OF.getValue() { return (IFG1 & OFIFG) ? 1 : 0; }
!   async command bool ACCV.getValue() { return (IFG1 & ACCVIFG) ? 1: 0; }
  
    async command void Port10.edge(bool l2h) {