From 9e8c06563ef46be4205efc9c7310da4e8f58ce5a Mon Sep 17 00:00:00 2001
From: Dan Kalowsky <daniel.kalowsky@intel.com>
Date: Thu, 30 Apr 2015 14:22:47 -0700
Subject: [PATCH] Renaming GROUP_TASK_ macros to TASK_GROUP_

Updating micro kernel functions to follow a consistent naming convention.
Part of that process is the removal of camelCase naming conventions for the
preferred_underscore_method.  This specific change maps the macro to the
function naming used by the OS.

Change accomplished with the following script:

#!/bin/bash
echo "Searching for ${1} to replace with ${2}"

echo "Checking C, CPP, H, HPP, and s files..."
find . -type f \( -iname \*.[ch] -o -iname \*.[ch]pp -o -iname \*.s \) \
       -not \( -path host/src/genIdt -prune \) \
       -not \( -path host/src/gen_tables -prune \) \
       -print | xargs sed -i "s/"${1}"/"${2}"/g"

echo "Checking KCONF, LST, and PY files..."
find . -type f \( -iname \*.lst -o -iname \*.kconf -o -iname \*.py \) \
       -not \( -path host/src/genIdt -prune \) \
       -not \( -path host/src/gen_tables -prune \) \
       -print | xargs sed -i "s/"${1}"/"${2}"/g"

Change-Id: If41030c6b9f0417356807b0cc6f4c287378e0c17
Signed-off-by: Dan Kalowsky <daniel.kalowsky@intel.com>
---
 include/microkernel/task.h            |  4 ++--
 include/microkernel/task_api_export.h | 16 ++++++++--------
 kernel/microkernel/k_task.c           | 16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/microkernel/task.h b/include/microkernel/task.h
index f23f79975dd..c535f382e55 100644
--- a/include/microkernel/task.h
+++ b/include/microkernel/task.h
@@ -72,8 +72,8 @@ extern void task_abort_handler_set(void (*func)(void));
 #define TASK_BLOCK 4
 #define TASK_UNBLOCK 5
 
-#define GROUP_TASK_BLOCK 4
-#define GROUP_TASK_UNBLOCK 5
+#define TASK_GROUP_BLOCK 4
+#define TASK_GROUP_UNBLOCK 5
 
 #ifdef CONFIG_TASK_MONITOR
 extern void KS_TaskSetSwitchCallBack(taskswitchcallbackfunc func);
diff --git a/include/microkernel/task_api_export.h b/include/microkernel/task_api_export.h
index ac2ca342799..5fc168aae9e 100644
--- a/include/microkernel/task_api_export.h
+++ b/include/microkernel/task_api_export.h
@@ -38,19 +38,19 @@
 #define TASK_SUSPEND 2
 #define TASK_RESUME 3
 
-#define GROUP_TASK_START 0
-#define GROUP_TASK_ABORT 1
-#define GROUP_TASK_SUSPEND 2
-#define GROUP_TASK_RESUME 3
+#define TASK_GROUP_START 0
+#define TASK_GROUP_ABORT 1
+#define TASK_GROUP_SUSPEND 2
+#define TASK_GROUP_RESUME 3
 
 #define task_abort(t) _task_ioctl(t, TASK_ABORT)
 #define task_suspend(t) _task_ioctl(t, TASK_SUSPEND)
 #define task_resume(t) _task_ioctl(t, TASK_RESUME)
-#define task_group_abort(g) _task_group_ioctl(g, GROUP_TASK_ABORT)
-#define task_group_suspend(g) _task_group_ioctl(g, GROUP_TASK_SUSPEND)
-#define task_group_resume(g) _task_group_ioctl(g, GROUP_TASK_RESUME)
+#define task_group_abort(g) _task_group_ioctl(g, TASK_GROUP_ABORT)
+#define task_group_suspend(g) _task_group_ioctl(g, TASK_GROUP_SUSPEND)
+#define task_group_resume(g) _task_group_ioctl(g, TASK_GROUP_RESUME)
 
 #define task_start(t) _task_ioctl(t, TASK_START)
-#define task_group_start(g) _task_group_ioctl(g, GROUP_TASK_START)
+#define task_group_start(g) _task_group_ioctl(g, TASK_GROUP_START)
 
 #endif /* _task_api_export__h_ */
diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c
index 77235407df9..6dc50f1444e 100644
--- a/kernel/microkernel/k_task.c
+++ b/kernel/microkernel/k_task.c
@@ -308,31 +308,31 @@ void _k_task_group_op(struct k_args *A)
 	struct k_proc *X;
 
 #ifdef CONFIG_TASK_DEBUG
-	if (opt == GROUP_TASK_BLOCK)
+	if (opt == TASK_GROUP_BLOCK)
 		_k_debug_halt = 1;
-	if (opt == GROUP_TASK_UNBLOCK)
+	if (opt == TASK_GROUP_UNBLOCK)
 		_k_debug_halt = 0;
 #endif
 
 	for (i = 0, X = _k_task_list; i < _k_task_count; i++, X++) {
 		if (X->Group & grp) {
 			switch (opt) {
-			case GROUP_TASK_START:
+			case TASK_GROUP_START:
 				start_task(X, X->fstart);
 				break;
-			case GROUP_TASK_ABORT:
+			case TASK_GROUP_ABORT:
 				abort_task(X);
 				break;
-			case GROUP_TASK_SUSPEND:
+			case TASK_GROUP_SUSPEND:
 				set_state_bit(X, TF_SUSP);
 				break;
-			case GROUP_TASK_RESUME:
+			case TASK_GROUP_RESUME:
 				reset_state_bit(X, TF_SUSP);
 				break;
-			case GROUP_TASK_BLOCK:
+			case TASK_GROUP_BLOCK:
 				set_state_bit(X, TF_BLCK);
 				break;
-			case GROUP_TASK_UNBLOCK:
+			case TASK_GROUP_UNBLOCK:
 				reset_state_bit(X, TF_BLCK);
 				break;
 			}