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
ZhouShuya
OpenXG-RAN
Commits
bba649ac
Commit
bba649ac
authored
Jun 03, 2016
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removal of slot_fep_ul in phy_procedures_rx_uespec
parent
f895f42c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
31 deletions
+4
-31
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+4
-31
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
bba649ac
...
@@ -1954,7 +1954,7 @@ void prach_procedures(PHY_VARS_eNB *eNB,uint8_t abstraction_flag)
...
@@ -1954,7 +1954,7 @@ void prach_procedures(PHY_VARS_eNB *eNB,uint8_t abstraction_flag)
eNB
->
UE_stats
[(
uint32_t
)
UE_id
].
UE_timing_offset
=
preamble_delay_list
[
preamble_max
]
&
0x1FFF
;
//limit to 13 (=11+2) bits
eNB
->
UE_stats
[(
uint32_t
)
UE_id
].
UE_timing_offset
=
preamble_delay_list
[
preamble_max
]
&
0x1FFF
;
//limit to 13 (=11+2) bits
eNB
->
UE_stats
[(
uint32_t
)
UE_id
].
sector
=
0
;
eNB
->
UE_stats
[(
uint32_t
)
UE_id
].
sector
=
0
;
LOG_
D
(
PHY
,
"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure (UE_id %d) with preamble %d, energy %d.%d dB, delay %d
\n
"
,
LOG_
I
(
PHY
,
"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure (UE_id %d) with preamble %d, energy %d.%d dB, delay %d
\n
"
,
eNB
->
Mod_id
,
eNB
->
Mod_id
,
eNB
->
CC_id
,
eNB
->
CC_id
,
frame
,
frame
,
...
@@ -2647,30 +2647,6 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
...
@@ -2647,30 +2647,6 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
if
(
abstraction_flag
==
0
)
{
start_meas
(
&
eNB
->
ofdm_demod_stats
);
for
(
l
=
0
;
l
<
fp
->
symbols_per_tti
/
2
;
l
++
)
{
slot_fep_ul
(
fp
,
&
eNB
->
common_vars
,
l
,
subframe
<<
1
,
0
,
0
);
slot_fep_ul
(
fp
,
&
eNB
->
common_vars
,
l
,
(
subframe
<<
1
)
+
1
,
0
,
0
);
}
stop_meas
(
&
eNB
->
ofdm_demod_stats
);
}
// Check for active processes in current subframe
// Check for active processes in current subframe
harq_pid
=
subframe2harq_pid
(
fp
,
harq_pid
=
subframe2harq_pid
(
fp
,
frame
,
subframe
);
frame
,
subframe
);
...
@@ -2705,18 +2681,14 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
...
@@ -2705,18 +2681,14 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
(
eNB
->
ulsch
[
i
]
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
==
1
))
{
(
eNB
->
ulsch
[
i
]
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
==
1
))
{
// UE is has ULSCH scheduling
// UE is has ULSCH scheduling
round
=
eNB
->
ulsch
[
i
]
->
harq_processes
[
harq_pid
]
->
round
;
round
=
eNB
->
ulsch
[
i
]
->
harq_processes
[
harq_pid
]
->
round
;
for
(
int
rb
=
0
;
for
(
int
rb
=
0
;
rb
<=
eNB
->
ulsch
[
i
]
->
harq_processes
[
harq_pid
]
->
nb_rb
;
rb
<=
eNB
->
ulsch
[
i
]
->
harq_processes
[
harq_pid
]
->
nb_rb
;
rb
++
)
{
rb
++
)
{
int
rb2
=
rb
+
eNB
->
ulsch
[
i
]
->
harq_processes
[
harq_pid
]
->
first_rb
;
int
rb2
=
rb
+
eNB
->
ulsch
[
i
]
->
harq_processes
[
harq_pid
]
->
first_rb
;
eNB
->
rb_mask_ul
[
rb2
>>
5
]
|=
(
1
<<
(
rb2
&
31
));
eNB
->
rb_mask_ul
[
rb2
>>
5
]
|=
(
1
<<
(
rb2
&
31
));
}
}
#ifdef DEBUG_PHY_PROC
LOG_D
(
PHY
,
"[eNB %d][PUSCH %d] frame %d subframe %d Scheduling PUSCH/ULSCH Reception for rnti %x (UE_id %d)
\n
"
,
eNB
->
Mod_id
,
harq_pid
,
frame
,
subframe
,
eNB
->
ulsch
[
i
]
->
rnti
,
i
);
#endif
if
(
eNB
->
ulsch
[
i
]
->
Msg3_flag
==
1
)
{
if
(
eNB
->
ulsch
[
i
]
->
Msg3_flag
==
1
)
{
LOG_D
(
PHY
,
"[eNB %d] frame %d, subframe %d: Scheduling ULSCH Reception for Msg3 in Sector %d
\n
"
,
LOG_D
(
PHY
,
"[eNB %d] frame %d, subframe %d: Scheduling ULSCH Reception for Msg3 in Sector %d
\n
"
,
...
@@ -2726,6 +2698,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
...
@@ -2726,6 +2698,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
eNB
->
UE_stats
[
i
].
sector
);
eNB
->
UE_stats
[
i
].
sector
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_ULSCH_MSG3
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_ULSCH_MSG3
,
1
);
}
else
{
}
else
{
LOG_D
(
PHY
,
"[eNB %d] frame %d, subframe %d: Scheduling ULSCH Reception for UE %d Mode %s
\n
"
,
LOG_D
(
PHY
,
"[eNB %d] frame %d, subframe %d: Scheduling ULSCH Reception for UE %d Mode %s
\n
"
,
eNB
->
Mod_id
,
eNB
->
Mod_id
,
frame
,
frame
,
...
...
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