Merge "seemp: add more seemp parameters" (3053b98e) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/seemp_core/seemp_logk.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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,10 +407,12 @@ 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;
		}
		return 0;
		}

		static long seemp_logk_reserve_rdblks(
		struct seemp_logk_dev *sdev, unsigned long arg)

+2 −0

Original line number	Diff line number	Diff line
		@@ -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_ */

+16 −1

Original line number	Diff line number	Diff line
		@@ -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;