From 446c315b251802b7948fbf9a07ccfac45bee2ab3 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 2 Apr 2009 16:37:41 +0200 Subject: ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support. From: Hans Verkuil Remove support for the debug call VIDIOC_INT_S_AUDIO_ROUTING from cx18 and ivtv. These internal ioctls shouldn't be exposed. These were only used through the cx18-ctl and ivtv-ctl utilities, and only when testing a new card variant. This cleanup allows the removal of this ioctl from v4l2-common.h. Priority: normal Signed-off-by: Hans Verkuil CC: Andy Walls --- v4l2-apps/util/cx18-ctl.c | 51 +---------------------------------------------- v4l2-apps/util/ivtv-ctl.c | 47 ------------------------------------------- 2 files changed, 1 insertion(+), 97 deletions(-) (limited to 'v4l2-apps/util') diff --git a/v4l2-apps/util/cx18-ctl.c b/v4l2-apps/util/cx18-ctl.c index 3d8ff385d..138f3c26a 100644 --- a/v4l2-apps/util/cx18-ctl.c +++ b/v4l2-apps/util/cx18-ctl.c @@ -52,12 +52,6 @@ #define CX18_DBGFLG_HIGHVOL (1 << 8) /* Internals copied from media/v4l2-common.h */ -struct v4l2_routing { - __u32 input; - __u32 output; -}; -#define VIDIOC_INT_S_AUDIO_ROUTING _IOW('d', 109, struct v4l2_routing) - #define VIDIOC_INT_RESET _IOW('d', 102, __u32) #define __stringify_1(x) #x @@ -80,7 +74,6 @@ enum Option { OptHelp = 'h', OptSetGPIO = 'i', OptListGPIO = 'I', - OptSetAudioRoute = 'v', OptReset = 128, OptVersion, OptLast = 256 @@ -97,7 +90,6 @@ static struct option long_options[] = { {"help", no_argument, 0, OptHelp}, {"set-gpio", required_argument, 0, OptSetGPIO}, {"list-gpio", no_argument, 0, OptListGPIO}, - {"audio-route", required_argument, 0, OptSetAudioRoute}, {"reset", required_argument, 0, OptReset}, {"version", no_argument, 0, OptVersion}, {0, 0, 0, 0} @@ -129,8 +121,6 @@ static void usage(void) printf(" show GPIO input/direction/output bits\n"); printf(" -i, --set-gpio [dir=,]val=\n"); printf(" set GPIO direction bits to and set output to \n"); - printf(" -v, --audio-route=input=,output=\n"); - printf(" set the audio input/output routing [VIDIOC_INT_S_AUDIO_ROUTING]\n"); exit(0); } @@ -250,14 +240,8 @@ int main(int argc, char **argv) char *subopts[] = { #define SUB_VAL 0 "val", -#define SUB_YUV_MODE 1 - "mode", -#define SUB_DIR 2 +#define SUB_DIR 1 "dir", -#define SUB_INPUT 3 - "input", -#define SUB_OUTPUT 4 - "output", NULL }; @@ -270,7 +254,6 @@ int main(int argc, char **argv) const char *device = "/dev/video0"; /* -d device */ int ch; int yuv_mode = 0; - struct v4l2_routing route; /* audio_route */ unsigned int gpio_out = 0x0; /* GPIO output data */ unsigned int gpio_dir = 0x0; /* GPIO direction bits */ int gpio_set_dir = 0; @@ -321,34 +304,6 @@ int main(int argc, char **argv) device = newdev; } break; - case OptSetAudioRoute: - subs = optarg; - while (*subs != '\0') { - switch (getsubopt(&subs, subopts, &value)) { - case SUB_INPUT: - if (value == NULL) { - printf - ("No value given to suboption \n"); - usage(); - } - route.input = strtol(value, 0L, 0); - break; - case SUB_OUTPUT: - if (value == NULL) { - printf - ("No value given to suboption \n"); - usage(); - } - route.output = strtol(value, 0L, 0); - break; - default: - printf - ("Invalid suboptions specified\n"); - usage(); - break; - } - } - break; case OptReset: reset = strtol(optarg, 0L, 0); break; @@ -414,10 +369,6 @@ int main(int argc, char **argv) } /* Setting Opts */ - - if (options[OptSetAudioRoute]) - doioctl(fd, VIDIOC_INT_S_AUDIO_ROUTING, &route, "VIDIOC_INT_S_AUDIO_ROUTING"); - if (options[OptSetGPIO]) { struct v4l2_dbg_register reg; diff --git a/v4l2-apps/util/ivtv-ctl.c b/v4l2-apps/util/ivtv-ctl.c index a05dcbba2..6af8fc663 100644 --- a/v4l2-apps/util/ivtv-ctl.c +++ b/v4l2-apps/util/ivtv-ctl.c @@ -56,12 +56,6 @@ #define IVTV_DBGFLG_HIGHVOL (1 << 10) /* Internals copied from media/v4l2-common.h */ -struct v4l2_routing { - __u32 input; - __u32 output; -}; -#define VIDIOC_INT_S_AUDIO_ROUTING _IOW('d', 109, struct v4l2_routing) - #define VIDIOC_INT_RESET _IOW('d', 102, __u32) #include @@ -81,7 +75,6 @@ enum Option { OptListGPIO = 'I', OptPassThrough = 'K', OptFrameSync = 'k', - OptSetAudioRoute = 'v', OptReset = 128, OptSetYuvMode, OptGetYuvMode, @@ -106,7 +99,6 @@ static struct option long_options[] = { {"list-gpio", no_argument, 0, OptListGPIO}, {"passthrough", required_argument, 0, OptPassThrough}, {"sync", no_argument, 0, OptFrameSync}, - {"audio-route", required_argument, 0, OptSetAudioRoute}, {"reset", required_argument, 0, OptReset}, {"get-yuv-mode", no_argument, 0, OptGetYuvMode}, {"set-yuv-mode", required_argument, 0, OptSetYuvMode}, @@ -167,8 +159,6 @@ static void usage(void) printf(" -i, --set-gpio [dir=,]val=\n"); printf(" set GPIO direction bits to and set output to \n"); printf(" -k, --sync test vsync's capabilities [VIDEO_GET_EVENT]\n"); - printf(" -v, --audio-route=input=,output=\n"); - printf(" set the audio input/output routing [VIDIOC_INT_S_AUDIO_ROUTING]\n"); exit(0); } @@ -330,10 +320,6 @@ int main(int argc, char **argv) "mode", #define SUB_DIR 2 "dir", -#define SUB_INPUT 3 - "input", -#define SUB_OUTPUT 4 - "output", NULL }; @@ -346,7 +332,6 @@ int main(int argc, char **argv) const char *device = "/dev/video0"; /* -d device */ int ch; int yuv_mode = 0; - struct v4l2_routing route; /* audio_route */ unsigned short gpio_out = 0x0; /* GPIO output data */ unsigned short gpio_dir = 0x0; /* GPIO direction bits */ int gpio_set_dir = 0; @@ -424,34 +409,6 @@ int main(int argc, char **argv) device = newdev; } break; - case OptSetAudioRoute: - subs = optarg; - while (*subs != '\0') { - switch (getsubopt(&subs, subopts, &value)) { - case SUB_INPUT: - if (value == NULL) { - printf - ("No value given to suboption \n"); - usage(); - } - route.input = strtol(value, 0L, 0); - break; - case SUB_OUTPUT: - if (value == NULL) { - printf - ("No value given to suboption \n"); - usage(); - } - route.output = strtol(value, 0L, 0); - break; - default: - printf - ("Invalid suboptions specified\n"); - usage(); - break; - } - } - break; case OptReset: reset = strtol(optarg, 0L, 0); break; @@ -529,10 +486,6 @@ int main(int argc, char **argv) /* Setting Opts */ - if (options[OptSetAudioRoute]) - doioctl(fd, VIDIOC_INT_S_AUDIO_ROUTING, &route, - "VIDIOC_INT_S_AUDIO_ROUTING"); - if (options[OptFrameSync]) { printf("ioctl: VIDEO_GET_EVENT\n"); -- cgit v1.2.3