summaryrefslogtreecommitdiff
path: root/v4l2-apps/libv4l/libv4lconvert/control/libv4lcontrol-priv.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-07 00:26:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-07 00:26:34 -0300
commit7e9376280a53b01b33a00591e26e6ca8587c0a7d (patch)
tree7d1fe6c915cdc4f38bc7a184fba80e4a98ee1228 /v4l2-apps/libv4l/libv4lconvert/control/libv4lcontrol-priv.h
parentfe71d82c6502272eee2df15c848cd067cfd7b2f0 (diff)
parente94f0a9e6ddf4e039056b4ade462545146b64947 (diff)
downloadmediapointer-dvb-s2-7e9376280a53b01b33a00591e26e6ca8587c0a7d.tar.gz
mediapointer-dvb-s2-7e9376280a53b01b33a00591e26e6ca8587c0a7d.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-apps/libv4l/libv4lconvert/control/libv4lcontrol-priv.h')
-rw-r--r--v4l2-apps/libv4l/libv4lconvert/control/libv4lcontrol-priv.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/v4l2-apps/libv4l/libv4lconvert/control/libv4lcontrol-priv.h b/v4l2-apps/libv4l/libv4lconvert/control/libv4lcontrol-priv.h
index 6211ee22a..632e9338a 100644
--- a/v4l2-apps/libv4l/libv4lconvert/control/libv4lcontrol-priv.h
+++ b/v4l2-apps/libv4l/libv4lconvert/control/libv4lcontrol-priv.h
@@ -25,6 +25,7 @@
#define V4LCONTROL_SHM_SIZE 4096
#define V4LCONTROL_SUPPORTS_NEXT_CTRL 0x01
+#define V4LCONTROL_MEMORY_IS_MALLOCED 0x02
struct v4lcontrol_flags_info;
@@ -49,6 +50,15 @@ struct v4lcontrol_flags_info {
const char *product; */
int flags;
int default_gamma;
+/* Some seldom used dmi strings (for notebooks with bogus info in the board
+ entries, but usefull info elsewhere). We keep this at the end as to not
+ polute the initalizers for the normal case. */
+ /* System (product) vendor / name */
+ const char *dmi_system_vendor;
+ const char *dmi_system_name;
+ /* Board and System versions */
+ const char *dmi_board_version;
+ const char *dmi_system_version;
};
#endif