[Tinyos-2-commits] CVS: tinyos-2.x/tos/sensorboards/im2sb MAX136xInternalC.nc, 1.1.2.4, 1.1.2.5 MAX136xInternalP.nc, 1.1.2.3, 1.1.2.4

[Philip Buonadonna]

Update of /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18959

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


Index: MAX136xInternalC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/MAX136xInternalC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** MAX136xInternalC.nc	7 Nov 2006 23:15:26 -0000	1.1.2.4
--- MAX136xInternalC.nc	14 Nov 2006 03:29:12 -0000	1.1.2.5
***************
*** 48,52 ****
  
    components new HplMAX136xLogicP(MAX136_SLAVE_ADDR) as Logic;
!   MainC.SoftwareInit -> Logic;
  
    components new HalPXA27xI2CMasterC(TRUE) as I2CC;
--- 48,56 ----
  
    components new HplMAX136xLogicP(MAX136_SLAVE_ADDR) as Logic;
!   //MainC.SoftwareInit -> Logic;
! 
!  components GeneralIOC;
!   Logic.InterruptAlert -> GeneralIOC.GpioInterrupt[GPIO_MAX1363_ANALOG_INT];
!   Logic.InterruptPin -> GeneralIOC.GeneralIO[GPIO_MAX1363_ANALOG_INT];
  
    components new HalPXA27xI2CMasterC(TRUE) as I2CC;
***************
*** 56,62 ****
    HplMAX136x = Internal.HplMAX136x;
    Internal.ToHPLC -> Logic.HplMAX136x;
! 
    SplitControl = Logic;
  
    components HplPXA27xGPIOC;
    I2CC.I2CSCL -> HplPXA27xGPIOC.HplPXA27xGPIOPin[I2C_SCL];
--- 60,69 ----
    HplMAX136x = Internal.HplMAX136x;
    Internal.ToHPLC -> Logic.HplMAX136x;
!   Internal.SubInit -> Logic.Init;
!   Internal.InterruptAlert -> GeneralIOC.GpioInterrupt[GPIO_MAX1363_ANALOG_INT];
!   MainC.SoftwareInit -> Internal.Init;
    SplitControl = Logic;
  
+  
    components HplPXA27xGPIOC;
    I2CC.I2CSCL -> HplPXA27xGPIOC.HplPXA27xGPIOPin[I2C_SCL];

Index: MAX136xInternalP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/MAX136xInternalP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** MAX136xInternalP.nc	7 Nov 2006 23:15:26 -0000	1.1.2.3
--- MAX136xInternalP.nc	14 Nov 2006 03:29:12 -0000	1.1.2.4
***************
*** 35,40 ****
--- 35,43 ----
   */
  module MAX136xInternalP {
+   provides interface Init;
    provides interface HplMAX136x[uint8_t id];
+   uses interface Init as SubInit;
    uses interface HplMAX136x as ToHPLC;
+   uses interface GpioInterrupt as InterruptAlert;
  }
  
***************
*** 42,45 ****
--- 45,56 ----
    uint8_t currentId;
  
+   command error_t Init.init() {
+     call SubInit.init();
+     // The Intel Mote 2 Sensorboard multiplexes the MAX136 interrupt through a NAND
+     // gate.  Need to override the edge trigger from the driver default
+     call InterruptAlert.enableRisingEdge();
+     return SUCCESS;
+   }
+ 
    command error_t HplMAX136x.measureChannels[uint8_t id](uint8_t *buf, uint8_t len) {
      currentId = id;
***************
*** 67,70 ****
--- 78,83 ----
    }
  
+   async event void InterruptAlert.fired() {}
+ 
    default async event void HplMAX136x.measureChannelsDone[uint8_t id]( error_t error, uint8_t *buf, uint8_t len ) {}
    default async event void HplMAX136x.setConfigDone[uint8_t id]( error_t error , uint8_t *cfgbuf, uint8_t len) {}