[{"id":21657,"web_url":"https://patchwork.libcamera.org/comment/21657/","msgid":"","date":"2021-12-08T08:33:56","subject":"Re: [libcamera-devel] [PATCH v3 4/9] libcamera: camera_sensor:\n\tDiscover VCMs through ancillary links","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Daniel,\n\nThank you for the patch.\n\nOn Tue, Dec 07, 2021 at 10:45:07PM +0000, Daniel Scally wrote:\n> Add a function to check for and initialise any VCMs linked to the\n> CameraSensor's entity by ancillary links. This should initialise\n> the lens_ member with the linked entity. Call the new function\n> during CameraSensor::init().\n> \n> Signed-off-by: Daniel Scally \n> ---\n> Changes 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(+)\n> \n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index 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_;\n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index 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\ns/function:/function/\n\nReviewed-by: Laurent Pinchart \n\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","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 BF6FDBDB13\n\tfor ;\n\tWed, 8 Dec 2021 08:34:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 176C2605C4;\n\tWed, 8 Dec 2021 09:34:29 +0100 (CET)","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 34BC360225\n\tfor ;\n\tWed, 8 Dec 2021 09:34:27 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9B3628BB;\n\tWed, 8 Dec 2021 09:34:26 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CYL1IVv5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638952466;\n\tbh=5wNtEXKlomCrmgHx5TkFxnpGPEk47M10M5QPvWXwAxQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=CYL1IVv5sIfootn69hYXD8nnFlCnNOCUZz1UOUm0yCsjrvLn4rcQma1VQB01UTCog\n\tuzc1F7jz8I4JiOy2I2CO6teqAcaUghc8IBzeuh7WRF52jFodwUWOS7P6q2uIH5AtSf\n\tB2Re6yC1G+urwvfFVqyuQo+Nmbs70K/fzH6VvgTg=","Date":"Wed, 8 Dec 2021 10:33:56 +0200","From":"Laurent Pinchart ","To":"Daniel Scally ","Message-ID":"","References":"<20211207224512.753979-1-djrscally@gmail.com>\n\t<20211207224512.753979-5-djrscally@gmail.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211207224512.753979-5-djrscally@gmail.com>","Subject":"Re: [libcamera-devel] [PATCH v3 4/9] libcamera: camera_sensor:\n\tDiscover VCMs 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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]