diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 10:17:59 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 10:17:59 -0200 |
| commit | 3f85abb813f1ad7454fb7a2f8e2998373571fe39 (patch) | |
| tree | cf89a87206ea42719ee69f209d43a704034b2c22 /v4l2-apps/test/ioctl-test.c | |
| parent | b0ab681e920adac28d099cb1ec192d2ada2c160f (diff) | |
| parent | b50e38700408ec0bb073fc56ade123a1305842b6 (diff) | |
| download | mediapointer-dvb-s2-3f85abb813f1ad7454fb7a2f8e2998373571fe39.tar.gz mediapointer-dvb-s2-3f85abb813f1ad7454fb7a2f8e2998373571fe39.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-apps/test/ioctl-test.c')
| -rw-r--r-- | v4l2-apps/test/ioctl-test.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/v4l2-apps/test/ioctl-test.c b/v4l2-apps/test/ioctl-test.c index 37a0e2374..f9ac1cad5 100644 --- a/v4l2-apps/test/ioctl-test.c +++ b/v4l2-apps/test/ioctl-test.c @@ -88,8 +88,9 @@ union v4l_parms { struct v4l2_frmivalenum p_v4l2_frmivalenum; struct v4l2_enc_idx p_v4l2_enc_idx; struct v4l2_encoder_cmd p_v4l2_encoder_cmd; - struct v4l2_register p_v4l2_register; - struct v4l2_chip_ident p_v4l2_chip_ident; + struct v4l2_dbg_register p_v4l2_dbg_register; + struct v4l2_dbg_chip_ident p_v4l2_dbg_chip_ident; + struct v4l2_chip_ident_old p_v4l2_chip_ident_old; struct v4l2_hw_freq_seek p_v4l2_hw_freq_seek; }; @@ -195,7 +196,8 @@ static const struct { ioc(VIDIOC_TRY_ENCODER_CMD), /* struct v4l2_encoder_cmd */ ioc(VIDIOC_DBG_S_REGISTER), /* struct v4l2_register */ ioc(VIDIOC_DBG_G_REGISTER), /* struct v4l2_register */ - ioc(VIDIOC_G_CHIP_IDENT), /* struct v4l2_chip_ident */ + ioc(VIDIOC_DBG_G_CHIP_IDENT), /* struct v4l2_dbg_chip_ident */ + ioc(VIDIOC_G_CHIP_IDENT_OLD), /* struct v4l2_chip_ident_old */ ioc(VIDIOC_S_HW_FREQ_SEEK), /* struct v4l2_hw_freq_seek */ #ifdef __OLD_VIDIOC_ ioc(VIDIOC_OVERLAY_OLD), /* int */ |