diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index ad44dd6f6..40491c84f 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -505,7 +505,7 @@ WifiPhy::GetTypeId (void) "Trace source indicating a packet " "has begun transmitting over the channel medium", MakeTraceSourceAccessor (&WifiPhy::m_phyTxBeginTrace), - "ns3::Packet::TracedCallback") + "ns3::WifiPhy::PhyTxBeginTracedCallback") .AddTraceSource ("PhyTxPsduBegin", "Trace source indicating a PSDU " "has begun transmitting over the channel medium", @@ -526,7 +526,7 @@ WifiPhy::GetTypeId (void) "has begun being received from the channel medium " "by the device", MakeTraceSourceAccessor (&WifiPhy::m_phyRxBeginTrace), - "ns3::Packet::TracedCallback") + "ns3::WifiPhy::PhyRxBeginTracedCallback") .AddTraceSource ("PhyRxPayloadBegin", "Trace source indicating the reception of the " "payload of a PPDU has begun", diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h index d786d321c..6dba65eb8 100644 --- a/src/wifi/model/wifi-phy.h +++ b/src/wifi/model/wifi-phy.h @@ -678,6 +678,14 @@ public: MpduInfo aMpdu, uint16_t staId); + /** + * TracedCallback signature for Phy transmit events. + * + * \param packet the packet being transmitted + * \param txPowerW the transmit power in Watts + */ + typedef void (* PhyTxBeginTracedCallback)(Ptr packet, double txPowerW); + /** * TracedCallback signature for PSDU transmit events. * @@ -687,6 +695,14 @@ public: */ typedef void (* PsduTxBeginCallback)(WifiConstPsduMap psduMap, WifiTxVector txVector, double txPowerW); + /** + * TracedCallback signature for PhyRxBegin trace source. + * + * \param packet the packet being received + * \param rxPowersW the receive power per channel band in Watts + */ + typedef void (* PhyRxBeginTracedCallback) (Ptr packet, RxPowerWattPerChannelBand rxPowersW); + /** * TracedCallback signature for start of PSDU reception events. *