[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/imote2/test/TestMDA440 TestMDA440M.nc, 1.4, 1.5 MDA440M.nc, 1.4, 1.5

[Lama Nachman]

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

Modified Files:
	TestMDA440M.nc MDA440M.nc 
Log Message:
Pushed out new release OCT 2006


Index: TestMDA440M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/TestMDA440/TestMDA440M.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMDA440M.nc	9 Sep 2006 16:05:20 -0000	1.4
--- TestMDA440M.nc	10 Oct 2006 21:51:09 -0000	1.5
***************
*** 143,148 ****
        else{
            sscanf(cmdBuff,"ClearGPIO %d", &gpio);
! 	  _PXA_setaltfn(gpio,0,GPIO_OUT);
! 	  _PXA_clrgpio(gpio);
  	  trace(DBG_USR1,"ClearGPIO DONE\r\n",gpio);
        }
--- 143,148 ----
        else{
            sscanf(cmdBuff,"ClearGPIO %d", &gpio);
! 	  GPIO_SET_ALT_FUNC(gpio,0,GPIO_OUT);
! 	  CLEAR_GPIO(gpio);
  	  trace(DBG_USR1,"ClearGPIO DONE\r\n",gpio);
        }
***************
*** 166,171 ****
        else{
  	sscanf(cmdBuff,"SetGPIO %d", &gpio);
! 	_PXA_setaltfn(gpio,0,GPIO_OUT);
! 	_PXA_setgpio(gpio);
  	trace(DBG_USR1,"SetGPIO DONE\r\n",gpio);
        }
--- 166,171 ----
        else{
  	sscanf(cmdBuff,"SetGPIO %d", &gpio);
! 	GPIO_SET_ALT_FUNC(gpio,0,GPIO_OUT);
! 	SET_GPIO(gpio);
  	trace(DBG_USR1,"SetGPIO DONE\r\n",gpio);
        }

Index: MDA440M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/TestMDA440/MDA440M.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MDA440M.nc	9 Sep 2006 16:05:20 -0000	1.4
--- MDA440M.nc	10 Oct 2006 21:51:09 -0000	1.5
***************
*** 123,128 ****
    void EnableMux(const uint8_t mux[4]){
      if(mux[3]){
!       _PXA_setaltfn(mux[3],0, GPIO_OUT);
!       _PXA_setgpio(mux[3]);
      }
    }
--- 123,128 ----
    void EnableMux(const uint8_t mux[4]){
      if(mux[3]){
!       GPIO_SET_ALT_FUNC(mux[3],0, GPIO_OUT);
!       SET_GPIO(mux[3]);
      }
    }
***************
*** 130,135 ****
      void DisableMux(const uint8_t mux[4]){
        if(mux[3]){
! 	_PXA_setaltfn(mux[3],0, GPIO_OUT);
! 	_PXA_clrgpio(mux[3]);
        }
      }
--- 130,135 ----
      void DisableMux(const uint8_t mux[4]){
        if(mux[3]){
! 	GPIO_SET_ALT_FUNC(mux[3],0, GPIO_OUT);
! 	CLEAR_GPIO(mux[3]);
        }
      }
***************
*** 137,164 ****
    void SetMuxAddress(const uint8_t mux[4], uint8_t bit0, uint8_t bit1, uint8_t bit2){
      if(mux[0]){
!       _PXA_setaltfn(mux[0],0, GPIO_OUT);
  	if(bit0==0){ 
! 	  _PXA_clrgpio(mux[0]);
  	}
  	else{  
! 	  _PXA_setgpio(mux[0]);
  	}
        }
        if(mux[1]){
! 	_PXA_setaltfn(mux[1],0, GPIO_OUT);
  	if(bit1==0){
! 	  _PXA_clrgpio(mux[1]);
  	} 
  	else {
! 	  _PXA_setgpio(mux[1]);
  	}
        }
        if(mux[2]){
! 	_PXA_setaltfn(mux[2], 0, GPIO_OUT);
  	if(bit2==0) {
! 	  _PXA_clrgpio(mux[2]);
  	}
  	else{
! 	  _PXA_setgpio(mux[2]);
  	}
        }
--- 137,164 ----
    void SetMuxAddress(const uint8_t mux[4], uint8_t bit0, uint8_t bit1, uint8_t bit2){
      if(mux[0]){
!       GPIO_SET_ALT_FUNC(mux[0],0, GPIO_OUT);
  	if(bit0==0){ 
! 	  CLEAR_GPIO(mux[0]);
  	}
  	else{  
! 	  SET_GPIO(mux[0]);
  	}
        }
        if(mux[1]){
! 	GPIO_SET_ALT_FUNC(mux[1],0, GPIO_OUT);
  	if(bit1==0){
! 	  CLEAR_GPIO(mux[1]);
  	} 
  	else {
! 	  SET_GPIO(mux[1]);
  	}
        }
        if(mux[2]){
! 	GPIO_SET_ALT_FUNC(mux[2], 0, GPIO_OUT);
  	if(bit2==0) {
! 	  CLEAR_GPIO(mux[2]);
  	}
  	else{
! 	  SET_GPIO(mux[2]);
  	}
        }
***************
*** 201,205 ****
        TOSH_MAKE_ADS1271_SYNC_OUTPUT();
        
!       _PXA_setaltfn(107,0,GPIO_IN);
        call TACHInterrupt.enable(TOSH_FALLING_EDGE);
        gTotalTachTime=0;
--- 201,205 ----
        TOSH_MAKE_ADS1271_SYNC_OUTPUT();
        
!       GPIO_SET_ALT_FUNC(107,0,GPIO_IN);
        call TACHInterrupt.enable(TOSH_FALLING_EDGE);
        gTotalTachTime=0;
***************
*** 368,373 ****
        TOSH_SET_MUX0_ACCEL_PWR_EN_PIN();
        
!       _PXA_setaltfn(85,0,GPIO_OUT);
!       _PXA_setgpio(85);
        TOSH_CLR_VCC3_SENSOR_EN_PIN();
        TOSH_SET_VCC5_SENSOR_EN_PIN();
--- 368,373 ----
        TOSH_SET_MUX0_ACCEL_PWR_EN_PIN();
        
!       GPIO_SET_ALT_FUNC(85,0,GPIO_OUT);
!       SET_GPIO(85);
        TOSH_CLR_VCC3_SENSOR_EN_PIN();
        TOSH_SET_VCC5_SENSOR_EN_PIN();
***************
*** 383,388 ****
        TOSH_SET_MUX0_ACCEL_PWR_EN_PIN();
        
!       _PXA_setaltfn(85,0,GPIO_OUT);
!       _PXA_setgpio(85);
        TOSH_CLR_VCC3_SENSOR_EN_PIN();
        TOSH_SET_VCC5_SENSOR_EN_PIN();
--- 383,388 ----
        TOSH_SET_MUX0_ACCEL_PWR_EN_PIN();
        
!       GPIO_SET_ALT_FUNC(85,0,GPIO_OUT);
!       SET_GPIO(85);
        TOSH_CLR_VCC3_SENSOR_EN_PIN();
        TOSH_SET_VCC5_SENSOR_EN_PIN();
***************
*** 400,405 ****
        TOSH_SET_MUX0_ACCEL_PWR_EN_PIN();
        
!       _PXA_setaltfn(85,0,GPIO_OUT);
!       _PXA_setgpio(85);
        TOSH_CLR_VCC3_SENSOR_EN_PIN();
        TOSH_SET_VCC5_SENSOR_EN_PIN();
--- 400,405 ----
        TOSH_SET_MUX0_ACCEL_PWR_EN_PIN();
        
!       GPIO_SET_ALT_FUNC(85,0,GPIO_OUT);
!       SET_GPIO(85);
        TOSH_CLR_VCC3_SENSOR_EN_PIN();
        TOSH_SET_VCC5_SENSOR_EN_PIN();