make frame/slot in ul_config dl_config instead of upper structures value, fix modulo computation of frame

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h

@@ -95,14 +95,10 @@ typedef struct {
     uint32_t gNB_index;
     /// component carrier id
     int cc_id;
-    /// frame 
-    frame_t frame_rx;
-    /// slot rx
-    uint32_t slot_rx;
     /// frame tx
-    frame_t frame_tx;
+    frame_t frame;
     /// slot tx
-    uint32_t slot_tx;
+    uint32_t slot;
 
     /// dci reception indication structure
     fapi_nr_dci_indication_t *dci_ind;
@@ -142,17 +138,13 @@ typedef struct {
 
 // Downlink subframe P7
 
-
+struct PHY_VARS_NR_UE_s;
+struct NR_UE_MAC_INST_s;
 typedef struct {
     /// module id
     module_id_t module_id; 
     /// component carrier id
     int CC_id;
-    /// frame
-    frame_t frame;
-    /// slot
-    int slot;
-
     /// NR UE FAPI-like P7 message, direction: L2 to L1
     /// downlink transmission configuration request structure
     fapi_nr_dl_config_request_t *dl_config;
@@ -172,6 +164,7 @@ typedef struct {
     /// PHY data structure initially passed on to L2 via the nr_downlink_indication_t and
     /// returned to L1 via nr_scheduled_response_t
     void *phy_data;
+    struct NR_UE_MAC_INST_s *mac;
 } nr_scheduled_response_t;
 
 typedef struct {
@@ -335,33 +328,5 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info);
 
 int nr_ue_dcireq(nr_dcireq_t *dcireq);
 
-//  TODO check
-/**\brief handle BCCH-BCH message from dl_indication
-   \param phy_data        PHY structure to be filled in by the callee in the FAPI call (L1 caller -> indication to L2 -> FAPI call to L1 callee)
-   \param pduP            pointer to bch pdu
-   \param additional_bits corresponding to 38.212 ch.7
-   \param ssb_index       SSB index within 0 - (L_ssb-1) corresponding to 38.331 ch.13 parameter i
-   \param ssb_length      corresponding to L1 parameter L_ssb 
-   \param cell_id         cell id */
-int handle_bcch_bch(module_id_t module_id,
-                    int cc_id,
-                    unsigned int gNB_index,
-                    void *phy_data,
-                    uint8_t *pduP,
-                    unsigned int additional_bits,
-                    uint32_t ssb_index,
-                    uint32_t ssb_length,
-                    uint16_t ssb_start_subcarrier,
-                    uint16_t cell_id);
-
-//  TODO check
-/**\brief handle BCCH-DL-SCH message from dl_indication
-   \param pdu_len   length(bytes) of pdu
-   \param pduP      pointer to pdu*/
-int handle_bcch_dlsch(module_id_t module_id, int cc_id, unsigned int gNB_index, uint8_t ack_nack, uint8_t *pduP, uint32_t pdu_len);
-
-int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, frame_t frame, int slot, fapi_nr_dci_indication_pdu_t *dci);
-
-
 #endif