Commit da791cbe authored by Matthieu Kanj's avatar Matthieu Kanj

code cleaning

parent 13ab4e73
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
#include "UTIL/LISTS/list.h" #include "UTIL/LISTS/list.h"
#endif #endif
////////////////////////////////////////////////#include "dci_nb_iot.h"
#define MOD_TABLE_QPSK_OFFSET 1 #define MOD_TABLE_QPSK_OFFSET 1
#define MOD_TABLE_16QAM_OFFSET 5 #define MOD_TABLE_16QAM_OFFSET 5
#define MOD_TABLE_64QAM_OFFSET 21 #define MOD_TABLE_64QAM_OFFSET 21
......
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
extern unsigned int dlsch_tbs25[27][25],TBStable[27][110],TBStable1C[32]; extern unsigned int dlsch_tbs25[27][25],TBStable[27][110],TBStable1C[32];
//NB-Iot
//extern unsigned int TBStable_NB_IoT[14][8];
extern unsigned short lte_cqi_eff1024[16]; extern unsigned short lte_cqi_eff1024[16];
extern char lte_cqi_snr_dB[15]; extern char lte_cqi_snr_dB[15];
extern short conjugate[8],conjugate2[8]; extern short conjugate[8],conjugate2[8];
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#ifndef __PHY_LTE_TRANSPORT_EXTERN_NB_IOT__H__ #ifndef __PHY_LTE_TRANSPORT_EXTERN_NB_IOT__H__
#define __PHY_LTE_TRANSPORT_EXTERN_NB_IOT__H__ #define __PHY_LTE_TRANSPORT_EXTERN_NB_IOT__H__
//NB-Iot
extern unsigned int TBStable_NB_IoT[14][8]; extern unsigned int TBStable_NB_IoT[14][8];
extern unsigned char cs_ri_normal_NB_IoT[4]; extern unsigned char cs_ri_normal_NB_IoT[4];
......
...@@ -119,7 +119,6 @@ static inline void* malloc16_clear( size_t size ) ...@@ -119,7 +119,6 @@ static inline void* malloc16_clear( size_t size )
#include "impl_defs_top.h" #include "impl_defs_top.h"
#include "impl_defs_lte.h" #include "impl_defs_lte.h"
//#include "impl_defs_lte_NB_IoT.h"
#include "PHY/TOOLS/time_meas.h" #include "PHY/TOOLS/time_meas.h"
#include "PHY/CODING/defs.h" #include "PHY/CODING/defs.h"
...@@ -129,7 +128,7 @@ static inline void* malloc16_clear( size_t size ) ...@@ -129,7 +128,7 @@ static inline void* malloc16_clear( size_t size )
#ifdef OPENAIR_LTE #ifdef OPENAIR_LTE
#include "PHY/LTE_TRANSPORT/defs.h" #include "PHY/LTE_TRANSPORT/defs.h"
//#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
#include <pthread.h> #include <pthread.h>
#include "targets/ARCH/COMMON/common_lib.h" #include "targets/ARCH/COMMON/common_lib.h"
...@@ -569,10 +568,6 @@ typedef struct PHY_VARS_eNB_s { ...@@ -569,10 +568,6 @@ typedef struct PHY_VARS_eNB_s {
// Pointers for active physicalConfigDedicated to be applied in current subframe // Pointers for active physicalConfigDedicated to be applied in current subframe
struct PhysicalConfigDedicated *physicalConfigDedicated[NUMBER_OF_UE_MAX]; struct PhysicalConfigDedicated *physicalConfigDedicated[NUMBER_OF_UE_MAX];
//Pointers for actve physicalConfigDedicated for NB-IoT to be applied in current subframe
//struct PhysicalConfigDedicated_NB_r13 *phy_config_dedicated_NB[NUMBER_OF_UE_MAX];
uint32_t rb_mask_ul[4]; uint32_t rb_mask_ul[4];
/// Information regarding TM5 /// Information regarding TM5
...@@ -661,55 +656,6 @@ typedef struct PHY_VARS_eNB_s { ...@@ -661,55 +656,6 @@ typedef struct PHY_VARS_eNB_s {
/// Pointer for ifdevice buffer struct /// Pointer for ifdevice buffer struct
if_buffer_t ifbuffer; if_buffer_t ifbuffer;
//------------------------
// NB-IoT
//------------------------
/*
* NUMBER_OF_UE_MAX_NB_IoT maybe in the future should be dynamic because could be very large and the memory may explode
* (is almost the indication of the number of UE context that we are storing at PHY layer)
*
* reasoning: the following data structure (ndlsch, nulsch ecc..) are used to store the context that should be transmitted in at least n+4 subframe later
* (the minimum interval between NPUSCH and the ACK for this)
* the problem is that in NB_IoT the ACK for the UPLINK is contained in the DCI through the NDI field (if this value change from the previous one then it means ACK)
* but may we could schedule this DCI long time later so may lots of contents shuld be stored (there is no concept of phich channel in NB-IoT)
* For the DL transmission the UE send a proper ACK/NACK message
*
* *the HARQ process should be killed when the NDI change
*
* *In the Structure for nulsch we should also store the information related to the subframe (because each time we should read it and understand what should be done
* in that subframe)
*
*/
/*
* TIMING
* the entire transmission and scheduling are done for the "subframe" concept but the subframe = proc->subframe_tx (that in reality is the subframe_rx +4)
* (see USER/lte-enb/wakeup_rxtx )
*
* Related to FAPI:
* DCI and DL_CONFIG.request (also more that 1) and MAC_PDU are transmitted in the same subframe (our assumption) so will be all contained in the schedule_response getting from the scheduler
* DCI0 and UL_CONFIG.request are transmitted in the same subframe (our assumption) so contained in the schedule_response
*
*/
//TODO: check what should be NUMBER_OF_UE_MAX_NB_IoT value
/*
NB_IoT_eNB_NPBCH_t *npbch;
NB_IoT_eNB_NPDCCH_t *npdcch[NUMBER_OF_UE_MAX_NB_IoT];
NB_IoT_eNB_NDLSCH_t *ndlsch[NUMBER_OF_UE_MAX_NB_IoT];
NB_IoT_eNB_NULSCH_t *nulsch[NUMBER_OF_UE_MAX_NB_IoT+1]; //nulsch[0] contains the RAR
NB_IoT_eNB_NDLSCH_t *ndlsch_SI,*ndlsch_ra, *ndlsch_SIB1;
NB_IoT_DL_FRAME_PARMS frame_parms_NB_IoT;
// DCI for at most 2 DCI pdus
DCI_PDU_NB_IoT *DCI_pdu;
*/
} PHY_VARS_eNB; } PHY_VARS_eNB;
#define debug_msg if (((mac_xface->frame%100) == 0) || (mac_xface->frame < 50)) msg #define debug_msg if (((mac_xface->frame%100) == 0) || (mac_xface->frame < 50)) msg
......
...@@ -628,7 +628,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s { ...@@ -628,7 +628,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
// Pointers for active physicalConfigDedicated to be applied in current subframe // Pointers for active physicalConfigDedicated to be applied in current subframe
struct PhysicalConfigDedicated *physicalConfigDedicated[NUMBER_OF_UE_MAX_NB_IoT]; struct PhysicalConfigDedicated *physicalConfigDedicated[NUMBER_OF_UE_MAX_NB_IoT];
//Pointers for actve physicalConfigDedicated for NB-IoT to be applied in current subframe //Pointers for actve physicalConfigDedicated for NB-IoT to be applied in current subframe
struct PhysicalConfigDedicated_NB_r13 *phy_config_dedicated_NB[NUMBER_OF_UE_MAX_NB_IoT]; struct PhysicalConfigDedicated_NB_r13 *phy_config_dedicated_NB_IoT[NUMBER_OF_UE_MAX_NB_IoT];
/// ///
uint32_t rb_mask_ul[4]; uint32_t rb_mask_ul[4];
/// Information regarding TM5 /// Information regarding TM5
......
...@@ -374,8 +374,6 @@ uint16_t get_Np(uint8_t N_RB_DL,uint8_t nCCE,uint8_t plus1); ...@@ -374,8 +374,6 @@ uint16_t get_Np(uint8_t N_RB_DL,uint8_t nCCE,uint8_t plus1);
int8_t find_ue(uint16_t rnti, PHY_VARS_eNB *phy_vars_eNB); int8_t find_ue(uint16_t rnti, PHY_VARS_eNB *phy_vars_eNB);
//NB-IoT
//int8_t find_ue_NB_IoT(uint16_t rnti, PHY_VARS_eNB_NB_IoT *eNB);
int32_t add_ue(int16_t rnti, PHY_VARS_eNB *phy_vars_eNB); int32_t add_ue(int16_t rnti, PHY_VARS_eNB *phy_vars_eNB);
int mac_phy_remove_ue(module_id_t Mod_idP,rnti_t rnti); int mac_phy_remove_ue(module_id_t Mod_idP,rnti_t rnti);
......
...@@ -1111,25 +1111,6 @@ int8_t find_ue(uint16_t rnti, PHY_VARS_eNB *eNB) ...@@ -1111,25 +1111,6 @@ int8_t find_ue(uint16_t rnti, PHY_VARS_eNB *eNB)
return(-1); return(-1);
} }
/*
int8_t find_ue_NB_IoT(uint16_t rnti, PHY_VARS_eNB_NB_IoT *eNB)
{
uint8_t i;
for (i=0; i<NUMBER_OF_UE_MAX_NB_IoT; i++) {
if ((eNB->ndlsch[i]) &&
(eNB->ndlsch[i]->rnti==rnti)) {
return(i);
}
}
return(-1);
}
*/
LTE_DL_FRAME_PARMS* get_lte_frame_parms(module_id_t Mod_id, uint8_t CC_id) LTE_DL_FRAME_PARMS* get_lte_frame_parms(module_id_t Mod_id, uint8_t CC_id)
{ {
......
...@@ -45,14 +45,6 @@ ...@@ -45,14 +45,6 @@
#include "PHY_INTERFACE/defs.h" #include "PHY_INTERFACE/defs.h"
#include "RRC/LITE/defs.h" #include "RRC/LITE/defs.h"
#ifdef NB_IOT
#include "defs_NB_IoT.h"
//NB-IoT
extern IF_Module_t *if_inst;
extern eNB_MAC_INST_NB_IoT *eNB_mac_inst_NB_IoT;
#endif
extern const uint32_t BSR_TABLE[BSR_TABLE_SIZE]; extern const uint32_t BSR_TABLE[BSR_TABLE_SIZE];
//extern uint32_t EBSR_Level[63]; //extern uint32_t EBSR_Level[63];
extern const uint32_t Extended_BSR_TABLE[BSR_TABLE_SIZE]; extern const uint32_t Extended_BSR_TABLE[BSR_TABLE_SIZE];
...@@ -129,9 +121,6 @@ extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2; ...@@ -129,9 +121,6 @@ extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2;
extern DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E; extern DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E;
#endif //DEF_H #endif //DEF_H
...@@ -125,7 +125,7 @@ typedef struct { ...@@ -125,7 +125,7 @@ typedef struct {
#endif #endif
/// PHY-Config-Dedicated eNB /// PHY-Config-Dedicated eNB
void (*phy_config_dedicated_eNB)(module_id_t Mod_id,int CC_id,rnti_t rnti, void (*phy_config_dedicated_eNB_NB_IoT)(module_id_t Mod_id,int CC_id,rnti_t rnti,
struct PhysicalConfigDedicated *physicalConfigDedicated); struct PhysicalConfigDedicated *physicalConfigDedicated);
///////////////////////////////////////////// /////////////////////////////////////////////
/* /*
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "collection/tree.h" #include "collection/tree.h"
#include "COMMON/platform_types.h" #include "COMMON/platform_types.h"
#include "defs.h" #include "defs.h"
//#include "defs_NB_IoT.h"
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment