diff options
| author | rmcc@localhost.localdomain <rmcc@localhost.localdomain> | 2006-05-18 16:06:06 +0100 |
|---|---|---|
| committer | rmcc@localhost.localdomain <rmcc@localhost.localdomain> | 2006-05-18 16:06:06 +0100 |
| commit | aad2e973e44590acd4c1b55dd32eadad842e7fdb (patch) | |
| tree | de152190bd763eb849cf2952cfb468169f3881ba /linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c | |
| parent | f637ab4e875bd28b68bbd4d776c2071683050b5c (diff) | |
| parent | 122bd90fa6f72e1366146662e7fb9a6581aab68e (diff) | |
| download | mediapointer-dvb-s2-aad2e973e44590acd4c1b55dd32eadad842e7fdb.tar.gz mediapointer-dvb-s2-aad2e973e44590acd4c1b55dd32eadad842e7fdb.tar.bz2 | |
merge: from master
From: Ricardo Cerqueira <v4l@cerqueira.org>
merging master changes
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c index bcfe468eb..586900e36 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c @@ -32,11 +32,11 @@ struct debugifc_mask_item { }; static struct debugifc_mask_item mask_items[] = { - {"ENC_FIRMWARE",PVR2_SUBSYS_ENC_FIRMWARE}, - {"ENC_CFG",PVR2_SUBSYS_ENC_CFG}, - {"DIG_RUN",PVR2_SUBSYS_DIGITIZER_RUN}, - {"USB_RUN",PVR2_SUBSYS_USBSTREAM_RUN}, - {"ENC_RUN",PVR2_SUBSYS_ENC_RUN}, + {"ENC_FIRMWARE",(1<<PVR2_SUBSYS_B_ENC_FIRMWARE)}, + {"ENC_CFG",(1<<PVR2_SUBSYS_B_ENC_CFG)}, + {"DIG_RUN",(1<<PVR2_SUBSYS_B_DIGITIZER_RUN)}, + {"USB_RUN",(1<<PVR2_SUBSYS_B_USBSTREAM_RUN)}, + {"ENC_RUN",(1<<PVR2_SUBSYS_B_ENC_RUN)}, }; @@ -362,11 +362,13 @@ int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf, } else if (debugifc_match_keyword(wptr,wlen,"bus")) { pvr2_hdw_device_reset(hdw); } else if (debugifc_match_keyword(wptr,wlen,"soft")) { - return pvr2_hdw_cmd_soft_reset(hdw); + return pvr2_hdw_cmd_powerup(hdw); } else if (debugifc_match_keyword(wptr,wlen,"deep")) { return pvr2_hdw_cmd_deep_reset(hdw); } else if (debugifc_match_keyword(wptr,wlen,"firmware")) { return pvr2_upload_firmware2(hdw); + } else if (debugifc_match_keyword(wptr,wlen,"decoder")) { + return pvr2_hdw_cmd_decoder_reset(hdw); } return -EINVAL; } else if (debugifc_match_keyword(wptr,wlen,"subsys_flags")) { |