summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--v4l2-apps/Make.rules2
-rw-r--r--v4l2-apps/test/capture_example.c328
-rw-r--r--v4l2-apps/util/Makefile6
-rw-r--r--v4l2-apps/util/em28xx-dbg.h2
-rw-r--r--v4l2-apps/util/qv4l2/general-tab.cpp8
-rw-r--r--v4l2-apps/util/v4l-board-dbg.h2
-rw-r--r--v4l2-apps/util/v4l2-ctl.cpp16
-rw-r--r--v4l2-apps/util/v4l2-dbg.cpp10
8 files changed, 173 insertions, 201 deletions
diff --git a/v4l2-apps/Make.rules b/v4l2-apps/Make.rules
index d1b013317..5e471abcd 100644
--- a/v4l2-apps/Make.rules
+++ b/v4l2-apps/Make.rules
@@ -35,7 +35,7 @@ else
@$(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(filter %.o %.c,$^) $(LOADLIBES) $(LDLIBS) -o $@
%.so:
@echo LD $@
- @$(LD) -shared -o $@ $^
+ @$(CC) -shared -o $@ $^
%.a:
@echo AR $@
@$(AR) rcs $@ $^
diff --git a/v4l2-apps/test/capture_example.c b/v4l2-apps/test/capture_example.c
index bbb0c4e57..b2260b05f 100644
--- a/v4l2-apps/test/capture_example.c
+++ b/v4l2-apps/test/capture_example.c
@@ -27,7 +27,7 @@
#include <linux/videodev2.h>
-#define CLEAR(x) memset (&(x), 0, sizeof (x))
+#define CLEAR(x) memset(&(x), 0, sizeof(x))
typedef enum {
IO_METHOD_READ,
@@ -47,49 +47,43 @@ struct buffer * buffers = NULL;
static unsigned int n_buffers = 0;
static int out_buf = 0;
-static void
-errno_exit (const char * s)
+static void errno_exit(const char *s)
{
- fprintf (stderr, "%s error %d, %s\n",
- s, errno, strerror (errno));
+ fprintf(stderr, "%s error %d, %s\n",
+ s, errno, strerror(errno));
- exit (EXIT_FAILURE);
+ exit(EXIT_FAILURE);
}
-static int
-xioctl (int fd,
- int request,
- void * arg)
+static int xioctl(int fh, int request, void *arg)
{
int r;
- do r = ioctl (fd, request, arg);
- while (-1 == r && EINTR == errno);
+ do {
+ r = ioctl(fh, request, arg);
+ } while (-1 == r && EINTR == errno);
return r;
}
-static void
-process_image (const void * p,
- int size)
+static void process_image(const void *p, int size)
{
if (!out_buf)
- fputc ('.', stdout);
+ fputc('.', stdout);
else
- fwrite (p, size, 1, stdout);
+ fwrite(p, size, 1, stdout);
- fflush (stdout);
+ fflush(stdout);
}
-static int
-read_frame (void)
+static int read_frame(void)
{
struct v4l2_buffer buf;
unsigned int i;
switch (io) {
case IO_METHOD_READ:
- if (-1 == read (fd, buffers[0].start, buffers[0].length)) {
+ if (-1 == read(fd, buffers[0].start, buffers[0].length)) {
switch (errno) {
case EAGAIN:
return 0;
@@ -100,21 +94,21 @@ read_frame (void)
/* fall through */
default:
- errno_exit ("read");
+ errno_exit("read");
}
}
- process_image (buffers[0].start, buffers[0].length);
+ process_image(buffers[0].start, buffers[0].length);
break;
case IO_METHOD_MMAP:
- CLEAR (buf);
+ CLEAR(buf);
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP;
- if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) {
+ if (-1 == xioctl(fd, VIDIOC_DQBUF, &buf)) {
switch (errno) {
case EAGAIN:
return 0;
@@ -125,26 +119,26 @@ read_frame (void)
/* fall through */
default:
- errno_exit ("VIDIOC_DQBUF");
+ errno_exit("VIDIOC_DQBUF");
}
}
- assert (buf.index < n_buffers);
+ assert(buf.index < n_buffers);
- process_image (buffers[buf.index].start, buffers[buf.index].length);
+ process_image(buffers[buf.index].start, buffers[buf.index].length);
- if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
- errno_exit ("VIDIOC_QBUF");
+ if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
+ errno_exit("VIDIOC_QBUF");
break;
case IO_METHOD_USERPTR:
- CLEAR (buf);
+ CLEAR(buf);
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_USERPTR;
- if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) {
+ if (-1 == xioctl(fd, VIDIOC_DQBUF, &buf)) {
switch (errno) {
case EAGAIN:
return 0;
@@ -155,7 +149,7 @@ read_frame (void)
/* fall through */
default:
- errno_exit ("VIDIOC_DQBUF");
+ errno_exit("VIDIOC_DQBUF");
}
}
@@ -164,12 +158,12 @@ read_frame (void)
&& buf.length == buffers[i].length)
break;
- assert (i < n_buffers);
+ assert(i < n_buffers);
- process_image ((void *) buf.m.userptr, buf.length);
+ process_image((void *) buf.m.userptr, buf.length);
- if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
- errno_exit ("VIDIOC_QBUF");
+ if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
+ errno_exit("VIDIOC_QBUF");
break;
}
@@ -177,8 +171,7 @@ read_frame (void)
return 1;
}
-static void
-mainloop (void)
+static void mainloop(void)
{
unsigned int count;
@@ -190,28 +183,28 @@ mainloop (void)
struct timeval tv;
int r;
- FD_ZERO (&fds);
- FD_SET (fd, &fds);
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
/* Timeout. */
tv.tv_sec = 2;
tv.tv_usec = 0;
- r = select (fd + 1, &fds, NULL, NULL, &tv);
+ r = select(fd + 1, &fds, NULL, NULL, &tv);
if (-1 == r) {
if (EINTR == errno)
continue;
- errno_exit ("select");
+ errno_exit("select");
}
if (0 == r) {
- fprintf (stderr, "select timeout\n");
- exit (EXIT_FAILURE);
+ fprintf(stderr, "select timeout\n");
+ exit(EXIT_FAILURE);
}
- if (read_frame ())
+ if (read_frame())
break;
/* EAGAIN - continue select loop. */
@@ -219,8 +212,7 @@ mainloop (void)
}
}
-static void
-stop_capturing (void)
+static void stop_capturing(void)
{
enum v4l2_buf_type type;
@@ -233,15 +225,14 @@ stop_capturing (void)
case IO_METHOD_USERPTR:
type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if (-1 == xioctl (fd, VIDIOC_STREAMOFF, &type))
- errno_exit ("VIDIOC_STREAMOFF");
+ if (-1 == xioctl(fd, VIDIOC_STREAMOFF, &type))
+ errno_exit("VIDIOC_STREAMOFF");
break;
}
}
-static void
-start_capturing (void)
+static void start_capturing(void)
{
unsigned int i;
enum v4l2_buf_type type;
@@ -255,20 +246,20 @@ start_capturing (void)
for (i = 0; i < n_buffers; ++i) {
struct v4l2_buffer buf;
- CLEAR (buf);
+ CLEAR(buf);
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP;
buf.index = i;
- if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
- errno_exit ("VIDIOC_QBUF");
+ if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
+ errno_exit("VIDIOC_QBUF");
}
type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if (-1 == xioctl (fd, VIDIOC_STREAMON, &type))
- errno_exit ("VIDIOC_STREAMON");
+ if (-1 == xioctl(fd, VIDIOC_STREAMON, &type))
+ errno_exit("VIDIOC_STREAMON");
break;
@@ -276,7 +267,7 @@ start_capturing (void)
for (i = 0; i < n_buffers; ++i) {
struct v4l2_buffer buf;
- CLEAR (buf);
+ CLEAR(buf);
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_USERPTR;
@@ -284,163 +275,158 @@ start_capturing (void)
buf.m.userptr = (unsigned long) buffers[i].start;
buf.length = buffers[i].length;
- if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
- errno_exit ("VIDIOC_QBUF");
+ if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
+ errno_exit("VIDIOC_QBUF");
}
type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if (-1 == xioctl (fd, VIDIOC_STREAMON, &type))
- errno_exit ("VIDIOC_STREAMON");
+ if (-1 == xioctl(fd, VIDIOC_STREAMON, &type))
+ errno_exit("VIDIOC_STREAMON");
break;
}
}
-static void
-uninit_device (void)
+static void uninit_device(void)
{
unsigned int i;
switch (io) {
case IO_METHOD_READ:
- free (buffers[0].start);
+ free(buffers[0].start);
break;
case IO_METHOD_MMAP:
for (i = 0; i < n_buffers; ++i)
- if (-1 == munmap (buffers[i].start, buffers[i].length))
- errno_exit ("munmap");
+ if (-1 == munmap(buffers[i].start, buffers[i].length))
+ errno_exit("munmap");
break;
case IO_METHOD_USERPTR:
for (i = 0; i < n_buffers; ++i)
- free (buffers[i].start);
+ free(buffers[i].start);
break;
}
- free (buffers);
+ free(buffers);
}
-static void
-init_read (unsigned int buffer_size)
+static void init_read(unsigned int buffer_size)
{
- buffers = calloc (1, sizeof (*buffers));
+ buffers = calloc(1, sizeof(*buffers));
if (!buffers) {
- fprintf (stderr, "Out of memory\n");
- exit (EXIT_FAILURE);
+ fprintf(stderr, "Out of memory\n");
+ exit(EXIT_FAILURE);
}
buffers[0].length = buffer_size;
- buffers[0].start = malloc (buffer_size);
+ buffers[0].start = malloc(buffer_size);
if (!buffers[0].start) {
- fprintf (stderr, "Out of memory\n");
- exit (EXIT_FAILURE);
+ fprintf(stderr, "Out of memory\n");
+ exit(EXIT_FAILURE);
}
}
-static void
-init_mmap (void)
+static void init_mmap(void)
{
struct v4l2_requestbuffers req;
- CLEAR (req);
+ CLEAR(req);
req.count = 4;
req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
req.memory = V4L2_MEMORY_MMAP;
- if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) {
+ if (-1 == xioctl(fd, VIDIOC_REQBUFS, &req)) {
if (EINVAL == errno) {
- fprintf (stderr, "%s does not support "
+ fprintf(stderr, "%s does not support "
"memory mapping\n", dev_name);
- exit (EXIT_FAILURE);
+ exit(EXIT_FAILURE);
} else {
- errno_exit ("VIDIOC_REQBUFS");
+ errno_exit("VIDIOC_REQBUFS");
}
}
if (req.count < 2) {
- fprintf (stderr, "Insufficient buffer memory on %s\n",
+ fprintf(stderr, "Insufficient buffer memory on %s\n",
dev_name);
- exit (EXIT_FAILURE);
+ exit(EXIT_FAILURE);
}
- buffers = calloc (req.count, sizeof (*buffers));
+ buffers = calloc(req.count, sizeof(*buffers));
if (!buffers) {
- fprintf (stderr, "Out of memory\n");
- exit (EXIT_FAILURE);
+ fprintf(stderr, "Out of memory\n");
+ exit(EXIT_FAILURE);
}
for (n_buffers = 0; n_buffers < req.count; ++n_buffers) {
struct v4l2_buffer buf;
- CLEAR (buf);
+ CLEAR(buf);
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP;
buf.index = n_buffers;
- if (-1 == xioctl (fd, VIDIOC_QUERYBUF, &buf))
- errno_exit ("VIDIOC_QUERYBUF");
+ if (-1 == xioctl(fd, VIDIOC_QUERYBUF, &buf))
+ errno_exit("VIDIOC_QUERYBUF");
buffers[n_buffers].length = buf.length;
buffers[n_buffers].start =
- mmap (NULL /* start anywhere */,
+ mmap(NULL /* start anywhere */,
buf.length,
PROT_READ | PROT_WRITE /* required */,
MAP_SHARED /* recommended */,
fd, buf.m.offset);
if (MAP_FAILED == buffers[n_buffers].start)
- errno_exit ("mmap");
+ errno_exit("mmap");
}
}
-static void
-init_userp (unsigned int buffer_size)
+static void init_userp(unsigned int buffer_size)
{
struct v4l2_requestbuffers req;
- CLEAR (req);
+ CLEAR(req);
- req.count = 4;
- req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- req.memory = V4L2_MEMORY_USERPTR;
+ req.count = 4;
+ req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ req.memory = V4L2_MEMORY_USERPTR;
- if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) {
+ if (-1 == xioctl(fd, VIDIOC_REQBUFS, &req)) {
if (EINVAL == errno) {
- fprintf (stderr, "%s does not support "
+ fprintf(stderr, "%s does not support "
"user pointer i/o\n", dev_name);
- exit (EXIT_FAILURE);
+ exit(EXIT_FAILURE);
} else {
- errno_exit ("VIDIOC_REQBUFS");
+ errno_exit("VIDIOC_REQBUFS");
}
}
- buffers = calloc (4, sizeof (*buffers));
+ buffers = calloc(4, sizeof(*buffers));
if (!buffers) {
- fprintf (stderr, "Out of memory\n");
- exit (EXIT_FAILURE);
+ fprintf(stderr, "Out of memory\n");
+ exit(EXIT_FAILURE);
}
for (n_buffers = 0; n_buffers < 4; ++n_buffers) {
buffers[n_buffers].length = buffer_size;
- buffers[n_buffers].start = malloc (buffer_size);
+ buffers[n_buffers].start = malloc(buffer_size);
if (!buffers[n_buffers].start) {
- fprintf (stderr, "Out of memory\n");
- exit (EXIT_FAILURE);
+ fprintf(stderr, "Out of memory\n");
+ exit(EXIT_FAILURE);
}
}
}
-static void
-init_device (void)
+static void init_device(void)
{
struct v4l2_capability cap;
struct v4l2_cropcap cropcap;
@@ -448,28 +434,28 @@ init_device (void)
struct v4l2_format fmt;
unsigned int min;
- if (-1 == xioctl (fd, VIDIOC_QUERYCAP, &cap)) {
+ if (-1 == xioctl(fd, VIDIOC_QUERYCAP, &cap)) {
if (EINVAL == errno) {
- fprintf (stderr, "%s is no V4L2 device\n",
+ fprintf(stderr, "%s is no V4L2 device\n",
dev_name);
- exit (EXIT_FAILURE);
+ exit(EXIT_FAILURE);
} else {
- errno_exit ("VIDIOC_QUERYCAP");
+ errno_exit("VIDIOC_QUERYCAP");
}
}
if (!(cap.capabilities & V4L2_CAP_VIDEO_CAPTURE)) {
- fprintf (stderr, "%s is no video capture device\n",
+ fprintf(stderr, "%s is no video capture device\n",
dev_name);
- exit (EXIT_FAILURE);
+ exit(EXIT_FAILURE);
}
switch (io) {
case IO_METHOD_READ:
if (!(cap.capabilities & V4L2_CAP_READWRITE)) {
- fprintf (stderr, "%s does not support read i/o\n",
+ fprintf(stderr, "%s does not support read i/o\n",
dev_name);
- exit (EXIT_FAILURE);
+ exit(EXIT_FAILURE);
}
break;
@@ -477,9 +463,9 @@ init_device (void)
case IO_METHOD_MMAP:
case IO_METHOD_USERPTR:
if (!(cap.capabilities & V4L2_CAP_STREAMING)) {
- fprintf (stderr, "%s does not support streaming i/o\n",
+ fprintf(stderr, "%s does not support streaming i/o\n",
dev_name);
- exit (EXIT_FAILURE);
+ exit(EXIT_FAILURE);
}
break;
@@ -489,15 +475,15 @@ init_device (void)
/* Select video input, video standard and tune here. */
- CLEAR (cropcap);
+ CLEAR(cropcap);
cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if (0 == xioctl (fd, VIDIOC_CROPCAP, &cropcap)) {
+ if (0 == xioctl(fd, VIDIOC_CROPCAP, &cropcap)) {
crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
crop.c = cropcap.defrect; /* reset to default */
- if (-1 == xioctl (fd, VIDIOC_S_CROP, &crop)) {
+ if (-1 == xioctl(fd, VIDIOC_S_CROP, &crop)) {
switch (errno) {
case EINVAL:
/* Cropping not supported. */
@@ -512,7 +498,7 @@ init_device (void)
}
- CLEAR (fmt);
+ CLEAR(fmt);
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
fmt.fmt.pix.width = 640;
@@ -520,8 +506,8 @@ init_device (void)
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
- if (-1 == xioctl (fd, VIDIOC_S_FMT, &fmt))
- errno_exit ("VIDIOC_S_FMT");
+ if (-1 == xioctl(fd, VIDIOC_S_FMT, &fmt))
+ errno_exit("VIDIOC_S_FMT");
/* Note VIDIOC_S_FMT may change width and height. */
@@ -535,59 +521,54 @@ init_device (void)
switch (io) {
case IO_METHOD_READ:
- init_read (fmt.fmt.pix.sizeimage);
+ init_read(fmt.fmt.pix.sizeimage);
break;
case IO_METHOD_MMAP:
- init_mmap ();
+ init_mmap();
break;
case IO_METHOD_USERPTR:
- init_userp (fmt.fmt.pix.sizeimage);
+ init_userp(fmt.fmt.pix.sizeimage);
break;
}
}
-static void
-close_device (void)
+static void close_device(void)
{
- if (-1 == close (fd))
- errno_exit ("close");
+ if (-1 == close(fd))
+ errno_exit("close");
fd = -1;
}
-static void
-open_device (void)
+static void open_device(void)
{
struct stat st;
- if (-1 == stat (dev_name, &st)) {
- fprintf (stderr, "Cannot identify '%s': %d, %s\n",
- dev_name, errno, strerror (errno));
- exit (EXIT_FAILURE);
+ if (-1 == stat(dev_name, &st)) {
+ fprintf(stderr, "Cannot identify '%s': %d, %s\n",
+ dev_name, errno, strerror(errno));
+ exit(EXIT_FAILURE);
}
- if (!S_ISCHR (st.st_mode)) {
- fprintf (stderr, "%s is no device\n", dev_name);
- exit (EXIT_FAILURE);
+ if (!S_ISCHR(st.st_mode)) {
+ fprintf(stderr, "%s is no device\n", dev_name);
+ exit(EXIT_FAILURE);
}
- fd = open (dev_name, O_RDWR /* required */ | O_NONBLOCK, 0);
+ fd = open(dev_name, O_RDWR /* required */ | O_NONBLOCK, 0);
if (-1 == fd) {
- fprintf (stderr, "Cannot open '%s': %d, %s\n",
- dev_name, errno, strerror (errno));
- exit (EXIT_FAILURE);
+ fprintf(stderr, "Cannot open '%s': %d, %s\n",
+ dev_name, errno, strerror(errno));
+ exit(EXIT_FAILURE);
}
}
-static void
-usage (FILE * fp,
- int argc,
- char ** argv)
+static void usage(FILE *fp, int argc, char **argv)
{
- fprintf (fp,
+ fprintf(fp,
"Usage: %s [options]\n\n"
"Options:\n"
"-d | --device name Video device name [/dev/video]\n"
@@ -613,19 +594,17 @@ long_options [] = {
{ 0, 0, 0, 0 }
};
-int
-main (int argc,
- char ** argv)
+int main(int argc, char **argv)
{
dev_name = "/dev/video";
for (;;) {
- int index;
+ int idx;
int c;
- c = getopt_long (argc, argv,
+ c = getopt_long(argc, argv,
short_options, long_options,
- &index);
+ &idx);
if (-1 == c)
break;
@@ -639,8 +618,8 @@ main (int argc,
break;
case 'h':
- usage (stdout, argc, argv);
- exit (EXIT_SUCCESS);
+ usage(stdout, argc, argv);
+ exit(EXIT_SUCCESS);
case 'm':
io = IO_METHOD_MMAP;
@@ -659,26 +638,17 @@ main (int argc,
break;
default:
- usage (stderr, argc, argv);
- exit (EXIT_FAILURE);
+ usage(stderr, argc, argv);
+ exit(EXIT_FAILURE);
}
}
- open_device ();
-
- init_device ();
-
- start_capturing ();
-
- mainloop ();
-
- stop_capturing ();
-
- uninit_device ();
-
- close_device ();
-
- exit (EXIT_SUCCESS);
-
+ open_device();
+ init_device();
+ start_capturing();
+ mainloop();
+ stop_capturing();
+ uninit_device();
+ close_device();
return 0;
}
diff --git a/v4l2-apps/util/Makefile b/v4l2-apps/util/Makefile
index 873553a95..41d4712e1 100644
--- a/v4l2-apps/util/Makefile
+++ b/v4l2-apps/util/Makefile
@@ -22,6 +22,8 @@ clean::
-if [ -f qv4l2/Makefile ]; then make -C qv4l2 $@; fi
-rm -f qv4l2/qv4l2 qv4l2/Makefile
make -C xc3028-firmware $@
+ rm -f v4l2-driverids.cpp v4l2-chipids.cpp
+ rm -rf keycodes parse.h keytable
qv4l2:
if [ ! -f qv4l2/Makefile ]; then (cd qv4l2; qmake); fi
@@ -41,7 +43,7 @@ parse.h: $(KERNEL_DIR)/include/linux/input.h
@echo -en "struct parse_key {\n\tchar *name;\n\tunsigned int value;\n} " >parse.h
@echo -en "keynames[] = {\n" >>parse.h
- @more $(KERNEL_DIR)/linux/input.h |perl -n \
+ @more $(KERNEL_DIR)/include/linux/input.h |perl -n \
-e 'if (m/^\#define\s+(KEY_[^\s]+)\s+(0x[\d\w]+|[\d]+)/) ' \
-e '{ printf "\t{\"%s\", %s},\n",$$1,$$2; }' \
-e 'if (m/^\#define\s+(BTN_[^\s]+)\s+(0x[\d\w]+|[\d]+)/) ' \
@@ -50,7 +52,7 @@ parse.h: $(KERNEL_DIR)/include/linux/input.h
@echo -en "\t{ NULL, 0}\n};\n" >>parse.h
keytables:
- -mkdir keycodes
+ -mkdir -p keycodes
./gen_keytables.pl ../../linux/drivers/media/common/ir-keymaps.c
keytable: keytable.c parse.h keytables
diff --git a/v4l2-apps/util/em28xx-dbg.h b/v4l2-apps/util/em28xx-dbg.h
index d2edc60bc..3d3600c44 100644
--- a/v4l2-apps/util/em28xx-dbg.h
+++ b/v4l2-apps/util/em28xx-dbg.h
@@ -81,4 +81,4 @@ static struct board_regs em28xx_regs[] = {
{0x02, EM28XX_PREFIX "MASTER_AC97", 1},
{0x10, EM28XX_PREFIX "LINE_IN_AC97", 1},
{0x14, EM28XX_PREFIX "VIDEO_AC97", 1},
-}; \ No newline at end of file
+};
diff --git a/v4l2-apps/util/qv4l2/general-tab.cpp b/v4l2-apps/util/qv4l2/general-tab.cpp
index d7f5a98d2..3b9ad2e5b 100644
--- a/v4l2-apps/util/qv4l2/general-tab.cpp
+++ b/v4l2-apps/util/qv4l2/general-tab.cpp
@@ -42,23 +42,23 @@ GeneralTab::GeneralTab(const char *device, int _fd, int n, QWidget *parent) :
memset(&querycap, 0, sizeof(querycap));
if (ioctl(fd, VIDIOC_QUERYCAP, &querycap) >=0) {
QLabel *l1 = new QLabel("Device:", this);
- QLabel *l1t = new QLabel(device, this);
+ new QLabel(device, this);
l1->setAlignment(Qt::AlignRight);
QLabel *l2 = new QLabel("Driver:", this);
l2->setAlignment(Qt::AlignRight);
- QLabel *l2t = new QLabel((char *)querycap.driver, this);
+ new QLabel((char *)querycap.driver, this);
QLabel *l3 = new QLabel("Card:", this);
l3->setAlignment(Qt::AlignRight);
- QLabel *l3t = new QLabel((char *)querycap.card, this);
+ new QLabel((char *)querycap.card, this);
QLabel *l4 = new QLabel("Bus:", this);
l4->setAlignment(Qt::AlignRight);
- QLabel *l4t = new QLabel((char *)querycap.bus_info, this);
+ new QLabel((char *)querycap.bus_info, this);
}
memset(&tuner, 0, sizeof(tuner));
diff --git a/v4l2-apps/util/v4l-board-dbg.h b/v4l2-apps/util/v4l-board-dbg.h
index 5d040812d..d7e7a9ef3 100644
--- a/v4l2-apps/util/v4l-board-dbg.h
+++ b/v4l2-apps/util/v4l-board-dbg.h
@@ -21,4 +21,4 @@ struct board_regs {
char *name;
int size;
};
-#endif \ No newline at end of file
+#endif
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp
index 57d98fc13..3e56e63a1 100644
--- a/v4l2-apps/util/v4l2-ctl.cpp
+++ b/v4l2-apps/util/v4l2-ctl.cpp
@@ -1019,9 +1019,9 @@ static int doioctl(int fd, int request, void *parm, const char *name)
return retVal;
}
-static int parse_subopt(char **subs, char * const *subopts, char **value)
+static int parse_subopt(char **subs, const char * const *subopts, char **value)
{
- int opt = getsubopt(subs, subopts, value);
+ int opt = getsubopt(subs, (char * const *)subopts, value);
if (opt == -1) {
fprintf(stderr, "Invalid suboptions specified\n");
@@ -1094,7 +1094,7 @@ static void parse_crop(char *optarg, unsigned int &set_crop, v4l2_rect &vcrop)
char *subs = optarg;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char *const subopts[] = {
"left",
"top",
"width",
@@ -1230,7 +1230,7 @@ int main(int argc, char **argv)
case OptSetVideoFormat:
subs = optarg;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char *const subopts[] = {
"width",
"height",
NULL
@@ -1251,7 +1251,7 @@ int main(int argc, char **argv)
case OptSetVideoOutFormat:
subs = optarg;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char *const subopts[] = {
"width",
"height",
NULL
@@ -1272,7 +1272,7 @@ int main(int argc, char **argv)
case OptSetOutputOverlayFormat:
subs = optarg;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char *const subopts[] = {
"chromakey",
"global_alpha",
NULL
@@ -1293,7 +1293,7 @@ int main(int argc, char **argv)
case OptSetFBuf:
subs = optarg;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char *const subopts[] = {
"chromakey",
"global_alpha",
"local_alpha",
@@ -1428,7 +1428,7 @@ int main(int argc, char **argv)
fmt->fmt.sliced.service_set = 0;
subs = optarg;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char *const subopts[] = {
"off",
"teletext",
"cc",
diff --git a/v4l2-apps/util/v4l2-dbg.cpp b/v4l2-apps/util/v4l2-dbg.cpp
index 8323f2120..0ffd9de64 100644
--- a/v4l2-apps/util/v4l2-dbg.cpp
+++ b/v4l2-apps/util/v4l2-dbg.cpp
@@ -245,9 +245,9 @@ static int doioctl(int fd, int request, void *parm, const char *name)
return retVal;
}
-static int parse_subopt(char **subs, char * const *subopts, char **value)
+static int parse_subopt(char **subs, const char * const *subopts, char **value)
{
- int opt = getsubopt(subs, subopts, value);
+ int opt = getsubopt(subs, (char * const *)subopts, value);
if (opt == -1) {
fprintf(stderr, "Invalid suboptions specified\n");
@@ -322,7 +322,7 @@ int main(int argc, char **argv)
subs = optarg;
set_reg.match_type = V4L2_CHIP_MATCH_I2C_DRIVER;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char * const subopts[] = {
"type",
"chip",
"reg",
@@ -352,7 +352,7 @@ int main(int argc, char **argv)
subs = optarg;
get_reg.match_type = V4L2_CHIP_MATCH_I2C_DRIVER;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char * const subopts[] = {
"type",
"chip",
"min",
@@ -382,7 +382,7 @@ int main(int argc, char **argv)
subs = optarg;
set_reg.match_type = V4L2_CHIP_MATCH_I2C_DRIVER;
while (*subs != '\0') {
- static char *const subopts[] = {
+ static const char *const subopts[] = {
"type",
"chip",
NULL
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 08:58:38 +0000