--- a/src/lte/model/lte-ue-mac.cc	Wed Jul 18 00:35:39 2012 -0400
+++ b/src/lte/model/lte-ue-mac.cc	Thu Jul 19 13:02:41 2012 +0200
@@ -30,7 +30,7 @@
 #include "lte-ue-net-device.h"
 #include "lte-radio-bearer-tag.h"
 #include <ns3/ff-mac-common.h>
-#include <ns3/ideal-control-messages.h>
+#include <ns3/lte-control-messages.h>
 #include <ns3/simulator.h>
 #include <ns3/lte-common.h>
 
@@ -136,7 +136,7 @@
   // inherited from LtePhySapUser
   virtual void ReceivePhyPdu (Ptr<Packet> p);
   virtual void SubframeIndication (uint32_t frameNo, uint32_t subframeNo);
-  virtual void ReceiveIdealControlMessage (Ptr<IdealControlMessage> msg);
+  virtual void ReceiveLteControlMessage (Ptr<LteControlMessage> msg);
 
 private:
   LteUeMac* m_mac;
@@ -161,9 +161,9 @@
 }
 
 void
-UeMemberLteUePhySapUser::ReceiveIdealControlMessage (Ptr<IdealControlMessage> msg)
+UeMemberLteUePhySapUser::ReceiveLteControlMessage (Ptr<LteControlMessage> msg)
 {
-  m_mac->DoReceiveIdealControlMessage (msg);
+  m_mac->DoReceiveLteControlMessage (msg);
 }
 
 
@@ -310,9 +310,9 @@
   bsr.m_macCeValue.m_bufferStatus.push_back (BufferSizeLevelBsr::BufferSize2BsrId (0));
 
   // create the feedback to eNB
-  Ptr<BsrIdealControlMessage> msg = Create<BsrIdealControlMessage> ();
+  Ptr<BsrLteControlMessage> msg = Create<BsrLteControlMessage> ();
   msg->SetBsr (bsr);
-  m_uePhySapProvider->SendIdealControlMessage (msg);
+  m_uePhySapProvider->SendLteControlMessage (msg);
 
 }
 
@@ -345,6 +345,7 @@
   NS_LOG_FUNCTION (this << " txMode " << (uint8_t) params.m_transmissionMode);
   // forward info to PHY layer
   m_uePhySapProvider->SetTransmissionMode (params.m_transmissionMode);
+  m_uePhySapProvider->SetSrsConfigurationIndex (params.m_srsConfigurationIndex);
 }
 
 
@@ -364,12 +365,12 @@
 
 
 void
-LteUeMac::DoReceiveIdealControlMessage (Ptr<IdealControlMessage> msg)
+LteUeMac::DoReceiveLteControlMessage (Ptr<LteControlMessage> msg)
 {
   NS_LOG_FUNCTION (this);
-  if (msg->GetMessageType () == IdealControlMessage::UL_DCI)
+  if (msg->GetMessageType () == LteControlMessage::UL_DCI)
     {
-      Ptr<UlDciIdealControlMessage> msg2 = DynamicCast<UlDciIdealControlMessage> (msg);
+      Ptr<UlDciLteControlMessage> msg2 = DynamicCast<UlDciLteControlMessage> (msg);
       UlDciListElement_s dci = msg2->GetDci ();
       std::map <uint8_t, uint64_t>::iterator itBsr;
       NS_ASSERT_MSG (m_ulBsrReceived.size () <=4, " Too many LCs (max is 4)");
@@ -409,7 +410,7 @@
     }
   else
     {
-      NS_LOG_FUNCTION (this << " IdealControlMessage not recognized");
+      NS_LOG_FUNCTION (this << " LteControlMessage not recognized");
     }
 }