[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/pins HplMsp430InterruptNMIP.nc, 1.1.2.2, 1.1.2.3

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/pins
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15326

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HplMsp430InterruptNMIP.nc 
Log Message:

Include fixes made in 1.x tree by Robert Szewczyk.

Constants MNIIFG, OFIFG and ACCVIFG are bitmasks rather than bit
positions.  This addresses bug 1371869



Index: HplMsp430InterruptNMIP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/pins/HplMsp430InterruptNMIP.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** HplMsp430InterruptNMIP.nc	19 Jun 2006 11:12:23 -0000	1.1.2.2
--- HplMsp430InterruptNMIP.nc	19 Jul 2006 22:45:13 -0000	1.1.2.3
***************
*** 73,79 ****
    async command void ACCV.clear() { atomic FCTL3 &= ~ACCVIFG; }
  
!   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 NMI.edge(bool l2h) { 
--- 73,79 ----
    async command void ACCV.clear() { atomic FCTL3 &= ~ACCVIFG; }
  
!   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 NMI.edge(bool l2h) {