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
lizhongxiao
OpenXG-RAN
Commits
de76c9de
Commit
de76c9de
authored
Nov 21, 2023
by
111
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some fixes
parent
87a61800
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
769 additions
and
277 deletions
+769
-277
executables/ric-interface-dmrs.c
executables/ric-interface-dmrs.c
+2
-2
executables/ric-interface.c
executables/ric-interface.c
+5
-5
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+3
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+3
-3
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
+1
-1
radio/rfsimulator/simulator.c
radio/rfsimulator/simulator.c
+430
-262
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.1x4.36192.oxgrf.conf
...NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.1x4.36192.oxgrf.conf
+324
-0
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.1x4.oxgrf.conf
...NERIC-NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.1x4.oxgrf.conf
+1
-1
No files found.
executables/ric-interface-dmrs.c
View file @
de76c9de
...
@@ -50,7 +50,7 @@ int round_times = 0;//轮数
...
@@ -50,7 +50,7 @@ int round_times = 0;//轮数
//定义两个表示线程的变量(标识符)
//定义两个表示线程的变量(标识符)
pthread_t
myThread1
;
pthread_t
myThread1
;
//创建 myThread1 线程
//创建 myThread1 线程
static
int
start
=
0
;
int
bupt_
start
=
0
;
static
int
closesocket
=
0
;
static
int
closesocket
=
0
;
#define RIC_INTERFACE_PORT 7788
#define RIC_INTERFACE_PORT 7788
#define RIC_INTERFACE_SOCKET_MAX_LEN (104+4*273*12*4*2*4)
#define RIC_INTERFACE_SOCKET_MAX_LEN (104+4*273*12*4*2*4)
...
@@ -154,7 +154,7 @@ void *ric_interface_task(void *args_p)
...
@@ -154,7 +154,7 @@ void *ric_interface_task(void *args_p)
printf
(
"线程创建失败"
);
printf
(
"线程创建失败"
);
return
0
;
return
0
;
}
}
start
=
1
;
//是否传数据
bupt_
start
=
1
;
//是否传数据
//assert(0);
//assert(0);
// iRecvLen = recv(new_fd, buf, sizeof(buf), 0);
// iRecvLen = recv(new_fd, buf, sizeof(buf), 0);
...
...
executables/ric-interface.c
View file @
de76c9de
...
@@ -50,7 +50,7 @@ int round_times = 0;//轮数
...
@@ -50,7 +50,7 @@ int round_times = 0;//轮数
//定义两个表示线程的变量(标识符)
//定义两个表示线程的变量(标识符)
pthread_t
myThread1
;
pthread_t
myThread1
;
//创建 myThread1 线程
//创建 myThread1 线程
static
int
start
=
0
;
int
bupt_
start
=
0
;
static
int
closesocket
=
0
;
static
int
closesocket
=
0
;
#define RIC_INTERFACE_PORT 7788
#define RIC_INTERFACE_PORT 7788
#define RIC_INTERFACE_SOCKET_MAX_LEN (104+4*273*12*4*2*4)
#define RIC_INTERFACE_SOCKET_MAX_LEN (104+4*273*12*4*2*4)
...
@@ -154,7 +154,7 @@ void *ric_interface_task(void *args_p)
...
@@ -154,7 +154,7 @@ void *ric_interface_task(void *args_p)
printf
(
"线程创建失败"
);
printf
(
"线程创建失败"
);
return
0
;
return
0
;
}
}
start
=
1
;
//是否传数据
bupt_
start
=
1
;
//是否传数据
//assert(0);
//assert(0);
// iRecvLen = recv(new_fd, buf, sizeof(buf), 0);
// iRecvLen = recv(new_fd, buf, sizeof(buf), 0);
...
@@ -195,11 +195,11 @@ void *ric_interface_task(void *args_p)
...
@@ -195,11 +195,11 @@ void *ric_interface_task(void *args_p)
// fwrite(ric_send_buf, sizeof(int32_t), 26, output_fd);
// fwrite(ric_send_buf, sizeof(int32_t), 26, output_fd);
// //printf("writing\n");
// //printf("writing\n");
// }
// }
send_len1
=
send
(
new_fd
,
ric_send_buf
,
ric_send_len
-
12
-
(
ric_send_len
-
12
-
len1
)
/
2
,
0
);
send_len1
=
send
(
new_fd
,
ric_send_buf
,
ric_send_len
-
(
ric_send_len
-
len1
)
/
2
,
0
);
//printf ("send data %p, size %d to client. %d OK \n", ric_send_buf, ric_send_len-12-(ric_send_len-len1-12)/2, send_len1);
//printf ("send data %p, size %d to client. %d OK \n", ric_send_buf, ric_send_len-12-(ric_send_len-len1-12)/2, send_len1);
send_len2
=
send
(
new_fd
,
ric_send_buf
+
len2
,
(
ric_send_len
-
len1
-
12
)
/
2
,
0
);
//pos*4*2
send_len2
=
send
(
new_fd
,
ric_send_buf
+
len2
,
(
ric_send_len
-
len1
)
/
2
,
0
);
//pos*4*2
//printf ("send data %p, size %d to client. %d OK \n", ric_send_buf,(ric_send_len-len1-12)/2 , send_len2);
//printf ("send data %p, size %d to client. %d OK \n", ric_send_buf,(ric_send_len-len1-12)/2 , send_len2);
send_len3
=
send
(
new_fd
,
ta_information
,
12
,
0
);
//
send_len3 = send(new_fd, ta_information, 12, 0);
//printf ("send data %p, size %d to client. %d OK \n", ta_information, ric_send_len, send_len3);
//printf ("send data %p, size %d to client. %d OK \n", ta_information, ric_send_len, send_len3);
round_times
=
round_times
+
1
;
round_times
=
round_times
+
1
;
}
}
...
...
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
View file @
de76c9de
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
#define SEND_BY_SOCKET
#define SEND_BY_SOCKET
int
g_dmrs_caps_idx
=
0
;
int
g_dmrs_caps_idx
=
0
;
int
g_dmrs_cnt
=
0
;
int
g_dmrs_cnt
=
0
;
int
start
;
extern
int
bupt_
start
;
#if defined SEND_BY_SOCKET
#if defined SEND_BY_SOCKET
NR_DMRS_CAPS_t
g_dmrs_caps
[
2
];
NR_DMRS_CAPS_t
g_dmrs_caps
[
2
];
extern
uint8_t
*
ric_send_buf
;
extern
uint8_t
*
ric_send_buf
;
...
@@ -2297,9 +2297,9 @@ void nr_rx_pusch(PHY_VARS_gNB *gNB,
...
@@ -2297,9 +2297,9 @@ void nr_rx_pusch(PHY_VARS_gNB *gNB,
#if defined SEND_BY_SOCKET
#if defined SEND_BY_SOCKET
ric_send_buf
=
&
g_dmrs_caps
[
g_dmrs_caps_idx
];
ric_send_buf
=
&
g_dmrs_caps
[
g_dmrs_caps_idx
];
ric_send_len
=
OFFSETOF
(
NR_DMRS_CAPS_t
,
dmrsData
)
+
pos
*
4
*
2
+
12
;
//长度
ric_send_len
=
OFFSETOF
(
NR_DMRS_CAPS_t
,
dmrsData
)
+
pos
*
4
*
2
;
//长度 djy修改
g_dmrs_caps
[
g_dmrs_caps_idx
].
dataLen
=
ric_send_len
;
g_dmrs_caps
[
g_dmrs_caps_idx
].
dataLen
=
ric_send_len
;
if
(
start
==
1
)
if
(
bupt_
start
==
1
)
{
{
sem_post
(
&
ric_send_sem
);
sem_post
(
&
ric_send_sem
);
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
de76c9de
...
@@ -1554,7 +1554,7 @@ void pf_ul(module_id_t module_id,
...
@@ -1554,7 +1554,7 @@ void pf_ul(module_id_t module_id,
gNB_MAC_INST
*
nrmac
=
RC
.
nrmac
[
module_id
];
gNB_MAC_INST
*
nrmac
=
RC
.
nrmac
[
module_id
];
NR_ServingCellConfigCommon_t
*
scc
=
nrmac
->
common_channels
[
CC_id
].
ServingCellConfigCommon
;
NR_ServingCellConfigCommon_t
*
scc
=
nrmac
->
common_channels
[
CC_id
].
ServingCellConfigCommon
;
const
int
min_rb
=
9
0
;
const
int
min_rb
=
25
0
;
// UEs that could be scheduled
// UEs that could be scheduled
UEsched_t
UE_sched
[
MAX_MOBILES_PER_GNB
]
=
{
0
};
UEsched_t
UE_sched
[
MAX_MOBILES_PER_GNB
]
=
{
0
};
int
remainUEs
=
max_num_ue
;
int
remainUEs
=
max_num_ue
;
...
@@ -1657,8 +1657,8 @@ void pf_ul(module_id_t module_id,
...
@@ -1657,8 +1657,8 @@ void pf_ul(module_id_t module_id,
while
(
rbStart
<
bwpSize
&&
(
rballoc_mask
[
rbStart
]
&
slbitmap
)
!=
slbitmap
)
while
(
rbStart
<
bwpSize
&&
(
rballoc_mask
[
rbStart
]
&
slbitmap
)
!=
slbitmap
)
rbStart
++
;
rbStart
++
;
if
(
rbStart
+
min_rb
>=
bwpSize
)
{
if
(
rbStart
+
min_rb
>=
bwpSize
)
{
LOG_W
(
NR_MAC
,
"cannot allocate continuous UL data for RNTI %04x: no resources (rbStart %d, min_rb %d, bwpSize %d
\n
"
,
LOG_W
(
NR_MAC
,
"
frame %d %d
cannot allocate continuous UL data for RNTI %04x: no resources (rbStart %d, min_rb %d, bwpSize %d
\n
"
,
UE
->
rnti
,
rbStart
,
min_rb
,
bwpSize
);
UE
->
rnti
,
rbStart
,
min_rb
,
bwpSize
,
frame
,
slot
);
continue
;
continue
;
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
View file @
de76c9de
...
@@ -56,7 +56,7 @@ int dl_rrc_message(module_id_t module_id, const f1ap_dl_rrc_message_t *dl_rrc)
...
@@ -56,7 +56,7 @@ int dl_rrc_message(module_id_t module_id, const f1ap_dl_rrc_message_t *dl_rrc)
break
;
break
;
case
NR_DL_CCCH_MessageType__c1_PR_rrcReject
:
case
NR_DL_CCCH_MessageType__c1_PR_rrcReject
:
LOG_D
(
NR_MAC
,
"DL-CCCH/SRB0, received rrcReject for RNTI %04x
\n
"
,
dl_rrc
->
rnti
);
LOG_D
(
NR_MAC
,
"DL-CCCH/SRB0, received rrcReject for RNTI %04x
\n
"
,
dl_rrc
->
rnti
);
AssertFatal
(
0
,
"rrcReject not implemented yet
\n
"
);
//
AssertFatal(0, "rrcReject not implemented yet\n");
break
;
break
;
case
NR_DL_CCCH_MessageType__c1_PR_rrcSetup
:
case
NR_DL_CCCH_MessageType__c1_PR_rrcSetup
:
LOG_I
(
NR_MAC
,
"DL-CCCH/SRB0, received rrcSetup for RNTI %04x
\n
"
,
dl_rrc
->
rnti
);
LOG_I
(
NR_MAC
,
"DL-CCCH/SRB0, received rrcSetup for RNTI %04x
\n
"
,
dl_rrc
->
rnti
);
...
...
radio/rfsimulator/simulator.c
View file @
de76c9de
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.1x4.36192.oxgrf.conf
0 → 100644
View file @
de76c9de
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.1x4.oxgrf.conf
View file @
de76c9de
...
@@ -30,7 +30,7 @@ gNBs =
...
@@ -30,7 +30,7 @@ gNBs =
pdsch_AntennaPorts_XP
=
1
;
pdsch_AntennaPorts_XP
=
1
;
pusch_AntennaPorts
=
2
;
pusch_AntennaPorts
=
2
;
#do_CSIRS = 1;
#do_CSIRS = 1;
do_SRS
=
1
;
do_SRS
=
0
;
ul_prbblacklist
=
"135,136,137,138"
ul_prbblacklist
=
"135,136,137,138"
pdcch_ConfigSIB1
= (
pdcch_ConfigSIB1
= (
...
...
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