---

yaml --- r: 92447 b: refs/heads/master c: c55a97d h: refs/heads/master i: 92445: 19d87bc 92443: 6c248fa 92439: fed87b4 92431: 8c7e33b 92415: e2d8c90 v: v3
git-mirror · Apr 24, 2008 · 138d3d2 · 138d3d2
1 parent f7fb3df
commit 138d3d2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b9c18c54d68cc22f090948fc47890c56d22153d
+refs/heads/master: c55a97d7538d5f3abbee5486e37e56e896478fbd
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -480,9 +480,7 @@ int pvr2_encoder_start(struct pvr2_hdw *hdw)
 	/* unmask some interrupts */
 	pvr2_write_register(hdw, 0x0048, 0xbfffffff);
 
-	/* change some GPIO data */
-	pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000481);
-	pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000000);
+	pvr2_led_ctrl(hdw, 1);
 
 	pvr2_encoder_vcmd(hdw,CX2341X_ENC_MUTE_VIDEO,1,
 			  hdw->input_val == PVR2_CVAL_INPUT_RADIO ? 1 : 0);
@@ -526,11 +524,7 @@ int pvr2_encoder_stop(struct pvr2_hdw *hdw)
 		break;
 	}
 
-	/* change some GPIO data */
-	/* 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);
+	pvr2_led_ctrl(hdw, 0);
 
 	return status;
 }

diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -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 */
 static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl)
 {

diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -258,6 +258,9 @@ int pvr2_hdw_cmd_powerup(struct pvr2_hdw *);
 /* suspend */
 int pvr2_hdw_cmd_powerdown(struct pvr2_hdw *);
 
+/* toggle LED */
+int pvr2_led_ctrl(struct pvr2_hdw *hdw, int onoff);
+
 /* Order decoder to reset */
 int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *);