From patchwork Mon Jan 18 16:17:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 32656 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84) (envelope-from ) id 1aLCVj-0005KP-So; Mon, 18 Jan 2016 16:18:31 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-7) with esmtp id 1aLCVh-0000UO-2o; Mon, 18 Jan 2016 17:18:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755739AbcARQS2 (ORCPT + 1 other); Mon, 18 Jan 2016 11:18:28 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:38818 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755569AbcARQS2 (ORCPT ); Mon, 18 Jan 2016 11:18:28 -0500 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O1500V0PPAQUN20@mailout3.samsung.com> for linux-media@vger.kernel.org; Tue, 19 Jan 2016 01:18:26 +0900 (KST) X-AuditID: cbfee61a-f79266d000003652-04-569d10529485 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 86.31.13906.2501D965; Tue, 19 Jan 2016 01:18:26 +0900 (KST) Received: from AMDC2362.DIGITAL.local ([106.120.53.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O15003TLP9I9Y00@mmp2.samsung.com>; Tue, 19 Jan 2016 01:18:26 +0900 (KST) From: Jacek Anaszewski To: linux-media@vger.kernel.org Cc: sakari.ailus@linux.intel.com, laurent.pinchart@ideasonboard.com, gjasny@googlemail.com, hdegoede@redhat.com, hverkuil@xs4all.nl, Jacek Anaszewski Subject: [PATCH 06/15] mediactl: Add media_device creation helpers Date: Mon, 18 Jan 2016 17:17:31 +0100 Message-id: <1453133860-21571-7-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1453133860-21571-1-git-send-email-j.anaszewski@samsung.com> References: <1453133860-21571-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrALMWRmVeSWpSXmKPExsVy+t9jQd0ggblhBivPGVhMnzKL0eLN8elM FqcmP2Oy6L36nNGic+ISdoueDVtZLT5t+cbkwO7xdMJkdo/ZHTNZPeadDPR4v+8qm0ffllWM Hp83yXmc+vqZPYA9issmJTUnsyy1SN8ugSvj+NkPrAUvVCoeLTnF1MD4WbaLkZNDQsBEonnx KnYIW0ziwr31bF2MXBxCArMYJf5NuMsM4fxklDj/ex4bSBWbgKHEzxevmUBsEQF5iSe9N8A6 mAW2MErcvbMIbJSwgJPE1NVvWEFsFgFVieVdH8HivAIeEtvm3wWyOYDWKUjMmWQDEuYU8JR4 c3M/2HwhoJIDd7cyT2DkXcDIsIpRIrUguaA4KT3XMC+1XK84Mbe4NC9dLzk/dxMjONyeSe1g PLjL/RCjAAejEg+vw9nZYUKsiWXFlbmHGCU4mJVEeA9xzA0T4k1JrKxKLcqPLyrNSS0+xCjN waIkzlt7KTJMSCA9sSQ1OzW1ILUIJsvEwSnVwFj4aJVck9CR7Mhj7LdXfmljCs/4lW154lLx 7DuZ539li56IL6r4MevY6qSmpIri70+PruB6lHGW6byllp//R6+UkgMPX32VCU94uUrGu4I1 usY06VJy2Nqsc9pMoZ1TIpTvpz68vTeq8ukkK1kdzafiNs0tE6oX7rp0hCVgsebBtNSHJeEp O5RYijMSDbWYi4oTAXfyygszAgAA Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.1.18.160917 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS ' Add helper functions that allow for easy instantiation of media_device object basing on whether the media device contains video device with given node name. Signed-off-by: Jacek Anaszewski Acked-by: Kyungmin Park --- utils/media-ctl/libmediactl.c | 75 +++++++++++++++++++++++++++++++++++++++++ utils/media-ctl/mediactl.h | 30 +++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c index 0be1845..3a45ecc 100644 --- a/utils/media-ctl/libmediactl.c +++ b/utils/media-ctl/libmediactl.c @@ -734,6 +734,44 @@ struct media_device *media_device_new(const char *devnode) return media; } +struct media_device *media_device_new_by_entity_devname(char *entity_devname) +{ + struct media_device *media; + char media_devname[32]; + struct media_entity *entity; + int i, ret; + + /* query all available media devices */ + for (i = 0;; ++i) { + sprintf(media_devname, "/dev/media%d", i); + + media = media_device_new(media_devname); + if (media == NULL) + return NULL; + + ret = media_device_enumerate(media); + if (ret < 0) { + media_dbg(media, "Failed to enumerate %s (%d)\n", + media_devname, ret); + goto err_dev_enum; + } + + /* Check if the media device contains entity with entity_devname */ + entity = media_get_entity_by_devname(media, entity_devname, + strlen(entity_devname)); + if (entity) + return media; + + if (media) + media_device_unref(media); + } + +err_dev_enum: + if (media) + media_device_unref(media); + return NULL; +} + struct media_device *media_device_new_emulated(struct media_device_info *info) { struct media_device *media; @@ -773,6 +811,43 @@ void media_device_unref(struct media_device *media) free(media); } +int media_get_devname_by_fd(int fd, char *node_name) +{ + struct udev *udev; + struct media_entity tmp_entity; + struct stat stat; + int ret; + + if (node_name == NULL) + return -EINVAL; + + ret = fstat(fd, &stat); + if (ret < 0) + return -EINVAL; + + tmp_entity.info.v4l.major = MAJOR(stat.st_rdev); + tmp_entity.info.v4l.minor = MINOR(stat.st_rdev); + + ret = media_udev_open(&udev); + if (ret < 0) + printf("Can't get udev context\n"); + + /* Try to get the device name via udev */ + ret = media_get_devname_udev(udev, &tmp_entity); + if (!ret) + goto out; + + ret = media_get_devname_sysfs(&tmp_entity); + if (ret < 0) + goto err_get_devname; + +out: + strcpy(node_name, tmp_entity.devname); +err_get_devname: + media_udev_close(udev); + return ret; +} + int media_device_add_entity(struct media_device *media, const struct media_entity_desc *desc, const char *devnode) diff --git a/utils/media-ctl/mediactl.h b/utils/media-ctl/mediactl.h index 9db40a8..1d62191 100644 --- a/utils/media-ctl/mediactl.h +++ b/utils/media-ctl/mediactl.h @@ -76,6 +76,23 @@ struct media_device *media_device_new(const char *devnode); struct media_device *media_device_new_emulated(struct media_device_info *info); /** + * @brief Create a new media device if it comprises entity with given devname + * @param entity_devname - device node name of the entity to be matched. + * + * Query all media devices available in the system to find the one comprising + * the entity with given devname. If the media device is matched then its + * instance is created and initialized with enumerated entities and links. + * The returned device can be accessed. + * + * Media devices are reference-counted, see media_device_ref() and + * media_device_unref() for more information. + * + * @return A pointer to the new media device or NULL if video_devname cannot + * be matched or memory cannot be allocated. + */ +struct media_device *media_device_new_by_entity_devname(char *entity_devname); + +/** * @brief Take a reference to the device. * @param media - device instance. * @@ -240,6 +257,19 @@ const char *media_entity_get_devname(struct media_entity *entity); */ const char *media_entity_get_name(struct media_entity *entity); +/** + * @brief Get the device node name by its file descriptor + * @param fd - file descriptor of a device. + * @param node_name - output device node name string. + * + * This function returns the full path and name to the device node corresponding + * to the given file descriptor. + * + * @return 0 on success, or a negative error code on failure. + */ +int media_get_devname_by_fd(int fd, char *node_name); + +/** * @brief Get the type of an entity. * @param entity - the entity. *