--- a/hotspotfw/hsserver/inc/hssscanoffsets.h	Wed Feb 03 12:16:50 2010 +0000
+++ b/hotspotfw/hsserver/inc/hssscanoffsets.h	Fri Feb 19 23:55:42 2010 +0200
@@ -20,44 +20,36 @@
 #ifndef HSSSCANOFFSETS_H
 #define HSSSCANOFFSETS_H
 
-#include "802dot11.h"
+
+/** Offset for RCPI value. */
+const TUint32 RX_LEVEL_OFFSET         = 0;   
 
-// Offsets for the static header.
-const TUint32 RX_LEVEL_OFFSET         = 0;                                                // 0
-const TUint32 RX_SNR_OFFSET           = RX_LEVEL_OFFSET + sizeof(TUint32);                // 4
+/** Offset for SNR value. Deprecated. */
+const TUint32 RX_SNR_OFFSET           = 4;                
 
-// Offsets for scan results.
-const TUint32 LENGTH_OFFSET           = RX_SNR_OFFSET + sizeof(TUint32);                  // 8
+/** Offset for beacon/probe response frame data length. */
+const TUint32 LENGTH_OFFSET           = 8;                  
 
-// length of the control information proceeding the DOT11 header (DOT11_BASE_OFFSET)
+/** Length of the control information header. */
 const TUint32 CNTRL_HEADER_LEN        = 12;
 
+/** Start of beacon/probe response frame data. */
 const TUint32 DOT11_BASE_OFFSET       = CNTRL_HEADER_LEN;
-// start of BSSID
+
+/** Start of BSSID field (6 octets ). */
 const TUint32 BSSID_OFFSET            = DOT11_BASE_OFFSET + 16;           
-// start of first IE in beacon of the probe response
-const TUint32 BODY_OFFSET             = DOT11_BASE_OFFSET + sizeof(SManagementFrameHeader)
-                                        + KTimeStampFixedFieldLength
-                                        + KBeaconIntervalFixedFieldLength
-                                        + KCapabilityInformationFixedFieldLength;
 
-const TUint32 BEACON_INTERVAL_OFFSET  = DOT11_BASE_OFFSET 
-                                        + sizeof(SManagementFrameHeader)
-                                        + KTimeStampFixedFieldLength;
-const TUint32 CAPABILITY_OFFSET       = BEACON_INTERVAL_OFFSET + KBeaconIntervalFixedFieldLength;
+/** Start of Timestamp field (8 octets). */
+const TUint32 TIMESTAMP_OFFSET        = DOT11_BASE_OFFSET + 24;
 
-// start of timestamp field
-const TUint32 TIMESTAMP_OFFSET        = DOT11_BASE_OFFSET + sizeof(SManagementFrameHeader);
+/** Start of Beacon Interval field (2 octets). */
+const TUint32 BEACON_INTERVAL_OFFSET  = DOT11_BASE_OFFSET + 32;
+
+/** Start of Capability field (2 octets). */
+const TUint32 CAPABILITY_OFFSET       = DOT11_BASE_OFFSET + 34;
 
-// Offsets for the static header.
-const TUint16 x30RX_LEVEL_OFFSET         = 13;
-const TUint16 x30RX_SNR_OFFSET           = 12;
-//const TUint16 FRAME_CNTRL_OFFSET      = 12;
-const TUint16 x30BSSID_OFFSET            = 0;
-const TUint16 x30BEACON_INTERVAL_OFFSET  = 52;
-const TUint16 x30CAPABILITY_OFFSET       = 54;
-const TUint16 x30STATUS_INFO_LENGTH      = 12;
-// Offsets for scan results.
-const TUint16 x30LENGTH_OFFSET           = 62;
-const TUint16 x30BODY_OFFSET             = 64 + x30STATUS_INFO_LENGTH;
+/** Start of first IE in beacon/probe response frame. */
+const TUint32 BODY_OFFSET             = DOT11_BASE_OFFSET + 36;
+
+
 #endif // HSSSCANOFFSETS_H