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
wangwenhui
OpenXG-RAN
Commits
222519fb
Commit
222519fb
authored
Sep 28, 2016
by
Rohit Gupta
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into develop
parents
dc2ec6fd
1410b3f3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/defs.h
+6
-2
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
+1
-0
No files found.
openair2/LAYER2/MAC/defs.h
View file @
222519fb
...
@@ -621,7 +621,9 @@ typedef struct {
...
@@ -621,7 +621,9 @@ typedef struct {
uint8_t
DLSCH_dci_size_bits
;
uint8_t
DLSCH_dci_size_bits
;
/// DCI buffer for DLSCH
/// DCI buffer for DLSCH
uint8_t
DLSCH_DCI
[
8
][(
MAX_DCI_SIZE_BITS
>>
3
)
+
1
];
/* rounded to 32 bits unit (actual value should be 8 due to the logic
* of the function generate_dci0) */
uint8_t
DLSCH_DCI
[
8
][(((
MAX_DCI_SIZE_BITS
)
+
31
)
>>
5
)
*
4
];
/// Number of Allocated RBs for DL after scheduling (prior to frequency allocation)
/// Number of Allocated RBs for DL after scheduling (prior to frequency allocation)
uint16_t
nb_rb
[
8
];
// num_max_harq
uint16_t
nb_rb
[
8
];
// num_max_harq
...
@@ -645,7 +647,9 @@ typedef struct {
...
@@ -645,7 +647,9 @@ typedef struct {
uint8_t
assigned_mcs_ul
;
uint8_t
assigned_mcs_ul
;
/// DCI buffer for ULSCH
/// DCI buffer for ULSCH
uint8_t
ULSCH_DCI
[
8
][(
MAX_DCI_SIZE_BITS
>>
3
)
+
1
];
/* rounded to 32 bits unit (actual value should be 8 due to the logic
* of the function generate_dci0) */
uint8_t
ULSCH_DCI
[
8
][(((
MAX_DCI_SIZE_BITS
)
+
31
)
>>
5
)
*
4
];
/// DL DAI
/// DL DAI
uint8_t
DAI
;
uint8_t
DAI
;
...
...
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
View file @
222519fb
...
@@ -774,6 +774,7 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
...
@@ -774,6 +774,7 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
openair0_cfg
[
card
].
rxbase
[
ant
]
=
(
int32_t
*
)
openair0_exmimo_pci
[
card
].
adc_head
[
ant
];
openair0_cfg
[
card
].
rxbase
[
ant
]
=
(
int32_t
*
)
openair0_exmimo_pci
[
card
].
adc_head
[
ant
];
openair0_cfg
[
card
].
txbase
[
ant
]
=
(
int32_t
*
)
openair0_exmimo_pci
[
card
].
dac_head
[
ant
];
openair0_cfg
[
card
].
txbase
[
ant
]
=
(
int32_t
*
)
openair0_exmimo_pci
[
card
].
dac_head
[
ant
];
}
}
openair0_cfg
[
card
].
mmapped_dma
=
1
;
}
}
create_watchdog
(
device
);
create_watchdog
(
device
);
...
...
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