[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/serial SerialActiveMessageP.nc, 1.1.2.11, 1.1.2.12 SerialP.nc, 1.1.2.13, 1.1.2.14

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/serial
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9855/lib/serial

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	SerialActiveMessageP.nc SerialP.nc 
Log Message:
Remove statistics collection.


Index: SerialActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/serial/SerialActiveMessageP.nc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** SerialActiveMessageP.nc	4 Aug 2006 00:34:18 -0000	1.1.2.11
--- SerialActiveMessageP.nc	17 Oct 2006 18:17:20 -0000	1.1.2.12
***************
*** 146,150 ****
      header->dest = addr;
    }
!   
    command void AMPacket.setSource(message_t* amsg, am_addr_t addr) {
      serial_header_t* header = getHeader(amsg);
--- 146,150 ----
      header->dest = addr;
    }
! 
    command void AMPacket.setSource(message_t* amsg, am_addr_t addr) {
      serial_header_t* header = getHeader(amsg);

Index: SerialP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/serial/SerialP.nc,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** SerialP.nc	17 Aug 2006 17:19:25 -0000	1.1.2.13
--- SerialP.nc	17 Oct 2006 18:17:20 -0000	1.1.2.14
***************
*** 34,38 ****
   *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   * 
-  * Author: Phil Buonadonna
   * Revision: $Revision$
   * 
--- 34,37 ----
***************
*** 163,169 ****
    ack_queue_t ackQ;
  
-   /* stats */
-   radio_stats_t stats;
- 
    bool offPending = FALSE;
  
--- 162,165 ----
***************
*** 173,177 ****
    inline void rxInit();
    inline void ackInit();
-   inline void statsInit();
  
    inline bool ack_queue_is_full(); 
--- 169,172 ----
***************
*** 220,230 ****
    }
  
-   inline void statsInit(){
-     memset(&stats, 0, sizeof(stats));
-     stats.platform = 0; // TODO: set platform
-     stats.MTU = SERIAL_MTU;
-     stats.version = SERIAL_VERSION;
-   }
-   
    command error_t Init.init() {
  
--- 215,218 ----
***************
*** 232,236 ****
      rxInit();
      ackInit();
-     statsInit();
  
      return SUCCESS;
--- 220,223 ----
***************
*** 430,434 ****
      case RXSTATE_TOKEN:
        if (isDelimeter) {
-         stats.serial_short_packets++;
          goto nosync;
        }
--- 417,420 ----
***************
*** 450,459 ****
              }
              else {
-               stats.serial_crc_fail++;
                goto nosync;
              }
            }
            else {
-             stats.serial_short_packets++;
              goto nosync;
            }
--- 436,443 ----
***************
*** 471,475 ****
        /* no valid message.. */
        else {
-         stats.serial_proto_drops++;
          goto nosync;
         }
--- 455,458 ----
***************
*** 571,575 ****
      /* if done, call the send done */
      if (done || fail) {
-       if (fail) atomic stats.serial_tx_fail++;
        txSeqno++;
        if (txProto == SERIAL_PROTO_ACK){
--- 554,557 ----