diff options
| author | Moyster <oysterized@gmail.com> | 2018-05-16 14:50:09 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-05-16 14:50:09 +0200 |
| commit | bb4b357ef392e4ce1f862d1e0d23ad4be982b74b (patch) | |
| tree | b2531345e7421021f5b89441e53793ae45d38d93 /drivers/input/touchscreen | |
| parent | cc615a4eded1c0de0b71f488173699fcda7873a1 (diff) | |
meizu: drivers: touchscreen: cleanup windows ^M
Diffstat (limited to 'drivers/input/touchscreen')
6 files changed, 329 insertions, 329 deletions
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c index 0dcecd951..7e6808ceb 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c @@ -35,7 +35,7 @@ #define TPD_DEVICE "tpd_FOCALTECH"
#include <mach/battery_common.h>
-#include <linux/meizu-sys.h> +#include <linux/meizu-sys.h>
/*result*/
#define TPD_OK 0
@@ -171,11 +171,11 @@ static int tpd_halt = 0; static int point_num = 0;
static int p_point_num = 0;
-#ifdef FTS_ESD_CHECKER -static struct workqueue_struct *fts_esd_wq; -static struct delayed_work fts_esd_checker; -int apk_debug_flag = 0; -#endif +#ifdef FTS_ESD_CHECKER
+static struct workqueue_struct *fts_esd_wq;
+static struct delayed_work fts_esd_checker;
+int apk_debug_flag = 0;
+#endif
//extern int tpd_mstar_status ; // compatible mstar and ft6306 chenzhecong
@@ -478,9 +478,9 @@ int tpd_glove_disable(void) }
#endif
- -DEFINE_MUTEX(ft_suspend_lock); - +
+DEFINE_MUTEX(ft_suspend_lock);
+
// track which id is down
static unsigned long ft5x46_finger_status = 0;
@@ -534,8 +534,8 @@ static void tpd_up(int x, int y, int p, int id) static int tpd_touchinfo(struct touch_info *cinfo, struct touch_info *pinfo)
{
- int i = 0; - int ret = TRUE; + int i = 0;
+ int ret = TRUE;
char data[128] = {0};
u16 high_byte,low_byte,reg;
u8 report_rate =0;
@@ -545,9 +545,9 @@ static int tpd_touchinfo(struct touch_info *cinfo, struct touch_info *pinfo) p_point_num = point_num;
if (tpd_halt)
{
- TPD_DMESG( "tpd_touchinfo tpd_halt = 1, return FALSE..\n"); - ret = FALSE; - goto exit; + TPD_DMESG( "tpd_touchinfo tpd_halt = 1, return FALSE..\n");
+ ret = FALSE;
+ goto exit;
}
mutex_lock(&i2c_access);
@@ -558,9 +558,9 @@ static int tpd_touchinfo(struct touch_info *cinfo, struct touch_info *pinfo) if (ret < 0)
{
- FTS_DBG("tpd_touchinfo i2c read error, ret = %d\n", ret); - ret = FALSE; - goto exit; + FTS_DBG("tpd_touchinfo i2c read error, ret = %d\n", ret);
+ ret = FALSE;
+ goto exit;
}
/*get the number of the touch points*/
@@ -580,9 +580,9 @@ static int tpd_touchinfo(struct touch_info *cinfo, struct touch_info *pinfo) {
cinfo->p[i] = data[3+6*i] >> 6; //event flag
cinfo->id[i] = data[3+6*i+2]>>4; //touch id
- // max id value is 15 - if(cinfo->id[i] >= 0xf) // invalid id, set NO_EVENT flag - cinfo->p[i] = 0x3; + // max id value is 15
+ if(cinfo->id[i] >= 0xf) // invalid id, set NO_EVENT flag
+ cinfo->p[i] = 0x3;
/*get the X coordinate, 2 bytes*/
high_byte = data[3+6*i];
high_byte <<= 8;
@@ -604,7 +604,7 @@ static int tpd_touchinfo(struct touch_info *cinfo, struct touch_info *pinfo) //cinfo->y[i]= cinfo->y[i] * 800 >> 11;
}
-exit: +exit:
FTS_DBG("tpd_touchinfo cinfo->x[0] = %d, cinfo->y[0] = %d, cinfo->p[0] = %d, point_num = %d\n", cinfo->x[0], cinfo->y[0], cinfo->p[0], point_num);
return ret;
@@ -808,7 +808,7 @@ static void tpd_gesture_report(int gesture_id) mz_gesture_report(tpd->dev, gesture_code);
}
- +
static int tpd_gesture_read_data(void)
{
unsigned char buf[FTS_GESTURE_POINTS * 2] = { 0 };
@@ -822,8 +822,8 @@ static int tpd_gesture_read_data(void) if (ret < 0)
{
- pr_err( "%s read touchdata failed...\n", __func__); - goto exit; + pr_err( "%s read touchdata failed...\n", __func__);
+ goto exit;
}
gesture_id = buf[0];
@@ -866,7 +866,7 @@ static int tpd_gesture_read_data(void) */
tpd_gesture_report(gesture_id);
-exit: +exit:
return -1;
}
@@ -922,25 +922,25 @@ static int touch_event_handler(void *unused) do
{
set_current_state(TASK_INTERRUPTIBLE);
- - if(tpd_halt) { - tpd_flag = 0; - } - +
+ if(tpd_halt) {
+ tpd_flag = 0;
+ }
+
wait_event_interruptible(waiter,tpd_flag!=0);
tpd_flag = 0;
- set_current_state(TASK_RUNNING); - - mutex_lock(&ft_suspend_lock); + set_current_state(TASK_RUNNING);
+
+ mutex_lock(&ft_suspend_lock);
tpd_charger_check(0);
#ifdef FTS_GESTURE
if ((G_stGestureCtrl.state == GESTURE_ENABLE)
&& (tpd_gesture_is_enable() == GESTURE_ENABLE))
{
tpd_gesture_read_data();
- goto exit_lock; + goto exit_lock;
}
#endif
@@ -953,17 +953,17 @@ static int touch_event_handler(void *unused) for(i =0; i<FTS_MAX_TOUCH; i++)
{
- if(cinfo.y[i] == 2000) { //filter touch home - if(cinfo.p[i] == 0 || cinfo.p[i] == 2) { - set_bit(16, &ft5x46_finger_status); - } else if(test_bit(16, &ft5x46_finger_status)) { - tpd_down(360, 2000, 0, 0); - input_sync(tpd->dev); - tpd_up(360, 2000, 1, 0); - clear_bit(16, &ft5x46_finger_status); - } - continue; - } + if(cinfo.y[i] == 2000) { //filter touch home
+ if(cinfo.p[i] == 0 || cinfo.p[i] == 2) {
+ set_bit(16, &ft5x46_finger_status);
+ } else if(test_bit(16, &ft5x46_finger_status)) {
+ tpd_down(360, 2000, 0, 0);
+ input_sync(tpd->dev);
+ tpd_up(360, 2000, 1, 0);
+ clear_bit(16, &ft5x46_finger_status);
+ }
+ continue;
+ }
if(cinfo.p[i] == 0 || cinfo.p[i] == 2)
tpd_down(cinfo.x[i], cinfo.y[i],
cinfo.p[i], cinfo.id[i]);
@@ -989,9 +989,9 @@ static int touch_event_handler(void *unused) //ctp_power_off();
msleep(20);
}
- mt_eint_unmask(CUST_EINT_TOUCH_PANEL_NUM); -exit_lock: - mutex_unlock(&ft_suspend_lock); + mt_eint_unmask(CUST_EINT_TOUCH_PANEL_NUM);
+exit_lock:
+ mutex_unlock(&ft_suspend_lock);
}
while(!kthread_should_stop());
@@ -1012,21 +1012,21 @@ static void tpd_eint_interrupt_handler(void) wake_up_interruptible(&waiter);
}
-int tpd_firmware_upgrade_thread(void *unused) +int tpd_firmware_upgrade_thread(void *unused)
{
int err = 0;
- - // disable esd checker work when fw is updating -#ifdef FTS_ESD_CHECKER - cancel_delayed_work_sync(&fts_esd_checker); -#endif +
+ // disable esd checker work when fw is updating
+#ifdef FTS_ESD_CHECKER
+ cancel_delayed_work_sync(&fts_esd_checker);
+#endif
mt_eint_mask(CUST_EINT_TOUCH_PANEL_NUM);
err = fts_ctpm_auto_upgrade(i2c_client);
mt_eint_unmask(CUST_EINT_TOUCH_PANEL_NUM);
-#ifdef FTS_ESD_CHECKER - queue_delayed_work(fts_esd_wq, &fts_esd_checker, 0); -#endif +#ifdef FTS_ESD_CHECKER
+ queue_delayed_work(fts_esd_wq, &fts_esd_checker, 0);
+#endif
return err;
}
@@ -1077,35 +1077,35 @@ void ft5x46_gesture_handler(u8 state) ft5x46_gesture_state = state;
}
-#ifdef FTS_ESD_CHECKER -static void fts_esd_checker_handler(struct work_struct *work) -{ - u8 data = 0x1; -#define FTS_ESD_REG 0xE1 - - if(apk_debug_flag) { - pr_warn("apk debug node is opened, disable esd check, %d\n", - apk_debug_flag); - goto exit; - } - - if(fts_read_reg(g_focalclient, FTS_ESD_REG, &data) < 0) - pr_err("%s: read esd i2c error\n", __func__); - pr_err("%s: read esd %02x\n", __func__, data); - - if(data != 0) { - pr_err("!!! ic work abnormally, reset ic\n"); - fts_ctpm_hw_reset(); - } else { - fts_write_reg(g_focalclient, FTS_ESD_REG, 0x1); - } - -exit: - if(!tpd_halt) - queue_delayed_work(fts_esd_wq, &fts_esd_checker, 2 * HZ); -} -#endif - +#ifdef FTS_ESD_CHECKER
+static void fts_esd_checker_handler(struct work_struct *work)
+{
+ u8 data = 0x1;
+#define FTS_ESD_REG 0xE1
+
+ if(apk_debug_flag) {
+ pr_warn("apk debug node is opened, disable esd check, %d\n",
+ apk_debug_flag);
+ goto exit;
+ }
+
+ if(fts_read_reg(g_focalclient, FTS_ESD_REG, &data) < 0)
+ pr_err("%s: read esd i2c error\n", __func__);
+ pr_err("%s: read esd %02x\n", __func__, data);
+
+ if(data != 0) {
+ pr_err("!!! ic work abnormally, reset ic\n");
+ fts_ctpm_hw_reset();
+ } else {
+ fts_write_reg(g_focalclient, FTS_ESD_REG, 0x1);
+ }
+
+exit:
+ if(!tpd_halt)
+ queue_delayed_work(fts_esd_wq, &fts_esd_checker, 2 * HZ);
+}
+#endif
+
static int tpd_probe(struct i2c_client *client, const struct i2c_device_id *id)
{
int retval = TPD_OK;
@@ -1205,13 +1205,13 @@ reset_proc: mz_gesture_handle_register(ft5x46_gesture_handler);
-#ifdef FTS_ESD_CHECKER - INIT_DELAYED_WORK(&fts_esd_checker, fts_esd_checker_handler); - fts_esd_wq = create_singlethread_workqueue("FTS-ESD"); - pr_err("start fts esd checking ...\n"); - queue_delayed_work(fts_esd_wq, &fts_esd_checker, 0); -#endif - +#ifdef FTS_ESD_CHECKER
+ INIT_DELAYED_WORK(&fts_esd_checker, fts_esd_checker_handler);
+ fts_esd_wq = create_singlethread_workqueue("FTS-ESD");
+ pr_err("start fts esd checking ...\n");
+ queue_delayed_work(fts_esd_wq, &fts_esd_checker, 0);
+#endif
+
#ifdef TPD_AUTO_UPGRADE
// fts_ctpm_auto_upgrade(i2c_client);
kthread_run(tpd_firmware_upgrade_thread, 0, TPD_DEVICE);
@@ -1230,7 +1230,7 @@ reset_proc: #endif
sysfs_create_link(sysfs_get_devices_parent(), &client->dev.kobj, "mx_tsp");
- meizu_sysfslink_register_name(&client->dev, "tp"); + meizu_sysfslink_register_name(&client->dev, "tp");
#ifdef FTS_CTL_IIC
if (ft_rw_iic_drv_init(i2c_client) < 0)
@@ -1301,10 +1301,10 @@ static int tpd_local_init(void) #ifdef MZ_HALL_MODE
extern int ft5x46_hall_mode_state;
-int ft5x46_hall_mode_switch(int state); +int ft5x46_hall_mode_switch(int state);
#endif
-extern void mz_tp_set_mode(int mode); +extern void mz_tp_set_mode(int mode);
static void tpd_resume( struct early_suspend *h )
{
int i = 0;
@@ -1313,14 +1313,14 @@ static void tpd_resume( struct early_suspend *h ) TPD_DMESG("TPD wake up\n");
- mutex_lock(&ft_suspend_lock); -#ifdef TYPE_B_PROTOCOL - tpd_clear_all_touch(); -#else - tpd_up(0, 0, 0, 0); - input_sync(tpd->dev); -#endif - + mutex_lock(&ft_suspend_lock);
+#ifdef TYPE_B_PROTOCOL
+ tpd_clear_all_touch();
+#else
+ tpd_up(0, 0, 0, 0);
+ input_sync(tpd->dev);
+#endif
+
#ifdef FTS_GESTURE
#ifdef MZ_HALL_MODE
if((ft5x46_gesture_state_pre != MZ_GESTURE_DISABLE) &&
@@ -1368,26 +1368,26 @@ static void tpd_resume( struct early_suspend *h ) #endif
tpd_charger_check(1);
- -#ifdef MZ_HALL_MODE - ft5x46_hall_mode_switch(ft5x46_hall_mode_state); -#endif - - if(ft5x46_hall_mode_state) - mz_tp_set_mode(MZ_COVER_MODE); - else - mz_tp_set_mode(MZ_HAND_MODE); - +
+#ifdef MZ_HALL_MODE
+ ft5x46_hall_mode_switch(ft5x46_hall_mode_state);
+#endif
+
+ if(ft5x46_hall_mode_state)
+ mz_tp_set_mode(MZ_COVER_MODE);
+ else
+ mz_tp_set_mode(MZ_HAND_MODE);
+
mt_eint_unmask(CUST_EINT_TOUCH_PANEL_NUM);
msleep(30);
tpd_halt = 0;
- -#ifdef FTS_ESD_CHECKER - pr_err("start fts esd checking ...\n"); - queue_delayed_work(fts_esd_wq, &fts_esd_checker, 0); -#endif - mutex_unlock(&ft_suspend_lock); +
+#ifdef FTS_ESD_CHECKER
+ pr_err("start fts esd checking ...\n");
+ queue_delayed_work(fts_esd_wq, &fts_esd_checker, 0);
+#endif
+ mutex_unlock(&ft_suspend_lock);
TPD_DMESG("TPD wake up done\n");
}
@@ -1397,12 +1397,12 @@ static void tpd_suspend( struct early_suspend *h ) unsigned char reg = 0xA5;
int i = 0;
- mutex_lock(&ft_suspend_lock); -#ifdef FTS_ESD_CHECKER - pr_err("stop fts esd checking ...\n"); - cancel_delayed_work(&fts_esd_checker); -#endif - + mutex_lock(&ft_suspend_lock);
+#ifdef FTS_ESD_CHECKER
+ pr_err("stop fts esd checking ...\n");
+ cancel_delayed_work(&fts_esd_checker);
+#endif
+
#ifdef FTS_GESTURE
ft5x46_gesture_state_pre = ft5x46_gesture_state;
#ifdef MZ_HALL_MODE
@@ -1422,8 +1422,8 @@ static void tpd_suspend( struct early_suspend *h ) {
FTS_DBG("[FTS] tpd_suspend gesture \
state = enable...\n");
- mz_tp_set_mode(MZ_GESTURE_MODE); - goto exit; + mz_tp_set_mode(MZ_GESTURE_MODE);
+ goto exit;
}
}
@@ -1439,9 +1439,9 @@ static void tpd_suspend( struct early_suspend *h ) tpd_halt = 1;
TPD_DMESG("TPD enter sleep\n");
- mt_eint_mask(CUST_EINT_TOUCH_PANEL_NUM); - - mz_tp_set_mode(MZ_SLEEP_MODE); + mt_eint_mask(CUST_EINT_TOUCH_PANEL_NUM);
+
+ mz_tp_set_mode(MZ_SLEEP_MODE);
mutex_lock(&i2c_access);
fts_write_reg(i2c_client, reg, data); //TP enter sleep mode
mutex_unlock(&i2c_access);
@@ -1467,9 +1467,9 @@ static void tpd_suspend( struct early_suspend *h ) #endif
#endif
- -exit: - mutex_unlock(&ft_suspend_lock); +
+exit:
+ mutex_unlock(&ft_suspend_lock);
TPD_DMESG("TPD enter sleep done\n");
}
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.c b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.c index d00479cb8..3a78071c1 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.c +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.c @@ -67,7 +67,7 @@ static unsigned char aucFW_APP_SHP_B[] = {
#include "FT5346_V22_M81_OFILM_SHP_B_20150701_app.i"
};
- +
static unsigned char aucFW_APP_AUO_B[] =
{
#include "FT5346_V27_M81_OFILM_AUO_B_20150831_app.i"
@@ -1436,9 +1436,9 @@ int fts_ctpm_fw_download_with_i_file(struct i2c_client *client, }
#endif
-// get lcm id from LCD -extern int primary_display_get_lcm_index(void); - +// get lcm id from LCD
+extern int primary_display_get_lcm_index(void);
+
int fts_ctpm_auto_upgrade(struct i2c_client *client)
{
u8 *fw_data = NULL;
@@ -1447,36 +1447,36 @@ int fts_ctpm_auto_upgrade(struct i2c_client *client) struct CtpInfo ctp_info = {0};
u8 auc_i2c_write_buf;
static bool version_check = true;
- int upgrade_ret = MZ_FAILED; - int lcm_id; + int upgrade_ret = MZ_FAILED;
+ int lcm_id;
pr_warn("********************Enter CTP Auto Upgrade********************\n");
for(i = 0; i < 5; ++i) {
- /* + /*
if(i < 3)
i_ret = fts_ctpm_read_ctp_info_from_app(client,
&ctp_info);
else {
- */ + */
i_ret = fts_ctpm_read_ctp_info_from_flash(client,
&ctp_info);
// version_check = false;
//}
- - // there no version info in flash area, read it in app - fts_read_reg(client, FT_REG_FW_VER, &(ctp_info.fw_version)); +
+ // there no version info in flash area, read it in app
+ fts_read_reg(client, FT_REG_FW_VER, &(ctp_info.fw_version));
pr_warn("[FTS] %d: lcm_id = 0x%x, fm_ver = 0x%x, vendor_id = 0x%x\n",
i, ctp_info.lcm_id,
ctp_info.fw_version, ctp_info.vendor_id);
-/* +/*
if(ctp_info.vendor_id == 0x79) {
pr_warn("[FTS] ignore old fw %02x upgrade",
ctp_info.vendor_id);
goto fw_exit;
}
-*/ +*/
// get fw according to vendor_id and lcm_id
i_ret = fts_ctpm_get_fw_data(ctp_info.vendor_id,
@@ -1491,22 +1491,22 @@ int fts_ctpm_auto_upgrade(struct i2c_client *client) if(i >= 5) {
pr_err("!!! firmware not match vendor_id %02x lcm_id %02x, exit\n",
ctp_info.vendor_id, ctp_info.lcm_id);
- /* - * read from LCD, if lcm_id is not exist - * 0 -- sharp - * 1 -- auo - */ - lcm_id = primary_display_get_lcm_index(); - if(lcm_id >= 0) { - pr_err("lcm_id from LCD %d\n", lcm_id); - // ctp_fw_app index is same as lcm_id, direct reference - fw_data = ctp_fw_app[lcm_id].fw_data; - fw_length = ctp_fw_app[lcm_id].fw_length; - version_check = false; - } else { - pr_err("!!! get wrong lcm_id from LCD %d, abort\n", lcm_id); + /*
+ * read from LCD, if lcm_id is not exist
+ * 0 -- sharp
+ * 1 -- auo
+ */
+ lcm_id = primary_display_get_lcm_index();
+ if(lcm_id >= 0) {
+ pr_err("lcm_id from LCD %d\n", lcm_id);
+ // ctp_fw_app index is same as lcm_id, direct reference
+ fw_data = ctp_fw_app[lcm_id].fw_data;
+ fw_length = ctp_fw_app[lcm_id].fw_length;
+ version_check = false;
+ } else {
+ pr_err("!!! get wrong lcm_id from LCD %d, abort\n", lcm_id);
goto fw_exit;
- } + }
}
//version check
@@ -1514,7 +1514,7 @@ int fts_ctpm_auto_upgrade(struct i2c_client *client) pr_warn("firmware is up-to-date ic %02x driver %02x, abort\n",
ctp_info.fw_version, fw_data[fw_length - 2]);
version_check = false;
- upgrade_ret = MZ_NO_ACTION; + upgrade_ret = MZ_NO_ACTION;
goto fw_exit;
}
@@ -1522,8 +1522,8 @@ int fts_ctpm_auto_upgrade(struct i2c_client *client) i_ret = fts_ctpm_fw_upgrade(client, fw_data, fw_length);
if(i_ret < 0) {
pr_err("firmware upgrade failed, ret %d\n", i_ret);
- } else - upgrade_ret = MZ_SUCCESS; + } else
+ upgrade_ret = MZ_SUCCESS;
fw_exit:
// read current tp info
@@ -1744,7 +1744,7 @@ error_return: return count;
}
- +
#ifdef FTS_MCAP_TEST
static ssize_t ft5x46_appid_show(struct device *dev,
struct device_attribute *attr, char *buf)
@@ -1881,39 +1881,39 @@ static DEVICE_ATTR(ftstprwreg, S_IRUGO | S_IWUSR, fts_tprwreg_show, static DEVICE_ATTR(ctptest, S_IRUGO|S_IWUSR, ft5x46_ctptest_show, ft5x46_ctptest_store);
static DEVICE_ATTR(appid, S_IRUGO|S_IWUSR, ft5x46_appid_show, ft5x46_appid_store);
#endif
- -static int mz_tp_mode = MZ_UNKNOWN; -static int mz_tp_state = MZ_NO_ACTION; - -void mz_tp_set_mode(int mode) -{ - mz_tp_mode = mode; -} - +
+static int mz_tp_mode = MZ_UNKNOWN;
+static int mz_tp_state = MZ_NO_ACTION;
+
+void mz_tp_set_mode(int mode)
+{
+ mz_tp_mode = mode;
+}
+
static ssize_t ft5x46_mode_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%d\n", mz_tp_mode);
}
- +
static ssize_t ft5x46_fwupdate_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%d\n", mz_tp_state);
}
- -extern int tpd_firmware_upgrade_thread(void *unused); +
+extern int tpd_firmware_upgrade_thread(void *unused);
static ssize_t ft5x46_fwupdate_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
-{ - mz_tp_state = tpd_firmware_upgrade_thread(NULL); - - return count; -} - +{
+ mz_tp_state = tpd_firmware_upgrade_thread(NULL);
+
+ return count;
+}
+
static DEVICE_ATTR(mode, S_IRUGO, ft5x46_mode_show, NULL);
static DEVICE_ATTR(fwupdate, S_IRUGO|S_IWUSR, ft5x46_fwupdate_show, ft5x46_fwupdate_store);
- +
/*add your attr in here*/
static struct attribute *fts_attributes[] =
{
@@ -2127,7 +2127,7 @@ static int ft5x0x_debug_read(struct file *filp,char __user *buf,size_t count, FTS_DBG( "%s:read iic error\n", __func__);
return ret;
}
- +
num_read_chars = readlen;
break;
case PROC_WRITE_DATA:
@@ -2141,34 +2141,34 @@ static int ft5x0x_debug_read(struct file *filp,char __user *buf,size_t count, return num_read_chars;
}
- -#ifdef FTS_ESD_CHECKER -extern int apk_debug_flag; -#endif - -int ft5x0x_debug_open(struct inode * node, struct file *filp) -{ -#ifdef FTS_ESD_CHECKER - apk_debug_flag++; -#endif - - return 0; -} - -int ft5x0x_debug_release(struct inode *node, struct file *filp) -{ -#ifdef FTS_ESD_CHECKER - apk_debug_flag--; -#endif - - return 0; -} - +
+#ifdef FTS_ESD_CHECKER
+extern int apk_debug_flag;
+#endif
+
+int ft5x0x_debug_open(struct inode * node, struct file *filp)
+{
+#ifdef FTS_ESD_CHECKER
+ apk_debug_flag++;
+#endif
+
+ return 0;
+}
+
+int ft5x0x_debug_release(struct inode *node, struct file *filp)
+{
+#ifdef FTS_ESD_CHECKER
+ apk_debug_flag--;
+#endif
+
+ return 0;
+}
+
static struct file_operations ft5x0x_proc_fops = {
- .open = ft5x0x_debug_open, + .open = ft5x0x_debug_open,
.read = ft5x0x_debug_read,
- .write = ft5x0x_debug_write, - .release = ft5x0x_debug_release, + .write = ft5x0x_debug_write,
+ .release = ft5x0x_debug_release,
};
int ft5x0x_create_apk_debug_channel(struct i2c_client * client)
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h index dbce14685..44fbadc46 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h @@ -30,10 +30,10 @@ #define FTS_FACTORYMODE_VALUE 0x40
#define FTS_WORKMODE_VALUE 0x00
- +
#define FTS_MIN_FW_LENGTH (8)
#define FTS_ALL_FW_LENGTH (64*1024)
-#define FTS_APP_FW_LENGTH (54*1024) +#define FTS_APP_FW_LENGTH (54*1024)
/*create sysfs for debug*/
int fts_create_sysfs(struct i2c_client * client);
@@ -62,5 +62,5 @@ int fts_write_reg(struct i2c_client * client,u8 regaddr, u8 regvalue); int fts_read_reg(struct i2c_client * client,u8 regaddr, u8 *regvalue);
-void fts_ctpm_hw_reset(void); +void fts_ctpm_hw_reset(void);
#endif
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h b/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h index fee278a5b..82f225470 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h @@ -101,10 +101,10 @@ FHD 1920x1080 2key ( (160,2100);(920,2100) ) 3key ( (160,2100);(540, /*register address*/
#define FT_REG_CHIP_ID 0xA3 //chip ID
#define FT_REG_FW_VER 0xA6 //FW version
-#define FT_REG_VENDOR_ID 0xA8 //TP vendor ID +#define FT_REG_VENDOR_ID 0xA8 //TP vendor ID
#define FT_REG_LCM_ID 0xAB //lcm ID
-#define FT_APP_INFO_ADDR 0xd7f8 +#define FT_APP_INFO_ADDR 0xd7f8
#define FT_VENDOR_ID_ADDR 0xd784
#define FT_LCM_ID_ADDR 0xd786
@@ -121,18 +121,18 @@ FHD 1920x1080 2key ( (160,2100);(920,2100) ) 3key ( (160,2100);(540, /*debug fuction*/
#define TPD_SYSFS_DEBUG
-#ifndef USER_BUILD_KERNEL +#ifndef USER_BUILD_KERNEL
#define FTS_CTL_IIC
#define FTS_APK_DEBUG
-#define FTS_DEBUG -#endif +#define FTS_DEBUG
+#endif
/*tp power down when suspend*/
//#define TPD_CLOSE_POWER_IN_SLEEP
- -// include ft5x46 self test interface -#define FTS_MCAP_TEST - +
+// include ft5x46 self test interface
+#define FTS_MCAP_TEST
+
/*download*/
// #define TPD_AUTO_DOWNLOAD // if need download CTP FW when POWER ON,pls enable this MACRO
@@ -148,18 +148,18 @@ FHD 1920x1080 2key ( (160,2100);(920,2100) ) 3key ( (160,2100);(540, #ifdef FTS_GESTURE
#undef TPD_CLOSE_POWER_IN_SLEEP
#define FTS_GESTURE_DBG // if define it,open gesture in suspend every time
-#define FTS_ESD_CHECKER // enable esd checker -
-#define MZ_UNKNOWN 0 -#define MZ_HAND_MODE 1 -#define MZ_GESTURE_MODE 2 -#define MZ_COVER_MODE 3 -#define MZ_SLEEP_MODE 4 - -#define MZ_NO_ACTION 0 -#define MZ_FAILED 1 -#define MZ_SUCCESS 2 - +#define FTS_ESD_CHECKER // enable esd checker
+
+#define MZ_UNKNOWN 0
+#define MZ_HAND_MODE 1
+#define MZ_GESTURE_MODE 2
+#define MZ_COVER_MODE 3
+#define MZ_SLEEP_MODE 4
+
+#define MZ_NO_ACTION 0
+#define MZ_FAILED 1
+#define MZ_SUCCESS 2
+
#define GESTURE_SWITCH_OPEN 0x50
#define GESTURE_SWITCH_CLOSE 0x51
#endif //FTS_GESTURE
@@ -171,11 +171,11 @@ FHD 1920x1080 2key ( (160,2100);(920,2100) ) 3key ( (160,2100);(540, #define GLOVE_SWITCH_CLOSE 0x54
#endif
-#define MZ_HALL_MODE - +#define MZ_HALL_MODE
+
/*trace*/
#define pr_fmt(fmt) "[FTS]" fmt
- +
#ifdef FTS_DEBUG
#define FTS_DBG pr_debug
#else
diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_firmware.h b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_firmware.h index f661e1a16..df6e70862 100644 --- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_firmware.h +++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_firmware.h @@ -1,28 +1,28 @@ -/* Copyright Statement:
- * This firmware are protected under relevant copyright laws, this information contained
- * herein is confidential and proprietary to Goodix.
- *
- * GOODIX (C) 2014. All rights reserved.
- *
- * WARNING:
- * The GTP_COMPATIBLE_MODE part of this file was generated by the specialized tools,
- * Please do not modify it manually!
- *
- * Generate date & time:
- * 2014/10/17, 14:06:06
- */
-
-
-#ifndef _GT9XX_FIRMWARE_H_
-#define _GT9XX_FIRMWARE_H_
-
+/* Copyright Statement:
+ * This firmware are protected under relevant copyright laws, this information contained
+ * herein is confidential and proprietary to Goodix.
+ *
+ * GOODIX (C) 2014. All rights reserved.
+ *
+ * WARNING:
+ * The GTP_COMPATIBLE_MODE part of this file was generated by the specialized tools,
+ * Please do not modify it manually!
+ *
+ * Generate date & time:
+ * 2014/10/17, 14:06:06
+ */
+
+
+#ifndef _GT9XX_FIRMWARE_H_
+#define _GT9XX_FIRMWARE_H_
+
struct gtp_fw_info {
u8 pid[8];
u8 *fwp;
unsigned long length;
};
-#if GTP_HEADER_FW_UPDATE
+#if GTP_HEADER_FW_UPDATE
unsigned char gtp_gt970_FW[] = {
#include "gt970_201e_1103_0906.ihex"
};
@@ -30,14 +30,14 @@ unsigned char gtp_gt970_FW[] = { struct gtp_fw_info gtp_update_tb[] = {
{"970", gtp_gt970_FW, sizeof(gtp_gt970_FW)},
};
-#endif /* GTP_HEADER_FW_UPDATE */
-
-
-#if GTP_COMPATIBLE_MODE
-unsigned char gtp_default_FW_fl[] =
-{
-
-};
-#endif /* GTP_COMPATIBLE_MODE */
-
-#endif
+#endif /* GTP_HEADER_FW_UPDATE */
+
+
+#if GTP_COMPATIBLE_MODE
+unsigned char gtp_default_FW_fl[] =
+{
+
+};
+#endif /* GTP_COMPATIBLE_MODE */
+
+#endif
diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h b/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h index ee5f5dd5b..63f3da5f2 100644 --- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h +++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h @@ -188,59 +188,59 @@ typedef struct // The predefined one is just a sample config, which is not suitable for your tp in most cases.
#ifdef MZ_HALL_MODE
// for glove mode
-#define CTP_CFG_HALL_MODE {\ - 0x4E,0x38,0x04,0xA2,0x03,0x02,0x35,0x00,\ - 0x02,0x0F,0x28,0x0F,0x5F,0x4B,0x03,0x05,\ - 0x4E,0x00,0x00,0x00,0x22,0x22,0x00,0x14,\ - 0x14,0x24,0x14,0x8C,0x00,0x0E,0x55,0x00,\ - 0x7C,0x06,0x00,0x00,0x00,0x9B,0x03,0x91,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ - 0x00,0x30,0x00,0x46,0x96,0x94,0xC0,0x02,\ - 0x20,0x00,0x03,0x04,0x8E,0x4B,0x00,0x7C,\ - 0x58,0x28,0x6E,0x66,0x00,0x62,0x77,0x00,\ - 0x58,0x8B,0x00,0x58,0x00,0x00,0x00,0x00,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x67,\ - 0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x19,\ - 0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ - 0x02,0x04,0x06,0x08,0x0A,0x0C,0x0E,0x10,\ - 0x12,0x14,0x16,0x18,0x1A,0x1C,0x00,0x00,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x63,\ - 0x88,0x70,0x15,0x1F,0x64,0x46,0x14,0x13,\ - 0x12,0x10,0x0F,0x0C,0x0A,0x08,0x06,0x04,\ - 0x02,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,\ - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ - 0x53,0x01,\ +#define CTP_CFG_HALL_MODE {\
+ 0x4E,0x38,0x04,0xA2,0x03,0x02,0x35,0x00,\
+ 0x02,0x0F,0x28,0x0F,0x5F,0x4B,0x03,0x05,\
+ 0x4E,0x00,0x00,0x00,0x22,0x22,0x00,0x14,\
+ 0x14,0x24,0x14,0x8C,0x00,0x0E,0x55,0x00,\
+ 0x7C,0x06,0x00,0x00,0x00,0x9B,0x03,0x91,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+ 0x00,0x30,0x00,0x46,0x96,0x94,0xC0,0x02,\
+ 0x20,0x00,0x03,0x04,0x8E,0x4B,0x00,0x7C,\
+ 0x58,0x28,0x6E,0x66,0x00,0x62,0x77,0x00,\
+ 0x58,0x8B,0x00,0x58,0x00,0x00,0x00,0x00,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x67,\
+ 0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x19,\
+ 0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+ 0x02,0x04,0x06,0x08,0x0A,0x0C,0x0E,0x10,\
+ 0x12,0x14,0x16,0x18,0x1A,0x1C,0x00,0x00,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x63,\
+ 0x88,0x70,0x15,0x1F,0x64,0x46,0x14,0x13,\
+ 0x12,0x10,0x0F,0x0C,0x0A,0x08,0x06,0x04,\
+ 0x02,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,\
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+ 0x53,0x01,\
}
#endif
-#define CTP_CFG_GROUP1 {\ - 0x4E,0x38,0x04,0x80,0x07,0x0A,0x35,0x01,\ - 0x01,0x08,0x28,0x28,0x78,0x64,0x03,0x05,\ - 0x4E,0x00,0x00,0x00,0x22,0x22,0x08,0x14,\ - 0x14,0x24,0x14,0x8C,0x2D,0x0E,0x59,0x5B,\ - 0xB9,0x08,0xB9,0x08,0x00,0xBB,0x33,0x11,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ - 0x00,0x00,0x2B,0x24,0x78,0x54,0xC0,0x02,\ - 0x10,0x00,0x03,0x04,0xB1,0x28,0x00,0x90,\ - 0x34,0x28,0x7A,0x42,0x00,0x6A,0x54,0x00,\ - 0x5E,0x6B,0x00,0x5E,0x70,0x00,0x00,0x00,\ - 0xF5,0x50,0x40,0xAA,0xAA,0x57,0x15,0x00,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x67,\ - 0x22,0x00,0x03,0x00,0x10,0x02,0x32,0x14,\ - 0x14,0x14,0x50,0x00,0x00,0x00,0x00,0x28,\ - 0x02,0x04,0x06,0x08,0x0A,0x0C,0x0E,0x10,\ - 0x12,0x14,0x16,0x18,0x1A,0x1C,0x00,0x00,\ - 0x00,0x00,0x02,0x78,0x46,0x07,0x40,0x63,\ - 0xB4,0xA0,0x13,0x94,0x8C,0x46,0x14,0x13,\ - 0x12,0x10,0x0F,0x0C,0x0A,0x08,0x06,0x04,\ - 0x02,0x00,0x16,0x18,0x1C,0x24,0x26,0x28,\ - 0x1D,0x1E,0x1F,0x20,0x21,0x22,0x29,0xFF,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ - 0xBE,0x01,\ +#define CTP_CFG_GROUP1 {\
+ 0x4E,0x38,0x04,0x80,0x07,0x0A,0x35,0x01,\
+ 0x01,0x08,0x28,0x28,0x78,0x64,0x03,0x05,\
+ 0x4E,0x00,0x00,0x00,0x22,0x22,0x08,0x14,\
+ 0x14,0x24,0x14,0x8C,0x2D,0x0E,0x59,0x5B,\
+ 0xB9,0x08,0xB9,0x08,0x00,0xBB,0x33,0x11,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+ 0x00,0x00,0x2B,0x24,0x78,0x54,0xC0,0x02,\
+ 0x10,0x00,0x03,0x04,0xB1,0x28,0x00,0x90,\
+ 0x34,0x28,0x7A,0x42,0x00,0x6A,0x54,0x00,\
+ 0x5E,0x6B,0x00,0x5E,0x70,0x00,0x00,0x00,\
+ 0xF5,0x50,0x40,0xAA,0xAA,0x57,0x15,0x00,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x67,\
+ 0x22,0x00,0x03,0x00,0x10,0x02,0x32,0x14,\
+ 0x14,0x14,0x50,0x00,0x00,0x00,0x00,0x28,\
+ 0x02,0x04,0x06,0x08,0x0A,0x0C,0x0E,0x10,\
+ 0x12,0x14,0x16,0x18,0x1A,0x1C,0x00,0x00,\
+ 0x00,0x00,0x02,0x78,0x46,0x07,0x40,0x63,\
+ 0xB4,0xA0,0x13,0x94,0x8C,0x46,0x14,0x13,\
+ 0x12,0x10,0x0F,0x0C,0x0A,0x08,0x06,0x04,\
+ 0x02,0x00,0x16,0x18,0x1C,0x24,0x26,0x28,\
+ 0x1D,0x1E,0x1F,0x20,0x21,0x22,0x29,0xFF,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+ 0xBE,0x01,\
}
// TODO: define your config for Sensor_ID == 1 here, if needed
#define CTP_CFG_GROUP2 {\
@@ -328,16 +328,16 @@ typedef struct #define CFG_GROUP_LEN(p_cfg_grp) (sizeof(p_cfg_grp) / sizeof(p_cfg_grp[0]))
-#define MZ_UNKNOWN 0 -#define MZ_HAND_MODE 1 -#define MZ_GESTURE_MODE 2 -#define MZ_COVER_MODE 3 -#define MZ_SLEEP_MODE 4 - -#define MZ_NO_ACTION 0 -#define MZ_FAILED 1 -#define MZ_SUCCESS 2 - +#define MZ_UNKNOWN 0
+#define MZ_HAND_MODE 1
+#define MZ_GESTURE_MODE 2
+#define MZ_COVER_MODE 3
+#define MZ_SLEEP_MODE 4
+
+#define MZ_NO_ACTION 0
+#define MZ_FAILED 1
+#define MZ_SUCCESS 2
+
//******************** For GT9XXF Start **********************//
#if GTP_COMPATIBLE_MODE
typedef enum
|