[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/imote2/test/TestMDA440 EEPROMC.nc, 1.1, 1.2 EEPROMM.nc, 1.1, 1.2 MDA440M.nc, 1.5, 1.6

[Robbie Adler]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/TestMDA440
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20563

Modified Files:
	EEPROMC.nc EEPROMM.nc MDA440M.nc 
Log Message:
updated to reflect latest platform push

Index: EEPROMC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/TestMDA440/EEPROMC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EEPROMC.nc	9 Sep 2006 16:05:20 -0000	1.1
--- EEPROMC.nc	10 Oct 2006 22:29:58 -0000	1.2
***************
*** 12,15 ****
    EEPROM = EEPROMM;
    StdControl = EEPROMM;
!   EEPROMM.I2CInterrupt -> PXA27XInterruptM.PXA27XIrq[PPID_I2C];
  }
--- 12,15 ----
    EEPROM = EEPROMM;
    StdControl = EEPROMM;
!   EEPROMM.I2CInterrupt -> PXA27XInterruptM.PXA27XIrq[IID_I2C];
  }

Index: EEPROMM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/TestMDA440/EEPROMM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EEPROMM.nc	9 Sep 2006 16:05:20 -0000	1.1
--- EEPROMM.nc	10 Oct 2006 22:29:58 -0000	1.2
***************
*** 120,127 ****
      //enable the clock
      //while(!bPMICenabled);
!     CKEN |= CKEN14_I2C;
      //config the GPIO's
!     _PXA_setaltfn(117,0x1,GPIO_IN);
!     _PXA_setaltfn(118,0x1,GPIO_IN);
      //PICR = ICR_IUE | ICR_SCLE | ICR_BEIE | ICR_ITEIE ;
      ICR = ICR_IUE | ICR_SCLE;
--- 120,128 ----
      //enable the clock
      //while(!bPMICenabled);
!     CKEN |= CKEN_CKEN14;
      //config the GPIO's
! 
!     GPIO_SET_ALT_FUNC(117,0x1,GPIO_IN);
!     GPIO_SET_ALT_FUNC(118,0x1,GPIO_IN);
      //PICR = ICR_IUE | ICR_SCLE | ICR_BEIE | ICR_ITEIE ;
      ICR = ICR_IUE | ICR_SCLE;
***************
*** 158,162 ****
    command result_t StdControl.stop(){
      call I2CInterrupt.disable();
!     CKEN &= ~CKEN14_I2C;
      PICR = 0;
      
--- 159,163 ----
    command result_t StdControl.stop(){
      call I2CInterrupt.disable();
!     CKEN &= ~CKEN_CKEN14;
      PICR = 0;
      

Index: MDA440M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/TestMDA440/MDA440M.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MDA440M.nc	10 Oct 2006 21:51:09 -0000	1.5
--- MDA440M.nc	10 Oct 2006 22:29:58 -0000	1.6
***************
*** 215,219 ****
        call SSP.setMasterSCLK(TRUE);
        call SSP.setMasterSFRM(FALSE);
!       call SSP.init();
  
  
--- 215,219 ----
        call SSP.setMasterSCLK(TRUE);
        call SSP.setMasterSFRM(FALSE);
!       //      call SSP.init();
  
  
***************
*** 446,450 ****
    
    
!   event uint8_t *BulkTxRx.BulkReceiveDone(uint8_t *data, uint16_t NumBytes){
      uint8_t *tempBuf= NULL;
      
--- 446,450 ----
    
    
!   async event uint8_t *BulkTxRx.BulkReceiveDone(uint8_t *data, uint16_t NumBytes){
      uint8_t *tempBuf= NULL;
      
***************
*** 466,472 ****
    }
    
!   event result_t BulkTxRx.BulkTransmitDone(uint8_t *data){
!       return SUCCESS;
!     }
    
    async event void TACHInterrupt.fired(){
--- 466,480 ----
    }
    
!   async event uint8_t *BulkTxRx.BulkTransmitDone(uint8_t *data, 
! 						 uint16_t numBytes){
!     return NULL;
!   }
! 
!   async event BulkTxRxBuffer_t *BulkTxRx.BulkTxRxDone(BulkTxRxBuffer_t *TxRxBuffer,
! 							  uint16_t numBytes){
!     return NULL;
!   }
! 
!   
    
    async event void TACHInterrupt.fired(){