OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "[media] docs-rst: escape [] characters" 

This patch touches on places where it shouldn't: image
files and code examples. Also, it doesn't fix all array
occurrences.

So, let's revert it.

This reverts commit ffbab694ed.
This commit is contained in:
Mauro Carvalho Chehab 2016-07-13 08:43:30 -03:00
parent d2cd627be0
commit 8968da9b86
68 changed files with 188 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
View File

@ -52,7 +52,7 @@ returns the information to the application. The ioctl never fails.
- char
- ``driver\[32\]``
- ``driver[32]``
- The name of the cec adapter driver.
@ -60,7 +60,7 @@ returns the information to the application. The ioctl never fails.
- char
- ``name\[32\]``
- ``name[32]``
- The name of this CEC adapter. The combination ``driver`` and
``name`` must be unique.

6
Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
View File

@ -70,7 +70,7 @@ by a file handle in initiator mode (see
- The actual logical addresses that were claimed. This is set by the
driver. If no logical address could be claimed, then it is set to
``CEC_LOG_ADDR_INVALID``. If this adapter is Unregistered, then
``log_addr\[0\]`` is set to 0xf and all others to
``log_addr[0]`` is set to 0xf and all others to
``CEC_LOG_ADDR_INVALID``.
- .. row 2
@ -138,7 +138,7 @@ by a file handle in initiator mode (see
- char
- ``osd_name``\ \[15\]
- ``osd_name``\ [15]
- The On-Screen Display name as is returned by the
``CEC_MSG_SET_OSD_NAME`` message.
@ -178,7 +178,7 @@ by a file handle in initiator mode (see
- __u8
- ``features`` [CEC_MAX_LOG_ADDRS]\[12\]
- ``features`` [CEC_MAX_LOG_ADDRS][12]
- Features for each logical address. Used to implement the
``CEC_MSG_REPORT_FEATURES`` message. The 12 bytes include both the

2
Documentation/media/uapi/cec/cec-ioc-receive.rst
View File

@ -133,7 +133,7 @@ queue, then it will return -1 and set errno to the EBUSY error code.
- __u8
- ``msg``\ \[16\]
- ``msg``\ [16]
- The message payload. For :ref:`CEC_TRANSMIT` this is filled in by the
application. The driver will fill this in for :ref:`CEC_RECEIVE` and

4
Documentation/media/uapi/dvb/ca_data_types.rst
View File

@ -77,7 +77,7 @@ ca_msg_t
unsigned int index;
unsigned int type;
unsigned int length;
unsigned char msg\[256\];
unsigned char msg[256];
} ca_msg_t;
@ -92,7 +92,7 @@ ca_descr_t
typedef struct ca_descr {
unsigned int index;
unsigned int parity;
unsigned char cw\[8\];
unsigned char cw[8];
} ca_descr_t;

4
Documentation/media/uapi/dvb/dmx-get-pes-pids.rst
View File

@ -15,7 +15,7 @@ DMX_GET_PES_PIDS
Synopsis
--------
.. cpp:function:: int ioctl(fd, int request = DMX_GET_PES_PIDS, __u16\[5\])
.. cpp:function:: int ioctl(fd, int request = DMX_GET_PES_PIDS, __u16[5])
Arguments
@ -40,7 +40,7 @@ Arguments
- .. row 3
- __u16\[5\]
- __u16[5]
- Undocumented.

6
Documentation/media/uapi/dvb/dtv-property.rst
View File

@ -13,14 +13,14 @@ struct dtv_property
struct dtv_property {
__u32 cmd;
__u32 reserved\[3\];
__u32 reserved[3];
union {
__u32 data;
struct dtv_fe_stats st;
struct {
__u8 data\[32\];
__u8 data[32];
__u32 len;
__u32 reserved1\[3\];
__u32 reserved1[3];
void *reserved2;
} buffer;
} u;

18
Documentation/media/uapi/dvb/examples.rst
View File

@ -87,7 +87,7 @@ tuners, but can easily be adjusted for QAM.
struct secCmdSequence scmds;
struct dmx_pes_filter_params pesFilterParams;
FrontendParameters frp;
struct pollfd pfd\[1\];
struct pollfd pfd[1];
FrontendEvent event;
int demux1, demux2, demux3, front;
@ -143,7 +143,7 @@ tuners, but can easily be adjusted for QAM.
scmd.u.diseqc.addr=0x10;
scmd.u.diseqc.cmd=0x38;
scmd.u.diseqc.numParams=1;
scmd.u.diseqc.params\[0\] = 0xF0 | ((diseqc * 4) & 0x0F) |
scmd.u.diseqc.params[0] = 0xF0 | ((diseqc * 4) & 0x0F) |
(scmds.continuousTone == SEC_TONE_ON ? 1 : 0) |
(scmds.voltage==SEC_VOLTAGE_18 ? 2 : 0);
@ -168,11 +168,11 @@ tuners, but can easily be adjusted for QAM.
return -1;
}
pfd\[0\].fd = front;
pfd\[0\].events = POLLIN;
pfd[0].fd = front;
pfd[0].events = POLLIN;
if (poll(pfd,1,3000)){
if (pfd\[0\].revents & POLLIN){
if (pfd[0].revents & POLLIN){
printf("Getting QPSK event\\n");
if ( ioctl(front, FE_GET_EVENT, &event)
@ -324,7 +324,7 @@ recording.
int written;
uint8_t buf[BUFFY];
uint64_t length;
struct pollfd pfd\[1\];
struct pollfd pfd[1];
int dvr, dvr_out;
/* open dvr device */
@ -351,13 +351,13 @@ recording.
return -1;
}
pfd\[0\].fd = dvr;
pfd\[0\].events = POLLIN;
pfd[0].fd = dvr;
pfd[0].events = POLLIN;
/* poll for dvr data and write to file */
while (length < MAX_LENGTH ) {
if (poll(pfd,1,1)){
if (pfd\[0\].revents & POLLIN){
if (pfd[0].revents & POLLIN){
len = read(dvr, buf, BUFFY);
if (len < 0){
perror("recording");

4
Documentation/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst
View File

@ -52,9 +52,9 @@ struct dvb_diseqc_slave_reply
- uint8_t
- msg\[4\]
- msg[4]
- DiSEqC message (framing, data\[3\])
- DiSEqC message (framing, data[3])
- .. row 2

4
Documentation/media/uapi/dvb/fe-diseqc-send-master-cmd.rst
View File

@ -52,9 +52,9 @@ struct dvb_diseqc_master_cmd
- uint8_t
- msg\[6\]
- msg[6]
- DiSEqC message (framing, address, command, data\[3\])
- DiSEqC message (framing, address, command, data[3])
- .. row 2

2
Documentation/media/uapi/dvb/fe-get-info.rst
View File

@ -57,7 +57,7 @@ struct dvb_frontend_info
- char
- name\[128\]
- name[128]
- Name of the frontend

4
Documentation/media/uapi/dvb/video_types.rst
View File

@ -125,7 +125,7 @@ it can be extended safely in the future.
} play;
struct {
__u32 data\[16\];
__u32 data[16];
} raw;
};
};
@ -352,7 +352,7 @@ passed to the ioctl VIDEO_GET_NAVI:
typedef
struct video_navi_pack {
int length; /* 0 ... 1024 */
uint8_t data\[1024\];
uint8_t data[1024];
} video_navi_pack_t;

10
Documentation/media/uapi/mediactl/media-ioc-device-info.rst
View File

@ -52,7 +52,7 @@ ioctl never fails.
- char
- ``driver``\ \[16\]
- ``driver``\ [16]
- Name of the driver implementing the media API as a NUL-terminated
ASCII string. The driver version is stored in the
@ -66,7 +66,7 @@ ioctl never fails.
- char
- ``model``\ \[32\]
- ``model``\ [32]
- Device model name as a NUL-terminated UTF-8 string. The device
version is stored in the ``device_version`` field and is not be
@ -76,7 +76,7 @@ ioctl never fails.
- char
- ``serial``\ \[40\]
- ``serial``\ [40]
- Serial number as a NUL-terminated ASCII string.
@ -84,7 +84,7 @@ ioctl never fails.
- char
- ``bus_info``\ \[32\]
- ``bus_info``\ [32]
- Location of the device in the system as a NUL-terminated ASCII
string. This includes the bus type name (PCI, USB, ...) and a
@ -120,7 +120,7 @@ ioctl never fails.
- __u32
- ``reserved``\ \[31\]
- ``reserved``\ [31]
- Reserved for future extensions. Drivers and applications must set
this array to zero.

4
Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst
View File

@ -75,7 +75,7 @@ id's until they get an error.
- char
- ``name``\ \[32\]
- ``name``\ [32]
-
-
@ -181,7 +181,7 @@ id's until they get an error.
-
- __u8
- ``raw``\ \[184\]
- ``raw``\ [184]
-
-

10
Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
View File

@ -163,7 +163,7 @@ desired arrays with the media graph elements.
- char
- ``name``\ \[64\]
- ``name``\ [64]
- Entity name as an UTF-8 NULL-terminated string.
@ -179,7 +179,7 @@ desired arrays with the media graph elements.
- __u32
- ``reserved``\ \[12\]
- ``reserved``\ [12]
- Reserved for future extensions. Drivers and applications must set
this array to zero.
@ -221,7 +221,7 @@ desired arrays with the media graph elements.
- __u32
- ``reserved``\ \[9\]
- ``reserved``\ [9]
- Reserved for future extensions. Drivers and applications must set
this array to zero.
@ -299,7 +299,7 @@ desired arrays with the media graph elements.
- __u32
- ``reserved``\ \[9\]
- ``reserved``\ [9]
- Reserved for future extensions. Drivers and applications must set
this array to zero.
@ -354,7 +354,7 @@ desired arrays with the media graph elements.
- __u32
- ``reserved``\ \[5\]
- ``reserved``\ [5]
- Reserved for future extensions. Drivers and applications must set
this array to zero.

42
Documentation/media/uapi/rc/keytable.c.rst
View File

@ -35,16 +35,16 @@ file: uapi/v4l/keytable.c
struct parse_key *p;
for (p=keynames;p->name!=NULL;p++) {
if (p->value == (unsigned)codes\[1\]) {
printf("scancode 0x%04x = %s (0x%02x)\\n", codes\[0\], p->name, codes\[1\]);
if (p->value == (unsigned)codes[1]) {
printf("scancode 0x%04x = %s (0x%02x)\\n", codes[0], p->name, codes[1]);
return;
}
}
if (isprint (codes\[1\]))
printf("scancode %d = '%c' (0x%02x)\\n", codes\[0\], codes\[1\], codes\[1\]);
if (isprint (codes[1]))
printf("scancode %d = '%c' (0x%02x)\\n", codes[0], codes[1], codes[1]);
else
printf("scancode %d = 0x%02x\\n", codes\[0\], codes\[1\]);
printf("scancode %d = 0x%02x\\n", codes[0], codes[1]);
}
int parse_code(char *string)
@ -63,7 +63,7 @@ file: uapi/v4l/keytable.c
{
int fd;
unsigned int i, j;
int codes\[2\];
int codes[2];
if (argc<2 || argc>4) {
printf ("usage: %s <device> to get table; or\\n"
@ -72,7 +72,7 @@ file: uapi/v4l/keytable.c
return -1;
}
if ((fd = open(argv\[1\], O_RDONLY)) < 0) {
if ((fd = open(argv[1], O_RDONLY)) < 0) {
perror("Couldn't open input device");
return(-1);
}
@ -80,16 +80,16 @@ file: uapi/v4l/keytable.c
if (argc==4) {
int value;
value=parse_code(argv\[3\]);
value=parse_code(argv[3]);
if (value==-1) {
value = strtol(argv\[3\], NULL, 0);
value = strtol(argv[3], NULL, 0);
if (errno)
perror("value");
}
codes \[0\] = (unsigned) strtol(argv\[2\], NULL, 0);
codes \[1\] = (unsigned) value;
codes [0] = (unsigned) strtol(argv[2], NULL, 0);
codes [1] = (unsigned) value;
if(ioctl(fd, EVIOCSKEYCODE, codes))
perror ("EVIOCSKEYCODE");
@ -102,9 +102,9 @@ file: uapi/v4l/keytable.c
if (argc==3) {
FILE *fin;
int value;
char *scancode, *keycode, s\[2048\];
char *scancode, *keycode, s[2048];
fin=fopen(argv\[2\],"r");
fin=fopen(argv[2],"r");
if (fin==NULL) {
perror ("opening keycode file");
return -1;
@ -113,8 +113,8 @@ file: uapi/v4l/keytable.c
/* Clears old table */
for (j = 0; j < 256; j++) {
for (i = 0; i < 256; i++) {
codes\[0\] = (j << 8) | i;
codes\[1\] = KEY_RESERVED;
codes[0] = (j << 8) | i;
codes[1] = KEY_RESERVED;
ioctl(fd, EVIOCSKEYCODE, codes);
}
}
@ -149,12 +149,12 @@ file: uapi/v4l/keytable.c
perror("value");
}
codes \[0\] = (unsigned) strtol(scancode, NULL, 0);
codes \[1\] = (unsigned) value;
codes [0] = (unsigned) strtol(scancode, NULL, 0);
codes [1] = (unsigned) value;
// printf("\\t%04x=%04x\\n",codes\[0\], codes\[1\]);
// printf("\\t%04x=%04x\\n",codes[0], codes[1]);
if(ioctl(fd, EVIOCSKEYCODE, codes)) {
fprintf(stderr, "Setting scancode 0x%04x with 0x%04x via ",codes\[0\], codes\[1\]);
fprintf(stderr, "Setting scancode 0x%04x with 0x%04x via ",codes[0], codes[1]);
perror ("EVIOCSKEYCODE");
}
@ -167,8 +167,8 @@ file: uapi/v4l/keytable.c
/* Get scancode table */
for (j = 0; j < 256; j++) {
for (i = 0; i < 256; i++) {
codes\[0\] = (j << 8) | i;
if (!ioctl(fd, EVIOCGKEYCODE, codes) && codes\[1\] != KEY_RESERVED)
codes[0] = (j << 8) | i;
if (!ioctl(fd, EVIOCGKEYCODE, codes) && codes[1] != KEY_RESERVED)
prtcode(codes);
}
}

4
Documentation/media/uapi/v4l/buffer.rst
View File

@ -379,7 +379,7 @@ struct v4l2_plane
- __u32
- ``reserved\[11\]``
- ``reserved[11]``
-
- Reserved for future use. Should be zeroed by drivers and
@ -868,7 +868,7 @@ struct v4l2_timecode
- __u8
- ``userbits``\ \[4\]
- ``userbits``\ [4]
- The "user group" bits from the timecode.

14
Documentation/media/uapi/v4l/capture.c.rst
View File

@ -88,7 +88,7 @@ file: media/v4l/capture.c
switch (io) {
case IO_METHOD_READ:
if (-1 == read(fd, buffers\[0\].start, buffers\[0\].length)) {
if (-1 == read(fd, buffers[0].start, buffers[0].length)) {
switch (errno) {
case EAGAIN:
return 0;
@ -103,7 +103,7 @@ file: media/v4l/capture.c
}
}
process_image(buffers\[0\].start, buffers\[0\].length);
process_image(buffers[0].start, buffers[0].length);
break;
case IO_METHOD_MMAP:
@ -284,7 +284,7 @@ file: media/v4l/capture.c
switch (io) {
case IO_METHOD_READ:
free(buffers\[0\].start);
free(buffers[0].start);
break;
case IO_METHOD_MMAP:
@ -311,10 +311,10 @@ file: media/v4l/capture.c
exit(EXIT_FAILURE);
}
buffers\[0\].length = buffer_size;
buffers\[0\].start = malloc(buffer_size);
buffers[0].length = buffer_size;
buffers[0].start = malloc(buffer_size);
if (!buffers\[0\].start) {
if (!buffers[0].start) {
fprintf(stderr, "Out of memory\\n");
exit(EXIT_FAILURE);
}
@ -575,7 +575,7 @@ file: media/v4l/capture.c
"-f | --format Force format to 640x480 YUYVn"
"-c | --count Number of frames to grab [%i]n"
"",
argv\[0\], dev_name, frame_count);
argv[0], dev_name, frame_count);
}
static const char short_options[] = "d:hmruofc:";

2
Documentation/media/uapi/v4l/dev-osd.rst
View File

@ -68,7 +68,7 @@ Example: Finding a framebuffer device for OSD
}
for (i = 0; i < 30; i++) {
char dev_name\[16\];
char dev_name[16];
struct fb_fix_screeninfo si;
snprintf(dev_name, sizeof(dev_name), "/dev/fb%u", i);

4
Documentation/media/uapi/v4l/dev-raw-vbi.rst
View File

@ -188,7 +188,7 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT <VIDIOC_G_FMT>` does
service transmissions embedded in the picture.
An application can set the first or second ``count`` value to zero
if no data is required from the respective field; ``count``\ \[1\]
if no data is required from the respective field; ``count``\ [1]
if the scanning system is progressive, i. e. not interlaced. The
corresponding start value shall be ignored by the application and
driver. Anyway, drivers may not support single field capturing and
@ -318,7 +318,7 @@ The total size of a frame computes as follows:
.. code-block:: c
(count\[0\] + count\[1\]) * samples_per_line * sample size in bytes
(count[0] + count[1]) * samples_per_line * sample size in bytes
The sample size is most likely always one byte, applications must check
the ``sample_format`` field though, to function properly with other

BIN
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf
View File

Binary file not shown.

2
Documentation/media/uapi/v4l/dev-sdr.rst
View File

@ -110,7 +110,7 @@ data transfer, set by the driver in order to inform application.
- __u8
- ``reserved\[24\]``
- ``reserved[24]``
- This array is reserved for future extensions. Drivers and
applications must set it to zero.

58
Documentation/media/uapi/v4l/dev-sliced-vbi.rst
View File

@ -140,7 +140,7 @@ struct v4l2_sliced_vbi_format
- __u16
- ``service_lines``\ \[2\]\[24\]
- ``service_lines``\ [2][24]
- :cspan:`2`
@ -170,7 +170,7 @@ struct v4l2_sliced_vbi_format
-
-
- ``service_lines``\ \[0\]\[1\]
- ``service_lines``\ [0][1]
- 1
@ -180,7 +180,7 @@ struct v4l2_sliced_vbi_format
-
-
- ``service_lines``\ \[0\]\[23\]
- ``service_lines``\ [0][23]
- 23
@ -190,7 +190,7 @@ struct v4l2_sliced_vbi_format
-
-
- ``service_lines``\ \[1\]\[1\]
- ``service_lines``\ [1][1]
- 264
@ -200,7 +200,7 @@ struct v4l2_sliced_vbi_format
-
-
- ``service_lines``\ \[1\]\[23\]
- ``service_lines``\ [1][23]
- 286
@ -210,8 +210,8 @@ struct v4l2_sliced_vbi_format
-
-
- :cspan:`2` Drivers must set ``service_lines`` \[0\]\[0\] and
``service_lines``\ \[1\]\[0\] to zero. The
- :cspan:`2` Drivers must set ``service_lines`` [0][0] and
``service_lines``\ [1][0] to zero. The
``V4L2_VBI_ITU_525_F1_START``, ``V4L2_VBI_ITU_525_F2_START``,
``V4L2_VBI_ITU_625_F1_START`` and ``V4L2_VBI_ITU_625_F2_START``
defines give the start line numbers for each field for each 525 or
@ -238,7 +238,7 @@ struct v4l2_sliced_vbi_format
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- :cspan:`2` This array is reserved for future extensions.
Applications and drivers must set it to zero.
@ -427,7 +427,7 @@ struct v4l2_sliced_vbi_data
- __u8
- ``data``\ \[48\]
- ``data``\ [48]
- The packet payload. See :ref:`vbi-services` for the contents and
number of bytes passed for each data type. The contents of padding
@ -566,7 +566,7 @@ struct v4l2_mpeg_vbi_fmt_ivtv
- __u8
- ``magic``\ \[4\]
- ``magic``\ [4]
-
- A "magic" constant from :ref:`v4l2-mpeg-vbi-fmt-ivtv-magic` that
@ -662,7 +662,7 @@ struct v4l2_mpeg_vbi_itv0
- __le32
- ``linemask``\ \[2\]
- ``linemask``\ [2]
- Bitmasks indicating the VBI service lines present. These
``linemask`` values are stored in little endian byte order in the
@ -675,30 +675,30 @@ struct v4l2_mpeg_vbi_itv0
::
linemask\[0\] b0: line 6 first field
linemask\[0\] b17: line 23 first field
linemask\[0\] b18: line 6 second field
linemask\[0\] b31: line 19 second field
linemask\[1\] b0: line 20 second field
linemask\[1\] b3: line 23 second field
linemask\[1\] b4-b31: unused and set to 0
linemask[0] b0: line 6 first field
linemask[0] b17: line 23 first field
linemask[0] b18: line 6 second field
linemask[0] b31: line 19 second field
linemask[1] b0: line 20 second field
linemask[1] b3: line 23 second field
linemask[1] b4-b31: unused and set to 0
- .. row 2
- struct
:ref:`v4l2_mpeg_vbi_itv0_line <v4l2-mpeg-vbi-itv0-line>`
- ``line``\ \[35\]
- ``line``\ [35]
- This is a variable length array that holds from 1 to 35 lines of
sliced VBI data. The sliced VBI data lines present correspond to
the bits set in the ``linemask`` array, starting from b\ :sub:`0`
of ``linemask``\ \[0\] up through b\ :sub:`31` of ``linemask``\ \[0\],
and from b\ :sub:`0` of ``linemask``\ \[1\] up through b\ :sub:`3` of
``linemask``\ \[1\]. ``line``\ \[0\] corresponds to the first bit
found set in the ``linemask`` array, ``line``\ \[1\] corresponds to
of ``linemask``\ [0] up through b\ :sub:`31` of ``linemask``\ [0],
and from b\ :sub:`0` of ``linemask``\ [1] up through b\ :sub:`3` of
``linemask``\ [1]. ``line``\ [0] corresponds to the first bit
found set in the ``linemask`` array, ``line``\ [1] corresponds to
the second bit found set in the ``linemask`` array, etc. If no
``linemask`` array bits are set, then ``line``\ \[0\] may contain
``linemask`` array bits are set, then ``line``\ [0] may contain
one line of unspecified data that should be ignored by
applications.
@ -720,11 +720,11 @@ struct v4l2_mpeg_vbi_ITV0
- struct
:ref:`v4l2_mpeg_vbi_itv0_line <v4l2-mpeg-vbi-itv0-line>`
- ``line``\ \[36\]
- ``line``\ [36]
- A fixed length array of 36 lines of sliced VBI data. ``line``\ \[0\]
through ``line``\ \[17\] correspond to lines 6 through 23 of the
first field. ``line``\ \[18\] through ``line``\ \[35\] corresponds to
- A fixed length array of 36 lines of sliced VBI data. ``line``\ [0]
through ``line``\ [17] correspond to lines 6 through 23 of the
first field. ``line``\ [18] through ``line``\ [35] corresponds to
lines 6 through 23 of the second field.
@ -754,7 +754,7 @@ struct v4l2_mpeg_vbi_itv0_line
- __u8
- ``data``\ \[42\]
- ``data``\ [42]
- The sliced VBI data for the line.

10
Documentation/media/uapi/v4l/hist-v4l2.rst
View File

@ -266,7 +266,7 @@ V4L2 Version 0.20 2000-11-23
A number of changes were made to the raw VBI interface.
1. Figures clarifying the line numbering scheme were added to the V4L2
API specification. The ``start``\ \[0\] and ``start``\ \[1\] fields no
API specification. The ``start``\ [0] and ``start``\ [1] fields no
longer count line numbers beginning at zero. Rationale: a) The
previous definition was unclear. b) The ``start``\ [] values are
ordinal numbers. c) There is no point in inventing a new line
@ -274,8 +274,8 @@ A number of changes were made to the raw VBI interface.
Compatibility: Add one to the start values. Applications depending on
the previous semantics may not function correctly.
2. The restriction "count\[0\] > 0 and count\[1\] > 0" has been relaxed to
"(count\[0\] + count\[1\]) > 0". Rationale: Drivers may allocate
2. The restriction "count[0] > 0 and count[1] > 0" has been relaxed to
"(count[0] + count[1]) > 0". Rationale: Drivers may allocate
resources at scan line granularity and some data services are
transmitted only on the first field. The comment that both ``count``
values will usually be equal is misleading and pointless and has been
@ -649,7 +649,7 @@ This unnamed version was finally merged into Linux 2.5.46.
memory. It was barely useful and so was removed.
14. In struct :ref:`v4l2_framebuffer <v4l2-framebuffer>` the
``base\[3\]`` array anticipating double- and triple-buffering in
``base[3]`` array anticipating double- and triple-buffering in
off-screen video memory, however without defining a synchronization
mechanism, was replaced by a single pointer. The
``V4L2_FBUF_CAP_SCALEUP`` and ``V4L2_FBUF_CAP_SCALEDOWN`` flags were
@ -833,7 +833,7 @@ V4L2 in Linux 2.6.6, 2004-05-09
V4L2 in Linux 2.6.8
===================
1. A new field ``input`` (former ``reserved\[0\]``) was added to the
1. A new field ``input`` (former ``reserved[0]``) was added to the
struct :ref:`v4l2_buffer <v4l2-buffer>` structure. Purpose of this
field is to alternate between video inputs (e. g. cameras) in step
with the video capturing process. This function must be enabled with

4
Documentation/media/uapi/v4l/pixfmt-003.rst
View File

@ -41,7 +41,7 @@ describing all planes of that format.
- __u16
- ``reserved\[6\]``
- ``reserved[6]``
- Reserved for future extensions. Should be zeroed by drivers and
applications.
@ -160,7 +160,7 @@ describing all planes of that format.
- __u8
- ``reserved\[7\]``
- ``reserved[7]``
- Reserved for future extensions. Should be zeroed by drivers and
applications.

2
Documentation/media/uapi/v4l/subdev-formats.rst
View File

@ -92,7 +92,7 @@ Media Bus Formats
- __u16
- ``reserved``\ \[11\]
- ``reserved``\ [11]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

2
Documentation/media/uapi/v4l/v4l2grab.c.rst
View File

@ -62,7 +62,7 @@ file: media/v4l/v4l2grab.c
int r, fd = -1;
unsigned int i, n_buffers;
char *dev_name = "/dev/video0";
char out_name\[256\];
char out_name[256];
FILE *fout;
struct buffer *buffers;

2
Documentation/media/uapi/v4l/vidioc-create-bufs.rst
View File

@ -125,7 +125,7 @@ than the number requested.
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
- A place holder for future extensions. Drivers and applications
must set the array to zero.

6
Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst
View File

@ -115,7 +115,7 @@ instructions.
-
- char
- ``name\[32\]``
- ``name[32]``
- Match a chip by this name, interpreted according to the ``type``
field. Currently unused.
@ -142,7 +142,7 @@ instructions.
- char
- ``name\[32\]``
- ``name[32]``
- The name of the chip.
@ -161,7 +161,7 @@ instructions.
- __u32
- ``reserved\[8\]``
- ``reserved[8]``
- Reserved fields, both application and driver must set these to 0.

2
Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst
View File

@ -123,7 +123,7 @@ instructions.
-
- char
- ``name\[32\]``
- ``name[32]``
- Match a chip by this name, interpreted according to the ``type``
field. Currently unused.

2
Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
View File

@ -178,7 +178,7 @@ introduced in Linux 3.3.
-
- __u32
- ``data``\ \[16\]
- ``data``\ [16]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

4
Documentation/media/uapi/v4l/vidioc-dqevent.rst
View File

@ -116,7 +116,7 @@ call.
-
- __u8
- ``data``\ \[64\]
- ``data``\ [64]
- Event data. Defined by the event type. The union should be used to
define easily accessible type for events.
@ -167,7 +167,7 @@ call.
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
-
- Reserved for future extensions. Drivers must set the array to

6
Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
View File

@ -130,7 +130,7 @@ that doesn't support them will return an ``EINVAL`` error code.
- __u32
- ``reserved``\ \[16\]
- ``reserved``\ [16]
- Reserved for future extensions. Drivers must set the array to
zero.
@ -167,7 +167,7 @@ that doesn't support them will return an ``EINVAL`` error code.
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- Reserved for future extensions. Drivers and applications must set
the array to zero.
@ -193,7 +193,7 @@ that doesn't support them will return an ``EINVAL`` error code.
-
- __u32
- ``raw_data``\ \[32\]
- ``raw_data``\ [32]
-

2
Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst
View File

@ -94,7 +94,7 @@ introduced in Linux 2.6.21.
- __u32
- ``data``\ \[8\]
- ``data``\ [8]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst
View File

@ -92,7 +92,7 @@ return an ``EINVAL`` error code.
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

4
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
View File

@ -86,7 +86,7 @@ one until ``EINVAL`` is returned.
- __u8
- ``description``\ \[32\]
- ``description``\ [32]
- Description of the format, a NUL-terminated ASCII string. This
information is intended for the user, for example: "YUV 4:2:2".
@ -120,7 +120,7 @@ one until ``EINVAL`` is returned.
- __u32
- ``reserved``\ \[4\]
- ``reserved``\ [4]
- Reserved for future extensions. Drivers must set the array to
zero.

2
Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst
View File

@ -217,7 +217,7 @@ application should zero out all members except for the *IN* fields.
- __u32
- ``reserved\[2\]``
- ``reserved[2]``
-
- Reserved space for future use. Must be zeroed by drivers and

2
Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst
View File

@ -238,7 +238,7 @@ application should zero out all members except for the *IN* fields.
- __u32
- ``reserved\[2\]``
- ``reserved[2]``
-
- Reserved space for future use. Must be zeroed by drivers and

2
Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
View File

@ -140,7 +140,7 @@ of the corresponding tuner/modulator is set.
- __u32
- ``reserved``\ \[9\]
- ``reserved``\ [9]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

4
Documentation/media/uapi/v4l/vidioc-enuminput.rst
View File

@ -61,7 +61,7 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
- __u8
- ``name``\ \[32\]
- ``name``\ [32]
- Name of the video input, a NUL-terminated ASCII string, for
example: "Vin (Composite 2)". This information is intended for the
@ -141,7 +141,7 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
- __u32
- ``reserved``\ \[3\]
- ``reserved``\ [3]
- Reserved for future extensions. Drivers must set the array to
zero.

4
Documentation/media/uapi/v4l/vidioc-enumoutput.rst
View File

@ -62,7 +62,7 @@ EINVAL.
- __u8
- ``name``\ \[32\]
- ``name``\ [32]
- Name of the video output, a NUL-terminated ASCII string, for
example: "Vout". This information is intended for the user,
@ -131,7 +131,7 @@ EINVAL.
- __u32
- ``reserved``\ \[3\]
- ``reserved``\ [3]
- Reserved for future extensions. Drivers must set the array to
zero.

4
Documentation/media/uapi/v4l/vidioc-enumstd.rst
View File

@ -78,7 +78,7 @@ or output. [#f1]_
- __u8
- ``name``\ \[24\]
- ``name``\ [24]
- Name of the standard, a NUL-terminated ASCII string, for example:
"PAL-B/G", "NTSC Japan". This information is intended for the
@ -105,7 +105,7 @@ or output. [#f1]_
- __u32
- ``reserved``\ \[4\]
- ``reserved``\ [4]
- Reserved for future extensions. Drivers must set the array to
zero.

2
Documentation/media/uapi/v4l/vidioc-expbuf.rst
View File

@ -179,7 +179,7 @@ Examples
- __u32
- ``reserved\[11\]``
- ``reserved[11]``
- Reserved field for future use. Drivers and applications must set
the array to zero.

4
Documentation/media/uapi/v4l/vidioc-g-audio.rst
View File

@ -70,7 +70,7 @@ return the actual new audio mode.
- __u8
- ``name``\ \[32\]
- ``name``\ [32]
- Name of the audio input, a NUL-terminated ASCII string, for
example: "Line In". This information is intended for the user,
@ -97,7 +97,7 @@ return the actual new audio mode.
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

4
Documentation/media/uapi/v4l/vidioc-g-audioout.rst
View File

@ -75,7 +75,7 @@ as ``VIDIOC_G_AUDOUT`` does.
- __u8
- ``name``\ \[32\]
- ``name``\ [32]
- Name of the audio output, a NUL-terminated ASCII string, for
example: "Line Out". This information is intended for the user,
@ -103,7 +103,7 @@ as ``VIDIOC_G_AUDOUT`` does.
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
View File

@ -259,7 +259,7 @@ EBUSY
-
- __u32
- ``reserved``\ \[32\]
- ``reserved``\ [32]
-

2
Documentation/media/uapi/v4l/vidioc-g-edid.rst
View File

@ -131,7 +131,7 @@ EDID is no longer available.
- __u32
- ``reserved``\ \[5\]
- ``reserved``\ [5]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

4
Documentation/media/uapi/v4l/vidioc-g-enc-index.rst
View File

@ -86,7 +86,7 @@ video elementary streams.
- __u32
- ``reserved``\ \[4\]
- ``reserved``\ [4]
- :cspan:`2` Reserved for future extensions. Drivers must set the
array to zero.
@ -153,7 +153,7 @@ video elementary streams.
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- Reserved for future extensions. Drivers must set the array to
zero.

4
Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
View File

@ -136,7 +136,7 @@ still cause this situation.
- __u32
- ``reserved2``\ \[1\]
- ``reserved2``\ [1]
-
- Reserved for future extensions. Drivers and applications must set
@ -338,7 +338,7 @@ still cause this situation.
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-g-fmt.rst
View File

@ -171,7 +171,7 @@ The format as returned by :ref:`VIDIOC_TRY_FMT <VIDIOC_G_FMT>` must be identical
-
- __u8
- ``raw_data``\ \[200\]
- ``raw_data``\ [200]
- Place holder for future extensions.

2
Documentation/media/uapi/v4l/vidioc-g-frequency.rst
View File

@ -102,7 +102,7 @@ write-only ioctl, it does not return the actual new frequency.
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

4
Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst
View File

@ -94,7 +94,7 @@ encoding. You usually do want to add them.
- char
- ``APP_data``\ \[60\]
- ``APP_data``\ [60]
-
@ -110,7 +110,7 @@ encoding. You usually do want to add them.
- char
- ``COM_data``\ \[60\]
- ``COM_data``\ [60]
-

4
Documentation/media/uapi/v4l/vidioc-g-modulator.rst
View File

@ -81,7 +81,7 @@ To change the radio frequency the
- __u8
- ``name``\ \[32\]
- ``name``\ [32]
- Name of the modulator, a NUL-terminated ASCII string. This
information is intended for the user.
@ -149,7 +149,7 @@ To change the radio frequency the
- __u32
- ``reserved``\ \[3\]
- ``reserved``\ [3]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

6
Documentation/media/uapi/v4l/vidioc-g-parm.rst
View File

@ -103,7 +103,7 @@ union holding separate parameters for input and output devices.
-
- __u8
- ``raw_data``\ \[200\]
- ``raw_data``\ [200]
- A place holder for future extensions.
@ -183,7 +183,7 @@ union holding separate parameters for input and output devices.
- __u32
- ``reserved``\ \[4\]
- ``reserved``\ [4]
- Reserved for future extensions. Drivers and applications must set
the array to zero.
@ -271,7 +271,7 @@ union holding separate parameters for input and output devices.
- __u32
- ``reserved``\ \[4\]
- ``reserved``\ [4]
- Reserved for future extensions. Drivers and applications must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-g-selection.rst
View File

@ -182,7 +182,7 @@ Selection targets and flags are documented in
- __u32
- ``reserved\[9\]``
- ``reserved[9]``
- Reserved fields for future use. Drivers and applications must zero
this array.

16
Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
View File

@ -65,7 +65,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
- __u16
- ``service_lines``\ \[2\]\[24\]
- ``service_lines``\ [2][24]
- :cspan:`2` Each element of this array contains a set of data
services the hardware can look for or insert into a particular
@ -87,7 +87,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
-
-
- ``service_lines``\ \[0\]\[1\]
- ``service_lines``\ [0][1]
- 1
@ -97,7 +97,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
-
-
- ``service_lines``\ \[0\]\[23\]
- ``service_lines``\ [0][23]
- 23
@ -107,7 +107,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
-
-
- ``service_lines``\ \[1\]\[1\]
- ``service_lines``\ [1][1]
- 264
@ -117,7 +117,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
-
-
- ``service_lines``\ \[1\]\[23\]
- ``service_lines``\ [1][23]
- 286
@ -147,8 +147,8 @@ the sliced VBI API is unsupported or ``type`` is invalid.
-
-
- :cspan:`2` Drivers must set ``service_lines`` \[0\]\[0\] and
``service_lines``\ \[1\]\[0\] to zero.
- :cspan:`2` Drivers must set ``service_lines`` [0][0] and
``service_lines``\ [1][0] to zero.
- .. row 12
@ -164,7 +164,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
- __u32
- ``reserved``\ \[3\]
- ``reserved``\ [3]
- :cspan:`2` This array is reserved for future extensions.
Applications and drivers must set it to zero.

4
Documentation/media/uapi/v4l/vidioc-g-tuner.rst
View File

@ -79,7 +79,7 @@ To change the radio frequency the
- __u8
- ``name``\ \[32\]
- ``name``\ [32]
- :cspan:`1`
@ -246,7 +246,7 @@ To change the radio frequency the
- __u32
- ``reserved``\ \[4\]
- ``reserved``\ [4]
- :cspan:`1` Reserved for future extensions. Drivers and
applications must set the array to zero.

8
Documentation/media/uapi/v4l/vidioc-querycap.rst
View File

@ -53,7 +53,7 @@ specification the ioctl returns an ``EINVAL`` error code.
- __u8
- ``driver``\ \[16\]
- ``driver``\ [16]
- Name of the driver, a unique NUL-terminated ASCII string. For
example: "bttv". Driver specific applications can use this
@ -69,7 +69,7 @@ specification the ioctl returns an ``EINVAL`` error code.
- __u8
- ``card``\ \[32\]
- ``card``\ [32]
- Name of the device, a NUL-terminated UTF-8 string. For example:
"Yoyodyne TV/FM". One driver may support different brands or
@ -84,7 +84,7 @@ specification the ioctl returns an ``EINVAL`` error code.
- __u8
- ``bus_info``\ \[32\]
- ``bus_info``\ [32]
- Location of the device in the system, a NUL-terminated ASCII
string. For example: "PCI:0000:05:06.0". This information is
@ -166,7 +166,7 @@ specification the ioctl returns an ``EINVAL`` error code.
- __u32
- ``reserved``\ \[3\]
- ``reserved``\ [3]
- Reserved for future extensions. Drivers must set this array to
zero.

12
Documentation/media/uapi/v4l/vidioc-queryctrl.rst
View File

@ -124,7 +124,7 @@ See also the examples in :ref:`control`.
- __u8
- ``name``\ \[32\]
- ``name``\ [32]
- Name of the control, a NUL-terminated ASCII string. This
information is intended for the user.
@ -203,7 +203,7 @@ See also the examples in :ref:`control`.
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- Reserved for future extensions. Drivers must set the array to
zero.
@ -245,7 +245,7 @@ See also the examples in :ref:`control`.
- char
- ``name``\ \[32\]
- ``name``\ [32]
- Name of the control, a NUL-terminated ASCII string. This
information is intended for the user.
@ -326,7 +326,7 @@ See also the examples in :ref:`control`.
- The size in bytes of a single element of the array. Given a char
pointer ``p`` to a 3-dimensional array you can find the position
of cell ``(z, y, x)`` as follows:
``p + ((z * dims\[1\] + y) * dims\[0\] + x) * elem_size``.
``p + ((z * dims[1] + y) * dims[0] + x) * elem_size``.
``elem_size`` is always valid, also when the control isn't an
array. For string controls ``elem_size`` is equal to
``maximum + 1``.
@ -363,7 +363,7 @@ See also the examples in :ref:`control`.
- __u32
- ``reserved``\ \[32\]
- ``reserved``\ [32]
- Reserved for future extensions. Applications and drivers must set
the array to zero.
@ -410,7 +410,7 @@ See also the examples in :ref:`control`.
-
- __u8
- ``name``\ \[32\]
- ``name``\ [32]
- Name of the menu item, a NUL-terminated ASCII string. This
information is intended for the user. This field is valid for

2
Documentation/media/uapi/v4l/vidioc-reqbufs.rst
View File

@ -107,7 +107,7 @@ any DMA in progress, an implicit
- __u32
- ``reserved``\ \[2\]
- ``reserved``\ [2]
- A place holder for future extensions. Drivers and applications
must set the array to zero.

2
Documentation/media/uapi/v4l/vidioc-s-hw-freq-seek.rst
View File

@ -150,7 +150,7 @@ error code is returned and no seek takes place.
- __u32
- ``reserved``\ \[5\]
- ``reserved``\ [5]
- Reserved for future extensions. Applications must set the array to
zero.

2
Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst
View File

@ -132,7 +132,7 @@ multiple pads of the same sub-device is not defined.
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst
View File

@ -142,7 +142,7 @@ information about try formats.
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst
View File

@ -95,7 +95,7 @@ information about the try formats.
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst
View File

@ -109,7 +109,7 @@ modified format should be as close as possible to the original request.
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst
View File

@ -113,7 +113,7 @@ should be as close as possible to the original request.
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst
View File

@ -95,7 +95,7 @@ the same sub-device is not defined.
- __u32
- ``reserved``\ \[9\]
- ``reserved``\ [9]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst
View File

@ -117,7 +117,7 @@ Selection targets and flags are documented in
- __u32
- ``reserved``\ \[8\]
- ``reserved``\ [8]
- Reserved for future extensions. Applications and drivers must set
the array to zero.

2
Documentation/media/uapi/v4l/vidioc-subscribe-event.rst
View File

@ -79,7 +79,7 @@ using the :ref:`VIDIOC_DQEVENT` ioctl.
- __u32
- ``reserved``\ \[5\]
- ``reserved``\ [5]
- Reserved for future extensions. Drivers and applications must set
the array to zero.