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
112b3719
Commit
112b3719
authored
Mar 10, 2017
by
Elena_Lukashova
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature-59-tm4
parents
83a045ec
5c375d3a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+1
-1
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
+1
-1
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+1
-0
No files found.
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
View file @
112b3719
...
...
@@ -148,7 +148,7 @@ int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, voi
int
sent_byte
;
if
(
eth
->
compression
=
ALAW_COMPRESS
)
{
if
(
eth
->
compression
=
=
ALAW_COMPRESS
)
{
sent_byte
=
RAW_PACKET_SIZE_BYTES_ALAW
(
nsamps
);
}
else
{
sent_byte
=
RAW_PACKET_SIZE_BYTES
(
nsamps
);
...
...
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
View file @
112b3719
...
...
@@ -68,7 +68,7 @@
// Packet sizes for IF4p5 interface format
#define DATA_BLOCK_SIZE_BYTES(scaled_nblocks) (sizeof(uint16_t)*scaled_nblocks)
#define PRACH_HARD_CODED_NUM_SAMPLES (839*
4
)
#define PRACH_HARD_CODED_NUM_SAMPLES (839*
2
)
#define PRACH_BLOCK_SIZE_BYTES (sizeof(int16_t)*PRACH_HARD_CODED_NUM_SAMPLES) // FIX hard coded prach size
#define RAW_IF4p5_PDLFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4p5_header_t + DATA_BLOCK_SIZE_BYTES(nblocks))
...
...
targets/RT/USER/lte-softmodem.c
View file @
112b3719
...
...
@@ -1081,6 +1081,7 @@ static void get_options (int argc, char **argv) {
}
else
{
(
eth_params
+
j
)
->
rf_preference
=
0
;
}
(
eth_params
+
j
)
->
if_compress
=
enb_properties
->
properties
[
i
]
->
rrh_gw_config
[
j
].
if_compress
;
}
else
{
local_remote_radio
=
BBU_LOCAL_RADIO_HEAD
;
}
...
...
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