From patchwork Fri Sep 28 10:07:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 10619341 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C51F1112B for ; Fri, 28 Sep 2018 10:07:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B91D62AFF8 for ; Fri, 28 Sep 2018 10:07:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABBFC2B213; Fri, 28 Sep 2018 10:07:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E9A02B0FD for ; Fri, 28 Sep 2018 10:07:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729289AbeI1Qat (ORCPT ); Fri, 28 Sep 2018 12:30:49 -0400 Received: from lb3-smtp-cloud9.xs4all.net ([194.109.24.30]:60307 "EHLO lb3-smtp-cloud9.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729229AbeI1Qat (ORCPT ); Fri, 28 Sep 2018 12:30:49 -0400 Received: from test-nl.fritz.box ([80.101.105.217]) by smtp-cloud9.xs4all.net with ESMTPA id 5pgXgEDPBS9Y35pgZg1M7B; Fri, 28 Sep 2018 12:07:47 +0200 From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Hans Verkuil Subject: [RFCv3 PATCH 3/3] vimc: add property test code Date: Fri, 28 Sep 2018 12:07:45 +0200 Message-Id: <20180928100745.4946-4-hverkuil@xs4all.nl> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180928100745.4946-1-hverkuil@xs4all.nl> References: <20180928100745.4946-1-hverkuil@xs4all.nl> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfAcYhBKvR/qJsWc2DoiH+wJVxn8y2wOLHZYjlfVddTTWOiQGzCTMyAk0dYrbQ9958hfTxCRFD0iVBbeWeQsh0CrHMRPv/8ZDf7Bx9Poqmb8Ma3qM37N4 AVYa3K7uBkUSjSIRW9Vi9i+3nDKj8ZdTuSl39wAqyffXISkxDqKveKXZOseqUvcXTaqhHqNVkxzJY7RoqOcPf40QmafCvk8R3oYnouujQYngfeCjWSentpcR Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hans Verkuil Add properties to entities and pads to be able to test the properties API. Signed-off-by: Hans Verkuil --- drivers/media/platform/vimc/vimc-common.c | 50 +++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/platform/vimc/vimc-common.c index dee1b9dfc4f6..2f70e4e64790 100644 --- a/drivers/media/platform/vimc/vimc-common.c +++ b/drivers/media/platform/vimc/vimc-common.c @@ -415,6 +415,7 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved, const unsigned long *pads_flag, const struct v4l2_subdev_ops *sd_ops) { + struct media_prop *prop = NULL; int ret; /* Allocate the pads */ @@ -452,6 +453,55 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved, goto err_clean_m_ent; } + ret = media_entity_add_prop_u64(&sd->entity, "u64", ~1); + if (!ret) + ret = media_entity_add_prop_s64(&sd->entity, "s64", -5); + if (!ret) + ret = media_entity_add_prop_string(&sd->entity, "string", + sd->name); + if (!ret) { + prop = media_entity_add_prop_group(&sd->entity, "empty-group"); + ret = PTR_ERR_OR_ZERO(prop); + } + if (!ret) { + prop = media_entity_add_prop_group(&sd->entity, "group"); + ret = PTR_ERR_OR_ZERO(prop); + } + if (!ret) + ret = media_prop_add_prop_u64(prop, "u64", 42); + if (!ret) + ret = media_prop_add_prop_s64(prop, "s64", -42); + if (!ret) + ret = media_prop_add_prop_string(prop, "string", "42"); + if (!ret) + ret = media_pad_add_prop_u64(&sd->entity.pads[num_pads - 1], + "u64", ~1); + if (!ret) + ret = media_pad_add_prop_s64(&sd->entity.pads[num_pads - 1], + "s64", -5); + if (!ret) { + prop = media_pad_add_prop_group(&sd->entity.pads[num_pads - 1], + "group"); + ret = PTR_ERR_OR_ZERO(prop); + } + if (!ret) + ret = media_prop_add_prop_u64(prop, "u64", 24); + if (!ret) + ret = media_prop_add_prop_s64(prop, "s64", -24); + if (!ret) + ret = media_pad_add_prop_string(&sd->entity.pads[0], + "string", sd->name); + if (!ret) + ret = media_prop_add_prop_string(prop, "string", "24"); + if (!ret) { + prop = media_prop_add_prop_group(prop, "subgroup"); + ret = PTR_ERR_OR_ZERO(prop); + } + if (!ret) + ret = media_prop_add_prop_string(prop, "string", "substring"); + if (ret) + goto err_clean_m_ent; + return 0; err_clean_m_ent: