wifi: remove some more unused functions

src/energy/model/device-energy-model.h

@@ -62,13 +62,6 @@ public:
    */
   virtual void SetEnergySource (Ptr<EnergySource> source) = 0;
 
-  /**
-   * \returns Total energy consumption of the device.
-   *
-   * DeviceEnergyModel records its own energy consumption during simulation.
-   */
-  virtual double GetTotalEnergyConsumption (void) const = 0;
-
   /**
    * \param newState New state the device is in.
    *

src/energy/model/simple-device-energy-model.cc

@@ -81,13 +81,6 @@ SimpleDeviceEnergyModel::GetNode () const
   return m_node;
 }
 
-double
-SimpleDeviceEnergyModel::GetTotalEnergyConsumption (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_totalEnergyConsumption;
-}
-
 void
 SimpleDeviceEnergyModel::SetCurrentA (double current)
 {

src/energy/model/simple-device-energy-model.h

@@ -69,13 +69,6 @@ public:
    */
   virtual void SetEnergySource (Ptr<EnergySource> source);
 
-  /**
-   * \returns Total energy consumption of the vehicle.
-   *
-   * Implements DeviceEnergyModel::GetTotalEnergyConsumption.
-   */
-  virtual double GetTotalEnergyConsumption (void) const;
-
   /**
    * \param newState New state the device is in.
    *

src/wifi/model/ssid.cc

@@ -51,23 +51,6 @@ Ssid::Ssid (std::string s)
     }
 }
 
-Ssid::Ssid (char const ssid[32], uint8_t length)
-{
-  NS_ASSERT (length <= 32);
-  uint8_t len = 0;
-  while (len < length)
-    {
-      m_ssid[len] = ssid[len];
-      len++;
-    }
-  m_length = length;
-  while (len < 33)
-    {
-      m_ssid[len] = 0;
-      len++;
-    }
-}
-
 bool
 Ssid::IsEqual (const Ssid& o) const
 {

src/wifi/model/ssid.h

@@ -43,13 +43,6 @@ public:
    * \param s SSID in string
    */
   Ssid (std::string s);
-  /**
-   * Create SSID from a given array of char and given length.
-   *
-   * \param ssid
-   * \param length
-   */
-  Ssid (char const ssid[32], uint8_t length);
 
   /**
    * Check if the two SSIDs are equal.

src/wifi/model/wifi-mac-header.cc

@@ -323,12 +323,6 @@ WifiMacHeader::SetType (WifiMacType type)
   m_ctrlFromDs = 0;
 }
 
-void
-WifiMacHeader::SetRawDuration (uint16_t duration)
-{
-  m_duration = duration;
-}
-
 void
 WifiMacHeader::SetDuration (Time duration)
 {
@@ -416,24 +410,6 @@ void WifiMacHeader::SetQosAckPolicy (QosAckPolicy policy)
     }
 }
 
-void
-WifiMacHeader::SetQosNormalAck ()
-{
-  m_qosAckPolicy = 0;
-}
-
-void
-WifiMacHeader::SetQosBlockAck ()
-{
-  m_qosAckPolicy = 3;
-}
-
-void
-WifiMacHeader::SetQosNoAck ()
-{
-  m_qosAckPolicy = 1;
-}
-
 void WifiMacHeader::SetQosAmsdu (void)
 {
   m_amsduPresent = 1;
@@ -738,12 +714,6 @@ WifiMacHeader::IsBlockAck (void) const
   return (GetType () == WIFI_MAC_CTL_BACKRESP) ? true : false;
 }
 
-uint16_t
-WifiMacHeader::GetRawDuration (void) const
-{
-  return m_duration;
-}
-
 Time
 WifiMacHeader::GetDuration (void) const
 {
@@ -822,25 +792,6 @@ WifiMacHeader::GetQosTid (void) const
   return m_qosTid;
 }
 
-WifiMacHeader::QosAckPolicy
-WifiMacHeader::GetQosAckPolicy (void) const
-{
-  switch (m_qosAckPolicy)
-    {
-    case 0:
-      return NORMAL_ACK;
-    case 1:
-      return NO_ACK;
-    case 2:
-      return NO_EXPLICIT_ACK;
-    case 3:
-      return BLOCK_ACK;
-    }
-  // NOTREACHED
-  NS_ASSERT (false);
-  return (QosAckPolicy) - 1;
-}
-
 uint8_t
 WifiMacHeader::GetQosTxopLimit (void) const
 {
@@ -1043,9 +994,7 @@ WifiMacHeader::Print (std::ostream &os) const
          << ", RA=" << m_addr1;
       break;
     case WIFI_MAC_CTL_BACKREQ:
-      break;
     case WIFI_MAC_CTL_BACKRESP:
-      break;
     case WIFI_MAC_CTL_CTLWRAPPER:
       break;
     case WIFI_MAC_MGT_BEACON:

src/wifi/model/wifi-mac-header.h

@@ -204,12 +204,6 @@ public:
    * \param type the WifiMacType for the header
    */
   void SetType (WifiMacType type);
-  /**
-   * Set the Duration/ID field with the given raw uint16_t value.
-   *
-   * \param duration the raw duration in uint16_t
-   */
-  void SetRawDuration (uint16_t duration);
   /**
    * Set the Duration/ID field with the given duration (Time object).
    * The method converts the given time to microseconds.
@@ -271,18 +265,6 @@ public:
    * \param policy
    */
   void SetQosAckPolicy (QosAckPolicy policy);
-  /**
-   * Set the QoS ACK policy in the QoS control field to normal ACK.
-   */
-  void SetQosNormalAck (void);
-  /**
-   * Set the QoS ACK policy in the QoS control field to block ACK.
-   */
-  void SetQosBlockAck (void);
-  /**
-   * Set the QoS ACK policy in the QoS control field to no ACK.
-   */
-  void SetQosNoAck (void);
   /**
    * Set that A-MSDU is present.
    */
@@ -488,12 +470,6 @@ public:
    *         false otherwise
    */
   bool IsMultihopAction () const;
-  /**
-   * Return the raw duration from the Duration/ID field.
-   *
-   * \return the raw duration from the Duration/ID field
-   */
-  uint16_t GetRawDuration (void) const;
   /**
    * Return the duration from the Duration/ID field (Time object).
    *
@@ -567,12 +543,6 @@ public:
    * \return the Traffic ID of a QoS header
    */
   uint8_t GetQosTid (void) const;
-  /**
-   * Return the QoS ACK Policy of a QoS header.
-   *
-   * \return the QoS ACK Policy of a QoS header
-   */
-  QosAckPolicy GetQosAckPolicy (void) const;
   /**
    * Return the TXOP limit.
    *

src/wifi/model/wifi-radio-energy-model.cc

@@ -116,13 +116,6 @@ WifiRadioEnergyModel::SetEnergySource (const Ptr<EnergySource> source)
   m_source = source;
 }
 
-double
-WifiRadioEnergyModel::GetTotalEnergyConsumption (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_totalEnergyConsumption;
-}
-
 double
 WifiRadioEnergyModel::GetIdleCurrentA (void) const
 {

src/wifi/model/wifi-radio-energy-model.h

@@ -227,13 +227,6 @@ public:
    */
   void SetEnergySource (const Ptr<EnergySource> source);
 
-  /**
-   * \returns Total energy consumption of the wifi device.
-   *
-   * Implements DeviceEnergyModel::GetTotalEnergyConsumption.
-   */
-  double GetTotalEnergyConsumption (void) const;
-
   // Setter & getters for state power consumption.
   /**
    * \brief Gets idle current.