Re: [PATCH] libv4l1: move VIDIOCGFREQ and VIDIOCSFREQ to libv4l1

2010-06-07 Thread Hans de Goede

Hi,

Looks good, applied

Thanks!

Regards,

Hans

On 06/04/2010 09:23 AM, huzai...@redhat.com wrote:

From: Huzaifa Sidhpurwalahuzai...@redhat.com

move VIDIOCGFREQ and VIDIOCSFREQ to libv4l1

Signed-of-by: Huzaifa Sidhpurwalahuzai...@redhat.com
---
  lib/libv4l1/libv4l1.c |   28 
  1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/lib/libv4l1/libv4l1.c b/lib/libv4l1/libv4l1.c
index 081ed0a..579f13b 100644
--- a/lib/libv4l1/libv4l1.c
+++ b/lib/libv4l1/libv4l1.c
@@ -939,6 +939,34 @@ int v4l1_ioctl(int fd, unsigned long int request, ...)
break;
}

+   case VIDIOCSFREQ: {
+   unsigned long *freq = arg;
+   struct v4l2_frequency freq2 = { 0, };
+
+   result = v4l2_ioctl(fd, VIDIOC_G_FREQUENCY,freq2);
+   if (result  0)
+   break;
+
+   freq2.frequency = *freq;
+
+   result = v4l2_ioctl(fd, VIDIOC_S_FREQUENCY,freq2);
+
+   break;
+   }
+
+   case VIDIOCGFREQ: {
+   unsigned long *freq = arg;
+   struct v4l2_frequency freq2 = { 0, };
+
+   freq2.tuner = 0;
+   result = v4l2_ioctl(fd, VIDIOC_G_FREQUENCY,freq2);
+   if (result  0)
+   break;
+   if (0 == result)
+   *freq = freq2.frequency;
+
+   break;
+   }
default:
/* Pass through libv4l2 for applications which are using v4l2 
through
   libv4l1 (this can happen with the v4l1compat.so wrapper 
preloaded */

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] libv4l1: move VIDIOCGFREQ and VIDIOCSFREQ to libv4l1

2010-06-04 Thread huzaifas
From: Huzaifa Sidhpurwala huzai...@redhat.com

move VIDIOCGFREQ and VIDIOCSFREQ to libv4l1

Signed-of-by: Huzaifa Sidhpurwala huzai...@redhat.com
---
 lib/libv4l1/libv4l1.c |   28 
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/lib/libv4l1/libv4l1.c b/lib/libv4l1/libv4l1.c
index 081ed0a..579f13b 100644
--- a/lib/libv4l1/libv4l1.c
+++ b/lib/libv4l1/libv4l1.c
@@ -939,6 +939,34 @@ int v4l1_ioctl(int fd, unsigned long int request, ...)
break;
}
 
+   case VIDIOCSFREQ: {
+   unsigned long *freq = arg;
+   struct v4l2_frequency freq2 = { 0, };
+
+   result = v4l2_ioctl(fd, VIDIOC_G_FREQUENCY, freq2);
+   if (result  0)
+   break;
+
+   freq2.frequency = *freq;
+
+   result = v4l2_ioctl(fd, VIDIOC_S_FREQUENCY, freq2);
+
+   break;
+   }
+
+   case VIDIOCGFREQ: {
+   unsigned long *freq = arg;
+   struct v4l2_frequency freq2 = { 0, };
+
+   freq2.tuner = 0;
+   result = v4l2_ioctl(fd, VIDIOC_G_FREQUENCY, freq2);
+   if (result  0)
+   break;
+   if (0 == result)
+   *freq = freq2.frequency;
+
+   break;
+   }
default:
/* Pass through libv4l2 for applications which are using v4l2 
through
   libv4l1 (this can happen with the v4l1compat.so wrapper 
preloaded */
-- 
1.6.6.1

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html