wifi: Rename functions in preamble-detection-test
authorSébastien Deronne <sebastien.deronne@gmail.com>
Tue, 04 Dec 2018 21:07:17 +0100
changeset 13883 1db024851228
parent 13882 ae1ca3005ef8
child 13884 2a74e177fb00
wifi: Rename functions in preamble-detection-test
src/wifi/test/preamble-detection-test.cc
--- a/src/wifi/test/preamble-detection-test.cc	Tue Dec 04 20:52:43 2018 +0100
+++ b/src/wifi/test/preamble-detection-test.cc	Tue Dec 04 21:07:17 2018 +0100
@@ -67,11 +67,11 @@
    * \param snr the SNR
    * \param txVector the transmit vector
    */
-  void SpectrumWifiPhyRxSuccess (Ptr<Packet> p, double snr, WifiTxVector txVector);
+  void RxSuccess (Ptr<Packet> p, double snr, WifiTxVector txVector);
   /**
    * Spectrum wifi receive failure function
    */
-  void SpectrumWifiPhyRxFailure (void);
+  void RxFailure (void);
   uint32_t m_countRxSuccess; ///< count RX success
   uint32_t m_countRxFailure; ///< count RX failure
 
@@ -147,14 +147,14 @@
 }
 
 void
-TestThresholdPreambleDetectionWithoutFrameCapture::SpectrumWifiPhyRxSuccess (Ptr<Packet> p, double snr, WifiTxVector txVector)
+TestThresholdPreambleDetectionWithoutFrameCapture::RxSuccess (Ptr<Packet> p, double snr, WifiTxVector txVector)
 {
   NS_LOG_FUNCTION (this << p << snr << txVector);
   m_countRxSuccess++;
 }
 
 void
-TestThresholdPreambleDetectionWithoutFrameCapture::SpectrumWifiPhyRxFailure (void)
+TestThresholdPreambleDetectionWithoutFrameCapture::RxFailure (void)
 {
   NS_LOG_FUNCTION (this);
   m_countRxFailure++;
@@ -173,8 +173,8 @@
   m_phy->SetErrorRateModel (error);
   m_phy->SetChannelNumber (CHANNEL_NUMBER);
   m_phy->SetFrequency (FREQUENCY);
-  m_phy->SetReceiveOkCallback (MakeCallback (&TestThresholdPreambleDetectionWithoutFrameCapture::SpectrumWifiPhyRxSuccess, this));
-  m_phy->SetReceiveErrorCallback (MakeCallback (&TestThresholdPreambleDetectionWithoutFrameCapture::SpectrumWifiPhyRxFailure, this));
+  m_phy->SetReceiveOkCallback (MakeCallback (&TestThresholdPreambleDetectionWithoutFrameCapture::RxSuccess, this));
+  m_phy->SetReceiveErrorCallback (MakeCallback (&TestThresholdPreambleDetectionWithoutFrameCapture::RxFailure, this));
 
   Ptr<ThresholdPreambleDetectionModel> preambleDetectionModel = CreateObject<ThresholdPreambleDetectionModel> ();
   m_phy->SetPreambleDetectionModel (preambleDetectionModel);