correct scheduler typedefs

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -1174,8 +1174,8 @@ schedule_ulsch(module_id_t module_idP, frame_t frameP,
 		}
 
 		// Run each enabled slice-specific schedulers one by one
-		slice_sched_ul[i](module_idP, i,frameP, subframeP, sched_subframe,
+                /* TODO Navid What is the right call for this message? */
-						  first_rb);
+		slice_sched_ul[i](module_idP, i, frameP, subframeP, sched_subframe, first_rb);
 	}
 
 

openair2/LAYER2/MAC/proto.h

@@ -39,20 +39,22 @@
  * slice specific scheduler
  */
 /* TODO Navid: Protocol__FlexranMessage -> unknown when compiling without
- * FlexRAN, what to do with it? */
+ * FlexRAN, what to do with it? Matches schedule_ue_spec now */
 typedef void (*slice_scheduler_dl)(module_id_t mod_id,
-				int slice_id,
+				   slice_id_t  slice_id,
-				uint32_t frame,
-				uint32_t subframe,
-				int *mbsfn_flag/*,
-				Protocol__FlexranMessage **dl_info*/);
-
-typedef void (*slice_scheduler_ul)(module_id_t mod_id,
 				   frame_t     frame,
-				unsigned char cooperation_flag,
+				   sub_frame_t subframe,
-				uint32_t      subframe,
+				   int        *mbsfn_flag
-				unsigned char sched_subframe/*,
+                                /* Protocol__FlexranMessage **dl_info*/);
-				Protocol__FlexranMessage **ul_info*/);
+
+/* TODO Navid: the same as above, matches schedule_ulsch_rnti now */
+typedef void (*slice_scheduler_ul)(module_id_t mod_id,
+                                   slice_id_t  slice_id,
+				   frame_t       frame,
+				   sub_frame_t   subframe,
+				   unsigned char sched_subframe,
+                                   uint16_t     *first_rb
+                                   /* Protocol__FlexranMessage **ul_info*/);
 
 /** \fn void schedule_mib(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
 \brief MIB scheduling for PBCH. This function requests the MIB from RRC and provides it to L1.