From 2babf9f21eb3673ccc10af7e8a62e63995ae98c7 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 12 Nov 2014 10:40:02 -0800 Subject: [PATCH] rescan wifi bindings --- src/wifi/bindings/modulegen__gcc_ILP32.py | 28 ++++++++++++++++------- src/wifi/bindings/modulegen__gcc_LP64.py | 28 ++++++++++++++++------- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/wifi/bindings/modulegen__gcc_ILP32.py b/src/wifi/bindings/modulegen__gcc_ILP32.py index 544275c17..ce5bf8a54 100644 --- a/src/wifi/bindings/modulegen__gcc_ILP32.py +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py @@ -3503,8 +3503,6 @@ def register_Ns3RateInfo_methods(root_module, cls): cls.add_constructor([param('ns3::RateInfo const &', 'arg0')]) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::adjustedRetryCount [variable] cls.add_instance_attribute('adjustedRetryCount', 'uint32_t', is_const=False) - ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::attemptHist [variable] - cls.add_instance_attribute('attemptHist', 'uint64_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::ewmaProb [variable] cls.add_instance_attribute('ewmaProb', 'uint32_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::numRateAttempt [variable] @@ -3513,16 +3511,10 @@ def register_Ns3RateInfo_methods(root_module, cls): cls.add_instance_attribute('numRateSuccess', 'uint32_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::perfectTxTime [variable] cls.add_instance_attribute('perfectTxTime', 'ns3::Time', is_const=False) - ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::prevNumRateAttempt [variable] - cls.add_instance_attribute('prevNumRateAttempt', 'uint32_t', is_const=False) - ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::prevNumRateSuccess [variable] - cls.add_instance_attribute('prevNumRateSuccess', 'uint32_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::prob [variable] cls.add_instance_attribute('prob', 'uint32_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::retryCount [variable] cls.add_instance_attribute('retryCount', 'uint32_t', is_const=False) - ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::successHist [variable] - cls.add_instance_attribute('successHist', 'uint64_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::throughput [variable] cls.add_instance_attribute('throughput', 'uint32_t', is_const=False) return @@ -8145,6 +8137,11 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): cls.add_method('SetRtsCtsThreshold', 'void', [param('uint32_t', 'threshold')]) + ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetupMac(ns3::Ptr mac) [member function] + cls.add_method('SetupMac', + 'void', + [param('ns3::Ptr< ns3::WifiMac >', 'mac')], + is_virtual=True) ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetupPhy(ns3::Ptr phy) [member function] cls.add_method('SetupPhy', 'void', @@ -8165,6 +8162,11 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'uint32_t', [param('ns3::WifiRemoteStation const *', 'station')], is_const=True, visibility='protected') + ## wifi-remote-station-manager.h (module 'wifi'): ns3::Ptr ns3::WifiRemoteStationManager::GetMac() const [member function] + cls.add_method('GetMac', + 'ns3::Ptr< ns3::WifiMac >', + [], + is_const=True, visibility='protected') ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetMcsSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function] cls.add_method('GetMcsSupported', 'uint8_t', @@ -8190,6 +8192,11 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'uint32_t', [param('ns3::WifiRemoteStation const *', 'station')], is_const=True, visibility='protected') + ## wifi-remote-station-manager.h (module 'wifi'): ns3::Ptr ns3::WifiRemoteStationManager::GetPhy() const [member function] + cls.add_method('GetPhy', + 'ns3::Ptr< ns3::WifiPhy >', + [], + is_const=True, visibility='protected') ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetShortGuardInterval(ns3::WifiRemoteStation const * station) const [member function] cls.add_method('GetShortGuardInterval', 'bool', @@ -11428,6 +11435,11 @@ def register_Ns3MinstrelWifiManager_methods(root_module, cls): 'ns3::WifiTxVector', [param('ns3::WifiRemoteStation *', 'station')], visibility='private', is_virtual=True) + ## minstrel-wifi-manager.h (module 'wifi'): bool ns3::MinstrelWifiManager::DoNeedDataRetransmission(ns3::WifiRemoteStation * st, ns3::Ptr packet, bool normally) [member function] + cls.add_method('DoNeedDataRetransmission', + 'bool', + [param('ns3::WifiRemoteStation *', 'st'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], + visibility='private', is_virtual=True) ## minstrel-wifi-manager.h (module 'wifi'): void ns3::MinstrelWifiManager::DoReportDataFailed(ns3::WifiRemoteStation * station) [member function] cls.add_method('DoReportDataFailed', 'void', diff --git a/src/wifi/bindings/modulegen__gcc_LP64.py b/src/wifi/bindings/modulegen__gcc_LP64.py index 544275c17..ce5bf8a54 100644 --- a/src/wifi/bindings/modulegen__gcc_LP64.py +++ b/src/wifi/bindings/modulegen__gcc_LP64.py @@ -3503,8 +3503,6 @@ def register_Ns3RateInfo_methods(root_module, cls): cls.add_constructor([param('ns3::RateInfo const &', 'arg0')]) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::adjustedRetryCount [variable] cls.add_instance_attribute('adjustedRetryCount', 'uint32_t', is_const=False) - ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::attemptHist [variable] - cls.add_instance_attribute('attemptHist', 'uint64_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::ewmaProb [variable] cls.add_instance_attribute('ewmaProb', 'uint32_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::numRateAttempt [variable] @@ -3513,16 +3511,10 @@ def register_Ns3RateInfo_methods(root_module, cls): cls.add_instance_attribute('numRateSuccess', 'uint32_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::perfectTxTime [variable] cls.add_instance_attribute('perfectTxTime', 'ns3::Time', is_const=False) - ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::prevNumRateAttempt [variable] - cls.add_instance_attribute('prevNumRateAttempt', 'uint32_t', is_const=False) - ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::prevNumRateSuccess [variable] - cls.add_instance_attribute('prevNumRateSuccess', 'uint32_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::prob [variable] cls.add_instance_attribute('prob', 'uint32_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::retryCount [variable] cls.add_instance_attribute('retryCount', 'uint32_t', is_const=False) - ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::successHist [variable] - cls.add_instance_attribute('successHist', 'uint64_t', is_const=False) ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo::throughput [variable] cls.add_instance_attribute('throughput', 'uint32_t', is_const=False) return @@ -8145,6 +8137,11 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): cls.add_method('SetRtsCtsThreshold', 'void', [param('uint32_t', 'threshold')]) + ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetupMac(ns3::Ptr mac) [member function] + cls.add_method('SetupMac', + 'void', + [param('ns3::Ptr< ns3::WifiMac >', 'mac')], + is_virtual=True) ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetupPhy(ns3::Ptr phy) [member function] cls.add_method('SetupPhy', 'void', @@ -8165,6 +8162,11 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'uint32_t', [param('ns3::WifiRemoteStation const *', 'station')], is_const=True, visibility='protected') + ## wifi-remote-station-manager.h (module 'wifi'): ns3::Ptr ns3::WifiRemoteStationManager::GetMac() const [member function] + cls.add_method('GetMac', + 'ns3::Ptr< ns3::WifiMac >', + [], + is_const=True, visibility='protected') ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetMcsSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function] cls.add_method('GetMcsSupported', 'uint8_t', @@ -8190,6 +8192,11 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'uint32_t', [param('ns3::WifiRemoteStation const *', 'station')], is_const=True, visibility='protected') + ## wifi-remote-station-manager.h (module 'wifi'): ns3::Ptr ns3::WifiRemoteStationManager::GetPhy() const [member function] + cls.add_method('GetPhy', + 'ns3::Ptr< ns3::WifiPhy >', + [], + is_const=True, visibility='protected') ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetShortGuardInterval(ns3::WifiRemoteStation const * station) const [member function] cls.add_method('GetShortGuardInterval', 'bool', @@ -11428,6 +11435,11 @@ def register_Ns3MinstrelWifiManager_methods(root_module, cls): 'ns3::WifiTxVector', [param('ns3::WifiRemoteStation *', 'station')], visibility='private', is_virtual=True) + ## minstrel-wifi-manager.h (module 'wifi'): bool ns3::MinstrelWifiManager::DoNeedDataRetransmission(ns3::WifiRemoteStation * st, ns3::Ptr packet, bool normally) [member function] + cls.add_method('DoNeedDataRetransmission', + 'bool', + [param('ns3::WifiRemoteStation *', 'st'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], + visibility='private', is_virtual=True) ## minstrel-wifi-manager.h (module 'wifi'): void ns3::MinstrelWifiManager::DoReportDataFailed(ns3::WifiRemoteStation * station) [member function] cls.add_method('DoReportDataFailed', 'void',