Permalink
Browse files

Ieee80211: bitrate now has an (opMode dependent) default value.

  • Loading branch information...
1 parent c55b625 commit 4518f7eb3cff161ef268d0f250eeb21ea8f363cc @rhornig rhornig committed Aug 7, 2012
Showing with 16 additions and 9 deletions.
  1. +5 −3 WHATSNEW
  2. +9 −2 src/linklayer/ieee80211/ChangeLog
  3. +2 −4 src/linklayer/ieee80211/Ieee80211Nic.ned
View
@@ -1,7 +1,7 @@
Recent changes in the INET Framework
====================================
-INET-2.0.0 (Aug 3, 2012)
+INET-2.0.0 (Aug 7, 2012)
------------------------
This is the latest stable version of the INET framework. This version
@@ -24,8 +24,10 @@ Ieee80211:
speed values for 11MBps and 12MBps were swapped.
- A new "bitrate" parameter was added to the Ieee80211Nic module.
The Radio and MAC module uses this bitrate to set thir own bitrate
- value. This can avoid potential configuration inconsitencies.
- UPDATE all your INI files according to this.
+ value. Its default value is 11Mbps for 802.11b, 27Mbps for 802.11p
+ and 54Mbps for 802.11g and 802.11a. (i.e. the default bitrate depends
+ on the opMode parameter) This can avoid potential configuration
+ inconsitencies. UPDATE all your INI files accordingly.
The Ethernet module now throws an error message if two ethernet ports are
connected using an IdealChannel. Previously it just silently ignored the
@@ -1,7 +1,14 @@
+2012-08-04 Rudolf Hornig
+
+ The "bitrate" parameter now has a default value: it is
+ 11Mbps for 802.11b, 27Mbps for 802.11p and 54Mbps for
+ 802.11g and 802.11a. (i.e. the default bitrate depends
+ on the opMode parameter)
+
2012-08-02 Zoltan Bojthe
- Added new bitrate parameter to NIC. The Radio and MAC uses
- this parameter to set their own bitrate parameters.
+ Added new bitrate parameter to NIC. The Radio and MAC uses
+ this parameter to set their own bitrate parameters.
2012-07-19 Zoltan Bojthe
@@ -29,9 +29,7 @@ import inet.linklayer.ieee80211.radio.Ieee80211Radio;
//
// This NIC implements an 802.11 network interface card.
// It can be configured via the mgmtType parameter to act
-// as an AP or a STA, or for ad-hoc mode. By default it is
-// configured for a simplified station mode (no channel scanning
-// association, authentication etc.)
+// as an AP or a STA, or for ad-hoc mode.
//
// Potential mgmType values: Ieee80211MgmtSTASimplified, Ieee80211MgmtSTA
// Ieee80211MgmtAP, Ieee80211MgmtAPSimplified, Ieee80211MgmtAdhoc
@@ -41,7 +39,7 @@ module Ieee80211Nic like IWirelessNic
parameters:
string mgmtType = default("Ieee80211MgmtSTA"); // name of the management module type (implements IIeee80211Mgmt)
string opMode @enum("b","g","a","p") = default("g");
- double bitrate @unit("bps");
+ double bitrate @unit("bps") = default(opMode == "b" ? 11Mbps : opMode == "p" ? 27Mbps : 54Mbps);
int numOutputHooks = default(0);
int numInputHooks = default(0);
bool _agentNeeded = (mgmtType == "Ieee80211MgmtSTA"); // internal par. do not use, shows if optional agent module is needed

0 comments on commit 4518f7e

Please sign in to comment.