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

Commit b9b05a89 authored by Nick Dyer's avatar Nick Dyer Committed by Dmitry Torokhov
Browse files

Input: atmel_mxt_ts - split message handler into separate functions 



This is in preparation for support of the T44 message count object.

Also, cache T5 address to avoid lookup on every interrupt cycle.

Signed-off-by: default avatarNick Dyer <nick.dyer@itdev.co.uk>
Acked-by: default avatarBenson Leung <bleung@chromium.org>
Acked-by: default avatarYufeng Shen <miletus@chromium.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 497767d1

drivers/input/touchscreen/atmel_mxt_ts.c

+64 −59
Original line number Original line Diff line number Diff line
@@ -249,8 +249,10 @@ struct mxt_data { 
	u8 bootloader_addr;

	u8 bootloader_addr;

	u8 *msg_buf;

	u8 *msg_buf;

	u8 t6_status;

	u8 t6_status;

	bool update_input;





	/* Cached parameters from object table */

	/* Cached parameters from object table */

	u16 T5_address;

	u8 T5_msg_size;

	u8 T5_msg_size;

	u8 T6_reportid;

	u8 T6_reportid;

	u16 T6_address;

	u16 T6_address;
@@ -662,20 +664,6 @@ static void mxt_proc_t6_messages(struct mxt_data *data, u8 *msg) 
	data->t6_status = status;

	data->t6_status = status;

}

}





static int mxt_read_message(struct mxt_data *data, u8 *message)

{

	struct mxt_object *object;

	u16 reg;



	object = mxt_get_object(data, MXT_GEN_MESSAGE_T5);

	if (!object)

		return -EINVAL;



	reg = object->start_address;

	return __mxt_read_reg(data->client, reg,

			data->T5_msg_size, message);

}



static int mxt_write_object(struct mxt_data *data,

static int mxt_write_object(struct mxt_data *data,

				 u8 type, u8 offset, u8 val)

				 u8 type, u8 offset, u8 val)

{

{
@@ -713,7 +701,7 @@ static void mxt_input_sync(struct mxt_data *data) 
	input_sync(data->input_dev);

	input_sync(data->input_dev);

}

}





static void mxt_input_touchevent(struct mxt_data *data, u8 *message)

static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)

{

{

	struct device *dev = &data->client->dev;

	struct device *dev = &data->client->dev;

	struct input_dev *input_dev = data->input_dev;

	struct input_dev *input_dev = data->input_dev;
@@ -775,50 +763,67 @@ static void mxt_input_touchevent(struct mxt_data *data, u8 *message) 
		/* Touch no longer active, close out slot */

		/* Touch no longer active, close out slot */

		input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 0);

		input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 0);

	}

	}

}





static bool mxt_is_T9_message(struct mxt_data *data, u8 *msg)

	data->update_input = true;

{

	u8 id = msg[0];

	return (id >= data->T9_reportid_min && id <= data->T9_reportid_max);

}

}





static irqreturn_t mxt_process_messages_until_invalid(struct mxt_data *data)

static int mxt_proc_message(struct mxt_data *data, u8 *message)

