summaryrefslogtreecommitdiff
path: root/v4l2-apps/util
diff options
context:
space:
mode:
Diffstat (limited to 'v4l2-apps/util')
-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
6 files changed, 23 insertions, 21 deletions
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-09 04:52:39 +0000