Skip to content

O
OpenXG-RAN
Commit 2466f16e authored by Florian Kaltenberger's avatar Florian Kaltenberger
Browse files
Options

adding flag for phy-test

parent 5487c709
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 23 deletions
openair2/LAYER2/MAC/defs.h
View file @ 2466f16e
...@@ -1051,6 +1051,8 @@ typedef struct eNB_MAC_INST_s { ...@@ -1051,6 +1051,8 @@ typedef struct eNB_MAC_INST_s {
COMMON_channels_t common_channels[MAX_NUM_CCs]; COMMON_channels_t common_channels[MAX_NUM_CCs];
/// current PDU index (BCH,MCH,DLSCH) /// current PDU index (BCH,MCH,DLSCH)
uint16_t pdu_index[MAX_NUM_CCs]; uint16_t pdu_index[MAX_NUM_CCs];
/// flag to enable phy-test (disables the scheduler)
uint16_t phy_test;
/// NFAPI Config Request Structure /// NFAPI Config Request Structure
nfapi_config_request_t config[MAX_NUM_CCs]; nfapi_config_request_t config[MAX_NUM_CCs];
......
openair2/LAYER2/MAC/eNB_scheduler.c
View file @ 2466f16e
...@@ -517,29 +517,30 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame ...@@ -517,29 +517,30 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame
#endif #endif
// This schedules MIB if (RC.mac[module_idP]->phy_test==0) {
if ((subframeP==0) && (frameP&3) == 0) schedule_mib(module_idP,frameP,subframeP); // This schedules MIB
/* if ((subframeP==0) && (frameP&3) == 0) schedule_mib(module_idP,frameP,subframeP);
// This schedules SI for legacy LTE and eMTC starting in subframeP // This schedules SI for legacy LTE and eMTC starting in subframeP
schedule_SI(module_idP,frameP,subframeP); schedule_SI(module_idP,frameP,subframeP);
// This schedules Random-Access for legacy LTE and eMTC starting in subframeP // This schedules Random-Access for legacy LTE and eMTC starting in subframeP
schedule_RA(module_idP,frameP,subframeP); schedule_RA(module_idP,frameP,subframeP);
// copy previously scheduled UL resources (ULSCH + HARQ) // copy previously scheduled UL resources (ULSCH + HARQ)
copy_ulreq(module_idP,frameP,subframeP); copy_ulreq(module_idP,frameP,subframeP);
// This schedules SRS in subframeP // This schedules SRS in subframeP
schedule_SRS(module_idP,frameP,subframeP); schedule_SRS(module_idP,frameP,subframeP);
// This schedules ULSCH in subframeP (dci0) // This schedules ULSCH in subframeP (dci0)
schedule_ulsch(module_idP,frameP,subframeP); schedule_ulsch(module_idP,frameP,subframeP);
// This schedules UCI_SR in subframeP // This schedules UCI_SR in subframeP
schedule_SR(module_idP,frameP,subframeP); schedule_SR(module_idP,frameP,subframeP);
// This schedules UCI_CSI in subframeP // This schedules UCI_CSI in subframeP
schedule_CSI(module_idP, frameP, subframeP); schedule_CSI(module_idP, frameP, subframeP);
*/
// This schedules DLSCH in subframeP
// This schedules DLSCH in subframeP schedule_ue_spec(module_idP,frameP,subframeP,mbsfn_status);
//schedule_ue_spec(module_idP,frameP,subframeP,mbsfn_status); }
else {
schedule_ue_spec_phy_test(module_idP,frameP,subframeP,mbsfn_status); schedule_ue_spec_phy_test(module_idP,frameP,subframeP,mbsfn_status);
}
// Allocate CCEs for good after scheduling is done // Allocate CCEs for good after scheduling is done
......
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