Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ | 1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari | 3 * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari |
4 * Copyright (c) 2015 Danilo Abrignani· | |
4 * | 5 * |
5 * This program is free software; you can redistribute it and/or modify | 6 * This program is free software; you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 2 as | 7 * it under the terms of the GNU General Public License version 2 as |
7 * published by the Free Software Foundation; | 8 * published by the Free Software Foundation; |
8 * | 9 * |
9 * This program is distributed in the hope that it will be useful, | 10 * This program is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 13 * GNU General Public License for more details. |
13 * | 14 * |
14 * You should have received a copy of the GNU General Public License | 15 * You should have received a copy of the GNU General Public License |
15 * along with this program; if not, write to the Free Software | 16 * along with this program; if not, write to the Free Software |
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 * | 18 * |
18 * Author: Giuseppe Piro <g.piro@poliba.it> | 19 * Author: Giuseppe Piro <g.piro@poliba.it> |
19 * Nicola Baldo <nbaldo@cttc.es> | 20 * Nicola Baldo <nbaldo@cttc.es> |
21 * Danilo Abrignani <danilo.abrignani@unibo.it> - Carrier Aggregation GS oC 2015 | |
20 */ | 22 */ |
21 | 23 |
22 #ifndef LTE_UE_NET_DEVICE_H | 24 #ifndef LTE_UE_NET_DEVICE_H |
23 #define LTE_UE_NET_DEVICE_H | 25 #define LTE_UE_NET_DEVICE_H |
24 | 26 |
25 #include "ns3/lte-net-device.h" | 27 #include "ns3/lte-net-device.h" |
26 #include "ns3/event-id.h" | 28 #include "ns3/event-id.h" |
27 #include "ns3/mac48-address.h" | 29 #include "ns3/mac48-address.h" |
28 #include "ns3/traced-callback.h" | 30 #include "ns3/traced-callback.h" |
29 #include "ns3/nstime.h" | 31 #include "ns3/nstime.h" |
30 #include "ns3/lte-phy.h" | 32 #include "ns3/lte-phy.h" |
31 #include "ns3/eps-bearer.h" | 33 #include "ns3/eps-bearer.h" |
34 #include "ns3/component-carrier-ue.h" | |
35 #include <vector> | |
gawlowicz.p
2015/07/05 00:25:09
I think it is not needed here?
dabrignani
2015/07/05 11:12:49
I will check, in case, I will remove that.
| |
32 | 36 |
37 #include <map> | |
33 | 38 |
34 namespace ns3 { | 39 namespace ns3 { |
35 | 40 |
36 class Packet; | 41 class Packet; |
37 class PacketBurst; | 42 class PacketBurst; |
38 class Node; | 43 class Node; |
39 class LtePhy; | 44 class LtePhy; |
40 class LteUePhy; | 45 class LteUePhy; |
41 class LteEnbNetDevice; | 46 class LteEnbNetDevice; |
42 class LteUeMac; | 47 class LteUeMac; |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
113 * \param enb | 118 * \param enb |
114 */ | 119 */ |
115 void SetTargetEnb (Ptr<LteEnbNetDevice> enb); | 120 void SetTargetEnb (Ptr<LteEnbNetDevice> enb); |
116 | 121 |
117 /** | 122 /** |
118 * \brief Get the targer eNB where the UE is registered | 123 * \brief Get the targer eNB where the UE is registered |
119 * \return the pointer to the enb | 124 * \return the pointer to the enb |
120 */ | 125 */ |
121 Ptr<LteEnbNetDevice> GetTargetEnb (void); | 126 Ptr<LteEnbNetDevice> GetTargetEnb (void); |
122 | 127 |
128 void SetCcMap (std::map< uint8_t, Ptr<ComponentCarrierUe> > ccm); | |
129 | |
130 std::map< uint8_t, Ptr<ComponentCarrierUe> > GetCcMap (void); | |
131 | |
132 | |
123 | 133 |
124 protected: | 134 protected: |
125 // inherited from Object | 135 // inherited from Object |
126 virtual void DoInitialize (void); | 136 virtual void DoInitialize (void); |
127 | 137 |
128 | 138 |
129 private: | 139 private: |
130 bool m_isConstructed; | 140 bool m_isConstructed; |
131 | 141 |
132 /** | 142 /** |
(...skipping 13 matching lines...) Expand all Loading... | |
146 Ptr<LteUePhy> m_phy; | 156 Ptr<LteUePhy> m_phy; |
147 Ptr<LteUeRrc> m_rrc; | 157 Ptr<LteUeRrc> m_rrc; |
148 Ptr<EpcUeNas> m_nas; | 158 Ptr<EpcUeNas> m_nas; |
149 | 159 |
150 uint64_t m_imsi; | 160 uint64_t m_imsi; |
151 | 161 |
152 uint16_t m_dlEarfcn; /**< downlink carrier frequency */ | 162 uint16_t m_dlEarfcn; /**< downlink carrier frequency */ |
153 | 163 |
154 uint32_t m_csgId; | 164 uint32_t m_csgId; |
155 | 165 |
166 std::map < uint8_t, Ptr<ComponentCarrierUe> > m_ccMap; | |
167 | |
156 }; // end of class LteUeNetDevice | 168 }; // end of class LteUeNetDevice |
157 | 169 |
158 } // namespace ns3 | 170 } // namespace ns3 |
159 | 171 |
160 #endif /* LTE_UE_NET_DEVICE_H */ | 172 #endif /* LTE_UE_NET_DEVICE_H */ |
OLD | NEW |