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
ab058059
Commit
ab058059
authored
Oct 24, 2017
by
Eurecom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes for IF4p5 in RAU.
parent
5d5efb7b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
11 deletions
+10
-11
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
+3
-4
openair1/PHY/LTE_TRANSPORT/if4_tools.h
openair1/PHY/LTE_TRANSPORT/if4_tools.h
+5
-5
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+2
-2
No files found.
openair1/PHY/LTE_TRANSPORT/if4_tools.c
View file @
ab058059
...
...
@@ -309,7 +309,7 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
*
subframe
=
((
packet_header
->
frame_status
)
>>
22
)
&
0x000f
;
*
packet_type
=
packet_header
->
sub_type
;
LOG_D
(
PHY
,
"recv_IF4p5: Frame %d, Subframe %d: packet_type %x
\n
"
,
*
frame
,
*
subframe
,
*
packet_type
);
if
(
*
packet_type
==
IF4p5_PDLFFT
)
{
*
symbol_number
=
((
packet_header
->
frame_status
)
>>
26
)
&
0x000f
;
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_RECV_IF4_SYMBOL
,
*
symbol_number
);
...
...
@@ -339,7 +339,6 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
slotoffsetF
=
(
*
symbol_number
)
*
(
fp
->
ofdm_symbol_size
);
blockoffsetF
=
slotoffsetF
+
fp
->
ofdm_symbol_size
-
db_halflength
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_DECOMPR_IF
,
1
);
if
(
ru
->
idx
==
0
)
LOG_D
(
PHY
,
"UL_IF4p5: CC_id %d : frame %d, subframe %d, symbol %d
\n
"
,
ru
->
idx
,
*
frame
,
*
subframe
,
*
symbol_number
);
for
(
element_id
=
0
;
element_id
<
db_halflength
;
element_id
++
)
{
i
=
(
uint16_t
*
)
&
rxdataF
[
0
][
blockoffsetF
+
element_id
];
*
i
=
alaw2lin_if4p5
[
(
data_block
[
element_id
]
&
0xff
)
];
...
...
@@ -379,8 +378,8 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
PRACH_BLOCK_SIZE_BYTES
);
}
//
LOG_D(PHY,"PRACH_IF4p5: CC_id %d : frame %d, subframe %d => %d dB\n",ru->idx,*frame,*subframe,
//
dB_fixed(signal_energy((int*)&prach_rxsigF[0][0],839)));
LOG_D
(
PHY
,
"PRACH_IF4p5: CC_id %d : frame %d, subframe %d => %d dB
\n
"
,
ru
->
idx
,
*
frame
,
*
subframe
,
dB_fixed
(
signal_energy
((
int
*
)
&
prach_rxsigF
[
0
][
0
],
839
)));
for
(
idx
=
0
;
idx
<
ru
->
num_eNB
;
idx
++
)
ru
->
wakeup_prach_eNB
(
ru
->
eNB_list
[
idx
],
ru
,
*
frame
,
*
subframe
);
}
else
if
(
*
packet_type
==
IF4p5_PULTICK
)
{
...
...
openair1/PHY/LTE_TRANSPORT/if4_tools.h
View file @
ab058059
...
...
@@ -39,11 +39,11 @@
#define IF4p5_PULFFT 0x0019
#define IF4p5_PDLFFT 0x0020
#define IF4p5_PRACH 0x0021
#define IF4p5_PRACH_BR_CE0 0x002
1
#define IF4p5_PRACH_BR_CE1 0x002
2
#define IF4p5_PRACH_BR_CE2 0x002
3
#define IF4p5_PRACH_BR_CE3 0x002
4
#define IF4p5_PULTICK 0x002
5
#define IF4p5_PRACH_BR_CE0 0x002
2
#define IF4p5_PRACH_BR_CE1 0x002
3
#define IF4p5_PRACH_BR_CE2 0x002
4
#define IF4p5_PRACH_BR_CE3 0x002
5
#define IF4p5_PULTICK 0x002
6
struct
IF4p5_header
{
/// Type
...
...
targets/RT/USER/lte-enb.c
View file @
ab058059
...
...
@@ -386,7 +386,7 @@ void wakeup_prach_eNB(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe) {
pthread_mutex_lock
(
&
proc
->
mutex_RU_PRACH
);
for
(
i
=
0
;
i
<
eNB
->
num_RU
;
i
++
)
{
if
(
ru
==
eNB
->
RU_list
[
i
])
{
LOG_
D
(
PHY
,
"frame %d, subframe %d: RU %d for eNB %d signals PRACH (mask %x, num_RU %d)
\n
"
,
frame
,
subframe
,
i
,
eNB
->
Mod_id
,
proc
->
RU_mask_prach
,
eNB
->
num_RU
);
LOG_
I
(
PHY
,
"frame %d, subframe %d (%d): RU %d for eNB %d signals PRACH (mask %x, num_RU %d)
\n
"
,
frame
,
subframe
,
is_prach_subframe
(
fp
,
frame
,
subframe
)
,
i
,
eNB
->
Mod_id
,
proc
->
RU_mask_prach
,
eNB
->
num_RU
);
if
((
proc
->
RU_mask_prach
&
(
1
<<
i
))
>
0
)
LOG_E
(
PHY
,
"eNB %d frame %d, subframe %d : previous information (PRACH) from RU %d (num_RU %d, mask %x) has not been served yet!
\n
"
,
eNB
->
Mod_id
,
frame
,
subframe
,
ru
->
idx
,
eNB
->
num_RU
,
proc
->
RU_mask_prach
);
...
...
@@ -405,7 +405,7 @@ void wakeup_prach_eNB(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe) {
// check if we have to detect PRACH first
if
(
is_prach_subframe
(
fp
,
frame
,
subframe
)
>
0
)
{
LOG_
D
(
PHY
,
"Triggering prach processing, frame %d, subframe %d
\n
"
,
frame
,
subframe
);
LOG_
I
(
PHY
,
"Triggering prach processing, frame %d, subframe %d
\n
"
,
frame
,
subframe
);
if
(
proc
->
instance_cnt_prach
==
0
)
{
LOG_W
(
PHY
,
"[eNB] Frame %d Subframe %d, dropping PRACH
\n
"
,
frame
,
subframe
);
return
;
...
...
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