Skip to content

O
OpenXG-RAN
Commit a44d5fdc authored by Rigiel Antony's avatar Rigiel Antony
Browse files
Options

fixed mergee conflicts

parents 7964fed7 884cbc7c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @ a44d5fdc
...@@ -244,6 +244,8 @@ typedef struct UE_info { ...@@ -244,6 +244,8 @@ typedef struct UE_info {
pdschTciStatesActDeact_t pdsch_TCI_States_ActDeact; pdschTciStatesActDeact_t pdsch_TCI_States_ActDeact;
} NR_UE_mac_ce_ctrl_t; } NR_UE_mac_ce_ctrl_t;
typedef struct NR_sched_pucch {
int frame;
int ul_slot; int ul_slot;
uint8_t dai_c; uint8_t dai_c;
uint8_t timing_indicator; uint8_t timing_indicator;
...@@ -251,7 +253,6 @@ typedef struct UE_info { ...@@ -251,7 +253,6 @@ typedef struct UE_info {
struct NR_sched_pucch *next_sched_pucch; struct NR_sched_pucch *next_sched_pucch;
} NR_sched_pucch; } NR_sched_pucch;
/*! \brief scheduling control information set through an API */ /*! \brief scheduling control information set through an API */
typedef struct { typedef struct {
uint64_t dlsch_in_slot_bitmap; // static bitmap signaling which slot in a tdd period contains dlsch uint64_t dlsch_in_slot_bitmap; // static bitmap signaling which slot in a tdd period contains dlsch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment