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
Michael Black
OpenXG UE
Commits
6c1cd993
Commit
6c1cd993
authored
Jul 25, 2014
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
git-svn-id:
http://svn.eurecom.fr/openair4G/trunk@5611
818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent
23f22b87
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
9 deletions
+35
-9
targets/RT/USER/Makefile
targets/RT/USER/Makefile
+2
-2
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+33
-7
No files found.
targets/RT/USER/Makefile
View file @
6c1cd993
...
@@ -99,9 +99,9 @@ include $(OPENAIR3_DIR)/RAL-LTE/Makefile.inc
...
@@ -99,9 +99,9 @@ include $(OPENAIR3_DIR)/RAL-LTE/Makefile.inc
ifeq
($(USRP),1)
ifeq
($(USRP),1)
include
$(OPENAIR_TARGETS)/ARCH/USRP/USERSPACE/LIB/Makefile.inc
include
$(OPENAIR_TARGETS)/ARCH/USRP/USERSPACE/LIB/Makefile.inc
CFLAGS
+=
-I
/opt/
uhd/include
-L
/opt/uhd
/lib
-luhd
-lpthread
-lstdc
++
CFLAGS
+=
-I
/opt/
include/uhd
-L
/opt
/lib
-luhd
-lpthread
-lstdc
++
CFLAGS
+=
-DUSRP
CFLAGS
+=
-DUSRP
LDFLAGS
+=
-L
/opt/
uhd/
lib
-luhd
-lpthread
-lstdc
++
LDFLAGS
+=
-L
/opt/lib
-luhd
-lpthread
-lstdc
++
endif
endif
OBJ
+=
$(ENB_APP_OBJS)
OBJ
+=
$(ENB_APP_OBJS)
...
...
targets/RT/USER/lte-softmodem.c
View file @
6c1cd993
...
@@ -234,7 +234,7 @@ static char *itti_dump_file = NULL;
...
@@ -234,7 +234,7 @@ static char *itti_dump_file = NULL;
#ifndef USRP
#ifndef USRP
double
tx_gain
=
20
;
double
tx_gain
=
20
;
double
rx_gain
=
3
0
;
double
rx_gain
=
1
0
;
#else
#else
double
tx_gain
=
120
;
double
tx_gain
=
120
;
double
rx_gain
=
30
;
double
rx_gain
=
30
;
...
@@ -1088,8 +1088,12 @@ void init_eNB_proc() {
...
@@ -1088,8 +1088,12 @@ void init_eNB_proc() {
pthread_cond_init
(
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
].
cond_rx
,
NULL
);
pthread_cond_init
(
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
].
cond_rx
,
NULL
);
pthread_create
(
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
].
pthread_tx
,
NULL
,
eNB_thread_tx
,(
void
*
)
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
]);
pthread_create
(
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
].
pthread_tx
,
NULL
,
eNB_thread_tx
,(
void
*
)
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
]);
pthread_create
(
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
].
pthread_rx
,
NULL
,
eNB_thread_rx
,(
void
*
)
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
]);
pthread_create
(
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
].
pthread_rx
,
NULL
,
eNB_thread_rx
,(
void
*
)
&
PHY_vars_eNB_g
[
0
]
->
proc
[
i
]);
PHY_vars_eNB_g
[
0
]
->
proc
[
i
].
frame_tx
=
0
;
PHY_vars_eNB_g
[
0
]
->
proc
[
i
].
frame_rx
=
0
;
}
PHY_vars_eNB_g
[
0
]
->
proc
[
0
].
frame_rx
=
1023
;
PHY_vars_eNB_g
[
0
]
->
proc
[
9
].
frame_tx
=
1
;
}
}
}
void
kill_eNB_proc
()
{
void
kill_eNB_proc
()
{
...
@@ -1214,6 +1218,8 @@ static void *eNB_thread(void *arg)
...
@@ -1214,6 +1218,8 @@ static void *eNB_thread(void *arg)
#ifndef USRP
#ifndef USRP
hw_slot
=
(((((
volatile
unsigned
int
*
)
DAQ_MBOX
)[
0
]
+
1
)
%
150
)
<<
1
)
/
15
;
hw_slot
=
(((((
volatile
unsigned
int
*
)
DAQ_MBOX
)[
0
]
+
1
)
%
150
)
<<
1
)
/
15
;
// LOG_D(HW,"eNB frame %d, time %llu: slot %d, hw_slot %d (mbox %d)\n",frame,rt_get_time_ns(),slot,hw_slot,((unsigned int *)DAQ_MBOX)[0]);
// LOG_D(HW,"eNB frame %d, time %llu: slot %d, hw_slot %d (mbox %d)\n",frame,rt_get_time_ns(),slot,hw_slot,((unsigned int *)DAQ_MBOX)[0]);
vcd_signal_dumper_dump_variable_by_name
(
VCD_SIGNAL_DUMPER_VARIABLES_HW_SUBFRAME
,
hw_slot
>>
1
);
vcd_signal_dumper_dump_variable_by_name
(
VCD_SIGNAL_DUMPER_VARIABLES_HW_FRAME
,
frame
);
//this is the mbox counter where we should be
//this is the mbox counter where we should be
mbox_target
=
mbox_bounds
[
slot
];
mbox_target
=
mbox_bounds
[
slot
];
//this is the mbox counter where we are
//this is the mbox counter where we are
...
@@ -1280,16 +1286,36 @@ static void *eNB_thread(void *arg)
...
@@ -1280,16 +1286,36 @@ static void *eNB_thread(void *arg)
openair0_timestamp
time0
,
time1
;
openair0_timestamp
time0
,
time1
;
unsigned
int
rxs
;
unsigned
int
rxs
;
// Grab 1/4 of RX buffer and get timestamp
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
rxs
=
openair0
.
trx_read_func
(
&
openair0
,
&
timestamp
,
&
rxdata
[
rx_cnt
*
samples_per_packets
],
samples_per_packets
);
rxs
=
openair0
.
trx_read_func
(
&
openair0
,
if
(
rxs
!=
samples_per_packets
)
&
timestamp
,
&
rxdata
[
rx_cnt
*
samples_per_packets
],
(
samples_per_packets
>>
2
));
if
(
rxs
!=
(
samples_per_packets
>>
2
))
oai_exit
=
1
;
oai_exit
=
1
;
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
// Transmit TX buffer based on timestamp from RX
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
1
);
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
1
);
openair0
.
trx_write_func
(
&
openair0
,
(
timestamp
+
samples_per_packets
*
tx_delay
-
tx_forward_nsamps
),
&
txdata
[
tx_cnt
*
samples_per_packets
],
samples_per_packets
,
1
);
openair0
.
trx_write_func
(
&
openair0
,
(
timestamp
+
samples_per_packets
*
tx_delay
-
tx_forward_nsamps
),
&
txdata
[
tx_cnt
*
samples_per_packets
],
samples_per_packets
,
1
);
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
0
);
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
0
);
// Grab remaining 3/4 of RX buffer
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
rxs
=
openair0
.
trx_read_func
(
&
openair0
,
&
timestamp
,
&
rxdata
[(
rx_cnt
*
samples_per_packets
)
+
(
samples_per_packets
>>
2
)],
3
*
((
samples_per_packets
>>
2
)));
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
if
(
rxs
!=
(
3
*
(
samples_per_packets
>>
2
)))
oai_exit
=
1
;
rx_cnt
++
;
rx_cnt
++
;
tx_cnt
++
;
tx_cnt
++
;
...
@@ -1338,7 +1364,7 @@ static void *eNB_thread(void *arg)
...
@@ -1338,7 +1364,7 @@ static void *eNB_thread(void *arg)
}
}
}
}
else
{
// multi-thread > 0
else
{
// multi-thread > 0
if
((
slot
&
1
)
==
0
)
{
if
((
slot
&
1
)
==
1
)
{
sf
=
((
slot
>>
1
)
+
1
)
%
10
;
sf
=
((
slot
>>
1
)
+
1
)
%
10
;
// LOG_I(PHY,"[eNB] Multithread slot %d (IC %d)\n",slot,PHY_vars_eNB_g[0]->proc[sf].instance_cnt);
// LOG_I(PHY,"[eNB] Multithread slot %d (IC %d)\n",slot,PHY_vars_eNB_g[0]->proc[sf].instance_cnt);
...
@@ -1917,7 +1943,7 @@ int main(int argc, char **argv) {
...
@@ -1917,7 +1943,7 @@ int main(int argc, char **argv) {
set_comp_log
(
HW
,
LOG_DEBUG
,
LOG_HIGH
,
1
);
set_comp_log
(
HW
,
LOG_DEBUG
,
LOG_HIGH
,
1
);
#ifdef OPENAIR2
#ifdef OPENAIR2
set_comp_log
(
PHY
,
LOG_
INFO
,
LOG_HIGH
,
1
);
set_comp_log
(
PHY
,
LOG_
DEBUG
,
LOG_HIGH
,
1
);
#else
#else
set_comp_log
(
PHY
,
LOG_INFO
,
LOG_HIGH
,
1
);
set_comp_log
(
PHY
,
LOG_INFO
,
LOG_HIGH
,
1
);
#endif
#endif
...
...
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