[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/mac/tkn154 ScanP.nc, 1.5, 1.6

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26111/tos/lib/mac/tkn154

Modified Files:
	ScanP.nc 
Log Message:
fix by Daniel Santos: for an orphan scan the buffers may be empty

Index: ScanP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/ScanP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ScanP.nc	17 Apr 2009 14:47:09 -0000	1.5
--- ScanP.nc	24 Apr 2009 16:44:55 -0000	1.6
***************
*** 135,142 ****
            (ChannelPage != IEEE154_SUPPORTED_CHANNELPAGE) ||
            !(supportedChannels & ScanChannels) ||
!           (EnergyDetectListNumEntries && PANDescriptorListNumEntries) ||
            (EnergyDetectList != NULL && PANDescriptorList != NULL) ||
            (EnergyDetectListNumEntries && EnergyDetectList == NULL) ||
!           (PANDescriptorListNumEntries && PANDescriptorList == NULL)) {
        status = IEEE154_INVALID_PARAMETER;
      } else if (ScanType != ENERGY_DETECTION_SCAN &&
--- 135,143 ----
            (ChannelPage != IEEE154_SUPPORTED_CHANNELPAGE) ||
            !(supportedChannels & ScanChannels) ||
!           ((ScanType != ORPHAN_SCAN) &&
!           ((EnergyDetectListNumEntries && PANDescriptorListNumEntries) ||
            (EnergyDetectList != NULL && PANDescriptorList != NULL) ||
            (EnergyDetectListNumEntries && EnergyDetectList == NULL) ||
!           (PANDescriptorListNumEntries && PANDescriptorList == NULL)))) {
        status = IEEE154_INVALID_PARAMETER;
      } else if (ScanType != ENERGY_DETECTION_SCAN &&