leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (7312): pvrusb2: Indicate streaming status via LED

Browse Source 
Most of this originates from Michael Krufky <mkrufky@linuxtv.org>;
these changes move LED control into separate functions.  This is the
first step in new work to make LED control a device-specific attribute.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mike Isely 2008-04-22 14:45:41 -03:00 committed by Mauro Carvalho Chehab
parent 1b9c18c54d
commit c55a97d753
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/pvrusb2/pvrusb2-encoder.c
View File

@ -480,9 +480,7 @@ int pvr2_encoder_start(struct pvr2_hdw *hdw)
/* unmask some interrupts */ /* unmask some interrupts */
pvr2_write_register(hdw, 0x0048, 0xbfffffff); pvr2_write_register(hdw, 0x0048, 0xbfffffff);
/* change some GPIO data */ pvr2_led_ctrl(hdw, 1);
pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000481);
pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000000);
pvr2_encoder_vcmd(hdw,CX2341X_ENC_MUTE_VIDEO,1, pvr2_encoder_vcmd(hdw,CX2341X_ENC_MUTE_VIDEO,1,
hdw->input_val == PVR2_CVAL_INPUT_RADIO ? 1 : 0); hdw->input_val == PVR2_CVAL_INPUT_RADIO ? 1 : 0);
@ -526,11 +524,7 @@ int pvr2_encoder_stop(struct pvr2_hdw *hdw)
break; break;
} }
/* change some GPIO data */ pvr2_led_ctrl(hdw, 0);
/* Note: Bit d7 of dir appears to control the LED. So we shut it
off here. */
pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000401);
pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000000);
return status; return status;
} }

21
drivers/media/video/pvrusb2/pvrusb2-hdw.c
View File

@ -3357,6 +3357,27 @@ static void pvr2_hdw_cmd_modeswitch(struct pvr2_hdw *hdw,int digitalFl)
} }
/* Toggle LED */
int pvr2_led_ctrl(struct pvr2_hdw *hdw, int onoff)
{
/* change some GPIO data
*
* note: bit d7 of dir appears to control the LED,
* so we shut it off here.
*
* FIXME: is this device-specific?
*/
if (onoff)
pvr2_hdw_gpio_chg_dir(hdw, 0xffffffff, 0x00000481);
else
pvr2_hdw_gpio_chg_dir(hdw, 0xffffffff, 0x00000401);
pvr2_hdw_gpio_chg_out(hdw, 0xffffffff, 0x00000000);
return 0;
}
/* Stop / start video stream transport */ /* Stop / start video stream transport */
static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl) static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl)
{ {

3
drivers/media/video/pvrusb2/pvrusb2-hdw.h
View File

@ -258,6 +258,9 @@ int pvr2_hdw_cmd_powerup(struct pvr2_hdw *);
/* suspend */ /* suspend */
int pvr2_hdw_cmd_powerdown(struct pvr2_hdw *); int pvr2_hdw_cmd_powerdown(struct pvr2_hdw *);
/* toggle LED */
int pvr2_led_ctrl(struct pvr2_hdw *hdw, int onoff);
/* Order decoder to reset */ /* Order decoder to reset */
int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *); int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *);