Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f27551bd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: st: Disable SCRIPTLESS"

parents a629752b ae4db2b6

drivers/input/touchscreen/st/fts.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#define FTS_TS_DRV_NAME      "fts"

#define FTS_TS_DRV_VERSION   "4.2.14" /* version */



#define SCRIPTLESS /*allow to work in scriptless mode with the GUI*/

/*#define SCRIPTLESS*/ /*allow to work in scriptless mode with the GUI*/

#ifdef SCRIPTLESS

#define SCRIPTLESS_DEBUG

/**

drivers/input/touchscreen/st/fts_gui.c

+38 −38
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ 


#ifdef SCRIPTLESS



unsigned int data[CMD_RESULT_STR_LEN] = {0};

unsigned char pAddress_i2c[CMD_RESULT_STR_LEN] = {0};

int byte_count_read;

char Out_buff[TSP_BUF_SIZE];

static unsigned int fts_data[CMD_RESULT_STR_LEN] = {0};

static unsigned char fts_pAddress_i2c[CMD_RESULT_STR_LEN] = {0};

static int byte_count_read;

static char Out_buff[TSP_BUF_SIZE];





/*I2C CMd functions: functions to interface with GUI without script */
@@ -60,7 +60,7 @@ ssize_t fts_i2c_wr_show(struct device *dev, 
	int i;

	char buff[16];



	memset(Out_buff, 0x00, ARRAY_SIZE(Out_buff));

	memset(Out_buff, 0x00, sizeof(Out_buff));

	if (byte_count_read == 0) {

		snprintf(Out_buff, sizeof(Out_buff), "{FAILED}\n");

		return snprintf(buf, TSP_BUF_SIZE, "%s\n", Out_buff);
@@ -75,7 +75,7 @@ ssize_t fts_i2c_wr_show(struct device *dev, 
	pr_err("}\n");

#endif

	snprintf(buff, sizeof(buff), "{");

	strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff));

	strlcat(Out_buff, buff, sizeof(Out_buff));

	for (i = 0; i < (byte_count_read + 2); i++) {

		char temp_byte_count_read;
@@ -95,14 +95,14 @@ ssize_t fts_i2c_wr_show(struct device *dev, 
				info->cmd_wr_result[i-2]);

		}

		//snprintf(buff, sizeof(buff), "%02X", info->cmd_wr_result[i]);

		strlcat(Out_buff, buff,  ARRAY_SIZE(Out_buff));

		strlcat(Out_buff, buff,  sizeof(Out_buff));

		if (i < (byte_count_read + 1)) {

			snprintf(buff, sizeof(buff), " ");

			strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff));

			strlcat(Out_buff, buff, sizeof(Out_buff));

		}

	}

	snprintf(buff, sizeof(buff), "}");

	strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff));

	strlcat(Out_buff, buff, sizeof(Out_buff));

	return snprintf(buf, TSP_BUF_SIZE, "%s\n", Out_buff);

}
@@ -112,13 +112,14 @@ ssize_t fts_i2c_wr_store(struct device *dev, struct device_attribute *attr, 
	int ret;

	struct i2c_client *client = to_i2c_client(dev);

	struct fts_ts_info *info = i2c_get_clientdata(client);

	unsigned char pAddress[9] = {0};

	unsigned char pAddress[9];

	unsigned int byte_count = 0;

	int i;

	unsigned int data[9] = {0};

	unsigned int data[9];



	memset(data, 0x00, ARRAY_SIZE(data));

	memset(info->cmd_wr_result, 0x00, ARRAY_SIZE(info->cmd_wr_result));

	memset(data, 0x00, sizeof(data));

	memset(pAddress, 0x00, sizeof(pAddress));

	memset(info->cmd_wr_result, 0x00, CMD_RESULT_STR_LEN);

	ret = sscanf(buf, "%x %x %x %x %x %x %x %x %x ",

		(data + 8), (data), (data + 1), (data + 2), (data + 3),

		(data + 4), (data + 5), (data + 6), (data + 7));
@@ -133,7 +134,7 @@ ssize_t fts_i2c_wr_store(struct device *dev, struct device_attribute *attr, 
	 * }

	 */



	if (byte_count > ARRAY_SIZE(pAddress))

	if (byte_count > sizeof(pAddress))

		return -EINVAL;

#ifdef SCRIPTLESS_DEBUG
@@ -190,7 +191,7 @@ ssize_t fts_i2c_read_show(struct device *dev, 
	int i;

	char buff[16];



	memset(Out_buff, 0x00, ARRAY_SIZE(Out_buff));

	memset(Out_buff, 0x00, sizeof(Out_buff));

	if (byte_count_read == 0) {

		snprintf(Out_buff, sizeof(Out_buff), "{FAILED}");

		return snprintf(buf, TSP_BUF_SIZE, "%s\n", Out_buff);
@@ -205,7 +206,7 @@ ssize_t fts_i2c_read_show(struct device *dev, 
	pr_err("}\n");

#endif

	snprintf(buff, sizeof(buff), "{");

	strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff));

	strlcat(Out_buff, buff, sizeof(Out_buff));

	for (i = 0; i < (byte_count_read + 2); i++) {

		char temp_byte_count_read;
@@ -221,14 +222,14 @@ ssize_t fts_i2c_read_show(struct device *dev, 
			snprintf(buff, sizeof(buff), "%02X",

				info->cmd_read_result[i - 2]);

		}

		strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff));

		strlcat(Out_buff, buff, sizeof(Out_buff));

		if (i < (byte_count_read + 1)) {

			snprintf(buff, sizeof(buff), " ");

			strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff));

			strlcat(Out_buff, buff, sizeof(Out_buff));

		}

	}

	snprintf(buff, sizeof(buff), "}");

	strlcat(Out_buff, buff, ARRAY_SIZE(Out_buff));

	strlcat(Out_buff, buff, sizeof(Out_buff));



	return snprintf(buf, TSP_BUF_SIZE, "%s\n", Out_buff);

}
@@ -239,14 +240,15 @@ ssize_t fts_i2c_read_store(struct device *dev, struct device_attribute *attr, 
	int ret;

	struct i2c_client *client = to_i2c_client(dev);

	struct fts_ts_info *info = i2c_get_clientdata(client);

	unsigned char pAddress[9] = {0};

	unsigned char pAddress[9];

	unsigned int byte_count = 0;

	int i;

	unsigned int data[9] = {0};

	unsigned int data[9];



	byte_count_read = 0;

	memset(data, 0x00, ARRAY_SIZE(data));

	memset(info->cmd_read_result, 0x00, ARRAY_SIZE(info->cmd_read_result));

	memset(data, 0x00, sizeof(data));

	memset(pAddress, 0x00, sizeof(pAddress));

	memset(info->cmd_read_result, 0x00, CMD_RESULT_STR_LEN);

	ret = sscanf(buf, "%x %x %x %x %x %x %x %x %x ",

		(data + 8), (data), (data + 1), (data + 2), (data + 3),

		(data + 4), (data + 5), (data + 6), (data + 7));
@@ -326,17 +328,17 @@ ssize_t fts_i2c_write_store(struct device *dev, struct device_attribute *attr, 
	struct fts_ts_info *info = i2c_get_clientdata(client);

	unsigned int byte_count = 0;

	int i;

	unsigned int *data = &fts_data[0];



	memset(data, 0x00, ARRAY_SIZE(data));

	memset(pAddress_i2c, 0x00, ARRAY_SIZE(pAddress_i2c));

	memset(info->cmd_write_result, 0x00,

			ARRAY_SIZE(info->cmd_write_result));

	memset(fts_data, 0x00, sizeof(fts_data));

	memset(fts_pAddress_i2c, 0x00, sizeof(fts_pAddress_i2c));

	memset(info->cmd_write_result, 0x00, sizeof(info->cmd_write_result));

	ret = sscanf(buf, "%x %x", data, (data + 1));

	if (ret != 2)

		return -EINVAL;

	byte_count = data[0] << 8 | data[1];



	if (byte_count <= ARRAY_SIZE(pAddress_i2c)) {

	if (byte_count <= sizeof(fts_pAddress_i2c)) {

		for (i = 0; i < (byte_count); i++) {

			ret = sscanf(&buf[3 * (i + 2)], "%x ", (data + i));

			if (ret != 1)
@@ -358,25 +360,24 @@ ssize_t fts_i2c_write_store(struct device *dev, struct device_attribute *attr, 
	pr_err("%s: Input Data 1:\n", __func__);

	for (i = 0 ; i < byte_count; i++) {

		pr_err(" %02X\n", data[i]);

		pAddress_i2c[i] = (unsigned char)data[i];

		fts_pAddress_i2c[i] = (unsigned char)data[i];

	}

	pr_err("\n");

#else

	for (i = 0 ; i < byte_count; i++)

		pAddress_i2c[i] = (unsigned char)data[i];

		fts_pAddress_i2c[i] = (unsigned char)data[i];

#endif

	if ((pAddress_i2c[0] == 0xb3) && (pAddress_i2c[3] == 0xb1)) {

		ret = fts_writeCmd(pAddress_i2c, 3);

	if ((fts_pAddress_i2c[0] == 0xb3) && (fts_pAddress_i2c[3] == 0xb1)) {

		ret = fts_writeCmd(fts_pAddress_i2c, 3);

		msleep(20);

		ret = fts_writeCmd(&pAddress_i2c[3], byte_count-3);

	} else {

		ret = fts_writeCmd(pAddress_i2c, byte_count);

	}

		ret = fts_writeCmd(&fts_pAddress_i2c[3], byte_count-3);

	} else

		ret = fts_writeCmd(fts_pAddress_i2c, byte_count);



#ifdef SCRIPTLESS_DEBUG

	pr_err("%s:DATA :\n", __func__);

	for (i = 0; i < byte_count; i++)

		pr_err(" %02X\n", (unsigned int)pAddress_i2c[i]);

		pr_err(" %02X\n", (unsigned int)fts_pAddress_i2c[i]);

	pr_err(" byte_count: %02X\n", byte_count);

#endif

	if (ret < 0) {
@@ -397,7 +398,6 @@ static DEVICE_ATTR_RW(fts_i2c_read); 
static DEVICE_ATTR_RW(fts_i2c_wr);

static DEVICE_ATTR_RW(fts_i2c_write);





static struct attribute *i2c_cmd_attributes[] = {

	&dev_attr_fts_i2c_read.attr,

	&dev_attr_fts_i2c_wr.attr,