diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 63b707aa748a79db8c90eb049b9672f7e70cbe99..3e65f83e063a7f5385771290437ce6d3fd9f6d73 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -596,20 +596,6 @@ class Containerize():
else:
time.sleep(10)
- # HACK TO REMOVE LATER WHEN FIX
- res = re.search('oai-nr-ue', self.services[0])
- if res is not None:
- cmd = 'docker exec rfsim5g-oai-nr-ue /bin/bash -c "ip route del default"'
- logging.debug(cmd)
- deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
- cmd = 'docker exec rfsim5g-oai-nr-ue /bin/bash -c "ip route del 12.1.1.0/24"'
- logging.debug(cmd)
- deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
- cmd = 'docker exec rfsim5g-oai-nr-ue /bin/bash -c "ip route add default via 12.1.1.2 dev oaitun_ue1"'
- logging.debug(cmd)
- deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
- # END OF HACK TO REMOVE LATER WHEN FIX
-
if count == 100 and healthy == self.nb_healthy[0]:
HTML.CreateHtmlTestRow('n/a', 'OK', CONST.ALL_PROCESSES_OK)
logging.info('\u001B[1m Deploying OAI Object(s) PASS\u001B[0m')
@@ -628,7 +614,7 @@ class Containerize():
logging.debug(cmd)
subprocess.run(cmd, shell=True)
-# if the containers are running, recover the logs!
+ # if the containers are running, recover the logs!
cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all'
logging.debug(cmd)
deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10)
@@ -831,7 +817,9 @@ class Containerize():
logging.debug('\u001B[1;34m Jitter : ' + jitter + '\u001B[0m')
self.IperfExit(HTML, iperfStatus, msg)
else:
+ iperfStatus = False
logging.error('problem?')
+ self.IperfExit(HTML, iperfStatus, 'problem?')
if iperfStatus:
logging.info('\u001B[1m Iperf Test PASS\u001B[0m')
diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 15b28cbe996d7e3f289a5625be41e68311313e81..f1ab8c106fbc51a0c8d33ffec48eb0bcdf3c44ab 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -2005,6 +2005,7 @@ class OaiCiTest():
curr_br = curr_br * 1000 * 1000
br_sum = curr_br + br_sum
ji_sum = float(ji[0]) + ji_sum
+
if (row_idx > 0):
br_sum = br_sum / row_idx
ji_sum = ji_sum / row_idx
@@ -2025,10 +2026,12 @@ class OaiCiTest():
pl = float(100 * pl_sum / ps_sum)
packetloss = '%2.1f ' % (pl)
packetloss += '%'
- else:
- packetloss = 'unknown'
+ if float(pl) > float(self.iperf_packetloss_threshold):
+ pal_too_high_msg = 'Packet Loss too high : actual = '+packetloss+', target = '+self.iperf_packetloss_threshold+'%\n'
+ else:
+ pal_too_high_msg=''
lock.acquire()
- if (br_loss < 90):
+ if (br_loss < 90) or (float(pl) > float(self.iperf_packetloss_threshold)):
statusQueue.put(1)
else:
statusQueue.put(0)
@@ -2039,13 +2042,14 @@ class OaiCiTest():
brl_msg = 'Bitrate Perf: ' + bitperf
jit_msg = 'Jitter : ' + jitter
pal_msg = 'Packet Loss : ' + packetloss
- statusQueue.put(req_msg + '\n' + bir_msg + '\n' + brl_msg + '\n' + jit_msg + '\n' + pal_msg + '\n')
+ statusQueue.put(req_msg + '\n' + bir_msg + '\n' + brl_msg + '\n' + jit_msg + '\n' + pal_msg + '\n' + pal_too_high_msg + '\n')
logging.debug('\u001B[1;37;45m iperf result (' + UE_IPAddress + ') \u001B[0m')
logging.debug('\u001B[1;35m ' + req_msg + '\u001B[0m')
logging.debug('\u001B[1;35m ' + bir_msg + '\u001B[0m')
logging.debug('\u001B[1;35m ' + brl_msg + '\u001B[0m')
logging.debug('\u001B[1;35m ' + jit_msg + '\u001B[0m')
logging.debug('\u001B[1;35m ' + pal_msg + '\u001B[0m')
+ logging.debug('\u001B[1;35m ' + pal_too_high_msg + '\u001B[0m')
lock.release()
else:
self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not analyze from server log')
@@ -2705,7 +2709,7 @@ class OaiCiTest():
if (status_queue.empty()):
HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.ALL_PROCESSES_OK)
- self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfaUE)
+ self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE)
else:
iperf_status = True
iperf_noperf = False
diff --git a/ci-scripts/xml_files/container_4g_rfsim.xml b/ci-scripts/xml_files/container_4g_rfsim.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5430b2b0567ea92703cbf25f967d38cc8a9e3af4
--- /dev/null
+++ b/ci-scripts/xml_files/container_4g_rfsim.xml
@@ -0,0 +1,129 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+ contact@openairinterface.org
+
+-->
+<testCaseList>
+ <htmlTabRef>rfsim-4glte</htmlTabRef>
+ <htmlTabName>Testing 4G LTE RF sim in containers</htmlTabName>
+ <htmlTabIcon>wrench</htmlTabIcon>
+ <TestCaseRequestedList>
+ 100011
+ 000011
+ 000001
+ 000012
+ 000002
+ 000013
+ 000001
+ 000014
+ 000002
+ 020011
+ 020012
+ 030011
+ 030012
+ 100011
+ </TestCaseRequestedList>
+ <TestCaseExclusionList></TestCaseExclusionList>
+
+ <testCase id="000011">
+ <class>DeployGenObject</class>
+ <desc>Deploy Cassandra Database</desc>
+ <yaml_path>yaml_files/4g_rfsimulator</yaml_path>
+ <services>cassandra db_init</services>
+ <nb_healthy>1</nb_healthy>
+ </testCase>
+
+ <testCase id="000001">
+ <class>IdleSleep</class>
+ <desc>Sleep</desc>
+ <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+ </testCase>
+
+ <testCase id="000002">
+ <class>IdleSleep</class>
+ <desc>Sleep</desc>
+ <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+ </testCase>
+
+ <testCase id="000012">
+ <class>DeployGenObject</class>
+ <desc>Deploy OAI 4G CoreNetwork</desc>
+ <yaml_path>yaml_files/4g_rfsimulator</yaml_path>
+ <services>oai_hss oai_mme oai_spgwc oai_spgwu trf_gen</services>
+ <nb_healthy>6</nb_healthy>
+ </testCase>
+
+ <testCase id="000013">
+ <class>DeployGenObject</class>
+ <desc>Deploy OAI 4G eNB RF sim</desc>
+ <yaml_path>yaml_files/4g_rfsimulator</yaml_path>
+ <services>enb</services>
+ <nb_healthy>7</nb_healthy>
+ </testCase>
+
+ <testCase id="000014">
+ <class>DeployGenObject</class>
+ <desc>Deploy OAI 4G NR-UE RF sim</desc>
+ <yaml_path>yaml_files/4g_rfsimulator</yaml_path>
+ <services>oai_ue0</services>
+ <nb_healthy>8</nb_healthy>
+ </testCase>
+
+ <testCase id="020011">
+ <class>PingFromContainer</class>
+ <desc>Ping Traffic-Gen from LTE-UE</desc>
+ <container_name>rfsim4g-oai-lte-ue0</container_name>
+ <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
+ <loss_threshold>5</loss_threshold>
+ </testCase>
+
+ <testCase id="020012">
+ <class>PingFromContainer</class>
+ <desc>Ping LTE-UE from Traffic-Gen</desc>
+ <container_name>rfsim4g-trf-gen</container_name>
+ <options>-c 20 12.0.0.2</options>
+ <loss_threshold>5</loss_threshold>
+ </testCase>
+
+ <testCase id="030011">
+ <class>IperfFromContainer</class>
+ <desc>Iperf UDP Downlink</desc>
+ <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+ <client_container_name>rfsim4g-trf-gen</client_container_name>
+ <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+ <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 2M</client_options>
+ </testCase>
+
+ <testCase id="030012">
+ <class>IperfFromContainer</class>
+ <desc>Iperf UDP Uplink</desc>
+ <server_container_name>rfsim4g-trf-gen</server_container_name>
+ <client_container_name>rfsim4g-oai-lte-ue0</client_container_name>
+ <server_options>-u -i 1 -s</server_options>
+ <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 1M</client_options>
+ </testCase>
+
+ <testCase id="100011">
+ <class>UndeployGenObject</class>
+ <desc>Undeploy all OAI 4G stack</desc>
+ <yaml_path>yaml_files/4g_rfsimulator</yaml_path>
+ </testCase>
+
+</testCaseList>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_down.xml b/ci-scripts/xml_files/container_4g_rfsim_down.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dee516d9248e1ea3dd2141dca5fa7f5e2987f3d2
--- /dev/null
+++ b/ci-scripts/xml_files/container_4g_rfsim_down.xml
@@ -0,0 +1,38 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+ contact@openairinterface.org
+
+-->
+<testCaseList>
+ <htmlTabRef>rfsim-4glte-down</htmlTabRef>
+ <htmlTabName>CleanUp 4G RF</htmlTabName>
+ <htmlTabIcon>trash</htmlTabIcon>
+ <TestCaseRequestedList>
+ 100011
+ </TestCaseRequestedList>
+ <TestCaseExclusionList></TestCaseExclusionList>
+
+ <testCase id="100011">
+ <class>UndeployGenObject</class>
+ <desc>Undeploy all OAI 4G stack</desc>
+ <yaml_path>yaml_files/4g_rfsimulator</yaml_path>
+ </testCase>
+
+</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml
index 8847c1189429ec8acc3f9f18d71a5d064a2a141e..660cd7cde86090c0739d6c1fa94ba7393c90703e 100644
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -25,6 +25,7 @@
<htmlTabName>Testing 5G NR RF sim in containers</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList>
+ 100001
000001
000002
000003
diff --git a/ci-scripts/yaml_files/5g_rfsimulator/README.md b/ci-scripts/yaml_files/5g_rfsimulator/README.md
index 807f1b47c55c6e6cd92632288076d83d08e2f093..1351d6742bc234daa3271e3d289098df3db26278 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator/README.md
+++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md
@@ -218,34 +218,6 @@ oaitun_ue1: flags=4305<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST> mtu 1500
TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
```
-**CAUTION: THESE NEXT FEW COMMANDS ARE A HACK. RAN developers SHALL FIX THIS!**
-
-```bash
-$ docker exec -it rfsim5g-oai-nr-ue /bin/bash
-
-# Check the current routes
-
-root@bb4d400a832d:/opt/oai-nr-ue# ip route
-default via 192.168.71.129 dev eth0
-12.1.1.0/24 dev oaitun_ue1 proto kernel scope link src 12.1.1.2
-192.168.71.128/26 dev eth0 proto kernel scope link src 192.168.71.137
-
-# Remove the default and PDN routes
-
-root@bb4d400a832d:/opt/oai-nr-ue# ip route del default
-root@bb4d400a832d:/opt/oai-nr-ue# ip route del 12.1.1.0/24
-
-# Force the default route through oaitun_ue1 tunnel
-
-root@bb4d400a832d:/opt/oai-nr-ue# ip route add default via 12.1.1.2 dev oaitun_ue1
-
-# Check the new routes
-
-root@bb4d400a832d:/opt/oai-nr-ue# ip route
-default via 12.1.1.2 dev oaitun_ue1
-192.168.71.128/26 dev eth0 proto kernel scope link src 192.168.71.137
-```
-
# 3. Check traffic #
## 3.1. Check your Internet connectivity ##
diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt
index ca5690497dc05140dc918e8b47254ec94f0ab26f..cd66be73f5ac650da9b6a25abfb44b1447b2f7c0 100644
--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -16,7 +16,7 @@ ID = ENB_PHY_DL_TICK
ID = ENB_PHY_DLSCH_UE_DCI
DESC = eNodeB downlink UE specific DCI as sent by the PHY layer
GROUP = ALL:PHY:GRAPHIC:ENB
- FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+ FORMAT = int,eNB_ID : int,frame : int,subframe : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS : int,ndi : int,rv : int,rbc : int,nb_rb : int,rb_alloc
ID = ENB_PHY_DLSCH_UE_ACK
DESC = eNodeB downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
GROUP = ALL:PHY:GRAPHIC:ENB
diff --git a/common/utils/nr/nr_common.c b/common/utils/nr/nr_common.c
index 9e4869035ab371acf483359bbbac6ae8832f0178..8ba4633604a5933d7245d3656b0c754b849f47bf 100644
--- a/common/utils/nr/nr_common.c
+++ b/common/utils/nr/nr_common.c
@@ -106,6 +106,40 @@ nr_bandentry_t nr_bandtable[] = {
{261,27500040,28350000,27500040,28350000, 2,2070833, 120}
};
+uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex)
+{
+ const uint64_t dl_freq_khz = downlink_frequency / 1000;
+ const int32_t delta_duplex_khz = delta_duplex / 1000;
+
+ uint64_t center_freq_diff_khz = 999999999999999999; // 2^64
+ uint16_t current_band = 0;
+
+ for (int ind = 0; ind < nr_bandtable_size; ind++) {
+
+ if (dl_freq_khz < nr_bandtable[ind].dl_min || dl_freq_khz > nr_bandtable[ind].dl_max)
+ continue;
+
+ int32_t current_offset_khz = nr_bandtable[ind].ul_min - nr_bandtable[ind].dl_min;
+
+ if (current_offset_khz != delta_duplex_khz)
+ continue;
+
+ uint64_t center_frequency_khz = (nr_bandtable[ind].dl_max + nr_bandtable[ind].dl_min) / 2;
+
+ if (abs(dl_freq_khz - center_frequency_khz) < center_freq_diff_khz){
+ current_band = nr_bandtable[ind].band;
+ center_freq_diff_khz = abs(dl_freq_khz - center_frequency_khz);
+ }
+ }
+
+ printf("DL frequency %"PRIu64": band %d, UL frequency %"PRIu64"\n",
+ downlink_frequency, current_band, downlink_frequency+delta_duplex);
+
+ AssertFatal(current_band != 0, "Can't find EUTRA band for frequency %"PRIu64" and duplex_spacing %u\n", downlink_frequency, delta_duplex);
+
+ return current_band;
+}
+
const size_t nr_bandtable_size = sizeof(nr_bandtable) / sizeof(nr_bandentry_t);
int NRRIV2BW(int locationAndBandwidth,int N_RB) {
diff --git a/common/utils/nr/nr_common.h b/common/utils/nr/nr_common.h
index b95fdd50463fc450d518282ee9a8a757ebd1e693..b3d2469a12d41751bc5c06f3de797bfe818cf8fc 100644
--- a/common/utils/nr/nr_common.h
+++ b/common/utils/nr/nr_common.h
@@ -50,6 +50,7 @@ typedef struct nr_bandentry_s {
extern const size_t nr_bandtable_size;
extern nr_bandentry_t nr_bandtable[];
+uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex);
int NRRIV2BW(int locationAndBandwidth,int N_RB);
int NRRIV2PRBOFFSET(int locationAndBandwidth,int N_RB);
int PRBalloc_to_locationandbandwidth0(int NPRB,int RBstart,int BWPsize);
diff --git a/common/utils/system.c b/common/utils/system.c
index d8b66c51d3210287bfe95fa8f6165d0a23539937..38d1c1d7ad001202368bca781545fd161b8c7b12 100644
--- a/common/utils/system.c
+++ b/common/utils/system.c
@@ -209,6 +209,10 @@ int background_system(char *command) {
void start_background_system(void) {
int p[2];
pid_t son;
+
+ if (module_initialized == 1)
+ return;
+
module_initialized = 1;
if (pipe(p) == -1) {
diff --git a/docker/Dockerfile.lteUE.rhel8.2 b/docker/Dockerfile.lteUE.rhel8.2
index 2d540876e34961e57414535b9784f8ebb1e64822..936780297a6c8f1d5976e3fbe374dd15316aba70 100644
--- a/docker/Dockerfile.lteUE.rhel8.2
+++ b/docker/Dockerfile.lteUE.rhel8.2
@@ -37,9 +37,7 @@ RUN /bin/sh oaienv && \
mkdir -p log && \
./build_oai --UE --ninja -w USRP --verbose-ci
-RUN yum install -y python3-pip && \
- pip3 install --ignore-installed pyyaml && \
- python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml
#start from scratch for target executable
diff --git a/docker/Dockerfile.lteUE.ubuntu18 b/docker/Dockerfile.lteUE.ubuntu18
index c6a70a0b503c9c9e03d1f9c57f41fc63b699d123..34cbe651adc90fcae4150080148b4468455be982 100644
--- a/docker/Dockerfile.lteUE.ubuntu18
+++ b/docker/Dockerfile.lteUE.ubuntu18
@@ -37,9 +37,7 @@ RUN /bin/sh oaienv && \
mkdir -p log && \
./build_oai --UE --ninja -w USRP --verbose-ci
-RUN apt-get install -y python3-pip && \
- pip3 install --ignore-installed pyyaml && \
- python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml
#start from scratch for target executable
diff --git a/docker/Dockerfile.nrUE.rhel8.2 b/docker/Dockerfile.nrUE.rhel8.2
index f036c1148343710587585d42490924077b0d19d0..56fc746adeb53cc0336ca28b88f80cd068b6d4b9 100644
--- a/docker/Dockerfile.nrUE.rhel8.2
+++ b/docker/Dockerfile.nrUE.rhel8.2
@@ -49,6 +49,7 @@ RUN yum update -y && \
nettle \
net-tools \
iputils \
+ iproute \
atlas \
libXpm \
libX11 \
diff --git a/docker/scripts/enb_entrypoint.sh b/docker/scripts/enb_entrypoint.sh
index 4ac86ef1b705b04d4e6e31166bec79cb48b32a30..2e8886e8558071a79482a439ef726af5b7a69b87 100755
--- a/docker/scripts/enb_entrypoint.sh
+++ b/docker/scripts/enb_entrypoint.sh
@@ -6,6 +6,7 @@ PREFIX=/opt/oai-enb
RRC_INACTIVITY_THRESHOLD=${RRC_INACTIVITY_THRESHOLD:-0}
ENABLE_MEASUREMENT_REPORTS=${ENABLE_MEASUREMENT_REPORTS:-no}
ENABLE_X2=${ENABLE_X2:-no}
+THREAD_PARALLEL_CONFIG=${THREAD_PARALLEL_CONFIG:-PARALLEL_SINGLE_THREAD}
# Based another env var, pick one template to use
if [[ -v USE_FDD_CU ]]; then ln -s $PREFIX/etc/cu.fdd.conf $PREFIX/etc/enb.conf; fi
diff --git a/docker/scripts/enb_parameters.yaml b/docker/scripts/enb_parameters.yaml
index 58715a71527fbc5574cffa224391a2e5c1dec7db..07bba4479b95417e58cabb7866f83e7d2de9a955 100644
--- a/docker/scripts/enb_parameters.yaml
+++ b/docker/scripts/enb_parameters.yaml
@@ -98,6 +98,8 @@
env: "@NID_CELL@"
- key: N_RB_DL
env: "@NB_PRB@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: rru.fdd
outputfilename: "rru.fdd.conf"
@@ -110,6 +112,8 @@
env: "@RRU_LOCAL_IP_ADDRESS@"
- key: bands
env: "@UTRA_BAND_ID@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: rru.tdd
outputfilename: "rru.tdd.conf"
@@ -122,6 +126,8 @@
env: "@RRU_LOCAL_IP_ADDRESS@"
- key: bands
env: "@UTRA_BAND_ID@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: enb.band7.tm1.fr1.25PRB.usrpb210.conf
outputfilename: "enb.fdd.conf"
@@ -171,6 +177,8 @@
env: "@FLEXRAN_INTERFACE_NAME@"
- key: FLEXRAN_IPV4_ADDRESS
env: "@FLEXRAN_IPV4_ADDRESS@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: enb.band40.tm1.25PRB.FairScheduler.usrpb210
outputfilename: "enb.tdd.conf"
@@ -208,6 +216,8 @@
env: "@F1_CU_IP_ADDRESS@"
- key: ENB_IPV4_ADDRESS_FOR_X2C
env: "@F1_CU_IP_ADDRESS@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: "rcc.band7.tm1.nfapi"
outputfilename: "rcc.nfapi.fdd.conf"
@@ -251,6 +261,8 @@
env: "@F1_CU_IP_ADDRESS@"
- key: ENB_IPV4_ADDRESS_FOR_X2C
env: "@F1_CU_IP_ADDRESS@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: "rcc.band7.tm1.if4p5.lo.25PRB"
outputfilename: "rcc.if4p5.fdd.conf"
@@ -294,6 +306,8 @@
env: "@IF4P5_RRU_IP_ADDRESS@"
- key: local_address
env: "@IF4P5_RCC_IP_ADDRESS@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: "rcc.band40.tm1.25PRB"
outputfilename: "rcc.if4p5.tdd.conf"
@@ -337,4 +351,6 @@
env: "@IF4P5_RRU_IP_ADDRESS@"
- key: local_address
env: "@IF4P5_RCC_IP_ADDRESS@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh
index 6d3d63629ff07ce858d4ab946a4fea64beda3902..678ec6cb1bd0e5ca00bac201fd0b5dfdafa3fca1 100755
--- a/docker/scripts/gnb_entrypoint.sh
+++ b/docker/scripts/gnb_entrypoint.sh
@@ -4,6 +4,7 @@ set -euo pipefail
PREFIX=/opt/oai-gnb
ENABLE_X2=${ENABLE_X2:-yes}
+THREAD_PARALLEL_CONFIG=${THREAD_PARALLEL_CONFIG:-PARALLEL_SINGLE_THREAD}
# Based another env var, pick one template to use
if [[ -v USE_NSA_TDD_MONO ]]; then ln -s $PREFIX/etc/gnb.nsa.tdd.conf $PREFIX/etc/gnb.conf; fi
diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml
index a13d0d3677dded433610069e7b2db1358c8c3016..ac5a6cb971629cbc69d0c6959625c83c18b1c518 100644
--- a/docker/scripts/gnb_parameters.yaml
+++ b/docker/scripts/gnb_parameters.yaml
@@ -61,6 +61,8 @@
env: "@FLEXRAN_INTERFACE_NAME@"
- key: FLEXRAN_IPV4_ADDRESS
env: "@FLEXRAN_IPV4_ADDRESS@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: gnb.band78.sa.fr1.106PRB.usrpn310.conf
outputfilename: "gnb.sa.tdd.conf"
@@ -89,4 +91,6 @@
env: "@GNB_NGU_IF_NAME@"
- key: GNB_IPV4_ADDRESS_FOR_NGU
env: "@GNB_NGU_IP_ADDRESS@"
+ - key: parallel_config
+ env: "@THREAD_PARALLEL_CONFIG@"
diff --git a/executables/nr-softmodem-common.h b/executables/nr-softmodem-common.h
index 101b1a2bf9775d98632ff50e5fdd89d38f125783..5b6d21d177d603021b84c916d11683641fd53279 100644
--- a/executables/nr-softmodem-common.h
+++ b/executables/nr-softmodem-common.h
@@ -64,6 +64,7 @@
#define CONFIG_HLP_NOSNGLT "Disables single-thread mode in lte-softmodem\n"
#define CONFIG_HLP_TADV "Set timing_advance\n"
#define CONFIG_HLP_DLF "Set the downlink frequency for all component carriers\n"
+#define CONFIG_HLP_ULOFF "Set the uplink frequnecy offset for all component carriers\n"
#define CONFIG_HLP_CHOFF "Channel id offset\n"
#define CONFIG_HLP_SOFTS "Enable soft scope and L1 and L2 stats (Xforms)\n"
#define CONFIG_HLP_EXMCAL "Calibrate the EXMIMO borad, available files: exmimo2_2arxg.lime exmimo2_2brxg.lime \n"
@@ -71,13 +72,14 @@
#define CONFIG_HLP_DLMCS_PHYTEST "Set the downlink MCS for PHYTEST mode\n"
#define CONFIG_HLP_DLNL_PHYTEST "Set the downlink nrOfLayers for PHYTEST mode\n"
#define CONFIG_HLP_STMON "Enable processing timing measurement of lte softmodem on per subframe basis \n"
-#define CONFIG_HLP_PRB "Set the PRB, valid values: 6, 25, 50, 100 \n"
#define CONFIG_HLP_MSLOTS "Skip the missed slots/subframes \n"
#define CONFIG_HLP_ULMCS_PHYTEST "Set the uplink MCS for PHYTEST mode\n"
#define CONFIG_HLP_DLBW_PHYTEST "Set the number of PRBs used for DLSCH in PHYTEST mode\n"
#define CONFIG_HLP_ULBW_PHYTEST "Set the number of PRBs used for ULSCH in PHYTEST mode\n"
+#define CONFIG_HLP_PRB_SA "Set the number of PRBs for SA\n"
#define CONFIG_HLP_DLBM_PHYTEST "Bitmap for DLSCH slots (slot 0 starts at LSB)\n"
#define CONFIG_HLP_ULBM_PHYTEST "Bitmap for ULSCH slots (slot 0 starts at LSB)\n"
+#define CONFIG_HLP_SSC "Set the start subcarrier \n"
#define CONFIG_HLP_TDD "Set hardware to TDD mode (default: FDD). Used only with -U (otherwise set in config file).\n"
#define CONFIG_HLP_UE "Set the lte softmodem as a UE\n"
#define CONFIG_HLP_L2MONW "Enable L2 wireshark messages on localhost \n"
@@ -119,7 +121,7 @@
{"g" , CONFIG_HLP_LOGL, 0, uptr:&glog_level, defintval:0, TYPE_UINT, 0}, \
{"G" , CONFIG_HLP_LOGV, 0, uptr:&glog_verbosity, defintval:0, TYPE_UINT16, 0}, \
{"telnetsrv", CONFIG_HLP_TELN, PARAMFLAG_BOOL, uptr:&start_telnetsrv, defintval:0, TYPE_UINT, 0}, \
- {"msc", CONFIG_HLP_MSC, PARAMFLAG_BOOL, uptr:&START_MSC, defintval:0, TYPE_UINT, 0}, \
+ {"msc", CONFIG_HLP_MSC, PARAMFLAG_BOOL, uptr:&START_MSC, defintval:0, TYPE_UINT, 0}, \
}
#define CMDLINE_ONLINELOG_IDX 0
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index b855418d649674b6337ede00b9c1a123c629d282..1b33667b1396811eaeaf23e3c68fa8bb40039bcf 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -823,7 +823,8 @@ int main( int argc, char **argv ) {
}
printf("About to call end_configmodule() from %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
- end_configmodule();
+ // We have to set PARAMFLAG_NOFREE on right paramters before re-enabling end_configmodule()
+ //end_configmodule();
printf("Called end_configmodule() from %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
// wait for end of program
printf("TYPE <CTRL-C> TO TERMINATE\n");
diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index 82b11f9b7fd29c464b4ffdef9b0525b572ffea90..92fe5174c28f54bb0bf6811797a7a583511d7fe1 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -222,7 +222,7 @@ static void UE_synch(void *arg) {
uint64_t dl_carrier, ul_carrier;
nr_get_carrier_frequencies(&UE->frame_parms, &dl_carrier, &ul_carrier);
- if (nr_initial_sync(&syncD->proc, UE, 2) == 0) {
+ if (nr_initial_sync(&syncD->proc, UE, 2, get_softmodem_params()->sa, get_nrUE_params()->nr_dlsch_parallel) == 0) {
freq_offset = UE->common_vars.freq_offset; // frequency offset computed with pss in initial sync
hw_slot_offset = ((UE->rx_offset<<1) / UE->frame_parms.samples_per_subframe * UE->frame_parms.slots_per_subframe) +
round((float)((UE->rx_offset<<1) % UE->frame_parms.samples_per_subframe)/UE->frame_parms.samples_per_slot0);
@@ -717,15 +717,18 @@ void *UE_thread(void *arg) {
if (openair0_cfg[0].duplex_mode == duplex_mode_TDD) {
- uint8_t tdd_period = mac->phy_config.config_req.tdd_table.tdd_period_in_slots;
-
- int nrofUplinkSlots = 0;
- if (mac->scc_SIB)
- nrofUplinkSlots = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
- else if (mac->scc)
- nrofUplinkSlots = mac->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
+ uint8_t tdd_period = mac->phy_config.config_req.tdd_table.tdd_period_in_slots;
+ int nrofUplinkSlots, nrofUplinkSymbols;
+ if (mac->scc) {
+ nrofUplinkSlots = mac->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
+ nrofUplinkSymbols = mac->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols;
+ }
+ else {
+ nrofUplinkSlots = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
+ nrofUplinkSymbols = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols;
+ }
+ uint8_t num_UL_slots = nrofUplinkSlots + (nrofUplinkSymbols != 0);
- uint8_t num_UL_slots = nrofUplinkSlots + (nrofUplinkSlots != 0);
uint8_t first_tx_slot = tdd_period - num_UL_slots;
if (slot_tx_usrp % tdd_period == first_tx_slot)
diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
index 395801f488801e36698b7590128a28cc3ab96b1a..76049db8ce8e64b0597830a15b215dcd9dfd8123 100644
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -33,6 +33,7 @@
//#include "common/utils/threadPool/thread-pool.h"
#include "common/utils/load_module_shlib.h"
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
+#include "common/utils/nr/nr_common.h"
#include "../../ARCH/COMMON/common_lib.h"
#include "../../ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
@@ -279,7 +280,7 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
UE->mode = normal_txrx;
- config_process_cmdline( cmdline_params,numparams,NULL);
+ config_get(cmdline_params,numparams,NULL);
int pindex = config_paramidx_fromname(cmdline_params,numparams, CALIBRX_OPT);
if ( (cmdline_params[pindex].paramflags & PARAMFLAG_PARAMSET) != 0) UE->mode = rx_calib_ue;
@@ -318,22 +319,16 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
UE->rf_map.card = card_offset;
UE->rf_map.chain = CC_id + chain_offset;
-
LOG_I(PHY,"Set UE mode %d, UE_fo_compensation %d, UE_scan_carrier %d, UE_no_timing_correction %d \n, do_prb_interpolation %d\n",
- UE->mode, UE->UE_fo_compensation, UE->UE_scan_carrier, UE->no_timing_correction, UE->prb_interpolation);
+ UE->mode, UE->UE_fo_compensation, UE->UE_scan_carrier, UE->no_timing_correction, UE->prb_interpolation);
// Set FP variables
-
-
if (tddflag){
fp->frame_type = TDD;
LOG_I(PHY, "Set UE frame_type %d\n", fp->frame_type);
}
- fp->N_RB_DL = N_RB_DL;
-
- LOG_I(PHY, "Set UE N_RB_DL %d\n", N_RB_DL);
LOG_I(PHY, "Set UE nb_rx_antenna %d, nb_tx_antenna %d, threequarter_fs %d\n", fp->nb_antennas_rx, fp->nb_antennas_tx, fp->threequarter_fs);
fp->ofdm_offset_divisor = nrUE_params.ofdm_offset_divisor;
@@ -469,34 +464,30 @@ int main( int argc, char **argv ) {
for (int CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-
PHY_vars_UE_g[0][CC_id] = (PHY_VARS_NR_UE *)malloc(sizeof(PHY_VARS_NR_UE));
UE[CC_id] = PHY_vars_UE_g[0][CC_id];
memset(UE[CC_id],0,sizeof(PHY_VARS_NR_UE));
set_options(CC_id, UE[CC_id]);
-
NR_UE_MAC_INST_t *mac = get_mac_inst(0);
- if(mac->if_module != NULL && mac->if_module->phy_config_request != NULL)
- mac->if_module->phy_config_request(&mac->phy_config);
-
- fapi_nr_config_request_t *nrUE_config = &UE[CC_id]->nrUE_config;
- if (get_softmodem_params()->sa) { // set frame config to initial values from command line and assume that the SSB is centered on the grid
- nrUE_config->ssb_config.scs_common = get_softmodem_params()->numerology;
- nrUE_config->carrier_config.dl_grid_size[nrUE_config->ssb_config.scs_common] = UE[CC_id]->frame_parms.N_RB_DL;
- nrUE_config->carrier_config.ul_grid_size[nrUE_config->ssb_config.scs_common] = UE[CC_id]->frame_parms.N_RB_DL;
- nrUE_config->carrier_config.dl_frequency = (downlink_frequency[0][0] -(6*UE[CC_id]->frame_parms.N_RB_DL*(15000<<nrUE_config->ssb_config.scs_common)))/1000;
- nrUE_config->carrier_config.uplink_frequency = (downlink_frequency[0][0] -(6*UE[CC_id]->frame_parms.N_RB_DL*(15000<<nrUE_config->ssb_config.scs_common)))/1000;
- nrUE_config->ssb_table.ssb_offset_point_a = (UE[CC_id]->frame_parms.N_RB_DL - 20)>>1;
-
- // Initialize values, will be updated upon SIB1 reception
- nrUE_config->cell_config.frame_duplex_type = TDD;
- nrUE_config->ssb_table.ssb_mask_list[0].ssb_mask = 0xFFFFFFFF;
- nrUE_config->ssb_table.ssb_period = 1;
+
+ if (get_softmodem_params()->sa) {
+ uint16_t nr_band = get_band(downlink_frequency[CC_id][0],uplink_frequency_offset[CC_id][0]);
+ mac->nr_band = nr_band;
+ nr_init_frame_parms_ue_sa(&UE[CC_id]->frame_parms,
+ downlink_frequency[CC_id][0],
+ uplink_frequency_offset[CC_id][0],
+ get_softmodem_params()->numerology,
+ nr_band);
+ }
+ else{
+ if(mac->if_module != NULL && mac->if_module->phy_config_request != NULL)
+ mac->if_module->phy_config_request(&mac->phy_config);
+
+ fapi_nr_config_request_t *nrUE_config = &UE[CC_id]->nrUE_config;
+
+ nr_init_frame_parms_ue(&UE[CC_id]->frame_parms, nrUE_config, *mac->scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]);
}
-
- nr_init_frame_parms_ue(&UE[CC_id]->frame_parms, nrUE_config,
- mac->scc == NULL ? 78 : *mac->scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]);
init_symbol_rotation(&UE[CC_id]->frame_parms);
init_timeshift_rotation(&UE[CC_id]->frame_parms);
diff --git a/executables/nr-uesoftmodem.h b/executables/nr-uesoftmodem.h
index 3eba5731b07ed9cdfdfd194770d140d65abd98b5..9f2a48d6a151e8a1beb26265b3038d133e41e655 100644
--- a/executables/nr-uesoftmodem.h
+++ b/executables/nr-uesoftmodem.h
@@ -42,27 +42,28 @@
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*------------------------------------------------------------------------------------------------------------------------------------------*/
#define CMDLINE_NRUE_PHYPARAMS_DESC { \
- { CALIBRX_OPT, CONFIG_HLP_CALUER, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
- { CALIBRXMED_OPT, CONFIG_HLP_CALUERM, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
- { CALIBRXBYP_OPT, CONFIG_HLP_CALUERB, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
- { DBGPRACH_OPT, CONFIG_HLP_DBGUEPR, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
- { NOL2CONNECT_OPT, CONFIG_HLP_NOL2CN, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
- {CALIBPRACH_OPT, CONFIG_HLP_CALPRACH, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
- { DUMPFRAME_OPT, CONFIG_HLP_DUMPFRAME, PARAMFLAG_BOOL, iptr:&dumpframe, defintval:0, TYPE_INT, 0}, \
- {"ue-rxgain", CONFIG_HLP_UERXG, 0, dblptr:&(rx_gain[0][0]), defdblval:0, TYPE_DOUBLE, 0}, \
- {"ue-rxgain-off", CONFIG_HLP_UERXGOFF, 0, dblptr:&rx_gain_off, defdblval:0, TYPE_DOUBLE, 0}, \
- {"ue-txgain", CONFIG_HLP_UETXG, 0, dblptr:&(tx_gain[0][0]), defdblval:0, TYPE_DOUBLE, 0}, \
- {"ue-nb-ant-rx", CONFIG_HLP_UENANTR, 0, u8ptr:&(fp->nb_antennas_rx), defuintval:1, TYPE_UINT8, 0}, \
- {"ue-nb-ant-tx", CONFIG_HLP_UENANTT, 0, u8ptr:&(fp->nb_antennas_tx), defuintval:1, TYPE_UINT8, 0}, \
- {"ue-scan-carrier", CONFIG_HLP_UESCAN, PARAMFLAG_BOOL, iptr:&(UE->UE_scan_carrier), defintval:0, TYPE_INT, 0}, \
- {"ue-fo-compensation", CONFIG_HLP_UEFO, PARAMFLAG_BOOL, iptr:&(UE->UE_fo_compensation), defintval:0, TYPE_INT, 0}, \
- {"ue-max-power", NULL, 0, iptr:&(tx_max_power[0]), defintval:90, TYPE_INT, 0}, \
- {"r" , CONFIG_HLP_PRB, 0, uptr:&(N_RB_DL), defuintval:160, TYPE_UINT, 0}, \
- {"A" , CONFIG_HLP_TADV, 0, iptr:&(UE->timing_advance), defintval:0, TYPE_INT, 0}, \
- {"E" , CONFIG_HLP_TQFS, PARAMFLAG_BOOL, u8ptr:&(fp->threequarter_fs), defintval:0, TYPE_UINT8, 0}, \
- {"T" , CONFIG_HLP_TDD, PARAMFLAG_BOOL, iptr:&tddflag, defintval:0, TYPE_INT, 0}, \
- {"ue-timing-correction-disable", CONFIG_HLP_DISABLETIMECORR, PARAMFLAG_BOOL, iptr:&(UE->no_timing_correction), defintval:0, TYPE_INT, 0}, \
- {"do-prb-interpolation", CONFIG_HLP_PRBINTER, PARAMFLAG_BOOL, iptr:&(UE->prb_interpolation), defintval:0, TYPE_INT, 0}, \
+ { CALIBRX_OPT, CONFIG_HLP_CALUER, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
+ { CALIBRXMED_OPT, CONFIG_HLP_CALUERM, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
+ { CALIBRXBYP_OPT, CONFIG_HLP_CALUERB, 0, iptr:&rx_input_level_dBm, defintval:0, TYPE_INT, 0}, \
+ { DBGPRACH_OPT, CONFIG_HLP_DBGUEPR, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
+ { NOL2CONNECT_OPT, CONFIG_HLP_NOL2CN, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
+ { CALIBPRACH_OPT, CONFIG_HLP_CALPRACH, PARAMFLAG_BOOL, uptr:NULL, defuintval:1, TYPE_INT, 0}, \
+ { DUMPFRAME_OPT, CONFIG_HLP_DUMPFRAME, PARAMFLAG_BOOL, iptr:&dumpframe, defintval:0, TYPE_INT, 0}, \
+ {"ue-rxgain", CONFIG_HLP_UERXG, 0, dblptr:&(rx_gain[0][0]), defdblval:0, TYPE_DOUBLE,0}, \
+ {"ue-rxgain-off", CONFIG_HLP_UERXGOFF, 0, dblptr:&rx_gain_off, defdblval:0, TYPE_DOUBLE,0}, \
+ {"ue-txgain", CONFIG_HLP_UETXG, 0, dblptr:&(tx_gain[0][0]), defdblval:0, TYPE_DOUBLE,0}, \
+ {"ue-nb-ant-rx", CONFIG_HLP_UENANTR, 0, u8ptr:&(fp->nb_antennas_rx), defuintval:1, TYPE_UINT8, 0}, \
+ {"ue-nb-ant-tx", CONFIG_HLP_UENANTT, 0, u8ptr:&(fp->nb_antennas_tx), defuintval:1, TYPE_UINT8, 0}, \
+ {"ue-scan-carrier", CONFIG_HLP_UESCAN, PARAMFLAG_BOOL, iptr:&(UE->UE_scan_carrier), defintval:0, TYPE_INT, 0}, \
+ {"ue-fo-compensation", CONFIG_HLP_UEFO, PARAMFLAG_BOOL, iptr:&(UE->UE_fo_compensation), defintval:0, TYPE_INT, 0}, \
+ {"ue-max-power", NULL, 0, iptr:&(tx_max_power[0]), defintval:90, TYPE_INT, 0}, \
+ {"A" , CONFIG_HLP_TADV, 0, iptr:&(UE->timing_advance), defintval:0, TYPE_INT, 0}, \
+ {"E" , CONFIG_HLP_TQFS, PARAMFLAG_BOOL, u8ptr:&(fp->threequarter_fs), defintval:0, TYPE_UINT8, 0}, \
+ {"r" , CONFIG_HLP_PRB_SA, 0, iptr:&(fp->N_RB_DL), defintval:106, TYPE_UINT, 0}, \
+ {"s" , CONFIG_HLP_SSC, 0, u16ptr:&(fp->ssb_start_subcarrier), defintval:516, TYPE_UINT16,0}, \
+ {"T" , CONFIG_HLP_TDD, PARAMFLAG_BOOL, iptr:&tddflag, defintval:0, TYPE_INT, 0}, \
+ {"do-prb-interpolation", CONFIG_HLP_PRBINTER, PARAMFLAG_BOOL, iptr:&(UE->prb_interpolation), defintval:0, TYPE_INT, 0}, \
+ {"ue-timing-correction-disable", CONFIG_HLP_DISABLETIMECORR, PARAMFLAG_BOOL, iptr:&(UE->no_timing_correction), defintval:0, TYPE_INT, 0}, \
}
diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h
index 76904f2368995711fde6a661f5f4d3e080c8641e..c6a1eb44e4959f0f4de21f4f949fa5d456b22541 100644
--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
@@ -139,8 +139,8 @@ extern int usrp_tx_thread;
{"time-source", CONFIG_HLP_TME, 0, uptr:&TIMING_SOURCE, defintval:0, TYPE_UINT, 0}, \
{"wait-for-sync", NULL, PARAMFLAG_BOOL, iptr:&WAIT_FOR_SYNC, defintval:0, TYPE_INT, 0}, \
{"single-thread-enable", CONFIG_HLP_NOSNGLT, PARAMFLAG_BOOL, iptr:&SINGLE_THREAD_FLAG, defintval:0, TYPE_INT, 0}, \
- {"C" , CONFIG_HLP_DLF, 0, u64ptr:&(downlink_frequency[0][0]), defuintval:3619200000, TYPE_UINT64, 0}, \
- {"CO" , CONFIG_HLP_ULF, 0, iptr:&(uplink_frequency_offset[0][0]), defintval:0, TYPE_INT, 0}, \
+ {"C" , CONFIG_HLP_DLF, 0, u64ptr:&(downlink_frequency[0][0]), defuintval:0, TYPE_UINT64, 0}, \
+ {"CO" , CONFIG_HLP_ULF, 0, iptr:&(uplink_frequency_offset[0][0]), defintval:0, TYPE_INT, 0}, \
{"a" , CONFIG_HLP_CHOFF, 0, iptr:&CHAIN_OFFSET, defintval:0, TYPE_INT, 0}, \
{"d" , CONFIG_HLP_SOFTS, PARAMFLAG_BOOL, uptr:(uint32_t *)&do_forms, defintval:0, TYPE_INT8, 0}, \
{"q" , CONFIG_HLP_STMON, PARAMFLAG_BOOL, iptr:&opp_enabled, defintval:0, TYPE_INT, 0}, \
@@ -155,10 +155,10 @@ extern int usrp_tx_thread;
{"nokrnmod", CONFIG_HLP_NOKRNMOD, PARAMFLAG_BOOL, uptr:&nokrnmod, defintval:0, TYPE_INT, 0}, \
{"nbiot-disable", CONFIG_HLP_DISABLNBIOT, PARAMFLAG_BOOL, uptr:&nonbiot, defuintval:0, TYPE_INT, 0}, \
{"use-256qam-table", CONFIG_HLP_256QAM, PARAMFLAG_BOOL, iptr:&USE_256QAM_TABLE, defintval:0, TYPE_INT, 0}, \
- {"do-prb-interpolation", CONFIG_HLP_PRBINTER, PARAMFLAG_BOOL, iptr:&PRB_INTERPOLATION, defintval:0, TYPE_INT, 0}, \
- {"usrp-tx-thread-config", CONFIG_HLP_USRP_THREAD, 0, iptr:&usrp_tx_thread, defstrval:0, TYPE_INT, 0}, \
- {"nfapi", CONFIG_HLP_NFAPI, 0, u8ptr:&nfapi_mode, defintval:0, TYPE_UINT8, 0}, \
- {"non-stop", CONFIG_HLP_NONSTOP, PARAMFLAG_BOOL, iptr:&NON_STOP, defintval:0, TYPE_INT, 0}, \
+ {"do-prb-interpolation", CONFIG_HLP_PRBINTER, PARAMFLAG_BOOL, iptr:&PRB_INTERPOLATION, defintval:0, TYPE_INT, 0}, \
+ {"usrp-tx-thread-config",CONFIG_HLP_USRP_THREAD, 0, iptr:&usrp_tx_thread, defstrval:0, TYPE_INT, 0}, \
+ {"nfapi", CONFIG_HLP_NFAPI, 0, u8ptr:&nfapi_mode, defintval:0, TYPE_UINT8, 0}, \
+ {"non-stop", CONFIG_HLP_NONSTOP, PARAMFLAG_BOOL, iptr:&NON_STOP, defintval:0, TYPE_INT, 0}, \
}
diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 0fbaad98eb41f87a1b076f0c4ba45b9f980a2047..32e190679d1ecdd017a3147084c945a844661727 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -46,42 +46,6 @@
#include "PHY/NR_REFSIG/ul_ref_seq_nr.h"
-static
-uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex)
-{
- const uint64_t dl_freq_khz = downlink_frequency / 1000;
- const int32_t delta_duplex_khz = delta_duplex / 1000;
-
- uint64_t center_freq_diff_khz = 999999999999999999; // 2^64
- uint16_t current_band = 0;
-
- for (int ind = 0; ind < nr_bandtable_size; ind++) {
-
- LOG_D(PHY, "Scanning band %d, dl_min %"PRIu64", ul_min %"PRIu64"\n", nr_bandtable[ind].band, nr_bandtable[ind].dl_min, nr_bandtable[ind].ul_min);
-
- if (dl_freq_khz < nr_bandtable[ind].dl_min || dl_freq_khz > nr_bandtable[ind].dl_max)
- continue;
-
- int32_t current_offset_khz = nr_bandtable[ind].ul_min - nr_bandtable[ind].dl_min;
-
- if (current_offset_khz != delta_duplex_khz)
- continue;
-
- uint64_t center_frequency_khz = (nr_bandtable[ind].dl_max + nr_bandtable[ind].dl_min) / 2;
-
- if (abs(dl_freq_khz - center_frequency_khz) < center_freq_diff_khz){
- current_band = nr_bandtable[ind].band;
- center_freq_diff_khz = abs(dl_freq_khz - center_frequency_khz);
- }
- }
-
- LOG_I(PHY, "DL frequency %"PRIu64": band %d, UL frequency %"PRIu64"\n",
- downlink_frequency, current_band, downlink_frequency+delta_duplex);
-
- AssertFatal(current_band != 0, "Can't find EUTRA band for frequency %"PRIu64" and duplex_spacing %u\n", downlink_frequency, delta_duplex);
-
- return current_band;
-}
int l1_north_init_gNB() {
diff --git a/openair1/PHY/INIT/nr_parms.c b/openair1/PHY/INIT/nr_parms.c
index dab280de263f79b12b46dccb00fab3f1594e0181..98e3c5a1a3d752f9ad2f829a9f733c71714f7e6d 100644
--- a/openair1/PHY/INIT/nr_parms.c
+++ b/openair1/PHY/INIT/nr_parms.c
@@ -20,6 +20,7 @@
*/
#include "phy_init.h"
+#include "common/utils/nr/nr_common.h"
#include "common/utils/LOG/log.h"
#include "LAYER2/NR_MAC_gNB/mac_proto.h"
@@ -27,6 +28,20 @@
uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3, 30e3, 60e3, 120e3, 240e3};
uint16_t nr_slots_per_subframe[MAX_NUM_SUBCARRIER_SPACING] = {1, 2, 4, 8, 16};
+
+void set_Lmax(NR_DL_FRAME_PARMS *fp) {
+ // definition of Lmax according to ts 38.213 section 4.1
+ if (fp->dl_CarrierFreq < 6e9) {
+ if(fp->frame_type && (fp->ssb_type==2))
+ fp->Lmax = (fp->dl_CarrierFreq < 2.4e9)? 4 : 8;
+ else
+ fp->Lmax = (fp->dl_CarrierFreq < 3e9)? 4 : 8;
+ } else {
+ fp->Lmax = 64;
+ }
+}
+
+
int nr_get_ssb_start_symbol(NR_DL_FRAME_PARMS *fp,uint8_t i_ssb) {
int mu = fp->numerology_index;
@@ -217,15 +232,7 @@ int nr_init_frame_parms(nfapi_nr_config_request_scf_t* cfg,
fp->Ncp = Ncp;
- // definition of Lmax according to ts 38.213 section 4.1
- if (fp->dl_CarrierFreq < 6e9) {
- if(fp->frame_type && (fp->ssb_type==2))
- fp->Lmax = (fp->dl_CarrierFreq < 2.4e9)? 4 : 8;
- else
- fp->Lmax = (fp->dl_CarrierFreq < 3e9)? 4 : 8;
- } else {
- fp->Lmax = 64;
- }
+ set_Lmax(fp);
fp->N_ssb = 0;
int num_tx_ant = cfg->carrier_config.num_tx_ant.value;
@@ -316,16 +323,7 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
sco = config->ssb_table.ssb_subcarrier_offset;
fp->ssb_start_subcarrier = (12 * config->ssb_table.ssb_offset_point_a + sco);
-
- // definition of Lmax according to ts 38.213 section 4.1
- if (fp->dl_CarrierFreq < 6e9) {
- if(fp->frame_type && (fp->ssb_type==2))
- fp->Lmax = (fp->dl_CarrierFreq < 2.4e9)? 4 : 8;
- else
- fp->Lmax = (fp->dl_CarrierFreq < 3e9)? 4 : 8;
- } else {
- fp->Lmax = 64;
- }
+ set_Lmax(fp);
fp->L_ssb = (((uint64_t) config->ssb_table.ssb_mask_list[0].ssb_mask)<<32) | config->ssb_table.ssb_mask_list[1].ssb_mask;
@@ -336,6 +334,43 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
return 0;
}
+void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink_frequency, int32_t delta_duplex, uint8_t mu, uint16_t nr_band) {
+
+ LOG_I(PHY,"SA init parameters. DL freq %lu UL offset %d SSB numerology %d N_RB_DL %d\n",
+ downlink_frequency,
+ delta_duplex,
+ mu,
+ frame_parms->N_RB_DL);
+
+ frame_parms->numerology_index = mu;
+ frame_parms->dl_CarrierFreq = downlink_frequency;
+ frame_parms->ul_CarrierFreq = downlink_frequency + delta_duplex;
+ frame_parms->freq_range = (frame_parms->dl_CarrierFreq < 6e9)? nr_FR1 : nr_FR2;
+ frame_parms->N_RB_UL = frame_parms->N_RB_DL;
+
+ frame_parms->nr_band = nr_band;
+ frame_parms->frame_type = get_frame_type(frame_parms->nr_band, frame_parms->numerology_index);
+
+ frame_parms->Ncp = NORMAL;
+ set_scs_parameters(frame_parms, frame_parms->numerology_index, frame_parms->N_RB_DL);
+ set_Lmax(frame_parms);
+
+ frame_parms->slots_per_frame = 10* frame_parms->slots_per_subframe;
+ frame_parms->symbols_per_slot = ((frame_parms->Ncp == NORMAL)? 14 : 12); // to redefine for different slot formats
+ frame_parms->samples_per_subframe_wCP = frame_parms->ofdm_symbol_size * frame_parms->symbols_per_slot * frame_parms->slots_per_subframe;
+ frame_parms->samples_per_frame_wCP = 10 * frame_parms->samples_per_subframe_wCP;
+ frame_parms->samples_per_slot_wCP = frame_parms->symbols_per_slot*frame_parms->ofdm_symbol_size;
+ frame_parms->samples_per_slotN0 = (frame_parms->nb_prefix_samples + frame_parms->ofdm_symbol_size) * frame_parms->symbols_per_slot;
+ frame_parms->samples_per_slot0 = frame_parms->nb_prefix_samples0 + ((frame_parms->symbols_per_slot-1)*frame_parms->nb_prefix_samples) + (frame_parms->symbols_per_slot*frame_parms->ofdm_symbol_size);
+ frame_parms->samples_per_subframe = (frame_parms->nb_prefix_samples0 + frame_parms->ofdm_symbol_size) * 2 +
+ (frame_parms->nb_prefix_samples + frame_parms->ofdm_symbol_size) * (frame_parms->symbols_per_slot * frame_parms->slots_per_subframe - 2);
+ frame_parms->get_samples_per_slot = &get_samples_per_slot;
+ frame_parms->get_samples_slot_timestamp = &get_samples_slot_timestamp;
+ frame_parms->samples_per_frame = 10 * frame_parms->samples_per_subframe;
+
+}
+
+
void nr_dump_frame_parms(NR_DL_FRAME_PARMS *fp)
{
LOG_I(PHY,"fp->scs=%d\n",fp->subcarrier_spacing);
diff --git a/openair1/PHY/INIT/phy_init.h b/openair1/PHY/INIT/phy_init.h
index 2ab610739d5fcfb772d2173e7f3cf5247de3a475..85101a308052d01115f254a5362124e4a0f75514 100644
--- a/openair1/PHY/INIT/phy_init.h
+++ b/openair1/PHY/INIT/phy_init.h
@@ -389,12 +389,12 @@ void phy_config_request(PHY_Config_t *phy_config);
void phy_config_update_sib2_request(PHY_Config_t *phy_config);
void phy_config_update_sib13_request(PHY_Config_t *phy_config);
-
int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf);
void dump_frame_parms(LTE_DL_FRAME_PARMS *frame_parms);
int nr_get_ssb_start_symbol(NR_DL_FRAME_PARMS *fp,uint8_t i_ssb);
int nr_init_frame_parms(nfapi_nr_config_request_scf_t *config, NR_DL_FRAME_PARMS *frame_parms);
int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms, fapi_nr_config_request_t *config, uint16_t nr_band);
+void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink_frequency, int32_t uplink_frequency_offset, uint8_t mu, uint16_t nr_band);
int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB,uint8_t abstraction_flag);
void init_nr_ue_transport(PHY_VARS_NR_UE *ue,int abstraction_flag);
void init_N_TA_offset(PHY_VARS_NR_UE *ue);
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index 61af617d6e6a6ae7dd47147a751a5bcdb83acd3e..1bbe9eb39a28159559597ae5008e4a623b5d7c68 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -1527,7 +1527,9 @@ void fill_dci_and_dlsch(PHY_VARS_eNB *eNB,
if (dlsch0->active)
T(T_ENB_PHY_DLSCH_UE_DCI, T_INT(0), T_INT(frame), T_INT(subframe),
T_INT(rel8->rnti), T_INT(rel8->dci_format), T_INT(rel8->harq_process),
- T_INT(rel8->mcs_1), T_INT(dlsch0_harq->TBS));
+ T_INT(rel8->mcs_1), T_INT(dlsch0_harq->TBS), T_INT(rel8->new_data_indicator_1),
+ T_INT(rel8->redundancy_version_1), T_INT(rel8->resource_block_coding),
+ T_INT(dlsch0_harq->nb_rb), T_INT(dlsch0_harq->rb_alloc[0]));
#endif
}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index b1bf32b7904ab7fa165f04bf4ab51143304a1110..ce056b5aa5d7d46a71eb924401ae9c99c1e2ece7 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -213,7 +213,7 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
nr_pdsch_codeword_scrambling_optim(harq->f,
encoded_length,
q,
- rel15->dlDmrsScramblingId,
+ rel15->dataScramblingId,
rel15->rnti,
scrambled_output[q]);
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index 2ae2549df31743e6d7263e1087c8d0714bf34091..9956e147016559bb79e53bd9b354a3d241065e97 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -292,7 +292,8 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
}
G = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs,mod_order,rel15->nrOfLayers);
- LOG_D(NR_PHY,"dlsch coding A %d G %d (nb_rb %d, nb_symb_sch %d, nb_re_dmrs %d, length_dmrs %d, mod_order %d)\n", A,G, nb_rb,nb_symb_sch,nb_re_dmrs,length_dmrs,mod_order);
+ LOG_D(PHY,"dlsch coding A %d G %d (nb_rb %d, nb_symb_sch %d, nb_re_dmrs %d, length_dmrs %d, mod_order %d)\n",
+ A,G, nb_rb,nb_symb_sch,nb_re_dmrs,length_dmrs,(int)mod_order);
if (A > 3824) {
// Add 24-bit crc (polynomial A) to payload
diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
index a4d4daed70a65d7337071f1586781fbf87306131..aa8588f106f6a4718d50fed7b0f72d768372f7aa 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -715,106 +715,102 @@ void pdcch_siso(NR_DL_FRAME_PARMS *frame_parms,
#ifdef NR_PDCCH_DCI_RUN
int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
- UE_nr_rxtx_proc_t *proc) {
+ UE_nr_rxtx_proc_t *proc,
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15) {
uint32_t frame = proc->frame_rx;
uint32_t slot = proc->nr_slot_rx;
NR_UE_COMMON *common_vars = &ue->common_vars;
NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
NR_UE_PDCCH *pdcch_vars = ue->pdcch_vars[proc->thread_id][0];
- fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15;
uint8_t log2_maxh, aarx;
int32_t avgs;
int32_t avgP[4];
- for (int i=0;i<pdcch_vars->nb_search_space;i++) {
-
- rel15 = &pdcch_vars->pdcch_config[i];
- int n_rb,rb_offset;
- get_coreset_rballoc(rel15->coreset.frequency_domain_resource,&n_rb,&rb_offset);
-
- LOG_D(PHY,"pdcch coreset: freq %x, n_rb %d, rb_offset %d\n",
- rel15->coreset.frequency_domain_resource[0],n_rb,rb_offset);
-
- for (int s=rel15->coreset.StartSymbolIndex; s<(rel15->coreset.StartSymbolIndex+rel15->coreset.duration); s++) {
- LOG_D(PHY,"in nr_pdcch_extract_rbs_single(rxdataF -> rxdataF_ext || dl_ch_estimates -> dl_ch_estimates_ext)\n");
-
- nr_pdcch_extract_rbs_single(common_vars->common_vars_rx_data_per_thread[proc->thread_id].rxdataF,
- pdcch_vars->dl_ch_estimates,
- pdcch_vars->rxdataF_ext,
- pdcch_vars->dl_ch_estimates_ext,
- s,
- frame_parms,
- rel15->coreset.frequency_domain_resource,
- n_rb,
- rel15->BWPStart);
-
- LOG_D(PHY,"we enter nr_pdcch_channel_level(avgP=%d) => compute channel level based on ofdm symbol 0, pdcch_vars[eNB_id]->dl_ch_estimates_ext\n",*avgP);
- LOG_D(PHY,"in nr_pdcch_channel_level(dl_ch_estimates_ext -> dl_ch_estimates_ext)\n");
- // compute channel level based on ofdm symbol 0
- nr_pdcch_channel_level(pdcch_vars->dl_ch_estimates_ext,
- frame_parms,
- avgP,
- n_rb);
- avgs = 0;
-
- for (aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++)
- avgs = cmax(avgs, avgP[aarx]);
-
- log2_maxh = (log2_approx(avgs) / 2) + 1; //+frame_parms->nb_antennas_rx;
+ int n_rb,rb_offset;
+ get_coreset_rballoc(rel15->coreset.frequency_domain_resource,&n_rb,&rb_offset);
+ LOG_D(PHY,"pdcch coreset: freq %x, n_rb %d, rb_offset %d\n",
+ rel15->coreset.frequency_domain_resource[0],n_rb,rb_offset);
+ for (int s=rel15->coreset.StartSymbolIndex; s<(rel15->coreset.StartSymbolIndex+rel15->coreset.duration); s++) {
+ LOG_D(PHY,"in nr_pdcch_extract_rbs_single(rxdataF -> rxdataF_ext || dl_ch_estimates -> dl_ch_estimates_ext)\n");
+
+ nr_pdcch_extract_rbs_single(common_vars->common_vars_rx_data_per_thread[proc->thread_id].rxdataF,
+ pdcch_vars->dl_ch_estimates,
+ pdcch_vars->rxdataF_ext,
+ pdcch_vars->dl_ch_estimates_ext,
+ s,
+ frame_parms,
+ rel15->coreset.frequency_domain_resource,
+ n_rb,
+ rel15->BWPStart);
+
+ LOG_D(PHY,"we enter nr_pdcch_channel_level(avgP=%d) => compute channel level based on ofdm symbol 0, pdcch_vars[eNB_id]->dl_ch_estimates_ext\n",*avgP);
+ LOG_D(PHY,"in nr_pdcch_channel_level(dl_ch_estimates_ext -> dl_ch_estimates_ext)\n");
+ // compute channel level based on ofdm symbol 0
+ nr_pdcch_channel_level(pdcch_vars->dl_ch_estimates_ext,
+ frame_parms,
+ avgP,
+ n_rb);
+ avgs = 0;
+
+ for (aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++)
+ avgs = cmax(avgs, avgP[aarx]);
+
+ log2_maxh = (log2_approx(avgs) / 2) + 5; //+frame_parms->nb_antennas_rx;
+
#ifdef UE_DEBUG_TRACE
- LOG_D(PHY,"slot %d: pdcch log2_maxh = %d (%d,%d)\n",slot,log2_maxh,avgP[0],avgs);
+ LOG_D(PHY,"slot %d: pdcch log2_maxh = %d (%d,%d)\n",slot,log2_maxh,avgP[0],avgs);
#endif
#if T_TRACER
- T(T_UE_PHY_PDCCH_ENERGY, T_INT(0), T_INT(0), T_INT(frame%1024), T_INT(slot),
- T_INT(avgP[0]), T_INT(avgP[1]), T_INT(avgP[2]), T_INT(avgP[3]));
+ T(T_UE_PHY_PDCCH_ENERGY, T_INT(0), T_INT(0), T_INT(frame%1024), T_INT(slot),
+ T_INT(avgP[0]), T_INT(avgP[1]), T_INT(avgP[2]), T_INT(avgP[3]));
#endif
- LOG_D(PHY,"we enter nr_pdcch_channel_compensation(log2_maxh=%d)\n",log2_maxh);
- LOG_D(PHY,"in nr_pdcch_channel_compensation(rxdataF_ext x dl_ch_estimates_ext -> rxdataF_comp)\n");
- // compute LLRs for ofdm symbol 0 only
- nr_pdcch_channel_compensation(pdcch_vars->rxdataF_ext,
- pdcch_vars->dl_ch_estimates_ext,
- pdcch_vars->rxdataF_comp,
- NULL,
- frame_parms,
- s,
- log2_maxh,
- n_rb); // log2_maxh+I0_shift
- if (frame_parms->nb_antennas_rx > 1) {
- LOG_D(PHY,"we enter nr_pdcch_detection_mrc(frame_parms->nb_antennas_rx=%d)\n", frame_parms->nb_antennas_rx);
- nr_pdcch_detection_mrc(frame_parms, pdcch_vars->rxdataF_comp,s);
- }
+ LOG_D(PHY,"we enter nr_pdcch_channel_compensation(log2_maxh=%d)\n",log2_maxh);
+ LOG_D(PHY,"in nr_pdcch_channel_compensation(rxdataF_ext x dl_ch_estimates_ext -> rxdataF_comp)\n");
+ // compute LLRs for ofdm symbol 0 only
+ nr_pdcch_channel_compensation(pdcch_vars->rxdataF_ext,
+ pdcch_vars->dl_ch_estimates_ext,
+ pdcch_vars->rxdataF_comp,
+ NULL,
+ frame_parms,
+ s,
+ log2_maxh,
+ n_rb); // log2_maxh+I0_shift
+ if (frame_parms->nb_antennas_rx > 1) {
+ LOG_D(PHY,"we enter nr_pdcch_detection_mrc(frame_parms->nb_antennas_rx=%d)\n", frame_parms->nb_antennas_rx);
+ nr_pdcch_detection_mrc(frame_parms, pdcch_vars->rxdataF_comp,s);
+ }
- LOG_D(PHY,"we enter nr_pdcch_llr(for symbol %d), pdcch_vars[eNB_id]->rxdataF_comp ---> pdcch_vars[eNB_id]->llr \n",s);
- LOG_D(PHY,"in nr_pdcch_llr(rxdataF_comp -> llr)\n");
- nr_pdcch_llr(frame_parms,
- pdcch_vars->rxdataF_comp,
- pdcch_vars->llr,
- s,
- n_rb);
+ LOG_D(PHY,"we enter nr_pdcch_llr(for symbol %d), pdcch_vars[eNB_id]->rxdataF_comp ---> pdcch_vars[eNB_id]->llr \n",s);
+ LOG_D(PHY,"in nr_pdcch_llr(rxdataF_comp -> llr)\n");
+ nr_pdcch_llr(frame_parms,
+ pdcch_vars->rxdataF_comp,
+ pdcch_vars->llr,
+ s,
+ n_rb);
#if T_TRACER
- // T(T_UE_PHY_PDCCH_IQ, T_INT(frame_parms->N_RB_DL), T_INT(frame_parms->N_RB_DL),
- // T_INT(n_pdcch_symbols),
- // T_BUFFER(pdcch_vars[eNB_id]->rxdataF_comp, frame_parms->N_RB_DL*12*n_pdcch_symbols* 4));
+ // T(T_UE_PHY_PDCCH_IQ, T_INT(frame_parms->N_RB_DL), T_INT(frame_parms->N_RB_DL),
+ // T_INT(n_pdcch_symbols),
+ // T_BUFFER(pdcch_vars[eNB_id]->rxdataF_comp, frame_parms->N_RB_DL*12*n_pdcch_symbols* 4));
#endif
#ifdef DEBUG_DCI_DECODING
- printf("demapping: slot %d, mi %d\n",slot,get_mi(frame_parms,slot));
+ printf("demapping: slot %d, mi %d\n",slot,get_mi(frame_parms,slot));
#endif
- }
+ }
- LOG_D(PHY,"we enter nr_pdcch_demapping_deinterleaving()\n");
- nr_pdcch_demapping_deinterleaving((uint32_t *) pdcch_vars->llr,
- (uint32_t *) pdcch_vars->e_rx,
- rel15->coreset.duration,
- n_rb,
- rel15->coreset.RegBundleSize,
- rel15->coreset.InterleaverSize,
- rel15->coreset.ShiftIndex,
- rel15->number_of_candidates,
- rel15->CCE,
- rel15->L);
+ LOG_D(PHY,"we enter nr_pdcch_demapping_deinterleaving()\n");
+ nr_pdcch_demapping_deinterleaving((uint32_t *) pdcch_vars->llr,
+ (uint32_t *) pdcch_vars->e_rx,
+ rel15->coreset.duration,
+ n_rb,
+ rel15->coreset.RegBundleSize,
+ rel15->coreset.InterleaverSize,
+ rel15->coreset.ShiftIndex,
+ rel15->number_of_candidates,
+ rel15->CCE,
+ rel15->L);
/*
nr_pdcch_unscrambling(rel15->rnti,
frame_parms,
@@ -824,10 +820,9 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
// get_nCCE(n_pdcch_symbols, frame_parms, mi) * 72,
rel15->coreset.pdcch_dmrs_scrambling_id);
*/
- LOG_D(PHY,"we end nr_pdcch_unscrambling()\n");
- LOG_D(PHY,"Ending nr_rx_pdcch() function\n");
+ LOG_D(PHY,"we end nr_pdcch_unscrambling()\n");
+ LOG_D(PHY,"Ending nr_rx_pdcch() function\n");
- }
return (0);
}
@@ -923,72 +918,69 @@ uint16_t nr_dci_false_detection(uint64_t *dci,
uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
UE_nr_rxtx_proc_t *proc,
- fapi_nr_dci_indication_t *dci_ind) {
+ fapi_nr_dci_indication_t *dci_ind,
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15) {
- NR_UE_PDCCH *pdcch_vars = ue->pdcch_vars[proc->thread_id][0];
- fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15;
- for (int i=0;i<pdcch_vars->nb_search_space;i++) {
+ NR_UE_PDCCH *pdcch_vars = ue->pdcch_vars[proc->thread_id][0];
- rel15 = &pdcch_vars->pdcch_config[i];
- //int gNB_id = 0;
- int16_t tmp_e[16*108];
- rnti_t n_rnti;
+ //int gNB_id = 0;
+ int16_t tmp_e[16*108];
+ rnti_t n_rnti;
- for (int j=0;j<rel15->number_of_candidates;j++) {
- int CCEind = rel15->CCE[j];
- int L = rel15->L[j];
+ for (int j=0;j<rel15->number_of_candidates;j++) {
+ int CCEind = rel15->CCE[j];
+ int L = rel15->L[j];
- // Loop over possible DCI lengths
- for (int k = 0; k < rel15->num_dci_options; k++) {
- int dci_length = rel15->dci_length_options[k];
- uint64_t dci_estimation[2]= {0};
- const t_nrPolar_params *currentPtrDCI = nr_polar_params(NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L, 1, &ue->polarList);
+ // Loop over possible DCI lengths
+ for (int k = 0; k < rel15->num_dci_options; k++) {
+ int dci_length = rel15->dci_length_options[k];
+ uint64_t dci_estimation[2]= {0};
+ const t_nrPolar_params *currentPtrDCI = nr_polar_params(NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L, 1, &ue->polarList);
- LOG_D(PHY, "Trying DCI candidate %d of %d number of candidates, CCE %d (%d), L %d\n", j, rel15->number_of_candidates, CCEind, CCEind*9*6*2, L);
+ LOG_D(PHY, "Trying DCI candidate %d of %d number of candidates, CCE %d (%d), L %d\n", j, rel15->number_of_candidates, CCEind, CCEind*9*6*2, L);
- nr_pdcch_unscrambling(&pdcch_vars->e_rx[CCEind*108], rel15->coreset.scrambling_rnti, L*108, rel15->coreset.pdcch_dmrs_scrambling_id, tmp_e);
+ nr_pdcch_unscrambling(&pdcch_vars->e_rx[CCEind*108], rel15->coreset.scrambling_rnti, L*108, rel15->coreset.pdcch_dmrs_scrambling_id, tmp_e);
- #ifdef DEBUG_DCI_DECODING
- uint32_t * z = (uint32_t *) &pdcch_vars->e_rx[CCEind*108];
- for (int index_z = 0; index_z < 96; index_z++){
- for (int i=0; i<9; i++) {
- LOG_D(PHY,"z[%d]=(%d,%d) \n", (9*index_z + i), *(int16_t *) &z[index_z + i],*(1 + (int16_t *) &z[index_z + i]));
- }
- }
- #endif
-
- uint16_t crc = polar_decoder_int16(tmp_e,
- dci_estimation,
- 1,
- currentPtrDCI);
-
- n_rnti = rel15->rnti;
- LOG_D(PHY, "(%i.%i) dci indication (rnti %x,dci format %s,n_CCE %d,payloadSize %d)\n",
- proc->frame_rx, proc->nr_slot_rx,n_rnti,nr_dci_format_string[rel15->dci_format_options[k]],CCEind,dci_length);
- if (crc == n_rnti) {
- LOG_D(PHY, "(%i.%i) Received dci indication (rnti %x,dci format %s,n_CCE %d,payloadSize %d,payload %llx)\n",
- proc->frame_rx, proc->nr_slot_rx,n_rnti,nr_dci_format_string[rel15->dci_format_options[k]],CCEind,dci_length,*(unsigned long long*)dci_estimation);
- uint16_t mb = nr_dci_false_detection(dci_estimation,tmp_e,currentPtrDCI,L*108,n_rnti);
- ue->dci_thres = (ue->dci_thres + mb) / 2;
- if (mb > (ue->dci_thres+20)) {
- LOG_W(PHY,"DCI false positive. Dropping DCI index %d. Mismatched bits: %d/%d. Current DCI threshold: %d\n",j,mb,L*108,ue->dci_thres);
- continue;
- }
- else {
- dci_ind->SFN = proc->frame_rx;
- dci_ind->slot = proc->nr_slot_rx;
- dci_ind->dci_list[dci_ind->number_of_dcis].rnti = n_rnti;
- dci_ind->dci_list[dci_ind->number_of_dcis].n_CCE = CCEind;
- dci_ind->dci_list[dci_ind->number_of_dcis].N_CCE = L;
- dci_ind->dci_list[dci_ind->number_of_dcis].dci_format = rel15->dci_format_options[k];
- dci_ind->dci_list[dci_ind->number_of_dcis].payloadSize = dci_length;
- memcpy((void*)dci_ind->dci_list[dci_ind->number_of_dcis].payloadBits,(void*)dci_estimation,8);
- dci_ind->number_of_dcis++;
- break; // If DCI is found, no need to check for remaining DCI lengths
- }
- } else {
- LOG_D(PHY,"(%i.%i) Decoded crc %x does not match rnti %x for DCI format %d\n", proc->frame_rx, proc->nr_slot_rx, crc, n_rnti, rel15->dci_format_options[k]);
+#ifdef DEBUG_DCI_DECODING
+ uint32_t * z = (uint32_t *) &pdcch_vars->e_rx[CCEind*108];
+ for (int index_z = 0; index_z < 96; index_z++){
+ for (int i=0; i<9; i++) {
+ LOG_D(PHY,"z[%d]=(%d,%d) \n", (9*index_z + i), *(int16_t *) &z[index_z + i],*(1 + (int16_t *) &z[index_z + i]));
+ }
+ }
+#endif
+
+ uint16_t crc = polar_decoder_int16(tmp_e,
+ dci_estimation,
+ 1,
+ currentPtrDCI);
+
+ n_rnti = rel15->rnti;
+ LOG_D(PHY, "(%i.%i) dci indication (rnti %x,dci format %s,n_CCE %d,payloadSize %d)\n",
+ proc->frame_rx, proc->nr_slot_rx,n_rnti,nr_dci_format_string[rel15->dci_format_options[k]],CCEind,dci_length);
+ if (crc == n_rnti) {
+ LOG_D(PHY, "(%i.%i) Received dci indication (rnti %x,dci format %s,n_CCE %d,payloadSize %d,payload %llx)\n",
+ proc->frame_rx, proc->nr_slot_rx,n_rnti,nr_dci_format_string[rel15->dci_format_options[k]],CCEind,dci_length,*(unsigned long long*)dci_estimation);
+ uint16_t mb = nr_dci_false_detection(dci_estimation,tmp_e,currentPtrDCI,L*108,n_rnti);
+ ue->dci_thres = (ue->dci_thres + mb) / 2;
+ if (mb > (ue->dci_thres+20)) {
+ LOG_W(PHY,"DCI false positive. Dropping DCI index %d. Mismatched bits: %d/%d. Current DCI threshold: %d\n",j,mb,L*108,ue->dci_thres);
+ continue;
+ }
+ else {
+ dci_ind->SFN = proc->frame_rx;
+ dci_ind->slot = proc->nr_slot_rx;
+ dci_ind->dci_list[dci_ind->number_of_dcis].rnti = n_rnti;
+ dci_ind->dci_list[dci_ind->number_of_dcis].n_CCE = CCEind;
+ dci_ind->dci_list[dci_ind->number_of_dcis].N_CCE = L;
+ dci_ind->dci_list[dci_ind->number_of_dcis].dci_format = rel15->dci_format_options[k];
+ dci_ind->dci_list[dci_ind->number_of_dcis].payloadSize = dci_length;
+ memcpy((void*)dci_ind->dci_list[dci_ind->number_of_dcis].payloadBits,(void*)dci_estimation,8);
+ dci_ind->number_of_dcis++;
+ break; // If DCI is found, no need to check for remaining DCI lengths
}
+ } else {
+ LOG_D(PHY,"(%i.%i) Decoded crc %x does not match rnti %x for DCI format %d\n", proc->frame_rx, proc->nr_slot_rx, crc, n_rnti, rel15->dci_format_options[k]);
}
}
}
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
index c98a685ed8cff01d8aaa8344154fc2f3396cd2ae..95b04435eba70320525dbfec38663be2075d3319 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -155,7 +155,7 @@ NR_UE_DLSCH_t *new_nr_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint
if (dlsch->harq_processes[i]) {
memset(dlsch->harq_processes[i],0,sizeof(NR_DL_UE_HARQ_t));
init_downlink_harq_status(dlsch->harq_processes[i]);
- dlsch->harq_processes[i]->first_tx=1;
+ dlsch->harq_processes[i]->first_rx=1;
dlsch->harq_processes[i]->b = (uint8_t *)malloc16(dlsch_bytes);
if (dlsch->harq_processes[i]->b)
@@ -327,7 +327,9 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
dlsch->last_iteration_cnt = ret;
harq_process->G = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, dmrs_length, harq_process->Qm,harq_process->Nl);
G = harq_process->G;
- LOG_D(PHY,"DLSCH Decoding, harq_pid %d TBS %d (%d) G %d nb_re_dmrs %d mcs %d Nl %d nb_symb_sch %d nb_rb %d\n",harq_pid,A,A/8,G, nb_re_dmrs,harq_process->mcs, harq_process->Nl, nb_symb_sch,nb_rb);
+
+ LOG_D(PHY,"DLSCH Decoding, harq_pid %d TBS %d (%d) G %d nb_re_dmrs %d length dmrs %d mcs %d Nl %d nb_symb_sch %d nb_rb %d\n",
+ harq_pid,A,A/8,G, nb_re_dmrs, dmrs_length, harq_process->mcs, harq_process->Nl, nb_symb_sch,nb_rb);
if ((harq_process->R)<1024)
Coderate = (float) (harq_process->R) /(float) 1024;
@@ -358,7 +360,7 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
}
}
- if (harq_process->round == 0) {
+ if (harq_process->first_rx == 1) {
// This is a new packet, so compute quantities regarding segmentation
if (A > NR_MAX_PDSCH_TBS)
harq_process->B = A+24;
@@ -448,7 +450,7 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
harq_process->w[r],
harq_process->C,
harq_process->rvidx,
- (harq_process->round==0)?1:0,
+ (harq_process->first_rx==1)?1:0,
E,
harq_process->F,
Kr-harq_process->F-2*(p_decParams->Z))==-1) {
@@ -771,7 +773,7 @@ uint32_t nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
}
}
- if (harq_process->round == 0) {
+ if (harq_process->first_rx == 1) {
// This is a new packet, so compute quantities regarding segmentation
if (A > NR_MAX_PDSCH_TBS)
harq_process->B = A+24;
@@ -909,7 +911,7 @@ uint32_t nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
harq_process->w[r],
harq_process->C,
harq_process->rvidx,
- (harq_process->round==0)?1:0,
+ (harq_process->first_rx==1)?1:0,
E,
harq_process->F,
Kr-harq_process->F-2*(p_decParams->Z))==-1) {
@@ -1229,25 +1231,23 @@ void nr_dlsch_decoding_process(void *arg) {
}
}
- harq_process->round =0;
+ if (harq_process->first_rx == 1) {
+ // This is a new packet, so compute quantities regarding segmentation
+ if (A > NR_MAX_PDSCH_TBS)
+ harq_process->B = A+24;
+ else
+ harq_process->B = A+16;
- // if (harq_process->round == 0) {
- // This is a new packet, so compute quantities regarding segmentation
- if (A > NR_MAX_PDSCH_TBS)
- harq_process->B = A+24;
- else
- harq_process->B = A+16;
-
- nr_segmentation(NULL,
- NULL,
- harq_process->B,
- &harq_process->C,
- &harq_process->K,
- &harq_process->Z,
- &harq_process->F,
- p_decParams->BG);
- p_decParams->Z = harq_process->Z;
- // }
+ nr_segmentation(NULL,
+ NULL,
+ harq_process->B,
+ &harq_process->C,
+ &harq_process->K,
+ &harq_process->Z,
+ &harq_process->F,
+ p_decParams->BG);
+ p_decParams->Z = harq_process->Z;
+ }
LOG_D(PHY,"round %d Z %d K %d BG %d\n", harq_process->round, p_decParams->Z, harq_process->K, p_decParams->BG);
p_decParams->numMaxIter = dlsch->max_ldpc_iterations;
p_decParams->outMode= 0;
@@ -1314,7 +1314,7 @@ void nr_dlsch_decoding_process(void *arg) {
harq_process->w[r],
harq_process->C,
harq_process->rvidx,
- (harq_process->round==0)?1:0,
+ (harq_process->first_rx==1)?1:0,
E,
harq_process->F,
Kr-harq_process->F-2*(p_decParams->Z))==-1) {
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
index eae4a2eaa70f14e89e6d70674032432eab79c665..fb6e7bf6b5da04d2c47c890f7a07e51298cb2c16 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
@@ -738,11 +738,11 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
}
void nr_dlsch_deinterleaving(uint8_t symbol,
- uint8_t start_symbol,
- uint16_t L,
- uint16_t *llr,
- uint16_t *llr_deint,
- uint16_t nb_rb_pdsch)
+ uint8_t start_symbol,
+ uint16_t L,
+ uint16_t *llr,
+ uint16_t *llr_deint,
+ uint16_t nb_rb_pdsch)
{
uint32_t bundle_idx, N_bundle, R, C, r,c;
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
index d11a852a1ea95e38594a7de3cf21ca1b92e3824d..7dfd765b76e8050710b92f423600518232c101e1 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
@@ -36,8 +36,7 @@
#include "PHY/MODULATION/modulation_UE.h"
#include "nr_transport_proto_ue.h"
#include "PHY/NR_UE_ESTIMATION/nr_estimation.h"
-//#include "SCHED/defs.h"
-//#include "SCHED/extern.h"
+#include "SCHED_NR_UE/defs.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "common_lib.h"
@@ -46,6 +45,7 @@
#include "PHY/NR_REFSIG/pss_nr.h"
#include "PHY/NR_REFSIG/sss_nr.h"
#include "PHY/NR_REFSIG/refsig_defs_ue.h"
+#include "PHY/NR_TRANSPORT/nr_dci.h"
extern openair0_config_t openair0_cfg[];
//static nfapi_nr_config_request_t config_t;
@@ -201,7 +201,10 @@ int nr_pbch_detection(UE_nr_rxtx_proc_t * proc, PHY_VARS_NR_UE *ue, int pbch_ini
char duplex_string[2][4] = {"FDD","TDD"};
char prefix_string[2][9] = {"NORMAL","EXTENDED"};
-int nr_initial_sync(UE_nr_rxtx_proc_t *proc, PHY_VARS_NR_UE *ue, int n_frames)
+int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
+ PHY_VARS_NR_UE *ue,
+ int n_frames, int sa,
+ int dlsch_parallel)
{
int32_t sync_pos, sync_pos_frame; // k_ssb, N_ssb_crb, sync_pos2,
@@ -349,7 +352,7 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc, PHY_VARS_NR_UE *ue, int n_frames)
}
}
else {
- ret = -1;
+ ret = -1;
}
/* Consider this is a false detection if the offset is > 1000 Hz
@@ -479,6 +482,76 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc, PHY_VARS_NR_UE *ue, int n_frames)
}
+ // if stand alone and sync on ssb do sib1 detection as part of initial sync
+ if (sa==1 && ret==0) {
+ bool dec = false;
+ NR_UE_PDCCH *pdcch_vars = ue->pdcch_vars[proc->thread_id][0];
+ int gnb_id = 0; //FIXME
+ int coreset_nb_rb=0;
+ int coreset_start_rb=0;
+
+ for(int n_ss = 0; n_ss<pdcch_vars->nb_search_space; n_ss++) {
+ uint8_t nb_symb_pdcch = pdcch_vars->pdcch_config[n_ss].coreset.duration;
+ get_coreset_rballoc(pdcch_vars->pdcch_config[n_ss].coreset.frequency_domain_resource,&coreset_nb_rb,&coreset_start_rb);
+
+ for (uint16_t l=0; l<nb_symb_pdcch; l++) {
+ nr_slot_fep_init_sync(ue,
+ proc,
+ l, // the UE PHY has no notion of the symbols to be monitored in the search space
+ pdcch_vars->slot,
+ is*fp->samples_per_frame+pdcch_vars->sfn*fp->samples_per_frame+ue->rx_offset);
+
+ if (coreset_nb_rb > 0)
+ nr_pdcch_channel_estimation(ue,
+ proc,
+ 0,
+ pdcch_vars->slot,
+ l,
+ fp->first_carrier_offset+(pdcch_vars->pdcch_config[n_ss].BWPStart + coreset_start_rb)*12,
+ coreset_nb_rb);
+
+ }
+ int dci_cnt = nr_ue_pdcch_procedures(gnb_id, ue, proc, n_ss);
+ if (dci_cnt>0){
+ NR_UE_DLSCH_t *dlsch = ue->dlsch_SI[gnb_id];
+ if (dlsch && (dlsch->active == 1)) {
+ uint8_t harq_pid = dlsch->current_harq_pid;
+ NR_DL_UE_HARQ_t *dlsch0_harq = dlsch->harq_processes[harq_pid];
+ uint16_t nb_symb_sch = dlsch0_harq->nb_symbols;
+ uint16_t start_symb_sch = dlsch0_harq->start_symbol;
+
+ for (uint16_t m=start_symb_sch;m<(nb_symb_sch+start_symb_sch) ; m++){
+ nr_slot_fep_init_sync(ue,
+ proc,
+ m,
+ pdcch_vars->slot, // same slot and offset as pdcch
+ is*fp->samples_per_frame+pdcch_vars->sfn*fp->samples_per_frame+ue->rx_offset);
+ }
+
+ int ret = nr_ue_pdsch_procedures(ue,
+ proc,
+ gnb_id,
+ SI_PDSCH,
+ ue->dlsch_SI[gnb_id],
+ NULL);
+ if (ret >= 0)
+ dec = nr_ue_dlsch_procedures(ue,
+ proc,
+ gnb_id,
+ SI_PDSCH,
+ ue->dlsch_SI[gnb_id],
+ NULL,
+ &ue->dlsch_SI_errors[gnb_id],
+ dlsch_parallel);
+
+ // deactivate dlsch once dlsch proc is done
+ ue->dlsch_SI[gnb_id]->active = 0;
+ }
+ }
+ }
+ if (dec == false) // sib1 not decoded
+ ret = -1;
+ }
// exit_fun("debug exit");
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_NR_INITIAL_UE_SYNC, VCD_FUNCTION_OUT);
return ret;
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
index 8d13d70ac14bc0c248058c9e80022bebfde26b12..c277a8ffcc2e2b8a6f1b96ad7722776e92ff500d 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
@@ -1120,7 +1120,8 @@ uint32_t dlsch_decoding_emul(PHY_VARS_NR_UE *phy_vars_ue,
uint8_t eNB_id);
int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
- UE_nr_rxtx_proc_t *proc);
+ UE_nr_rxtx_proc_t *proc,
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15);
/*! \brief Extract PSS and SSS resource elements
@@ -1455,7 +1456,9 @@ void generate_RIV_tables(void);
*/
int nr_initial_sync(UE_nr_rxtx_proc_t *proc,
PHY_VARS_NR_UE *phy_vars_ue,
- int n_frames);
+ int n_frames,
+ int sa,
+ int dlsch_parallel);
/*!
\brief This function gets the carrier frequencies either from FP or command-line-set global variables, depending on the availability of the latter
@@ -1709,7 +1712,8 @@ uint32_t lte_gold_generic(uint32_t *x1, uint32_t *x2, uint8_t reset);
uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
UE_nr_rxtx_proc_t *proc,
- fapi_nr_dci_indication_t *dci_ind);
+ fapi_nr_dci_indication_t *dci_ind,
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15);
/** \brief This function is the top-level entry point to PDSCH demodulation, after frequency-domain transformation and channel estimation. It performs
@@ -1745,6 +1749,8 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, uint8_t subframe);
+void dump_nrdlsch(PHY_VARS_NR_UE *ue,uint8_t gNB_id,uint8_t nr_slot_rx,unsigned int *coded_bits_per_codeword,int round, unsigned char harq_pid);
+
void *dlsch_thread(void *arg);
/**@}*/
#endif
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
index e8a96062556b6ebd9015a809489699c999be1aa2..b4ee4f5b41d047483cdd90afa7491a225072d478 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
@@ -206,8 +206,8 @@ typedef struct {
} NR_UE_ULSCH_t;
typedef struct {
- /// Indicator of first transmission
- uint8_t first_tx;
+ /// Indicator of first reception
+ uint8_t first_rx;
/// Last Ndi received for this process on DCI (used for C-RNTI only)
uint8_t DCINdi;
/// DLSCH status flag indicating
diff --git a/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c b/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
index 66296910fc419f2610a13de455d3ffee93aa6648..9339f3974d4cdb31cb01c12ad35e655cc3aebd89 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
@@ -318,7 +318,7 @@ int do_pss_sss_extract_nr(PHY_VARS_NR_UE *ue,
int32_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR],
int32_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR],
uint8_t doPss, uint8_t doSss,
- uint8_t subframe) // add flag to indicate extracting only PSS, only SSS, or both
+ uint8_t subframe) // add flag to indicate extracting only PSS, only SSS, or both
{
uint8_t aarx;
int32_t *pss_rxF,*pss_rxF_ext;
@@ -329,8 +329,8 @@ int do_pss_sss_extract_nr(PHY_VARS_NR_UE *ue,
for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
- pss_symbol = 0;
- sss_symbol = SSS_SYMBOL_NB-PSS_SYMBOL_NB;
+ pss_symbol = 0;
+ sss_symbol = SSS_SYMBOL_NB-PSS_SYMBOL_NB;
rxdataF = ue->common_vars.common_vars_rx_data_per_thread[proc->thread_id].rxdataF;
@@ -343,6 +343,7 @@ int do_pss_sss_extract_nr(PHY_VARS_NR_UE *ue,
sss_rxF_ext = &sss_ext[aarx][0];
unsigned int k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + 56;
+
if (k>= frame_parms->ofdm_symbol_size) k-=frame_parms->ofdm_symbol_size;
for (int i=0; i < LENGTH_PSS_NR; i++) {
@@ -401,7 +402,7 @@ int pss_sss_extract_nr(PHY_VARS_NR_UE *phy_vars_ue,
UE_nr_rxtx_proc_t *proc,
int32_t pss_ext[NB_ANTENNAS_RX][LENGTH_PSS_NR],
int32_t sss_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR],
- uint8_t subframe)
+ uint8_t subframe)
{
return do_pss_sss_extract_nr(phy_vars_ue, proc, pss_ext, sss_ext, 1 /* doPss */, 1 /* doSss */, subframe);
}
diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h
index 019d5e62591b649c26c53d8a8c2c0adca6c4b9a6..33322bccb233bf98c2197b5d36bfba6bc03464a2 100644
--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
@@ -639,6 +639,9 @@ typedef struct {
uint8_t agregationLevel;
int nb_search_space;
fapi_nr_dl_config_dci_dl_pdu_rel15_t pdcch_config[FAPI_NR_MAX_SS_PER_CORESET];
+ // frame and slot for sib1 in initial sync
+ uint16_t sfn;
+ uint16_t slot;
/*
#ifdef NR_PDCCH_DEFS_NR_UE
int nb_searchSpaces;
diff --git a/openair1/SCHED_NR_UE/defs.h b/openair1/SCHED_NR_UE/defs.h
index c4a3de1d5af3667cf17de6642eef6c1953c59553..7b4511e7f4236f7a4e67c90a288db37551827296 100644
--- a/openair1/SCHED_NR_UE/defs.h
+++ b/openair1/SCHED_NR_UE/defs.h
@@ -420,6 +420,25 @@ void nr_fill_rx_indication(fapi_nr_rx_indication_t *rx_ind,
NR_UE_DLSCH_t *dlsch1,
uint16_t n_pdus);
+bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
+ UE_nr_rxtx_proc_t *proc,
+ int gNB_id,
+ PDSCH_t pdsch,
+ NR_UE_DLSCH_t *dlsch0,
+ NR_UE_DLSCH_t *dlsch1,
+ int *dlsch_errors,
+ uint8_t dlsch_parallel);
+
+int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue,
+ UE_nr_rxtx_proc_t *proc,
+ int eNB_id, PDSCH_t pdsch,
+ NR_UE_DLSCH_t *dlsch0, NR_UE_DLSCH_t *dlsch1);
+
+int nr_ue_pdcch_procedures(uint8_t gNB_id,
+ PHY_VARS_NR_UE *ue,
+ UE_nr_rxtx_proc_t *proc,
+ int n_ss);
+
#endif
diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
index 4a17cb98b9bc7cb576a389c297d632fa0c4a17ed..697f5b19d10f3b5e8effa4958a8ba5dfa854f80d 100644
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -78,6 +78,8 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
fapi_nr_dl_config_dci_dl_pdu_rel15_t *pdcch_config = &dl_config->dl_config_list[i].dci_config_pdu.dci_config_rel15;
memcpy((void*)&pdcch_vars->pdcch_config[pdcch_vars->nb_search_space],(void*)pdcch_config,sizeof(*pdcch_config));
pdcch_vars->nb_search_space = pdcch_vars->nb_search_space + 1;
+ pdcch_vars->sfn = scheduled_response->frame;
+ pdcch_vars->slot = slot;
LOG_D(PHY,"Number of DCI SearchSpaces %d\n",pdcch_vars->nb_search_space);
} else {
@@ -127,7 +129,7 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
}
dlsch0_harq->Nl = Nl;
dlsch0_harq->mcs_table=dlsch_config_pdu->mcs_table;
- downlink_harq_process(dlsch0_harq, dlsch0->current_harq_pid, dlsch_config_pdu->ndi, dlsch0->rnti_type);
+ downlink_harq_process(dlsch0_harq, dlsch0->current_harq_pid, dlsch_config_pdu->ndi, dlsch_config_pdu->rv, dlsch0->rnti_type);
if (dlsch0_harq->status != ACTIVE) {
// dlsch0_harq->status not ACTIVE may be due to false retransmission. Reset the
// following flag to skip PDSCH procedures in that case.
diff --git a/openair1/SCHED_NR_UE/harq_nr.c b/openair1/SCHED_NR_UE/harq_nr.c
index 3f528f02d4693d47711d251ea16ec09df1aff423..7bc1f3053bafec50360e2ac01517ca87d6b757ef 100644
--- a/openair1/SCHED_NR_UE/harq_nr.c
+++ b/openair1/SCHED_NR_UE/harq_nr.c
@@ -306,8 +306,9 @@ harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, u
void init_downlink_harq_status(NR_DL_UE_HARQ_t *dl_harq)
{
dl_harq->status = SCH_IDLE;
- dl_harq->first_tx = 1;
+ dl_harq->first_rx = 1;
dl_harq->round = 0;
+ dl_harq->DCINdi = 1;
dl_harq->ack = DL_ACKNACK_NO_SET;
}
@@ -328,39 +329,66 @@ void init_downlink_harq_status(NR_DL_UE_HARQ_t *dl_harq)
*
*********************************************************************/
-void downlink_harq_process(NR_DL_UE_HARQ_t *dl_harq, int harq_pid, int ndi, uint8_t rnti_type) {
+void downlink_harq_process(NR_DL_UE_HARQ_t *dl_harq, int harq_pid, int ndi, int rv, uint8_t rnti_type) {
- if (rnti_type == _CS_RNTI_) {
- LOG_E(PHY, "Fatal error in HARQ entity due to not supported CS_RNTI at line %d in function %s of file %s \n", __LINE__ , __func__, __FILE__);
- return;
- }
- else if ((rnti_type != _C_RNTI_) && (rnti_type != _TC_RNTI_)) {
- /* harq mechanism is not relevant for other rnti */
- return;
- }
- if (dl_harq->first_tx == 1) {
+ if (rnti_type == _SI_RNTI_ ||
+ rnti_type == _P_RNTI_ ||
+ rnti_type == _RA_RNTI_) {
dl_harq->round = 0;
dl_harq->status = ACTIVE;
- dl_harq->DCINdi = ndi;
- dl_harq->first_tx = 0;
-
- LOG_D(PHY, "[HARQ-DL-PDSCH harqId : %d] first new reception \n", harq_pid);
+ dl_harq->first_rx = 1;
}
- else if (dl_harq->DCINdi != ndi) {
- dl_harq->round = 0;
- dl_harq->status = ACTIVE;
- dl_harq->DCINdi = ndi;
-
- LOG_D(PHY, "[HARQ-DL-PDSCH harqId : %d] new reception due to toogle of ndi \n", harq_pid);
+ else{
+ switch(rv){
+ case 0:
+ dl_harq->round = 0;
+ dl_harq->status = ACTIVE;
+ dl_harq->first_rx = 1;
+ if (dl_harq->DCINdi == ndi)
+ LOG_E(PHY,"Warning! rv %d indicates new transmission but new ndi %d is the same as old ndi %d\n",rv,ndi,dl_harq->DCINdi);
+ dl_harq->DCINdi = ndi;
+ break;
+ case 1:
+ dl_harq->round = 2;
+ dl_harq->first_rx = 0;
+ if (dl_harq->DCINdi != ndi) {
+ LOG_E(PHY,"Missed previous DCI detections. NDI toggled but rv %d does not correspond to first reception\n",rv);
+ dl_harq->status = ACTIVE;
+ dl_harq->first_rx = 1;
+ dl_harq->DCINdi = ndi;
+ }
+ else if (dl_harq->ack)
+ dl_harq->status = SCH_IDLE;
+ break;
+ case 2:
+ dl_harq->round = 1;
+ dl_harq->first_rx = 0;
+ if (dl_harq->DCINdi != ndi) {
+ LOG_E(PHY,"Missed previous DCI detections. NDI toggled but rv %d does not correspond to first reception\n",rv);
+ dl_harq->status = ACTIVE;
+ dl_harq->first_rx = 1;
+ dl_harq->DCINdi = ndi;
+ }
+ else if (dl_harq->ack)
+ dl_harq->status = SCH_IDLE;
+ break;
+ case 3:
+ dl_harq->round = 3;
+ dl_harq->first_rx = 0;
+ if (dl_harq->DCINdi != ndi) {
+ LOG_E(PHY,"Missed previous DCI detections. NDI toggled but rv %d does not correspond to first reception\n",rv);
+ dl_harq->status = ACTIVE;
+ dl_harq->first_rx = 1;
+ dl_harq->DCINdi = ndi;
+ }
+ else if (dl_harq->ack)
+ dl_harq->status = SCH_IDLE;
+ break;
+ default:
+ AssertFatal(1==0,"Invalid value for rv %d\n",rv);
+ }
}
- else {
- dl_harq->round++;
-
- if (dl_harq->ack) dl_harq->status = SCH_IDLE;
-
- LOG_D(PHY, "[HARQ-DL-PDSCH harqId : %d] reception of a retransmission \n", harq_pid);
- }
}
diff --git a/openair1/SCHED_NR_UE/harq_nr.h b/openair1/SCHED_NR_UE/harq_nr.h
index 47d1de8a1155fc6e1d052e1c34cfd53000385bfb..5586518d7c7646e598b89b7369c74cf82edf3e8c 100644
--- a/openair1/SCHED_NR_UE/harq_nr.h
+++ b/openair1/SCHED_NR_UE/harq_nr.h
@@ -120,7 +120,7 @@ void init_downlink_harq_status(NR_DL_UE_HARQ_t *dl_harq);
@param rnti_type type of rnti
@returns retransmission or new transmission */
-void downlink_harq_process(NR_DL_UE_HARQ_t *dlsch, int harq_pid, int ndi, uint8_t rnti_type);
+void downlink_harq_process(NR_DL_UE_HARQ_t *dlsch, int harq_pid, int ndi, int rv, uint8_t rnti_type);
#undef EXTERN
#undef INIT_VARIABLES_HARQ_NR_H
diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
index 7c0e2c890688b2e7fdf68cde578ed0778b8c8843..36715b20d7528196a905e4478217a84560a40568 100644
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -114,7 +114,6 @@ void nr_fill_dl_indication(nr_downlink_indication_t *dl_ind,
dl_ind->dci_ind = NULL;
}
-
}
void nr_fill_rx_indication(fapi_nr_rx_indication_t *rx_ind,
@@ -482,7 +481,8 @@ unsigned int nr_get_tx_amp(int power_dBm, int power_max_dBm, int N_RB_UL, int nb
int nr_ue_pdcch_procedures(uint8_t gNB_id,
PHY_VARS_NR_UE *ue,
- UE_nr_rxtx_proc_t *proc)
+ UE_nr_rxtx_proc_t *proc,
+ int n_ss)
{
int frame_rx = proc->frame_rx;
int nr_slot_rx = proc->nr_slot_rx;
@@ -490,6 +490,9 @@ int nr_ue_pdcch_procedures(uint8_t gNB_id,
fapi_nr_dci_indication_t dci_ind = {0};
nr_downlink_indication_t dl_indication;
+ NR_UE_PDCCH *pdcch_vars = ue->pdcch_vars[proc->thread_id][gNB_id];
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15 = &pdcch_vars->pdcch_config[n_ss];
+
/*
// unsigned int dci_cnt=0, i; //removed for nr_ue_pdcch_procedures and added in the loop for nb_coreset_active
#ifdef NR_PDCCH_SCHED_DEBUG
@@ -674,18 +677,18 @@ int nr_ue_pdcch_procedures(uint8_t gNB_id,
*/
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PDCCH, VCD_FUNCTION_IN);
- nr_rx_pdcch(ue, proc);
+ nr_rx_pdcch(ue, proc, rel15);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PDCCH, VCD_FUNCTION_OUT);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_DCI_DECODING, VCD_FUNCTION_IN);
#ifdef NR_PDCCH_SCHED_DEBUG
- printf("<-NR_PDCCH_PHY_PROCEDURES_LTE_UE (nr_ue_pdcch_procedures)-> Entering function nr_dci_decoding_procedure with (nb_searchspace_active=%d)\n",
- pdcch_vars->nb_search_space);
+ printf("<-NR_PDCCH_PHY_PROCEDURES_LTE_UE (nr_ue_pdcch_procedures)-> Entering function nr_dci_decoding_procedure for search space %d)\n",
+ n_ss);
#endif
- dci_cnt = nr_dci_decoding_procedure(ue, proc, &dci_ind);
+ dci_cnt = nr_dci_decoding_procedure(ue, proc, &dci_ind, rel15);
#ifdef NR_PDCCH_SCHED_DEBUG
LOG_I(PHY,"<-NR_PDCCH_PHY_PROCEDURES_LTE_UE (nr_ue_pdcch_procedures)-> Ending function nr_dci_decoding_procedure() -> dci_cnt=%u\n",dci_cnt);
@@ -871,7 +874,7 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int gNB_
return 0;
}
-void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
+bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
UE_nr_rxtx_proc_t *proc,
int gNB_id,
PDSCH_t pdsch,
@@ -882,7 +885,7 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
if (dlsch0==NULL)
AssertFatal(0,"dlsch0 should be defined at this level \n");
-
+ bool dec = false;
int harq_pid = dlsch0->current_harq_pid;
int frame_rx = proc->frame_rx;
int nr_slot_rx = proc->nr_slot_rx;
@@ -936,11 +939,11 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
case PDSCH1:
LOG_E(PHY,"Illegal PDSCH %d for ue_pdsch_procedures\n",pdsch);
pdsch_vars = NULL;
- return;
+ return false;
break;
default:
pdsch_vars = NULL;
- return;
+ return false;
break;
}
@@ -953,13 +956,13 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
else {
LOG_E(PHY,"[UE %d] Frame %d, nr_slot_rx %d: FATAL, prach_resources is NULL\n", ue->Mod_id, frame_rx, nr_slot_rx);
//mac_xface->macphy_exit("prach_resources is NULL");
- return;
+ return false;
}
}
// exit dlsch procedures as there are no active dlsch
if (is_cw0_active != ACTIVE && is_cw1_active != ACTIVE)
- return;
+ return false;
// start ldpc decode for CW 0
dlsch0->harq_processes[harq_pid]->G = nr_get_G(dlsch0->harq_processes[harq_pid]->nb_rb,
@@ -1031,6 +1034,8 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
LOG_T(PHY,"Sequential dlsch decoding , ret = %d\n", ret);
}
+ if(ret<dlsch0->max_ldpc_iterations+1)
+ dec = true;
switch (pdsch) {
case RA_PDSCH:
@@ -1116,7 +1121,7 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
nr_slot_rx,
harq_pid,
pdsch==PDSCH?1:0,
- dlsch1->harq_processes[harq_pid]->TBS>256?1:0);
+ dlsch1->harq_processes[harq_pid]->TBS>256?1:0);
LOG_T(PHY,"CW dlsch decoding is parallelized, ret1 = %d\n", ret1);
}
else {
@@ -1154,7 +1159,6 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
LOG_D(PHY,"AbsSubframe %d.%d --> ldpc Decoding for CW1 %5.3f\n",
frame_rx%1024, nr_slot_rx,(ue->dlsch_decoding_stats[proc->thread_id].p_time)/(cpuf*1000.0));
-
LOG_D(PHY, "harq_pid: %d, TBS expected dlsch1: %d \n", harq_pid, dlsch1->harq_processes[harq_pid]->TBS);
}
@@ -1304,6 +1308,7 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
}
}
}
+ return dec;
}
@@ -1753,6 +1758,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
LOG_D(PHY," ------ --> PDCCH ChannelComp/LLR Frame.slot %d.%d ------ \n", frame_rx%1024, nr_slot_rx);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP_PDCCH, VCD_FUNCTION_IN);
+
for (uint16_t l=0; l<nb_symb_pdcch; l++) {
#if UE_TIMING_TRACE
@@ -1762,29 +1768,30 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
proc,
l,
nr_slot_rx);
+ }
- dci_cnt = 0;
- for(int n_ss = 0; n_ss<pdcch_vars->nb_search_space; n_ss++) {
+ dci_cnt = 0;
+ for(int n_ss = 0; n_ss<pdcch_vars->nb_search_space; n_ss++) {
+ for (uint16_t l=0; l<nb_symb_pdcch; l++) {
- // note: this only works if RBs for PDCCH are contigous!
- LOG_D(PHY, "pdcch_channel_estimation: first_carrier_offset %d, BWPStart %d, coreset_start_rb %d\n",
- fp->first_carrier_offset, pdcch_vars->pdcch_config[n_ss].BWPStart, coreset_start_rb);
+ // note: this only works if RBs for PDCCH are contigous!
+ LOG_D(PHY, "pdcch_channel_estimation: first_carrier_offset %d, BWPStart %d, coreset_start_rb %d\n",
+ fp->first_carrier_offset, pdcch_vars->pdcch_config[n_ss].BWPStart, coreset_start_rb);
- if (coreset_nb_rb > 0)
- nr_pdcch_channel_estimation(ue,
- proc,
- gNB_id,
- nr_slot_rx,
- l,
- fp->first_carrier_offset+(pdcch_vars->pdcch_config[n_ss].BWPStart + coreset_start_rb)*12,
- coreset_nb_rb);
+ if (coreset_nb_rb > 0)
+ nr_pdcch_channel_estimation(ue,
+ proc,
+ gNB_id,
+ nr_slot_rx,
+ l,
+ fp->first_carrier_offset+(pdcch_vars->pdcch_config[n_ss].BWPStart + coreset_start_rb)*12,
+ coreset_nb_rb);
#if UE_TIMING_TRACE
- stop_meas(&ue->ofdm_demod_stats);
+ stop_meas(&ue->ofdm_demod_stats);
#endif
-
- dci_cnt = dci_cnt + nr_ue_pdcch_procedures(gNB_id, ue, proc);
}
+ dci_cnt = dci_cnt + nr_ue_pdcch_procedures(gNB_id, ue, proc, n_ss);
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP_PDCCH, VCD_FUNCTION_OUT);
diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c
index df2356e324c96045a413ffaf5225d98e61d81dca..e08e8f7f7b8168a0d1bff07815d2f23072994960 100644
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -267,6 +267,8 @@ void nr_dlsim_preprocessor(module_id_t module_id,
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
+ ps->nrOfLayers = g_nrOfLayers;
+
nr_set_pdsch_semi_static(scc,
UE_info->CellGroup[0],
sched_ctrl->active_bwp,
@@ -282,7 +284,6 @@ void nr_dlsim_preprocessor(module_id_t module_id,
* configuration */
ps->mcsTableIdx = g_mcsTableIdx;
- sched_pdsch->nrOfLayers = g_nrOfLayers;
sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
sched_pdsch->R = nr_get_code_rate_dl(sched_pdsch->mcs, ps->mcsTableIdx);
sched_pdsch->tb_size = nr_compute_tbs(sched_pdsch->Qm,
@@ -292,7 +293,7 @@ void nr_dlsim_preprocessor(module_id_t module_id,
ps->N_PRB_DMRS * ps->N_DMRS_SLOT,
0 /* N_PRB_oh, 0 for initialBWP */,
0 /* tb_scaling */,
- sched_pdsch->nrOfLayers)
+ ps->nrOfLayers)
>> 3;
/* the simulator assumes the HARQ PID is equal to the slot number */
@@ -779,9 +780,9 @@ int main(int argc, char **argv)
AssertFatal((gNB->if_inst = NR_IF_Module_init(0))!=NULL,"Cannot register interface");
gNB->if_inst->NR_PHY_config_req = nr_phy_config_request;
// common configuration
- rrc_mac_config_req_gNB(0,0, n_tx, n_tx, scc, 0, 0, NULL);
+ rrc_mac_config_req_gNB(0,0, n_tx, n_tx, 0, scc, 0, 0, NULL);
// UE dedicated configuration
- rrc_mac_config_req_gNB(0,0, n_tx, n_tx, scc, 1, secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
+ rrc_mac_config_req_gNB(0,0, n_tx, n_tx, 0, scc, 1, secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
// reset preprocessor to the one of DLSIM after it has been set during
// rrc_mac_config_req_gNB
gNB_mac->pre_processor_dl = nr_dlsim_preprocessor;
@@ -938,6 +939,7 @@ int main(int argc, char **argv)
//Configure UE
rrc.carrier.MIB = (uint8_t*) malloc(4);
rrc.carrier.sizeof_MIB = do_MIB_NR(&rrc,0);
+
nr_rrc_mac_config_req_ue(0,0,0,rrc.carrier.mib.message.choice.mib, NULL, NULL, secondaryCellGroup);
@@ -1013,9 +1015,10 @@ int main(int argc, char **argv)
UE_harq_process->ack = 0;
round = 0;
UE_harq_process->round = round;
- UE_harq_process->first_tx = 1;
+ UE_harq_process->first_rx = 1;
while ((round<num_rounds) && (UE_harq_process->ack==0)) {
+
memset(RC.nrmac[0]->cce_list[1][0],0,MAX_NUM_CCE*sizeof(int));
memset(RC.nrmac[0]->cce_list[1][1],0,MAX_NUM_CCE*sizeof(int));
clear_nr_nfapi_information(RC.nrmac[0], 0, frame, slot);
diff --git a/openair1/SIMULATION/NR_PHY/pbchsim.c b/openair1/SIMULATION/NR_PHY/pbchsim.c
index 9d3ab17ebc3c11d21988698a4aafe01177d6874d..46b42666b58746a5b85a2bff4f97d111645adc07 100644
--- a/openair1/SIMULATION/NR_PHY/pbchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pbchsim.c
@@ -70,6 +70,31 @@ softmodem_params_t *get_softmodem_params(void) {return 0;}
void init_downlink_harq_status(NR_DL_UE_HARQ_t *dl_harq) {}
+int nr_ue_pdcch_procedures(uint8_t gNB_id,
+ PHY_VARS_NR_UE *ue,
+ UE_nr_rxtx_proc_t *proc,
+ int n_ss) {
+ return 0;
+}
+
+int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue,
+ UE_nr_rxtx_proc_t *proc,
+ int eNB_id, PDSCH_t pdsch,
+ NR_UE_DLSCH_t *dlsch0, NR_UE_DLSCH_t *dlsch1) {
+ return 0;
+}
+
+bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
+ UE_nr_rxtx_proc_t *proc,
+ int gNB_id,
+ PDSCH_t pdsch,
+ NR_UE_DLSCH_t *dlsch0,
+ NR_UE_DLSCH_t *dlsch1,
+ int *dlsch_errors,
+ uint8_t dlsch_parallel) {
+ return false;
+}
+
void nr_phy_config_request_sim_pbchsim(PHY_VARS_gNB *gNB,
int N_RB_DL,
int N_RB_UL,
@@ -686,7 +711,7 @@ int main(int argc, char **argv)
}
if (UE->is_synchronized == 0) {
UE_nr_rxtx_proc_t proc={0};
- ret = nr_initial_sync(&proc, UE, 1);
+ ret = nr_initial_sync(&proc, UE, 1, 0, 0);
printf("nr_initial_sync1 returns %d\n",ret);
if (ret<0) n_errors++;
}
diff --git a/openair1/SIMULATION/NR_PHY/prachsim.c b/openair1/SIMULATION/NR_PHY/prachsim.c
index 5d5d600d8403200e6da8c21244cbb743063430f4..6167c809ff3daeac997367e018de35ba27942a92 100644
--- a/openair1/SIMULATION/NR_PHY/prachsim.c
+++ b/openair1/SIMULATION/NR_PHY/prachsim.c
@@ -67,6 +67,7 @@ extern uint16_t prach_root_sequence_map0_3[838];
openair0_config_t openair0_cfg[MAX_CARDS];
//uint8_t nfapi_mode=0;
uint64_t downlink_frequency[MAX_NUM_CCs][4];
+int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
uint16_t sl_ahead = 0;
msc_interface_t msc_interface;
uint32_t N_RB_DL = 106;
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index 0b5b9a86fc9dfddf4806cc3ad50aaaafc3e8dcdc..e267c8b6d7410379bdd6ee8a8ec5c58c2472ecb3 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -723,9 +723,9 @@ int main(int argc, char **argv)
gNB->if_inst->NR_PHY_config_req = nr_phy_config_request;
// common configuration
- rrc_mac_config_req_gNB(0,0, n_tx, n_tx, scc, 0, 0, NULL);
+ rrc_mac_config_req_gNB(0,0, n_tx, n_tx, 0, scc, 0, 0, NULL);
// UE dedicated configuration
- rrc_mac_config_req_gNB(0,0, n_tx, n_tx, scc, 1, secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
+ rrc_mac_config_req_gNB(0,0, n_tx, n_tx, 0, scc, 1, secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
phy_init_nr_gNB(gNB,0,1);
N_RB_DL = gNB->frame_parms.N_RB_DL;
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index ca4011231ac22ddba6482e1cbb792df15a5a3e87..c0fa80d4a9a0c23b5970568d8d27e304bbdc454b 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -409,6 +409,7 @@ typedef struct NRRrcConfigurationReq_s {
NR_ServingCellConfigCommon_t *scc;
NR_ServingCellConfig_t *scd;
int ssb_SubcarrierOffset;
+ int sib1_tda;
int pdsch_AntennaPorts;
int pusch_AntennaPorts;
int do_CSIRS;
diff --git a/openair2/ENB_APP/enb_app.c b/openair2/ENB_APP/enb_app.c
index 9f134f826ea26d0863892547e7f75fde30f2e3a6..2e6c94540d768a61ec6b0da881c993e4d5ec2cb6 100644
--- a/openair2/ENB_APP/enb_app.c
+++ b/openair2/ENB_APP/enb_app.c
@@ -53,7 +53,6 @@
#include "openair1/PHY/INIT/phy_init.h"
extern unsigned char NB_eNB_INST;
-#include <nr-softmodem.h>
extern RAN_CONTEXT_t RC;
# define ENB_REGISTER_RETRY_DELAY 10
diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c
index 1a59f333f322770351d4b785cda71ac582041101..f3d268762c84a2c58d2e310ecaa8b99aecac0b01 100644
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -1040,6 +1040,7 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
NRRRC_CONFIGURATION_REQ (msg_p).pdsch_AntennaPorts = *GNBParamList.paramarray[i][GNB_PDSCH_ANTENNAPORTS_IDX].iptr;
printf("pusch_AntennaPorts %d\n",*GNBParamList.paramarray[i][GNB_PUSCH_ANTENNAPORTS_IDX].iptr);
NRRRC_CONFIGURATION_REQ (msg_p).pusch_AntennaPorts = *GNBParamList.paramarray[i][GNB_PUSCH_ANTENNAPORTS_IDX].iptr;
+ NRRRC_CONFIGURATION_REQ (msg_p).sib1_tda = *GNBParamList.paramarray[i][GNB_SIB1_TDA_IDX].iptr;
printf("Do CSI-RS %d\n",*GNBParamList.paramarray[i][GNB_DO_CSIRS_IDX].iptr);
NRRRC_CONFIGURATION_REQ (msg_p).do_CSIRS = *GNBParamList.paramarray[i][GNB_DO_CSIRS_IDX].iptr;
NRRRC_CONFIGURATION_REQ (msg_p).scc = scc;
@@ -1919,6 +1920,7 @@ void configure_gnb_du_mac(int inst) {
rrc->configuration.ssb_SubcarrierOffset,
rrc->configuration.pdsch_AntennaPorts,
rrc->configuration.pusch_AntennaPorts,
+ rrc->configuration.sib1_tda,
rrc->configuration.scc,
0,
0, // rnti
diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h
index e2a666c16aa60b3c2f3e9d96ebe2c5c53f8d8ebd..ccab98d63c6634e49b7899521fb6d220310004b0 100644
--- a/openair2/GNB_APP/gnb_paramdef.h
+++ b/openair2/GNB_APP/gnb_paramdef.h
@@ -116,6 +116,7 @@ typedef enum {
#define GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET "ssb_SubcarrierOffset"
#define GNB_CONFIG_STRING_PDSCHANTENNAPORTS "pdsch_AntennaPorts"
#define GNB_CONFIG_STRING_PUSCHANTENNAPORTS "pusch_AntennaPorts"
+#define GNB_CONFIG_STRING_SIB1TDA "sib1_tda"
#define GNB_CONFIG_STRING_DOCSIRS "do_CSIRS"
#define GNB_CONFIG_STRING_NRCELLID "nr_cellid"
@@ -141,8 +142,9 @@ typedef enum {
{GNB_CONFIG_STRING_SSBSUBCARRIEROFFSET, NULL, 0, iptr:NULL, defintval:31, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_PDSCHANTENNAPORTS, NULL, 0, iptr:NULL, defintval:1, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_PUSCHANTENNAPORTS, NULL, 0, iptr:NULL, defintval:1, TYPE_INT, 0}, \
+{GNB_CONFIG_STRING_SIB1TDA, NULL, 0, iptr:NULL, defintval:0, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_DOCSIRS, NULL, 0, iptr:NULL, defintval:0, TYPE_INT, 0}, \
-{GNB_CONFIG_STRING_NRCELLID , NULL, 0, u64ptr:NULL, defint64val:1, TYPE_UINT64, 0}, \
+{GNB_CONFIG_STRING_NRCELLID, NULL, 0, u64ptr:NULL, defint64val:1, TYPE_UINT64, 0}, \
}
#define GNB_GNB_ID_IDX 0
@@ -162,8 +164,9 @@ typedef enum {
#define GNB_SSB_SUBCARRIEROFFSET_IDX 14
#define GNB_PDSCH_ANTENNAPORTS_IDX 15
#define GNB_PUSCH_ANTENNAPORTS_IDX 16
-#define GNB_DO_CSIRS_IDX 17
-#define GNB_NRCELLID_IDX 18
+#define GNB_SIB1_TDA_IDX 17
+#define GNB_DO_CSIRS_IDX 18
+#define GNB_NRCELLID_IDX 19
#define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD}
#define GNBPARAMS_CHECK { \
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h b/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
index 6bb7970be66d72ed4a1f67498af3dcdaad6001b4..09fb08d7c4b0df33d73390047cd39ccf531fc0e7 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
@@ -38,6 +38,8 @@
#include <string.h>
#include <stdbool.h>
+#include "NR_SubcarrierSpacing.h"
+
#define TABLE_38213_13_1_NUM_INDEXES 15
#define TABLE_38213_13_2_NUM_INDEXES 14
#define TABLE_38213_13_3_NUM_INDEXES 9
@@ -452,9 +454,11 @@ typedef struct Type0_PDCCH_CSS_config_s {
uint32_t number_of_search_space_per_slot;
uint32_t first_symbol_index;
uint32_t search_space_duration;
+ uint32_t search_space_frame_period; // in slots
uint32_t ssb_length;
uint32_t ssb_index;
uint32_t cset_start_rb;
+ NR_SubcarrierSpacing_t scs_pdcch;
bool active;
} NR_Type0_PDCCH_CSS_config_t;
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
index beaba9548e25d76e7b19d6563c7bbdc797d574b8..83e9a3a968d6c93cb1d9344b711f988493e348c6 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -139,151 +139,225 @@ const float table_38213_13_12_c3[16] = { 1, 0.5f, 1, 0.5f, 1, 0.5f, 0.5f, 0.5f
const int32_t table_38213_10_1_1_c2[5] = { 0, 0, 4, 2, 1 };
// for PDSCH from TS 38.214 subclause 5.1.2.1.1
-const uint8_t table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[16][3]={
- {0,2,12}, // row index 1
- {0,2,10}, // row index 2
- {0,2,9}, // row index 3
- {0,2,7}, // row index 4
- {0,2,5}, // row index 5
- {0,9,4}, // row index 6
- {0,4,4}, // row index 7
- {0,5,7}, // row index 8
- {0,5,2}, // row index 9
- {0,9,2}, // row index 10
- {0,12,2}, // row index 11
- {0,1,13}, // row index 12
- {0,1,6}, // row index 13
- {0,2,4}, // row index 14
- {0,4,7}, // row index 15
- {0,8,4} // row index 16
+const uint8_t table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[16][4]={
+ {1,0,2,12}, // row index 1
+ {1,0,2,10}, // row index 2
+ {1,0,2,9}, // row index 3
+ {1,0,2,7}, // row index 4
+ {1,0,2,5}, // row index 5
+ {0,0,9,4}, // row index 6
+ {0,0,4,4}, // row index 7
+ {0,0,5,7}, // row index 8
+ {0,0,5,2}, // row index 9
+ {0,0,9,2}, // row index 10
+ {0,0,12,2}, // row index 11
+ {1,0,1,13}, // row index 12
+ {1,0,1,6}, // row index 13
+ {1,0,2,4}, // row index 14
+ {0,0,4,7}, // row index 15
+ {0,0,8,4} // row index 16
};
-const uint8_t table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[16][3]={
- {0,3,11}, // row index 1
- {0,3,9}, // row index 2
- {0,3,8}, // row index 3
- {0,3,6}, // row index 4
- {0,3,4}, // row index 5
- {0,10,4}, // row index 6
- {0,6,4}, // row index 7
- {0,5,7}, // row index 8
- {0,5,2}, // row index 9
- {0,9,2}, // row index 10
- {0,12,2}, // row index 11
- {0,1,13}, // row index 12
- {0,1,6}, // row index 13
- {0,2,4}, // row index 14
- {0,4,7}, // row index 15
- {0,8,4} // row index 16
+const uint8_t table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[16][4]={
+ {1,0,3,11}, // row index 1
+ {1,0,3,9}, // row index 2
+ {1,0,3,8}, // row index 3
+ {1,0,3,6}, // row index 4
+ {1,0,3,4}, // row index 5
+ {0,0,10,4}, // row index 6
+ {0,0,6,4}, // row index 7
+ {0,0,5,7}, // row index 8
+ {0,0,5,2}, // row index 9
+ {0,0,9,2}, // row index 10
+ {0,0,12,2}, // row index 11
+ {1,0,1,13}, // row index 12
+ {1,0,1,6}, // row index 13
+ {1,0,2,4}, // row index 14
+ {0,0,4,7}, // row index 15
+ {0,0,8,4} // row index 16
};
-const uint8_t table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[16][3]={
- {0,2,6}, // row index 1
- {0,2,10}, // row index 2
- {0,2,9}, // row index 3
- {0,2,7}, // row index 4
- {0,2,5}, // row index 5
- {0,6,4}, // row index 6
- {0,4,4}, // row index 7
- {0,5,6}, // row index 8
- {0,5,2}, // row index 9
- {0,9,2}, // row index 10
- {0,10,2}, // row index 11
- {0,1,11}, // row index 12
- {0,1,6}, // row index 13
- {0,2,4}, // row index 14
- {0,4,6}, // row index 15
- {0,8,4} // row index 16
+const uint8_t table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[16][4]={
+ {1,0,2,6}, // row index 1
+ {1,0,2,10}, // row index 2
+ {1,0,2,9}, // row index 3
+ {1,0,2,7}, // row index 4
+ {1,0,2,5}, // row index 5
+ {0,0,6,4}, // row index 6
+ {0,0,4,4}, // row index 7
+ {0,0,5,6}, // row index 8
+ {0,0,5,2}, // row index 9
+ {0,0,9,2}, // row index 10
+ {0,0,10,2}, // row index 11
+ {1,0,1,11}, // row index 12
+ {1,0,1,6}, // row index 13
+ {1,0,2,4}, // row index 14
+ {0,0,4,6}, // row index 15
+ {0,0,8,4} // row index 16
};
-const uint8_t table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[16][3]={
- {0,3,5}, // row index 1
- {0,3,9}, // row index 2
- {0,3,8}, // row index 3
- {0,3,6}, // row index 4
- {0,3,4}, // row index 5
- {0,8,2}, // row index 6
- {0,6,4}, // row index 7
- {0,5,6}, // row index 8
- {0,5,2}, // row index 9
- {0,9,2}, // row index 10
- {0,10,2}, // row index 11
- {0,1,11}, // row index 12
- {0,1,6}, // row index 13
- {0,2,4}, // row index 14
- {0,4,6}, // row index 15
- {0,8,4} // row index 16
+const uint8_t table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[16][4]={
+ {1,0,3,5}, // row index 1
+ {1,0,3,9}, // row index 2
+ {1,0,3,8}, // row index 3
+ {1,0,3,6}, // row index 4
+ {1,0,3,4}, // row index 5
+ {0,0,8,2}, // row index 6
+ {0,0,6,4}, // row index 7
+ {0,0,5,6}, // row index 8
+ {0,0,5,2}, // row index 9
+ {0,0,9,2}, // row index 10
+ {0,0,10,2}, // row index 11
+ {1,0,1,11}, // row index 12
+ {1,0,1,6}, // row index 13
+ {1,0,2,4}, // row index 14
+ {0,0,4,6}, // row index 15
+ {0,0,8,4} // row index 16
};
-const uint8_t table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[16][3]={
- {0,2,2}, // row index 1
- {0,4,2}, // row index 2
- {0,6,2}, // row index 3
- {0,8,2}, // row index 4
- {0,10,2}, // row index 5
- {1,2,2}, // row index 6
- {1,4,2}, // row index 7
- {0,2,4}, // row index 8
- {0,4,4}, // row index 9
- {0,6,4}, // row index 10
- {0,8,4}, // row index 11
- {0,10,4}, // row index 12
- {0,2,7}, // row index 13
- {0,2,12}, // row index 14
- {1,2,4}, // row index 15
- {0,0,0} // row index 16
+const uint8_t table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[16][4]={
+ {0,0,2,2}, // row index 1
+ {0,0,4,2}, // row index 2
+ {0,0,6,2}, // row index 3
+ {0,0,8,2}, // row index 4
+ {0,0,10,2}, // row index 5
+ {0,1,2,2}, // row index 6
+ {0,1,4,2}, // row index 7
+ {0,0,2,4}, // row index 8
+ {0,0,4,4}, // row index 9
+ {0,0,6,4}, // row index 10
+ {0,0,8,4}, // row index 11
+ {0,0,10,4}, // row index 12
+ {0,0,2,7}, // row index 13
+ {1,0,2,12}, // row index 14
+ {0,1,2,4}, // row index 15
+ {0,0,0,0} // row index 16
};
-const uint8_t table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[16][3]={
- {0,2,2}, // row index 1
- {0,4,2}, // row index 2
- {0,6,2}, // row index 3
- {0,8,2}, // row index 4
- {0,10,2}, // row index 5
- {1,2,2}, // row index 6
- {1,4,2}, // row index 7
- {0,2,4}, // row index 8
- {0,4,4}, // row index 9
- {0,6,4}, // row index 10
- {0,8,4}, // row index 11
- {0,10,4}, // row index 12
- {0,2,7}, // row index 13
- {0,3,11}, // row index 14
- {1,2,4}, // row index 15
- {0,0,0} // row index 16
+const uint8_t table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[16][4]={
+ {0,0,2,2}, // row index 1
+ {0,0,4,2}, // row index 2
+ {0,0,6,2}, // row index 3
+ {0,0,8,2}, // row index 4
+ {0,0,10,2}, // row index 5
+ {0,1,2,2}, // row index 6
+ {0,1,4,2}, // row index 7
+ {0,0,2,4}, // row index 8
+ {0,0,4,4}, // row index 9
+ {0,0,6,4}, // row index 10
+ {0,0,8,4}, // row index 11
+ {0,0,10,4}, // row index 12
+ {0,0,2,7}, // row index 13
+ {1,0,3,11}, // row index 14
+ {0,1,2,4}, // row index 15
+ {0,0,0,0} // row index 16
};
-const uint8_t table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[16][3]={
- {0,2,2}, // row index 1
- {0,4,2}, // row index 2
- {0,6,2}, // row index 3
- {0,8,2}, // row index 4
- {0,10,2}, // row index 5
- {0,0,0}, // row index 6
- {0,0,0}, // row index 7
- {0,2,4}, // row index 8
- {0,4,4}, // row index 9
- {0,6,4}, // row index 10
- {0,8,4}, // row index 11
- {0,10,4}, // row index 12
- {0,2,7}, // row index 13
- {0,2,12}, // row index 14
- {0,0,6}, // row index 15
- {0,2,6} // row index 16
+const uint8_t table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[16][4]={
+ {0,0,2,2}, // row index 1
+ {0,0,4,2}, // row index 2
+ {0,0,6,2}, // row index 3
+ {0,0,8,2}, // row index 4
+ {0,0,10,2}, // row index 5
+ {0,0,0,0}, // row index 6
+ {0,0,0,0}, // row index 7
+ {0,0,2,4}, // row index 8
+ {0,0,4,4}, // row index 9
+ {0,0,6,4}, // row index 10
+ {0,0,8,4}, // row index 11
+ {0,0,10,4}, // row index 12
+ {0,0,2,7}, // row index 13
+ {1,0,2,12}, // row index 14
+ {1,0,0,6}, // row index 15
+ {1,0,2,6} // row index 16
};
-const uint8_t table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[16][3]={
- {0,2,2}, // row index 1
- {0,4,2}, // row index 2
- {0,6,2}, // row index 3
- {0,8,2}, // row index 4
- {0,10,2}, // row index 5
- {0,0,0}, // row index 6
- {0,0,0}, // row index 7
- {0,2,4}, // row index 8
- {0,4,4}, // row index 9
- {0,6,4}, // row index 10
- {0,8,4}, // row index 11
- {0,10,4}, // row index 12
- {0,2,7}, // row index 13
- {0,3,11}, // row index 14
- {0,0,6}, // row index 15
- {0,2,6} // row index 16
+const uint8_t table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[16][4]={
+ {0,0,2,2}, // row index 1
+ {0,0,4,2}, // row index 2
+ {0,0,6,2}, // row index 3
+ {0,0,8,2}, // row index 4
+ {0,0,10,2}, // row index 5
+ {0,0,0,0}, // row index 6
+ {0,0,0,0}, // row index 7
+ {0,0,2,4}, // row index 8
+ {0,0,4,4}, // row index 9
+ {0,0,6,4}, // row index 10
+ {0,0,8,4}, // row index 11
+ {0,0,10,4}, // row index 12
+ {0,0,2,7}, // row index 13
+ {1,0,3,11}, // row index 14
+ {1,0,0,6}, // row index 15
+ {1,0,2,6} // row index 16
};
+void get_info_from_tda_tables(int default_abc,
+ int tda,
+ int dmrs_TypeA_Position,
+ int normal_CP,
+ int *startSymbolIndex,
+ int *nrOfSymbols) {
+ int k0 = 0;
+ int is_mapping_typeA = 1;
+ switch(default_abc){
+ case 1:
+ if (normal_CP){
+ if (dmrs_TypeA_Position){
+ is_mapping_typeA = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][0];
+ k0 = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][1];
+ *startSymbolIndex = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][2];
+ *nrOfSymbols = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[tda][3];
+ }
+ else{
+ is_mapping_typeA = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][0];
+ k0 = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][1];
+ *startSymbolIndex = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][2];
+ *nrOfSymbols = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[tda][3];
+ }
+ }
+ else{
+ if (dmrs_TypeA_Position){
+ is_mapping_typeA = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][0];
+ k0 = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][1];
+ *startSymbolIndex = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][2];
+ *nrOfSymbols = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[tda][3];
+ }
+ else{
+ is_mapping_typeA = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][0];
+ k0 = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][1];
+ *startSymbolIndex = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][2];
+ *nrOfSymbols = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[tda][3];
+ }
+ }
+ break;
+ case 2:
+ if (dmrs_TypeA_Position){
+ is_mapping_typeA = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][0];
+ k0 = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][1];
+ *startSymbolIndex = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][2];
+ *nrOfSymbols = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[tda][3];
+ }
+ else{
+ is_mapping_typeA = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][0];
+ k0 = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][1];
+ *startSymbolIndex = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][2];
+ *nrOfSymbols = table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[tda][3];
+ }
+ break;
+ case 3:
+ if (dmrs_TypeA_Position){
+ is_mapping_typeA = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][0];
+ k0 = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][1];
+ *startSymbolIndex = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][2];
+ *nrOfSymbols = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[tda][3];
+ }
+ else{
+ is_mapping_typeA = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][0];
+ k0 = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][1];
+ *startSymbolIndex = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][2];
+ *nrOfSymbols = table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[tda][3];
+ }
+ break;
+ default:
+ AssertFatal(1==0,"Invalid default time domaing allocation type\n");
+ }
+ AssertFatal(k0==0,"Only k0 = 0 is supported\n");
+ AssertFatal(is_mapping_typeA==1,"Only mapping type A is currently supported\n");
+}
+
const char *prachfmt[]={"0","1","2","3", "A1","A2","A3","B1","B4","C0","C2","A1/B1","A2/B2","A3/B3"};
const char *duplex_mode[]={"FDD","TDD"};
@@ -1234,6 +1308,79 @@ void find_aggregation_candidates(uint8_t *aggregation_level,
*aggregation_level = 16;
*nr_of_candidates = ss->nrofCandidates->aggregationLevel16;
}
+ // n8 does not correspont to a value of 8 but 7, the following corrects this
+ if(*nr_of_candidates == 7)
+ *nr_of_candidates = 8;
+}
+
+
+void set_monitoring_periodicity_offset(NR_SearchSpace_t *ss,
+ uint16_t period,
+ uint16_t offset) {
+
+ switch(period) {
+ case 1:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+ break;
+ case 2:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl2 = offset;
+ break;
+ case 4:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl4;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl4 = offset;
+ break;
+ case 5:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl5;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl5 = offset;
+ break;
+ case 8:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl8;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl8 = offset;
+ break;
+ case 10:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl10;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl10 = offset;
+ break;
+ case 16:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl16;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl16 = offset;
+ break;
+ case 20:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl20;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl20 = offset;
+ break;
+ case 40:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl40;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl40 = offset;
+ break;
+ case 80:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl80;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl80 = offset;
+ break;
+ case 160:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl160;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl160 = offset;
+ break;
+ case 320:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl320;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl320 = offset;
+ break;
+ case 640:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl640;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl640 = offset;
+ break;
+ case 1280:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1280;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl1280 = offset;
+ break;
+ case 2560:
+ ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2560;
+ ss->monitoringSlotPeriodicityAndOffset->choice.sl2560 = offset; break;
+ default:
+ AssertFatal(1==0,"Invalid monitoring slot periodicity value\n");
+ break;
+ }
}
@@ -3383,6 +3530,7 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
NR_SubcarrierSpacing_t scs_ssb,
frequency_range_t frequency_range,
uint32_t ssb_index,
+ uint32_t ssb_period,
uint32_t ssb_offset_point_a) {
NR_SubcarrierSpacing_t scs_pdcch;
@@ -3402,7 +3550,7 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
else
scs_pdcch = NR_SubcarrierSpacing_kHz30;
}
-
+ type0_PDCCH_CSS_config->scs_pdcch = scs_pdcch;
type0_PDCCH_CSS_config->ssb_index = ssb_index;
type0_PDCCH_CSS_config->frame = frameP;
@@ -3595,6 +3743,8 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
}
// 38.213 chapter 13: over two consecutive slots
type0_PDCCH_CSS_config->search_space_duration = 2;
+ // two frames
+ type0_PDCCH_CSS_config->search_space_frame_period = nr_slots_per_frame[scs_ssb]<<1;
}
if(type0_PDCCH_CSS_config->type0_pdcch_ss_mux_pattern == 1 && frequency_range == FR2){
@@ -3611,6 +3761,8 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
}
// 38.213 chapter 13: over two consecutive slots
type0_PDCCH_CSS_config->search_space_duration = 2;
+ // two frames
+ type0_PDCCH_CSS_config->search_space_frame_period = nr_slots_per_frame[scs_ssb]<<1;
}
/// MUX PATTERN 2
@@ -3676,6 +3828,8 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
}else{ ; }
// 38.213 chapter 13: over one slot
type0_PDCCH_CSS_config->search_space_duration = 1;
+ // SSB periodicity in slots
+ type0_PDCCH_CSS_config->search_space_frame_period = ssb_period*nr_slots_per_frame[scs_ssb];
}
/// MUX PATTERN 3
@@ -3704,6 +3858,8 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
}else{ ; }
// 38.213 chapter 13: over one slot
type0_PDCCH_CSS_config->search_space_duration = 1;
+ // SSB periodicity in slots
+ type0_PDCCH_CSS_config->search_space_frame_period = ssb_period*nr_slots_per_frame[scs_ssb];
}
AssertFatal(type0_PDCCH_CSS_config->number_of_search_space_per_slot!=UINT_MAX,"");
@@ -3727,6 +3883,135 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
}
+void fill_coresetZero(NR_ControlResourceSet_t *coreset0, NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config) {
+
+ int32_t duration;
+
+ if (coreset0 == NULL)
+ coreset0 = calloc(1,sizeof(*coreset0));
+
+ coreset0->controlResourceSetId = 0;
+
+ AssertFatal(type0_PDCCH_CSS_config!=NULL,"No type0 CSS configuration\n");
+
+ duration = type0_PDCCH_CSS_config->num_symbols;
+
+ if(coreset0->frequencyDomainResources.buf == NULL) coreset0->frequencyDomainResources.buf = calloc(1,6);
+
+ switch(type0_PDCCH_CSS_config->num_rbs){
+ case 24:
+ coreset0->frequencyDomainResources.buf[0] = 0xf0;
+ coreset0->frequencyDomainResources.buf[1] = 0;
+ break;
+ case 48:
+ coreset0->frequencyDomainResources.buf[0] = 0xff;
+ coreset0->frequencyDomainResources.buf[1] = 0;
+ break;
+ case 96:
+ coreset0->frequencyDomainResources.buf[0] = 0xff;
+ coreset0->frequencyDomainResources.buf[1] = 0xff;
+ break;
+ default:
+ AssertFatal(1==0,"Invalid number of PRBs %d for Coreset0\n",type0_PDCCH_CSS_config->num_rbs);
+ }
+ coreset0->frequencyDomainResources.buf[2] = 0;
+ coreset0->frequencyDomainResources.buf[3] = 0;
+ coreset0->frequencyDomainResources.buf[4] = 0;
+ coreset0->frequencyDomainResources.buf[5] = 0;
+ coreset0->frequencyDomainResources.size = 6;
+ coreset0->frequencyDomainResources.bits_unused = 3;
+
+ coreset0->duration = duration;
+ coreset0->cce_REG_MappingType.present=NR_ControlResourceSet__cce_REG_MappingType_PR_interleaved;
+ coreset0->cce_REG_MappingType.choice.interleaved=calloc(1,sizeof(*coreset0->cce_REG_MappingType.choice.interleaved));
+ coreset0->cce_REG_MappingType.choice.interleaved->reg_BundleSize = NR_ControlResourceSet__cce_REG_MappingType__interleaved__reg_BundleSize_n6;
+ coreset0->cce_REG_MappingType.choice.interleaved->interleaverSize = NR_ControlResourceSet__cce_REG_MappingType__interleaved__interleaverSize_n2;
+ coreset0->cce_REG_MappingType.choice.interleaved->shiftIndex = NULL; // -> use cell_id
+ coreset0->precoderGranularity = NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle;
+
+ coreset0->tci_StatesPDCCH_ToAddList = NULL;
+ coreset0->tci_StatesPDCCH_ToReleaseList = NULL;
+ coreset0->tci_PresentInDCI = NULL;
+ coreset0->pdcch_DMRS_ScramblingID = NULL;
+
+}
+
+uint8_t fill_searchSpaceZero(NR_SearchSpace_t *ss0, NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config, int L) {
+
+ if(ss0 == NULL) ss0=calloc(1,sizeof(*ss0));
+ if(ss0->controlResourceSetId == NULL) ss0->controlResourceSetId=calloc(1,sizeof(*ss0->controlResourceSetId));
+ if(ss0->monitoringSymbolsWithinSlot == NULL) ss0->monitoringSymbolsWithinSlot = calloc(1,sizeof(*ss0->monitoringSymbolsWithinSlot));
+ if(ss0->monitoringSymbolsWithinSlot->buf == NULL) ss0->monitoringSymbolsWithinSlot->buf = calloc(1,2);
+ if(ss0->nrofCandidates == NULL) ss0->nrofCandidates = calloc(1,sizeof(*ss0->nrofCandidates));
+ if(ss0->searchSpaceType == NULL) ss0->searchSpaceType = calloc(1,sizeof(*ss0->searchSpaceType));
+ if(ss0->searchSpaceType->choice.common == NULL) ss0->searchSpaceType->choice.common=calloc(1,sizeof(*ss0->searchSpaceType->choice.common));
+ if(ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 == NULL)
+ ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 = calloc(1,sizeof(*ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0));
+
+ uint32_t duration,periodicity,offset;
+ uint16_t symbols,max_agg;
+
+ AssertFatal(type0_PDCCH_CSS_config!=NULL,"No type0 CSS configuration\n");
+
+ max_agg = (type0_PDCCH_CSS_config->num_symbols*type0_PDCCH_CSS_config->num_rbs)/6;
+ if (L>max_agg) return 0;
+
+ symbols = (1-(1<<type0_PDCCH_CSS_config->num_symbols))<<type0_PDCCH_CSS_config->first_symbol_index;
+ duration = type0_PDCCH_CSS_config->search_space_duration;
+ periodicity = type0_PDCCH_CSS_config->search_space_frame_period;
+ if (type0_PDCCH_CSS_config->type0_pdcch_ss_mux_pattern == 1)
+ offset = type0_PDCCH_CSS_config->n_0;
+ else
+ offset = type0_PDCCH_CSS_config->n_c;
+
+ ss0->searchSpaceId = 0;
+ *ss0->controlResourceSetId = 0;
+ ss0->monitoringSlotPeriodicityAndOffset = calloc(1,sizeof(*ss0->monitoringSlotPeriodicityAndOffset));
+ set_monitoring_periodicity_offset(ss0,periodicity,offset);
+ if (duration==1)
+ ss0->duration = NULL;
+ else{
+ ss0->duration = calloc(1,sizeof(*ss0->duration));
+ *ss0->duration = duration;
+ }
+
+ ss0->monitoringSymbolsWithinSlot->size = 2;
+ ss0->monitoringSymbolsWithinSlot->bits_unused = 2;
+ ss0->monitoringSymbolsWithinSlot->buf[1] = 0;
+ ss0->monitoringSymbolsWithinSlot->buf[0] = 0;
+ for (int i=0; i<8; i++) {
+ ss0->monitoringSymbolsWithinSlot->buf[1] |= ((symbols>>(i+8))&0x01)<<(7-i);
+ ss0->monitoringSymbolsWithinSlot->buf[0] |= ((symbols>>i)&0x01)<<(7-i);
+ }
+
+ // max values are set according to TS38.213 Section 10.1 Table 10.1-1
+ ss0->nrofCandidates->aggregationLevel1 = NR_SearchSpace__nrofCandidates__aggregationLevel1_n0;
+ ss0->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n0;
+ switch(L){
+ case 4:
+ ss0->nrofCandidates->aggregationLevel4 = (((max_agg>>2) > 4)? 4 : max_agg>>2);
+ ss0->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
+ ss0->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;
+ break;
+ case 8:
+ ss0->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n0;
+ ss0->nrofCandidates->aggregationLevel8 = (((max_agg>>3) > 2)? 2 : max_agg>>3);
+ ss0->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;
+ break;
+ case 16:
+ ss0->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n0;
+ ss0->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
+ ss0->nrofCandidates->aggregationLevel16 = (((max_agg>>4) > 1)? 1 : max_agg>>4);
+ break;
+ default:
+ AssertFatal(1==0,"Invalid aggregation level %d for SS0\n",L);
+ }
+
+ ss0->searchSpaceType->present = NR_SearchSpace__searchSpaceType_PR_common;
+ return 1;
+}
+
+
void find_period_offest_SR (NR_SchedulingRequestResourceConfig_t *SchedulingReqRec, int *period, int *offset) {
NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR P_O = SchedulingReqRec->periodicityAndOffset->present;
switch (P_O){
@@ -3863,7 +4148,6 @@ uint16_t compute_pucch_prb_size(uint8_t format,
}
}
-
/* extract UL PTRS values from RRC and validate it based upon 38.214 6.2.3 */
bool set_ul_ptrs_values(NR_PTRS_UplinkConfig_t *ul_ptrs_config,
uint16_t rbSize,uint8_t mcsIndex, uint8_t mcsTable,
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
index 9acde415efe32b7ed8f7796d75a3223b2a1c0eef..0a185157ef90c84af2af9523afd8cf792d512037 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
@@ -135,10 +135,21 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
NR_SubcarrierSpacing_t scs_ssb,
frequency_range_t frequency_range,
uint32_t ssb_index,
+ uint32_t ssb_period,
uint32_t ssb_offset_point_a);
uint16_t get_ssb_start_symbol(const long band, NR_SubcarrierSpacing_t scs, int i_ssb);
+void get_info_from_tda_tables(int default_abc,
+ int tda,
+ int dmrs_TypeA_Position,
+ int normal_CP,
+ int *startSymbolIndex,
+ int *nrOfSymbols);
+
+void fill_coresetZero(NR_ControlResourceSet_t *coreset0, NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config);
+uint8_t fill_searchSpaceZero(NR_SearchSpace_t *ss0, NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config, int L);
+
uint16_t compute_pucch_prb_size(uint8_t format,
uint8_t nr_prbs,
uint16_t O_tot,
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
index 1b3e5e5d602dbb680e61e8a1584f84440eb56543..5b4ebe2397e25cbb2a1769aedfdf574493e4ca55 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
@@ -138,13 +138,4 @@ extern const float table_38213_13_12_c3[16];
extern const int32_t table_38213_10_1_1_c2[5];
-extern const uint8_t table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[16][3];
-extern const uint8_t table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[16][3];
-extern const uint8_t table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos2[16][3];
-extern const uint8_t table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP_dmrs_typeA_pos3[16][3];
-extern const uint8_t table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos2[16][3];
-extern const uint8_t table_5_1_2_1_1_4_time_dom_res_alloc_B_dmrs_typeA_pos3[16][3];
-extern const uint8_t table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos2[16][3];
-extern const uint8_t table_5_1_2_1_1_5_time_dom_res_alloc_C_dmrs_typeA_pos3[16][3];
-
#endif //DEF_H
diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c
index b60067ecb8ba8860922f00b313216328697209cd..d9eef9b9fbdf11b237450e1cc11acf872ce35f83 100755
--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
@@ -35,9 +35,8 @@
#include "NR_MAC_UE/mac_proto.h"
#include "NR_MAC-CellGroupConfig.h"
#include "LAYER2/NR_MAC_COMMON/nr_mac_common.h"
-#include <executables/softmodem-common.h>
-
-extern uint32_t N_RB_DL;
+#include "common/utils/nr/nr_common.h"
+#include "executables/softmodem-common.h"
int set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg,
int mu,
@@ -145,13 +144,170 @@ int set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg,
}
+void config_common_ue_sa(NR_UE_MAC_INST_t *mac,
+ module_id_t module_id,
+ int cc_idP) {
+
+ fapi_nr_config_request_t *cfg = &mac->phy_config.config_req;
+ NR_ServingCellConfigCommonSIB_t *scc = mac->scc_SIB;
+
+ mac->phy_config.Mod_id = module_id;
+ mac->phy_config.CC_id = cc_idP;
+
+ LOG_D(MAC, "Entering SA UE Config Common\n");
+
+ // carrier config
+ cfg->carrier_config.dl_bandwidth = config_bandwidth(scc->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
+ scc->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth,
+ *scc->downlinkConfigCommon.frequencyInfoDL.frequencyBandList.list.array[0]->freqBandIndicatorNR);
+
+ uint64_t dl_bw_khz = (12*scc->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth)*
+ (15<<scc->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing);
+ cfg->carrier_config.dl_frequency = (downlink_frequency[cc_idP][0]/1000) - (dl_bw_khz>>1);
+
+ for (int i=0; i<5; i++) {
+ if (i==scc->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing) {
+ cfg->carrier_config.dl_grid_size[i] = scc->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth;
+ cfg->carrier_config.dl_k0[i] = scc->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->offsetToCarrier;
+ }
+ else {
+ cfg->carrier_config.dl_grid_size[i] = 0;
+ cfg->carrier_config.dl_k0[i] = 0;
+ }
+ }
+
+ cfg->carrier_config.uplink_bandwidth = config_bandwidth(scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
+ scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth,
+ scc->uplinkConfigCommon->frequencyInfoUL.frequencyBandList==NULL ?
+ *scc->downlinkConfigCommon.frequencyInfoDL.frequencyBandList.list.array[0]->freqBandIndicatorNR :
+ *scc->uplinkConfigCommon->frequencyInfoUL.frequencyBandList->list.array[0]->freqBandIndicatorNR);
+
+
+ if (scc->uplinkConfigCommon->frequencyInfoUL.absoluteFrequencyPointA == NULL)
+ cfg->carrier_config.uplink_frequency = cfg->carrier_config.dl_frequency;
+ else
+ // TODO check if corresponds to what reported in SIB1
+ cfg->carrier_config.uplink_frequency = (downlink_frequency[cc_idP][0]/1000) + uplink_frequency_offset[cc_idP][0];
+
+ for (int i=0; i<5; i++) {
+ if (i==scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing) {
+ cfg->carrier_config.ul_grid_size[i] = scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth;
+ cfg->carrier_config.ul_k0[i] = scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->offsetToCarrier;
+ }
+ else {
+ cfg->carrier_config.ul_grid_size[i] = 0;
+ cfg->carrier_config.ul_k0[i] = 0;
+ }
+ }
+
+ mac->nr_band = *scc->downlinkConfigCommon.frequencyInfoDL.frequencyBandList.list.array[0]->freqBandIndicatorNR;
+ mac->frame_type = get_frame_type(mac->nr_band, get_softmodem_params()->numerology);
+ // cell config
+
+ cfg->cell_config.phy_cell_id = mac->physCellId;
+ cfg->cell_config.frame_duplex_type = mac->frame_type;
+
+ // SSB config
+ cfg->ssb_config.ss_pbch_power = scc->ss_PBCH_BlockPower;
+ cfg->ssb_config.scs_common = get_softmodem_params()->numerology;
+
+ // SSB Table config
+ cfg->ssb_table.ssb_offset_point_a = scc->downlinkConfigCommon.frequencyInfoDL.offsetToPointA;
+ cfg->ssb_table.ssb_period = scc->ssb_PeriodicityServingCell;
+ cfg->ssb_table.ssb_subcarrier_offset = mac->ssb_subcarrier_offset;
+
+ if (mac->frequency_range == FR1){
+ cfg->ssb_table.ssb_mask_list[0].ssb_mask = scc->ssb_PositionsInBurst.inOneGroup.buf[0]<<24;
+ cfg->ssb_table.ssb_mask_list[1].ssb_mask = 0;
+ }
+ else{
+ for (int i=0; i<8; i++){
+ if ((scc->ssb_PositionsInBurst.groupPresence->buf[0]>>(7-i))&0x01)
+ cfg->ssb_table.ssb_mask_list[i>>2].ssb_mask |= scc->ssb_PositionsInBurst.inOneGroup.buf[0]<<(24-8*(i%4));
+ }
+ }
+
+ // TDD Table Configuration
+ if (scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1 == NULL)
+ cfg->tdd_table.tdd_period = scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity;
+ else {
+ AssertFatal(scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 != NULL,
+ "scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 is null\n");
+ cfg->tdd_table.tdd_period = *scc->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530;
+ }
+ if(cfg->cell_config.frame_duplex_type == TDD){
+ LOG_I(MAC,"Setting TDD configuration period to %d\n", cfg->tdd_table.tdd_period);
+ int return_tdd = set_tdd_config_nr_ue(cfg,
+ scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
+ scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots,
+ scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols,
+ scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots,
+ scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols
+ );
+
+ if (return_tdd !=0)
+ LOG_E(PHY,"TDD configuration can not be done\n");
+ else
+ LOG_I(PHY,"TDD has been properly configurated\n");
+ }
+
+ // PRACH configuration
+
+ uint8_t nb_preambles = 64;
+ if(scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->totalNumberOfRA_Preambles != NULL)
+ nb_preambles = *scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->totalNumberOfRA_Preambles;
+
+ cfg->prach_config.prach_sequence_length = scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->prach_RootSequenceIndex.present-1;
+
+ if (scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->msg1_SubcarrierSpacing)
+ cfg->prach_config.prach_sub_c_spacing = *scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->msg1_SubcarrierSpacing;
+ else
+ cfg->prach_config.prach_sub_c_spacing = scc->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing;
+
+ cfg->prach_config.restricted_set_config = scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->restrictedSetConfig;
+
+ switch (scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->rach_ConfigGeneric.msg1_FDM) {
+ case 0 :
+ cfg->prach_config.num_prach_fd_occasions = 1;
+ break;
+ case 1 :
+ cfg->prach_config.num_prach_fd_occasions = 2;
+ break;
+ case 2 :
+ cfg->prach_config.num_prach_fd_occasions = 4;
+ break;
+ case 3 :
+ cfg->prach_config.num_prach_fd_occasions = 8;
+ break;
+ default:
+ AssertFatal(1==0,"msg1 FDM identifier %ld undefined (0,1,2,3) \n", scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->rach_ConfigGeneric.msg1_FDM);
+ }
+
+ cfg->prach_config.num_prach_fd_occasions_list = (fapi_nr_num_prach_fd_occasions_t *) malloc(cfg->prach_config.num_prach_fd_occasions*sizeof(fapi_nr_num_prach_fd_occasions_t));
+ for (int i=0; i<cfg->prach_config.num_prach_fd_occasions; i++) {
+ cfg->prach_config.num_prach_fd_occasions_list[i].num_prach_fd_occasions = i;
+ if (cfg->prach_config.prach_sequence_length)
+ cfg->prach_config.num_prach_fd_occasions_list[i].prach_root_sequence_index = scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->prach_RootSequenceIndex.choice.l139;
+ else
+ cfg->prach_config.num_prach_fd_occasions_list[i].prach_root_sequence_index = scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->prach_RootSequenceIndex.choice.l839;
+ cfg->prach_config.num_prach_fd_occasions_list[i].k1 = NRRIV2PRBOFFSET(scc->uplinkConfigCommon->initialUplinkBWP.genericParameters.locationAndBandwidth, MAX_BWP_SIZE) +
+ scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->rach_ConfigGeneric.msg1_FrequencyStart +
+ (get_N_RA_RB(cfg->prach_config.prach_sub_c_spacing, scc->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing ) * i);
+ cfg->prach_config.num_prach_fd_occasions_list[i].prach_zero_corr_conf = scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->rach_ConfigGeneric.zeroCorrelationZoneConfig;
+ cfg->prach_config.num_prach_fd_occasions_list[i].num_root_sequences = compute_nr_root_seq(scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup,
+ nb_preambles, mac->frame_type, mac->frequency_range);
+ //cfg->prach_config.num_prach_fd_occasions_list[i].num_unused_root_sequences = ???
+ }
+ cfg->prach_config.ssb_per_rach = scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->present-1;
+
+}
+
void config_common_ue(NR_UE_MAC_INST_t *mac,
- module_id_t module_id,
- int cc_idP) {
+ module_id_t module_id,
+ int cc_idP) {
fapi_nr_config_request_t *cfg = &mac->phy_config.config_req;
NR_ServingCellConfigCommon_t *scc = mac->scc;
- NR_ServingCellConfigCommonSIB_t *scc_SIB = mac->scc_SIB;
int i;
mac->phy_config.Mod_id = module_id;
@@ -160,7 +316,7 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
// carrier config
LOG_D(MAC, "Entering UE Config Common\n");
- AssertFatal(scc==NULL || scc_SIB==NULL,"Both scc and scc_SIB cannot be null\n");
+ AssertFatal(scc!=NULL,"scc cannot be null\n");
if (scc) {
cfg->carrier_config.dl_bandwidth = config_bandwidth(scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
@@ -212,7 +368,7 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
mac->frequency_range = band<100?FR1:FR2;
lte_frame_type_t frame_type = get_frame_type(*scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0], *scc->ssbSubcarrierSpacing);
-
+
// cell config
cfg->cell_config.phy_cell_id = *scc->physCellId;
@@ -231,8 +387,8 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
uint32_t absolute_diff = (*scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB - scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA);
cfg->ssb_table.ssb_offset_point_a = absolute_diff/(12*scs_scaling) - 10;
cfg->ssb_table.ssb_period = *scc->ssb_periodicityServingCell;
- cfg->ssb_table.ssb_subcarrier_offset = 0; // TODO currently not in RRC?
-
+ cfg->ssb_table.ssb_subcarrier_offset = mac->ssb_subcarrier_offset;
+
switch (scc->ssb_PositionsInBurst->present) {
case 1 :
cfg->ssb_table.ssb_mask_list[0].ssb_mask = scc->ssb_PositionsInBurst->choice.shortBitmap.buf[0]<<24;
@@ -328,156 +484,6 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
cfg->prach_config.ssb_per_rach = scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->present-1;
} // scc
-
- else { // scc_SIB
-
- cfg->carrier_config.dl_bandwidth = config_bandwidth(scc_SIB->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
- scc_SIB->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth,
- *scc_SIB->downlinkConfigCommon.frequencyInfoDL.frequencyBandList.list.array[0]->freqBandIndicatorNR);
-
- cfg->carrier_config.dl_frequency = downlink_frequency[0][0] - (10+scc_SIB->downlinkConfigCommon.frequencyInfoDL.offsetToPointA)*(15<<scc_SIB->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing);
-
- for (i=0; i<5; i++) {
- if (i==scc_SIB->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing) {
- cfg->carrier_config.dl_grid_size[i] = scc_SIB->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth;
- cfg->carrier_config.dl_k0[i] = scc_SIB->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->offsetToCarrier;
- }
- else {
- cfg->carrier_config.dl_grid_size[i] = 0;
- cfg->carrier_config.dl_k0[i] = 0;
- }
- }
-
- cfg->carrier_config.uplink_bandwidth = config_bandwidth(scc_SIB->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
- scc_SIB->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth,
- scc_SIB->uplinkConfigCommon->frequencyInfoUL.frequencyBandList==NULL ? *scc_SIB->downlinkConfigCommon.frequencyInfoDL.frequencyBandList.list.array[0]->freqBandIndicatorNR : *scc_SIB->uplinkConfigCommon->frequencyInfoUL.frequencyBandList->list.array[0]->freqBandIndicatorNR);
-
-
- if (scc_SIB->uplinkConfigCommon->frequencyInfoUL.absoluteFrequencyPointA == NULL)
- cfg->carrier_config.uplink_frequency = cfg->carrier_config.dl_frequency;
- else
- cfg->carrier_config.uplink_frequency = from_nrarfcn(*scc_SIB->uplinkConfigCommon->frequencyInfoUL.frequencyBandList->list.array[0]->freqBandIndicatorNR,
- scc_SIB->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
- *scc_SIB->uplinkConfigCommon->frequencyInfoUL.absoluteFrequencyPointA)/1000; // freq in kHz
-
-
- for (i=0; i<5; i++) {
- if (i==scc_SIB->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing) {
- cfg->carrier_config.ul_grid_size[i] = scc_SIB->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->carrierBandwidth;
- cfg->carrier_config.ul_k0[i] = scc_SIB->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->offsetToCarrier;
- }
- else {
- cfg->carrier_config.ul_grid_size[i] = 0;
- cfg->carrier_config.ul_k0[i] = 0;
- }
- }
-
- uint32_t band = *scc_SIB->downlinkConfigCommon.frequencyInfoDL.frequencyBandList.list.array[0]->freqBandIndicatorNR;
- frequency_range_t frequency_range = band<100?FR1:FR2;
-
- lte_frame_type_t frame_type = get_frame_type(band, get_softmodem_params()->numerology);
-
- // cell config
-
- cfg->cell_config.phy_cell_id = mac->physCellId;
- cfg->cell_config.frame_duplex_type = frame_type;
-
- // SSB config
- cfg->ssb_config.ss_pbch_power = scc_SIB->ss_PBCH_BlockPower;
- cfg->ssb_config.scs_common = get_softmodem_params()->numerology;
-
- // SSB Table config
-
- cfg->ssb_table.ssb_offset_point_a = scc_SIB->downlinkConfigCommon.frequencyInfoDL.offsetToPointA;
- cfg->ssb_table.ssb_period = scc_SIB->ssb_PeriodicityServingCell;
- cfg->ssb_table.ssb_subcarrier_offset = 0; // TODO currently not in RRC?
-
- AssertFatal(scc_SIB->ssb_PositionsInBurst.groupPresence==NULL, "Cannot handle more than 8 SSBs for now (%x.%x.%x.%x.%x.%x.%x.%x)\n",
- scc_SIB->ssb_PositionsInBurst.groupPresence->buf[0],
- scc_SIB->ssb_PositionsInBurst.groupPresence->buf[1],
- scc_SIB->ssb_PositionsInBurst.groupPresence->buf[2],
- scc_SIB->ssb_PositionsInBurst.groupPresence->buf[3],
- scc_SIB->ssb_PositionsInBurst.groupPresence->buf[4],
- scc_SIB->ssb_PositionsInBurst.groupPresence->buf[5],
- scc_SIB->ssb_PositionsInBurst.groupPresence->buf[6],
- scc_SIB->ssb_PositionsInBurst.groupPresence->buf[7]);
- cfg->ssb_table.ssb_mask_list[0].ssb_mask = scc_SIB->ssb_PositionsInBurst.inOneGroup.buf[0]<<24;
- cfg->ssb_table.ssb_mask_list[1].ssb_mask = 0;
-
-
- // TDD Table Configuration
- if (scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.ext1 == NULL)
- cfg->tdd_table.tdd_period = scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity;
- else {
- AssertFatal(scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 != NULL,
- "scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530 is null\n");
- cfg->tdd_table.tdd_period = *scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.ext1->dl_UL_TransmissionPeriodicity_v1530;
- }
- if(cfg->cell_config.frame_duplex_type == TDD){
- LOG_I(MAC,"Setting TDD configuration period to %d\n", cfg->tdd_table.tdd_period);
- int return_tdd = set_tdd_config_nr_ue(cfg,
- scc_SIB->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing,
- scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots,
- scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols,
- scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots,
- scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols
- );
-
- if (return_tdd !=0)
- LOG_E(PHY,"TDD configuration can not be done\n");
- else
- LOG_I(PHY,"TDD has been properly configurated\n");
- }
-
- // PRACH configuration
-
- uint8_t nb_preambles = 64;
- if(scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->totalNumberOfRA_Preambles != NULL)
- nb_preambles = *scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->totalNumberOfRA_Preambles;
-
- cfg->prach_config.prach_sequence_length = scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->prach_RootSequenceIndex.present-1;
-
- if (scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->msg1_SubcarrierSpacing)
- cfg->prach_config.prach_sub_c_spacing = *scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->msg1_SubcarrierSpacing;
- else
- cfg->prach_config.prach_sub_c_spacing = scc_SIB->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing;
-
- cfg->prach_config.restricted_set_config = scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->restrictedSetConfig;
-
- switch (scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->rach_ConfigGeneric.msg1_FDM) {
- case 0 :
- cfg->prach_config.num_prach_fd_occasions = 1;
- break;
- case 1 :
- cfg->prach_config.num_prach_fd_occasions = 2;
- break;
- case 2 :
- cfg->prach_config.num_prach_fd_occasions = 4;
- break;
- case 3 :
- cfg->prach_config.num_prach_fd_occasions = 8;
- break;
- default:
- AssertFatal(1==0,"msg1 FDM identifier %ld undefined (0,1,2,3) \n", scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->rach_ConfigGeneric.msg1_FDM);
- }
-
- cfg->prach_config.num_prach_fd_occasions_list = (fapi_nr_num_prach_fd_occasions_t *) malloc(cfg->prach_config.num_prach_fd_occasions*sizeof(fapi_nr_num_prach_fd_occasions_t));
- for (i=0; i<cfg->prach_config.num_prach_fd_occasions; i++) {
- cfg->prach_config.num_prach_fd_occasions_list[i].num_prach_fd_occasions = i;
- if (cfg->prach_config.prach_sequence_length)
- cfg->prach_config.num_prach_fd_occasions_list[i].prach_root_sequence_index = scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->prach_RootSequenceIndex.choice.l139;
- else
- cfg->prach_config.num_prach_fd_occasions_list[i].prach_root_sequence_index = scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->prach_RootSequenceIndex.choice.l839;
- cfg->prach_config.num_prach_fd_occasions_list[i].k1 = NRRIV2PRBOFFSET(scc_SIB->uplinkConfigCommon->initialUplinkBWP.genericParameters.locationAndBandwidth, MAX_BWP_SIZE) + scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->rach_ConfigGeneric.msg1_FrequencyStart + (get_N_RA_RB(cfg->prach_config.prach_sub_c_spacing, scc_SIB->uplinkConfigCommon->frequencyInfoUL.scs_SpecificCarrierList.list.array[0]->subcarrierSpacing ) * i);
- cfg->prach_config.num_prach_fd_occasions_list[i].prach_zero_corr_conf = scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->rach_ConfigGeneric.zeroCorrelationZoneConfig;
- cfg->prach_config.num_prach_fd_occasions_list[i].num_root_sequences = compute_nr_root_seq(scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup, nb_preambles, mac->frame_type, frequency_range);
- //cfg->prach_config.num_prach_fd_occasions_list[i].num_unused_root_sequences = ???
- }
-
- cfg->prach_config.ssb_per_rach = scc_SIB->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->present-1;
-
-
- }
}
@@ -523,70 +529,6 @@ void config_bwp_ue(NR_UE_MAC_INST_t *mac, uint16_t *bwp_ind, uint8_t *dci_format
}
-
-void fill_default_coreset_zero(NR_UE_MAC_INST_t *mac) {
-
- // Search space zero
-
- if(mac->search_space_zero == NULL) mac->search_space_zero=calloc(1,sizeof(*mac->search_space_zero));
- if(mac->search_space_zero->controlResourceSetId == NULL) mac->search_space_zero->controlResourceSetId=calloc(1,sizeof(*mac->search_space_zero->controlResourceSetId));
- if(mac->search_space_zero->monitoringSymbolsWithinSlot == NULL) mac->search_space_zero->monitoringSymbolsWithinSlot = calloc(1,sizeof(*mac->search_space_zero->monitoringSymbolsWithinSlot));
- if(mac->search_space_zero->monitoringSymbolsWithinSlot->buf == NULL) mac->search_space_zero->monitoringSymbolsWithinSlot->buf = calloc(1,2);
- if(mac->search_space_zero->nrofCandidates == NULL) mac->search_space_zero->nrofCandidates = calloc(1,sizeof(*mac->search_space_zero->nrofCandidates));
- if(mac->search_space_zero->searchSpaceType == NULL) mac->search_space_zero->searchSpaceType = calloc(1,sizeof(*mac->search_space_zero->searchSpaceType));
- if(mac->search_space_zero->searchSpaceType->choice.common == NULL) mac->search_space_zero->searchSpaceType->choice.common=calloc(1,sizeof(*mac->search_space_zero->searchSpaceType->choice.common));
- if(mac->search_space_zero->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 == NULL) mac->search_space_zero->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 = calloc(1,sizeof(*mac->search_space_zero->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0));
- mac->search_space_zero->searchSpaceId = 0;
- *mac->search_space_zero->controlResourceSetId = 0;
- mac->search_space_zero->monitoringSlotPeriodicityAndOffset = calloc(1,sizeof(*mac->search_space_zero->monitoringSlotPeriodicityAndOffset));
- mac->search_space_zero->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
- mac->search_space_zero->duration=NULL;
- // should be '1100 0000 0000 00'B (LSB first!), first two symbols in slot, adjust if needed
- mac->search_space_zero->monitoringSymbolsWithinSlot->buf[1] = 0;
- mac->search_space_zero->monitoringSymbolsWithinSlot->buf[0] = (1<<7);
- mac->search_space_zero->monitoringSymbolsWithinSlot->size = 2;
- mac->search_space_zero->monitoringSymbolsWithinSlot->bits_unused = 2;
-
- // FIXME: update values from TS38.213 Section 10.1 Table 10.1-1: CCE aggregation levels and maximum number of PDCCH candidates per CCE aggregation level for CSS sets configured by searchSpaceSIB1
- mac->search_space_zero->nrofCandidates->aggregationLevel1 = NR_SearchSpace__nrofCandidates__aggregationLevel1_n0;
- mac->search_space_zero->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n0;
- mac->search_space_zero->nrofCandidates->aggregationLevel4 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n2;
- mac->search_space_zero->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
- mac->search_space_zero->nrofCandidates->aggregationLevel16 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;
- mac->search_space_zero->searchSpaceType->present = NR_SearchSpace__searchSpaceType_PR_common;
-
- // Coreset0
- if(mac->coreset0 == NULL) mac->coreset0 = calloc(1,sizeof(*mac->coreset0));
- mac->coreset0->controlResourceSetId = 0;
- // frequencyDomainResources '11111111 00000000 00000000 00000000 00000000 00000'B,
- if(mac->coreset0->frequencyDomainResources.buf == NULL) mac->coreset0->frequencyDomainResources.buf = calloc(1,6);
- mac->coreset0->frequencyDomainResources.buf[0] = 0xff;
- mac->coreset0->frequencyDomainResources.buf[1] = 0;
- mac->coreset0->frequencyDomainResources.buf[2] = 0;
- mac->coreset0->frequencyDomainResources.buf[3] = 0;
- mac->coreset0->frequencyDomainResources.buf[4] = 0;
- mac->coreset0->frequencyDomainResources.buf[5] = 0;
- mac->coreset0->frequencyDomainResources.size = 6;
- mac->coreset0->frequencyDomainResources.bits_unused = 3;
- mac->coreset0->duration = 1;
- mac->coreset0->cce_REG_MappingType.present=NR_ControlResourceSet__cce_REG_MappingType_PR_interleaved;
- mac->coreset0->cce_REG_MappingType.choice.interleaved=calloc(1,sizeof(*mac->coreset0->cce_REG_MappingType.choice.interleaved));
- mac->coreset0->cce_REG_MappingType.choice.interleaved->reg_BundleSize = NR_ControlResourceSet__cce_REG_MappingType__interleaved__reg_BundleSize_n6;
- mac->coreset0->cce_REG_MappingType.choice.interleaved->interleaverSize = NR_ControlResourceSet__cce_REG_MappingType__interleaved__interleaverSize_n2;
- mac->coreset0->cce_REG_MappingType.choice.interleaved->shiftIndex = NULL;
- mac->coreset0->precoderGranularity = NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle;
- if(mac->coreset0->tci_StatesPDCCH_ToAddList == NULL) mac->coreset0->tci_StatesPDCCH_ToAddList = calloc(1,sizeof(*mac->coreset0->tci_StatesPDCCH_ToAddList));
- NR_TCI_StateId_t *tci[8];
- for (int i=0;i<8;i++) {
- tci[i]=calloc(1,sizeof(*tci[i]));
- *tci[i] = i;
- ASN_SEQUENCE_ADD(&mac->coreset0->tci_StatesPDCCH_ToAddList->list,tci[i]);
- }
- mac->coreset0->tci_StatesPDCCH_ToReleaseList = NULL;
- mac->coreset0->tci_PresentInDCI = NULL;
- mac->coreset0->pdcch_DMRS_ScramblingID = NULL;
-}
-
/** \brief This function is relavant for the UE procedures for control. It loads the search spaces, the BWPs and the CORESETs into the MAC instance and
\brief performs assert checks on the relevant RRC configuration.
@param NR_UE_MAC_INST_t mac: pointer to local MAC instance
@@ -672,9 +614,6 @@ void config_control_ue(NR_UE_MAC_INST_t *mac){
mac->SSpace[dl_bwp_id-1][coreset_id -1][ss_id] = css;
ss_id++;
}
-
- fill_default_coreset_zero(mac);
-
}
int nr_rrc_mac_config_req_ue(
@@ -694,16 +633,9 @@ int nr_rrc_mac_config_req_ue(
// TODO do something FAPI-like P5 L1/L2 config interface in config_si, config_mib, etc.
if(mibP != NULL){
-
- // if this is the first MIB intialize coreset0 for SA
- if (mac->mib == NULL) fill_default_coreset_zero(mac);
-
mac->mib = mibP; // update by every reception
mac->phy_config.Mod_id = module_id;
mac->phy_config.CC_id = cc_idP;
- mac->phy_config.config_req.ssb_table.ssb_subcarrier_offset = 0; // TODO currently not in RRC?
- mac->phy_config.config_req.tdd_table.tdd_period_in_slots=5<<get_softmodem_params()->numerology;
- mac->phy_config.config_req.ssb_table.ssb_offset_point_a = (N_RB_DL-20)>>1;
}
AssertFatal(scell_group_config == NULL || cell_group_config == NULL,
"both scell_group_config and cell_group_config cannot be non-NULL\n");
@@ -711,8 +643,8 @@ int nr_rrc_mac_config_req_ue(
if (sccP != NULL) {
mac->scc_SIB=sccP;
- LOG_I(MAC,"Keeping ServingCellConfigCommonSIB\n");
- config_common_ue(mac,module_id,cc_idP);
+ LOG_D(MAC,"Keeping ServingCellConfigCommonSIB\n");
+ config_common_ue_sa(mac,module_id,cc_idP);
int num_slots_ul = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
if (mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols>0) num_slots_ul++;
LOG_I(MAC, "Initializing ul_config_request. num_slots_ul = %d\n", num_slots_ul);
@@ -731,7 +663,7 @@ int nr_rrc_mac_config_req_ue(
ra->rach_ConfigDedicated = scell_group_config->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated->choice.uplink;
}
mac->scc = scell_group_config->spCellConfig->reconfigurationWithSync->spCellConfigCommon;
- mac->physCellId = *mac->scc->physCellId;
+ mac->physCellId = *mac->scc->physCellId;
config_common_ue(mac,module_id,cc_idP);
mac->crnti = scell_group_config->spCellConfig->reconfigurationWithSync->newUE_Identity;
LOG_I(MAC,"Configuring CRNTI %x\n",mac->crnti);
@@ -740,26 +672,12 @@ int nr_rrc_mac_config_req_ue(
// Setup the SSB to Rach Occasions mapping according to the config
build_ssb_to_ro_map(mac);
}
- else if (cell_group_config != NULL){
+ else if (cell_group_config != NULL ){
LOG_I(MAC,"Applying CellGroupConfig from gNodeB\n");
mac->cg = cell_group_config;
mac->servCellIndex = cell_group_config->spCellConfig->servCellIndex ? *cell_group_config->spCellConfig->servCellIndex : 0;
- if(get_softmodem_params()->phy_test==1 || get_softmodem_params()->do_ra==1) {
- config_control_ue(mac);
- if (cell_group_config->spCellConfig->reconfigurationWithSync) {
- if (cell_group_config->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated) {
- ra->rach_ConfigDedicated = cell_group_config->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated->choice.uplink;
- }
- mac->scc = cell_group_config->spCellConfig->reconfigurationWithSync->spCellConfigCommon;
- config_common_ue(mac,module_id,cc_idP);
- mac->crnti = cell_group_config->spCellConfig->reconfigurationWithSync->newUE_Identity;
- LOG_I(MAC,"Configuring CRNTI %x\n",mac->crnti);
- }
-
- // Setup the SSB to Rach Occasions mapping according to the config
- build_ssb_to_ro_map(mac);
- }
-
+ // config_control_ue(mac);
+ // config_common_ue(mac,module_id,cc_idP);
/*
if(mac_cell_group_configP != NULL){
if(mac_cell_group_configP->drx_Config != NULL ){
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_defs.h b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
index b73da4c4e71edc2a4c7c0aec1cedaf1494a415f5..f42efdfff0bad715791c529e3c7d82e585763921 100755
--- a/openair2/LAYER2/NR_MAC_UE/mac_defs.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
@@ -300,6 +300,8 @@ typedef struct {
/// BeamfailurerecoveryConfig
NR_BeamFailureRecoveryConfig_t RA_BeamFailureRecoveryConfig;
+ /// RA SearchSpace
+ NR_SearchSpace_t *ss;
} RA_config_t;
typedef struct {
@@ -422,6 +424,8 @@ typedef struct {
NR_SearchSpace_t *search_space_zero;
NR_ControlResourceSet_t *coreset0;
frequency_range_t frequency_range;
+ uint16_t nr_band;
+ uint8_t ssb_subcarrier_offset;
dci_pdu_rel15_t def_dci_pdu_rel15[8];
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_proto.h b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
index 41480d55a4ad45020564bb6d13d5d2b143cd9cdb..83ff1d3a9e25176188d615f742d299222bd9b73a 100755
--- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
@@ -189,8 +189,10 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
nfapi_nr_ue_pusch_pdu_t *pusch_config_pdu,
fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu,
uint8_t time_domain_ind,
+ int default_abc,
bool use_default);
+
uint8_t nr_ue_get_sdu(module_id_t module_idP,
frame_t frameP,
sub_frame_t subframe,
@@ -296,6 +298,15 @@ void nr_ue_msg3_scheduler(NR_UE_MAC_INST_t *mac,
sub_frame_t current_slot,
uint8_t Msg3_tda_id);
+void nr_ue_sib1_scheduler(module_id_t module_idP,
+ int cc_id,
+ uint16_t ssb_start_symbol,
+ uint16_t frame,
+ uint8_t ssb_subcarrier_offset,
+ uint32_t ssb_index,
+ uint16_t ssb_start_subcarrier,
+ frequency_range_t frequency_range);
+
/* \brief Function called by PHY to process the received RAR and check that the preamble matches what was sent by the gNB. It provides the timing advance and t-CRNTI.
@param Mod_id Index of UE instance
@param CC_id Index to a component carrier
@@ -362,6 +373,9 @@ int8_t nr_ue_process_dci_freq_dom_resource_assignment(nfapi_nr_ue_pusch_pdu_t *p
uint16_t n_RB_DLBWP,
uint16_t riv);
+void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15, fapi_nr_dl_config_request_t *dl_config, int rnti_type, int ss_id);
+void fill_dci_search_candidates(NR_SearchSpace_t *ss,fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15);
+
void get_num_re_dmrs(nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
uint8_t *nb_dmrs_re_per_rb,
uint16_t *number_dmrs_symbols);
diff --git a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
index 768f65bf635abebc6abecfcac462ae3c22447605..b27837043ffc5cd9c1712cb128ce3e388f23efa7 100644
--- a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
+++ b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
@@ -43,36 +43,27 @@
static NR_UE_MAC_INST_t *nr_ue_mac_inst;
-NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst)
-{
+NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst) {
+
//LOG_I(MAC, "[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
//LOG_I(MAC, "[MAIN] init UE MAC functions \n");
//init mac here
nr_ue_mac_inst = (NR_UE_MAC_INST_t *)calloc(sizeof(NR_UE_MAC_INST_t),NB_NR_UE_MAC_INST);
+
for (int j=0;j<NB_NR_UE_MAC_INST;j++)
- for (int i=0;i<NR_MAX_HARQ_PROCESSES;i++)
- nr_ue_mac_inst[j].first_ul_tx[i]=1;
+ for (int i=0;i<NR_MAX_HARQ_PROCESSES;i++) nr_ue_mac_inst[j].first_ul_tx[i]=1;
- if (rrc_inst && (rrc_inst->scell_group_config || rrc_inst->cell_group_config)) {
- if(rrc_inst->scell_group_config) {
- nr_rrc_mac_config_req_ue(0,0,0,NULL,NULL,NULL,rrc_inst->scell_group_config);
- //if (IS_SOFTMODEM_NOS1){
- // AssertFatal(rlc_module_init(0) == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
- // nr_pdcp_layer_init();
- // nr_DRB_preconfiguration(nr_ue_mac_inst->crnti);
- //}
- } else if (rrc_inst->cell_group_config) {
- nr_rrc_mac_config_req_ue(0,0,0,NULL,NULL,rrc_inst->cell_group_config,NULL);
- AssertFatal(rlc_module_init(0) == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
- if (IS_SOFTMODEM_NOS1){
- pdcp_layer_init();
- nr_DRB_preconfiguration(nr_ue_mac_inst->crnti);
- }
- }
+ if (rrc_inst && rrc_inst->scell_group_config) {
+ nr_rrc_mac_config_req_ue(0,0,0,NULL,NULL,NULL,rrc_inst->scell_group_config);
+ AssertFatal(rlc_module_init(0) == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
+ if (IS_SOFTMODEM_NOS1){
+ pdcp_layer_init();
+ nr_DRB_preconfiguration(nr_ue_mac_inst->crnti);
+ }
// Allocate memory for ul_config_request in the mac instance. This is now a pointer and will
// point to a list of structures (one for each UL slot) to store PUSCH scheduling parameters
// received from UL DCI.
@@ -83,8 +74,8 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst)
LOG_D(MAC, "Initializing ul_config_request. num_slots_ul = %d\n", num_slots_ul);
nr_ue_mac_inst->ul_config_request = (fapi_nr_ul_config_request_t *)calloc(num_slots_ul, sizeof(fapi_nr_ul_config_request_t));
}
-
- } else {
+ }
+ else {
LOG_I(MAC,"Running without CellGroupConfig\n");
nr_rrc_mac_config_req_ue(0,0,0,NULL,NULL,NULL,NULL);
if(get_softmodem_params()->sa == 1) {
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
index 452cc982ff603af342604679558e23afa8c69245..83784634fcf74b4c7aee68f76ad7c3ce722c9746 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
@@ -81,6 +81,41 @@ void init_RA(module_id_t mod_id,
prach_resources->POWER_OFFSET_2STEP_RA = 0;
prach_resources->RA_SCALING_FACTOR_BI = 1;
+ struct NR_PDCCH_ConfigCommon__commonSearchSpaceList *commonSearchSpaceList;
+ NR_SearchSpaceId_t *ra_ss;
+ NR_SearchSpaceId_t ss_id = -1;
+ NR_SearchSpace_t *ss = NULL;
+
+ if(mac->scc_SIB) {
+ commonSearchSpaceList = mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.pdcch_ConfigCommon->choice.setup->commonSearchSpaceList;
+ ss_id = *mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.pdcch_ConfigCommon->choice.setup->ra_SearchSpace;
+ }
+ else{
+ if (mac->scc) {
+ NR_SearchSpaceId_t *ra_ss = mac->scc->downlinkConfigCommon->initialDownlinkBWP->pdcch_ConfigCommon->choice.setup->ra_SearchSpace;
+ if (ra_ss) {
+ commonSearchSpaceList = mac->scc->downlinkConfigCommon->initialDownlinkBWP->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList;
+ ss_id = *mac->scc->downlinkConfigCommon->initialDownlinkBWP->pdcch_ConfigCommon->choice.setup->ra_SearchSpace;
+ }
+ }
+ if (ss_id < 0) {
+ ra_ss = mac->DLbwp[0]->bwp_Common->pdcch_ConfigCommon->choice.setup->ra_SearchSpace;
+ if (ra_ss) {
+ commonSearchSpaceList = mac->DLbwp[0]->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList;
+ ss_id = *mac->DLbwp[0]->bwp_Common->pdcch_ConfigCommon->choice.setup->ra_SearchSpace;
+ }
+ }
+ }
+
+ AssertFatal(ss_id>-1,"Didn't find ra-SearchSpace\n");
+ AssertFatal(commonSearchSpaceList->list.count > 0, "common SearchSpace list has 0 elements\n");
+ // Common searchspace list
+ for (int i = 0; i < commonSearchSpaceList->list.count; i++) {
+ ss = commonSearchSpaceList->list.array[i];
+ if (ss->searchSpaceId == ss_id)
+ ra->ss = ss;
+ }
+
if (rach_ConfigDedicated) {
if (rach_ConfigDedicated->cfra){
LOG_I(MAC, "Initialization of 2-step contention-free random access procedure\n");
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
index f9ba33c2b1014d7c4c1e6cb1731965700172983b..97a5f1d49fe73cf3ad8b6853f101649af76f13e3 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
@@ -66,7 +66,6 @@ void fill_dci_search_candidates(NR_SearchSpace_t *ss,fapi_nr_dl_config_dci_dl_pd
void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15, fapi_nr_dl_config_request_t *dl_config, int rnti_type, int ss_id){
- RA_config_t *ra = &mac->ra;
uint16_t monitoringSymbolsWithinSlot = 0;
uint8_t coreset_id = 1;
int sps = 0;
@@ -90,8 +89,11 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
NR_SearchSpace_t *ss;
NR_ControlResourceSet_t *coreset;
if(ss_id>=0) {
- ss = mac->SSpace[dl_bwp_id-1][coreset_id - 1][ss_id];
- coreset = mac->coreset[dl_bwp_id-1][coreset_id - 1];
+ AssertFatal(mac->scc != NULL, "scc is null\n");
+ initialDownlinkBWP = scc->downlinkConfigCommon->initialDownlinkBWP;
+ bwp_Common = mac->DLbwp[dl_bwp_id - 1]->bwp_Common;
+ ss = mac->SSpace[dl_bwp_id - 1][coreset_id - 1][ss_id];
+ coreset = mac->coreset[dl_bwp_id - 1][coreset_id - 1];
rel15->coreset.CoreSetType = NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG;
} else {
ss = mac->search_space_zero;
@@ -107,7 +109,8 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
for (int i = 0; i < 6; i++)
rel15->coreset.frequency_domain_resource[i] = coreset->frequencyDomainResources.buf[i];
- rel15->coreset.CceRegMappingType = coreset->cce_REG_MappingType.present == NR_ControlResourceSet__cce_REG_MappingType_PR_interleaved ? FAPI_NR_CCE_REG_MAPPING_TYPE_INTERLEAVED : FAPI_NR_CCE_REG_MAPPING_TYPE_NON_INTERLEAVED;
+ rel15->coreset.CceRegMappingType = coreset->cce_REG_MappingType.present ==
+ NR_ControlResourceSet__cce_REG_MappingType_PR_interleaved ? FAPI_NR_CCE_REG_MAPPING_TYPE_INTERLEAVED : FAPI_NR_CCE_REG_MAPPING_TYPE_NON_INTERLEAVED;
if (rel15->coreset.CceRegMappingType == FAPI_NR_CCE_REG_MAPPING_TYPE_INTERLEAVED) {
struct NR_ControlResourceSet__cce_REG_MappingType__interleaved *interleaved = coreset->cce_REG_MappingType.choice.interleaved;
rel15->coreset.RegBundleSize = (interleaved->reg_BundleSize == NR_ControlResourceSet__cce_REG_MappingType__interleaved__reg_BundleSize_n6) ? 6 : (2 + interleaved->reg_BundleSize);
@@ -130,10 +133,6 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
rel15->coreset.scrambling_rnti = 0;
}
- #ifdef DEBUG_DCI
- LOG_D(MAC, "[DCI_CONFIG] Configure DCI PDU: ss_id %d bwp %p bwp_Id %d controlResourceSetId %d\n", ss_id, mac->DLbwp[bwp_id - 1], mac->DLbwp[bwp_id - 1]->bwp_Id, coreset->controlResourceSetId);
- #endif
-
// loop over RNTI type and configure resource allocation for DCI
switch(rnti_type) {
case NR_RNTI_C:
@@ -161,7 +160,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
// we use the initial DL BWP
sps = initialDownlinkBWP->genericParameters.cyclicPrefix == NULL ? 14 : 12;
monitoringSymbolsWithinSlot = (ss->monitoringSymbolsWithinSlot->buf[0]<<(sps-8)) | (ss->monitoringSymbolsWithinSlot->buf[1]>>(16-sps));
- rel15->rnti = ra->ra_rnti;
+ rel15->rnti = mac->ra.ra_rnti;
rel15->BWPSize = NRRIV2BW(initialDownlinkBWP->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
if (get_softmodem_params()->sa) {
rel15->BWPStart = NRRIV2PRBOFFSET(initialDownlinkBWP->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
@@ -179,7 +178,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
// we use the initial DL BWP
sps = initialDownlinkBWP->genericParameters.cyclicPrefix == NULL ? 14 : 12;
monitoringSymbolsWithinSlot = (ss->monitoringSymbolsWithinSlot->buf[0]<<(sps-8)) | (ss->monitoringSymbolsWithinSlot->buf[1]>>(16-sps));
- rel15->rnti = ra->t_crnti;
+ rel15->rnti = mac->ra.t_crnti;
rel15->BWPSize = NRRIV2BW(initialDownlinkBWP->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
rel15->BWPStart = NRRIV2PRBOFFSET(initialDownlinkBWP->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
rel15->SubcarrierSpacing = initialDownlinkBWP->genericParameters.subcarrierSpacing;
@@ -199,7 +198,11 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
rel15->rnti = SI_RNTI; // SI-RNTI - 3GPP TS 38.321 Table 7.1-1: RNTI values
rel15->BWPSize = mac->type0_PDCCH_CSS_config.num_rbs;
rel15->BWPStart = mac->type0_PDCCH_CSS_config.cset_start_rb;
- rel15->SubcarrierSpacing = mac->mib->subCarrierSpacingCommon;
+
+ if(mac->frequency_range == FR1)
+ rel15->SubcarrierSpacing = mac->mib->subCarrierSpacingCommon;
+ else
+ rel15->SubcarrierSpacing = mac->mib->subCarrierSpacingCommon + 2;
for (int i = 0; i < rel15->num_dci_options; i++) {
rel15->dci_length_options[i] = nr_dci_size(initialUplinkBWP, mac->cg, &mac->def_dci_pdu_rel15[rel15->dci_format_options[i]], rel15->dci_format_options[i], NR_RNTI_SI, rel15->BWPSize, 0);
@@ -429,11 +432,13 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
}
else { // use coreset0/ss0
NR_SearchSpace_t *ss0 = mac->search_space_zero;
- fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15 = &dl_config->dl_config_list[0].dci_config_pdu.dci_config_rel15;
- rel15->num_dci_options = 1;
- rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
- config_dci_pdu(mac, rel15, dl_config, NR_RNTI_C , -1);
- fill_dci_search_candidates(ss0, rel15);
- dl_config->number_pdus = 1;
+ if(ss0) {
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15 = &dl_config->dl_config_list[0].dci_config_pdu.dci_config_rel15;
+ rel15->num_dci_options = 1;
+ rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
+ config_dci_pdu(mac, rel15, dl_config, NR_RNTI_C , -1);
+ fill_dci_search_candidates(ss0, rel15);
+ dl_config->number_pdus = 1;
+ }
}
}
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index 205b702b4e2b174793a6d47da9d920dbb9269735..f45aafac7716a7bb2de8dbaf66d794c92b30b3e8 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -219,34 +219,37 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
//storing ssb index in the mac structure
mac->mib_ssb = ssb_index;
+ mac->ssb_subcarrier_offset = ssb_subcarrier_offset;
+
+ uint8_t scs_ssb;
+ uint32_t band;
+ uint16_t ssb_start_symbol;
if (get_softmodem_params()->sa == 1) {
- // TODO these values shouldn't be taken from SCC in SA
- uint8_t scs_ssb = get_softmodem_params()->numerology;
- uint32_t band = get_softmodem_params()->band;
- uint16_t ssb_start_symbol = get_ssb_start_symbol(band,scs_ssb,ssb_index);
- uint16_t ssb_offset_point_a = (ssb_start_subcarrier - ssb_subcarrier_offset)/12;
-
- get_type0_PDCCH_CSS_config_parameters(&mac->type0_PDCCH_CSS_config,
- frame,
- mac->mib,
- nr_slots_per_frame[scs_ssb],
- ssb_subcarrier_offset,
- ssb_start_symbol,
- scs_ssb,
- mac->frequency_range,
- ssb_index,
- ssb_offset_point_a);
-
-
- mac->type0_pdcch_ss_mux_pattern = mac->type0_PDCCH_CSS_config.type0_pdcch_ss_mux_pattern;
- mac->type0_pdcch_ss_sfn_c = mac->type0_PDCCH_CSS_config.sfn_c;
- mac->type0_pdcch_ss_n_c = mac->type0_PDCCH_CSS_config.n_c;
+ scs_ssb = get_softmodem_params()->numerology;
+ band = mac->nr_band;
+ ssb_start_symbol = get_ssb_start_symbol(band,scs_ssb,ssb_index);
+
+ if (mac->common_configuration_complete == 0)
+ nr_ue_sib1_scheduler(module_id,
+ cc_id,
+ ssb_start_symbol,
+ frame,
+ ssb_subcarrier_offset,
+ ssb_index,
+ ssb_start_subcarrier,
+ mac->frequency_range);
+ }
+ else {
+ NR_ServingCellConfigCommon_t *scc = mac->scc;
+ scs_ssb = *scc->ssbSubcarrierSpacing;
+ band = *scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0];
+ ssb_start_symbol = get_ssb_start_symbol(band,scs_ssb,ssb_index);
}
- mac->dl_config_request.sfn = mac->type0_PDCCH_CSS_config.frame;
- mac->dl_config_request.slot = (ssb_index>>1) + ((ssb_index>>4)<<1); // not valid for 240kHz SCS
+ mac->dl_config_request.sfn = frame;
+ mac->dl_config_request.slot = ssb_start_symbol/14;
return 0;
}
@@ -342,13 +345,14 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
nfapi_nr_ue_pusch_pdu_t *pusch_config_pdu,
fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu,
uint8_t time_domain_ind,
- bool use_default
- ){
+ int default_abc,
+ bool use_default){
+
int dmrs_typeA_pos = (mac->scc != NULL) ? mac->scc->dmrs_TypeA_Position : mac->mib->dmrs_TypeA_Position;
// uint8_t k_offset=0;
- uint8_t sliv_S=0;
- uint8_t sliv_L=0;
+ int sliv_S=0;
+ int sliv_L=0;
uint8_t mu_pusch = 1;
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id ;
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id ;
@@ -431,25 +435,14 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
}
else {// Default configuration from tables
-// k_offset = table_5_1_2_1_1_2_time_dom_res_alloc_A[time_domain_ind-1][0];
- if(dmrs_typeA_pos == 0) {
- sliv_S = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[time_domain_ind][1];
- sliv_L = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[time_domain_ind][2];
- } else {
- sliv_S = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[time_domain_ind][1];
- sliv_L = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[time_domain_ind][2];
- }
+ get_info_from_tda_tables(default_abc,
+ time_domain_ind,
+ dmrs_typeA_pos,
+ 1, // normal CP
+ &sliv_S,
+ &sliv_L);
- // k_offset = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP[nr_pdci_info_extracted->time_dom_resource_assignment][0];
- // sliv_S = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP[nr_pdci_info_extracted->time_dom_resource_assignment][1];
- // sliv_L = table_5_1_2_1_1_3_time_dom_res_alloc_A_extCP[nr_pdci_info_extracted->time_dom_resource_assignment][2];
- // k_offset = table_5_1_2_1_1_4_time_dom_res_alloc_B[nr_pdci_info_extracted->time_dom_resource_assignment][0];
- // sliv_S = table_5_1_2_1_1_4_time_dom_res_alloc_B[nr_pdci_info_extracted->time_dom_resource_assignment][1];
- // sliv_L = table_5_1_2_1_1_4_time_dom_res_alloc_B[nr_pdci_info_extracted->time_dom_resource_assignment][2];
- // k_offset = table_5_1_2_1_1_5_time_dom_res_alloc_C[nr_pdci_info_extracted->time_dom_resource_assignment][0];
- // sliv_S = table_5_1_2_1_1_5_time_dom_res_alloc_C[nr_pdci_info_extracted->time_dom_resource_assignment][1];
- // sliv_L = table_5_1_2_1_1_5_time_dom_res_alloc_C[nr_pdci_info_extracted->time_dom_resource_assignment][2];
dlsch_config_pdu->number_symbols = sliv_L;
dlsch_config_pdu->start_symbol = sliv_S;
}
@@ -520,7 +513,9 @@ int nr_ue_process_dci_indication_pdu(module_id_t module_id,int cc_id, int gNB_in
dci->dci_format = NR_UL_DCI_FORMAT_0_0;
def_dci_pdu_rel15 = &mac->def_dci_pdu_rel15[dci->dci_format];
}
- return (nr_ue_process_dci(module_id, cc_id, gNB_index, frame, slot, def_dci_pdu_rel15, dci));
+ int8_t ret_proc = nr_ue_process_dci(module_id, cc_id, gNB_index, frame, slot, def_dci_pdu_rel15, dci);
+ memset(def_dci_pdu_rel15, 0, sizeof(dci_pdu_rel15_t));
+ return ret_proc;
}
int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, frame_t frame, int slot, dci_pdu_rel15_t *dci, fapi_nr_dci_indication_pdu_t *dci_ind) {
@@ -538,6 +533,7 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
uint8_t is_Msg3 = 0;
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id ;
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id ;
+ int default_abc = 1;
uint16_t n_RB_DLBWP = 0;
if(dl_bwp_id){
@@ -708,12 +704,16 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
dl_config->dl_config_list[dl_config->number_pdus].dlsch_config_pdu.rnti = rnti;
fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu_1_0 = &dl_config->dl_config_list[dl_config->number_pdus].dlsch_config_pdu.dlsch_config_rel15;
+
NR_PDSCH_Config_t *pdsch_config = NULL;
if(dl_bwp_id)
pdsch_config = (mac->DLbwp[dl_bwp_id-1]) ? mac->DLbwp[dl_bwp_id-1]->bwp_Dedicated->pdsch_Config->choice.setup : NULL;
+
uint16_t BWPSize = n_RB_DLBWP;
if(rnti == SI_RNTI) {
+ NR_Type0_PDCCH_CSS_config_t type0_PDCCH_CSS_config = mac->type0_PDCCH_CSS_config;
+ default_abc = type0_PDCCH_CSS_config.type0_pdcch_ss_mux_pattern;
dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_SI_DLSCH;
dlsch_config_pdu_1_0->BWPSize = mac->type0_PDCCH_CSS_config.num_rbs;
dlsch_config_pdu_1_0->BWPStart = mac->type0_PDCCH_CSS_config.cset_start_rb;
@@ -762,7 +762,7 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
return -1;
}
/* TIME_DOM_RESOURCE_ASSIGNMENT */
- if (nr_ue_process_dci_time_dom_resource_assignment(mac,NULL,dlsch_config_pdu_1_0,dci->time_domain_assignment.val,rnti==SI_RNTI) < 0) {
+ if (nr_ue_process_dci_time_dom_resource_assignment(mac,NULL,dlsch_config_pdu_1_0,dci->time_domain_assignment.val,default_abc,rnti==SI_RNTI) < 0) {
LOG_W(MAC, "[%d.%d] Invalid time_domain_assignment. Possibly due to false DCI. Ignoring DCI!\n", frame, slot);
return -1;
}
@@ -788,9 +788,12 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
dlsch_config_pdu_1_0->number_symbols,
dlsch_config_pdu_1_0->start_symbol,
mappingtype);
+
if(dl_bwp_id){
- dlsch_config_pdu_1_0->dmrsConfigType = (mac->DLbwp[dl_bwp_id-1] != NULL) ? (mac->DLbwp[dl_bwp_id-1]->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? 0 : 1) : 0;
+ dlsch_config_pdu_1_0->dmrsConfigType = (mac->DLbwp[dl_bwp_id-1] != NULL) ?
+ (mac->DLbwp[dl_bwp_id-1]->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? 0 : 1) : 0;
}
+
/* number of DM-RS CDM groups without data according to subclause 5.1.6.2 of 3GPP TS 38.214 version 15.9.0 Release 15 */
if (dlsch_config_pdu_1_0->number_symbols == 2)
dlsch_config_pdu_1_0->n_dmrs_cdm_groups = 1;
@@ -957,7 +960,7 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
return -1;
}
/* TIME_DOM_RESOURCE_ASSIGNMENT */
- if (nr_ue_process_dci_time_dom_resource_assignment(mac,NULL,dlsch_config_pdu_1_1,dci->time_domain_assignment.val,false) < 0) {
+ if (nr_ue_process_dci_time_dom_resource_assignment(mac,NULL,dlsch_config_pdu_1_1,dci->time_domain_assignment.val,0,false) < 0) {
LOG_W(MAC, "[%d.%d] Invalid time_domain_assignment. Possibly due to false DCI. Ignoring DCI!\n", frame, slot);
return -1;
}
@@ -979,9 +982,11 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
dlsch_config_pdu_1_1->dlDmrsSymbPos = fill_dmrs_mask(pdsch_config,
mac->scc->dmrs_TypeA_Position,
dlsch_config_pdu_1_1->number_symbols,
- dlsch_config_pdu_1_1->start_symbol,
- mappingtype);
+ dlsch_config_pdu_1_1->start_symbol,
+ mappingtype);
+
dlsch_config_pdu_1_1->dmrsConfigType = mac->DLbwp[dl_bwp_id-1]->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? NFAPI_NR_DMRS_TYPE1 : NFAPI_NR_DMRS_TYPE2;
+
/* TODO: fix number of DM-RS CDM groups without data according to subclause 5.1.6.2 of 3GPP TS 38.214,
using tables 7.3.1.2.2-1, 7.3.1.2.2-2, 7.3.1.2.2-3, 7.3.1.2.2-4 of 3GPP TS 38.212 */
dlsch_config_pdu_1_1->n_dmrs_cdm_groups = 1;
@@ -2717,7 +2722,7 @@ uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
}
else N_RB=NRRIV2BW(mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP.genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
- // indicating a DL DCI format - 1 bit
+ // indicating a DL DCI format 1bit
pos++;
dci_pdu_rel15->format_indicator = (*dci_pdu>>(dci_size-pos))&1;
@@ -3188,248 +3193,238 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
LOG_D(MAC, "In %s [%d.%d]: processing PDU %d (with length %d) of %d total number of PDUs...\n", __FUNCTION__, frameP, slot, pdu_id, pdu_len, dl_info->rx_ind->number_pdus);
- while (!done && pdu_len > 0){
- mac_ce_len = 0x0000;
- mac_subheader_len = 0x0001; // default to fixed-length subheader = 1-oct
- mac_sdu_len = 0x0000;
- rx_lcid = ((NR_MAC_SUBHEADER_FIXED *)pduP)->LCID;
-
- LOG_D(MAC, "[UE] LCID %d, PDU length %d\n", rx_lcid, pdu_len);
- switch(rx_lcid){
- // MAC CE
-
- case DL_SCH_LCID_CCCH:
- // MSG4 RRC Setup 38.331
- // variable length
- if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
- mac_sdu_len = ((uint16_t)(((NR_MAC_SUBHEADER_LONG *) pduP)->L1 & 0x7f) << 8)
- | ((uint16_t)((NR_MAC_SUBHEADER_LONG *) pduP)->L2 & 0xff);
- mac_subheader_len = 3;
- } else {
- mac_sdu_len = ((NR_MAC_SUBHEADER_SHORT *) pduP)->L;
- mac_subheader_len = 2;
- }
+ while (!done && pdu_len > 0){
+ mac_ce_len = 0x0000;
+ mac_subheader_len = 0x0001; // default to fixed-length subheader = 1-oct
+ mac_sdu_len = 0x0000;
+ rx_lcid = ((NR_MAC_SUBHEADER_FIXED *)pduP)->LCID;
+
+ LOG_D(MAC, "[UE] LCID %d, PDU length %d\n", rx_lcid, pdu_len);
+ switch(rx_lcid){
+ // MAC CE
+ case DL_SCH_LCID_CCCH:
+ // MSG4 RRC Setup 38.331
+ // variable length
+ if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
+ mac_sdu_len = ((uint16_t)(((NR_MAC_SUBHEADER_LONG *) pduP)->L1 & 0x7f) << 8)
+ | ((uint16_t)((NR_MAC_SUBHEADER_LONG *) pduP)->L2 & 0xff);
+ mac_subheader_len = 3;
+ } else {
+ mac_sdu_len = ((NR_MAC_SUBHEADER_SHORT *) pduP)->L;
+ mac_subheader_len = 2;
+ }
- // Check if it is a valid CCCH message, we get all 00's messages very often
- int i = 0;
- for(i=0; i<(mac_subheader_len+mac_sdu_len); i++) {
- if(pduP[i] != 0) {
- break;
- }
- }
- if (i == (mac_subheader_len+mac_sdu_len)) {
- LOG_D(NR_MAC, "%s() Invalid CCCH message!, pdu_len: %d\n", __func__, pdu_len);
- done = 1;
- break;
- }
+ // Check if it is a valid CCCH message, we get all 00's messages very often
+ int i = 0;
+ for(i=0; i<(mac_subheader_len+mac_sdu_len); i++) {
+ if(pduP[i] != 0) {
+ break;
+ }
+ }
+ if (i == (mac_subheader_len+mac_sdu_len)) {
+ LOG_D(NR_MAC, "%s() Invalid CCCH message!, pdu_len: %d\n", __func__, pdu_len);
+ done = 1;
+ break;
+ }
- if ( mac_sdu_len > 0 ) {
- LOG_D(NR_MAC,"DL_SCH_LCID_CCCH (e.g. RRCSetup) with payload len %d\n", mac_sdu_len);
- for (int i = 0; i < mac_subheader_len; i++) {
- LOG_D(NR_MAC, "MAC header %d: 0x%x\n", i, pduP[i]);
- }
- for (int i = 0; i < mac_sdu_len; i++) {
- LOG_D(NR_MAC, "%d: 0x%x\n", i, pduP[mac_subheader_len + i]);
- }
- nr_mac_rrc_data_ind_ue(module_idP, CC_id, gNB_index, frameP, 0, mac->crnti, CCCH, pduP+mac_subheader_len, mac_sdu_len);
- }
- break;
+ if ( mac_sdu_len > 0 ) {
+ LOG_D(NR_MAC,"DL_SCH_LCID_CCCH (e.g. RRCSetup) with payload len %d\n", mac_sdu_len);
+ for (int i = 0; i < mac_subheader_len; i++) {
+ LOG_D(NR_MAC, "MAC header %d: 0x%x\n", i, pduP[i]);
+ }
+ for (int i = 0; i < mac_sdu_len; i++) {
+ LOG_D(NR_MAC, "%d: 0x%x\n", i, pduP[mac_subheader_len + i]);
+ }
+ nr_mac_rrc_data_ind_ue(module_idP, CC_id, gNB_index, frameP, 0, mac->crnti, CCCH, pduP+mac_subheader_len, mac_sdu_len);
+ }
+ break;
+ case DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH:
+
+ // 38.321 Ch6.1.3.14
+ // varialbe length
+ mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
+ mac_subheader_len = 2;
+ if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
+ mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
+ mac_subheader_len = 3;
+ }
+ break;
+ case DL_SCH_LCID_APERIODIC_CSI_TRI_STATE_SUBSEL:
+ // 38.321 Ch6.1.3.13
+ // varialbe length
+ mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
+ mac_subheader_len = 2;
+ if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
+ mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
+ mac_subheader_len = 3;
+ }
+ break;
+ case DL_SCH_LCID_SP_CSI_RS_CSI_IM_RES_SET_ACT:
+ // 38.321 Ch6.1.3.12
+ // varialbe length
+ mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
+ mac_subheader_len = 2;
+ if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
+ mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
+ mac_subheader_len = 3;
+ }
+ break;
+ case DL_SCH_LCID_SP_SRS_ACTIVATION:
+ // 38.321 Ch6.1.3.17
+ // varialbe length
+ mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
+ mac_subheader_len = 2;
+ if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
+ mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
+ mac_subheader_len = 3;
+ }
+ break;
+ case DL_SCH_LCID_RECOMMENDED_BITRATE:
+ // 38.321 Ch6.1.3.20
+ mac_ce_len = 2;
+ break;
+ case DL_SCH_LCID_SP_ZP_CSI_RS_RES_SET_ACT:
+ // 38.321 Ch6.1.3.19
+ mac_ce_len = 2;
+ break;
+ case DL_SCH_LCID_PUCCH_SPATIAL_RELATION_ACT:
+ // 38.321 Ch6.1.3.18
+ mac_ce_len = 3;
+ break;
+ case DL_SCH_LCID_SP_CSI_REP_PUCCH_ACT:
+ // 38.321 Ch6.1.3.16
+ mac_ce_len = 2;
+ break;
+ case DL_SCH_LCID_TCI_STATE_IND_UE_SPEC_PDCCH:
+ // 38.321 Ch6.1.3.15
+ mac_ce_len = 2;
+ break;
+ case DL_SCH_LCID_DUPLICATION_ACT:
+ // 38.321 Ch6.1.3.11
+ mac_ce_len = 1;
+ break;
+ case DL_SCH_LCID_SCell_ACT_4_OCT:
+ // 38.321 Ch6.1.3.10
+ mac_ce_len = 4;
+ break;
+ case DL_SCH_LCID_SCell_ACT_1_OCT:
+ // 38.321 Ch6.1.3.10
+ mac_ce_len = 1;
+ break;
+ case DL_SCH_LCID_L_DRX:
+ // 38.321 Ch6.1.3.6
+ // fixed length but not yet specify.
+ mac_ce_len = 0;
+ break;
+ case DL_SCH_LCID_DRX:
+ // 38.321 Ch6.1.3.5
+ // fixed length but not yet specify.
+ mac_ce_len = 0;
+ break;
+ case DL_SCH_LCID_TA_COMMAND:
+ // 38.321 Ch6.1.3.4
+ mac_ce_len = 1;
- case DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH:
-
- // 38.321 Ch6.1.3.14
- // varialbe length
- mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
- mac_subheader_len = 2;
- if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
- mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
- mac_subheader_len = 3;
- }
- break;
- case DL_SCH_LCID_APERIODIC_CSI_TRI_STATE_SUBSEL:
- // 38.321 Ch6.1.3.13
- // varialbe length
- mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
- mac_subheader_len = 2;
- if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
- mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
- mac_subheader_len = 3;
- }
- break;
- case DL_SCH_LCID_SP_CSI_RS_CSI_IM_RES_SET_ACT:
- // 38.321 Ch6.1.3.12
- // varialbe length
- mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
- mac_subheader_len = 2;
- if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
- mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
- mac_subheader_len = 3;
- }
- break;
- case DL_SCH_LCID_SP_SRS_ACTIVATION:
- // 38.321 Ch6.1.3.17
- // varialbe length
- mac_ce_len |= (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
- mac_subheader_len = 2;
- if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
- mac_ce_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
- mac_subheader_len = 3;
- }
- break;
-
- case DL_SCH_LCID_RECOMMENDED_BITRATE:
- // 38.321 Ch6.1.3.20
- mac_ce_len = 2;
- break;
- case DL_SCH_LCID_SP_ZP_CSI_RS_RES_SET_ACT:
- // 38.321 Ch6.1.3.19
- mac_ce_len = 2;
- break;
- case DL_SCH_LCID_PUCCH_SPATIAL_RELATION_ACT:
- // 38.321 Ch6.1.3.18
- mac_ce_len = 3;
- break;
- case DL_SCH_LCID_SP_CSI_REP_PUCCH_ACT:
- // 38.321 Ch6.1.3.16
- mac_ce_len = 2;
- break;
- case DL_SCH_LCID_TCI_STATE_IND_UE_SPEC_PDCCH:
- // 38.321 Ch6.1.3.15
- mac_ce_len = 2;
- break;
- case DL_SCH_LCID_DUPLICATION_ACT:
- // 38.321 Ch6.1.3.11
- mac_ce_len = 1;
- break;
- case DL_SCH_LCID_SCell_ACT_4_OCT:
- // 38.321 Ch6.1.3.10
- mac_ce_len = 4;
- break;
- case DL_SCH_LCID_SCell_ACT_1_OCT:
- // 38.321 Ch6.1.3.10
- mac_ce_len = 1;
- break;
- case DL_SCH_LCID_L_DRX:
- // 38.321 Ch6.1.3.6
- // fixed length but not yet specify.
- mac_ce_len = 0;
- break;
- case DL_SCH_LCID_DRX:
- // 38.321 Ch6.1.3.5
- // fixed length but not yet specify.
- mac_ce_len = 0;
- break;
- case DL_SCH_LCID_TA_COMMAND:
- // 38.321 Ch6.1.3.4
- mac_ce_len = 1;
-
- /*uint8_t ta_command = ((NR_MAC_CE_TA *)pduP)[1].TA_COMMAND;
- uint8_t tag_id = ((NR_MAC_CE_TA *)pduP)[1].TAGID;*/
-
- ul_time_alignment->apply_ta = 1;
- ul_time_alignment->ta_command = ((NR_MAC_CE_TA *)pduP)[1].TA_COMMAND;
- ul_time_alignment->tag_id = ((NR_MAC_CE_TA *)pduP)[1].TAGID;
-
- /*
- #ifdef DEBUG_HEADER_PARSING
- LOG_D(MAC, "[UE] CE %d : UE Timing Advance : %d\n", i, pduP[1]);
- #endif
- */
-
- LOG_D(MAC, "[%d.%d] Received TA_COMMAND %u TAGID %u CC_id %d\n", frameP, slot, ul_time_alignment->ta_command, ul_time_alignment->tag_id, CC_id);
-
- break;
- case DL_SCH_LCID_CON_RES_ID:
- // Clause 5.1.5 and 6.1.3.3 of 3GPP TS 38.321 version 16.2.1 Release 16
- // MAC Header: 1 byte (R/R/LCID)
- // MAC SDU: 6 bytes (UE Contention Resolution Identity)
- mac_ce_len = 6;
-
- if(ra->ra_state == WAIT_CONTENTION_RESOLUTION) {
- LOG_I(MAC, "[UE %d][RAPROC] Frame %d : received contention resolution identity: 0x%02x%02x%02x%02x%02x%02x Terminating RA procedure\n",
- module_idP, frameP, pduP[1], pduP[2], pduP[3], pduP[4], pduP[5], pduP[6]);
-
- bool ra_success = true;
- for(int i = 0; i<mac_ce_len; i++) {
- if(ra->cont_res_id[i] != pduP[i+1]) {
- ra_success = false;
- break;
- }
- }
-
- if ( (ra->RA_active == 1) && ra_success) {
- nr_ra_succeeded(module_idP, frameP, slot);
- } else if (!ra_success){
- // TODO: Handle failure of RA procedure @ MAC layer
- // nr_ra_failed(module_idP, CC_id, prach_resources, frameP, slot); // prach_resources is a PHY structure
- ra->ra_state = RA_UE_IDLE;
- ra->RA_active = 0;
- }
- }
+ /*uint8_t ta_command = ((NR_MAC_CE_TA *)pduP)[1].TA_COMMAND;
+ uint8_t tag_id = ((NR_MAC_CE_TA *)pduP)[1].TAGID;*/
+
+ ul_time_alignment->apply_ta = 1;
+ ul_time_alignment->ta_command = ((NR_MAC_CE_TA *)pduP)[1].TA_COMMAND;
+ ul_time_alignment->tag_id = ((NR_MAC_CE_TA *)pduP)[1].TAGID;
+ /*
+ #ifdef DEBUG_HEADER_PARSING
+ LOG_D(MAC, "[UE] CE %d : UE Timing Advance : %d\n", i, pduP[1]);
+ #endif
+ */
+
+ LOG_D(MAC, "[%d.%d] Received TA_COMMAND %u TAGID %u CC_id %d\n", frameP, slot, ul_time_alignment->ta_command, ul_time_alignment->tag_id, CC_id);
+
+ break;
+ case DL_SCH_LCID_CON_RES_ID:
+ // Clause 5.1.5 and 6.1.3.3 of 3GPP TS 38.321 version 16.2.1 Release 16
+ // MAC Header: 1 byte (R/R/LCID)
+ // MAC SDU: 6 bytes (UE Contention Resolution Identity)
+ mac_ce_len = 6;
+
+ if(ra->ra_state == WAIT_CONTENTION_RESOLUTION) {
+ LOG_I(MAC, "[UE %d][RAPROC] Frame %d : received contention resolution identity: 0x%02x%02x%02x%02x%02x%02x Terminating RA procedure\n",
+ module_idP, frameP, pduP[1], pduP[2], pduP[3], pduP[4], pduP[5], pduP[6]);
+
+ bool ra_success = true;
+ for(int i = 0; i<mac_ce_len; i++) {
+ if(ra->cont_res_id[i] != pduP[i+1]) {
+ ra_success = false;
break;
- case DL_SCH_LCID_PADDING:
- done = 1;
- // end of MAC PDU, can ignore the rest.
- break;
-
- // MAC SDU
-
- case DL_SCH_LCID_DCCH:
- // check if LCID is valid at current time.
-
- case DL_SCH_LCID_DCCH1:
- // check if LCID is valid at current time.
-
- default:
- // check if LCID is valid at current time.
- if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
- //mac_sdu_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
- mac_subheader_len = 3;
- mac_sdu_len = ((uint16_t)(((NR_MAC_SUBHEADER_LONG *) pduP)->L1 & 0x7f) << 8)
- | ((uint16_t)((NR_MAC_SUBHEADER_LONG *) pduP)->L2 & 0xff);
-
- } else {
- mac_sdu_len = (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
- mac_subheader_len = 2;
- }
-
- LOG_D(MAC, "[UE %d] Frame %d : DLSCH -> DL-DTCH %d (gNB %d, %d bytes)\n", module_idP, frameP, rx_lcid, gNB_index, mac_sdu_len);
-
- #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
- LOG_T(MAC, "[UE %d] First 32 bytes of DLSCH : \n", module_idP);
-
- for (i = 0; i < 32; i++)
- LOG_T(MAC, "%x.", (pduP + mac_subheader_len)[i]);
-
- LOG_T(MAC, "\n");
- #endif
-
-// if (IS_SOFTMODEM_NOS1){
- if (rx_lcid < NB_RB_MAX && rx_lcid >= DL_SCH_LCID_DCCH) {
-
- mac_rlc_data_ind(module_idP,
- mac->crnti,
- gNB_index,
- frameP,
- ENB_FLAG_NO,
- MBMS_FLAG_NO,
- rx_lcid,
- (char *) (pduP + mac_subheader_len),
- mac_sdu_len,
- 1,
- NULL);
- } else {
- LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (gNB %d)\n", module_idP, frameP, rx_lcid, gNB_index);
- }
-// }
+ }
+ }
- break;
+ if ( (ra->RA_active == 1) && ra_success) {
+ nr_ra_succeeded(module_idP, frameP, slot);
+ } else if (!ra_success){
+ // TODO: Handle failure of RA procedure @ MAC layer
+ // nr_ra_failed(module_idP, CC_id, prach_resources, frameP, slot); // prach_resources is a PHY structure
+ ra->ra_state = RA_UE_IDLE;
+ ra->RA_active = 0;
+ }
+ }
+ break;
+ case DL_SCH_LCID_PADDING:
+ done = 1;
+ // end of MAC PDU, can ignore the rest.
+ break;
+ // MAC SDU
+ case DL_SCH_LCID_DCCH:
+ // check if LCID is valid at current time.
+ case DL_SCH_LCID_DCCH1:
+ // check if LCID is valid at current time.
+ default:
+ // check if LCID is valid at current time.
+ if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
+ //mac_sdu_len |= (uint16_t)(((NR_MAC_SUBHEADER_LONG *)pduP)->L2)<<8;
+ mac_subheader_len = 3;
+ mac_sdu_len = ((uint16_t)(((NR_MAC_SUBHEADER_LONG *) pduP)->L1 & 0x7f) << 8)
+ | ((uint16_t)((NR_MAC_SUBHEADER_LONG *) pduP)->L2 & 0xff);
+
+ } else {
+ mac_sdu_len = (uint16_t)((NR_MAC_SUBHEADER_SHORT *)pduP)->L;
+ mac_subheader_len = 2;
}
- pduP += ( mac_subheader_len + mac_ce_len + mac_sdu_len );
- pdu_len -= ( mac_subheader_len + mac_ce_len + mac_sdu_len );
- if (pdu_len < 0)
- LOG_E(MAC, "[UE %d][%d.%d] nr_ue_process_mac_pdu, residual mac pdu length %d < 0!\n", module_idP, frameP, slot, pdu_len);
+
+ LOG_D(MAC, "[UE %d] Frame %d : DLSCH -> DL-DTCH %d (gNB %d, %d bytes)\n", module_idP, frameP, rx_lcid, gNB_index, mac_sdu_len);
+
+ #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+ LOG_T(MAC, "[UE %d] First 32 bytes of DLSCH : \n", module_idP);
+
+ for (i = 0; i < 32; i++)
+ LOG_T(MAC, "%x.", (pduP + mac_subheader_len)[i]);
+
+ LOG_T(MAC, "\n");
+ #endif
+
+ if (rx_lcid < NB_RB_MAX && rx_lcid >= DL_SCH_LCID_DCCH) {
+
+ mac_rlc_data_ind(module_idP,
+ mac->crnti,
+ gNB_index,
+ frameP,
+ ENB_FLAG_NO,
+ MBMS_FLAG_NO,
+ rx_lcid,
+ (char *) (pduP + mac_subheader_len),
+ mac_sdu_len,
+ 1,
+ NULL);
+ } else {
+ LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (gNB %d)\n", module_idP, frameP, rx_lcid, gNB_index);
+ }
+
+ break;
+ }
+ pduP += ( mac_subheader_len + mac_ce_len + mac_sdu_len );
+ pdu_len -= ( mac_subheader_len + mac_ce_len + mac_sdu_len );
+ if (pdu_len < 0)
+ LOG_E(MAC, "[UE %d][%d.%d] nr_ue_process_mac_pdu, residual mac pdu length %d < 0!\n", module_idP, frameP, slot, pdu_len);
}
}
@@ -3581,6 +3576,12 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
module_id_t mod_id = dl_info->module_id;
frame_t frame = dl_info->frame;
int slot = dl_info->slot;
+
+ if(dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.ack_nack == 0) {
+ LOG_W(NR_MAC,"[UE %d][RAPROC][%d.%d] CRC check failed on RAR (NAK)\n", mod_id, frame, slot);
+ return 0;
+ }
+
int cc_id = dl_info->cc_id;
uint8_t gNB_id = dl_info->gNB_index;
NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
@@ -3642,43 +3643,43 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
unsigned char csi_req;
#endif
- // TA command
- ul_time_alignment->apply_ta = 1;
- ul_time_alignment->ta_command = 31 + rar->TA2 + (rar->TA1 << 5);
+ // TA command
+ ul_time_alignment->apply_ta = 1;
+ ul_time_alignment->ta_command = 31 + rar->TA2 + (rar->TA1 << 5);
#ifdef DEBUG_RAR
- // CSI
- csi_req = (unsigned char) (rar->UL_GRANT_4 & 0x01);
+ // CSI
+ csi_req = (unsigned char) (rar->UL_GRANT_4 & 0x01);
#endif
- // TPC
- tpc_command = (unsigned char) ((rar->UL_GRANT_4 >> 1) & 0x07);
- switch (tpc_command){
- case 0:
- ra->Msg3_TPC = -6;
- break;
- case 1:
- ra->Msg3_TPC = -4;
- break;
- case 2:
- ra->Msg3_TPC = -2;
- break;
- case 3:
- ra->Msg3_TPC = 0;
- break;
- case 4:
- ra->Msg3_TPC = 2;
- break;
- case 5:
- ra->Msg3_TPC = 4;
- break;
- case 6:
- ra->Msg3_TPC = 6;
- break;
- case 7:
- ra->Msg3_TPC = 8;
- break;
- }
+ // TPC
+ tpc_command = (unsigned char) ((rar->UL_GRANT_4 >> 1) & 0x07);
+ switch (tpc_command){
+ case 0:
+ ra->Msg3_TPC = -6;
+ break;
+ case 1:
+ ra->Msg3_TPC = -4;
+ break;
+ case 2:
+ ra->Msg3_TPC = -2;
+ break;
+ case 3:
+ ra->Msg3_TPC = 0;
+ break;
+ case 4:
+ ra->Msg3_TPC = 2;
+ break;
+ case 5:
+ ra->Msg3_TPC = 4;
+ break;
+ case 6:
+ ra->Msg3_TPC = 6;
+ break;
+ case 7:
+ ra->Msg3_TPC = 8;
+ break;
+ }
// MCS
rar_grant.mcs = (unsigned char) (rar->UL_GRANT_4 >> 4);
// time alloc
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
index 659bf37371758aae5644177b6889072779c8fed8..66ba476f4b021e233f5c734600ba38000e12349b 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
@@ -738,7 +738,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
return -1;
}
/* TIME_DOM_RESOURCE_ASSIGNMENT */
- if (nr_ue_process_dci_time_dom_resource_assignment(mac, pusch_config_pdu, NULL, dci->time_domain_assignment.val,false) < 0) {
+ if (nr_ue_process_dci_time_dom_resource_assignment(mac, pusch_config_pdu, NULL, dci->time_domain_assignment.val,0,false) < 0) {
return -1;
}
@@ -867,8 +867,6 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
// 3. TODO: Perform PHR procedures
NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_indication_t *ul_info){
- uint32_t search_space_mask = 0;
-
if (dl_info){
module_id_t mod_id = dl_info->module_id;
@@ -879,90 +877,11 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
fapi_nr_dl_config_request_t *dl_config = &mac->dl_config_request;
+
nr_scheduled_response_t scheduled_response;
nr_dcireq_t dcireq;
- // check type0 from 38.213 13 if we have no CellGroupConfig
- // TODO: implementation to be completed
- LOG_D(NR_MAC,"nr_ue_scheduler(): mac->cg %p\n",mac->cg);
- if (mac->cg == NULL) {
- if(dl_info->ssb_index != -1){
-
- if(mac->type0_pdcch_ss_mux_pattern == 1){
- // 38.213 chapter 13
- if((mac->type0_pdcch_ss_sfn_c == SFN_C_MOD_2_EQ_0) && !(rx_frame & 0x1) && (rx_slot == mac->type0_pdcch_ss_n_c)){
- search_space_mask = search_space_mask | type0_pdcch;
- mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_dci_config.coreset.duration;
- }
- if((mac->type0_pdcch_ss_sfn_c == SFN_C_MOD_2_EQ_1) && (rx_frame & 0x1) && (rx_slot == mac->type0_pdcch_ss_n_c)){
- search_space_mask = search_space_mask | type0_pdcch;
- mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_dci_config.coreset.duration;
- }
- }
- if(mac->type0_pdcch_ss_mux_pattern == 2){
- // 38.213 Table 13-13, 13-14
- if((rx_frame == get_ssb_frame(rx_frame)) && (rx_slot == mac->type0_pdcch_ss_n_c)){
- search_space_mask = search_space_mask | type0_pdcch;
- mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_dci_config.coreset.duration;
- }
- }
- if(mac->type0_pdcch_ss_mux_pattern == 3){
- // 38.213 Table 13-15
- if((rx_frame == get_ssb_frame(rx_frame)) && (rx_slot == mac->type0_pdcch_ss_n_c)){
- search_space_mask = search_space_mask | type0_pdcch;
- mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_dci_config.coreset.duration;
- }
- }
- } // ssb_index != -1
-
- // Type0 PDCCH search space
- if((search_space_mask & type0_pdcch) || ( mac->type0_pdcch_consecutive_slots != 0 )){
- mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_consecutive_slots - 1;
-
- dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15 = mac->type0_pdcch_dci_config;
- dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DCI;
-
- /*
- dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15.rnti = 0xaaaa; // to be set
- dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15.N_RB_BWP = 106; // to be set
-
- LOG_I(NR_MAC,"nr_ue_scheduler Type0 PDCCH with rnti %x, BWP %d\n",
- dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15.rnti,
- dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15.N_RB_BWP);
- */
- NR_SearchSpace_t *ss0 = mac->search_space_zero;
- fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15;
-
-
- if( mac->scc == NULL && mac->scc_SIB == NULL && (rx_frame%2 == mac->type0_PDCCH_CSS_config.sfn_c) && (rx_slot == mac->type0_PDCCH_CSS_config.n_0) ){
- rel15->num_dci_options = 1;
- rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
- config_dci_pdu(mac, rel15, dl_config, NR_RNTI_SI, -1);
- fill_dci_search_candidates(ss0, rel15);
- dl_config->number_pdus = 1;
- LOG_D(NR_MAC,"Calling fill_scheduled_response, type0_pdcch, num_pdus %d\n",dl_config->number_pdus);
- fill_scheduled_response(&scheduled_response, dl_config, NULL, NULL, mod_id, cc_id, rx_frame, rx_slot, dl_info->thread_id);
- if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL)
- mac->if_module->scheduled_response(&scheduled_response);
- }
- // this is for Msg2/Msg4
- if (mac->ra.ra_state >= WAIT_RAR) {
- rel15->num_dci_options = mac->ra.ra_state == WAIT_RAR ? 1 : 2;
- rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
- if (mac->ra.ra_state == WAIT_CONTENTION_RESOLUTION)
- rel15->dci_format_options[1] = NR_UL_DCI_FORMAT_0_0; // msg3 retransmission
- config_dci_pdu(mac, rel15, dl_config, mac->ra.ra_state == WAIT_RAR ? NR_RNTI_RA : NR_RNTI_TC , -1);
- fill_dci_search_candidates(ss0, rel15);
- dl_config->number_pdus = 1;
- LOG_D(NR_MAC,"mac->cg %p: Calling fill_scheduled_response rnti %x, type0_pdcch, num_pdus %d frame %d slot %d\n",
- mac->cg,rel15->rnti,dl_config->number_pdus,rx_frame,rx_slot);
- fill_scheduled_response(&scheduled_response, dl_config, NULL, NULL, mod_id, cc_id, rx_frame, rx_slot, dl_info->thread_id);
- if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL)
- mac->if_module->scheduled_response(&scheduled_response);
- }
- }
- } else { // we have a Master or Secondary CellGroupConfig
-
+ if(mac->cg != NULL){ // we have a cg
dcireq.module_id = mod_id;
dcireq.gNB_index = gNB_index;
dcireq.cc_id = cc_id;
@@ -972,23 +891,25 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
nr_ue_dcireq(&dcireq); //to be replaced with function pointer later
fill_scheduled_response(&scheduled_response, &dcireq.dl_config_req, NULL, NULL, mod_id, cc_id, rx_frame, rx_slot, dl_info->thread_id);
- if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL){
+ if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL)
mac->if_module->scheduled_response(&scheduled_response);
+ }
+ else {
+ // this is for Msg2/Msg4
+ if (mac->ra.ra_state >= WAIT_RAR) {
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15;
+ rel15->num_dci_options = mac->ra.ra_state == WAIT_RAR ? 1 : 2;
+ rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
+ if (mac->ra.ra_state == WAIT_CONTENTION_RESOLUTION)
+ rel15->dci_format_options[1] = NR_UL_DCI_FORMAT_0_0; // msg3 retransmission
+ config_dci_pdu(mac, rel15, dl_config, mac->ra.ra_state == WAIT_RAR ? NR_RNTI_RA : NR_RNTI_TC , -1);
+ fill_dci_search_candidates(mac->ra.ss, rel15);
+ dl_config->number_pdus = 1;
+ LOG_D(MAC,"mac->cg %p: Calling fill_scheduled_response rnti %x, type0_pdcch, num_pdus %d\n",mac->cg,rel15->rnti,dl_config->number_pdus);
+ fill_scheduled_response(&scheduled_response, dl_config, NULL, NULL, mod_id, cc_id, rx_frame, rx_slot, dl_info->thread_id);
+ if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL)
+ mac->if_module->scheduled_response(&scheduled_response);
}
-
- /*
- if(search_space_mask & type0a_pdcch){
- }
-
- if(search_space_mask & type1_pdcch){
- }
-
- if(search_space_mask & type2_pdcch){
- }
-
- if(search_space_mask & type3_pdcch){
- }
- */
}
} else if (ul_info) {
@@ -1022,12 +943,11 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
if (ulcfg_pdu->pdu_type == FAPI_NR_UL_CONFIG_TYPE_PUSCH) {
uint16_t TBS_bytes = ulcfg_pdu->pusch_config_pdu.pusch_data.tb_size;
- LOG_D(NR_MAC,"harq_id %d, NDI %d NDI_DCI %d, TBS_bytes %d (ra_state %d)\n",
+ LOG_D(NR_MAC,"harq_id %d, NDI %d NDI_DCI %d, TBS_bytes %d\n",
ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id,
mac->UL_ndi[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id],
ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator,
- TBS_bytes,
- ra->ra_state);
+ TBS_bytes);
if (ra->ra_state == WAIT_RAR && !ra->cfra){
memcpy(ulsch_input_buffer, mac->ulsch_pdu.payload, TBS_bytes);
LOG_D(NR_MAC,"[RAPROC] Msg3 to be transmitted:\n");
@@ -1036,11 +956,14 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
}
LOG_D(NR_MAC,"Flipping NDI for harq_id %d (Msg3)\n",ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator);
mac->UL_ndi[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id] = ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator;
- mac->first_ul_tx[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id] = 0;
+ mac->first_ul_tx[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id] = 0;
} else {
- if ( (mac->UL_ndi[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id] != ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator ||
- mac->first_ul_tx[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id]==1)){
+ if ((mac->UL_ndi[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id] != ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator ||
+ mac->first_ul_tx[ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id]==1) &&
+ ((get_softmodem_params()->phy_test == 1) ||
+ (ra->ra_state == RA_SUCCEEDED) ||
+ (ra->ra_state == WAIT_RAR && ra->cfra))){
// Getting IP traffic to be transmitted
nr_ue_get_sdu(mod_id, frame_tx, slot_tx, gNB_index, ulsch_input_buffer, TBS_bytes);
@@ -1222,11 +1145,12 @@ static void build_ro_list(NR_UE_MAC_INST_t *mac) {
// WIP: For now assume no rejected PRACH occasions because of conflict with SSB or TDD_UL_DL_ConfigurationCommon schedule
int unpaired = mac->phy_config.config_req.cell_config.frame_duplex_type;
- // Identify the proper PRACH Configuration Index table according to the operating frequency
- LOG_D(NR_MAC,"mu = %u, PRACH config index = %u, unpaired = %u\n", mu, config_index, unpaired);
prach_config_info_p = get_prach_config_info(mac->frequency_range, config_index, unpaired);
+ // Identify the proper PRACH Configuration Index table according to the operating frequency
+ LOG_D(NR_MAC,"mu = %u, PRACH config index = %u, unpaired = %u\n", mu, config_index, unpaired);
+
if (mac->frequency_range == FR2) { //FR2
x = prach_config_info_p[2];
@@ -1357,57 +1281,57 @@ static void build_ssb_list(NR_UE_MAC_INST_t *mac) {
if (mac->scc) {
NR_ServingCellConfigCommon_t *scc = mac->scc;
switch (scc->ssb_PositionsInBurst->present) {
- case NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_shortBitmap:
- ssb_bitmap = &scc->ssb_PositionsInBurst->choice.shortBitmap;
-
- ssb_positionsInBurst = BIT_STRING_to_uint8(ssb_bitmap);
- LOG_D(NR_MAC,"SSB config: SSB_positions_in_burst 0x%lx\n", ssb_positionsInBurst);
-
- for (uint8_t bit_nb=3; bit_nb<=3; bit_nb--) {
- // If SSB is transmitted
- if ((ssb_positionsInBurst>>bit_nb) & 0x01) {
- ssb_list.nb_tx_ssb++;
- ssb_list.tx_ssb[ssb_idx].transmitted = true;
- LOG_D(NR_MAC,"SSB idx %d transmitted\n", ssb_idx);
+ case NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_shortBitmap:
+ ssb_bitmap = &scc->ssb_PositionsInBurst->choice.shortBitmap;
+
+ ssb_positionsInBurst = BIT_STRING_to_uint8(ssb_bitmap);
+ LOG_D(NR_MAC,"SSB config: SSB_positions_in_burst 0x%lx\n", ssb_positionsInBurst);
+
+ for (uint8_t bit_nb=3; bit_nb<=3; bit_nb--) {
+ // If SSB is transmitted
+ if ((ssb_positionsInBurst>>bit_nb) & 0x01) {
+ ssb_list.nb_tx_ssb++;
+ ssb_list.tx_ssb[ssb_idx].transmitted = true;
+ LOG_D(NR_MAC,"SSB idx %d transmitted\n", ssb_idx);
+ }
+ ssb_idx++;
}
- ssb_idx++;
- }
- break;
- case NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_mediumBitmap:
- ssb_bitmap = &scc->ssb_PositionsInBurst->choice.mediumBitmap;
-
- ssb_positionsInBurst = BIT_STRING_to_uint8(ssb_bitmap);
- LOG_D(NR_MAC,"SSB config: SSB_positions_in_burst 0x%lx\n", ssb_positionsInBurst);
-
- for (uint8_t bit_nb=7; bit_nb<=7; bit_nb--) {
- // If SSB is transmitted
- if ((ssb_positionsInBurst>>bit_nb) & 0x01) {
- ssb_list.nb_tx_ssb++;
- ssb_list.tx_ssb[ssb_idx].transmitted = true;
- LOG_D(NR_MAC,"SSB idx %d transmitted\n", ssb_idx);
+ break;
+ case NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_mediumBitmap:
+ ssb_bitmap = &scc->ssb_PositionsInBurst->choice.mediumBitmap;
+
+ ssb_positionsInBurst = BIT_STRING_to_uint8(ssb_bitmap);
+ LOG_D(NR_MAC,"SSB config: SSB_positions_in_burst 0x%lx\n", ssb_positionsInBurst);
+
+ for (uint8_t bit_nb=7; bit_nb<=7; bit_nb--) {
+ // If SSB is transmitted
+ if ((ssb_positionsInBurst>>bit_nb) & 0x01) {
+ ssb_list.nb_tx_ssb++;
+ ssb_list.tx_ssb[ssb_idx].transmitted = true;
+ LOG_D(NR_MAC,"SSB idx %d transmitted\n", ssb_idx);
+ }
+ ssb_idx++;
}
- ssb_idx++;
- }
- break;
- case NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_longBitmap:
- ssb_bitmap = &scc->ssb_PositionsInBurst->choice.longBitmap;
-
- ssb_positionsInBurst = BIT_STRING_to_uint64(ssb_bitmap);
- LOG_D(NR_MAC,"SSB config: SSB_positions_in_burst 0x%lx\n", ssb_positionsInBurst);
-
- for (uint8_t bit_nb=63; bit_nb<=63; bit_nb--) {
- // If SSB is transmitted
- if ((ssb_positionsInBurst>>bit_nb) & 0x01) {
- ssb_list.nb_tx_ssb++;
- ssb_list.tx_ssb[ssb_idx].transmitted = true;
- LOG_D(NR_MAC,"SSB idx %d transmitted\n", ssb_idx);
+ break;
+ case NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_longBitmap:
+ ssb_bitmap = &scc->ssb_PositionsInBurst->choice.longBitmap;
+
+ ssb_positionsInBurst = BIT_STRING_to_uint64(ssb_bitmap);
+ LOG_D(NR_MAC,"SSB config: SSB_positions_in_burst 0x%lx\n", ssb_positionsInBurst);
+
+ for (uint8_t bit_nb=63; bit_nb<=63; bit_nb--) {
+ // If SSB is transmitted
+ if ((ssb_positionsInBurst>>bit_nb) & 0x01) {
+ ssb_list.nb_tx_ssb++;
+ ssb_list.tx_ssb[ssb_idx].transmitted = true;
+ LOG_D(NR_MAC,"SSB idx %d transmitted\n", ssb_idx);
+ }
+ ssb_idx++;
}
- ssb_idx++;
- }
- break;
- default:
- AssertFatal(false,"ssb_PositionsInBurst not present\n");
- break;
+ break;
+ default:
+ AssertFatal(false,"ssb_PositionsInBurst not present\n");
+ break;
}
} else { // This is configuration from SIB1
@@ -1415,6 +1339,7 @@ static void build_ssb_list(NR_UE_MAC_INST_t *mac) {
ssb_bitmap = &mac->scc_SIB->ssb_PositionsInBurst.inOneGroup;
ssb_positionsInBurst = BIT_STRING_to_uint8(ssb_bitmap);
+
LOG_D(NR_MAC,"SSB config: SSB_positions_in_burst 0x%lx\n", ssb_positionsInBurst);
for (uint8_t bit_nb=7; bit_nb<=7; bit_nb--) {
@@ -1499,8 +1424,11 @@ static void map_ssb_to_ro(NR_UE_MAC_INST_t *mac) {
required_nb_of_prach_occasion = ssb_list.nb_tx_ssb * ssb_rach_ratio;
}
- AssertFatal(prach_assoc_pattern.prach_conf_period_list[0].nb_of_prach_occasion>0,"prach_assoc_pattern.prach_conf_period_list[0].nb_of_prach_occasion shouldn't be 0 (ssb_list.nb_tx_ssb %d, ssb_rach_ratio %d\n",ssb_list.nb_tx_ssb,ssb_rach_ratio);
- required_nb_of_prach_conf_period = ((required_nb_of_prach_occasion-1) + prach_assoc_pattern.prach_conf_period_list[0].nb_of_prach_occasion) / prach_assoc_pattern.prach_conf_period_list[0].nb_of_prach_occasion;
+ AssertFatal(prach_assoc_pattern.prach_conf_period_list[0].nb_of_prach_occasion>0,
+ "prach_assoc_pattern.prach_conf_period_list[0].nb_of_prach_occasion shouldn't be 0 (ssb_list.nb_tx_ssb %d, ssb_rach_ratio %d\n",
+ ssb_list.nb_tx_ssb,ssb_rach_ratio);
+ required_nb_of_prach_conf_period = ((required_nb_of_prach_occasion-1) + prach_assoc_pattern.prach_conf_period_list[0].nb_of_prach_occasion) /
+ prach_assoc_pattern.prach_conf_period_list[0].nb_of_prach_occasion;
if (required_nb_of_prach_conf_period == 1) {
prach_assoc_pattern.prach_association_period_list[0].nb_of_prach_conf_period = 1;
@@ -1585,7 +1513,9 @@ static void map_ssb_to_ro(NR_UE_MAC_INST_t *mac) {
ssb_list.tx_ssb[ssb_idx].nb_mapped_ro++;
AssertFatal(MAX_NB_RO_PER_SSB_IN_ASSOCIATION_PATTERN > ssb_list.tx_ssb[ssb_idx].nb_mapped_ro,"Too many mapped ROs (%d) to a single SSB\n", ssb_list.tx_ssb[ssb_idx].nb_mapped_ro);
- LOG_D(NR_MAC,"Mapped ssb_idx %u to RO slot-symbol %u-%u, %u-%u-%u/%u\n", ssb_idx, ro_p->slot, ro_p->start_symbol, slot, ro_in_time, ro_in_freq, prach_conf_period_p->prach_occasion_slot_map[frame][slot].nb_of_prach_occasion_in_freq);
+ LOG_D(NR_MAC,"Mapped ssb_idx %u to RO slot-symbol %u-%u, %u-%u-%u/%u\n",
+ ssb_idx, ro_p->slot, ro_p->start_symbol, slot, ro_in_time, ro_in_freq,
+ prach_conf_period_p->prach_occasion_slot_map[frame][slot].nb_of_prach_occasion_in_freq);
LOG_D(NR_MAC,"Nb mapped ROs for this ssb idx: in the association period only %u\n", ssb_list.tx_ssb[ssb_idx].nb_mapped_ro);
// If all the required SSBs are mapped to this RO, exit the loop of SSBs
@@ -1657,11 +1587,15 @@ static void map_ssb_to_ro(NR_UE_MAC_INST_t *mac) {
ro_p->nb_mapped_ssb = 1;
ssb_list.tx_ssb[ssb_idx].mapped_ro[ssb_list.tx_ssb[ssb_idx].nb_mapped_ro] = ro_p;
ssb_list.tx_ssb[ssb_idx].nb_mapped_ro++;
- AssertFatal(MAX_NB_RO_PER_SSB_IN_ASSOCIATION_PATTERN > ssb_list.tx_ssb[ssb_idx].nb_mapped_ro,"Too many mapped ROs (%d) to a single SSB\n", ssb_list.tx_ssb[ssb_idx].nb_mapped_ro);
+ AssertFatal(MAX_NB_RO_PER_SSB_IN_ASSOCIATION_PATTERN > ssb_list.tx_ssb[ssb_idx].nb_mapped_ro,"Too many mapped ROs (%d) to a single SSB\n",
+ ssb_list.tx_ssb[ssb_idx].nb_mapped_ro);
nb_mapped_ro_in_association_period++;
- LOG_D(NR_MAC,"Mapped ssb_idx %u to RO slot-symbol %u-%u, %u-%u-%u/%u\n", ssb_idx, ro_p->slot, ro_p->start_symbol, slot, ro_in_time, ro_in_freq, prach_conf_period_p->prach_occasion_slot_map[frame][slot].nb_of_prach_occasion_in_freq);
- LOG_D(NR_MAC,"Nb mapped ROs for this ssb idx: in the association period only %u / total %u\n", ssb_list.tx_ssb[ssb_idx].nb_mapped_ro, nb_mapped_ro_in_association_period);
+ LOG_D(NR_MAC,"Mapped ssb_idx %u to RO slot-symbol %u-%u, %u-%u-%u/%u\n",
+ ssb_idx, ro_p->slot, ro_p->start_symbol, slot, ro_in_time, ro_in_freq,
+ prach_conf_period_p->prach_occasion_slot_map[frame][slot].nb_of_prach_occasion_in_freq);
+ LOG_D(NR_MAC,"Nb mapped ROs for this ssb idx: in the association period only %u / total %u\n",
+ ssb_list.tx_ssb[ssb_idx].nb_mapped_ro, nb_mapped_ro_in_association_period);
// Exit the loop if this SSB has been mapped to all the required ROs
// WIP: Assuming that ssb_rach_ratio equals the maximum nb of times a given ssb_idx is mapped within an association period:
@@ -1726,7 +1660,8 @@ static int get_nr_prach_info_from_ssb_index(uint8_t ssb_idx,
ssb_info_p = &ssb_list.tx_ssb[ssb_idx];
LOG_D(NR_MAC,"checking for prach : ssb_info_p->nb_mapped_ro %d\n",ssb_info_p->nb_mapped_ro);
for (uint8_t n_mapped_ro=0; n_mapped_ro<ssb_info_p->nb_mapped_ro; n_mapped_ro++) {
- LOG_D(NR_MAC,"%d.%d: mapped_ro[%d]->frame.slot %d.%d, prach_assoc_pattern.nb_of_frame %d\n",frame,slot,n_mapped_ro,ssb_info_p->mapped_ro[n_mapped_ro]->frame,ssb_info_p->mapped_ro[n_mapped_ro]->slot,prach_assoc_pattern.nb_of_frame);
+ LOG_D(NR_MAC,"%d.%d: mapped_ro[%d]->frame.slot %d.%d, prach_assoc_pattern.nb_of_frame %d\n",
+ frame,slot,n_mapped_ro,ssb_info_p->mapped_ro[n_mapped_ro]->frame,ssb_info_p->mapped_ro[n_mapped_ro]->slot,prach_assoc_pattern.nb_of_frame);
if ((slot == ssb_info_p->mapped_ro[n_mapped_ro]->slot) &&
(ssb_info_p->mapped_ro[n_mapped_ro]->frame == (frame % prach_assoc_pattern.nb_of_frame))) {
@@ -1895,7 +1830,6 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
}
-
// This function schedules the PRACH according to prach_ConfigurationIndex and TS 38.211, tables 6.3.3.2.x
// PRACH formats 9, 10, 11 are corresponding to dual PRACH format configurations A1/B1, A2/B2, A3/B3.
// - todo:
@@ -2037,6 +1971,76 @@ void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t s
} // if is_nr_UL_slot
}
+// This function schedules the reception of SIB1 after initial sync and before going to real time state
+void nr_ue_sib1_scheduler(module_id_t module_idP,
+ int cc_id,
+ uint16_t ssb_start_symbol,
+ uint16_t frame,
+ uint8_t ssb_subcarrier_offset,
+ uint32_t ssb_index,
+ uint16_t ssb_start_subcarrier,
+ frequency_range_t frequency_range) {
+
+ NR_UE_MAC_INST_t *mac = get_mac_inst(module_idP);
+ nr_scheduled_response_t scheduled_response;
+ int frame_s,slot_s,ret;
+ fapi_nr_dl_config_request_t *dl_config = &mac->dl_config_request;
+ fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15;
+
+ uint8_t scs_ssb = get_softmodem_params()->numerology;
+ uint16_t ssb_offset_point_a = (ssb_start_subcarrier - ssb_subcarrier_offset)/12;
+
+ get_type0_PDCCH_CSS_config_parameters(&mac->type0_PDCCH_CSS_config,
+ frame,
+ mac->mib,
+ nr_slots_per_frame[scs_ssb],
+ ssb_subcarrier_offset,
+ ssb_start_symbol,
+ scs_ssb,
+ frequency_range,
+ ssb_index,
+ 1, // If the UE is not configured with a periodicity, the UE assumes a periodicity of a half frame
+ ssb_offset_point_a);
+
+ if(mac->search_space_zero == NULL) mac->search_space_zero=calloc(1,sizeof(*mac->search_space_zero));
+ if(mac->coreset0 == NULL) mac->coreset0 = calloc(1,sizeof(*mac->coreset0));
+
+ for (int i=0; i<3; i++) { // loop over possible aggregation levels
+
+ fill_coresetZero(mac->coreset0, &mac->type0_PDCCH_CSS_config);
+ ret = fill_searchSpaceZero(mac->search_space_zero, &mac->type0_PDCCH_CSS_config,4<<i);
+ if (ret) {
+ rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15;
+ rel15->num_dci_options = 1;
+ rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
+ config_dci_pdu(mac, rel15, dl_config, NR_RNTI_SI, -1);
+ fill_dci_search_candidates(mac->search_space_zero, rel15);
+
+ if(mac->type0_PDCCH_CSS_config.type0_pdcch_ss_mux_pattern == 1){
+ // same frame as ssb
+ if ((mac->type0_PDCCH_CSS_config.frame & 0x1) == mac->type0_PDCCH_CSS_config.sfn_c)
+ frame_s = 0;
+ else
+ frame_s = 1;
+ slot_s = mac->type0_PDCCH_CSS_config.n_0;
+ }
+ else{
+ frame_s = 0; // same frame as ssb
+ slot_s = mac->type0_PDCCH_CSS_config.n_c;
+ }
+ LOG_D(MAC,"Calling fill_scheduled_response, type0_pdcch, num_pdus %d\n",dl_config->number_pdus);
+ fill_scheduled_response(&scheduled_response, dl_config, NULL, NULL, module_idP, cc_id, frame_s, slot_s, 0); // TODO fix thread_id, for now assumed 0
+ }
+ }
+ if (dl_config->number_pdus) {
+ if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL)
+ mac->if_module->scheduled_response(&scheduled_response);
+ }
+ else
+ AssertFatal(1==0,"Unable to find aggregation level for type0 CSS\n");
+}
+
+
#define MAX_LCID 8 // NR_MAX_NUM_LCID shall be used but the mac_rlc_data_req function can fetch data for max 8 LCID
/**
diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index f649f818c99ac6cf876419898b040956d576ce43..13a2cb48ddb2d08a2629cd0e268c49e883e89d5f 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -419,6 +419,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int ssb_SubcarrierOffset,
int pdsch_AntennaPorts,
int pusch_AntennaPorts,
+ int sib1_tda,
NR_ServingCellConfigCommon_t *scc,
int add_ue,
uint32_t rnti,
@@ -507,6 +508,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
if (get_softmodem_params()->sa > 0) {
NR_COMMON_channels_t *cc = &RC.nrmac[Mod_idP]->common_channels[0];
+ RC.nrmac[Mod_idP]->sib1_tda = sib1_tda;
for (int n=0;n<NR_NB_RA_PROC_MAX;n++ ) {
cc->ra[n].cfra = false;
cc->ra[n].rnti = 0;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index b55fee2af62513a07104696c077b6ed1d9ed91d9..7a3dfb190ffb0f1ee34241410d115c362499f930 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -786,12 +786,18 @@ void nr_generate_Msg3_retransmission(module_id_t module_idP, int CC_id, frame_t
NR_BWP_Downlink_t *bwp = NULL;
NR_ControlResourceSet_t *coreset = NULL;
+ NR_BWP_t *genericParameters = NULL;
if (ra->CellGroup &&
ra->CellGroup->spCellConfig &&
ra->CellGroup->spCellConfig->spCellConfigDedicated &&
ra->CellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList &&
- ra->CellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[ra->bwp_id-1])
+ ra->CellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[ra->bwp_id-1]) {
bwp = ra->CellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[ra->bwp_id-1];
+ genericParameters = &bwp->bwp_Common->genericParameters;
+ }
+ else {
+ genericParameters= &scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
+ }
if (*ss->controlResourceSetId == 0)
coreset = nr_mac->sched_ctrlCommon->coreset; // this is coreset 0
@@ -810,7 +816,7 @@ void nr_generate_Msg3_retransmission(module_id_t module_idP, int CC_id, frame_t
ul_dci_request_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdcch_pdu));
pdcch_pdu_rel15 = &ul_dci_request_pdu->pdcch_pdu.pdcch_pdu_rel15;
ul_dci_req->numPdus += 1;
- nr_configure_pdcch(pdcch_pdu_rel15, ss, coreset, scc, bwp);
+ nr_configure_pdcch(pdcch_pdu_rel15, ss, coreset, scc, genericParameters, NULL);
nr_mac->pdcch_pdu_idx[CC_id][ra->bwp_id][coresetid] = pdcch_pdu_rel15;
}
@@ -1211,7 +1217,7 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
dl_tti_pdcch_pdu->PDUSize = (uint8_t)(2 + sizeof(nfapi_nr_dl_tti_pdcch_pdu));
dl_req->nPDUs += 1;
pdcch_pdu_rel15 = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
- nr_configure_pdcch(pdcch_pdu_rel15, ss, coreset, scc, bwp);
+ nr_configure_pdcch(pdcch_pdu_rel15, ss, coreset, scc, genericParameters, NULL);
nr_mac->pdcch_pdu_idx[CC_id][bwpid][coresetid] = pdcch_pdu_rel15;
}
@@ -1421,11 +1427,15 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
long BWPSize = NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
long BWPStart = NRRIV2PRBOFFSET(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
+ /* get the PID of a HARQ process awaiting retrnasmission, or -1 otherwise */
+ int current_harq_pid = sched_ctrl->retrans_dl_harq.head;
// HARQ management
- AssertFatal(sched_ctrl->available_dl_harq.head >= 0,
- "UE context not initialized: no HARQ processes found\n");
- int current_harq_pid = sched_ctrl->available_dl_harq.head;
- remove_front_nr_list(&sched_ctrl->available_dl_harq);
+ if (current_harq_pid < 0) {
+ AssertFatal(sched_ctrl->available_dl_harq.head >= 0,
+ "UE context not initialized: no HARQ processes found\n");
+ current_harq_pid = sched_ctrl->available_dl_harq.head;
+ remove_front_nr_list(&sched_ctrl->available_dl_harq);
+ }
NR_UE_harq_t *harq = &sched_ctrl->harq_processes[current_harq_pid];
DevAssert(!harq->is_waiting);
add_tail_nr_list(&sched_ctrl->feedback_dl_harq, current_harq_pid);
@@ -1458,18 +1468,19 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
harq->feedback_slot = pucch->ul_slot;
harq->feedback_frame = pucch->frame;
- // Bytes to be transmitted
uint8_t *buf = (uint8_t *) harq->tb;
- uint16_t mac_pdu_length = nr_write_ce_dlsch_pdu(module_idP, nr_mac->sched_ctrlCommon, buf, 255, ra->cont_res_id);
- LOG_D(NR_MAC,"Encoded contention resolution mac_pdu_length %d\n",mac_pdu_length);
- uint16_t mac_sdu_length = mac_rrc_nr_data_req(module_idP, CC_id, frameP, CCCH, ra->rnti, 1, &buf[mac_pdu_length+2]);
- ((NR_MAC_SUBHEADER_SHORT *) &buf[mac_pdu_length])->R = 0;
- ((NR_MAC_SUBHEADER_SHORT *) &buf[mac_pdu_length])->F = 0;
- ((NR_MAC_SUBHEADER_SHORT *) &buf[mac_pdu_length])->LCID = DL_SCH_LCID_CCCH;
- ((NR_MAC_SUBHEADER_SHORT *) &buf[mac_pdu_length])->L = mac_sdu_length;
- mac_pdu_length = mac_pdu_length + mac_sdu_length + sizeof(NR_MAC_SUBHEADER_SHORT);
-
- LOG_D(NR_MAC,"Encoded RRCSetup Piggyback (%d + %d bytes), mac_pdu_length %d\n", mac_sdu_length, (int)sizeof(NR_MAC_SUBHEADER_SHORT), mac_pdu_length);
+ // Bytes to be transmitted
+ if (harq->round == 0) {
+ uint16_t mac_pdu_length = nr_write_ce_dlsch_pdu(module_idP, nr_mac->sched_ctrlCommon, buf, 255, ra->cont_res_id);
+ LOG_D(NR_MAC,"Encoded contention resolution mac_pdu_length %d\n",mac_pdu_length);
+ uint16_t mac_sdu_length = mac_rrc_nr_data_req(module_idP, CC_id, frameP, CCCH, ra->rnti, 1, &buf[mac_pdu_length+2]);
+ ((NR_MAC_SUBHEADER_SHORT *) &buf[mac_pdu_length])->R = 0;
+ ((NR_MAC_SUBHEADER_SHORT *) &buf[mac_pdu_length])->F = 0;
+ ((NR_MAC_SUBHEADER_SHORT *) &buf[mac_pdu_length])->LCID = DL_SCH_LCID_CCCH;
+ ((NR_MAC_SUBHEADER_SHORT *) &buf[mac_pdu_length])->L = mac_sdu_length;
+ ra->mac_pdu_length = mac_pdu_length + mac_sdu_length + sizeof(NR_MAC_SUBHEADER_SHORT);
+ LOG_D(NR_MAC,"Encoded RRCSetup Piggyback (%d + %d bytes), mac_pdu_length %d\n", mac_sdu_length, (int)sizeof(NR_MAC_SUBHEADER_SHORT), ra->mac_pdu_length);
+ }
// Calculate number of symbols
int startSymbolIndex, nrOfSymbols;
@@ -1530,12 +1541,15 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
harq->tb_size = nr_compute_tbs(nr_get_Qm_dl(mcsIndex, mcsTableIdx),
nr_get_code_rate_dl(mcsIndex, mcsTableIdx),
rbSize, nrOfSymbols, N_PRB_DMRS * N_DMRS_SLOT, 0, tb_scaling,1) >> 3;
- } while (rbStart + rbSize < BWPSize && !vrb_map[rbStart + rbSize] && harq->tb_size < mac_pdu_length);
+ } while (rbSize < BWPSize && harq->tb_size < ra->mac_pdu_length);
- for (int i = 0; (i < rbSize) && (rbStart <= (BWPSize - rbSize)); i++) {
+ int i = 0;
+ while ((i < rbSize) && (rbStart + rbSize <= BWPSize)) {
if (vrb_map[rbStart + i]) {
- rbStart += i;
+ rbStart += i+1;
i = 0;
+ } else {
+ i++;
}
}
@@ -1564,7 +1578,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
dl_tti_pdcch_pdu->PDUSize = (uint8_t)(2 + sizeof(nfapi_nr_dl_tti_pdcch_pdu));
dl_req->nPDUs += 1;
pdcch_pdu_rel15 = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
- nr_configure_pdcch(pdcch_pdu_rel15, ss, coreset, scc, bwp);
+ nr_configure_pdcch(pdcch_pdu_rel15, ss, coreset, scc, genericParameters, NULL);
nr_mac->pdcch_pdu_idx[CC_id][bwpid][coresetid] = pdcch_pdu_rel15;
}
@@ -1681,11 +1695,11 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
bwpid);
// Add padding header and zero rest out if there is space left
- if (mac_pdu_length < harq->tb_size) {
- NR_MAC_SUBHEADER_FIXED *padding = (NR_MAC_SUBHEADER_FIXED *) &buf[mac_pdu_length];
+ if (ra->mac_pdu_length < harq->tb_size) {
+ NR_MAC_SUBHEADER_FIXED *padding = (NR_MAC_SUBHEADER_FIXED *) &buf[ra->mac_pdu_length];
padding->R = 0;
padding->LCID = DL_SCH_LCID_PADDING;
- for(int k = mac_pdu_length+1; k<harq->tb_size; k++) {
+ for(int k = ra->mac_pdu_length+1; k<harq->tb_size; k++) {
buf[k] = 0;
}
}
@@ -1736,24 +1750,32 @@ void nr_check_Msg4_Ack(module_id_t module_id, int CC_id, frame_t frame, sub_fram
NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
NR_UE_harq_t *harq = &UE_info->UE_sched_ctrl[UE_id].harq_processes[current_harq_pid];
+ NR_mac_stats_t *stats = &UE_info->mac_stats[UE_id];
LOG_D(NR_MAC, "ue %d, rnti %d, harq is waiting %d, round %d, frame %d %d, harq id %d\n", UE_id, ra->rnti, harq->is_waiting, harq->round, frame, slot, current_harq_pid);
- if (harq->is_waiting == 0)
- {
- if (harq->round == 0)
- {
- LOG_I(NR_MAC, "(ue %i, rnti 0x%04x) Received Ack of RA-Msg4. CBRA procedure succeeded!\n", UE_id, ra->rnti);
- nr_clear_ra_proc(module_id, CC_id, frame, ra);
- UE_info->active[UE_id] = true;
- UE_info->Msg4_ACKed[UE_id] = true;
+ if (harq->is_waiting == 0) {
+ if (harq->round == 0) {
+ if (stats->dlsch_errors == 0) {
+ LOG_I(NR_MAC, "(ue %i, rnti 0x%04x) Received Ack of RA-Msg4. CBRA procedure succeeded!\n", UE_id, ra->rnti);
+ nr_clear_ra_proc(module_id, CC_id, frame, ra);
+ UE_info->active[UE_id] = true;
+ UE_info->Msg4_ACKed[UE_id] = true;
+ }
+ else {
+ LOG_I(NR_MAC, "(ue %i, rnti 0x%04x) RA Procedure failed at Msg4!\n", UE_id, ra->rnti);
+ nr_mac_remove_ra_rnti(module_id, ra->rnti);
+ nr_clear_ra_proc(module_id, CC_id, frame, ra);
+ mac_remove_nr_ue(module_id, ra->rnti);
+ }
}
- else
- {
+ else {
+ LOG_I(NR_MAC, "(ue %i, rnti 0x%04x) Received Nack of RA-Msg4. Preparing retransmission!\n", UE_id, ra->rnti);
+ ra->Msg4_frame = (frame + 1) % 1024;
+ ra->Msg4_slot = 1;
ra->state = Msg4;
}
}
-
}
void nr_clear_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP, NR_RA_t *ra){
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
index fbd08f18c48297f04f2e54f2ca4e2aa1de161b81..b74432b2ae1462d707a325e36266a9dc6c558f71 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
@@ -220,6 +220,7 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
scs,
FR1,
i_ssb,
+ ssb_frame_periodicity,
offset_pointa);
gNB->type0_PDCCH_CSS_config[i_ssb].active = true;
}
@@ -246,6 +247,7 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
scs,
FR1,
i_ssb,
+ ssb_frame_periodicity,
offset_pointa);
gNB->type0_PDCCH_CSS_config[i_ssb].active = true;
}
@@ -280,6 +282,7 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
scs,
FR2,
i_ssb,
+ ssb_frame_periodicity,
offset_pointa);
gNB->type0_PDCCH_CSS_config[i_ssb].active = true;
}
@@ -313,40 +316,43 @@ void fill_ssb_vrb_map (NR_COMMON_channels_t *cc, int rbStart, uint16_t symStart
}
-void schedule_control_sib1(module_id_t module_id,
- int CC_id,
- NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config,
- int time_domain_allocation,
- uint8_t mcsTableIdx,
- uint8_t mcs,
- uint8_t candidate_idx,
- int num_total_bytes) {
+uint32_t schedule_control_sib1(module_id_t module_id,
+ int CC_id,
+ NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config,
+ int time_domain_allocation,
+ int startSymbolIndex,
+ int nrOfSymbols,
+ uint16_t dlDmrsSymbPos,
+ uint8_t candidate_idx,
+ int num_total_bytes) {
gNB_MAC_INST *gNB_mac = RC.nrmac[module_id];
- NR_ServingCellConfigCommon_t *servingcellconfigcommon = gNB_mac->common_channels[CC_id].ServingCellConfigCommon;
uint16_t *vrb_map = RC.nrmac[module_id]->common_channels[CC_id].vrb_map;
+ int ret;
if (gNB_mac->sched_ctrlCommon == NULL){
LOG_D(NR_MAC,"schedule_control_common: Filling nr_mac->sched_ctrlCommon\n");
gNB_mac->sched_ctrlCommon = calloc(1,sizeof(*gNB_mac->sched_ctrlCommon));
gNB_mac->sched_ctrlCommon->search_space = calloc(1,sizeof(*gNB_mac->sched_ctrlCommon->search_space));
gNB_mac->sched_ctrlCommon->coreset = calloc(1,sizeof(*gNB_mac->sched_ctrlCommon->coreset));
- gNB_mac->sched_ctrlCommon->active_bwp = calloc(1,sizeof(*gNB_mac->sched_ctrlCommon->active_bwp));
- fill_default_searchSpaceZero(gNB_mac->sched_ctrlCommon->search_space);
- fill_default_coresetZero(gNB_mac->sched_ctrlCommon->coreset,servingcellconfigcommon);
- fill_default_initialDownlinkBWP(gNB_mac->sched_ctrlCommon->active_bwp,servingcellconfigcommon);
+ for (int i=0; i<3; i++){ // loop over possible aggregation levels
+ ret = fill_searchSpaceZero(gNB_mac->sched_ctrlCommon->search_space,type0_PDCCH_CSS_config,4<<i);
+ if (ret == 1) break;
+ }
+ AssertFatal(ret==1,"No aggregation level for type0_PDCCH_CSS found\n");
+ fill_coresetZero(gNB_mac->sched_ctrlCommon->coreset,type0_PDCCH_CSS_config);
}
gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation = time_domain_allocation;
- gNB_mac->sched_ctrlCommon->pdsch_semi_static.mcsTableIdx = mcsTableIdx;
- gNB_mac->sched_ctrlCommon->sched_pdsch.mcs = mcs;
+ gNB_mac->sched_ctrlCommon->pdsch_semi_static.mcsTableIdx = 0;
+ gNB_mac->sched_ctrlCommon->sched_pdsch.mcs = 0; // starting from mcs 0
gNB_mac->sched_ctrlCommon->num_total_bytes = num_total_bytes;
uint8_t nr_of_candidates;
find_aggregation_candidates(&gNB_mac->sched_ctrlCommon->aggregation_level, &nr_of_candidates, gNB_mac->sched_ctrlCommon->search_space);
gNB_mac->sched_ctrlCommon->cce_index = allocate_nr_CCEs(RC.nrmac[module_id],
- gNB_mac->sched_ctrlCommon->active_bwp,
+ NULL,
gNB_mac->sched_ctrlCommon->coreset,
gNB_mac->sched_ctrlCommon->aggregation_level,
0,
@@ -358,17 +364,6 @@ void schedule_control_sib1(module_id_t module_id,
const uint16_t bwpSize = type0_PDCCH_CSS_config->num_rbs;
int rbStart = type0_PDCCH_CSS_config->cset_start_rb;
- int startSymbolIndex = 0;
- int nrOfSymbols = 0;
-
- if(gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position == 0) {
- startSymbolIndex = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation][1];
- nrOfSymbols = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation][2];
- } else {
- startSymbolIndex = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation][1];
- nrOfSymbols = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation][2];
- }
-
// TODO: There are exceptions to this in table 5.1.2.1.1-4,5 (Default time domain allocation tables B, C)
int mappingtype = (startSymbolIndex <= 3)? typeA: typeB;
@@ -380,22 +375,32 @@ void schedule_control_sib1(module_id_t module_id,
// Calculate number of PRB_DMRS
uint8_t N_PRB_DMRS = gNB_mac->sched_ctrlCommon->pdsch_semi_static.numDmrsCdmGrpsNoData * 6;
- uint16_t dlDmrsSymbPos = fill_dmrs_mask(NULL, gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position, nrOfSymbols, startSymbolIndex, mappingtype);
uint16_t dmrs_length = get_num_dmrs(dlDmrsSymbPos);
LOG_D(MAC,"dlDmrsSymbPos %x\n",dlDmrsSymbPos);
int rbSize = 0;
uint32_t TBS = 0;
do {
- rbSize++;
+ if(rbSize < bwpSize && !vrb_map[rbStart + rbSize])
+ rbSize++;
+ else{
+ if (gNB_mac->sched_ctrlCommon->sched_pdsch.mcs<10)
+ gNB_mac->sched_ctrlCommon->sched_pdsch.mcs++;
+ else
+ break;
+ }
TBS = nr_compute_tbs(nr_get_Qm_dl(gNB_mac->sched_ctrlCommon->sched_pdsch.mcs, gNB_mac->sched_ctrlCommon->pdsch_semi_static.mcsTableIdx),
nr_get_code_rate_dl(gNB_mac->sched_ctrlCommon->sched_pdsch.mcs, gNB_mac->sched_ctrlCommon->pdsch_semi_static.mcsTableIdx),
rbSize, nrOfSymbols, N_PRB_DMRS * dmrs_length,0, 0,1) >> 3;
- } while (rbStart + rbSize < bwpSize && !vrb_map[rbStart + rbSize] && TBS < gNB_mac->sched_ctrlCommon->num_total_bytes);
+ } while (TBS < gNB_mac->sched_ctrlCommon->num_total_bytes);
+
+ AssertFatal(TBS>=gNB_mac->sched_ctrlCommon->num_total_bytes,"Couldn't allocate enough resources for %d bytes in SIB1 PDSCH\n",
+ gNB_mac->sched_ctrlCommon->num_total_bytes);
gNB_mac->sched_ctrlCommon->sched_pdsch.rbSize = rbSize;
gNB_mac->sched_ctrlCommon->sched_pdsch.rbStart = 0;
+ LOG_D(MAC,"mcs = %i\n", gNB_mac->sched_ctrlCommon->sched_pdsch.mcs);
LOG_D(MAC,"startSymbolIndex = %i\n", startSymbolIndex);
LOG_D(MAC,"nrOfSymbols = %i\n", nrOfSymbols);
LOG_D(MAC, "rbSize = %i\n", gNB_mac->sched_ctrlCommon->sched_pdsch.rbSize);
@@ -408,6 +413,7 @@ void schedule_control_sib1(module_id_t module_id,
for (int rb = 0; rb < gNB_mac->sched_ctrlCommon->sched_pdsch.rbSize; rb++) {
vrb_map[rb + rbStart] = 1;
}
+ return TBS;
}
void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
@@ -421,7 +427,6 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
gNB_MAC_INST *gNB_mac = RC.nrmac[Mod_idP];
NR_COMMON_channels_t *cc = gNB_mac->common_channels;
NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
- NR_BWP_Downlink_t *bwp = gNB_mac->sched_ctrlCommon->active_bwp;
nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdcch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
memset((void*)dl_tti_pdcch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
@@ -433,11 +438,8 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
gNB_mac->sched_ctrlCommon->search_space,
gNB_mac->sched_ctrlCommon->coreset,
scc,
- bwp);
-
- // TODO: This assignment should be done in function nr_configure_pdcch()
- pdcch_pdu_rel15->BWPSize = type0_PDCCH_CSS_config->num_rbs;
- pdcch_pdu_rel15->BWPStart = type0_PDCCH_CSS_config->cset_start_rb;
+ NULL,
+ type0_PDCCH_CSS_config);
nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdsch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
memset((void*)dl_tti_pdsch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
@@ -455,12 +457,8 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
pdsch_pdu_rel15->BWPSize = type0_PDCCH_CSS_config->num_rbs;
pdsch_pdu_rel15->BWPStart = type0_PDCCH_CSS_config->cset_start_rb;
- pdsch_pdu_rel15->SubcarrierSpacing = bwp->bwp_Common->genericParameters.subcarrierSpacing;
- if (bwp->bwp_Common->genericParameters.cyclicPrefix) {
- pdsch_pdu_rel15->CyclicPrefix = *bwp->bwp_Common->genericParameters.cyclicPrefix;
- } else {
- pdsch_pdu_rel15->CyclicPrefix = 0;
- }
+ pdsch_pdu_rel15->SubcarrierSpacing = type0_PDCCH_CSS_config->scs_pdcch;
+ pdsch_pdu_rel15->CyclicPrefix = 0;
pdsch_pdu_rel15->NrOfCodewords = 1;
pdsch_pdu_rel15->targetCodeRate[0] = nr_get_code_rate_dl(gNB_mac->sched_ctrlCommon->sched_pdsch.mcs, 0);
@@ -505,7 +503,7 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
dci_pdu_rel15_t dci_payload;
memset(&dci_payload, 0, sizeof(dci_pdu_rel15_t));
- dci_payload.bwp_indicator.val = gNB_mac->sched_ctrlCommon->active_bwp->bwp_Id;
+ dci_payload.bwp_indicator.val = 0;
// frequency domain assignment
dci_payload.frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(
@@ -533,7 +531,7 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
dci_format,
rnti_type,
pdsch_pdu_rel15->BWPSize,
- gNB_mac->sched_ctrlCommon->active_bwp->bwp_Id);
+ 0);
LOG_D(MAC,"BWPSize: %i\n", pdcch_pdu_rel15->BWPSize);
LOG_D(MAC,"BWPStart: %i\n", pdcch_pdu_rel15->BWPStart);
@@ -556,14 +554,13 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
// TODO: Get these values from RRC
const int CC_id = 0;
- int time_domain_allocation = 0;
- uint8_t mcsTableIdx = 0;
- uint8_t mcs = 6;
uint8_t candidate_idx = 0;
gNB_MAC_INST *gNB_mac = RC.nrmac[module_idP];
NR_ServingCellConfigCommon_t *scc = gNB_mac->common_channels[CC_id].ServingCellConfigCommon;
+ int time_domain_allocation = gNB_mac->sib1_tda;
+
int L_max;
switch (scc->ssb_PositionsInBurst->present) {
case 1:
@@ -599,30 +596,27 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
for (int k=0;k<sib1_sdu_length;k++)
LOG_D(NR_MAC,"byte %d : %x\n",k,((uint8_t*)sib1_payload)[k]);
- // Configure sched_ctrlCommon for SIB1
- schedule_control_sib1(module_idP, CC_id, type0_PDCCH_CSS_config, time_domain_allocation, mcsTableIdx, mcs, candidate_idx, sib1_sdu_length);
-
int startSymbolIndex = 0;
int nrOfSymbols = 0;
- if(gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position == 0) {
- startSymbolIndex = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation][1];
- nrOfSymbols = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos2[gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation][2];
- } else {
- startSymbolIndex = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation][1];
- nrOfSymbols = table_5_1_2_1_1_2_time_dom_res_alloc_A_dmrs_typeA_pos3[gNB_mac->sched_ctrlCommon->pdsch_semi_static.time_domain_allocation][2];
- }
+
+ get_info_from_tda_tables(type0_PDCCH_CSS_config->type0_pdcch_ss_mux_pattern,
+ time_domain_allocation,
+ gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position,
+ 1, &startSymbolIndex, &nrOfSymbols);
// TODO: There are exceptions to this in table 5.1.2.1.1-4,5 (Default time domain allocation tables B, C)
- int mappingtype = (startSymbolIndex <= 3) ? typeA : typeB;
+ int mappingtype = (startSymbolIndex <= 3)? typeA: typeB;
- // Calculate number of PRB_DMRS
- uint8_t N_PRB_DMRS = gNB_mac->sched_ctrlCommon->pdsch_semi_static.numDmrsCdmGrpsNoData * 6;
uint16_t dlDmrsSymbPos = fill_dmrs_mask(NULL, gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position, nrOfSymbols, startSymbolIndex, mappingtype);
- uint16_t dmrs_length = get_num_dmrs(dlDmrsSymbPos);
- const uint32_t TBS = nr_compute_tbs(nr_get_Qm_dl(gNB_mac->sched_ctrlCommon->sched_pdsch.mcs, gNB_mac->sched_ctrlCommon->pdsch_semi_static.mcsTableIdx),
- nr_get_code_rate_dl(gNB_mac->sched_ctrlCommon->sched_pdsch.mcs, gNB_mac->sched_ctrlCommon->pdsch_semi_static.mcsTableIdx),
- gNB_mac->sched_ctrlCommon->sched_pdsch.rbSize, nrOfSymbols, N_PRB_DMRS * dmrs_length,0 ,0 ,1 ) >> 3;
+ // Configure sched_ctrlCommon for SIB1
+ uint32_t TBS = schedule_control_sib1(module_idP, CC_id,
+ type0_PDCCH_CSS_config,
+ time_domain_allocation,
+ startSymbolIndex,
+ nrOfSymbols,
+ dlDmrsSymbPos,
+ candidate_idx, sib1_sdu_length);
nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
nr_fill_nfapi_dl_sib1_pdu(module_idP, dl_req, type0_PDCCH_CSS_config, TBS, startSymbolIndex, nrOfSymbols, dlDmrsSymbPos);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index c5cd9ac80334b729b30fbd584faedd4480224c78..e498eaee07f1e3fa14081da0c2b626054392d564 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -455,9 +455,7 @@ bool allocate_dl_retransmission(module_id_t module_id,
int rbStart = NRRIV2PRBOFFSET(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
- const long f = sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats;
- const uint8_t num_dmrs_cdm_grps_no_data = sched_ctrl->active_bwp ? (f ? 1 : (ps->nrOfSymbols == 2 ? 1 : 2)) : (ps->nrOfSymbols == 2 ? 1 : 2);
-
+ const long f = sched_ctrl->active_bwp ? sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats : 0;
int rbSize = 0;
const int tda = sched_ctrl->active_bwp ? RC.nrmac[module_id]->preferred_dl_tda[sched_ctrl->active_bwp->bwp_Id][slot] : 1;
if (tda == retInfo->time_domain_allocation) {
@@ -476,9 +474,8 @@ bool allocate_dl_retransmission(module_id_t module_id,
}
/* check whether we need to switch the TDA allocation since the last
* (re-)transmission */
- if (ps->time_domain_allocation != tda || ps->numDmrsCdmGrpsNoData != num_dmrs_cdm_grps_no_data)
- nr_set_pdsch_semi_static(
- scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, tda, num_dmrs_cdm_grps_no_data, ps);
+ if (ps->time_domain_allocation != tda)
+ nr_set_pdsch_semi_static(scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, tda, f, ps);
} else {
/* the retransmission will use a different time domain allocation, check
* that we have enough resources */
@@ -487,8 +484,8 @@ bool allocate_dl_retransmission(module_id_t module_id,
while (rbStart + rbSize < bwpSize && rballoc_mask[rbStart + rbSize])
rbSize++;
NR_pdsch_semi_static_t temp_ps;
- nr_set_pdsch_semi_static(
- scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, tda, num_dmrs_cdm_grps_no_data, &temp_ps);
+ temp_ps.nrOfLayers = 1;
+ nr_set_pdsch_semi_static(scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, tda, f, &temp_ps);
uint32_t new_tbs;
uint16_t new_rbSize;
bool success = nr_find_nb_rb(retInfo->Qm,
@@ -604,7 +601,7 @@ void pf_dl(module_id_t module_id,
/* Calculate coeff */
sched_pdsch->mcs = 9;
- sched_pdsch->nrOfLayers = 1;
+ ps->nrOfLayers = 1;
uint32_t tbs = pf_tbs[ps->mcsTableIdx][sched_pdsch->mcs];
coeff_ue[UE_id] = (float) tbs / thr_ue[UE_id];
LOG_D(NR_MAC,"b %d, thr_ue[%d] %f, tbs %d, coeff_ue[%d] %f\n",
@@ -675,6 +672,7 @@ void pf_dl(module_id_t module_id,
// Freq-demain allocation
while (rbStart < bwpSize && !rballoc_mask[rbStart]) rbStart++;
+
uint16_t max_rbSize = 1;
while (rbStart + max_rbSize < bwpSize && rballoc_mask[rbStart + max_rbSize])
max_rbSize++;
@@ -683,11 +681,9 @@ void pf_dl(module_id_t module_id,
const int tda = sched_ctrl->active_bwp ? RC.nrmac[module_id]->preferred_dl_tda[sched_ctrl->active_bwp->bwp_Id][slot] : 1;
NR_sched_pdsch_t *sched_pdsch = &sched_ctrl->sched_pdsch;
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
- const long f = sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats;
- const uint8_t num_dmrs_cdm_grps_no_data = sched_ctrl->active_bwp ? (f ? 1 : (ps->nrOfSymbols == 2 ? 1 : 2)) : (ps->nrOfSymbols == 2 ? 1 : 2);
- if (ps->time_domain_allocation != tda || ps->numDmrsCdmGrpsNoData != num_dmrs_cdm_grps_no_data)
- nr_set_pdsch_semi_static(
- scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, tda, num_dmrs_cdm_grps_no_data, ps);
+ const long f = sched_ctrl->active_bwp ? sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats : 0;
+ if (ps->time_domain_allocation != tda)
+ nr_set_pdsch_semi_static(scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, tda, f, ps);
sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
sched_pdsch->R = nr_get_code_rate_dl(sched_pdsch->mcs, ps->mcsTableIdx);
sched_pdsch->pucch_allocation = alloc;
@@ -821,17 +817,17 @@ void nr_schedule_ue_spec(module_id_t module_id,
const rnti_t rnti = UE_info->rnti[UE_id];
- /* POST processing */
- const uint8_t nrOfLayers = sched_pdsch->nrOfLayers;
- const uint16_t R = sched_pdsch->R;
- const uint8_t Qm = sched_pdsch->Qm;
- const uint32_t TBS = sched_pdsch->tb_size;
-
/* pre-computed PDSCH values that only change if time domain
* allocation/DMRS parameters change. Updated in the preprocessor through
* nr_set_pdsch_semi_static() */
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
+ /* POST processing */
+ const uint8_t nrOfLayers = ps->nrOfLayers;
+ const uint16_t R = sched_pdsch->R;
+ const uint8_t Qm = sched_pdsch->Qm;
+ const uint32_t TBS = sched_pdsch->tb_size;
+
int8_t current_harq_pid = sched_pdsch->dl_harq_pid;
if (current_harq_pid < 0) {
/* PP has not selected a specific HARQ Process, get a new one */
@@ -878,6 +874,10 @@ void nr_schedule_ue_spec(module_id_t module_id,
/* look up the PDCCH PDU for this CC, BWP, and CORESET. If it does not
* exist, create it */
+
+ // BWP
+ NR_BWP_t *genericParameters = bwp ? &bwp->bwp_Common->genericParameters : &scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
+
const int bwpid = bwp ? bwp->bwp_Id : 0;
const int coresetid = bwp ? sched_ctrl->coreset->controlResourceSetId : gNB_mac->sched_ctrlCommon->coreset->controlResourceSetId;
nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu = gNB_mac->pdcch_pdu_idx[CC_id][bwpid][coresetid];
@@ -891,7 +891,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
LOG_D(NR_MAC,"Trying to configure DL pdcch for bwp %d, cs %d\n",bwpid,coresetid);
NR_SearchSpace_t *ss = bwp ? sched_ctrl->search_space:gNB_mac->sched_ctrlCommon->search_space;
NR_ControlResourceSet_t *coreset = bwp? sched_ctrl->coreset:gNB_mac->sched_ctrlCommon->coreset;
- nr_configure_pdcch(pdcch_pdu, ss, coreset, scc, bwp);
+ nr_configure_pdcch(pdcch_pdu, ss, coreset, scc, genericParameters, NULL);
gNB_mac->pdcch_pdu_idx[CC_id][bwpid][coresetid] = pdcch_pdu;
}
@@ -910,9 +910,6 @@ void nr_schedule_ue_spec(module_id_t module_id,
const int pduindex = gNB_mac->pdu_index[CC_id]++;
pdsch_pdu->pduIndex = pduindex;
- // BWP
- NR_BWP_t *genericParameters = bwp ? &bwp->bwp_Common->genericParameters : &scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
-
pdsch_pdu->BWPSize = NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
pdsch_pdu->BWPStart = NRRIV2PRBOFFSET(genericParameters->locationAndBandwidth,MAX_BWP_SIZE);
pdsch_pdu->SubcarrierSpacing = genericParameters->subcarrierSpacing;
@@ -941,7 +938,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
pdsch_pdu->dlDmrsScramblingId = *scc->physCellId;
pdsch_pdu->SCID = 0;
pdsch_pdu->numDmrsCdmGrpsNoData = ps->numDmrsCdmGrpsNoData;
- pdsch_pdu->dmrsPorts = 1;
+ pdsch_pdu->dmrsPorts = (1<<nrOfLayers)-1; // FIXME with a better implementation
// Pdsch Allocation in frequency domain
pdsch_pdu->resourceAlloc = 1;
@@ -1023,7 +1020,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
dci_payload.tpc = sched_ctrl->tpc1; // TPC for PUCCH: table 7.2.1-1 in 38.213
dci_payload.pucch_resource_indicator = pucch->resource_indicator;
dci_payload.pdsch_to_harq_feedback_timing_indicator.val = pucch->timing_indicator; // PDSCH to HARQ TI
- dci_payload.antenna_ports.val = 0; // nb of cdm groups w/o data 1 and dmrs port 0
+ dci_payload.antenna_ports.val = ps->dmrs_ports_id;
dci_payload.dmrs_sequence_initialization.val = pdsch_pdu->SCID;
LOG_D(NR_MAC,
"%4d.%2d DCI type 1 payload: freq_alloc %d (%d,%d,%d), "
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index 50a0b241b66080cab7a4b49099dd53eb55499a64..f906df1da7acc28d6a12ff7d24c5f90164729835 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -166,10 +166,10 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP,
pdsch_pdu_rel15->StartSymbolIndex = StartSymbolIndex;
pdsch_pdu_rel15->NrOfSymbols = NrOfSymbols;
pdsch_pdu_rel15->dlDmrsSymbPos = fill_dmrs_mask(NULL,
- scc->dmrs_TypeA_Position,
- NrOfSymbols,
- StartSymbolIndex,
- mappingtype);
+ scc->dmrs_TypeA_Position,
+ NrOfSymbols,
+ StartSymbolIndex,
+ mappingtype);
/*
AssertFatal(k0==0,"k0 is not zero for Initial DL BWP TimeDomain Alloc\n");
@@ -371,11 +371,12 @@ void nr_preprocessor_phytest(module_id_t module_id,
sched_pdsch->rbSize = rbSize;
const int tda = sched_ctrl->active_bwp ? RC.nrmac[module_id]->preferred_dl_tda[sched_ctrl->active_bwp->bwp_Id][slot] : 1;
const uint8_t num_dmrs_cdm_grps_no_data = 1;
+ ps->nrOfLayers = target_dl_Nl;
if (ps->time_domain_allocation != tda || ps->numDmrsCdmGrpsNoData != num_dmrs_cdm_grps_no_data)
nr_set_pdsch_semi_static(
scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, tda, num_dmrs_cdm_grps_no_data, ps);
- sched_pdsch->nrOfLayers = target_dl_Nl;
+
sched_pdsch->mcs = target_dl_mcs;
sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
sched_pdsch->R = nr_get_code_rate_dl(sched_pdsch->mcs, ps->mcsTableIdx);
@@ -386,7 +387,7 @@ void nr_preprocessor_phytest(module_id_t module_id,
ps->N_PRB_DMRS * ps->N_DMRS_SLOT,
0 /* N_PRB_oh, 0 for initialBWP */,
0 /* tb_scaling */,
- sched_pdsch->nrOfLayers)
+ ps->nrOfLayers)
>> 3;
/* get the PID of a HARQ process awaiting retransmission, or -1 otherwise */
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 41890866c824047eb2ac494ba4089d71b633f9a9..cca55152cb8140199e34413e709562a9ba16872d 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -122,6 +122,36 @@ static inline uint8_t get_max_cces(uint8_t scs) {
return (nr_max_number_of_cces_per_slot[scs]);
}
+void set_dl_dmrs_ports(NR_pdsch_semi_static_t *ps) {
+
+ //TODO first basic implementation of dmrs port selection
+ // only vaild for a single codeword
+ // for now it assumes a selection of Nl consecutive dmrs ports
+ // and a single front loaded symbol
+ // dmrs_ports_id is the index of Tables 7.3.1.2.2-1/2/3/4
+
+ switch (ps->nrOfLayers) {
+ case 1:
+ ps->dmrs_ports_id = 0;
+ ps->numDmrsCdmGrpsNoData = 1;
+ break;
+ case 2:
+ ps->dmrs_ports_id = 2;
+ ps->numDmrsCdmGrpsNoData = 1;
+ break;
+ case 3:
+ ps->dmrs_ports_id = 9;
+ ps->numDmrsCdmGrpsNoData = 2;
+ break;
+ case 4:
+ ps->dmrs_ports_id = 10;
+ ps->numDmrsCdmGrpsNoData = 2;
+ break;
+ default:
+ AssertFatal(1==0,"Number of layers %d\n not supported or not valid\n",ps->nrOfLayers);
+ }
+}
+
NR_ControlResourceSet_t *get_coreset(NR_ServingCellConfigCommon_t *scc,
NR_BWP_Downlink_t *bwp,
NR_SearchSpace_t *ss,
@@ -178,9 +208,6 @@ int allocate_nr_CCEs(gNB_MAC_INST *nr_mac,
uint16_t Y,
int m,
int nr_of_candidates) {
- // uncomment these when we allocate for common search space
- // NR_COMMON_channels_t *cc = nr_mac->common_channels;
- // NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
int coreset_id = coreset->controlResourceSetId;
@@ -269,7 +296,7 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
const NR_CellGroupConfig_t *secondaryCellGroup,
const NR_BWP_Downlink_t *bwp,
int tda,
- uint8_t num_dmrs_cdm_grps_no_data,
+ const long dci_format,
NR_pdsch_semi_static_t *ps)
{
ps->time_domain_allocation = tda;
@@ -295,12 +322,13 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
}
else ps->mcsTableIdx = 0;
- ps->numDmrsCdmGrpsNoData = num_dmrs_cdm_grps_no_data;
+ if(dci_format == 0) // format 1_0
+ ps->numDmrsCdmGrpsNoData = (ps->nrOfSymbols == 2 ? 1 : 2);
+ else
+ set_dl_dmrs_ports(ps);
ps->dmrsConfigType = bwp!=NULL ? (bwp->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? 0 : 1) : 0;
- // if no data in dmrs cdm group is 1 only even REs have no data
- // if no data in dmrs cdm group is 2 both odd and even REs have no data
- ps->N_PRB_DMRS = num_dmrs_cdm_grps_no_data * (ps->dmrsConfigType == NFAPI_NR_DMRS_TYPE1 ? 6 : 4);
+ ps->N_PRB_DMRS = ps->numDmrsCdmGrpsNoData * (ps->dmrsConfigType == NFAPI_NR_DMRS_TYPE1 ? 6 : 4);
ps->dl_dmrs_symb_pos = fill_dmrs_mask(bwp ? bwp->bwp_Dedicated->pdsch_Config->choice.setup : NULL, scc->dmrs_TypeA_Position, ps->nrOfSymbols, ps->startSymbolIndex, mapping_type);
ps->N_DMRS_SLOT = get_num_dmrs(ps->dl_dmrs_symb_pos);
}
@@ -679,25 +707,33 @@ void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu,
NR_SearchSpace_t *ss,
NR_ControlResourceSet_t *coreset,
NR_ServingCellConfigCommon_t *scc,
- NR_BWP_Downlink_t *bwp)
-{
- NR_BWP_t *genericParameters = bwp ? &bwp->bwp_Common->genericParameters : &scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
-
- pdcch_pdu->BWPSize = NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
- pdcch_pdu->BWPStart = NRRIV2PRBOFFSET(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
- pdcch_pdu->SubcarrierSpacing = genericParameters->subcarrierSpacing;
- pdcch_pdu->CyclicPrefix = genericParameters->cyclicPrefix ? *genericParameters->cyclicPrefix:0;
-
- // first symbol
- //AssertFatal(pdcch_scs==kHz15, "PDCCH SCS above 15kHz not allowed if a symbol above 2 is monitored");
- int sps = genericParameters->cyclicPrefix == NULL ? 14 : 12;
+ NR_BWP_t *bwp,
+ NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config) {
+
+ int sps;
+ if (bwp) { // This is not for SIB1
+ pdcch_pdu->BWPSize = NRRIV2BW(bwp->locationAndBandwidth, MAX_BWP_SIZE);
+ pdcch_pdu->BWPStart = NRRIV2PRBOFFSET(bwp->locationAndBandwidth, MAX_BWP_SIZE);
+ pdcch_pdu->SubcarrierSpacing = bwp->subcarrierSpacing;
+ pdcch_pdu->CyclicPrefix = (bwp->cyclicPrefix==NULL) ? 0 : *bwp->cyclicPrefix;
+
+ //AssertFatal(pdcch_scs==kHz15, "PDCCH SCS above 15kHz not allowed if a symbol above 2 is monitored");
+ sps = bwp->cyclicPrefix == NULL ? 14 : 12;
+ }
+ else {
+ pdcch_pdu->BWPSize = type0_PDCCH_CSS_config->num_rbs;
+ pdcch_pdu->BWPStart = type0_PDCCH_CSS_config->cset_start_rb;
+ pdcch_pdu->SubcarrierSpacing = type0_PDCCH_CSS_config->scs_pdcch;
+ pdcch_pdu->CyclicPrefix = 0;
+ sps = 14;
+ }
AssertFatal(ss->monitoringSymbolsWithinSlot!=NULL,"ss->monitoringSymbolsWithinSlot is null\n");
AssertFatal(ss->monitoringSymbolsWithinSlot->buf!=NULL,"ss->monitoringSymbolsWithinSlot->buf is null\n");
-
+
// for SPS=14 8 MSBs in positions 13 downto 6
uint16_t monitoringSymbolsWithinSlot = (ss->monitoringSymbolsWithinSlot->buf[0]<<(sps-8)) |
- (ss->monitoringSymbolsWithinSlot->buf[1]>>(16-sps));
+ (ss->monitoringSymbolsWithinSlot->buf[1]>>(16-sps));
for (int i=0; i<sps; i++) {
if ((monitoringSymbolsWithinSlot>>(sps-1-i))&1) {
@@ -717,8 +753,10 @@ void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu,
NFAPI_NR_CCE_REG_MAPPING_INTERLEAVED : NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED;
if (pdcch_pdu->CceRegMappingType == NFAPI_NR_CCE_REG_MAPPING_INTERLEAVED) {
- pdcch_pdu->RegBundleSize = (coreset->cce_REG_MappingType.choice.interleaved->reg_BundleSize == NR_ControlResourceSet__cce_REG_MappingType__interleaved__reg_BundleSize_n6) ? 6 : (2+coreset->cce_REG_MappingType.choice.interleaved->reg_BundleSize);
- pdcch_pdu->InterleaverSize = (coreset->cce_REG_MappingType.choice.interleaved->interleaverSize==NR_ControlResourceSet__cce_REG_MappingType__interleaved__interleaverSize_n6) ? 6 : (2+coreset->cce_REG_MappingType.choice.interleaved->interleaverSize);
+ pdcch_pdu->RegBundleSize = (coreset->cce_REG_MappingType.choice.interleaved->reg_BundleSize ==
+ NR_ControlResourceSet__cce_REG_MappingType__interleaved__reg_BundleSize_n6) ? 6 : (2+coreset->cce_REG_MappingType.choice.interleaved->reg_BundleSize);
+ pdcch_pdu->InterleaverSize = (coreset->cce_REG_MappingType.choice.interleaved->interleaverSize ==
+ NR_ControlResourceSet__cce_REG_MappingType__interleaved__interleaverSize_n6) ? 6 : (2+coreset->cce_REG_MappingType.choice.interleaved->interleaverSize);
AssertFatal(scc->physCellId != NULL,"scc->physCellId is null\n");
pdcch_pdu->ShiftIndex = coreset->cce_REG_MappingType.choice.interleaved->shiftIndex != NULL ? *coreset->cce_REG_MappingType.choice.interleaved->shiftIndex : *scc->physCellId;
}
@@ -729,7 +767,10 @@ void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu,
}
if(coreset->controlResourceSetId == 0) {
- pdcch_pdu->CoreSetType = NFAPI_NR_CSET_CONFIG_MIB_SIB1;
+ if(bwp == NULL)
+ pdcch_pdu->CoreSetType = NFAPI_NR_CSET_CONFIG_MIB_SIB1;
+ else
+ pdcch_pdu->CoreSetType = NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG_CSET_0;
} else{
pdcch_pdu->CoreSetType = NFAPI_NR_CSET_CONFIG_PDCCH_CONFIG;
}
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
index b9ad3c43abce8662d6415883e98c07849d3b5e3f..3c8891636f5195aef4481f4373bbcd6e6ea36eca 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
@@ -487,7 +487,7 @@ void nr_csi_meas_reporting(int Mod_idP,
// preparation is done in first slot of tdd period
if (frame % (period / n_slots_frame) != offset / n_slots_frame)
continue;
- LOG_I(MAC, "CSI reporting in frame %d slot %d\n", frame, sched_slot);
+ LOG_D(MAC, "CSI reporting in frame %d slot %d\n", frame, sched_slot);
const NR_PUCCH_CSI_Resource_t *pucchcsires = csirep->reportConfigType.choice.periodic->pucch_CSI_ResourceList.list.array[0];
const NR_PUCCH_ResourceSet_t *pucchresset = pucch_Config->resourceSetToAddModList->list.array[1]; // set with formats >1
@@ -507,6 +507,7 @@ void nr_csi_meas_reporting(int Mod_idP,
&& curr_pucch->dai_c == 0,
"PUCCH not free at index 1 for UE %04x\n",
UE_info->rnti[UE_id]);
+ curr_pucch->r_pucch = -1;
curr_pucch->frame = frame;
curr_pucch->ul_slot = sched_slot;
curr_pucch->resource_indicator = res_index;
@@ -985,7 +986,7 @@ void extract_pucch_csi_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
// verify if report with current id has been scheduled for this frame and slot
if ((n_slots_frame*frame + slot - offset)%period == 0) {
reportQuantity_type = UE_info->csi_report_template[UE_id][csi_report_id].reportQuantity_type;
- LOG_I(MAC,"SFN/SF:%d/%d reportQuantity type = %d\n",frame,slot,reportQuantity_type);
+ LOG_D(MAC,"SFN/SF:%d/%d reportQuantity type = %d\n",frame,slot,reportQuantity_type);
switch(reportQuantity_type){
case NR_CSI_ReportConfig__reportQuantity_PR_cri_RSRP:
evaluate_rsrp_report(UE_info,sched_ctrl,UE_id,csi_report_id,payload,&cumul_bits,reportQuantity_type);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index c854dd7b2e4a08194ec93881ec8f61071ea9ad9f..f43c4bfa6ea296f1b369c80e93fe3d72e2d15a2a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -793,7 +793,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
nr_process_mac_pdu(gnb_mod_idP, UE_id, CC_idP, frameP, slotP, sduP, sdu_lenP);
ra->state = Msg4;
- ra->Msg4_frame = ( frameP +2 ) % 1024;
+ ra->Msg4_frame = (frameP + 2) % 1024;
ra->Msg4_slot = 1;
LOG_I(NR_MAC, "Scheduling RA-Msg4 for TC_RNTI %04x (state %d, frame %d, slot %d)\n", ra->rnti, ra->state, ra->Msg4_frame, ra->Msg4_slot);
@@ -1595,7 +1595,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
ul_dci_request_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdcch_pdu));
pdcch_pdu = &ul_dci_request_pdu->pdcch_pdu.pdcch_pdu_rel15;
ul_dci_req->numPdus += 1;
- nr_configure_pdcch(pdcch_pdu, ss, coreset, scc, sched_ctrl->active_bwp);
+ nr_configure_pdcch(pdcch_pdu, ss, coreset, scc, genericParameters, NULL);
pdcch_pdu_bwp_coreset[bwpid][coresetid] = pdcch_pdu;
}
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index 83de1ba49b83a2bfd11ba54c391422196c032683..391b98af365dd4be61fe8985b44ad1fc7461a847 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -51,6 +51,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int ssb_SubcarrierOffset,
int pdsch_AntennaPorts,
int pusch_AntennaPorts,
+ int sib1_tda,
NR_ServingCellConfigCommon_t *scc,
int nsa_flag,
uint32_t rnti,
@@ -72,18 +73,19 @@ void nr_schedule_ue_spec(module_id_t module_id,
frame_t frame,
sub_frame_t slot);
+uint32_t schedule_control_sib1(module_id_t module_id,
+ int CC_id,
+ NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config,
+ int time_domain_allocation,
+ int startSymbolIndex,
+ int nrOfSymbols,
+ uint16_t dlDmrsSymbPos,
+ uint8_t candidate_idx,
+ int num_total_bytes);
+
/* \brief default FR1 DL preprocessor init routine, returns preprocessor to call */
nr_pp_impl_dl nr_init_fr1_dlsch_preprocessor(module_id_t module_id, int CC_id);
-void schedule_control_sib1(module_id_t module_id,
- int CC_id,
- NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config,
- int time_domain_allocation,
- uint8_t mcsTableIdx,
- uint8_t mcs,
- uint8_t candidate_idx,
- int num_total_bytes);
-
void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP);
void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP);
@@ -247,7 +249,8 @@ void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu,
NR_SearchSpace_t *ss,
NR_ControlResourceSet_t *coreset,
NR_ServingCellConfigCommon_t *scc,
- NR_BWP_Downlink_t *bwp);
+ NR_BWP_t *bwp,
+ NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config);
void fill_dci_pdu_rel15(const NR_ServingCellConfigCommon_t *scc,
const NR_CellGroupConfig_t *CellGroup,
@@ -280,7 +283,7 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
const NR_CellGroupConfig_t *secondaryCellGroup,
const NR_BWP_Downlink_t *bwp,
int tda,
- uint8_t num_dmrs_cdm_grps_no_data,
+ const long dci_format,
NR_pdsch_semi_static_t *ps);
void nr_set_pusch_semi_static(const NR_ServingCellConfigCommon_t *scc,
@@ -414,6 +417,8 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
void find_SSB_and_RO_available(module_id_t module_idP);
+void set_dl_dmrs_ports(NR_pdsch_semi_static_t *ps);
+
void calculate_preferred_dl_tda(module_id_t module_id, const NR_BWP_Downlink_t *bwp);
void calculate_preferred_ul_tda(module_id_t module_id, const NR_BWP_Uplink_t *ubwp);
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index 5d546a57c91ff1fc286d3645aaf8fcaae0607ff4..3457c81fa88340355a3db4553a4a9c0bce730ba3 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -157,6 +157,8 @@ typedef struct {
int msg4_TBsize;
/// MCS used for Msg4
int msg4_mcs;
+ /// MAC PDU length for Msg4
+ int mac_pdu_length;
/// RA search space
NR_SearchSpace_t *ra_ss;
// Beam index
@@ -366,9 +368,9 @@ typedef struct NR_pdsch_semi_static {
int startSymbolIndex;
int nrOfSymbols;
-
+ uint8_t nrOfLayers;
uint8_t mcsTableIdx;
-
+ uint8_t dmrs_ports_id;
uint8_t N_PRB_DMRS;
uint8_t N_DMRS_SLOT;
uint16_t dl_dmrs_symb_pos;
@@ -384,7 +386,6 @@ typedef struct NR_sched_pdsch {
uint8_t mcs;
/// TBS-related info
- uint8_t nrOfLayers;
uint16_t R;
uint8_t Qm;
uint32_t tb_size;
@@ -671,6 +672,8 @@ typedef struct gNB_MAC_INST_s {
int pusch_failure_thres;
/// Subcarrier Offset
int ssb_SubcarrierOffset;
+ /// SIB1 Time domain allocation
+ int sib1_tda;
/// Common cell resources
NR_COMMON_channels_t common_channels[NFAPI_CC_MAX];
/// current PDU index (BCH,DLSCH)
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c b/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
index 08f5b11c23197f47587d5f8801cd8c875dd211df..8db5ce31adf0885dcea340b2bac61b25c9ea0a83 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
@@ -218,7 +218,7 @@ static void reassemble_and_deliver(nr_rlc_entity_am_t *entity, int sn)
bad_sdu = 1;
}
if (!bad_sdu && len > 0) {
- memcpy(sdu + so, pdu->data, len);
+ memcpy(sdu + so, pdu->data + so - pdu->so, len);
so += len;
}
free(pdu->data);
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c b/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c
index f967c3c5432a9832768ea4ceb22a0083eecbc0ff..71173eee5af3ae0024f2cab860805057dcd05563 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c
@@ -148,7 +148,7 @@ static void reassemble_and_deliver(nr_rlc_entity_um_t *entity, int sn)
bad_sdu = 1;
}
if (!bad_sdu && len > 0) {
- memcpy(sdu + so, pdu->data, len);
+ memcpy(sdu + so, pdu->data + so - pdu->so, len);
so += len;
}
free(pdu->data);
diff --git a/openair2/LAYER2/nr_rlc/tests/run_tests.sh b/openair2/LAYER2/nr_rlc/tests/run_tests.sh
index a98f6b5d0fffe9f530e0ee49d06bedb9413ed11b..7ca4798861a8dc50f0abe830a67288404cc9d243 100755
--- a/openair2/LAYER2/nr_rlc/tests/run_tests.sh
+++ b/openair2/LAYER2/nr_rlc/tests/run_tests.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_count=15
+test_count=17
for i in `seq $test_count`
do
diff --git a/openair2/LAYER2/nr_rlc/tests/test.c b/openair2/LAYER2/nr_rlc/tests/test.c
index 742e79ca2c1cf788a38e95b9b2f4457c3e6deeb9..bfde8b9fadd37924e0811b7c4477179359c01c45 100644
--- a/openair2/LAYER2/nr_rlc/tests/test.c
+++ b/openair2/LAYER2/nr_rlc/tests/test.c
@@ -22,13 +22,13 @@
* create the UE RLC AM entity with given parameters
*
* GNB_UM <rx_maxsize> <tx_maxsize> <t_reassembly> <sn_field_length>
- * create the eNB RLC UM entity with given parameters
+ * create the gNB RLC UM entity with given parameters
*
* UE_UM <rx_maxsize> <tx_maxsize> <t_reassembly> <sn_field_length>
* create the UE RLC UM entity with given parameters
*
* GNB_TM <tx_maxsize>
- * create the eNB RLC TM entity with given parameters
+ * create the gNB RLC TM entity with given parameters
*
* UE_UM <tx_maxsize>
* create the UE RLC TM entity with given parameters
@@ -39,7 +39,7 @@
* You must end your test definition with a line 'TIME, -1'.
*
* GNB_SDU <id> <size>
- * send an SDU to eNB with id <i> and size <size>
+ * send an SDU to gNB with id <i> and size <size>
* the SDU is [00 01 ... ff 01 ...]
* (ie. start byte is 00 then we increment for each byte, loop if needed)
*
@@ -47,10 +47,10 @@
* same as GNB_SDU but the SDU is sent to the UE
*
* GNB_PDU <size> <'size' bytes>
- * send a custom PDU from eNB to UE (eNB does not see this PDU at all)
+ * send a custom PDU from gNB to UE (gNB does not see this PDU at all)
*
* UE_PDU <size> <'size' bytes>
- * send a custom PDU from UE to eNB (UE does not see this PDU at all)
+ * send a custom PDU from UE to gNB (UE does not see this PDU at all)
*
* GNB_PDU_SIZE <size>
* set 'gnb_pdu_size'
@@ -70,7 +70,7 @@
* that the test must fail (ie. exit with non zero, crash not allowed)
*
* GNB_BUFFER_STATUS
- * call buffer_status for eNB and print result
+ * call buffer_status for gNB and print result
*
* UE_BUFFER_STATUS
* call buffer_status for UE and print result
@@ -82,7 +82,7 @@
* discards given SDU
*
* RE_ESTABLISH
- * re-establish both eNB and UE
+ * re-establish both gNB and UE
*/
enum action {
@@ -368,7 +368,7 @@ int test_main(void)
pos += 2;
break;
case RE_ESTABLISH:
- printf("TEST: %d: re-establish eNB and UE\n", i);
+ printf("TEST: %d: re-establish gNB and UE\n", i);
gnb->reestablishment(gnb);
ue->reestablishment(ue);
pos++;
diff --git a/openair2/LAYER2/nr_rlc/tests/test16.h b/openair2/LAYER2/nr_rlc/tests/test16.h
new file mode 100644
index 0000000000000000000000000000000000000000..92f9923809b5bf3e5269f15c9370cb45c183e3fb
--- /dev/null
+++ b/openair2/LAYER2/nr_rlc/tests/test16.h
@@ -0,0 +1,19 @@
+/*
+ * am test (SN field size 18):
+ * there was a bug when we receive a full PDU after receiving only the
+ * beginning of it; the data was copied at the end but from the start of the
+ * full PDU instead of the correct offset. This test captures this case.
+ * Gnb sends the start of a PDU then the full PDU. That is the SDU is
+ * [00 .. 09]. First gnb sends [00 .. 08] then it sends [00 .. 09].
+ */
+
+TIME, 1,
+ GNB_AM, 100000, 100000, 45, 35, 0, -1, -1, 8, 18,
+ UE_AM, 100000, 100000, 45, 35, 0, -1, -1, 8, 18,
+ GNB_PDU_SIZE, 12,
+ UE_PDU_SIZE, 20,
+ GNB_PDU, 12, 0x90, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+TIME, 2,
+ GNB_PDU_SIZE, 20,
+ GNB_PDU, 13, 0xc0, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+TIME, -1
diff --git a/openair2/LAYER2/nr_rlc/tests/test16.txt.gz b/openair2/LAYER2/nr_rlc/tests/test16.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..74b19724aab10fcde721e98fa8e7565616eb133e
Binary files /dev/null and b/openair2/LAYER2/nr_rlc/tests/test16.txt.gz differ
diff --git a/openair2/LAYER2/nr_rlc/tests/test17.h b/openair2/LAYER2/nr_rlc/tests/test17.h
new file mode 100644
index 0000000000000000000000000000000000000000..3da9fcc6e5ad3f7f56e875eebeab794e36414430
--- /dev/null
+++ b/openair2/LAYER2/nr_rlc/tests/test17.h
@@ -0,0 +1,18 @@
+/*
+ * um test (SN field size 12):
+ * same problem as for test16, but we test by sending [00 .. 08] then
+ * [02 .. 09] (they overlap, the full SDU is [00 .. 09]), which probably
+ * never occurs in practice but triggers the bug. Doing as for test16 does
+ * not trigger the bug.
+ */
+
+TIME, 1,
+ GNB_UM, 100000, 100000, 35, 12,
+ UE_UM, 100000, 100000, 35, 12,
+ GNB_PDU_SIZE, 8,
+ UE_PDU_SIZE, 20,
+ GNB_PDU, 11, 0x40, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+TIME, 2,
+ GNB_PDU_SIZE, 20,
+ GNB_PDU, 12, 0x80, 0x00, 0x00, 0x02, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+TIME, -1
diff --git a/openair2/LAYER2/nr_rlc/tests/test17.txt.gz b/openair2/LAYER2/nr_rlc/tests/test17.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b30f671617a67a09b01e8016f96b5de33e669e73
Binary files /dev/null and b/openair2/LAYER2/nr_rlc/tests/test17.txt.gz differ
diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
index 435d7e8d30afb38169e0627e1f4113382f66d535..b5c2f666a295eb68ce83c06a6b9d2b07e1d45b93 100644
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
@@ -79,13 +79,13 @@ int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, frame_t
// L2 Abstraction Layer
// Note: sdu should always be processed because data and timing advance updates are transmitted by the UE
-int8_t handle_dlsch (nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment, int pdu_id){
+int8_t handle_dlsch(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment, int pdu_id){
update_harq_status(dl_info, pdu_id);
- nr_ue_send_sdu(dl_info, ul_time_alignment, pdu_id);
+ if(dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.ack_nack)
+ nr_ue_send_sdu(dl_info, ul_time_alignment, pdu_id);
return 0;
-
}
int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
diff --git a/openair2/RRC/NAS/nas_config.c b/openair2/RRC/NAS/nas_config.c
index 2eb439b9e9891fbd0076cbb2a9f02fbe73c83e5f..31ca8f9eb857a5ea6bfb30d3f182ca935778d3e3 100644
--- a/openair2/RRC/NAS/nas_config.c
+++ b/openair2/RRC/NAS/nas_config.c
@@ -344,6 +344,24 @@ int nas_config(int interface_id, int thirdOctet, int fourthOctet, char *ifname)
LOG_E(OIP,"Interface %s couldn't be configured (ip address %s, mask %s broadcast address %s)\n",
interfaceName, ipAddress, netMask, broadcastAddress);
+ int res;
+ char command_line[500];
+ res = sprintf(command_line,
+ "ip rule add from %s/32 table %d && "
+ "ip rule add to %s/32 table %d && "
+ "ip route add default dev %s%d table %d",
+ ipAddress, interface_id - 1 + 10000,
+ ipAddress, interface_id - 1 + 10000,
+ UE_NAS_USE_TUN ? "oaitun_ue" : "oip",
+ interface_id, interface_id - 1 + 10000);
+
+ if (res < 0) {
+ LOG_E(OIP,"Could not create ip rule/route commands string\n");
+ return res;
+ }
+
+ background_system(command_line);
+
return returnValue;
}
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c
index e36644afb0089375208ded1a1b8834af5b76668e..59c4ae09e54e9ee9de812423f8ce3e177fd6baa6 100755
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c
@@ -419,8 +419,28 @@ uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,
nrMultiBandInfo->freqBandIndicatorNR = configuration->scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[i];
ASN_SEQUENCE_ADD(&sib1->servingCellConfigCommon->downlinkConfigCommon.frequencyInfoDL.frequencyBandList.list,nrMultiBandInfo);
}
- //sib1->servingCellConfigCommon->downlinkConfigCommon.frequencyInfoDL.offsetToPointA = configuration->scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->offsetToCarrier;
- sib1->servingCellConfigCommon->downlinkConfigCommon.frequencyInfoDL.offsetToPointA = 86;
+
+ int scs_scaling0 = 1<<(configuration->scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.subcarrierSpacing);
+ int scs_scaling = scs_scaling0;
+ int scs_scaling2 = scs_scaling0;
+ if (configuration->scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA < 600000) {
+ scs_scaling = scs_scaling0*3;
+ }
+ if (configuration->scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA > 2016666) {
+ scs_scaling = scs_scaling0>>2;
+ scs_scaling2 = scs_scaling0>>2;
+ }
+ uint32_t absolute_diff = (*configuration->scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB -
+ configuration->scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA);
+
+ sib1->servingCellConfigCommon->downlinkConfigCommon.frequencyInfoDL.offsetToPointA = scs_scaling2 * (absolute_diff/(12*scs_scaling) - 10);
+
+ LOG_I(NR_RRC,"SIB1 freq: absoluteFrequencySSB %ld, absoluteFrequencyPointA %ld\n",
+ *configuration->scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB,
+ configuration->scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA);
+ LOG_I(NR_RRC,"SIB1 freq: absolute_diff %d, %d*(absolute_diff/(12*%d) - 10) %d\n",
+ absolute_diff,scs_scaling2,scs_scaling,(int)sib1->servingCellConfigCommon->downlinkConfigCommon.frequencyInfoDL.offsetToPointA);
+
for(int i = 0; i< configuration->scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.count; i++) {
ASN_SEQUENCE_ADD(&sib1->servingCellConfigCommon->downlinkConfigCommon.frequencyInfoDL.scs_SpecificCarrierList.list,configuration->scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[i]);
}
diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index b92b5defe68c7896220e4e384b8c7cc7fd7ab27c..c8b412df1f3d94e9f57022789bc60e16c4551fd7 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -443,7 +443,8 @@ typedef struct {
NR_SIB2_t *sib2;
NR_SIB3_t *sib3;
NR_BCCH_DL_SCH_Message_t systemInformation; // SIB23
- int ssb_SubcarrierOffset;
+ int ssb_SubcarrierOffset;
+ int sib1_tda;
int pdsch_AntennaPorts;
int pusch_AntennaPorts;
int pusch_TargetSNRx10;
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index 811c7a152fd7bcf12f9c6f38c54a245ff348d72f..9465b9b4b066f05be0c1431bb1a81d85c4dde931 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -73,12 +73,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
void rrc_remove_nsa_user(gNB_RRC_INST *rrc, int rnti);
-void fill_default_initialDownlinkBWP(NR_BWP_Downlink_t *bwp, NR_ServingCellConfigCommon_t *servingcellconfigcommon);
-
-void fill_default_coresetZero(NR_ControlResourceSet_t *coreset0, NR_ServingCellConfigCommon_t *servingcellconfigcommon);
-
-void fill_default_searchSpaceZero(NR_SearchSpace_t *ss0);
-
void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
NR_ServingCellConfig_t *servingcellconfigdedicated,
NR_CellGroupConfig_t *secondaryCellGroup,
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 07493f332c9f5f1f07e781921b246e8fbb5d5ada..810e83fc43b183d403829852a493deabc2cd5c1a 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -238,6 +238,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
rrc->carrier.ssb_SubcarrierOffset,
rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts,
+ rrc->carrier.sib1_tda,
(NR_ServingCellConfigCommon_t *)rrc->carrier.servingcellconfigcommon,
0,
0, // WIP hardcoded rnti
@@ -330,6 +331,7 @@ char openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigu
rrc->carrier.ssb_SubcarrierOffset = configuration->ssb_SubcarrierOffset;
rrc->carrier.pdsch_AntennaPorts = configuration->pdsch_AntennaPorts;
rrc->carrier.pusch_AntennaPorts = configuration->pusch_AntennaPorts;
+ rrc->carrier.sib1_tda = configuration->sib1_tda;
rrc->carrier.do_CSIRS = configuration->do_CSIRS;
/// System Information INIT
pthread_mutex_init(&rrc->cell_info_mutex,NULL);
@@ -384,13 +386,14 @@ void apply_macrlc_config(gNB_RRC_INST *rrc,
const protocol_ctxt_t *const ctxt_pP ) {
rrc_mac_config_req_gNB(rrc->module_id,
- rrc->carrier.ssb_SubcarrierOffset,
- rrc->carrier.pdsch_AntennaPorts,
- rrc->carrier.pusch_AntennaPorts,
- NULL,
- 0,
- ue_context_pP->ue_context.rnti,
- get_softmodem_params()->sa ? ue_context_pP->ue_context.masterCellGroup : (NR_CellGroupConfig_t *)NULL);
+ rrc->carrier.ssb_SubcarrierOffset,
+ rrc->carrier.pdsch_AntennaPorts,
+ rrc->carrier.pusch_AntennaPorts,
+ rrc->carrier.sib1_tda,
+ NULL,
+ 0,
+ ue_context_pP->ue_context.rnti,
+ get_softmodem_params()->sa ? ue_context_pP->ue_context.masterCellGroup : (NR_CellGroupConfig_t *)NULL);
nr_rrc_rlc_config_asn1_req(ctxt_pP,
ue_context_pP->ue_context.SRB_configList,
@@ -528,6 +531,7 @@ rrc_gNB_generate_RRCSetup(
// ue_context_pP->ue_context.ue_rrc_inactivity_timer = 0;
// configure MAC
+
apply_macrlc_config(rrc,ue_context_pP,ctxt_pP);
apply_pdcp_config(ue_context_pP,ctxt_pP);
@@ -576,6 +580,7 @@ rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(
rrc_instance_p->carrier.ssb_SubcarrierOffset,
rrc_instance_p->carrier.pdsch_AntennaPorts,
rrc_instance_p->carrier.pusch_AntennaPorts,
+ rrc_instance_p->carrier.sib1_tda,
(NR_ServingCellConfigCommon_t *)rrc_instance_p->carrier.servingcellconfigcommon,
0,
ue_context_pP->ue_context.rnti,
@@ -1318,11 +1323,13 @@ rrc_gNB_process_RRCReconfigurationComplete(
NULL,
get_softmodem_params()->sa ? ue_context_pP->ue_context.masterCellGroup->rlc_BearerToAddModList : NULL);
/* Refresh SRBs/DRBs */
+
if (!NODE_IS_CU(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
rrc_mac_config_req_gNB(rrc->module_id,
rrc->carrier.ssb_SubcarrierOffset,
rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts,
+ rrc->carrier.sib1_tda,
NULL,
0,
ue_context_pP->ue_context.rnti,
diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c
index 0b7b0745aa0616f8dcaa4e0f095c6ca7335064f1..167f85ba48266db822fac9dd156b8c0f08ec06bd 100644
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
@@ -352,7 +352,8 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
rrc_mac_config_req_gNB(rrc->module_id,
rrc->carrier.ssb_SubcarrierOffset,
rrc->carrier.pdsch_AntennaPorts,
- rrc->carrier.pusch_AntennaPorts,
+ rrc->carrier.pusch_AntennaPorts,
+ rrc->carrier.sib1_tda,
rrc->carrier.servingcellconfigcommon,
1, // add_ue flag
ue_context_p->ue_id_rnti,
@@ -362,6 +363,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
rrc->carrier.ssb_SubcarrierOffset,
rrc->carrier.pdsch_AntennaPorts,
rrc->carrier.pusch_AntennaPorts,
+ rrc->carrier.sib1_tda,
NULL,
1, // add_ue flag
ue_context_p->ue_id_rnti,
diff --git a/openair2/RRC/NR/rrc_gNB_reconfig.c b/openair2/RRC/NR/rrc_gNB_reconfig.c
index b20b014b45e6c6283572a4593384d079495e2ce1..c263353acba4c07b6e03c745968d89553092f11f 100644
--- a/openair2/RRC/NR/rrc_gNB_reconfig.c
+++ b/openair2/RRC/NR/rrc_gNB_reconfig.c
@@ -49,87 +49,6 @@
#define false 0
#define true 1
-void fill_default_initialDownlinkBWP(NR_BWP_Downlink_t *bwp, NR_ServingCellConfigCommon_t *servingcellconfigcommon) {
- bwp->bwp_Id = 0;
- bwp->bwp_Common=calloc(1,sizeof(*bwp->bwp_Common));
- *bwp->bwp_Common = *servingcellconfigcommon->downlinkConfigCommon->initialDownlinkBWP;
-}
-
-void fill_default_coresetZero(NR_ControlResourceSet_t *coreset0, NR_ServingCellConfigCommon_t *servingcellconfigcommon) {
-
- coreset0->controlResourceSetId = 0;
-
- // frequencyDomainResources '11111111 00000000 00000000 00000000 00000000 00000'B,
- if(coreset0->frequencyDomainResources.buf == NULL) coreset0->frequencyDomainResources.buf = calloc(1,6);
- int curr_bwp = NRRIV2BW(servingcellconfigcommon->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth, 275);
- if (curr_bwp < 48)
- coreset0->frequencyDomainResources.buf[0] = 0xf0;
- else
- coreset0->frequencyDomainResources.buf[0] = 0xff;
- if (curr_bwp < 96)
- coreset0->frequencyDomainResources.buf[1] = 0;
- else
- coreset0->frequencyDomainResources.buf[1] = 0xff;
- coreset0->frequencyDomainResources.buf[2] = 0;
- coreset0->frequencyDomainResources.buf[3] = 0;
- coreset0->frequencyDomainResources.buf[4] = 0;
- coreset0->frequencyDomainResources.buf[5] = 0;
- coreset0->frequencyDomainResources.size = 6;
- coreset0->frequencyDomainResources.bits_unused = 3;
- coreset0->duration = 1;
- coreset0->cce_REG_MappingType.present=NR_ControlResourceSet__cce_REG_MappingType_PR_interleaved;
- coreset0->cce_REG_MappingType.choice.interleaved=calloc(1,sizeof(*coreset0->cce_REG_MappingType.choice.interleaved));
- coreset0->cce_REG_MappingType.choice.interleaved->reg_BundleSize = NR_ControlResourceSet__cce_REG_MappingType__interleaved__reg_BundleSize_n6;
- coreset0->cce_REG_MappingType.choice.interleaved->interleaverSize = NR_ControlResourceSet__cce_REG_MappingType__interleaved__interleaverSize_n2;
- coreset0->cce_REG_MappingType.choice.interleaved->shiftIndex = servingcellconfigcommon->physCellId;
- coreset0->precoderGranularity = NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle;
-
- if(coreset0->tci_StatesPDCCH_ToAddList == NULL) coreset0->tci_StatesPDCCH_ToAddList = calloc(1,sizeof(*coreset0->tci_StatesPDCCH_ToAddList));
-
- NR_TCI_StateId_t *tci[8];
- for (int i=0;i<8;i++) {
- tci[i]=calloc(1,sizeof(*tci[i]));
- *tci[i] = i;
- ASN_SEQUENCE_ADD(&coreset0->tci_StatesPDCCH_ToAddList->list,tci[i]);
- }
- coreset0->tci_StatesPDCCH_ToReleaseList = NULL;
- coreset0->tci_PresentInDCI = NULL;
- coreset0->pdcch_DMRS_ScramblingID = NULL;
-
-}
-
-void fill_default_searchSpaceZero(NR_SearchSpace_t *ss0) {
-
- if(ss0->controlResourceSetId == NULL) ss0->controlResourceSetId=calloc(1,sizeof(*ss0->controlResourceSetId));
- if(ss0->monitoringSymbolsWithinSlot == NULL) ss0->monitoringSymbolsWithinSlot = calloc(1,sizeof(*ss0->monitoringSymbolsWithinSlot));
- if(ss0->monitoringSymbolsWithinSlot->buf == NULL) ss0->monitoringSymbolsWithinSlot->buf = calloc(1,2);
- if(ss0->nrofCandidates == NULL) ss0->nrofCandidates = calloc(1,sizeof(*ss0->nrofCandidates));
- if(ss0->searchSpaceType == NULL) ss0->searchSpaceType = calloc(1,sizeof(*ss0->searchSpaceType));
- if(ss0->searchSpaceType->choice.common == NULL) ss0->searchSpaceType->choice.common=calloc(1,sizeof(*ss0->searchSpaceType->choice.common));
- if(ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 == NULL) ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 = calloc(1,sizeof(*ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0));
-
- ss0->searchSpaceId = 0;
- *ss0->controlResourceSetId = 0;
- ss0->monitoringSlotPeriodicityAndOffset = calloc(1,sizeof(*ss0->monitoringSlotPeriodicityAndOffset));
- ss0->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
- ss0->duration=NULL;
-
- // should be '1100 0000 0000 00'B (LSB first!), first two symols in slot, adjust if needed
- ss0->monitoringSymbolsWithinSlot->buf[1] = 0;
- ss0->monitoringSymbolsWithinSlot->buf[0] = (1<<7);
- ss0->monitoringSymbolsWithinSlot->size = 2;
- ss0->monitoringSymbolsWithinSlot->bits_unused = 2;
-
- // FIXME: update values from TS38.213 Section 10.1 Table 10.1-1: CCE aggregation levels and maximum number of PDCCH candidates per CCE aggregation level for CSS sets configured by searchSpaceSIB1
- ss0->nrofCandidates->aggregationLevel1 = NR_SearchSpace__nrofCandidates__aggregationLevel1_n0;
- ss0->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n0;
- ss0->nrofCandidates->aggregationLevel4 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n2;
- ss0->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
- ss0->nrofCandidates->aggregationLevel16 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;
-
- ss0->searchSpaceType->present = NR_SearchSpace__searchSpaceType_PR_common;
-}
-
void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
NR_ServingCellConfig_t *servingcellconfigdedicated,
NR_CellGroupConfig_t *secondaryCellGroup,
@@ -548,9 +467,11 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
ASN_SEQUENCE_ADD(&bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList->list,ss);
-
- bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=calloc(1,sizeof(*bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1));
- *bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=0;
+ bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=NULL;
+ if(get_softmodem_params()->sa) {
+ bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=calloc(1,sizeof(*bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1));
+ *bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=0;
+ }
bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceOtherSystemInformation=NULL;
bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->pagingSearchSpace=NULL;
bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->ra_SearchSpace=calloc(1,sizeof(*bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->ra_SearchSpace));
diff --git a/openair2/RRC/NR_UE/rrc_UE.c b/openair2/RRC/NR_UE/rrc_UE.c
index c988ec9b80202555d485462b95e2b9c84e58a340..f272c1601792f5390f93063b5c552107a1a58140 100644
--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
@@ -201,42 +201,38 @@ extern rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t * con
struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
// from LTE-RRC DL-DCCH RRCConnectionReconfiguration nr-secondary-cell-group-config (encoded)
-int8_t nr_rrc_ue_decode_secondary_cellgroup_config(
- const module_id_t module_id,
- const uint8_t *buffer,
- const uint32_t size ){
+int8_t nr_rrc_ue_decode_secondary_cellgroup_config(const module_id_t module_id,
+ const uint8_t *buffer,
+ const uint32_t size){
- NR_CellGroupConfig_t *cell_group_config = NULL;
- uint32_t i;
-
- asn_dec_rval_t dec_rval = uper_decode_complete( NULL,
- &asn_DEF_NR_CellGroupConfig,
- (void **)&cell_group_config,
- (uint8_t *)buffer,
- size );
-
- if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
- printf("NR_CellGroupConfig decode error\n");
- for (i=0; i<size; i++){
- printf("%02x ",buffer[i]);
- }
- printf("\n");
- // free the memory
- SEQUENCE_free( &asn_DEF_NR_CellGroupConfig, (void *)cell_group_config, 1 );
- return -1;
- }
+ NR_CellGroupConfig_t *cell_group_config = NULL;
+ uint32_t i;
- if(NR_UE_rrc_inst[module_id].scell_group_config == NULL){
- NR_UE_rrc_inst[module_id].scell_group_config = cell_group_config;
- nr_rrc_ue_process_scg_config(module_id,cell_group_config);
- }else{
- nr_rrc_ue_process_scg_config(module_id,cell_group_config);
- SEQUENCE_free(&asn_DEF_NR_CellGroupConfig, (void *)cell_group_config, 0);
- }
+ asn_dec_rval_t dec_rval = uper_decode(NULL,
+ &asn_DEF_NR_CellGroupConfig,
+ (void **)&cell_group_config,
+ (uint8_t *)buffer,
+ size, 0, 0);
- //nr_rrc_mac_config_req_ue( 0,0,0,NULL, cell_group_config->mac_CellGroupConfig, cell_group_config->physicalCellGroupConfig, cell_group_config->spCellConfig );
+ if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
+ printf("NR_CellGroupConfig decode error\n");
+ for (i=0; i<size; i++)
+ printf("%02x ",buffer[i]);
+ printf("\n");
+ // free the memory
+ SEQUENCE_free( &asn_DEF_NR_CellGroupConfig, (void *)cell_group_config, 1 );
+ return -1;
+ }
- return 0;
+ if(NR_UE_rrc_inst[module_id].scell_group_config == NULL){
+ NR_UE_rrc_inst[module_id].scell_group_config = cell_group_config;
+ nr_rrc_ue_process_scg_config(module_id,cell_group_config);
+ }else{
+ nr_rrc_ue_process_scg_config(module_id,cell_group_config);
+ SEQUENCE_free(&asn_DEF_NR_CellGroupConfig, (void *)cell_group_config, 0);
+ }
+
+ return 0;
}
int8_t nr_rrc_ue_process_RadioBearerConfig(NR_RadioBearerConfig_t *RadioBearerConfig){
@@ -262,25 +258,33 @@ int8_t nr_rrc_ue_process_rrcReconfiguration(const module_id_t module_id, NR_RRCR
}
}
if(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration->secondaryCellGroup != NULL){
- NR_CellGroupConfig_t *cellGroupConfig = NULL;
- uper_decode(NULL,
- &asn_DEF_NR_CellGroupConfig, //might be added prefix later
- (void **)&cellGroupConfig,
- (uint8_t *)rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration->secondaryCellGroup->buf,
- rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration->secondaryCellGroup->size, 0, 0);
-
- xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void*)cellGroupConfig);
-
- if(NR_UE_rrc_inst[module_id].cell_group_config == NULL){
- // first time receive the configuration, just use the memory allocated from uper_decoder. TODO this is not good implementation, need to maintain RRC_INST own structure every time.
- NR_UE_rrc_inst[module_id].cell_group_config = cellGroupConfig;
- nr_rrc_ue_process_scg_config(module_id,cellGroupConfig);
- }else{
- // after first time, update it and free the memory after.
- SEQUENCE_free(&asn_DEF_NR_CellGroupConfig, (void *)NR_UE_rrc_inst[module_id].cell_group_config, 0);
- NR_UE_rrc_inst[module_id].cell_group_config = cellGroupConfig;
- nr_rrc_ue_process_scg_config(module_id,cellGroupConfig);
+
+ if(get_softmodem_params()->sa) {
+
+ NR_CellGroupConfig_t *cellGroupConfig = NULL;
+ uper_decode(NULL,
+ &asn_DEF_NR_CellGroupConfig, //might be added prefix later
+ (void **)&cellGroupConfig,
+ (uint8_t *)rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration->secondaryCellGroup->buf,
+ rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration->secondaryCellGroup->size, 0, 0);
+
+ xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void*)cellGroupConfig);
+
+ if(NR_UE_rrc_inst[module_id].cell_group_config == NULL){
+ // first time receive the configuration, just use the memory allocated from uper_decoder. TODO this is not good implementation, need to maintain RRC_INST own structure every time.
+ NR_UE_rrc_inst[module_id].cell_group_config = cellGroupConfig;
+ nr_rrc_ue_process_scg_config(module_id,cellGroupConfig);
+ }else{
+ // after first time, update it and free the memory after.
+ SEQUENCE_free(&asn_DEF_NR_CellGroupConfig, (void *)NR_UE_rrc_inst[module_id].cell_group_config, 0);
+ NR_UE_rrc_inst[module_id].cell_group_config = cellGroupConfig;
+ nr_rrc_ue_process_scg_config(module_id,cellGroupConfig);
+ }
}
+ else
+ nr_rrc_ue_decode_secondary_cellgroup_config(module_id,
+ rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration->secondaryCellGroup->buf,
+ rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration->secondaryCellGroup->size);
}
if(rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration->measConfig != NULL){
if(NR_UE_rrc_inst[module_id].meas_config == NULL){
@@ -317,7 +321,7 @@ int8_t nr_rrc_ue_process_meas_config(NR_MeasConfig_t *meas_config){
int8_t nr_rrc_ue_process_scg_config(const module_id_t module_id, NR_CellGroupConfig_t *cell_group_config){
int i;
- if(NR_UE_rrc_inst[module_id].cell_group_config==NULL){
+ if(cell_group_config==NULL){
// initial list
if(cell_group_config->spCellConfig != NULL){
if(cell_group_config->spCellConfig->spCellConfigDedicated != NULL){
@@ -512,7 +516,8 @@ NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* rrc_config_path){
fclose(fd);
process_nsa_message(NR_UE_rrc_inst, nr_RadioBearerConfigX_r15, buffer,msg_len);
}
- }else{
+ }
+ else{
NR_UE_rrc_inst = NULL;
}
@@ -551,8 +556,8 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
const uint8_t gNB_index,
uint8_t *const bufferP,
const uint8_t buffer_len ){
- NR_BCCH_BCH_Message_t *bcch_message = NULL;
+ NR_BCCH_BCH_Message_t *bcch_message = NULL;
if (NR_UE_rrc_inst[module_id].mib != NULL)
SEQUENCE_free( &asn_DEF_NR_BCCH_BCH_Message, (void *)bcch_message, 1 );
@@ -565,21 +570,21 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
buffer_len );
if ((dec_rval.code != RC_OK) || (dec_rval.consumed == 0)) {
- LOG_E(NR_RRC,"NR_BCCH_BCH decode error\n");
- // free the memory
- SEQUENCE_free( &asn_DEF_NR_BCCH_BCH_Message, (void *)bcch_message, 1 );
- return -1;
+ LOG_E(NR_RRC,"NR_BCCH_BCH decode error\n");
+ // free the memory
+ SEQUENCE_free( &asn_DEF_NR_BCCH_BCH_Message, (void *)bcch_message, 1 );
+ return -1;
}
else {
// link to rrc instance
- SEQUENCE_free( &asn_DEF_NR_MIB, (void *)NR_UE_rrc_inst[module_id].mib, 1 );
- NR_UE_rrc_inst[module_id].mib = bcch_message->message.choice.mib;
+ SEQUENCE_free( &asn_DEF_NR_MIB, (void *)NR_UE_rrc_inst[module_id].mib, 1 );
+ NR_UE_rrc_inst[module_id].mib = bcch_message->message.choice.mib;
//memcpy( (void *)mib,
// (void *)&bcch_message->message.choice.mib,
// sizeof(NR_MIB_t) );
- nr_rrc_mac_config_req_ue( 0, 0, 0, NR_UE_rrc_inst[module_id].mib, NULL, NULL, NULL);
- }
+ nr_rrc_mac_config_req_ue( 0, 0, 0, NR_UE_rrc_inst[module_id].mib, NULL, NULL, NULL);
+ }
return 0;
}
@@ -1004,7 +1009,6 @@ int nr_decode_SI( const protocol_ctxt_t *const ctxt_pP, const uint8_t gNB_index
}
if (new_sib == 1) {
NR_UE_rrc_inst[ctxt_pP->module_id].Info[gNB_index].SIcnt++;
-
if (NR_UE_rrc_inst[ctxt_pP->module_id].Info[gNB_index].SIcnt == sib1->si_SchedulingInfo->schedulingInfoList.list.count)
nr_rrc_set_sub_state( ctxt_pP->module_id, RRC_SUB_STATE_IDLE_SIB_COMPLETE );
@@ -1125,13 +1129,12 @@ int8_t nr_rrc_ue_generate_ra_msg(module_id_t module_id, uint8_t gNB_index) {
return 0;
}
-int8_t nr_rrc_ue_decode_NR_BCCH_DL_SCH_Message(
- module_id_t module_id,
- const uint8_t gNB_index,
- uint8_t *const Sdu,
- const uint8_t Sdu_len,
- const uint8_t rsrq,
- const uint8_t rsrp) {
+int8_t nr_rrc_ue_decode_NR_BCCH_DL_SCH_Message(module_id_t module_id,
+ const uint8_t gNB_index,
+ uint8_t *const Sdu,
+ const uint8_t Sdu_len,
+ const uint8_t rsrq,
+ const uint8_t rsrp) {
NR_BCCH_DL_SCH_Message_t *bcch_message = NULL;
NR_SIB1_t *sib1 = NR_UE_rrc_inst[module_id].sib1[gNB_index];
@@ -1190,8 +1193,6 @@ int8_t nr_rrc_ue_decode_NR_BCCH_DL_SCH_Message(
check_requested_SI_List(module_id, NR_UE_rrc_inst[module_id].requested_SI_List, *sib1);
if( nr_rrc_get_state(module_id) <= RRC_STATE_IDLE_NR ) {
NR_UE_rrc_inst[module_id].ra_trigger = INITIAL_ACCESS_FROM_RRC_IDLE;
- // TODO: remove flag after full RA procedures implemented
- // get_softmodem_params()->do_ra = 1;
LOG_D(PHY,"Setting state to NR_RRC_SI_RECEIVED\n");
nr_rrc_set_state (module_id, NR_RRC_SI_RECEIVED);
}
diff --git a/openair2/RRC/NR_UE/rrc_defs.h b/openair2/RRC/NR_UE/rrc_defs.h
index e417b9f0b478130a8cfc78a57dcd680b7572b75f..b79cbb4bae5107bbeaff3f04306c3531cc629e20 100644
--- a/openair2/RRC/NR_UE/rrc_defs.h
+++ b/openair2/RRC/NR_UE/rrc_defs.h
@@ -105,9 +105,8 @@ typedef struct NR_UE_RRC_INST_s {
NR_MeasConfig_t *meas_config;
NR_CellGroupConfig_t *cell_group_config;
- NR_CellGroupConfig_t *scell_group_config;
NR_ServingCellConfigCommonSIB_t *servingCellConfigCommonSIB;
-
+ NR_CellGroupConfig_t *scell_group_config;
NR_RadioBearerConfig_t *radio_bearer_config;
NR_MeasObjectToAddMod_t *MeasObj[NB_CNX_UE][MAX_MEAS_OBJ];
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
index 483fd34f2a1e910ce7ff449e4ad0e3f3b4966a77..bfb268fef848c35573ce959334c3a96f26abaaea 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
@@ -34,6 +34,8 @@ gNBs =
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts = 1;
+ pusch_AntennaPorts = 1;
+ sib1_tda = 0;
servingCellConfigCommon = (
{
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
index dcb3010f20386b2fc13f7bdbc8c00a72270a87d0..7b3535ce1fbc0f1e8213ed967eee082a00487d4b 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
@@ -26,6 +26,8 @@ gNBs =
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts = 1;
+ pusch_AntennaPorts = 1;
+ sib1_tda = 0;
servingCellConfigCommon = (
{
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
index 753bd0bed3ef58dac322a104f5bc70c7ecfae2a3..1b0c15ea7aaa5e7776e6efa03e964c3925f1dae8 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
@@ -38,7 +38,8 @@ gNBs =
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts = 1;
-
+ pusch_AntennaPorts = 1;
+ sib1_tda = 0;
servingCellConfigCommon = (
{
#spCellConfigCommon
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
index e573d3499d297137142785dfdf95082d3e826143..3fd543f70fcdb8d61dd1d18bc6b4e7592e6f27ef 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
@@ -35,6 +35,7 @@ gNBs =
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts = 1;
pusch_AntennaPorts = 1;
+ sib1_tda = 0;
pdcch_ConfigSIB1 = (
{
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
index 0cac691e741a2d2e3dc7e452bb5844cfdd5fefcd..e69607ee574213875a3b76bb7a6a16f65ab50d55 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -35,6 +35,7 @@ gNBs =
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts = 1;
pusch_AntennaPorts = 1;
+ sib1_tda = 0;
pdcch_ConfigSIB1 = (
{
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index f9ff03e422d82e349342c094e9a8e33d4df3945f..a67b58d61a90c63fa2b3ef836c76d4f4d022ef89 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -525,6 +525,8 @@ int main ( int argc, char **argv )
int ru_id;
int node_type = ngran_eNB;
+ start_background_system();
+
if ( load_configmodule(argc,argv,0) == NULL) {
exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
}
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 026e6d4a6061afc262b2a9f31d9c45c0ce371902..25bbef0bc6a1b37294c19ada7ad263ee0639db6f 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -757,6 +757,7 @@ int main( int argc, char **argv ) {
printf("sync sent\n");
/*
printf("About to call end_configmodule() from %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
+ We have to set properly PARAMFLAG_NOFREE
end_configmodule();
printf("Called end_configmodule() from %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
*/