Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
lizhongxiao
OpenXG UE
Commits
3ef2934c
Commit
3ef2934c
authored
Mar 13, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for FDD attachment
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
5ed27eef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
ci-scripts/main.py
ci-scripts/main.py
+5
-5
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+1
-1
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-2
No files found.
ci-scripts/main.py
View file @
3ef2934c
...
@@ -650,7 +650,7 @@ class SSHConnection():
...
@@ -650,7 +650,7 @@ class SSHConnection():
html_queue
=
SimpleQueue
()
html_queue
=
SimpleQueue
()
self
.
checkDevTTYisUnlocked
()
self
.
checkDevTTYisUnlocked
()
if
attach_status
:
if
attach_status
:
html_cell
=
'<pre style="background-color:white">CAT-M module
\n
Attach
Attach
Completed in '
+
str
(
attach_cnt
+
4
)
+
' seconds'
html_cell
=
'<pre style="background-color:white">CAT-M module
\n
Attach
ment
Completed in '
+
str
(
attach_cnt
+
4
)
+
' seconds'
if
(
nRSRQ
is
not
None
)
and
(
nRSRP
is
not
None
):
if
(
nRSRQ
is
not
None
)
and
(
nRSRP
is
not
None
):
html_cell
+=
'
\n
RSRQ = '
+
str
(
-
20
+
(
nRSRQ
/
2
))
+
' dB'
html_cell
+=
'
\n
RSRQ = '
+
str
(
-
20
+
(
nRSRQ
/
2
))
+
' dB'
html_cell
+=
'
\n
RSRP = '
+
str
(
-
140
+
nRSRP
)
+
' dBm</pre>'
html_cell
+=
'
\n
RSRP = '
+
str
(
-
140
+
nRSRP
)
+
' dBm</pre>'
...
@@ -659,7 +659,7 @@ class SSHConnection():
...
@@ -659,7 +659,7 @@ class SSHConnection():
html_queue
.
put
(
html_cell
)
html_queue
.
put
(
html_cell
)
self
.
CreateHtmlTestRowQueue
(
'N/A'
,
'OK'
,
1
,
html_queue
)
self
.
CreateHtmlTestRowQueue
(
'N/A'
,
'OK'
,
1
,
html_queue
)
else
:
else
:
html_cell
=
'<pre style="background-color:white">CAT-M module
\n
Attach Failed</pre>'
html_cell
=
'<pre style="background-color:white">CAT-M module
\n
Attach
ment
Failed</pre>'
html_queue
.
put
(
html_cell
)
html_queue
.
put
(
html_cell
)
self
.
CreateHtmlTestRowQueue
(
'N/A'
,
'KO'
,
1
,
html_queue
)
self
.
CreateHtmlTestRowQueue
(
'N/A'
,
'KO'
,
1
,
html_queue
)
...
@@ -2333,11 +2333,11 @@ class SSHConnection():
...
@@ -2333,11 +2333,11 @@ class SSHConnection():
self
.
htmlFile
.
write
(
' <td></td>
\n
'
)
self
.
htmlFile
.
write
(
' <td></td>
\n
'
)
self
.
htmlFile
.
write
(
' </tr>
\n
'
)
self
.
htmlFile
.
write
(
' </tr>
\n
'
)
self
.
htmlFile
.
write
(
' <tr>
\n
'
)
self
.
htmlFile
.
write
(
' <tr>
\n
'
)
self
.
htmlFile
.
write
(
' <th colspan=
4
bgcolor = "#33CCFF">Final Status</th>
\n
'
)
self
.
htmlFile
.
write
(
' <th colspan=
5
bgcolor = "#33CCFF">Final Status</th>
\n
'
)
if
passStatus
:
if
passStatus
:
self
.
htmlFile
.
write
(
' <th colspan=
2
bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>
\n
'
)
self
.
htmlFile
.
write
(
' <th colspan=
3
bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>
\n
'
)
else
:
else
:
self
.
htmlFile
.
write
(
' <th colspan=
2
bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>
\n
'
)
self
.
htmlFile
.
write
(
' <th colspan=
3
bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>
\n
'
)
self
.
htmlFile
.
write
(
' </tr>
\n
'
)
self
.
htmlFile
.
write
(
' </tr>
\n
'
)
self
.
htmlFile
.
write
(
' </table>
\n
'
)
self
.
htmlFile
.
write
(
' </table>
\n
'
)
self
.
htmlFile
.
write
(
' <p></p>
\n
'
)
self
.
htmlFile
.
write
(
' <p></p>
\n
'
)
...
...
openair1/SCHED/fapi_l1.c
View file @
3ef2934c
...
@@ -706,7 +706,7 @@ void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,
...
@@ -706,7 +706,7 @@ void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,
// check if we have received a dci for this ue and ulsch descriptor is configured
// check if we have received a dci for this ue and ulsch descriptor is configured
if
(
ul_config_pdu
->
pdu_type
==
NFAPI_UL_CONFIG_ULSCH_PDU_TYPE
)
{
if
(
ul_config_pdu
->
pdu_type
==
NFAPI_UL_CONFIG_ULSCH_PDU_TYPE
)
{
if
(
UE_id
==
find_ulsch
(
ul_config_pdu
->
ulsch_pdu
.
ulsch_pdu_rel8
.
rnti
,
eNB
,
SEARCH_EXIST_OR_FREE
)
<
0
)
//
if (UE_id == find_ulsch(ul_config_pdu->ulsch_pdu.ulsch_pdu_rel8.rnti,eNB,SEARCH_EXIST_OR_FREE)<0)
//for (int i=0;i<16;i++) if (eNB->ulsch[i]->harq_mask>0) LOG_I(PHY,"rnti %x, mask %x\n",eNB->ulsch[i]->rnti,eNB->ulsch[i]->harq_mask >0);
//for (int i=0;i<16;i++) if (eNB->ulsch[i]->harq_mask>0) LOG_I(PHY,"rnti %x, mask %x\n",eNB->ulsch[i]->rnti,eNB->ulsch[i]->harq_mask >0);
AssertFatal
((
UE_id
=
find_ulsch
(
ul_config_pdu
->
ulsch_pdu
.
ulsch_pdu_rel8
.
rnti
,
eNB
,
SEARCH_EXIST_OR_FREE
))
>=
0
,
AssertFatal
((
UE_id
=
find_ulsch
(
ul_config_pdu
->
ulsch_pdu
.
ulsch_pdu_rel8
.
rnti
,
eNB
,
SEARCH_EXIST_OR_FREE
))
>=
0
,
"No existing UE ULSCH for rnti %x
\n
"
,
rel8
->
rnti
);
"No existing UE ULSCH for rnti %x
\n
"
,
rel8
->
rnti
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
3ef2934c
...
@@ -2505,8 +2505,8 @@ UE_is_to_be_scheduled(module_id_t module_idP,
...
@@ -2505,8 +2505,8 @@ UE_is_to_be_scheduled(module_id_t module_idP,
if
(
UE_template
->
scheduled_ul_bytes
<
UE_template
->
estimated_ul_buffer
||
if
(
UE_template
->
scheduled_ul_bytes
<
UE_template
->
estimated_ul_buffer
||
UE_template
->
ul_SR
>
0
||
// uplink scheduling request
UE_template
->
ul_SR
>
0
||
// uplink scheduling request
(
UE_sched_ctl
->
ul_inactivity_timer
>
20
0
&&
UE_sched_ctl
->
ul_scheduled
==
0
)
||
// every 2 frames when RRC_CONNECTED
(
UE_sched_ctl
->
ul_inactivity_timer
>
20
&&
UE_sched_ctl
->
ul_scheduled
==
0
)
||
// every 2 frames when RRC_CONNECTED
(
UE_sched_ctl
->
ul_inactivity_timer
>
10
0
&&
(
UE_sched_ctl
->
ul_inactivity_timer
>
10
&&
UE_sched_ctl
->
ul_scheduled
==
0
&&
UE_sched_ctl
->
ul_scheduled
==
0
&&
mac_eNB_get_rrc_status
(
module_idP
,
mac_eNB_get_rrc_status
(
module_idP
,
ue_rnti
)
<
RRC_CONNECTED
))
{
// every Frame when not RRC_CONNECTED
ue_rnti
)
<
RRC_CONNECTED
))
{
// every Frame when not RRC_CONNECTED
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
3ef2934c
...
@@ -458,9 +458,9 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -458,9 +458,9 @@ rx_sdu(const module_id_t enb_mod_idP,
,
ra
->
rach_resource_type
>
0
,
ra
->
rach_resource_type
>
0
#endif
#endif
);
);
/*
Prepare transmission of Msg4(RRCConnectionReconfiguration)
*/
/*
Received a new rnti
*/
ra
->
state
=
MSGCRNTI
;
ra
->
state
=
MSGCRNTI
;
LOG_I
(
MAC
,
"[eNB %d] Frame %d, Subframe %d CC_id %d : (rnti %x UE_id %d) R
RCConnectionReconfiguration
(Msg4)
\n
"
,
LOG_I
(
MAC
,
"[eNB %d] Frame %d, Subframe %d CC_id %d : (rnti %x UE_id %d) R
eceived rnti
(Msg4)
\n
"
,
enb_mod_idP
,
enb_mod_idP
,
frameP
,
frameP
,
subframeP
,
subframeP
,
...
...
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