{"id":8408,"url":"https://patchwork.libcamera.org/api/1.1/patches/8408/?format=json","web_url":"https://patchwork.libcamera.org/patch/8408/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200624145256.48266-11-paul.elder@ideasonboard.com>","date":"2020-06-24T14:52:44","name":"[libcamera-devel,v4,10/22] v4l2: v4l2_camera_proxy: Implement VIDIOC_ENUMINPUT, VIDIOC_G/S_INPUT","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d7d05e8d5e416dbe053f55a15c09a0dd08fced30","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8408/mbox/","series":[{"id":1041,"url":"https://patchwork.libcamera.org/api/1.1/series/1041/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1041","date":"2020-06-24T14:52:34","name":"Support v4l2-compliance","version":4,"mbox":"https://patchwork.libcamera.org/series/1041/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8408/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8408/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 62436609A9\n\tfor ;\n\tWed, 24 Jun 2020 16:53:40 +0200 (CEST)","from jade.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:8147:f2a2:a8c6:9087])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4E8512A8;\n\tWed, 24 Jun 2020 16:53:38 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"TexvYPbd\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593010420;\n\tbh=iFElNjVQnZTQQnfU+8yxLeFarVTA5fdGEmgGife8r2U=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=TexvYPbdyEfJNYN8VPj8HRp9yqqVcG8itLXGVjF2l55V8VydxfP3R3Dbg/bbuSkCs\n\tYZTh/LpA01p6s174WI6jFb75ee7Vsu8xmfqYHDvOOs3re81SLN2BcO1bmggz8HOnw4\n\toCFDJ4DXn9htNqBBYCPd435fMBJrn7KWX9rhrFUI=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 24 Jun 2020 23:52:44 +0900","Message-Id":"<20200624145256.48266-11-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200624145256.48266-1-paul.elder@ideasonboard.com>","References":"<20200624145256.48266-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 10/22] v4l2: v4l2_camera_proxy:\n\tImplement VIDIOC_ENUMINPUT, VIDIOC_G/S_INPUT","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 24 Jun 2020 14:53:40 -0000"},"content":"Implement VIDIOC_ENUMINPUT, VIDIOC_G_INPUT, and VIDIOC_S_INPUT. Only the\nzeroth input device is supported, and the info returned by enuminput is\nhardcoded and basic. This is sufficient to pass v4l2-compliance.\n\nSigned-off-by: Paul Elder \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n\n---\nNo change in v4\n\nChanges in v3:\n- cosmetic changes\n\nChanges in v2:\n- use V4L2CameraFile instead of fd\n- remove arg == nullptr check as it has been moved away to the main\n ioctl handler\n---\n src/v4l2/v4l2_camera_proxy.cpp | 48 ++++++++++++++++++++++++++++++++++\n src/v4l2/v4l2_camera_proxy.h | 3 +++\n 2 files changed, 51 insertions(+)","diff":"diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 99586c3..2bbe821 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -383,6 +383,42 @@ int V4L2CameraProxy::vidioc_s_priority(V4L2CameraFile *file, enum v4l2_priority\n \treturn 0;\n }\n \n+int V4L2CameraProxy::vidioc_enuminput(V4L2CameraFile *file, struct v4l2_input *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_enuminput fd = \" << file->efd();\n+\n+\tif (arg->index != 0)\n+\t\treturn -EINVAL;\n+\n+\tmemset(arg, 0, sizeof(*arg));\n+\n+\tutils::strlcpy(reinterpret_cast(arg->name),\n+\t\t reinterpret_cast(capabilities_.card),\n+\t\t sizeof(arg->name));\n+\targ->type = V4L2_INPUT_TYPE_CAMERA;\n+\n+\treturn 0;\n+}\n+\n+int V4L2CameraProxy::vidioc_g_input(V4L2CameraFile *file, int *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_g_input fd = \" << file->efd();\n+\n+\t*arg = 0;\n+\n+\treturn 0;\n+}\n+\n+int V4L2CameraProxy::vidioc_s_input(V4L2CameraFile *file, int *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_s_input fd = \" << file->efd();\n+\n+\tif (*arg != 0)\n+\t\treturn -EINVAL;\n+\n+\treturn 0;\n+}\n+\n void V4L2CameraProxy::freeBuffers()\n {\n \tLOG(V4L2Compat, Debug) << \"Freeing libcamera bufs\";\n@@ -598,6 +634,9 @@ const std::set V4L2CameraProxy::supportedIoctls_ = {\n \tVIDIOC_TRY_FMT,\n \tVIDIOC_G_PRIORITY,\n \tVIDIOC_S_PRIORITY,\n+\tVIDIOC_ENUMINPUT,\n+\tVIDIOC_G_INPUT,\n+\tVIDIOC_S_INPUT,\n \tVIDIOC_REQBUFS,\n \tVIDIOC_QUERYBUF,\n \tVIDIOC_QBUF,\n@@ -646,6 +685,15 @@ int V4L2CameraProxy::ioctl(V4L2CameraFile *file, unsigned long request, void *ar\n \tcase VIDIOC_S_PRIORITY:\n \t\tret = vidioc_s_priority(file, static_cast(arg));\n \t\tbreak;\n+\tcase VIDIOC_ENUMINPUT:\n+\t\tret = vidioc_enuminput(file, static_cast(arg));\n+\t\tbreak;\n+\tcase VIDIOC_G_INPUT:\n+\t\tret = vidioc_g_input(file, static_cast(arg));\n+\t\tbreak;\n+\tcase VIDIOC_S_INPUT:\n+\t\tret = vidioc_s_input(file, static_cast(arg));\n+\t\tbreak;\n \tcase VIDIOC_REQBUFS:\n \t\tret = vidioc_reqbufs(file, static_cast(arg));\n \t\tbreak;\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex 8de306b..707a0de 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -54,6 +54,9 @@ private:\n \tint vidioc_try_fmt(V4L2CameraFile *file, struct v4l2_format *arg);\n \tint vidioc_g_priority(V4L2CameraFile *file, enum v4l2_priority *arg);\n \tint vidioc_s_priority(V4L2CameraFile *file, enum v4l2_priority *arg);\n+\tint vidioc_enuminput(V4L2CameraFile *file, struct v4l2_input *arg);\n+\tint vidioc_g_input(V4L2CameraFile *file, int *arg);\n+\tint vidioc_s_input(V4L2CameraFile *file, int *arg);\n \tint vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuffers *arg);\n \tint vidioc_querybuf(V4L2CameraFile *file, struct v4l2_buffer *arg);\n \tint vidioc_qbuf(V4L2CameraFile *file, struct v4l2_buffer *arg);\n","prefixes":["libcamera-devel","v4","10/22"]}