diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-11 12:31:04 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-11 12:31:04 -0300 |
commit | 9e63ad90aab3091baff361668bf7b87d5dfebbca (patch) | |
tree | 8197023f5a70eeb32e2cf025afee74883d3957a4 /linux/include/media | |
parent | a9d01dbf52913418e85dcc8797242984ac017280 (diff) | |
parent | 4b02add35284f34c7904c54a9e57630c0c8cbef2 (diff) | |
download | mediapointer-dvb-s2-9e63ad90aab3091baff361668bf7b87d5dfebbca.tar.gz mediapointer-dvb-s2-9e63ad90aab3091baff361668bf7b87d5dfebbca.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-dev
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media')
-rw-r--r-- | linux/include/media/v4l2-dev.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 9158ad8b5..bd59577d7 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -18,20 +18,11 @@ #define VIDEO_MAJOR 81 -/* Minor device allocation */ -#define MINOR_VFL_TYPE_GRABBER_MIN 0 -#define MINOR_VFL_TYPE_GRABBER_MAX 63 -#define MINOR_VFL_TYPE_RADIO_MIN 64 -#define MINOR_VFL_TYPE_RADIO_MAX 127 -#define MINOR_VFL_TYPE_VTX_MIN 192 -#define MINOR_VFL_TYPE_VTX_MAX 223 -#define MINOR_VFL_TYPE_VBI_MIN 224 -#define MINOR_VFL_TYPE_VBI_MAX 255 - #define VFL_TYPE_GRABBER 0 #define VFL_TYPE_VBI 1 #define VFL_TYPE_RADIO 2 #define VFL_TYPE_VTX 3 +#define VFL_TYPE_MAX 4 struct v4l2_ioctl_callbacks; @@ -60,6 +51,7 @@ struct video_device char name[32]; int vfl_type; int minor; + u16 num; /* attribute to differentiate multiple indices on one physical device */ int index; |