From 60e7620e60548cca9d3bfc1f4f4aee88bbd8fb1f Mon Sep 17 00:00:00 2001 From: litong Date: Tue, 18 Feb 2020 18:25:10 +0800 Subject: [PATCH] Modify the output format of the testing node Modify the output format of the testing node for synaptics TCMD command execution Change-Id: I3f6912a129ebc8a827641b34e8839bf72d83fa39 Reviewed-on: https://gerrit.mot.com/1497439 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Jialei Hao Reviewed-by: Jianqi Yang Submit-Approved: Jira Key --- .../synaptics_tcm_mmi_v2/synaptics_testing.c | 162 +----------------- 1 file changed, 4 insertions(+), 158 deletions(-) diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.c index 5ea9d23cf0d4..0f9b58c57299 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.c @@ -58,9 +58,10 @@ static ssize_t testing_sysfs_##t_name##_show(struct device *dev, \ goto exit; \ } \ \ - retval = snprintf(buf, PAGE_SIZE, \ - "%s\n", \ - testing_hcd->result ? "Passed" : "Failed"); \ + LOCK_BUFFER(testing_hcd->resp); \ + memcpy(buf, testing_hcd->resp.buf, testing_hcd->resp.data_length); \ + retval = testing_hcd->resp.data_length; \ + UNLOCK_BUFFER(testing_hcd->resp); \ \ exit: \ mutex_unlock(&tcm_hcd->extif_mutex); \ @@ -812,7 +813,6 @@ static int testing_pt01_trx_trx_short(void) bool do_pin_test = false; struct syna_tcm_app_info *app_info; struct syna_tcm_hcd *tcm_hcd = testing_hcd->tcm_hcd; - unsigned int size; unsigned char limit; unsigned char *buf; unsigned char data; @@ -823,7 +823,6 @@ static int testing_pt01_trx_trx_short(void) LOGN(tcm_hcd->pdev->dev.parent, "Start testing\n"); - testing_hcd->result = false; app_info = &tcm_hcd->app_info; @@ -878,19 +877,7 @@ static int testing_pt01_trx_trx_short(void) LOCK_BUFFER(testing_hcd->resp); - size = - sizeof(pt1_limits) / sizeof(pt1_limits[0]); - - if (size < testing_hcd->resp.data_length) { - LOGE(tcm_hcd->pdev->dev.parent, - "Mismatching limits data\n"); - UNLOCK_BUFFER(testing_hcd->resp); - retval = -EINVAL; - goto exit; - } - buf = testing_hcd->resp.buf; - testing_hcd->result = true; for (i = 0; i < testing_hcd->resp.data_length; i++) { @@ -923,7 +910,6 @@ static int testing_pt01_trx_trx_short(void) UNLOCK_BUFFER(testing_hcd->resp); -exit: #ifdef PT1_GET_PIN_ASSIGNMENT kfree(satic_cfg_buf); #endif @@ -935,26 +921,14 @@ exit: } } - LOGN(tcm_hcd->pdev->dev.parent, - "Result = %s\n", (testing_hcd->result)?"pass":"fail"); return retval; } static int testing_pt05_full_raw(void) { int retval; - unsigned char *buf; - unsigned int idx; - unsigned int row; - unsigned int col; - unsigned int rows; - unsigned int cols; - unsigned int limits_rows; - unsigned int limits_cols; - unsigned int frame_size; struct syna_tcm_app_info *app_info; struct syna_tcm_hcd *tcm_hcd = testing_hcd->tcm_hcd; - unsigned short data; LOGN(tcm_hcd->pdev->dev.parent, "Start testing\n"); @@ -962,11 +936,6 @@ static int testing_pt05_full_raw(void) app_info = &tcm_hcd->app_info; - rows = le2_to_uint(app_info->num_of_image_rows); - cols = le2_to_uint(app_info->num_of_image_cols); - - frame_size = rows * cols * 2; - retval = testing_run_prod_test_item(TEST_PT5_FULL_RAW_CAP); if (retval < 0) { LOGE(tcm_hcd->pdev->dev.parent, @@ -974,69 +943,6 @@ static int testing_pt05_full_raw(void) goto exit; } - LOCK_BUFFER(testing_hcd->resp); - - if (frame_size != testing_hcd->resp.data_length) { - LOGE(tcm_hcd->pdev->dev.parent, - "Frame size mismatch\n"); - UNLOCK_BUFFER(testing_hcd->resp); - retval = -EINVAL; - goto exit; - } - - limits_rows = - sizeof(pt5_hi_limits) / sizeof(pt5_hi_limits[0]); - limits_cols = - sizeof(pt5_hi_limits[0]) / sizeof(pt5_hi_limits[0][0]); - - if (rows > limits_rows || cols > limits_cols) { - LOGE(tcm_hcd->pdev->dev.parent, - "Mismatching limits data\n"); - UNLOCK_BUFFER(testing_hcd->resp); - retval = -EINVAL; - goto exit; - } - - limits_rows = - sizeof(pt5_lo_limits) / sizeof(pt5_lo_limits[0]); - limits_cols = - sizeof(pt5_lo_limits[0]) / sizeof(pt5_lo_limits[0][0]); - - if (rows > limits_rows || cols > limits_cols) { - LOGE(tcm_hcd->pdev->dev.parent, - "Mismatching limits data\n"); - UNLOCK_BUFFER(testing_hcd->resp); - retval = -EINVAL; - goto exit; - } - - buf = testing_hcd->resp.buf; - testing_hcd->result = true; - - idx = 0; - for (row = 0; row < rows; row++) { - for (col = 0; col < cols; col++) { - - data = (unsigned short)(buf[idx] & 0xff) | - (unsigned short)(buf[idx+1] << 8); - - if (data > pt5_hi_limits[row][col] || - data < pt5_lo_limits[row][col]) { - - LOGE(tcm_hcd->pdev->dev.parent, - "fail at (%2d, %2d) data = %5d, limit = (%4d, %4d)\n", - row, col, data, pt5_lo_limits[row][col], - pt5_hi_limits[row][col]); - - testing_hcd->result = false; - } - - idx += 2; - } - } - - UNLOCK_BUFFER(testing_hcd->resp); - retval = 0; exit: @@ -1047,8 +953,6 @@ exit: } } - LOGN(tcm_hcd->pdev->dev.parent, - "Result = %s\n", (testing_hcd->result)?"pass":"fail"); return retval; } @@ -1166,15 +1070,6 @@ exit: static int testing_pt10_noise(void) { int retval; - short data; - unsigned char *buf; - unsigned int idx; - unsigned int row; - unsigned int col; - unsigned int rows; - unsigned int cols; - unsigned int limits_rows; - unsigned int limits_cols; unsigned int frame_size_words; struct syna_tcm_app_info *app_info; struct syna_tcm_hcd *tcm_hcd = testing_hcd->tcm_hcd; @@ -1185,9 +1080,6 @@ static int testing_pt10_noise(void) app_info = &tcm_hcd->app_info; - rows = le2_to_uint(app_info->num_of_image_rows); - cols = le2_to_uint(app_info->num_of_image_cols); - testing_get_frame_size_words(&frame_size_words, true); retval = testing_run_prod_test_item(TEST_PT10_DELTA_NOISE); @@ -1197,50 +1089,6 @@ static int testing_pt10_noise(void) goto exit; } - LOCK_BUFFER(testing_hcd->resp); - - if (frame_size_words != testing_hcd->resp.data_length / 2) { - LOGE(tcm_hcd->pdev->dev.parent, - "Frame size mismatch\n"); - UNLOCK_BUFFER(testing_hcd->resp); - retval = -EINVAL; - goto exit; - } - - limits_rows = - sizeof(pt10_limits) / sizeof(pt10_limits[0]); - limits_cols = - sizeof(pt10_limits[0]) / sizeof(pt10_limits[0][0]); - - if (rows > limits_rows || cols > limits_cols) { - LOGE(tcm_hcd->pdev->dev.parent, - "Mismatching limits data\n"); - UNLOCK_BUFFER(testing_hcd->resp); - retval = -EINVAL; - goto exit; - } - - idx = 0; - buf = testing_hcd->resp.buf; - testing_hcd->result = true; - - for (row = 0; row < rows; row++) { - for (col = 0; col < cols; col++) { - data = (short)le2_to_uint(&buf[idx * 2]); - if (data > pt10_limits[row][col]) { - - LOGE(tcm_hcd->pdev->dev.parent, - "fail at (%2d, %2d) data = %5d, limit = %4d\n", - row, col, data, pt10_limits[row][col]); - - testing_hcd->result = false; - } - idx++; - } - } - - UNLOCK_BUFFER(testing_hcd->resp); - testing_standard_frame_output(false); retval = 0; @@ -1253,8 +1101,6 @@ exit: } } - LOGN(tcm_hcd->pdev->dev.parent, - "Result = %s\n", (testing_hcd->result)?"pass":"fail"); return retval; }