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
bb9d2c3a
Commit
bb9d2c3a
authored
Jul 21, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add more logs
parent
14c547bb
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
1 deletion
+24
-1
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/phich.c
+4
-0
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+4
-0
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+7
-1
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+3
-0
openair2/LAYER2/MAC/ff-mac.c
openair2/LAYER2/MAC/ff-mac.c
+2
-0
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+4
-0
No files found.
openair1/PHY/LTE_TRANSPORT/phich.c
View file @
bb9d2c3a
...
@@ -1343,6 +1343,8 @@ void rx_phich(PHY_VARS_UE *phy_vars_ue,
...
@@ -1343,6 +1343,8 @@ void rx_phich(PHY_VARS_UE *phy_vars_ue,
LOG_D
(
PHY
,
"HI16 %d
\n
"
,
HI16
);
LOG_D
(
PHY
,
"HI16 %d
\n
"
,
HI16
);
#endif
#endif
printf
(
"GOT UPLINK UE PHICH fsf %d/%d pid %d HI16 %d (>0 means NACK)
\n
"
,
phy_vars_ue
->
frame_rx
,
subframe
,
harq_pid
,
HI16
);
if
(
HI16
>
0
)
{
//NACK
if
(
HI16
>
0
)
{
//NACK
if
(
phy_vars_ue
->
ulsch_ue_Msg3_active
[
eNB_id
]
==
1
)
{
if
(
phy_vars_ue
->
ulsch_ue_Msg3_active
[
eNB_id
]
==
1
)
{
LOG_D
(
PHY
,
"[UE %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received NAK (%d) nseq %d, ngroup %d
\n
"
,
LOG_D
(
PHY
,
"[UE %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received NAK (%d) nseq %d, ngroup %d
\n
"
,
...
@@ -1360,6 +1362,7 @@ void rx_phich(PHY_VARS_UE *phy_vars_ue,
...
@@ -1360,6 +1362,7 @@ void rx_phich(PHY_VARS_UE *phy_vars_ue,
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
// ulsch->harq_processes[harq_pid]->Ndi = 0;
// ulsch->harq_processes[harq_pid]->Ndi = 0;
ulsch
->
harq_processes
[
harq_pid
]
->
round
++
;
ulsch
->
harq_processes
[
harq_pid
]
->
round
++
;
printf
(
"GOT UPLINK UE PHICH msg3 pid %d round %d
\n
"
,
harq_pid
,
ulsch
->
harq_processes
[
harq_pid
]
->
round
);
ulsch
->
harq_processes
[
harq_pid
]
->
rvidx
=
rv_table
[
ulsch
->
harq_processes
[
harq_pid
]
->
round
&
3
];
ulsch
->
harq_processes
[
harq_pid
]
->
rvidx
=
rv_table
[
ulsch
->
harq_processes
[
harq_pid
]
->
round
&
3
];
if
(
ulsch
->
harq_processes
[
harq_pid
]
->
round
>=
phy_vars_ue
->
lte_frame_parms
.
maxHARQ_Msg3Tx
)
{
if
(
ulsch
->
harq_processes
[
harq_pid
]
->
round
>=
phy_vars_ue
->
lte_frame_parms
.
maxHARQ_Msg3Tx
)
{
...
@@ -1381,6 +1384,7 @@ void rx_phich(PHY_VARS_UE *phy_vars_ue,
...
@@ -1381,6 +1384,7 @@ void rx_phich(PHY_VARS_UE *phy_vars_ue,
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
// ulsch->harq_processes[harq_pid]->Ndi = 0;
// ulsch->harq_processes[harq_pid]->Ndi = 0;
ulsch
->
harq_processes
[
harq_pid
]
->
round
++
;
ulsch
->
harq_processes
[
harq_pid
]
->
round
++
;
printf
(
"GOT UPLINK UE PHICH [%p] pid %d round %d
\n
"
,
ulsch
,
harq_pid
,
ulsch
->
harq_processes
[
harq_pid
]
->
round
);
ulsch
->
harq_processes
[
harq_pid
]
->
rvidx
=
rv_table
[
ulsch
->
harq_processes
[
harq_pid
]
->
round
&
3
];
ulsch
->
harq_processes
[
harq_pid
]
->
rvidx
=
rv_table
[
ulsch
->
harq_processes
[
harq_pid
]
->
round
&
3
];
ulsch
->
O_RI
=
0
;
ulsch
->
O_RI
=
0
;
ulsch
->
O
=
0
;
ulsch
->
O
=
0
;
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
bb9d2c3a
...
@@ -881,6 +881,10 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
...
@@ -881,6 +881,10 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
ulsch_input_buffer
,
ulsch_input_buffer
,
input_buffer_length
,
input_buffer_length
,
&
access_mode
);
&
access_mode
);
printf
(
"GOT UPLINK in the UE tx [%p] (fsf %d/%d pid %d round %d) size %d [ "
,
phy_vars_ue
->
ulsch_ue
[
eNB_id
],
frame_tx
,
subframe_tx
,
harq_pid
,
phy_vars_ue
->
ulsch_ue
[
eNB_id
]
->
harq_processes
[
harq_pid
]
->
round
,
input_buffer_length
);
int
zaza
;
for
(
zaza
=
0
;
zaza
<
input_buffer_length
;
zaza
++
)
printf
(
"%2.2x "
,
ulsch_input_buffer
[
zaza
]);
printf
(
" ]
\n
"
);
//}
//}
/*
/*
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
bb9d2c3a
...
@@ -1099,7 +1099,7 @@ printf("FAPI to MAC uplink nr_dclList %d nr_phichList %d\n", ulind.nr_dciList, u
...
@@ -1099,7 +1099,7 @@ printf("FAPI to MAC uplink nr_dclList %d nr_phichList %d\n", ulind.nr_dciList, u
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 uplink schedule 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)
rbstart %d rblen %d tbsize %d mcs %d
\n
"
,
ulind
.
dciList
[
i
].
rnti
,
ulind
.
dciList
[
i
].
ndi
,
frameP
,
subframeP
,
ulind
.
dciList
[
i
].
rbStart
,
ulind
.
dciList
[
i
].
rbLen
,
ulind
.
dciList
[
i
].
tbSize
,
ulind
.
dciList
[
i
].
mcs
);
fapi_schedule_uplink
(
module_idP
,
CC_id
,
&
ulind
.
dciList
[
i
]);
fapi_schedule_uplink
(
module_idP
,
CC_id
,
&
ulind
.
dciList
[
i
]);
}
}
...
@@ -1111,6 +1111,12 @@ printf(" RECAP %i rnti %x %s dci pdu %s\n", i,
...
@@ -1111,6 +1111,12 @@ printf(" RECAP %i rnti %x %s dci pdu %s\n", i,
binary
(
*
(
uint32_t
*
)
eNB_mac_inst
[
0
].
common_channels
[
0
].
DCI_pdu
.
dci_alloc
[
i
].
dci_pdu
)
binary
(
*
(
uint32_t
*
)
eNB_mac_inst
[
0
].
common_channels
[
0
].
DCI_pdu
.
dci_alloc
[
i
].
dci_pdu
)
);
);
}
}
printf
(
"RECAP phich count %d
\n
"
,
ulind
.
nr_phichList
);
for
(
i
=
0
;
i
<
ulind
.
nr_phichList
;
i
++
)
{
printf
(
" RECAP %i rnti %x %s
\n
"
,
i
,
ulind
.
phichList
[
i
].
rnti
,
ulind
.
phichList
[
i
].
phich
==
ACK
?
"ACK"
:
"NACK"
);
}
global_subframe
++
;
global_subframe
++
;
}
}
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
bb9d2c3a
...
@@ -97,6 +97,9 @@ void rx_sdu(
...
@@ -97,6 +97,9 @@ void rx_sdu(
start_meas
(
&
eNB
->
rx_ulsch_sdu
);
start_meas
(
&
eNB
->
rx_ulsch_sdu
);
printf
(
"GOT UPLINK rnti %x packet; size = %d ["
,
rntiP
,
sdu_lenP
);
for
(
ii
=
0
;
ii
<
sdu_lenP
;
ii
++
)
printf
(
" %2.2x"
,
sduP
[
ii
]);
printf
(
" ]
\n
"
);
if
((
UE_id
>
NUMBER_OF_UE_MAX
)
||
(
UE_id
==
-
1
)
)
if
((
UE_id
>
NUMBER_OF_UE_MAX
)
||
(
UE_id
==
-
1
)
)
for
(
ii
=
0
;
ii
<
NB_RB_MAX
;
ii
++
)
{
for
(
ii
=
0
;
ii
<
NB_RB_MAX
;
ii
++
)
{
rx_lengths
[
ii
]
=
0
;
rx_lengths
[
ii
]
=
0
;
...
...
openair2/LAYER2/MAC/ff-mac.c
View file @
bb9d2c3a
...
@@ -283,6 +283,8 @@ void SchedUlConfigInd_callback(void *callback_data, const struct SchedUlConfigIn
...
@@ -283,6 +283,8 @@ void SchedUlConfigInd_callback(void *callback_data, const struct SchedUlConfigIn
LOCK
(
fi
,
fn
);
LOCK
(
fi
,
fn
);
CHECK
(
fi
,
fn
);
CHECK
(
fi
,
fn
);
printf
(
"SchedUlConfigInd_callback nr_dciList %d
\n
"
,
params
->
nr_dciList
);
/* copy from params to local structure */
/* copy from params to local structure */
fi
->
SchedUlConfigIndParameters
.
nr_dciList
=
params
->
nr_dciList
;
fi
->
SchedUlConfigIndParameters
.
nr_dciList
=
params
->
nr_dciList
;
fi
->
SchedUlConfigIndParameters
.
nr_phichList
=
params
->
nr_phichList
;
fi
->
SchedUlConfigIndParameters
.
nr_phichList
=
params
->
nr_phichList
;
...
...
openair2/RRC/LITE/rrc_UE.c
View file @
bb9d2c3a
...
@@ -440,6 +440,10 @@ static void rrc_ue_generate_RRCConnectionSetupComplete( const protocol_ctxt_t* c
...
@@ -440,6 +440,10 @@ static void rrc_ue_generate_RRCConnectionSetupComplete( const protocol_ctxt_t* c
size
=
do_RRCConnectionSetupComplete
(
ctxt_pP
->
module_id
,
buffer
,
Transaction_id
,
nas_msg_length
,
nas_msg
);
size
=
do_RRCConnectionSetupComplete
(
ctxt_pP
->
module_id
,
buffer
,
Transaction_id
,
nas_msg_length
,
nas_msg
);
printf
(
"GOT UPLINK ue generated connection setup complete size %d ["
,
(
int
)
size
);
int
i
;
for
(
i
=
0
;
i
<
size
;
i
++
)
printf
(
" %2.2x"
,
buffer
[
i
]);
printf
(
" ]
\n
"
);
LOG_I
(
RRC
,
"[UE %d][RAPROC] Frame %d : Logical Channel UL-DCCH (SRB1), Generating RRCConnectionSetupComplete (bytes%d, eNB %d)
\n
"
,
LOG_I
(
RRC
,
"[UE %d][RAPROC] Frame %d : Logical Channel UL-DCCH (SRB1), Generating RRCConnectionSetupComplete (bytes%d, eNB %d)
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
size
,
eNB_index
);
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
size
,
eNB_index
);
LOG_D
(
RLC
,
LOG_D
(
RLC
,
...
...
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