[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/tsb MicDriverC.nc, 1.1, 1.2 MicDriverM.nc, 1.1, 1.2

[Joe Polastre]

Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/tsb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20870

Modified Files:
	MicDriverC.nc MicDriverM.nc 
Log Message:
updated microphone drivers for tsb, minor bug fixes


Index: MicDriverC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/tsb/MicDriverC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MicDriverC.nc	24 Jun 2005 00:14:44 -0000	1.1
--- MicDriverC.nc	17 Jul 2005 20:53:50 -0000	1.2
***************
*** 50,56 ****
    Mic = ADCC.ADC[TOS_ADC_MIC_PORT];
    MicInterrupt = MicDriverM;
!   MicInterruptSettings = MicDriverM;
!   Vrc = MicDriverM;
!   Vrg = MicDriverM;
  
    MicDriverM.ADCStdControl -> ADCC;
--- 50,56 ----
    Mic = ADCC.ADC[TOS_ADC_MIC_PORT];
    MicInterrupt = MicDriverM;
!   MicInterruptSettings = MicDriverM.MicInterruptSettings;
!   Vrc = MicDriverM.Vrc;
!   Vrg = MicDriverM.Vrg;
  
    MicDriverM.ADCStdControl -> ADCC;

Index: MicDriverM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/tsb/MicDriverM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MicDriverM.nc	24 Jun 2005 00:14:44 -0000	1.1
--- MicDriverM.nc	17 Jul 2005 20:53:50 -0000	1.2
***************
*** 34,39 ****
      interface SplitControl;
      interface TSBInterrupt as MicInterrupt;
!     interface Potentiometer as MicVrc;
!     interface Potentiometer as MicVrg;
      interface Potentiometer as MicInterruptSettings;
    }
--- 34,39 ----
      interface SplitControl;
      interface TSBInterrupt as MicInterrupt;
!     interface Potentiometer as Vrc;
!     interface Potentiometer as Vrg;
      interface Potentiometer as MicInterruptSettings;
    }
***************
*** 55,59 ****
      OFF = 0,
      IDLE,
!     START,
      START_O1, // mic circuit power on
      START_O2, // filter circuit power on
--- 55,60 ----
      OFF = 0,
      IDLE,
!     START1,
!     START2,
      START_O1, // mic circuit power on
      START_O2, // filter circuit power on
***************
*** 88,96 ****
      atomic {
        if (state == OFF) {
! 	state = START;
  	_state = state;
        }
      }
!     if (_state == START) {
        call ADCStdControl.start();
        call ADCControl.init();
--- 89,97 ----
      atomic {
        if (state == OFF) {
! 	state = START1;
  	_state = state;
        }
      }
!     if (_state == START1) {
        call ADCStdControl.start();
        call ADCControl.init();
***************
*** 100,106 ****
  	return FAIL;
        }
        TOSH_SEL_ADC2_MODFUNC();
        call AD5242Control.start();
!       return call AD5242.start(AD5242_MIC_PWR_ADDR);
      }
      return FAIL;
--- 101,108 ----
  	return FAIL;
        }
+       TOSH_MAKE_ADC2_INPUT();
        TOSH_SEL_ADC2_MODFUNC();
        call AD5242Control.start();
!       return call AD5242.start(AD5242_MIC1_ADDR);
      }
      return FAIL;
***************
*** 110,120 ****
      uint8_t _state = OFF;
      atomic {
!       if (state == START) {
  	state = START_O1;
! 	_state = state;
        }
      }
      // turn on the microphone circuit
!     if (_state == START_O1) {
        if (!(call AD5242.setOutput1(AD5242_MIC_PWR_ADDR, TRUE))) {
  	atomic state = IDLE;
--- 112,131 ----
      uint8_t _state = OFF;
      atomic {
!       if (state == START1) {
! 	state = START2;
!       }
!       else if (state == START2) {
  	state = START_O1;
!       }
!       _state = state;
!     }
!     if (_state == START2) {
!       if (!(call AD5242.start(AD5242_MIC2_ADDR))) {
! 	atomic state = IDLE;
! 	signal SplitControl.startDone();
        }
      }
      // turn on the microphone circuit
!     else if (_state == START_O1) {
        if (!(call AD5242.setOutput1(AD5242_MIC_PWR_ADDR, TRUE))) {
  	atomic state = IDLE;
***************
*** 187,190 ****
--- 198,203 ----
  
    event void AD5242.setOutput2Done(uint8_t _addr, result_t _result) { 
+     uint8_t _state = OFF;
+ 
      atomic {
        if ((state == START_O2) || (state == STOP_O2)) {
***************
*** 202,205 ****
--- 215,220 ----
  
    event void AD5242.setPot1Done(uint8_t _addr, result_t _result) { 
+     uint8_t _state = OFF;
+ 
      atomic {
        if (state == VRC) {