[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250/mac CsmaMacC.nc, 1.1.2.11, 1.1.2.12 CsmaMacP.nc, 1.1.2.12, 1.1.2.13

[Philipp Huppertz]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv966/chips/tda5250/mac

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CsmaMacC.nc CsmaMacP.nc 
Log Message:
- removed debug flags

Index: CsmaMacC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacC.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
*** CsmaMacC.nc	11 Oct 2006 15:48:30 -0000	1.1.2.11
--- CsmaMacC.nc	11 Oct 2006 20:02:03 -0000	1.1.2.12
***************
*** 36,40 ****
   */
  
!  #define MAC_DEBUG
  configuration CsmaMacC {
    provides {
--- 36,40 ----
   */
  
! // #define MAC_DEBUG
  configuration CsmaMacC {
    provides {

Index: CsmaMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacP.nc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** CsmaMacP.nc	11 Oct 2006 15:48:30 -0000	1.1.2.12
--- CsmaMacP.nc	11 Oct 2006 20:02:03 -0000	1.1.2.13
***************
*** 43,47 ****
  */
  
! #define MACM_DEBUG                 // debug...
  module CsmaMacP {
      provides {
--- 43,47 ----
  */
  
! // #define MACM_DEBUG                 // debug...
  module CsmaMacP {
      provides {
***************
*** 265,269 ****
      void requestAdc() {
          if(macState != INIT) {
!             call RssiAdcResource.immediateRequest();
          }
          else {
--- 265,269 ----
      void requestAdc() {
          if(macState != INIT) {
!           call RssiAdcResource.immediateRequest();
          }
          else {
***************
*** 642,647 ****
          error_t err = SUCCESS;
          atomic {
!             if((shortRetryCounter == 0) && (txBufPtr == NULL) && (macState != INIT)) {
!                 storeOldState(40);
                  shortRetryCounter = 1;
                  longRetryCounter = 1;
--- 642,647 ----
          error_t err = SUCCESS;
          atomic {
!             if((shortRetryCounter == 0) && (txBufPtr == NULL) && (macState != INIT)) { 
!               storeOldState(40);
                  shortRetryCounter = 1;
                  longRetryCounter = 1;
***************
*** 681,685 ****
      /****** PacketSerializer events **********************/
      async event void PacketReceive.receiveDetected() {
!         if(macState <= RX_ACK) {
              storeOldState(60);
              interruptBackoffTimer();
--- 681,685 ----
      /****** PacketSerializer events **********************/
      async event void PacketReceive.receiveDetected() {
!       if(macState <= RX_ACK) {
              storeOldState(60);
              interruptBackoffTimer();