diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-09-06 06:13:14 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:19:27 -0400 |
commit | 22e221258b56cc1a4dc5a9fb2c26f4d6ed9dde81 (patch) | |
tree | 0e07015c3b78211491594f000b77aa8a7e48d8fc /Documentation/video4linux | |
parent | 7ae0cd9bc793e16d8d68df3c17c601732cc1d3c7 (diff) |
V4L/DVB (12722): v4l2-dev: replace 'kernel number' by 'device node number'.
The term 'kernel number' is very vague, so replace it with the somewhat more
descriptive term 'device node number'.
In one place the local variable 'nr' was used to create the device node number
of the new device name. This has been replaced with the vdev->num field to
more clearly mark this as being the device node number and not the minor
number.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r-- | Documentation/video4linux/v4l2-framework.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt index cb6c7eb51472..38b3716d8643 100644 --- a/Documentation/video4linux/v4l2-framework.txt +++ b/Documentation/video4linux/v4l2-framework.txt | |||
@@ -486,14 +486,14 @@ VFL_TYPE_RADIO: radioX for radio tuners | |||
486 | VFL_TYPE_VTX: vtxX for teletext devices (deprecated, don't use) | 486 | VFL_TYPE_VTX: vtxX for teletext devices (deprecated, don't use) |
487 | 487 | ||
488 | The last argument gives you a certain amount of control over the device | 488 | The last argument gives you a certain amount of control over the device |
489 | kernel number used (i.e. the X in videoX). Normally you will pass -1 to | 489 | device node number used (i.e. the X in videoX). Normally you will pass -1 to |
490 | let the v4l2 framework pick the first free number. But if a driver creates | 490 | let the v4l2 framework pick the first free number. But if a driver creates |
491 | many devices, then it can be useful to have different video devices in | 491 | many devices, then it can be useful to have different video devices in |
492 | separate ranges. For example, video capture devices start at 0, video | 492 | separate ranges. For example, video capture devices start at 0, video |
493 | output devices start at 16. | 493 | output devices start at 16. |
494 | 494 | ||
495 | So you can use the last argument to specify a minimum kernel number and | 495 | So you can use the last argument to specify a minimum device node number |
496 | the v4l2 framework will try to pick the first free number that is equal | 496 | and the v4l2 framework will try to pick the first free number that is equal |
497 | or higher to what you passed. If that fails, then it will just pick the | 497 | or higher to what you passed. If that fails, then it will just pick the |
498 | first free number. | 498 | first free number. |
499 | 499 | ||
@@ -513,7 +513,7 @@ After the device was successfully registered, then you can use these fields: | |||
513 | 513 | ||
514 | - vfl_type: the device type passed to video_register_device. | 514 | - vfl_type: the device type passed to video_register_device. |
515 | - minor: the assigned device minor number. | 515 | - minor: the assigned device minor number. |
516 | - num: the device kernel number (i.e. the X in videoX). | 516 | - num: the device node number (i.e. the X in videoX). |
517 | - index: the device index number. | 517 | - index: the device index number. |
518 | 518 | ||
519 | If the registration failed, then you need to call video_device_release() | 519 | If the registration failed, then you need to call video_device_release() |