[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250/mac SpeckMacDP.nc, 1.3, 1.4 RedMacP.nc, 1.14, 1.15

[akoepke]

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

Modified Files:
	SpeckMacDP.nc RedMacP.nc 
Log Message:
bug: storeStrength did not do it in the right place


Index: SpeckMacDP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/SpeckMacDP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SpeckMacDP.nc	4 Oct 2007 09:42:03 -0000	1.3
--- SpeckMacDP.nc	4 Oct 2007 15:54:26 -0000	1.4
***************
*** 392,403 ****
      void storeStrength(message_t *m) {
          if(rssiValue != INVALID_SNR) {
!             (getMetadata(txBufPtr))->strength = rssiValue;
          }
          else {
              if(call RssiAdcResource.isOwner()) {
!                 (getMetadata(txBufPtr))->strength = call ChannelMonitorData.readSnr();
              }
              else {
!                 (getMetadata(txBufPtr))->strength = 1;
              }
          }
--- 392,403 ----
      void storeStrength(message_t *m) {
          if(rssiValue != INVALID_SNR) {
!             (getMetadata(m))->strength = rssiValue;
          }
          else {
              if(call RssiAdcResource.isOwner()) {
!                 (getMetadata(m))->strength = call ChannelMonitorData.readSnr();
              }
              else {
!                 (getMetadata(m))->strength = 1;
              }
          }

Index: RedMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/RedMacP.nc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** RedMacP.nc	1 Oct 2007 17:58:07 -0000	1.14
--- RedMacP.nc	4 Oct 2007 15:54:26 -0000	1.15
***************
*** 396,407 ****
      void storeStrength(message_t *m) {
          if(rssiValue != INVALID_SNR) {
!             (getMetadata(txBufPtr))->strength = rssiValue;
          }
          else {
              if(call RssiAdcResource.isOwner()) {
!                 (getMetadata(txBufPtr))->strength = call ChannelMonitorData.readSnr();
              }
              else {
!                 (getMetadata(txBufPtr))->strength = 1;
              }
          }
--- 396,407 ----
      void storeStrength(message_t *m) {
          if(rssiValue != INVALID_SNR) {
!             (getMetadata(m))->strength = rssiValue;
          }
          else {
              if(call RssiAdcResource.isOwner()) {
!                 (getMetadata(m))->strength = call ChannelMonitorData.readSnr();
              }
              else {
!                 (getMetadata(m))->strength = 1;
              }
          }