diff --git a/nfapi/oai_integration/nfapi_vnf.c b/nfapi/oai_integration/nfapi_vnf.c
index 74e999528c51fc7d40f4eea48d56cd069a7ced04..d3df4edf25836bdaf3949417e1c10cca5a89688f 100644
--- a/nfapi/oai_integration/nfapi_vnf.c
+++ b/nfapi/oai_integration/nfapi_vnf.c
@@ -31,7 +31,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "nfapi_interface.h"
+#include "nfapi_nr_interface.h"
#include "nfapi_vnf_interface.h"
#include "nfapi.h"
#include "vendor_ext.h"
@@ -1161,6 +1161,25 @@ int oai_nfapi_dl_config_req(nfapi_dl_config_request_t *dl_config_req)
return retval;
}
+int oai_nfapi_nr_dl_config_req(nfapi_nr_dl_config_request_t *dl_config_req)
+{
+ nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
+
+ dl_config_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
+
+ int retval = nfapi_vnf_p7_dl_config_req(p7_config, dl_config_req);
+
+ dl_config_req->dl_config_request_body.number_pdcch_ofdm_symbols = 1;
+ dl_config_req->dl_config_request_body.number_dci = 0;
+ dl_config_req->dl_config_request_body.number_pdu = 0;
+ dl_config_req->dl_config_request_body.number_pdsch_rnti = 0;
+
+ if (retval!=0) {
+ LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
+ }
+ return retval;
+}
+
int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req)
{
nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
index 9a14755f43485164447f57665b4318e7906f5154..cc935fc59e95a102d82f35d8da6e90a03613b853 100644
--- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
@@ -331,7 +331,7 @@ typedef struct {
typedef struct {
nfapi_tl_t tl;
- //uint8_t number_pdcch_ofdm_symbols;
+ uint8_t number_pdcch_ofdm_symbols;
uint8_t number_dci;
uint16_t number_pdu;
uint8_t number_pdsch_rnti;
diff --git a/openair1/SCHED_NR/fapi_nr_l1.c b/openair1/SCHED_NR/fapi_nr_l1.c
new file mode 100644
index 0000000000000000000000000000000000000000..9140e4fcf234ae46de791529d846918832aaec22
--- /dev/null
+++ b/openair1/SCHED_NR/fapi_nr_l1.c
@@ -0,0 +1,114 @@
+/*
+ * 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
+ */
+
+/*! \file fapi_l1.c
+ * \brief functions for FAPI L1 interface
+ * \author R. Knopp
+ * \date 2017
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr
+ * \note
+ * \warning
+ */
+#include "fapi_nr_l1.h"
+
+int oai_nfapi_nr_dl_config_req(nfapi_nr_dl_config_request_t *dl_config_req);
+int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req);
+
+extern uint8_t nfapi_mode;
+
+void handle_nr_nfapi_bch_pdu(PHY_VARS_gNB *gNB,
+ gNB_rxtx_proc_t *proc,
+ nfapi_nr_dl_config_request_pdu_t *dl_config_pdu,
+ uint8_t *sdu)
+{
+
+ AssertFatal(dl_config_pdu->bch_pdu_rel15.length == 3, "BCH PDU has length %d != 3\n",
+ dl_config_pdu->bch_pdu_rel15.length);
+
+ //LOG_D(PHY,"bch_pdu: %x,%x,%x\n",sdu[0],sdu[1],sdu[2]);
+ gNB->pbch_pdu[0] = sdu[2];
+ gNB->pbch_pdu[1] = sdu[1];
+ gNB->pbch_pdu[2] = sdu[0];
+
+ // adjust transmit amplitude here based on NFAPI info
+}
+
+void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
+ PHY_VARS_gNB *gNB;
+ gNB_rxtx_proc_t *proc;
+ // copy data from L2 interface into L1 structures
+ module_id_t Mod_id = Sched_INFO->module_id;
+ uint8_t CC_id = Sched_INFO->CC_id;
+ nfapi_nr_dl_config_request_t *DL_req = Sched_INFO->DL_req;
+ nfapi_tx_request_t *TX_req = Sched_INFO->TX_req;
+ frame_t frame = Sched_INFO->frame;
+ sub_frame_t subframe = Sched_INFO->subframe;
+
+ AssertFatal(RC.gNB!=NULL,"RC.gNB is null\n");
+ AssertFatal(RC.gNB[Mod_id]!=NULL,"RC.gNB[%d] is null\n",Mod_id);
+ AssertFatal(RC.gNB[Mod_id][CC_id]!=NULL,"RC.gNB[%d][%d] is null\n",Mod_id,CC_id);
+
+ gNB = RC.gNB[Mod_id][CC_id];
+ proc = &gNB->proc.proc_rxtx[0];
+
+ uint8_t number_dl_pdu = DL_req->dl_config_request_body.number_pdu;
+
+ nfapi_nr_dl_config_request_pdu_t *dl_config_pdu;
+
+ int i;
+
+ LOG_D(PHY,"NFAPI: Sched_INFO:SFN/SF:%04d%d DL_req:SFN/SF:%04d%d:dl_pdu:%d tx_req:SFN/SF:%04d%d:pdus:%d \n",
+ frame,subframe,
+ NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),number_dl_pdu,
+ NFAPI_SFNSF2SFN(TX_req->sfn_sf),NFAPI_SFNSF2SF(TX_req->sfn_sf),TX_req->tx_request_body.number_of_pdus);
+
+ int do_oai =0;
+ int dont_send =0;
+
+ for (i=0;i<number_dl_pdu;i++) {
+ dl_config_pdu = &DL_req->dl_config_request_body.dl_config_pdu_list[i];
+ //LOG_D(PHY,"NFAPI: dl_pdu %d : type %d\n",i,dl_config_pdu->pdu_type);
+ switch (dl_config_pdu->pdu_type) {
+ case NFAPI_NR_DL_CONFIG_BCH_PDU_TYPE:
+ AssertFatal(dl_config_pdu->bch_pdu_rel15.pdu_index < TX_req->tx_request_body.number_of_pdus,
+ "bch_pdu_rel8.pdu_index>=TX_req->number_of_pdus (%d>%d)\n",
+ dl_config_pdu->bch_pdu_rel15.pdu_index,
+ TX_req->tx_request_body.number_of_pdus);
+ gNB->pbch_configured=1;
+ do_oai=1;
+
+ handle_nr_nfapi_bch_pdu(gNB,
+ proc,
+ dl_config_pdu,
+ TX_req->tx_request_body.tx_pdu_list[dl_config_pdu->bch_pdu_rel15.pdu_index].segments[0].segment_data);
+ break;
+ }
+ }
+
+ if (nfapi_mode && do_oai && !dont_send) {
+ oai_nfapi_tx_req(Sched_INFO->TX_req);
+
+ oai_nfapi_nr_dl_config_req(Sched_INFO->DL_req); // DJP - .dl_config_request_body.dl_config_pdu_list[0]); // DJP - FIXME TODO - yuk - only copes with 1 pdu
+ }
+
+}
\ No newline at end of file
diff --git a/openair1/SCHED_NR/fapi_nr_l1.h b/openair1/SCHED_NR/fapi_nr_l1.h
new file mode 100644
index 0000000000000000000000000000000000000000..a1c068c606543e19fc8b5ebb6bbfcdf2b594120d
--- /dev/null
+++ b/openair1/SCHED_NR/fapi_nr_l1.h
@@ -0,0 +1,41 @@
+/*
+ * 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
+ */
+
+/*! \file fapi_l1.h
+ * \brief function prototypes for FAPI L1 interface
+ * \author R. Knopp
+ * \date 2017
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr
+ * \note
+ * \warning
+ */
+
+#include "PHY/defs_gNB.h"
+#include "PHY/phy_extern.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"
+#include "SCHED/sched_eNB.h"
+#include "SCHED/sched_common.h"
+#include "SCHED_NR/sched_nr.h"
+#include "nfapi_nr_interface.h"
+
+void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO);
\ No newline at end of file