Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
canghaiwuhen
OpenXG-RAN
Commits
43a3f826
Commit
43a3f826
authored
Apr 19, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add some printf logs to help debug
parent
bb888e4f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
8 deletions
+45
-8
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+2
-0
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+41
-8
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+1
-0
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1
-0
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
43a3f826
...
@@ -1329,6 +1329,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
...
@@ -1329,6 +1329,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
int
frame
=
phy_vars_eNB
->
proc
[
sched_subframe
].
frame_tx
;
int
frame
=
phy_vars_eNB
->
proc
[
sched_subframe
].
frame_tx
;
int
subframe
=
phy_vars_eNB
->
proc
[
sched_subframe
].
subframe_tx
;
int
subframe
=
phy_vars_eNB
->
proc
[
sched_subframe
].
subframe_tx
;
printf
(
"PHY TX f/sf %d/%d sched_sf %d
\n
"
,
frame
,
subframe
,
sched_subframe
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX
,
1
);
start_meas
(
&
phy_vars_eNB
->
phy_proc_tx
);
start_meas
(
&
phy_vars_eNB
->
phy_proc_tx
);
...
@@ -3149,6 +3150,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
...
@@ -3149,6 +3150,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
const
int
subframe
=
phy_vars_eNB
->
proc
[
sched_subframe
].
subframe_rx
;
const
int
subframe
=
phy_vars_eNB
->
proc
[
sched_subframe
].
subframe_rx
;
const
int
frame
=
phy_vars_eNB
->
proc
[
sched_subframe
].
frame_rx
;
const
int
frame
=
phy_vars_eNB
->
proc
[
sched_subframe
].
frame_rx
;
printf
(
"PHY RX f/sf %d/%d sched_sf %d
\n
"
,
frame
,
subframe
,
sched_subframe
);
AssertFatal
(
sched_subframe
<
NUM_ENB_THREADS
,
"Bad sched_subframe %d"
,
sched_subframe
);
AssertFatal
(
sched_subframe
<
NUM_ENB_THREADS
,
"Bad sched_subframe %d"
,
sched_subframe
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX
,
1
);
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
43a3f826
...
@@ -569,6 +569,20 @@ static void fapi_schedule_uplink(int module_idP, int CC_id, struct UlDciListElem
...
@@ -569,6 +569,20 @@ static void fapi_schedule_uplink(int module_idP, int CC_id, struct UlDciListElem
fapi_convert_ul_dci
(
module_idP
,
CC_id
,
dci
,
a
);
fapi_convert_ul_dci
(
module_idP
,
CC_id
,
dci
,
a
);
}
}
char
*
binary
(
unsigned
x
)
{
static
char
r
[
33
];
char
*
s
=
r
+
31
;
int
i
;
r
[
32
]
=
0
;
for
(
i
=
0
;
i
<
32
;
i
++
)
{
*
s
=
'0'
+
(
x
&
1
);
s
--
;
x
>>=
1
;
}
return
r
;
}
void
eNB_dlsch_ulsch_scheduler
(
module_id_t
module_idP
,
uint8_t
cooperation_flag
,
frame_t
frameP
,
sub_frame_t
subframeP
)
//, int calibration_flag) {
void
eNB_dlsch_ulsch_scheduler
(
module_id_t
module_idP
,
uint8_t
cooperation_flag
,
frame_t
frameP
,
sub_frame_t
subframeP
)
//, int calibration_flag) {
{
{
int
CC_id
;
int
CC_id
;
...
@@ -588,6 +602,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -588,6 +602,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
struct
UlInfoListElement_s
ulinfo
[
MAX_UL_INFO_LIST
];
struct
UlInfoListElement_s
ulinfo
[
MAX_UL_INFO_LIST
];
int
ulsf
;
int
ulsf
;
printf
(
"SCHEDULER called for f/sf %d/%d
\n
"
,
frameP
,
subframeP
);
#if defined(ENABLE_ITTI)
#if defined(ENABLE_ITTI)
while
(
1
)
{
while
(
1
)
{
// Checks if a message has been sent to MAC sub-task
// Checks if a message has been sent to MAC sub-task
...
@@ -664,6 +679,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -664,6 +679,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
rlc
.
logicalChannelIdentity
=
CCCH
;
rlc
.
logicalChannelIdentity
=
CCCH
;
rlc
.
rlcTransmissionQueueSize
=
mac_rrc_get_ccch_size
(
module_idP
,
CC_id
);
rlc
.
rlcTransmissionQueueSize
=
mac_rrc_get_ccch_size
(
module_idP
,
CC_id
);
LOG_I
(
MAC
,
"calling SchedDlRlcBufferReq on CCCH rnti %x queue_size %d
\n
"
,
rlc
.
rnti
,
rlc
.
rlcTransmissionQueueSize
);
LOG_I
(
MAC
,
"calling SchedDlRlcBufferReq on CCCH rnti %x queue_size %d
\n
"
,
rlc
.
rnti
,
rlc
.
rlcTransmissionQueueSize
);
printf
(
"MAC to FAPI downlink BUF CCCH %d
\n
"
,
rlc
.
rlcTransmissionQueueSize
);
SchedDlRlcBufferReq
(
fapi
->
sched
,
&
rlc
);
SchedDlRlcBufferReq
(
fapi
->
sched
,
&
rlc
);
/* let's report only once, so put generate_Msg4 to 2
/* let's report only once, so put generate_Msg4 to 2
* (we will generate later on, when FAPI tells us to do so)
* (we will generate later on, when FAPI tells us to do so)
...
@@ -689,7 +705,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -689,7 +705,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
rlc
.
rlcTransmissionQueueSize
=
rlc_status
.
bytes_in_buffer
;
rlc
.
rlcTransmissionQueueSize
=
rlc_status
.
bytes_in_buffer
;
LOG_I
(
MAC
,
"calling SchedDlRlcBufferReq on DCCH rnti %x queue_size %d
\n
"
,
rlc
.
rnti
,
rlc_status
.
bytes_in_buffer
);
LOG_I
(
MAC
,
"calling SchedDlRlcBufferReq on DCCH rnti %x queue_size %d
\n
"
,
rlc
.
rnti
,
rlc_status
.
bytes_in_buffer
);
SchedDlRlcBufferReq
(
fapi
->
sched
,
&
rlc
);
SchedDlRlcBufferReq
(
fapi
->
sched
,
&
rlc
);
printf
(
"
BUF
%d
\n
"
,
rlc_status
.
bytes_in_buffer
);
printf
(
"
MAC to FAPI downlink BUF DCCH
%d
\n
"
,
rlc_status
.
bytes_in_buffer
);
/* DCCH+1 (srb 2, lcid 2) */
/* DCCH+1 (srb 2, lcid 2) */
rlc_status
=
mac_rlc_get_buffer_occupancy
(
module_idP
,
rlc
.
rnti
,
frameP
,
DCCH
+
1
);
rlc_status
=
mac_rlc_get_buffer_occupancy
(
module_idP
,
rlc
.
rnti
,
frameP
,
DCCH
+
1
);
...
@@ -697,7 +713,7 @@ printf("BUF %d\n", rlc_status.bytes_in_buffer);
...
@@ -697,7 +713,7 @@ printf("BUF %d\n", rlc_status.bytes_in_buffer);
rlc
.
rlcTransmissionQueueSize
=
rlc_status
.
bytes_in_buffer
;
rlc
.
rlcTransmissionQueueSize
=
rlc_status
.
bytes_in_buffer
;
LOG_I
(
MAC
,
"calling SchedDlRlcBufferReq on DCCH+1 rnti %x queue_size %d
\n
"
,
rlc
.
rnti
,
rlc_status
.
bytes_in_buffer
);
LOG_I
(
MAC
,
"calling SchedDlRlcBufferReq on DCCH+1 rnti %x queue_size %d
\n
"
,
rlc
.
rnti
,
rlc_status
.
bytes_in_buffer
);
SchedDlRlcBufferReq
(
fapi
->
sched
,
&
rlc
);
SchedDlRlcBufferReq
(
fapi
->
sched
,
&
rlc
);
printf
(
"
BUF
%d
\n
"
,
rlc_status
.
bytes_in_buffer
);
printf
(
"
MAC to FAPI downlink BUF DCCH+1
%d
\n
"
,
rlc_status
.
bytes_in_buffer
);
/* DTCH (drb 1, lcid 3) */
/* DTCH (drb 1, lcid 3) */
rlc_status
=
mac_rlc_get_buffer_occupancy
(
module_idP
,
rlc
.
rnti
,
frameP
,
DTCH
);
rlc_status
=
mac_rlc_get_buffer_occupancy
(
module_idP
,
rlc
.
rnti
,
frameP
,
DTCH
);
...
@@ -705,7 +721,7 @@ printf("BUF %d\n", rlc_status.bytes_in_buffer);
...
@@ -705,7 +721,7 @@ printf("BUF %d\n", rlc_status.bytes_in_buffer);
rlc
.
rlcTransmissionQueueSize
=
rlc_status
.
bytes_in_buffer
;
rlc
.
rlcTransmissionQueueSize
=
rlc_status
.
bytes_in_buffer
;
LOG_I
(
MAC
,
"calling SchedDlRlcBufferReq on DTCH rnti %x queue_size %d
\n
"
,
rlc
.
rnti
,
rlc_status
.
bytes_in_buffer
);
LOG_I
(
MAC
,
"calling SchedDlRlcBufferReq on DTCH rnti %x queue_size %d
\n
"
,
rlc
.
rnti
,
rlc_status
.
bytes_in_buffer
);
SchedDlRlcBufferReq
(
fapi
->
sched
,
&
rlc
);
SchedDlRlcBufferReq
(
fapi
->
sched
,
&
rlc
);
printf
(
"
BUF
%d
\n
"
,
rlc_status
.
bytes_in_buffer
);
printf
(
"
MAC to FAPI downlink BUF DTCH
%d
\n
"
,
rlc_status
.
bytes_in_buffer
);
}
}
dlreq
.
sfnSf
=
frameP
*
16
+
subframeP
;
dlreq
.
sfnSf
=
frameP
*
16
+
subframeP
;
...
@@ -722,7 +738,7 @@ printf("BUF %d\n", rlc_status.bytes_in_buffer);
...
@@ -722,7 +738,7 @@ printf("BUF %d\n", rlc_status.bytes_in_buffer);
dlinfo
[
i
].
nr_harqStatus
=
1
;
/* TODO: deal with more than 1 TB */
dlinfo
[
i
].
nr_harqStatus
=
1
;
/* TODO: deal with more than 1 TB */
dlinfo
[
i
].
harqStatus
[
0
]
=
fapi_dl_ack_nack_data
.
ack
[
i
].
ack
[
0
];
/* TODO: more than 1 TB */
dlinfo
[
i
].
harqStatus
[
0
]
=
fapi_dl_ack_nack_data
.
ack
[
i
].
ack
[
0
];
/* TODO: more than 1 TB */
dlinfo
[
i
].
servCellIndex
=
0
;
/* TODO: get real value for the servCellIndex */
dlinfo
[
i
].
servCellIndex
=
0
;
/* TODO: get real value for the servCellIndex */
printf
(
"
FILL feedback
f/sf %d/%d rnti %x harq %d ack %d
\n
"
,
frameP
,
subframeP
,
dlinfo
[
i
].
rnti
,
dlinfo
[
i
].
harqProcessId
,
dlinfo
[
i
].
harqStatus
[
0
]);
printf
(
"
MAC to FAPI downlink ack/nack from PHY
f/sf %d/%d rnti %x harq %d ack %d
\n
"
,
frameP
,
subframeP
,
dlinfo
[
i
].
rnti
,
dlinfo
[
i
].
harqProcessId
,
dlinfo
[
i
].
harqStatus
[
0
]);
}
}
if
(
fapi_dl_ack_nack_data
.
count
)
{
if
(
fapi_dl_ack_nack_data
.
count
)
{
dlreq
.
nr_dlInfoList
=
fapi_dl_ack_nack_data
.
count
;
dlreq
.
nr_dlInfoList
=
fapi_dl_ack_nack_data
.
count
;
...
@@ -744,6 +760,7 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
...
@@ -744,6 +760,7 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
for
(
i
=
0
;
i
<
dlind
.
nr_buildDataList
;
i
++
)
{
for
(
i
=
0
;
i
<
dlind
.
nr_buildDataList
;
i
++
)
{
if
(
dlind
.
buildDataList
[
i
].
ceBitmap
[
1
]
!=
0
||
dlind
.
buildDataList
[
i
].
nr_rlcPDU_List
[
1
]
!=
0
)
{
printf
(
"%s:%d:%s: TODO
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
abort
();
}
if
(
dlind
.
buildDataList
[
i
].
ceBitmap
[
1
]
!=
0
||
dlind
.
buildDataList
[
i
].
nr_rlcPDU_List
[
1
]
!=
0
)
{
printf
(
"%s:%d:%s: TODO
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
abort
();
}
if
(
dlind
.
buildDataList
[
i
].
nr_rlcPDU_List
[
0
]
!=
1
)
{
printf
(
"%s:%d:%s: TODO
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
abort
();
}
if
(
dlind
.
buildDataList
[
i
].
nr_rlcPDU_List
[
0
]
!=
1
)
{
printf
(
"%s:%d:%s: TODO
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
abort
();
}
printf
(
"FAPI to MAC downlink schedule ue %x channel %d f/sf %d/%d
\n
"
,
dlind
.
buildDataList
[
i
].
rnti
,
dlind
.
buildDataList
[
i
].
rlcPduList
[
0
][
0
].
logicalChannelIdentity
,
frameP
,
subframeP
);
switch
(
dlind
.
buildDataList
[
i
].
rlcPduList
[
0
][
0
].
logicalChannelIdentity
)
{
switch
(
dlind
.
buildDataList
[
i
].
rlcPduList
[
0
][
0
].
logicalChannelIdentity
)
{
case
0
:
/* CCCH */
case
0
:
/* CCCH */
/* TODO: get the right CC_id from servCellIndex, depending on the UE rnti/pcell/scell settings */
/* TODO: get the right CC_id from servCellIndex, depending on the UE rnti/pcell/scell settings */
...
@@ -780,6 +797,7 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
...
@@ -780,6 +797,7 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
* this is for contention-based RA
* this is for contention-based RA
* maybe we will need to review that if/when we do contention-free RA
* maybe we will need to review that if/when we do contention-free RA
*/
*/
printf
(
"FAPI to MAC downlink schedule RAR ue %x f/sf %d/%d
\n
"
,
dlind
.
buildRarList
[
0
].
rnti
,
frameP
,
subframeP
);
dlind
.
buildRarList
[
0
].
grant
&=
~
1
;
dlind
.
buildRarList
[
0
].
grant
&=
~
1
;
fapi_schedule_RAR
(
module_idP
,
dlind
.
buildRarList
[
0
].
carrierIndex
,
frameP
,
subframeP
,
fapi_schedule_RAR
(
module_idP
,
dlind
.
buildRarList
[
0
].
carrierIndex
,
frameP
,
subframeP
,
dlind
.
buildRarList
[
0
].
rnti
,
dlind
.
buildRarList
[
0
].
grant
,
&
dlind
.
buildRarList
[
0
].
dci
);
dlind
.
buildRarList
[
0
].
rnti
,
dlind
.
buildRarList
[
0
].
grant
,
&
dlind
.
buildRarList
[
0
].
dci
);
...
@@ -789,6 +807,7 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
...
@@ -789,6 +807,7 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
if
(
dlind
.
nr_buildBroadcastList
!=
1
)
{
printf
(
"%s:%d: more than 1 broadcast SI, todo
\n
"
,
__FUNCTION__
,
__LINE__
);
exit
(
0
);
}
if
(
dlind
.
nr_buildBroadcastList
!=
1
)
{
printf
(
"%s:%d: more than 1 broadcast SI, todo
\n
"
,
__FUNCTION__
,
__LINE__
);
exit
(
0
);
}
if
(
dlind
.
buildBroadcastList
[
0
].
type
==
ff_PCCH
)
{
printf
(
"%s:%d: PCCH: todo
\n
"
,
__FUNCTION__
,
__LINE__
);
exit
(
0
);
}
if
(
dlind
.
buildBroadcastList
[
0
].
type
==
ff_PCCH
)
{
printf
(
"%s:%d: PCCH: todo
\n
"
,
__FUNCTION__
,
__LINE__
);
exit
(
0
);
}
if
(
dlind
.
buildBroadcastList
[
0
].
carrierIndex
!=
0
)
{
printf
(
"%s:%d: 2nd CC: todo properly
\n
"
,
__FUNCTION__
,
__LINE__
);
exit
(
0
);
}
if
(
dlind
.
buildBroadcastList
[
0
].
carrierIndex
!=
0
)
{
printf
(
"%s:%d: 2nd CC: todo properly
\n
"
,
__FUNCTION__
,
__LINE__
);
exit
(
0
);
}
printf
(
"FAPI to MAC downlink schedule SI %d f/sf %d/%d
\n
"
,
dlind
.
buildBroadcastList
[
0
].
index
,
frameP
,
subframeP
);
fapi_schedule_SI
(
module_idP
,
dlind
.
buildBroadcastList
[
0
].
carrierIndex
,
frameP
,
subframeP
,
fapi_schedule_SI
(
module_idP
,
dlind
.
buildBroadcastList
[
0
].
carrierIndex
,
frameP
,
subframeP
,
dlind
.
buildBroadcastList
[
0
].
index
,
dlind
.
buildBroadcastList
[
0
].
index
,
&
dlind
.
buildBroadcastList
[
0
].
dci
);
&
dlind
.
buildBroadcastList
[
0
].
dci
);
...
@@ -801,6 +820,7 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
...
@@ -801,6 +820,7 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
if
(
dlind
.
nrOfPdcchOfdmSymbols
[
CC_id
]
!=
NULL
)
{
if
(
dlind
.
nrOfPdcchOfdmSymbols
[
CC_id
]
!=
NULL
)
{
int
cc
=
dlind
.
nrOfPdcchOfdmSymbols
[
CC_id
]
->
carrierIndex
;
int
cc
=
dlind
.
nrOfPdcchOfdmSymbols
[
CC_id
]
->
carrierIndex
;
DCI_pdu
[
cc
]
->
num_pdcch_symbols
=
dlind
.
nrOfPdcchOfdmSymbols
[
CC_id
]
->
pdcchOfdmSymbolCount
;
DCI_pdu
[
cc
]
->
num_pdcch_symbols
=
dlind
.
nrOfPdcchOfdmSymbols
[
CC_id
]
->
pdcchOfdmSymbolCount
;
printf
(
"FAPI to MAC downlink DCI_pdu[%d]->num_pdcch_symbols %d f/sf %d/%d
\n
"
,
cc
,
DCI_pdu
[
cc
]
->
num_pdcch_symbols
,
frameP
,
subframeP
);
}
}
}
}
}
}
...
@@ -823,18 +843,22 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
...
@@ -823,18 +843,22 @@ printf("FILL feedback f/sf %d/%d rnti %x harq %d ack %d\n", frameP, subframeP, d
/* fill ulInfoList */
/* fill ulInfoList */
ulsf
=
(
subframeP
+
6
)
%
10
;
ulsf
=
(
subframeP
+
6
)
%
10
;
ulsf
=
(
subframeP
+
6
)
%
10
;
if
(
fapi_ul_ack_nack_data
[
ulsf
].
count
)
{
if
(
fapi_ul_ack_nack_data
[
ulsf
].
count
)
{
ulreq
.
nr_ulInfoList
=
fapi_ul_ack_nack_data
[
ulsf
].
count
;
ulreq
.
nr_ulInfoList
=
fapi_ul_ack_nack_data
[
ulsf
].
count
;
ulreq
.
ulInfoList
=
ulinfo
;
ulreq
.
ulInfoList
=
ulinfo
;
for
(
i
=
0
;
i
<
ulreq
.
nr_ulInfoList
;
i
++
)
{
for
(
i
=
0
;
i
<
ulreq
.
nr_ulInfoList
;
i
++
)
{
printf
(
"MAC to FAPI uplink acknack
to send to ue %x ack %d
\n
"
,
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
rnti
,
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
ack
);
printf
(
"MAC to FAPI uplink acknack
ue %x ulsf %d ack %d
\n
"
,
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
rnti
,
ulsf
,
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
ack
);
ulinfo
[
i
].
rnti
=
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
rnti
;
ulinfo
[
i
].
rnti
=
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
rnti
;
ulinfo
[
i
].
receptionStatus
=
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
ack
==
1
?
Ok
:
NotOk
;
ulinfo
[
i
].
receptionStatus
=
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
ack
==
1
?
Ok
:
NotOk
;
ulinfo
[
i
].
tpc
=
0
;
/* TODO */
ulinfo
[
i
].
tpc
=
0
;
/* TODO */
ulinfo
[
i
].
servCellIndex
=
0
;
/* TODO: get correct value */
ulinfo
[
i
].
servCellIndex
=
0
;
/* TODO: get correct value */
for
(
j
=
0
;
j
<
MAX_LC_LIST
+
1
;
j
++
)
for
(
j
=
0
;
j
<
MAX_LC_LIST
+
1
;
j
++
)
{
ulinfo
[
i
].
ulReception
[
j
]
=
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
length
[
j
];
ulinfo
[
i
].
ulReception
[
j
]
=
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
length
[
j
];
printf
(
"MAC to FAPI uplink ue %x lcid %d size acked %d
\n
"
,
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
rnti
,
j
,
fapi_ul_ack_nack_data
[
ulsf
].
ack
[
i
].
length
[
j
]);
}
}
}
fapi_ul_ack_nack_data
[
ulsf
].
count
=
0
;
}
}
LOG_I
(
MAC
,
"calling SchedUlTriggerReq
\n
"
);
LOG_I
(
MAC
,
"calling SchedUlTriggerReq
\n
"
);
...
@@ -843,13 +867,22 @@ printf("MAC to FAPI uplink acknack to send to ue %x ack %d\n", fapi_ul_ack_nack_
...
@@ -843,13 +867,22 @@ printf("MAC to FAPI uplink acknack to send to ue %x ack %d\n", fapi_ul_ack_nack_
LOG_I
(
MAC
,
"calling SchedUlConfigInd
\n
"
);
LOG_I
(
MAC
,
"calling SchedUlConfigInd
\n
"
);
SchedUlConfigInd
(
fapi
,
&
ulind
);
SchedUlConfigInd
(
fapi
,
&
ulind
);
printf
(
"
yo
nr_dclList %d nr_phichList %d
\n
"
,
ulind
.
nr_dciList
,
ulind
.
nr_phichList
);
printf
(
"
FAPI to MAC uplink
nr_dclList %d nr_phichList %d
\n
"
,
ulind
.
nr_dciList
,
ulind
.
nr_phichList
);
for
(
i
=
0
;
i
<
ulind
.
nr_dciList
;
i
++
)
{
for
(
i
=
0
;
i
<
ulind
.
nr_dciList
;
i
++
)
{
/* TODO: get the right CC_id from servCellIndex, depending on the UE rnti/pcell/scell settings */
/* TODO: get the right CC_id from servCellIndex, depending on the UE rnti/pcell/scell settings */
CC_id
=
ulind
.
dciList
[
i
].
servCellIndex
;
CC_id
=
ulind
.
dciList
[
i
].
servCellIndex
;
printf
(
"FAPI to MAC
schedule uplink
ue %x ndi %d (fsf %d %d)
\n
"
,
ulind
.
dciList
[
i
].
rnti
,
ulind
.
dciList
[
i
].
ndi
,
frameP
,
subframeP
);
printf
(
"FAPI to MAC
uplink schedule
ue %x ndi %d (fsf %d %d)
\n
"
,
ulind
.
dciList
[
i
].
rnti
,
ulind
.
dciList
[
i
].
ndi
,
frameP
,
subframeP
);
fapi_schedule_uplink
(
module_idP
,
CC_id
,
&
ulind
.
dciList
[
i
]);
fapi_schedule_uplink
(
module_idP
,
CC_id
,
&
ulind
.
dciList
[
i
]);
}
}
printf
(
"RECAP dci pdu count %d
\n
"
,
eNB_mac_inst
[
0
].
common_channels
[
0
].
DCI_pdu
.
Num_common_dci
);
for
(
i
=
0
;
i
<
eNB_mac_inst
[
0
].
common_channels
[
0
].
DCI_pdu
.
Num_common_dci
;
i
++
)
{
printf
(
" RECAP %i rnti %x format %d dci pdu %s
\n
"
,
i
,
eNB_mac_inst
[
0
].
common_channels
[
0
].
DCI_pdu
.
dci_alloc
[
i
].
rnti
,
eNB_mac_inst
[
0
].
common_channels
[
0
].
DCI_pdu
.
dci_alloc
[
i
].
format
,
binary
(
*
(
uint32_t
*
)
eNB_mac_inst
[
0
].
common_channels
[
0
].
DCI_pdu
.
dci_alloc
[
i
].
dci_pdu
)
);
}
}
}
#else
/* FAPI */
#else
/* FAPI */
...
...
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
43a3f826
...
@@ -775,6 +775,7 @@ void initiate_ra_proc(module_id_t module_idP, int CC_id,frame_t frameP, uint16_t
...
@@ -775,6 +775,7 @@ void initiate_ra_proc(module_id_t module_idP, int CC_id,frame_t frameP, uint16_t
}
}
if
(
i
==
NB_RA_PROC_MAX
)
{
printf
(
"%s:%d:%s: handle this case
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
abort
();
}
if
(
i
==
NB_RA_PROC_MAX
)
{
printf
(
"%s:%d:%s: handle this case
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
abort
();
}
printf
(
"MAC to FAPI initiate RA procedure new rnti %x f/sf %d/%d
\n
"
,
r
.
rnti
,
frameP
,
subframeP
);
LOG_I
(
MAC
,
"calling SchedDlRachInfoReq
\n
"
);
LOG_I
(
MAC
,
"calling SchedDlRachInfoReq
\n
"
);
SchedDlRachInfoReq
(
fapi
->
sched
,
&
p
);
SchedDlRachInfoReq
(
fapi
->
sched
,
&
p
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
43a3f826
...
@@ -615,6 +615,7 @@ void SR_indication(module_id_t mod_idP, int cc_idP, frame_t frameP, rnti_t rntiP
...
@@ -615,6 +615,7 @@ void SR_indication(module_id_t mod_idP, int cc_idP, frame_t frameP, rnti_t rntiP
sr
.
rnti
=
rntiP
;
sr
.
rnti
=
rntiP
;
LOG_I
(
MAC
,
"eNB %d/%d f/sf %d/%d calling SchedUlSrInfoReq for rnti %x
\n
"
,
mod_idP
,
cc_idP
,
frameP
,
subframeP
,
rntiP
);
LOG_I
(
MAC
,
"eNB %d/%d f/sf %d/%d calling SchedUlSrInfoReq for rnti %x
\n
"
,
mod_idP
,
cc_idP
,
frameP
,
subframeP
,
rntiP
);
printf
(
"MAC to FAPI SR indication rnti %x f/sf %d/%d
\n
"
,
rntiP
,
frameP
,
subframeP
);
SchedUlSrInfoReq
(
fapi
->
sched
,
&
p
);
SchedUlSrInfoReq
(
fapi
->
sched
,
&
p
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment