mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 13:22:55 +00:00
V4L/DVB (6357): pvrusb2: Improve encoder chip health tracking
This is a minor change to help with tracking the viability of the encoder chip within the PVR USB2 device. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
a39a8ed7be
commit
9a607f01b0
@ -209,6 +209,11 @@ static int pvr2_encoder_cmd(void *ctxt,
|
||||
|
||||
LOCK_TAKE(hdw->ctl_lock); do {
|
||||
|
||||
if (!hdw->flag_encoder_ok) {
|
||||
ret = -EIO;
|
||||
break;
|
||||
}
|
||||
|
||||
retry_flag = 0;
|
||||
try_count++;
|
||||
ret = 0;
|
||||
@ -273,6 +278,7 @@ static int pvr2_encoder_cmd(void *ctxt,
|
||||
ret = -EBUSY;
|
||||
}
|
||||
if (ret) {
|
||||
hdw->flag_encoder_ok = 0;
|
||||
pvr2_trace(
|
||||
PVR2_TRACE_ERROR_LEGS,
|
||||
"Giving up on command."
|
||||
|
@ -225,11 +225,12 @@ struct pvr2_hdw {
|
||||
unsigned int cmd_debug_write_len; //
|
||||
unsigned int cmd_debug_read_len; //
|
||||
|
||||
int flag_ok; // device in known good state
|
||||
int flag_disconnected; // flag_ok == 0 due to disconnect
|
||||
int flag_init_ok; // true if structure is fully initialized
|
||||
int flag_streaming_enabled; // true if streaming should be on
|
||||
int fw1_state; // current situation with fw1
|
||||
int flag_ok; /* device in known good state */
|
||||
int flag_disconnected; /* flag_ok == 0 due to disconnect */
|
||||
int flag_init_ok; /* true if structure is fully initialized */
|
||||
int flag_streaming_enabled; /* true if streaming should be on */
|
||||
int fw1_state; /* current situation with fw1 */
|
||||
int flag_encoder_ok; /* True if encoder is healthy */
|
||||
|
||||
int flag_decoder_is_tuned;
|
||||
|
||||
|
@ -1248,6 +1248,8 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
|
||||
time we configure the encoder, then we'll fully configure it. */
|
||||
hdw->enc_cur_valid = 0;
|
||||
|
||||
hdw->flag_encoder_ok = 0;
|
||||
|
||||
/* First prepare firmware loading */
|
||||
ret |= pvr2_write_register(hdw, 0x0048, 0xffffffff); /*interrupt mask*/
|
||||
ret |= pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000088); /*gpio dir*/
|
||||
@ -1346,6 +1348,7 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
|
||||
pvr2_trace(PVR2_TRACE_ERROR_LEGS,
|
||||
"firmware2 upload post-proc failure");
|
||||
} else {
|
||||
hdw->flag_encoder_ok = !0;
|
||||
hdw->subsys_enabled_mask |= (1<<PVR2_SUBSYS_B_ENC_FIRMWARE);
|
||||
}
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user