diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-25 14:48:13 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:58 -0500 |
commit | a0c05ab9762560cf12733181d19b6529bb7231d2 (patch) | |
tree | 5bb680851607d1f7ad5145fcd4ae442f65c7c9a3 /drivers/media/radio | |
parent | 676b0ac7aa409d326d92ca46c65bba20bebb3c1c (diff) |
V4L/DVB (5152): Implements VIDIOC_[S|G]_INPUT on radio-aztech/radio-maxiradio
fmtools use VIDIOCSTUNER, with, in turn, calls VIDIOC_S_INPUT on v4l1-compat.
So, those ioctls are required for V4L1 to work properly.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r-- | drivers/media/radio/radio-aztech.c | 16 | ||||
-rw-r--r-- | drivers/media/radio/radio-maxiradio.c | 16 |
2 files changed, 32 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index 9bf25820169b..9f1addae6928 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c | |||
@@ -237,6 +237,20 @@ static int vidioc_g_audio (struct file *file, void *priv, | |||
237 | return 0; | 237 | return 0; |
238 | } | 238 | } |
239 | 239 | ||
240 | static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i) | ||
241 | { | ||
242 | *i = 0; | ||
243 | return 0; | ||
244 | } | ||
245 | |||
246 | static int vidioc_s_input(struct file *filp, void *priv, unsigned int i) | ||
247 | { | ||
248 | if (i != 0) | ||
249 | return -EINVAL; | ||
250 | return 0; | ||
251 | } | ||
252 | |||
253 | |||
240 | static int vidioc_s_audio (struct file *file, void *priv, | 254 | static int vidioc_s_audio (struct file *file, void *priv, |
241 | struct v4l2_audio *a) | 255 | struct v4l2_audio *a) |
242 | { | 256 | { |
@@ -348,6 +362,8 @@ static struct video_device aztech_radio= | |||
348 | .vidioc_s_tuner = vidioc_s_tuner, | 362 | .vidioc_s_tuner = vidioc_s_tuner, |
349 | .vidioc_g_audio = vidioc_g_audio, | 363 | .vidioc_g_audio = vidioc_g_audio, |
350 | .vidioc_s_audio = vidioc_s_audio, | 364 | .vidioc_s_audio = vidioc_s_audio, |
365 | .vidioc_g_input = vidioc_g_input, | ||
366 | .vidioc_s_input = vidioc_s_input, | ||
351 | .vidioc_g_frequency = vidioc_g_frequency, | 367 | .vidioc_g_frequency = vidioc_g_frequency, |
352 | .vidioc_s_frequency = vidioc_s_frequency, | 368 | .vidioc_s_frequency = vidioc_s_frequency, |
353 | .vidioc_queryctrl = vidioc_queryctrl, | 369 | .vidioc_queryctrl = vidioc_queryctrl, |
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c index 40494dc5b7ff..fd2b9d944cd0 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c | |||
@@ -231,6 +231,20 @@ static int vidioc_g_audio (struct file *file, void *priv, | |||
231 | return 0; | 231 | return 0; |
232 | } | 232 | } |
233 | 233 | ||
234 | static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i) | ||
235 | { | ||
236 | *i = 0; | ||
237 | return 0; | ||
238 | } | ||
239 | |||
240 | static int vidioc_s_input(struct file *filp, void *priv, unsigned int i) | ||
241 | { | ||
242 | if (i != 0) | ||
243 | return -EINVAL; | ||
244 | return 0; | ||
245 | } | ||
246 | |||
247 | |||
234 | static int vidioc_s_audio (struct file *file, void *priv, | 248 | static int vidioc_s_audio (struct file *file, void *priv, |
235 | struct v4l2_audio *a) | 249 | struct v4l2_audio *a) |
236 | { | 250 | { |
@@ -326,6 +340,8 @@ static struct video_device maxiradio_radio = | |||
326 | .vidioc_s_tuner = vidioc_s_tuner, | 340 | .vidioc_s_tuner = vidioc_s_tuner, |
327 | .vidioc_g_audio = vidioc_g_audio, | 341 | .vidioc_g_audio = vidioc_g_audio, |
328 | .vidioc_s_audio = vidioc_s_audio, | 342 | .vidioc_s_audio = vidioc_s_audio, |
343 | .vidioc_g_input = vidioc_g_input, | ||
344 | .vidioc_s_input = vidioc_s_input, | ||
329 | .vidioc_g_frequency = vidioc_g_frequency, | 345 | .vidioc_g_frequency = vidioc_g_frequency, |
330 | .vidioc_s_frequency = vidioc_s_frequency, | 346 | .vidioc_s_frequency = vidioc_s_frequency, |
331 | .vidioc_queryctrl = vidioc_queryctrl, | 347 | .vidioc_queryctrl = vidioc_queryctrl, |