From d4681a2dfc513c3cb4fb45bea3267bce2a044361 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 4 May 2006 00:44:14 +0100 Subject: [PATCH] --- yaml --- r: 27991 b: refs/heads/master c: eba7f3bdb6344adee8a3d044f405ed38f5c66c6b h: refs/heads/master i: 27989: 5a577f10e51d8cce71c55786df7dd7a3948e86c0 27987: 687c1246851f3b2749c1713e011cceabeb4740bc 27983: 01a71a27ff0a7b9f95a2ae8109b96a66ac7c4676 v: v3 --- [refs] | 2 +- trunk/include/media/v4l2-common.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 62173979f386..16c3de6dc56c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 888855dc00c302c88663ec256bb422f4b27046f2 +refs/heads/master: eba7f3bdb6344adee8a3d044f405ed38f5c66c6b diff --git a/trunk/include/media/v4l2-common.h b/trunk/include/media/v4l2-common.h index 642520acdfa7..daa2de1784f1 100644 --- a/trunk/include/media/v4l2-common.h +++ b/trunk/include/media/v4l2-common.h @@ -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 */ @@ -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