diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-02-14 11:12:43 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-02-14 11:12:43 +0100 |
| commit | f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8 (patch) | |
| tree | 19db0887def3bf12dd92679fc773ba53fc100be6 /v4l2-apps/test | |
| parent | d0ee609e50f6eba78db4783e1374311be2e38ea5 (diff) | |
| parent | adff0f37dc0f0ab48850eaad267223c634e975a2 (diff) | |
| download | mediapointer-dvb-s2-f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8.tar.gz mediapointer-dvb-s2-f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'v4l2-apps/test')
| -rw-r--r-- | v4l2-apps/test/Makefile | 8 | ||||
| -rw-r--r-- | v4l2-apps/test/capture-example.c (renamed from v4l2-apps/test/capture_example.c) | 10 | ||||
| -rw-r--r-- | v4l2-apps/test/driver-test.c | 2 | ||||
| -rw-r--r-- | v4l2-apps/test/parse-sniffusb2.pl (renamed from v4l2-apps/test/parse_sniffusb2.pl) | 0 |
4 files changed, 9 insertions, 11 deletions
diff --git a/v4l2-apps/test/Makefile b/v4l2-apps/test/Makefile index a996c0baf..d118b9210 100644 --- a/v4l2-apps/test/Makefile +++ b/v4l2-apps/test/Makefile @@ -10,7 +10,7 @@ binaries = ioctl-test \ driver-test \ pixfmt-test \ stress-buffer \ - capture_example + capture-example .PHONY: all clean install @@ -21,10 +21,10 @@ clean:: install: -../lib/libv4l2.a: ../lib/v4l2_driver.c ../lib/frequencies.c - make -C ../lib libv4l2.a +../libv4l2util/libv4l2util.a: ../libv4l2util/v4l2_driver.c ../libv4l2util/frequencies.c + make -C ../libv4l2util libv4l2util.a -driver-test: driver-test.o ../lib/libv4l2.a +driver-test: driver-test.o ../libv4l2util/libv4l2util.a pixfmt-test: pixfmt-test.o $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lX11 diff --git a/v4l2-apps/test/capture_example.c b/v4l2-apps/test/capture-example.c index 0cd129885..9d5b0d6ce 100644 --- a/v4l2-apps/test/capture_example.c +++ b/v4l2-apps/test/capture-example.c @@ -23,17 +23,15 @@ #include <sys/mman.h> #include <sys/ioctl.h> -#include <asm/types.h> /* for videodev2.h */ - #include <linux/videodev2.h> #define CLEAR(x) memset(&(x), 0, sizeof(x)) -typedef enum { +enum io_method { IO_METHOD_READ, IO_METHOD_MMAP, IO_METHOD_USERPTR, -} io_method; +}; struct buffer { void *start; @@ -41,7 +39,7 @@ struct buffer { }; static char *dev_name; -static io_method io = IO_METHOD_MMAP; +static enum io_method io = IO_METHOD_MMAP; static int fd = -1; struct buffer *buffers; static unsigned int n_buffers; @@ -570,7 +568,7 @@ static void usage(FILE *fp, int argc, char **argv) "-f | --format Force format to 640x480 YUYV\n" "-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:"; diff --git a/v4l2-apps/test/driver-test.c b/v4l2-apps/test/driver-test.c index e4c16ed54..1f722e198 100644 --- a/v4l2-apps/test/driver-test.c +++ b/v4l2-apps/test/driver-test.c @@ -14,7 +14,7 @@ GNU General Public License for more details. */ -#include "../lib/v4l2_driver.h" +#include "../libv4l2util/v4l2_driver.h" #include <stdio.h> #include <string.h> #include <unistd.h> diff --git a/v4l2-apps/test/parse_sniffusb2.pl b/v4l2-apps/test/parse-sniffusb2.pl index 34406b0ea..34406b0ea 100644 --- a/v4l2-apps/test/parse_sniffusb2.pl +++ b/v4l2-apps/test/parse-sniffusb2.pl |