{"id":15309,"url":"https://patchwork.libcamera.org/api/1.1/patches/15309/?format=json","web_url":"https://patchwork.libcamera.org/patch/15309/","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":"<20220131223330.61563-5-djrscally@gmail.com>","date":"2022-01-31T22:33:25","name":"[libcamera-devel,v4,4/9] libcamera: camera_sensor: Discover VCMs through ancillary links","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"83811d5908c2daa787142f4baedd708a58241556","submitter":{"id":90,"url":"https://patchwork.libcamera.org/api/1.1/people/90/?format=json","name":"Daniel Scally","email":"djrscally@gmail.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15309/mbox/","series":[{"id":2906,"url":"https://patchwork.libcamera.org/api/1.1/series/2906/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2906","date":"2022-01-31T22:33:21","name":"Enumerate CameraLens by following sensor's ancillary links","version":4,"mbox":"https://patchwork.libcamera.org/series/2906/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15309/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15309/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 4A93DBF415\n\tfor ;\n\tMon, 31 Jan 2022 22:33:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0E28B609D6;\n\tMon, 31 Jan 2022 23:33:48 +0100 (CET)","from mail-wr1-x431.google.com (mail-wr1-x431.google.com\n\t[IPv6:2a00:1450:4864:20::431])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 684D3609C9\n\tfor ;\n\tMon, 31 Jan 2022 23:33:45 +0100 (CET)","by mail-wr1-x431.google.com with SMTP id u15so28289166wrt.3\n\tfor ;\n\tMon, 31 Jan 2022 14:33:45 -0800 (PST)","from localhost.localdomain\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net. [86.13.91.161])\n\tby smtp.gmail.com with ESMTPSA id\n\tq2sm6986740wrw.14.2022.01.31.14.33.44\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 31 Jan 2022 14:33:44 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"UWFLZmzS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=NlysUB6FBhVB8yavInpASF7jF/JylVh3ZMvCc4z37Yc=;\n\tb=UWFLZmzScSLwcK0xM1JgyBU5raDsjFAa433mDHU6b7vIUnwkcwrDKizz/m+aqIRdtf\n\t3cZN3qUKlE0XvrFW3c7DcAG/CydC90clBq4A5wywpn/iba2HoTOYkFaheUta4IeR5uNS\n\tzfLymiPWofW4rI/79yTGjjXkoARjQuPCsEnjb6wMLm8ezG8O/InEgGptMy9tS8ivzYq3\n\tiUgy24FgdM8oApRimZhA3opKdoovLC34QGtWm5M+ox5MzbTE03XQwO8v581Z+D4O94oe\n\tDbHji206E538tI6nH7Jecl2UsnJrQoz58wPqOLkHSe+m9dXp1iy4ld9I4AD0WZZN1EvG\n\t8qEQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=NlysUB6FBhVB8yavInpASF7jF/JylVh3ZMvCc4z37Yc=;\n\tb=h3RO7f6/dY5pEujnji2zAT7UjnhNeY62WIRDrd/UGnBeF9GrTi+9Wi4ZbujqNzTlKi\n\tQxr1/NEochF2T99UBSvZPUtGBd0KeJxtcnun+p/yl9+yoo9oenpXIF0GwFXuz6GwJiCB\n\tOlHjY0Gamptu9eaaJtdc/raGonB8QCvst/S1UsPkZVQjUcvd/NdX7e1Zu1U/Y7s7Z1U1\n\tRTkPPtvrg4Hb0vbyeYypIjC5yy+L6NXle+yXgul2yAotNkkdiQodWdf4lN4aOrO2nKdi\n\tnqaCLQGy5HTPb0SW8OdL8Wlu+KvMCpwb70IDdwOWI2LQU0DapOIiaW3KWX+8VkmKXi2v\n\tePKg==","X-Gm-Message-State":"AOAM5311Pek2hNWIryyGrb4U33/HbKvPy01gq2epOI672t6C/I1Vf5B9\n\tVwKGnwrb14lcc6uWkMwW/uM8jFzwJl0=","X-Google-Smtp-Source":"ABdhPJwvNHMo+lzyhw7f2P6N/fZhsxR6yfIJNJ/q/Y3rzIsJzXzb0vtMOJf1G/Kq9Nh6/X4Sn9VLgg==","X-Received":"by 2002:a05:6000:c2:: with SMTP id\n\tq2mr19255937wrx.85.1643668425221; \n\tMon, 31 Jan 2022 14:33:45 -0800 (PST)","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 31 Jan 2022 22:33:25 +0000","Message-Id":"<20220131223330.61563-5-djrscally@gmail.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20220131223330.61563-1-djrscally@gmail.com>","References":"<20220131223330.61563-1-djrscally@gmail.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 4/9] libcamera: camera_sensor: Discover\n\tVCMs through ancillary links","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a function to check for and initialise any VCMs linked to the\nCameraSensor's entity by ancillary links. This should initialise\nthe lens_ member with the linked entity. Call the new function\nduring CameraSensor::init().\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Daniel Scally \n---\nChanges in v4:\n\n\t- Fixed typo (Laurent)\n\nChanges in v3:\n\n\t- Fixed some style errors\n\t- Replaced the flash case by printing the entity function in the \n\tdefault case.\n\n include/libcamera/internal/camera_sensor.h | 1 +\n src/libcamera/camera_sensor.cpp | 39 ++++++++++++++++++++++\n 2 files changed, 40 insertions(+)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 2fa11567..7fb4eded 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -81,6 +81,7 @@ private:\n \tvoid initTestPatternModes();\n \tint initProperties();\n \tint applyTestPatternMode(controls::draft::TestPatternModeEnum mode);\n+\tint discoverAncillaryDevices();\n \n \tconst MediaEntity *entity_;\n \tstd::unique_ptr subdev_;\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 64f7f12c..f00c0aca 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -172,6 +172,10 @@ int CameraSensor::init()\n \tif (ret)\n \t\treturn ret;\n \n+\tret = discoverAncillaryDevices();\n+\tif (ret)\n+\t\treturn ret;\n+\n \treturn applyTestPatternMode(controls::draft::TestPatternModeEnum::TestPatternModeOff);\n }\n \n@@ -443,6 +447,41 @@ int CameraSensor::initProperties()\n \treturn 0;\n }\n \n+/**\n+ * \\brief Check for and initialise any ancillary devices\n+ *\n+ * Sensors sometimes have ancillary devices such as a Lens or Flash that could\n+ * be linked to their MediaEntity by the kernel. Search for and handle any\n+ * such device.\n+ *\n+ * \\todo Handle MEDIA_ENT_F_FLASH too.\n+ */\n+int CameraSensor::discoverAncillaryDevices()\n+{\n+\tint ret;\n+\n+\tfor (MediaEntity *ancillary : entity_->ancillaryEntities()) {\n+\t\tswitch (ancillary->function()) {\n+\t\tcase MEDIA_ENT_F_LENS:\n+\t\t\tfocusLens_ = std::make_unique(ancillary);\n+\t\t\tret = focusLens_->init();\n+\t\t\tif (ret) {\n+\t\t\t\tLOG(CameraSensor, Error)\n+\t\t\t\t\t<< \"CameraLens initialisation failed\";\n+\t\t\t\treturn ret;\n+\t\t\t}\n+\t\t\tbreak;\n+\n+\t\tdefault:\n+\t\t\tLOG(CameraSensor, Warning)\n+\t\t\t\t<< \"Unsupported ancillary entity function \"\n+\t\t\t\t<< ancillary->function();\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n /**\n * \\fn CameraSensor::model()\n * \\brief Retrieve the sensor model name\n","prefixes":["libcamera-devel","v4","4/9"]}