various

radio/ETHERNET/oran/5g/oran-config.c

@@ -340,7 +340,7 @@ void print_fh_config(const struct xran_fh_config *fh_config)
     fh_config->nCC,
     fh_config->neAxc,
     fh_config->neAxcUl,
-    fh_config->prach_eAxc_offset,
+    0, //fh_config->prach_eAxc_offset,
     fh_config->nAntElmTRx,
     fh_config->nDLFftSize,
     fh_config->nULFftSize,

radio/ETHERNET/oran/5g/oran-init.c

@@ -415,7 +415,6 @@ static void oran_allocate_buffers(void *handle,
 
 int *oai_oran_initialize(const openair0_config_t *openair0_cfg)
 {
-  int32_t o_xu_id = 0;
   int32_t xret = 0;
 
   struct xran_fh_init init = {0};
@@ -430,18 +429,22 @@ int *oai_oran_initialize(const openair0_config_t *openair0_cfg)
   //     exit(-1);
   // }
 
-  xret = xran_init(0, NULL, &init, NULL, &gxran_handle);
-  if (xret != XRAN_STATUS_SUCCESS) {
-    printf("xran_init failed %d\n", xret);
-    exit(-1);
-  }
+  //xret = xran_init(0, NULL, &init, NULL, &gxran_handle);
+  //if (xret != XRAN_STATUS_SUCCESS) {
+  //  printf("xran_init failed %d\n", xret);
+  //  exit(-1);
+  //}
 
   /** process all the O-RU|O-DU for use case */
-  for (o_xu_id = 0; o_xu_id < 1; o_xu_id++) {
-    if (!set_fh_config(openair0_cfg, &gxran_fh_config[o_xu_id]))
-      exit(124);
+  for (int32_t o_xu_id = 0; o_xu_id < 1; o_xu_id++) {
+    if (!set_fh_config(o_xu_id, openair0_cfg, &gxran_fh_config[o_xu_id])) {
+      printf("could not read FHI 7.2/RU-specific config\n");
+      return NULL;
+    }
     print_fh_config(&gxran_fh_config[o_xu_id]);
 
+    exit(1);
+
     xret = xran_open(gxran_handle, &gxran_fh_config[o_xu_id]);
     if (xret != XRAN_STATUS_SUCCESS) {
       printf("xran_open failed %d\n", xret);