Skip to content

Commit

Permalink
Fix private integer types used in V4L2 ioctls.
Browse files Browse the repository at this point in the history
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
David Woodhouse committed May 3, 2006
1 parent 888855d commit eba7f3b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions include/media/v4l2-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@ extern void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg);

/* VIDIOC_INT_G_REGISTER and VIDIOC_INT_S_REGISTER */
struct v4l2_register {
u32 i2c_id; /* I2C driver ID of the I2C chip. 0 for the I2C adapter. */
__u32 i2c_id; /* I2C driver ID of the I2C chip. 0 for the I2C adapter. */
unsigned long reg;
u32 val;
__u32 val;
};

/* VIDIOC_INT_DECODE_VBI_LINE */
struct v4l2_decode_vbi_line {
u32 is_second_field; /* Set to 0 for the first (odd) field,
__u32 is_second_field; /* Set to 0 for the first (odd) field,
set to 1 for the second (even) field. */
u8 *p; /* Pointer to the sliced VBI data from the decoder.
__u8 *p; /* Pointer to the sliced VBI data from the decoder.
On exit points to the start of the payload. */
u32 line; /* Line number of the sliced VBI data (1-23) */
u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */
__u32 line; /* Line number of the sliced VBI data (1-23) */
__u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */
};

/* VIDIOC_INT_G_CHIP_IDENT: identifies the actual chip installed on the board */
Expand Down Expand Up @@ -193,8 +193,8 @@ enum v4l2_chip_ident {
/* Routing definition, device dependent. It specifies which inputs (if any)
should be routed to which outputs (if any). */
struct v4l2_routing {
u32 input;
u32 output;
__u32 input;
__u32 output;
};

/* These internal commands should be used to define the inputs and outputs
Expand Down

0 comments on commit eba7f3b

Please sign in to comment.