update: tp,cst9220驱动添加回来，去掉升级

components/tp/luat_lib_tp.c

@@ -36,7 +36,7 @@ static const tp_reg_t tp_regs[] = {
 	{"jd9261t_inited",  &tp_config_jd9261t_inited},
 	{"ft3x68", &tp_config_ft3x68},
     {"cst820", &tp_config_cst820},
-    // {"cst9220", &tp_config_cst92xx},
+    {"cst9220", &tp_config_cst92xx},
     #endif
 #endif
 #ifdef LUAT_USE_TP_PC

components/tp/luat_tp_cst9220.c

@@ -11,10 +11,6 @@
 #define LUAT_LOG_TAG "cst92xx"
 #include "luat_log.h"
 
-#define HYN_POWER_ON_UPDATA           (0) //touch fw updata  //! ！！！目前这里的升级还有点问题，不要随便开，小心变砖！！！
-#define HYNITRON_PROGRAM_PAGE_SIZE    (128)
-#define RW_REG_LEN   (2)
-
 #define CST92XX_ADDRESS               (0x5A)
 
 #define CST9217_CHIP_ID_CODE          (0x9217)
@@ -74,11 +70,8 @@ typedef struct hyn_ts_data {
     struct tp_info hw_info;
     int boot_is_pass;
     int need_updata_fw;
-    int fw_updata_process;
 }hyn_ts_data_t;
 
-static int tp_cst92xx_enter_boot(luat_tp_config_t* luat_tp_config);
-static uint32_t cst92xx_read_checksum(luat_tp_config_t* luat_tp_config);
 static hyn_ts_data_t hyn_92xxdata = {0};
 
 typedef struct luat_touch_info{
@@ -263,209 +256,6 @@ static int tp_cst92xx_hw_reset(luat_tp_config_t* luat_tp_config){
     return 0;
 }
 
-static int erase_all_mem(luat_tp_config_t* luat_tp_config)
-{
-    int ok = -1,t;
-    uint8_t i2c_buf[8];
-
-	//erase_all_mem
-    ok = hyn_wr_reg(luat_tp_config, 0xA0140000, 4, NULL, 0);
-    if (ok){
-        return -1;
-    }
-    ok = hyn_wr_reg(luat_tp_config, 0xA00C807F, 4, NULL, 0);
-    if (ok){
-        return -1;
-    }
-    ok = hyn_wr_reg(luat_tp_config, 0xA004EC, 3, NULL, 0);
-    if (ok){
-        return -1;
-    }
-        
-    luat_rtos_task_sleep(300);
-    for (t = 0;; t += 10) {
-        if (t >= 1000) {
-           return -1;
-        }
-
-        luat_rtos_task_sleep(10);
-
-        ok = hyn_wr_reg(luat_tp_config, 0xA005, 2, i2c_buf, 1);
-        if (ok) {
-            continue;
-        }
-
-        if (i2c_buf[0] == 0x88) {
-            break;
-        }
-    }
-
-    return 0;
-}
-
-static int write_mem_page(luat_tp_config_t* luat_tp_config, uint16_t addr, uint8_t *buf, uint16_t len)
-{
-    int ok = -1,t;
-    uint8_t i2c_buf[1024+2] = {0};
-    // uint32_t write_data;
-
-    i2c_buf[0] = 0xA0;
-    i2c_buf[1] = 0x0C;
-    i2c_buf[2] = len;
-    i2c_buf[3] = len >> 8;
-    // write_data = (i2c_buf[0] << 24) + (i2c_buf[1] << 16) + (i2c_buf[2] << 8) + i2c_buf[3];
-    //ok = hyn_i2c_write_r16(HYN_BOOT_I2C_ADDR, 0xA00C, i2c_buf, 2);
-    ok = tp_i2c_write(luat_tp_config, i2c_buf, 4, NULL, 0);
-    // ok = hyn_write_data(luat_tp_config, i2c_buf,RW_REG_LEN, 4);
-    if(ok){
-         return -1;
-    }
-
-
-    i2c_buf[0] = 0xA0;
-    i2c_buf[1] = 0x14;
-    i2c_buf[2] = addr;
-    i2c_buf[3] = addr >> 8;
-    ok = tp_i2c_write(luat_tp_config, i2c_buf, 4, NULL, 0);
-    // ok = hyn_write_data(luat_tp_config, i2c_buf,RW_REG_LEN, 4);
-    if(ok) {
-        return -1;
-    }
-
-
-    i2c_buf[0] = 0xA0;
-    i2c_buf[1] = 0x18;
-    memcpy(i2c_buf + 2, buf, len);         
-    ok = tp_i2c_write(luat_tp_config, i2c_buf, len+2, NULL, 0);   
-    // ok = hyn_write_data(luat_tp_config, i2c_buf,RW_REG_LEN, len+2);
-    if(ok){
-        return -1;
-    }
-
-
-    ok =  hyn_wr_reg(luat_tp_config,0xA004EE,3,NULL,0);
-    if(ok){
-        return -1;
-    }
-
-    for (t = 0;; t += 10) {
-        if (t >= 1000) {
-            return -1;
-        }
-
-        luat_rtos_task_sleep(5);
-
-        ok =  hyn_wr_reg(luat_tp_config,0xA005,2,i2c_buf,1);
-        if(ok){
-            continue;
-        }        
-
-        if (i2c_buf[0] == 0x55) {
-            break;
-        }
-    }
-
-    return 0;
-}
-
-static int write_code(luat_tp_config_t* luat_tp_config, uint8_t *bin_addr,uint8_t retry)
-{
-    uint8_t data[HYNITRON_PROGRAM_PAGE_SIZE+4];//= (uint8_t *)bin_addr;
-    uint16_t addr = 0;
-    uint16_t remain_len = CST92XX_BIN_SIZE;
-    int ret;
-   
-    while (remain_len > 0) {
-        uint16_t cur_len = remain_len;
-        if (cur_len > HYNITRON_PROGRAM_PAGE_SIZE) {
-            cur_len = HYNITRON_PROGRAM_PAGE_SIZE;
-        }
-        
-        memcpy(data, bin_addr + addr, HYNITRON_PROGRAM_PAGE_SIZE);
-        //HYN_INFO("write_code addr 0x%x 0x%x",addr,*data);
-        if (write_mem_page(luat_tp_config, addr, data, cur_len) ==  -1) {
-             return -1;
-        }
-        //data += cur_len;
-        addr += cur_len;
-        remain_len -= cur_len;
-    }
-    return 0;
-}
-
-static int cst92xx_updata_fw(luat_tp_config_t* luat_tp_config, uint8_t *bin_addr, uint16_t len)
-{ 
-    #define CHECKSUM_OFFECT  (0x7F6C)
-    int retry = 0;
-    int ok_copy = 0;
-    int ok = -1;
-    uint8_t i2c_buf[4];
-
-    uint32_t fw_checksum=0;
-
-    if(len < CST92XX_BIN_SIZE){
-        LLOGE("len = %d",len);
-        goto UPDATA_END;
-    }
-    if(len > CST92XX_BIN_SIZE) len = CST92XX_BIN_SIZE;
-
-    fw_checksum = U8TO32(bin_addr[CHECKSUM_OFFECT+3],bin_addr[CHECKSUM_OFFECT+2],bin_addr[CHECKSUM_OFFECT+1],bin_addr[CHECKSUM_OFFECT+0]);
-    LLOGD("updating fw checksum:0x%04x",fw_checksum);
-
-    luat_tp_irq_enable(luat_tp_config, 0);
-    
-    LLOGD("updata_fw start");
-    for(retry = 1; retry<5; retry++){
-        hyn_92xxdata.fw_updata_process = 0;
-        ok = tp_cst92xx_enter_boot(luat_tp_config);
-        if (ok){
-            continue;
-        }
-        hyn_92xxdata.fw_updata_process = 10;
-        ok = erase_all_mem(luat_tp_config);
-        if (ok){
-            continue;
-        }
-        hyn_92xxdata.fw_updata_process = 20;
-        ok = write_code(luat_tp_config,bin_addr,retry);
-        if (ok){
-            continue;
-        }
-        hyn_92xxdata.fw_updata_process = 30;
-        hyn_92xxdata.hw_info.ic_fw_checksum = cst92xx_read_checksum(luat_tp_config);
-        if(fw_checksum != hyn_92xxdata.hw_info.ic_fw_checksum){
-            LLOGD("out data fw checksum err:0x%04x",hyn_92xxdata.hw_info.ic_fw_checksum);
-            hyn_92xxdata.fw_updata_process |= 0x80;
-            continue;
-        }
-        hyn_92xxdata.fw_updata_process = 100;   
-        if(retry>=5){
-            ok_copy = -1;
-            break;
-        }
-        break;
-    }
-
-    hyn_wr_reg(luat_tp_config,0xA006EE,3,NULL,0); //exit boot
-    luat_rtos_task_sleep(2);
-
-UPDATA_END:   
-    tp_cst92xx_hw_reset(luat_tp_config);
-    luat_rtos_task_sleep(50);
-
-    if(ok_copy == 0){
-        tp_cst92xx_updata_tpinfo(luat_tp_config);
-        LLOGD("updata_fw success");
-    }
-    else{
-        LLOGD("updata_fw failed");
-    }
-
-    luat_tp_irq_enable(luat_tp_config, 1);
-
-    return ok_copy;
-}
-
 static int16_t read_word_from_mem(luat_tp_config_t* luat_tp_config, uint8_t type, uint16_t addr, uint32_t *value){
     uint8_t i2c_buf[4] = {0};
 
@@ -577,85 +367,6 @@ static int tp_cst92xx_read_chip_id(luat_tp_config_t* luat_tp_config){
     return 0;
 }
 
-static uint32_t cst92xx_read_checksum(luat_tp_config_t* luat_tp_config){
-    uint8_t i2c_buf[4] = {0};
-    uint32_t chip_checksum = 0;
-    uint8_t retry = 5;
-    
-    hyn_92xxdata.boot_is_pass = 0;
-
-    if (hyn_wr_reg(luat_tp_config,0xA00300,3,i2c_buf,0)) {
-        return -1;
-    }      
-    luat_rtos_task_sleep(2);    
-    while(retry--){
-        luat_rtos_task_sleep(5);
-        if (hyn_wr_reg(luat_tp_config,0xA000,2,i2c_buf,1)) {
-            continue;
-        }
-        if(i2c_buf[0]!=0) break;
-    }
-
-    luat_rtos_task_sleep(1);
-    if(i2c_buf[0] == 0x01){
-        hyn_92xxdata.boot_is_pass = 1;
-        memset(i2c_buf,0,sizeof(i2c_buf));
-
-        if (hyn_wr_reg(luat_tp_config,0xA008,2,i2c_buf,4)) {
-            return -1;
-        }      
-
-        chip_checksum = ((uint32_t)(i2c_buf[0])) |
-            (((uint32_t)(i2c_buf[1])) << 8) |
-            (((uint32_t)(i2c_buf[2])) << 16) |
-            (((uint32_t)(i2c_buf[3])) << 24);
-    }
-    else{
-        hyn_92xxdata.need_updata_fw = 1;
-    }
-
-    return chip_checksum;
-}
-
-static int cst92xx_updata_judge(luat_tp_config_t* luat_tp_config, uint8_t *p_fw, uint16_t len){
-    uint32_t f_checksum,f_fw_ver,f_ictype,f_fw_project_id;
-    uint8_t *p_data = p_fw + len - 28;   //7F64
-    struct tp_info *ic = &hyn_92xxdata.hw_info;
-
-    if (tp_cst92xx_enter_boot(luat_tp_config)){
-        LLOGI("cst92xx_enter_boot fail,need update");
-        return -1; 
-    }
-    hyn_92xxdata.hw_info.ic_fw_checksum = cst92xx_read_checksum(luat_tp_config);
-    if(hyn_92xxdata.boot_is_pass == 0){
-        LLOGI("boot_is_pass %d,need force update",hyn_92xxdata.boot_is_pass);
-        return -1; //need updata
-    }
-    
-    f_fw_project_id = U8TO16(p_data[1],p_data[0]);
-    f_ictype = U8TO16(p_data[3],p_data[2]);
-
-    f_fw_ver = U8TO16(p_data[7],p_data[6]);
-    f_fw_ver = (f_fw_ver<<16)|U8TO16(p_data[5],p_data[4]);
-
-    f_checksum = U8TO16(p_data[11],p_data[10]);
-    f_checksum = (f_checksum << 16)|U8TO16(p_data[9],p_data[8]);
-
-
-    LLOGI("Bin_info project_id:0x%04x ictype:0x%04x fw_ver:0x%x checksum:0x%x",f_fw_project_id,f_ictype,f_fw_ver,f_checksum);
-    if(f_ictype != ic->fw_chip_type || f_fw_project_id != ic->fw_project_id){
-        LLOGE("not update,please confirm: ic_type 0x%04x,ic_project_id 0x%04x",ic->fw_chip_type,ic->fw_project_id);
-        return 0; //not updata
-    }
-    if(f_checksum != ic->ic_fw_checksum && f_fw_ver > ic->fw_ver){
-        LLOGI("need update!");
-        return -1; //need updata
-    }
-    LLOGI("cst92xx_updata_judge done, no need update");
-    return 0;
-}
-
-
 static int tp_cst92xx_gpio_init(luat_tp_config_t* luat_tp_config){
     luat_gpio_mode(luat_tp_config->pin_rst, Luat_GPIO_OUTPUT, Luat_GPIO_DEFAULT, Luat_GPIO_HIGH);
     luat_gpio_mode(luat_tp_config->pin_int, Luat_GPIO_OUTPUT, Luat_GPIO_DEFAULT, Luat_GPIO_HIGH);
@@ -684,25 +395,6 @@ static int tp_cst92xx_init(luat_tp_config_t* luat_tp_config){
     tp_cst92xx_hw_reset(luat_tp_config);
     luat_rtos_task_sleep(40);
 
-#if HYN_POWER_ON_UPDATA
-    if(tp_cst92xx_read_chip_id(luat_tp_config)){
-        LLOGE("cst92xx_read_chip_id failed");
-        return ret;
-    }
-
-    ret = tp_cst92xx_updata_tpinfo(luat_tp_config);
-    if(ret){
-        LLOGE("cst92xx_updata_tpinfo failed");
-        return ret;
-    }
-    ret = cst92xx_updata_judge(luat_tp_config,(uint8_t*)fw_bin,CST92XX_BIN_SIZE);
-    //! ！！！目前这里的升级还有点问题，不要开！！！
-    // if(ret == -1)
-    //     cst92xx_updata_fw(luat_tp_config, (uint8_t*)fw_bin, CST92XX_BIN_SIZE);
-    tp_cst92xx_hw_reset(luat_tp_config);
-    luat_rtos_task_sleep(40);
-#endif
-
     ret = tp_cst92xx_updata_tpinfo(luat_tp_config);
     if(ret){
         LLOGE("cst92xx_updata_tpinfo failed");