Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 138283
b: refs/heads/master
c: edb9dcb
h: refs/heads/master
i:
  138281: c92b606
  138279: b261d6b
v: v3
  • Loading branch information
Mike Isely authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent fe39f4a commit 9fe6bab
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 858f910e869d1300c1ab0cadbe9908322f8bfb78
refs/heads/master: edb9dcb885c6288813b62c20e6b578492845f9ad
19 changes: 18 additions & 1 deletion trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ MODULE_PARM_DESC(radio_freq, "specify initial radio frequency");
/* size of a firmware chunk */
#define FIRMWARE_CHUNK_SIZE 0x2000

typedef void (*pvr2_subdev_update_func)(struct pvr2_hdw *,
struct v4l2_subdev *);

static const pvr2_subdev_update_func pvr2_module_update_functions[] = {
/* ????? */
};

static const char *module_names[] = {
[PVR2_CLIENT_ID_MSP3400] = "msp3400",
[PVR2_CLIENT_ID_CX25840] = "cx25840",
Expand Down Expand Up @@ -2900,6 +2907,10 @@ static void pvr2_subdev_set_control(struct pvr2_hdw *hdw, int id,
sub-devices so that they match our current control values. */
static void pvr2_subdev_update(struct pvr2_hdw *hdw)
{
struct v4l2_subdev *sd;
unsigned int id;
pvr2_subdev_update_func fp;

if (hdw->input_dirty || hdw->std_dirty) {
pvr2_trace(PVR2_TRACE_CHIPS,"subdev v4l2 set_standard");
if (hdw->input_val == PVR2_CVAL_INPUT_RADIO) {
Expand Down Expand Up @@ -2971,7 +2982,13 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
/* Unable to set crop parameters; there is apparently no equivalent
for VIDIOC_S_CROP */

/* ????? Cover special cases for specific sub-devices. */
v4l2_device_for_each_subdev(sd, &hdw->v4l2_dev) {
id = sd->grp_id;
if (id >= ARRAY_SIZE(pvr2_module_update_functions)) continue;
fp = pvr2_module_update_functions[id];
if (!fp) continue;
(*fp)(hdw, sd);
}

if (hdw->tuner_signal_stale && hdw->cropcap_stale) {
pvr2_hdw_status_poll(hdw);
Expand Down

0 comments on commit 9fe6bab

Please sign in to comment.