Browse Source

qcacmn: Enable the scheduler based timer

Exporting the QDF timer API's required for enabling scheduler based timers.
Fixed the compilation issues when scheduler code is enabled.

Change-Id: I148bb17c361fdff101fab3711af3c0a6c4158963
CRs-Fixed: 1117366
Vivek 8 years ago
parent
commit
315fe40bee
2 changed files with 3 additions and 9 deletions
  1. 2 8
      qdf/linux/src/qdf_mc_timer.c
  2. 1 1
      scheduler/src/scheduler_api.c

+ 2 - 8
qdf/linux/src/qdf_mc_timer.c

@@ -291,11 +291,7 @@ QDF_STATUS qdf_mc_timer_init_debug(qdf_mc_timer_t *timer,
 		init_timer_deferrable(&(timer->platform_info.timer));
 	else
 		init_timer(&(timer->platform_info.timer));
-#ifdef NAPIER_CODE
 	timer->platform_info.timer.function = scheduler_timer_callback;
-#else
-	timer->platform_info.timer.function = NULL;
-#endif
 	timer->platform_info.timer.data = (unsigned long)timer;
 	timer->callback = callback;
 	timer->user_data = user_data;
@@ -306,6 +302,7 @@ QDF_STATUS qdf_mc_timer_init_debug(qdf_mc_timer_t *timer,
 
 	return QDF_STATUS_SUCCESS;
 }
+EXPORT_SYMBOL(qdf_mc_timer_init_debug);
 #else
 QDF_STATUS qdf_mc_timer_init(qdf_mc_timer_t *timer, QDF_TIMER_TYPE timer_type,
 			     qdf_mc_timer_callback_t callback,
@@ -327,11 +324,7 @@ QDF_STATUS qdf_mc_timer_init(qdf_mc_timer_t *timer, QDF_TIMER_TYPE timer_type,
 		init_timer_deferrable(&(timer->platform_info.timer));
 	else
 		init_timer(&(timer->platform_info.timer));
-#ifdef NAPIER_CODE
 	timer->platform_info.timer.function = scheduler_timer_callback;
-#else
-	timer->platform_info.timer.function = NULL;
-#endif
 	timer->platform_info.timer.data = (unsigned long)timer;
 	timer->callback = callback;
 	timer->user_data = user_data;
@@ -342,6 +335,7 @@ QDF_STATUS qdf_mc_timer_init(qdf_mc_timer_t *timer, QDF_TIMER_TYPE timer_type,
 
 	return QDF_STATUS_SUCCESS;
 }
+EXPORT_SYMBOL(qdf_mc_timer_init);
 #endif
 
 /**

+ 1 - 1
scheduler/src/scheduler_api.c

@@ -41,7 +41,7 @@ static void scheduler_flush_mqs(struct scheduler_ctx *sched_ctx)
 	 * shall be freed first
 	 */
 	QDF_TRACE(QDF_MODULE_ID_SCHEDULER, QDF_TRACE_LEVEL_INFO,
-		  ("Flushing scheduler message queue"));
+		  "%s: Flushing scheduler message queue", __func__);
 
 	if (!sched_ctx) {
 		QDF_ASSERT(0);