@@ -180,7 +180,7 @@ enum ds5_mux_pad {
180180#define DFU_WAIT_RET_LEN 6
181181
182182#define DS5_START_POLL_TIME 10
183- #define DS5_START_MAX_TIME 1000
183+ #define DS5_START_MAX_TIME 2000
184184#define DS5_START_MAX_COUNT (DS5_START_MAX_TIME / DS5_START_POLL_TIME)
185185
186186/* DFU definition section */
@@ -2039,7 +2039,7 @@ static int ds5_get_hwmc(struct ds5 *state, unsigned char *data,
20392039 }
20402040 }
20412041
2042- ret = regmap_raw_read (state -> regmap , DS5_HWMC_RESP_LEN ,
2042+ ret = ds5_raw_read (state , DS5_HWMC_RESP_LEN ,
20432043 & tmp_len , sizeof (tmp_len )); /* Read response length */
20442044 if (ret )
20452045 return - EBADMSG ;
@@ -2478,7 +2478,7 @@ static int ds5_get_calibration_data(struct ds5 *state, enum table_id id,
24782478 }
24792479
24802480 // get table length from fw
2481- ret = regmap_raw_read (state -> regmap , DS5_HWMC_RESP_LEN ,
2481+ ret = ds5_raw_read (state , DS5_HWMC_RESP_LEN ,
24822482 & table_length , sizeof (table_length )); /* Read response length */
24832483
24842484 // read table
@@ -2515,7 +2515,7 @@ static int ds5_gvd(struct ds5 *state, unsigned char *data)
25152515 return status ;
25162516 }
25172517
2518- ret = regmap_raw_read (state -> regmap , DS5_HWMC_RESP_LEN , & length , sizeof (length )); /* Read response length */
2518+ ret = ds5_raw_read (state , DS5_HWMC_RESP_LEN , & length , sizeof (length )); /* Read response length */
25192519 ds5_raw_read_with_check (state , DS5_HWMC_DATA , data , length ); /* Read response data */
25202520
25212521 return ret ;
@@ -2632,18 +2632,18 @@ static int ds5_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
26322632 // 2. send command
26332633 // 3. execute command
26342634 // 4. wait for completion
2635- ret = regmap_raw_write (state -> regmap , DS5_HWMC_DATA , /* Write command data */
2635+ ret = ds5_raw_write (state , DS5_HWMC_DATA , /* Write command data */
26362636 log_prepare , sizeof (log_prepare ));
26372637 if (ret < 0 )
26382638 return ret ;
26392639
2640- ret = regmap_raw_write (state -> regmap , DS5_HWMC_EXEC ,
2640+ ret = ds5_raw_write (state , DS5_HWMC_EXEC ,
26412641 & execute_cmd , sizeof (execute_cmd )); /* execute cmd */
26422642 if (ret < 0 )
26432643 return ret ;
26442644
26452645 for (i = 0 ; i < DS5_MAX_LOG_POLL ; i ++ ) {
2646- ret = regmap_raw_read (state -> regmap , DS5_HWMC_STATUS ,
2646+ ret = ds5_raw_read (state , DS5_HWMC_STATUS ,
26472647 & data , sizeof (data ));
26482648 dev_dbg (& state -> client -> dev , "%s(): log ready 0x%x\n" ,
26492649 __func__ , data );
@@ -2657,15 +2657,15 @@ static int ds5_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
26572657// if (i == DS5_MAX_LOG_POLL)
26582658// return -ETIMEDOUT;
26592659
2660- ret = regmap_raw_read (state -> regmap , DS5_HWMC_RESP_LEN , & data , sizeof (data )); /* Read response length */
2660+ ret = ds5_raw_read (state , DS5_HWMC_RESP_LEN , & data , sizeof (data )); /* Read response length */
26612661 dev_dbg (& state -> client -> dev , "%s(): log size 0x%x\n" , __func__ , data );
26622662 if (ret < 0 )
26632663 return ret ;
26642664 if (!data )
26652665 return 0 ;
26662666 if (data > 1024 )
26672667 return - ENOBUFS ;
2668- ret = regmap_raw_read (state -> regmap , DS5_HWMC_DATA ,
2668+ ret = ds5_raw_read (state , DS5_HWMC_DATA ,
26692669 ctrl -> p_new .p_u8 , data );
26702670 break ;
26712671 case DS5_CAMERA_DEPTH_CALIBRATION_TABLE_GET :
58975897 Shikun Ding <[email protected] >" );
58985898MODULE_AUTHOR (
"Dmitry Perchanov <[email protected] >" );
58995899MODULE_LICENSE ("GPL v2" );
5900- MODULE_VERSION ("1.0.1.29 " );
5900+ MODULE_VERSION ("1.0.1.30 " );
0 commit comments