Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96b03d2a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: rename VIDIOC_DBG_G_CHIP_NAME to _CHIP_INFO 



This ioctl will be extended to return more information than just the name.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0f0fe4b9

Documentation/DocBook/media/v4l/compat.xml

+1 −1
Original line number Diff line number Diff line
@@ -2507,7 +2507,7 @@ that used it. It was originally scheduled for removal in 2.6.35. 
	  </para>

        </listitem>

        <listitem>

	  <para>Added new debugging ioctl &VIDIOC-DBG-G-CHIP-NAME;.

	  <para>Added new debugging ioctl &VIDIOC-DBG-G-CHIP-INFO;.

	  </para>

        </listitem>

      </orderedlist>

Documentation/DocBook/media/v4l/v4l2.xml

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ applications. --> 
	<revremark>Remove obsolete and unused DV_PRESET ioctls:

	VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET, VIDIOC_QUERY_DV_PRESET and

	VIDIOC_ENUM_DV_PRESET. Remove the related v4l2_input/output capability

	flags V4L2_IN_CAP_PRESETS and V4L2_OUT_CAP_PRESETS. Added VIDIOC_DBG_G_CHIP_NAME.

	flags V4L2_IN_CAP_PRESETS and V4L2_OUT_CAP_PRESETS. Added VIDIOC_DBG_G_CHIP_INFO.

	</revremark>

      </revision>
@@ -548,7 +548,7 @@ and discussions on the V4L mailing list.</revremark> 
    &sub-create-bufs;

    &sub-cropcap;

    &sub-dbg-g-chip-ident;

    &sub-dbg-g-chip-name;

    &sub-dbg-g-chip-info;

    &sub-dbg-g-register;

    &sub-decoder-cmd;

    &sub-dqevent;

Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-name.xml→Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-info.xml

+10 −10
Original line number Diff line number Diff line 
<refentry id="vidioc-dbg-g-chip-name">

<refentry id="vidioc-dbg-g-chip-info">

  <refmeta>

    <refentrytitle>ioctl VIDIOC_DBG_G_CHIP_NAME</refentrytitle>

    <refentrytitle>ioctl VIDIOC_DBG_G_CHIP_INFO</refentrytitle>

    &manvol;

  </refmeta>



  <refnamediv>

    <refname>VIDIOC_DBG_G_CHIP_NAME</refname>

    <refname>VIDIOC_DBG_G_CHIP_INFO</refname>

    <refpurpose>Identify the chips on a TV card</refpurpose>

  </refnamediv>
@@ -15,7 +15,7 @@ 
	<funcdef>int <function>ioctl</function></funcdef>

	<paramdef>int <parameter>fd</parameter></paramdef>

	<paramdef>int <parameter>request</parameter></paramdef>

	<paramdef>struct v4l2_dbg_chip_name

	<paramdef>struct v4l2_dbg_chip_info

*<parameter>argp</parameter></paramdef>

      </funcprototype>

    </funcsynopsis>
@@ -34,7 +34,7 @@ 
      <varlistentry>

	<term><parameter>request</parameter></term>

	<listitem>

	  <para>VIDIOC_DBG_G_CHIP_NAME</para>

	  <para>VIDIOC_DBG_G_CHIP_INFO</para>

	</listitem>

      </varlistentry>

      <varlistentry>
@@ -69,8 +69,8 @@ so it can be fixed.</para> 
    <para>To query the driver applications must initialize the

<structfield>match.type</structfield> and

<structfield>match.addr</structfield> or <structfield>match.name</structfield>

fields of a &v4l2-dbg-chip-name;

and call <constant>VIDIOC_DBG_G_CHIP_NAME</constant> with a pointer to

fields of a &v4l2-dbg-chip-info;

and call <constant>VIDIOC_DBG_G_CHIP_INFO</constant> with a pointer to

this structure. On success the driver stores information about the

selected chip in the <structfield>name</structfield> and

<structfield>flags</structfield> fields. On failure the structure
@@ -81,7 +81,7 @@ remains unchanged.</para> 
<structfield>match.addr</structfield> selects the nth bridge 'chip'

on the TV card. You can enumerate all chips by starting at zero and

incrementing <structfield>match.addr</structfield> by one until

<constant>VIDIOC_DBG_G_CHIP_NAME</constant> fails with an &EINVAL;.

