{"id":15070,"url":"https://patchwork.libcamera.org/api/patches/15070/?format=json","web_url":"https://patchwork.libcamera.org/patch/15070/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20211207224512.753979-5-djrscally@gmail.com>","date":"2021-12-07T22:45:07","name":"[libcamera-devel,v3,4/9] libcamera: camera_sensor: Discover VCMs through ancillary links","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b669150ba9ceb4e6a5d9c5a87b0f4a9b1aee7d36","submitter":{"id":90,"url":"https://patchwork.libcamera.org/api/people/90/?format=json","name":"Daniel Scally","email":"djrscally@gmail.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15070/mbox/","series":[{"id":2824,"url":"https://patchwork.libcamera.org/api/series/2824/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2824","date":"2021-12-07T22:45:03","name":"Enumerate CameraLens by following sensor's ancillary links","version":3,"mbox":"https://patchwork.libcamera.org/series/2824/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15070/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15070/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 DF461C324B\n\tfor ;\n\tTue, 7 Dec 2021 22:45:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8A1E36089D;\n\tTue, 7 Dec 2021 23:45:36 +0100 (CET)","from mail-wr1-x432.google.com (mail-wr1-x432.google.com\n\t[IPv6:2a00:1450:4864:20::432])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5F57360592\n\tfor ;\n\tTue, 7 Dec 2021 23:45:31 +0100 (CET)","by mail-wr1-x432.google.com with SMTP id o13so687623wrs.12\n\tfor ;\n\tTue, 07 Dec 2021 14:45:31 -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\ty12sm980332wrn.73.2021.12.07.14.45.30\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 07 Dec 2021 14:45:30 -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=\"FSqsqDfY\"; 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=moWXhDYYHDTxZgKoZg+f4F5npDP4+tmfBJEX072EnMU=;\n\tb=FSqsqDfY9G9DAXBhNPIUhGytmWe+NmMaoE+PRW3yO9c8CfR8hp+A7AjsD9NvLe1o0v\n\tqxwFIZcOWESxicTYGqtPM929vwBZBNWoSwnM74nOA0CKMdqlJnGguSVxsrimmN6IWD5o\n\tAQAdTvVBcmGgWP7g6p2DVrxo//5t/ncBIDvA06m7eV9Nng0mArNmcXPdWE2tllDa57pJ\n\tVSSHmN6XzDYhdu2Rhup7qkQccAmZeKnHk+dymSZut/uZpAI+SBq1QA4kDa5dFEL3xhOa\n\tI/rPbPIUpCuiabqYfNDoUIjBWJbfENGx6Q/9CRRh03ubCURotmIs5nL0jnpLSdS6xSpB\n\trFvA==","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=moWXhDYYHDTxZgKoZg+f4F5npDP4+tmfBJEX072EnMU=;\n\tb=DIrBRqb9l01aiM3RL4moLcE5CPOfVFdNqc4BSWBq1jfaSv/w0VThV7F4sz5qk2N4fu\n\t+g30I4aPD4WokiRQFBLtiSoPHusDe+zqEmif6KTM/+x3nVGjKvn+st1icxwugawir+ke\n\ttoQfgX3te1xvuMcpWcUVy0uYzzRlSqc1oDX5KUslCb8L4kmoAgJQw3PpkUKAOh3HtHgG\n\tyLE09EHUNykRo9/WwSNitUaSjarMGOk8kB2iDCf4pd+mOHtianwT3J2ksKkMhxMGgFIK\n\ttqqnj06aE0YGJJv4bBcloqwc/hsEq4mSkt2Ne7XWAcLpmH6gcmF5xS2yyxClpJdtP6sm\n\t7C2A==","X-Gm-Message-State":"AOAM530cCfslyr5kNiFDVbbIpa/3DCN06Icym+za1XyAKK+j1wL+1OlE\n\taD1LUN8fnvFKMObctz52PNtndlcgbaQ=","X-Google-Smtp-Source":"ABdhPJx6lzMT2DbMnF703JtARko0XVa45U6zKPfxd7/nM4AdeVQyrZPZXIK53s6Mi4w/oiQnERE62g==","X-Received":"by 2002:a5d:6da5:: with SMTP id\n\tu5mr56498929wrs.374.1638917131191; \n\tTue, 07 Dec 2021 14:45:31 -0800 (PST)","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 7 Dec 2021 22:45:07 +0000","Message-Id":"<20211207224512.753979-5-djrscally@gmail.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20211207224512.753979-1-djrscally@gmail.com>","References":"<20211207224512.753979-1-djrscally@gmail.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 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\nSigned-off-by: Daniel Scally \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 7bb39b1e..1cfb1781 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -161,6 +161,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@@ -432,6 +436,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","v3","4/9"]}