---

yaml --- r: 92432 b: refs/heads/master c: 29bf5b1 h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · 711b447 · 711b447
1 parent 8c7e33b
commit 711b447
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aaac60fec0d3ba8043838c6eac86de987cfe5c1
+refs/heads/master: 29bf5b1d754a9a64f68c37938e1a0b7b63b724ba
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -182,6 +182,7 @@ static const char *control_values_srate[] = {
 
 static const char *control_values_input[] = {
 	[PVR2_CVAL_INPUT_TV]        = "television",  /*xawtv needs this name*/
+	[PVR2_CVAL_INPUT_DTV]       = "dtv",
 	[PVR2_CVAL_INPUT_RADIO]     = "radio",
 	[PVR2_CVAL_INPUT_SVIDEO]    = "s-video",
 	[PVR2_CVAL_INPUT_COMPOSITE] = "composite",
@@ -367,6 +368,27 @@ static int ctrl_get_input(struct pvr2_ctrl *cptr,int *vp)
 	return 0;
 }
 
+static int ctrl_check_input(struct pvr2_ctrl *cptr,int v)
+{
+	struct pvr2_hdw *hdw = cptr->hdw;
+	const struct pvr2_device_desc *dsc = hdw->hdw_desc;
+
+	switch (v) {
+	case PVR2_CVAL_INPUT_TV:
+		return dsc->flag_has_analogtuner != 0;
+	case PVR2_CVAL_INPUT_DTV:
+		return dsc->flag_has_digitaltuner != 0;
+	case PVR2_CVAL_INPUT_SVIDEO:
+		return dsc->flag_has_svideo != 0;
+	case PVR2_CVAL_INPUT_COMPOSITE:
+		return dsc->flag_has_composite != 0;
+	case PVR2_CVAL_INPUT_RADIO:
+		return dsc->flag_has_fmradio != 0;
+	default:
+		return 0;
+	}
+}
+
 static int ctrl_set_input(struct pvr2_ctrl *cptr,int m,int v)
 {
 	struct pvr2_hdw *hdw = cptr->hdw;
@@ -382,7 +404,8 @@ static int ctrl_set_input(struct pvr2_ctrl *cptr,int m,int v)
 	if (hdw->input_val == PVR2_CVAL_INPUT_RADIO) {
 		hdw->freqSelector = 0;
 		hdw->freqDirty = !0;
-	} else if (hdw->input_val == PVR2_CVAL_INPUT_TV) {
+	} else if ((hdw->input_val == PVR2_CVAL_INPUT_TV) ||
+		   (hdw->input_val == PVR2_CVAL_INPUT_DTV)) {
 		hdw->freqSelector = 1;
 		hdw->freqDirty = !0;
 	}
@@ -803,6 +826,7 @@ static const struct pvr2_ctl_info control_defs[] = {
 		.name = "input",
 		.internal_id = PVR2_CID_INPUT,
 		.default_value = PVR2_CVAL_INPUT_TV,
+		.check_value = ctrl_check_input,
 		DEFREF(input),
 		DEFENUM(control_values_input),
 	},{

diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -40,9 +40,10 @@
 
 /* Legal values for the INPUT state variable */
 #define PVR2_CVAL_INPUT_TV 0
-#define PVR2_CVAL_INPUT_SVIDEO 1
-#define PVR2_CVAL_INPUT_COMPOSITE 2
-#define PVR2_CVAL_INPUT_RADIO 3
+#define PVR2_CVAL_INPUT_DTV 1
+#define PVR2_CVAL_INPUT_SVIDEO 2
+#define PVR2_CVAL_INPUT_COMPOSITE 3
+#define PVR2_CVAL_INPUT_RADIO 4
 
 enum pvr2_config {
 	pvr2_config_empty,    /* No configuration */