From c301075386ff72d4b8e1672d8cdad2d815a9d4b0 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 1 Nov 2022 13:45:12 +0000 Subject: src: Move main to src Move the main uvc-gadget application to src/ to make it clear there is a separation between library and application code. Reviewed-by: Daniel Scally Signed-off-by: Kieran Bingham --- CMakeLists.txt | 5 +- main.c | 134 ----------------------------------------------------- src/CMakeLists.txt | 3 ++ src/main.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 138 insertions(+), 138 deletions(-) delete mode 100644 main.c create mode 100644 src/CMakeLists.txt create mode 100644 src/main.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cb8c20..5291256 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,11 +7,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Werror" include_directories(${CMAKE_BINARY_DIR}/generated) add_subdirectory(lib) +add_subdirectory(src) # Generate config.h configure_file(${CMAKE_SOURCE_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/generated/config.h) - -add_executable(uvc-gadget main.c) -target_link_libraries(uvc-gadget uvcgadget) -install(TARGETS uvc-gadget DESTINATION bin) diff --git a/main.c b/main.c deleted file mode 100644 index f0f71ba..0000000 --- a/main.c +++ /dev/null @@ -1,134 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * UVC gadget test application - * - * Copyright (C) 2010-2018 Laurent Pinchart - * - * Contact: Laurent Pinchart - */ - -#include -#include -#include - -#include "configfs.h" -#include "events.h" -#include "stream.h" -#include "v4l2-source.h" - -static void usage(const char *argv0) -{ - fprintf(stderr, "Usage: %s [options] \n", argv0); - fprintf(stderr, "Available options are\n"); - fprintf(stderr, " -c device V4L2 source device\n"); - fprintf(stderr, " -i image MJPEG image\n"); - fprintf(stderr, " -h Print this help screen and exit\n"); - fprintf(stderr, "\n"); - fprintf(stderr, " UVC device instance specifier\n"); - fprintf(stderr, "\n"); - - fprintf(stderr, " For ConfigFS devices the parameter can take the form of a shortened\n"); - fprintf(stderr, " function specifier such as: 'uvc.0', or if multiple gadgets are configured, the\n"); - fprintf(stderr, " gadget name should be included to prevent ambiguity: 'g1/functions/uvc.0'.\n"); - fprintf(stderr, "\n"); - fprintf(stderr, " For legacy g_webcam UVC instances, this parameter will identify the UDC that the\n"); - fprintf(stderr, " UVC function is bound to.\n"); - fprintf(stderr, "\n"); - fprintf(stderr, " The parameter is optional, and if not provided the first UVC function on the first\n"); - fprintf(stderr, " gadget identified will be used.\n"); - fprintf(stderr, "\n"); - fprintf(stderr, "Example usage:\n"); - fprintf(stderr, " %s uvc.1\n", argv0); - fprintf(stderr, " %s g1/functions/uvc.1\n", argv0); - fprintf(stderr, "\n"); - fprintf(stderr, " %s musb-hdrc.0.auto\n", argv0); -} - -/* Necessary for and only used by signal handler. */ -static struct events *sigint_events; - -static void sigint_handler(int signal) -{ - /* Stop the main loop when the user presses CTRL-C */ - events_stop(sigint_events); -} - -int main(int argc, char *argv[]) -{ - char *function = NULL; - char *cap_device = "/dev/video1"; - struct uvc_function_config *fc; - struct uvc_stream *stream = NULL; - struct video_source *src = NULL; - struct events events; - int ret = 0; - int opt; - - while ((opt = getopt(argc, argv, "c:h")) != -1) { - switch (opt) { - case 'c': - cap_device = optarg; - break; - - case 'h': - usage(argv[0]); - return 0; - - default: - fprintf(stderr, "Invalid option '-%c'\n", opt); - usage(argv[0]); - return 1; - } - } - - if (argv[optind] != NULL) - function = argv[optind]; - - fc = configfs_parse_uvc_function(function); - if (!fc) { - printf("Failed to identify function configuration\n"); - return 1; - } - - /* - * Create the events handler. Register a signal handler for SIGINT, - * received when the user presses CTRL-C. This will allow the main loop - * to be interrupted, and resources to be freed cleanly. - */ - events_init(&events); - - sigint_events = &events; - signal(SIGINT, sigint_handler); - - /* Create and initialize a video source. */ - src = v4l2_video_source_create(cap_device); - if (src == NULL) { - ret = 1; - goto done; - } - - v4l2_video_source_init(src, &events); - - /* Create and initialise the stream. */ - stream = uvc_stream_new(fc->video); - if (stream == NULL) { - ret = 1; - goto done; - } - - uvc_stream_set_event_handler(stream, &events); - uvc_stream_set_video_source(stream, src); - uvc_stream_init_uvc(stream, fc); - - /* Main capture loop */ - events_loop(&events); - -done: - /* Cleanup */ - uvc_stream_delete(stream); - video_source_destroy(src); - events_cleanup(&events); - configfs_free_uvc_function(fc); - - return ret; -} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..9f94788 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,3 @@ +add_executable(uvc-gadget main.c) +target_link_libraries(uvc-gadget uvcgadget) +install(TARGETS uvc-gadget DESTINATION bin) diff --git a/src/main.c b/src/main.c new file mode 100644 index 0000000..f0f71ba --- /dev/null +++ b/src/main.c @@ -0,0 +1,134 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * UVC gadget test application + * + * Copyright (C) 2010-2018 Laurent Pinchart + * + * Contact: Laurent Pinchart + */ + +#include +#include +#include + +#include "configfs.h" +#include "events.h" +#include "stream.h" +#include "v4l2-source.h" + +static void usage(const char *argv0) +{ + fprintf(stderr, "Usage: %s [options] \n", argv0); + fprintf(stderr, "Available options are\n"); + fprintf(stderr, " -c device V4L2 source device\n"); + fprintf(stderr, " -i image MJPEG image\n"); + fprintf(stderr, " -h Print this help screen and exit\n"); + fprintf(stderr, "\n"); + fprintf(stderr, " UVC device instance specifier\n"); + fprintf(stderr, "\n"); + + fprintf(stderr, " For ConfigFS devices the parameter can take the form of a shortened\n"); + fprintf(stderr, " function specifier such as: 'uvc.0', or if multiple gadgets are configured, the\n"); + fprintf(stderr, " gadget name should be included to prevent ambiguity: 'g1/functions/uvc.0'.\n"); + fprintf(stderr, "\n"); + fprintf(stderr, " For legacy g_webcam UVC instances, this parameter will identify the UDC that the\n"); + fprintf(stderr, " UVC function is bound to.\n"); + fprintf(stderr, "\n"); + fprintf(stderr, " The parameter is optional, and if not provided the first UVC function on the first\n"); + fprintf(stderr, " gadget identified will be used.\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "Example usage:\n"); + fprintf(stderr, " %s uvc.1\n", argv0); + fprintf(stderr, " %s g1/functions/uvc.1\n", argv0); + fprintf(stderr, "\n"); + fprintf(stderr, " %s musb-hdrc.0.auto\n", argv0); +} + +/* Necessary for and only used by signal handler. */ +static struct events *sigint_events; + +static void sigint_handler(int signal) +{ + /* Stop the main loop when the user presses CTRL-C */ + events_stop(sigint_events); +} + +int main(int argc, char *argv[]) +{ + char *function = NULL; + char *cap_device = "/dev/video1"; + struct uvc_function_config *fc; + struct uvc_stream *stream = NULL; + struct video_source *src = NULL; + struct events events; + int ret = 0; + int opt; + + while ((opt = getopt(argc, argv, "c:h")) != -1) { + switch (opt) { + case 'c': + cap_device = optarg; + break; + + case 'h': + usage(argv[0]); + return 0; + + default: + fprintf(stderr, "Invalid option '-%c'\n", opt); + usage(argv[0]); + return 1; + } + } + + if (argv[optind] != NULL) + function = argv[optind]; + + fc = configfs_parse_uvc_function(function); + if (!fc) { + printf("Failed to identify function configuration\n"); + return 1; + } + + /* + * Create the events handler. Register a signal handler for SIGINT, + * received when the user presses CTRL-C. This will allow the main loop + * to be interrupted, and resources to be freed cleanly. + */ + events_init(&events); + + sigint_events = &events; + signal(SIGINT, sigint_handler); + + /* Create and initialize a video source. */ + src = v4l2_video_source_create(cap_device); + if (src == NULL) { + ret = 1; + goto done; + } + + v4l2_video_source_init(src, &events); + + /* Create and initialise the stream. */ + stream = uvc_stream_new(fc->video); + if (stream == NULL) { + ret = 1; + goto done; + } + + uvc_stream_set_event_handler(stream, &events); + uvc_stream_set_video_source(stream, src); + uvc_stream_init_uvc(stream, fc); + + /* Main capture loop */ + events_loop(&events); + +done: + /* Cleanup */ + uvc_stream_delete(stream); + video_source_destroy(src); + events_cleanup(&events); + configfs_free_uvc_function(fc); + + return ret; +} -- cgit v1.2.3