From 9350faa14070f543a22f0df4591439e5008e1ad0 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 18 Jan 2009 15:51:35 +0100
Subject: v4l2-spec: assorted bug fixes.

From: Hans Verkuil <hverkuil@xs4all.nl>

Priority: normal

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
---
 v4l2-spec/compat.sgml                  |  6 +++---
 v4l2-spec/v4l2.sgml                    |  3 ++-
 v4l2-spec/vidioc-dbg-g-chip-ident.sgml |  6 +++---
 v4l2-spec/vidioc-dbg-g-register.sgml   |  6 +++---
 v4l2-spec/vidioc-g-frequency.sgml      |  2 +-
 v4l2-spec/vidioc-s-hw-freq-seek.sgml   | 11 +----------
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/v4l2-spec/compat.sgml b/v4l2-spec/compat.sgml
index 851ab19fb..c60af84cc 100644
--- a/v4l2-spec/compat.sgml
+++ b/v4l2-spec/compat.sgml
@@ -2230,7 +2230,7 @@ interface in Linux 2.6.18, where finally removed from the
 <constant>V4L2_PIX_FMT_PCA561</constant>,
 <constant>V4L2_PIX_FMT_SGBRG8</constant>,
 <constant>V4L2_PIX_FMT_PAC207</constant> and
-<constant>V4L2_PIX_FMT_PJPG</constant>were added.</para>
+<constant>V4L2_PIX_FMT_PJPG</constant> were added.</para>
 	</listitem>
       </orderedlist>
     </section>
@@ -2245,7 +2245,7 @@ interface in Linux 2.6.18, where finally removed from the
 	<listitem>
 	  <para>The pixel formats
 <constant>V4L2_PIX_FMT_SGRBG10</constant> and
-<constant>V4L2_PIX_FMT_SGRBG10DPCM8</constant>were added.</para>
+<constant>V4L2_PIX_FMT_SGRBG10DPCM8</constant> were added.</para>
 	</listitem>
       </orderedlist>
     </section>
@@ -2262,7 +2262,7 @@ was introduced in its place.</para>
 	  <para>The pixel formats
 <constant>V4L2_PIX_FMT_VYUY</constant>,
 <constant>V4L2_PIX_FMT_NV16</constant> and
-<constant>V4L2_PIX_FMT_NV61</constant>were added.</para>
+<constant>V4L2_PIX_FMT_NV61</constant> were added.</para>
 	</listitem>
        </orderedlist>
      </section>
diff --git a/v4l2-spec/v4l2.sgml b/v4l2-spec/v4l2.sgml
index c4c2bf322..782ccc36a 100644
--- a/v4l2-spec/v4l2.sgml
+++ b/v4l2-spec/v4l2.sgml
@@ -91,12 +91,13 @@ and VIDIOC_ENUM_FRAMEINTERVALS ioctls.</contrib>
       <year>2006</year>
       <year>2007</year>
       <year>2008</year>
+      <year>2009</year>
       <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin
 Rubli</holder>
     </copyright>
 
     <legalnotice>
-      <para>This document is copyrighted &copy; 1999-2008 by Bill
+      <para>This document is copyrighted &copy; 1999-2009 by Bill
 Dirks, Michael H. Schimek, Hans Verkuil and Martin Rubli.</para>
 
       <para>Permission is granted to copy, distribute and/or modify
diff --git a/v4l2-spec/vidioc-dbg-g-chip-ident.sgml b/v4l2-spec/vidioc-dbg-g-chip-ident.sgml
index 6b13e8188..84c704e61 100644
--- a/v4l2-spec/vidioc-dbg-g-chip-ident.sgml
+++ b/v4l2-spec/vidioc-dbg-g-chip-ident.sgml
@@ -135,12 +135,12 @@ access instructions.</para>
 	 contains a duplicate of this table. -->
     <table pgwide="1" frame="none" id="ident-v4l2-dbg-match">
       <title>struct <structname>v4l2_dbg_match</structname></title>
-      <tgroup cols="3">
-	&cs-str;
+      <tgroup cols="4">
+	&cs-ustr;
 	<tbody valign="top">
 	  <row>
 	    <entry>__u32</entry>
-	    <entry><structfield>match_type</structfield></entry>
+	    <entry><structfield>type</structfield></entry>
 	    <entry>See <xref linkend="ident-chip-match-types"> for a list of
 possible types.</entry>
 	  </row>
diff --git a/v4l2-spec/vidioc-dbg-g-register.sgml b/v4l2-spec/vidioc-dbg-g-register.sgml
index a29ff35ad..de8aacc3f 100644
--- a/v4l2-spec/vidioc-dbg-g-register.sgml
+++ b/v4l2-spec/vidioc-dbg-g-register.sgml
@@ -150,12 +150,12 @@ access instructions.</para>
 	 contains a duplicate of this table. -->
     <table pgwide="1" frame="none" id="v4l2-dbg-match">
       <title>struct <structname>v4l2_dbg_match</structname></title>
-      <tgroup cols="3">
-	&cs-str;
+      <tgroup cols="4">
+	&cs-ustr;
 	<tbody valign="top">
 	  <row>
 	    <entry>__u32</entry>
-	    <entry><structfield>match_type</structfield></entry>
+	    <entry><structfield>type</structfield></entry>
 	    <entry>See <xref linkend="ident-chip-match-types"> for a list of
 possible types.</entry>
 	  </row>
diff --git a/v4l2-spec/vidioc-g-frequency.sgml b/v4l2-spec/vidioc-g-frequency.sgml
index e655a61ff..062d72069 100644
--- a/v4l2-spec/vidioc-g-frequency.sgml
+++ b/v4l2-spec/vidioc-g-frequency.sgml
@@ -111,7 +111,7 @@ Hz.</entry>
 	  </row>
 	  <row>
 	    <entry>__u32</entry>
-	    <entry><structfield>reserved</structfield>[8];</entry>
+	    <entry><structfield>reserved</structfield>[8]</entry>
 	    <entry>Reserved for future extensions. Drivers and
 	    applications must set the array to zero.</entry>
 	  </row>
diff --git a/v4l2-spec/vidioc-s-hw-freq-seek.sgml b/v4l2-spec/vidioc-s-hw-freq-seek.sgml
index 7ef695a83..14b3ec7ed 100644
--- a/v4l2-spec/vidioc-s-hw-freq-seek.sgml
+++ b/v4l2-spec/vidioc-s-hw-freq-seek.sgml
@@ -16,15 +16,6 @@
 	<paramdef>int <parameter>fd</parameter></paramdef>
 	<paramdef>int <parameter>request</parameter></paramdef>
 	<paramdef>struct v4l2_hw_freq_seek
-*<parameter>argp</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-    <funcsynopsis>
-      <funcprototype>
-	<funcdef>int <function>ioctl</function></funcdef>
-	<paramdef>int <parameter>fd</parameter></paramdef>
-	<paramdef>int <parameter>request</parameter></paramdef>
-	<paramdef>struct v4l2_hw_freq_seek
 *<parameter>argp</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
@@ -98,7 +89,7 @@ field and the &v4l2-tuner; <structfield>index</structfield> field.</entry>
 	  </row>
 	  <row>
 	    <entry>__u32</entry>
-	    <entry><structfield>reserved</structfield>[8];</entry>
+	    <entry><structfield>reserved</structfield>[8]</entry>
 	    <entry>Reserved for future extensions. Drivers and
 	    applications must set the array to zero.</entry>
 	  </row>
-- 
cgit v1.2.3