Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103833
b: refs/heads/master
c: c121ba1
h: refs/heads/master
i:
  103831: 735b8a6
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jul 20, 2008
1 parent ffc2894 commit 25411f6
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 11417daab6d596f8d4851476777ca49fb3b12a87
refs/heads/master: c121ba1f408eb13ff50891ff8d9e5914f993939c
30 changes: 30 additions & 0 deletions trunk/drivers/media/video/saa7134/saa7134-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -2208,6 +2208,32 @@ static int saa7134_g_parm(struct file *file, void *fh,
return 0;
}

#ifdef CONFIG_VIDEO_ADV_DEBUG
static int vidioc_g_register (struct file *file, void *priv,
struct v4l2_register *reg)
{
struct saa7134_fh *fh = priv;
struct saa7134_dev *dev = fh->dev;

if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
return -EINVAL;
reg->val = saa_readb(reg->reg);
return 0;
}

static int vidioc_s_register (struct file *file, void *priv,
struct v4l2_register *reg)
{
struct saa7134_fh *fh = priv;
struct saa7134_dev *dev = fh->dev;

if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
return -EINVAL;
saa_writeb(reg->reg&0xffffff, reg->val);
return 0;
}
#endif

static int radio_querycap(struct file *file, void *priv,
struct v4l2_capability *cap)
{
Expand Down Expand Up @@ -2391,6 +2417,10 @@ struct video_device saa7134_video_template =
.vidioc_g_parm = saa7134_g_parm,
.vidioc_g_frequency = saa7134_g_frequency,
.vidioc_s_frequency = saa7134_s_frequency,
#ifdef CONFIG_VIDEO_ADV_DEBUG
.vidioc_g_register = vidioc_g_register,
.vidioc_s_register = vidioc_s_register,
#endif
.tvnorms = SAA7134_NORMS,
.current_norm = V4L2_STD_PAL,
};
Expand Down

0 comments on commit 25411f6

Please sign in to comment.