{

{

	u8 *message = &data->msg_buf[0];

	u8 report_id = message[0];

	struct device *dev = &data->client->dev;

	u8 reportid;

	bool update_input = false;



	do {

		if (mxt_read_message(data, message)) {

			dev_err(dev, "Failed to read message\n");

			return IRQ_NONE;

		}





		reportid = message[0];

	if (report_id == MXT_RPTID_NOMSG)

		return 0;





		if (reportid == data->T6_reportid) {

	if (report_id == data->T6_reportid) {

		mxt_proc_t6_messages(data, message);

		mxt_proc_t6_messages(data, message);

	} else if (!data->input_dev) {

	} else if (!data->input_dev) {

		/*

		/*

			 * do not report events if input device

		 * Do not report events if input device

			 * is not yet registered

		 * is not yet registered.

		 */

		 */

		mxt_dump_message(data, message);

		mxt_dump_message(data, message);

		} else if (mxt_is_T9_message(data, message)) {

	} else if (report_id >= data->T9_reportid_min

			mxt_input_touchevent(data, message);

	    && report_id <= data->T9_reportid_max) {

			update_input = true;

		mxt_proc_t9_message(data, message);

		} else if (reportid == data->T19_reportid) {

	} else if (report_id == data->T19_reportid) {

		mxt_input_button(data, message);

		mxt_input_button(data, message);

			update_input = true;

		data->update_input = true;

	} else {

	} else {

		mxt_dump_message(data, message);

		mxt_dump_message(data, message);

	}

	}

	} while (reportid != MXT_RPTID_NOMSG);





	if (update_input)

	return 1;

}



static int mxt_read_and_process_message(struct mxt_data *data)

{

	struct device *dev = &data->client->dev;

	int ret;



	ret = __mxt_read_reg(data->client, data->T5_address,

				data->T5_msg_size, data->msg_buf);

	if (ret) {

		dev_err(dev, "Error %d reading message\n", ret);

		return ret;

	}



	return mxt_proc_message(data, data->msg_buf);

}



static irqreturn_t mxt_process_messages_until_invalid(struct mxt_data *data)

{

	int ret;



	do {

		ret = mxt_read_and_process_message(data);

		if (ret < 0)

			return IRQ_NONE;

	} while (ret > 0);



	if (data->update_input) {

		mxt_input_sync(data);

		mxt_input_sync(data);

		data->update_input = false;

	}





	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}
@@ -1213,23 +1218,21 @@ static int mxt_make_highchg(struct mxt_data *data) 
{

{

	struct device *dev = &data->client->dev;

	struct device *dev = &data->client->dev;

	int count = 10;

	int count = 10;

	int error;

	int ret;





	/* Read dummy message to make high CHG pin */

	/* Read messages until we force an invalid */

	do {

	do {

		error = mxt_read_message(data, data->msg_buf);

		ret = mxt_read_and_process_message(data);

		if (error)

		if (ret == 0)

			return error;

			return 0;

	} while (data->msg_buf[0] != MXT_RPTID_NOMSG && --count);

		else if (ret < 0)

			return ret;

	} while (--count);





	if (!count) {

	dev_err(dev, "CHG pin isn't cleared\n");

	dev_err(dev, "CHG pin isn't cleared\n");

	return -EBUSY;

	return -EBUSY;

}

}





	return 0;

}



static int mxt_acquire_irq(struct mxt_data *data)

static int mxt_acquire_irq(struct mxt_data *data)

{

{

	int error;

	int error;
@@ -1266,6 +1269,7 @@ static void mxt_free_object_table(struct mxt_data *data) 
	data->object_table = NULL;

	data->object_table = NULL;

	kfree(data->msg_buf);

	kfree(data->msg_buf);

	data->msg_buf = NULL;

	data->msg_buf = NULL;

	data->T5_address = 0;

	data->T5_msg_size = 0;

	data->T5_msg_size = 0;

	data->T6_reportid = 0;

	data->T6_reportid = 0;

	data->T7_address = 0;

	data->T7_address = 0;
@@ -1327,6 +1331,7 @@ static int mxt_get_object_table(struct mxt_data *data) 
		case MXT_GEN_MESSAGE_T5:

		case MXT_GEN_MESSAGE_T5:

			/* CRC not enabled, therefore don't read last byte */

			/* CRC not enabled, therefore don't read last byte */

			data->T5_msg_size = mxt_obj_size(object) - 1;

			data->T5_msg_size = mxt_obj_size(object) - 1;

			data->T5_address = object->start_address;

		case MXT_GEN_COMMAND_T6:

		case MXT_GEN_COMMAND_T6:

			data->T6_reportid = min_id;

			data->T6_reportid = min_id;

			data->T6_address = object->start_address;

			data->T6_address = object->start_address;