<constant>VIDIOC_DBG_G_CHIP_INFO</constant> fails with an &EINVAL;.

The number zero always selects the bridge chip itself, &eg; the chip

connected to the PCI or USB bus. Non-zero numbers identify specific

parts of the bridge chip such as an AC97 register block.</para>
@@ -138,8 +138,8 @@ to the <structfield>type</structfield> field.</entry> 
      </tgroup>

    </table>



    <table pgwide="1" frame="none" id="v4l2-dbg-chip-name">

      <title>struct <structname>v4l2_dbg_chip_name</structname></title>

    <table pgwide="1" frame="none" id="v4l2-dbg-chip-info">

      <title>struct <structname>v4l2_dbg_chip_info</structname></title>

      <tgroup cols="3">

	&cs-str;

	<tbody valign="top">

Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml

+5 −5
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ unchanged.</para> 
<structfield>match.addr</structfield> selects the nth non-sub-device chip

on the TV card.  The number zero always selects the host chip, &eg; the

chip connected to the PCI or USB bus. You can find out which chips are

present with the &VIDIOC-DBG-G-CHIP-NAME; ioctl.</para>

present with the &VIDIOC-DBG-G-CHIP-INFO; ioctl.</para>



    <para>When <structfield>match.type</structfield> is

<constant>V4L2_CHIP_MATCH_I2C_DRIVER</constant>,
@@ -109,7 +109,7 @@ For instance 
supported by the saa7127 driver, regardless of its &i2c; bus address.

When multiple chips supported by the same driver are present, the

effect of these ioctls is undefined. Again with the

&VIDIOC-DBG-G-CHIP-NAME; ioctl you can find out which &i2c; chips are

&VIDIOC-DBG-G-CHIP-INFO; ioctl you can find out which &i2c; chips are

present.</para>



    <para>When <structfield>match.type</structfield> is
@@ -131,14 +131,14 @@ on the TV card.</para> 


      <para>Due to a flaw in the Linux &i2c; bus driver these ioctls may

return successfully without actually reading or writing a register. To

catch the most likely failure we recommend a &VIDIOC-DBG-G-CHIP-NAME;

catch the most likely failure we recommend a &VIDIOC-DBG-G-CHIP-INFO;

call confirming the presence of the selected &i2c; chip.</para>

    </note>



    <para>These ioctls are optional, not all drivers may support them.

However when a driver supports these ioctls it must also support

&VIDIOC-DBG-G-CHIP-NAME;. Conversely it may support

<constant>VIDIOC_DBG_G_CHIP_NAME</constant> but not these ioctls.</para>

&VIDIOC-DBG-G-CHIP-INFO;. Conversely it may support

<constant>VIDIOC_DBG_G_CHIP_INFO</constant> but not these ioctls.</para>



    <para><constant>VIDIOC_DBG_G_REGISTER</constant> and

<constant>VIDIOC_DBG_S_REGISTER</constant> were introduced in Linux

drivers/media/usb/em28xx/em28xx-video.c

+4 −4
Original line number Diff line number Diff line
@@ -1332,8 +1332,8 @@ static int vidioc_g_chip_ident(struct file *file, void *priv, 
}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int vidioc_g_chip_name(struct file *file, void *priv,

	       struct v4l2_dbg_chip_name *chip)

static int vidioc_g_chip_info(struct file *file, void *priv,

	       struct v4l2_dbg_chip_info *chip)

{

	struct em28xx_fh      *fh  = priv;

	struct em28xx         *dev = fh->dev;
@@ -1797,7 +1797,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,

	.vidioc_g_chip_ident        = vidioc_g_chip_ident,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.vidioc_g_chip_name         = vidioc_g_chip_name,

	.vidioc_g_chip_info         = vidioc_g_chip_info,

	.vidioc_g_register          = vidioc_g_register,

	.vidioc_s_register          = vidioc_s_register,

#endif
@@ -1827,7 +1827,7 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = { 
	.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,

	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,

	.vidioc_g_chip_ident  = vidioc_g_chip_ident,

	.vidioc_g_chip_name   = vidioc_g_chip_name,

	.vidioc_g_chip_info   = vidioc_g_chip_info,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.vidioc_g_register    = vidioc_g_register,

	.vidioc_s_register    = vidioc_s_register,