[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge DelugeM.nc, 1.23, 1.24

[Jonathan Hui]

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

Modified Files:
	DelugeM.nc 
Log Message:
- Switch to using int instead of uint8_t for index variables. Reduces
code size by about 40 bytes.



Index: DelugeM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeM.nc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** DelugeM.nc	29 Jun 2005 21:08:12 -0000	1.23
--- DelugeM.nc	11 Jul 2005 21:28:11 -0000	1.24
***************
*** 69,76 ****
    uint8_t rebootDelay;
  
!   uint8_t findMinTimer() {
  
!     uint8_t  minTimer = 0;
!     uint8_t  i;
  
      for ( i = 1; i < DELUGE_NUM_TIMERS; i++ ) {
--- 69,76 ----
    uint8_t rebootDelay;
  
!   int findMinTimer() {
  
!     int minTimer = 0;
!     int i;
  
      for ( i = 1; i < DELUGE_NUM_TIMERS; i++ ) {
***************
*** 83,89 ****
    }
  
!   void setupAdvTimer(uint8_t timerNum) {
  
!     uint8_t minTimer;
  
      advTimers[timerNum].timer = (uint32_t)0x1 << (advTimers[timerNum].periodLog2-1);
--- 83,89 ----
    }
  
!   void setupAdvTimer(int timerNum) {
  
!     int minTimer;
  
      advTimers[timerNum].timer = (uint32_t)0x1 << (advTimers[timerNum].periodLog2-1);
***************
*** 98,103 ****
    }
  
!   void updateTimers(uint8_t minTimer) {
!     uint8_t i;
      for ( i = 0; i < DELUGE_NUM_TIMERS; i++ ) {
        if ((advTimers[i].timer - 2) >= advTimers[minTimer].timer)
--- 98,103 ----
    }
  
!   void updateTimers(int minTimer) {
!     int i;
      for ( i = 0; i < DELUGE_NUM_TIMERS; i++ ) {
        if ((advTimers[i].timer - 2) >= advTimers[minTimer].timer)
***************
*** 106,110 ****
    }
  
!   void resetTimer(uint8_t i) {
      if (advTimers[i].periodLog2 != DELUGE_MIN_ADV_PERIOD_LOG2) {
        advTimers[i].periodLog2 = DELUGE_MIN_ADV_PERIOD_LOG2;
--- 106,110 ----
    }
  
!   void resetTimer(int i) {
      if (advTimers[i].periodLog2 != DELUGE_MIN_ADV_PERIOD_LOG2) {
        advTimers[i].periodLog2 = DELUGE_MIN_ADV_PERIOD_LOG2;
***************
*** 116,120 ****
  
      DelugeImgDesc *imgDesc;
!     uint8_t i;
  
      for ( i = 0; i < DELUGE_NUM_IMAGES; i++ ) {
--- 116,120 ----
  
      DelugeImgDesc *imgDesc;
!     int i;
  
      for ( i = 0; i < DELUGE_NUM_IMAGES; i++ ) {
***************
*** 153,157 ****
  
      result_t result;
!     uint8_t i;
  
      result = call PageTransferControl.start();
--- 153,157 ----
  
      result_t result;
!     int i;
  
      result = call PageTransferControl.start();
***************
*** 193,197 ****
    }
  
!   void sendAdvMsg(uint8_t imgNum, uint16_t addr) {
  
      TOS_MsgPtr pMsgBuf = call SharedMsgBuf.getMsgBuf();
--- 193,197 ----
    }
  
!   void sendAdvMsg(int imgNum, uint16_t addr) {
  
      TOS_MsgPtr pMsgBuf = call SharedMsgBuf.getMsgBuf();
***************
*** 217,221 ****
    event result_t Timer.fired() {
  
!     uint8_t minTimer = findMinTimer();
  
      updateTimers(minTimer);
--- 217,221 ----
    event result_t Timer.fired() {
  
!     int minTimer = findMinTimer();
  
      updateTimers(minTimer);