[Contiki-commits] contiki-2.x/core/sys energest.h, 1.1, 1.2 energest.c, 1.1, 1.2

[Joakim E. <jo...@us...>]

Update of /cvsroot/contiki/contiki-2.x/core/sys
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9100

Modified Files:
	energest.h energest.c 
Log Message:
fixed energest to always add positive values and to use all bits, removed energest arch

Index: energest.h
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/sys/energest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** energest.h	3 Jul 2008 23:36:30 -0000	1.1
--- energest.h	29 Sep 2008 11:44:37 -0000	1.2
***************
*** 58,66 ****
    ENERGEST_TYPE_TRANSMIT,
    ENERGEST_TYPE_LISTEN,
!   
    ENERGEST_TYPE_SENSORS,
  
    ENERGEST_TYPE_SERIAL,
!   
    ENERGEST_TYPE_MAX
  };
--- 58,66 ----
    ENERGEST_TYPE_TRANSMIT,
    ENERGEST_TYPE_LISTEN,
! 
    ENERGEST_TYPE_SENSORS,
  
    ENERGEST_TYPE_SERIAL,
! 
    ENERGEST_TYPE_MAX
  };
***************
*** 77,81 ****
  /*extern int energest_total_count;*/
  extern energest_t energest_total_time[ENERGEST_TYPE_MAX];
! extern unsigned short energest_current_time[ENERGEST_TYPE_MAX];
  extern unsigned char energest_current_mode[ENERGEST_TYPE_MAX];
  
--- 77,81 ----
  /*extern int energest_total_count;*/
  extern energest_t energest_total_time[ENERGEST_TYPE_MAX];
! extern rtimer_clock_t energest_current_time[ENERGEST_TYPE_MAX];
  extern unsigned char energest_current_mode[ENERGEST_TYPE_MAX];
  
***************
*** 91,104 ****
  
  #define ENERGEST_OFF(type) do { \
!                            energest_total_time[type].current += (unsigned long)((signed short)RTIMER_NOW() - \
!                            (signed short)energest_current_time[type]); \
  			   energest_current_mode[type] = 0; \
!                            } while(0) 
  
  #define ENERGEST_OFF_LEVEL(type,level) do { \
!                                         energest_leveldevice_current_leveltime[level].current += (unsigned long)((signed short)RTIMER_NOW() - \
! 			                (signed short)energest_current_time[type]); \
  			   energest_current_mode[type] = 0; \
!                                         } while(0) 
  
  
--- 91,104 ----
  
  #define ENERGEST_OFF(type) do { \
!                            energest_total_time[type].current += (rtimer_clock_t)(RTIMER_NOW() - \
!                            energest_current_time[type]); \
  			   energest_current_mode[type] = 0; \
!                            } while(0)
  
  #define ENERGEST_OFF_LEVEL(type,level) do { \
!                                         energest_leveldevice_current_leveltime[level].current += (rtimer_clock_t)(RTIMER_NOW() - \
! 			                energest_current_time[type]); \
  			   energest_current_mode[type] = 0; \
!                                         } while(0)
  
  
***************
*** 109,116 ****
  #endif /* ENERGEST_CONF_ON */
  
- #define ENERGEST_SECOND RTIMER_ARCH_SECOND
- 
- unsigned long energest_arch_current_estimate(void);
- unsigned short energest_arch_now(void);
- 
  #endif /* __ENERGEST_H__ */
--- 109,111 ----

Index: energest.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/sys/energest.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** energest.c	3 Jul 2008 23:36:30 -0000	1.1
--- energest.c	29 Sep 2008 11:44:37 -0000	1.2
***************
*** 46,50 ****
  int energest_total_count;
  energest_t energest_total_time[ENERGEST_TYPE_MAX];
! unsigned short energest_current_time[ENERGEST_TYPE_MAX];
  #ifdef ENERGEST_CONF_LEVELDEVICE_LEVELS
  energest_t energest_leveldevice_current_leveltime[ENERGEST_CONF_LEVELDEVICE_LEVELS];
--- 46,50 ----
  int energest_total_count;
  energest_t energest_total_time[ENERGEST_TYPE_MAX];
! rtimer_clock_t energest_current_time[ENERGEST_TYPE_MAX];
  #ifdef ENERGEST_CONF_LEVELDEVICE_LEVELS
  energest_t energest_leveldevice_current_leveltime[ENERGEST_CONF_LEVELDEVICE_LEVELS];
***************
*** 75,80 ****
    if(energest_current_mode[type]) {
      rtimer_clock_t now = RTIMER_NOW();
!     energest_total_time[type].current += (unsigned long)
!       ((signed short)now - (signed short)energest_current_time[type]);
      energest_current_time[type] = now;
    }
--- 75,80 ----
    if(energest_current_mode[type]) {
      rtimer_clock_t now = RTIMER_NOW();
!     energest_total_time[type].current += (rtimer_clock_t)
!       (now - energest_current_time[type]);
      energest_current_time[type] = now;
    }
***************
*** 108,113 ****
      if(energest_current_mode[i]) {
        now = RTIMER_NOW();
!       energest_total_time[i].current += (unsigned long)
! 	((signed short)now - (signed short)energest_current_time[i]);
        energest_current_time[i] = now;
      }
--- 108,113 ----
      if(energest_current_mode[i]) {
        now = RTIMER_NOW();
!       energest_total_time[i].current += (rtimer_clock_t)
! 	(now - energest_current_time[i]);
        energest_current_time[i] = now;
      }