On Monday 23 November 2009 18:14:26 Mauro Carvalho Chehab wrote: > Mauro Carvalho Chehab wrote: > > Hans Verkuil wrote: > >> Hi Mauro, > >> > >> Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb for the > >> following: > >> > >> - v4l2-spec: add missing V4L2-PIX-FMT-STV0680 description. > > > > Something went wrong here: > > > > $ less /tmp/newpatches/hg_v4l-dvb_01.patch|diffstat -p1 > > linux/Documentation/DocBook/v4l/pixfmt.xml | 5 > > linux/Documentation/DocBook/v4l/videodev2.h.xml | 1097 > > ++++++++++++------------ 2 files changed, 554 insertions(+), 548 > > deletions(-) > > > > Why a simple patch like this is changing 1097 lines at videodev2.h.xml? > > I've applied it here, reverted the videodev2.h.xml and did a make -C > media-specs. The produced changes at videodev2.h.xml were coherent... > > Maybe you used the legacy v4l2-specs tree to make the driver? > IMO, we can remove it and the dvb-specs directories, since I don't see > much sense on keeping compiling the separate specs. Comments? I'm all for removing v4l2-specs and dvb-specs. These are only confusing people. Regarding the videodev2.h.xml: all those whitespace changes have to do with the whitespace cleanups that 'make commit' does. When videodev2.h is changed, 'make spec' will regenerate videodev2.h.xml and 'make commit' will change that xml file again by modifying all the whitespace. I think it would be good if the whitespace checker script didn't mess with xml files. I don't know how easy it is to change that script, though. Regards, Hans > > Cheers, > Mauro. > > > diff --git a/linux/Documentation/DocBook/v4l/pixfmt.xml > b/linux/Documentation/DocBook/v4l/pixfmt.xml --- > a/linux/Documentation/DocBook/v4l/pixfmt.xml > +++ b/linux/Documentation/DocBook/v4l/pixfmt.xml > @@ -770,6 +770,11 @@ kernel sources in the file <filename>Doc > <entry>'S920'</entry> > <entry>YUV 4:2:0 format of the gspca sn9c20x driver.</entry> > </row> > + <row id="V4L2-PIX-FMT-STV0680"> > + <entry><constant>V4L2_PIX_FMT_STV0680</constant></entry> > + <entry>'S680'</entry> > + <entry>Bayer format of the gspca stv0680 driver.</entry> > + </row> > <row id="V4L2-PIX-FMT-WNVA"> > <entry><constant>V4L2_PIX_FMT_WNVA</constant></entry> > <entry>'WNVA'</entry> > diff --git a/linux/Documentation/DocBook/v4l/videodev2.h.xml > b/linux/Documentation/DocBook/v4l/videodev2.h.xml --- > a/linux/Documentation/DocBook/v4l/videodev2.h.xml > +++ b/linux/Documentation/DocBook/v4l/videodev2.h.xml > @@ -363,6 +363,7 @@ struct <link linkend="v4l2-pix-format">v > #define <link linkend="V4L2-PIX-FMT-OV511">V4L2_PIX_FMT_OV511</link> > v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */ #define <link > linkend="V4L2-PIX-FMT-OV518">V4L2_PIX_FMT_OV518</link> v4l2_fourcc('O', > '5', '1', '8') /* ov518 JPEG */ #define <link > linkend="V4L2-PIX-FMT-TM6000">V4L2_PIX_FMT_TM6000</link> > v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */ +#define <link > linkend="V4L2-PIX-FMT-STV0680">V4L2_PIX_FMT_STV0680</link> > v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */ > > /* > * F O R M A T E N U M E R A T I O N > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
