summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Clark <wclark@codeaurora.org>2015-08-24 14:24:15 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 19:58:13 -0700
commit7a494e644412e3a985e2a2c9b5886a275b341f72 (patch)
treef6e3d9151616b5aed49ea8f1380d3a600ed7045a
parent5f0d2109e18c8010eb0bdfacd1e4e04d86f132aa (diff)
seemp: add more seemp parameters
Add more seep parameters for frameworks refactoring. Change-Id: I9807ef0dc6d5a54c82dea64cec68be3fd0ff7396 Signed-off-by: William Clark <wclark@codeaurora.org>
-rw-r--r--drivers/platform/msm/seemp_core/seemp_logk.c7
-rw-r--r--include/uapi/linux/seemp_api.h2
-rw-r--r--include/uapi/linux/seemp_param_id.h17
3 files changed, 22 insertions, 4 deletions
diff --git a/drivers/platform/msm/seemp_core/seemp_logk.c b/drivers/platform/msm/seemp_core/seemp_logk.c
index 9901712b647c..20d6253a4432 100644
--- a/drivers/platform/msm/seemp_core/seemp_logk.c
+++ b/drivers/platform/msm/seemp_core/seemp_logk.c
@@ -393,7 +393,6 @@ static long seemp_logk_ioctl(struct file *filp, unsigned int cmd,
mutex_unlock(&sdev->lock);
if (ret && block_apps)
wake_up_interruptible(&sdev->writers_wq);
- return 0;
} else if (cmd == SEEMP_CMD_GET_RINGSZ) {
if (copy_to_user((unsigned int *)arg, &sdev->ring_sz,
sizeof(unsigned int)))
@@ -408,9 +407,11 @@ static long seemp_logk_ioctl(struct file *filp, unsigned int cmd,
return seemp_logk_set_mapping(arg);
} else if (SEEMP_CMD_CHECK_FILTER == cmd) {
return seemp_logk_check_filter(arg);
+ } else {
+ pr_err("Invalid Request %X\n", cmd);
+ return -ENOIOCTLCMD;
}
- pr_err("Invalid Request %X\n", cmd);
- return -ENOIOCTLCMD;
+ return 0;
}
static long seemp_logk_reserve_rdblks(
diff --git a/include/uapi/linux/seemp_api.h b/include/uapi/linux/seemp_api.h
index 38ed8e3fba12..f59545cf605d 100644
--- a/include/uapi/linux/seemp_api.h
+++ b/include/uapi/linux/seemp_api.h
@@ -414,5 +414,7 @@
#define SEEMP_API_Instrumentation__execStartActivityFromAppTask 410
#define SEEMP_API_ah_SystemSensorManager__registerListenerImpl 411
#define SEEMP_API_ah_SystemSensorManager__unregisterListenerImpl 412
+#define SEEMP_API_WindowManagerImpl__addView 413
+#define SEEMP_API_WindowManagerImpl__updateViewLayout 414
#endif /* _SEEMP_API_H_ */
diff --git a/include/uapi/linux/seemp_param_id.h b/include/uapi/linux/seemp_param_id.h
index d4f1894dadd1..cc7b9bfd74cd 100644
--- a/include/uapi/linux/seemp_param_id.h
+++ b/include/uapi/linux/seemp_param_id.h
@@ -9,7 +9,10 @@
#define PARAM_ID_SENSOR 5
#define PARAM_ID_SIZE 6
#define PARAM_ID_FD 7
-#define NUM_PARAM_IDS 8
+#define PARAM_ID_APP_UID 8
+#define PARAM_ID_WINDOW_TYPE 9
+#define PARAM_ID_WINDOW_FLAG 10
+#define NUM_PARAM_IDS 11
#ifndef PROVIDE_PARAM_ID
int param_id_index(const char *param, const char *end);
@@ -36,6 +39,12 @@ int param_id_index(const char *param, const char *end)
id = 6;
else if ((len == 2) && !memcmp(param, "fd", 2))
id = 7;
+ else if ((len == 2) && !memcmp(param, "app_uid", 7))
+ id = 8;
+ else if ((len == 2) && !memcmp(param, "window_type", 11))
+ id = 9;
+ else if ((len == 2) && !memcmp(param, "window_flag", 11))
+ id = 10;
return id;
}
@@ -61,6 +70,12 @@ const char *get_param_id_name(int id)
name = "size"; break;
case 7:
name = "fd"; break;
+ case 8:
+ name = "app_uid"; break;
+ case 9:
+ name = "window_type"; break;
+ case 10:
+ name = "window_flag"; break;
}
return name;