From patchwork Sun Aug 23 20:17:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 7058591 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AA72B9F731 for ; Sun, 23 Aug 2015 20:19:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC97220699 for ; Sun, 23 Aug 2015 20:19:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99C9A20694 for ; Sun, 23 Aug 2015 20:19:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753717AbbHWUTS (ORCPT ); Sun, 23 Aug 2015 16:19:18 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:58917 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753463AbbHWUSK (ORCPT ); Sun, 23 Aug 2015 16:18:10 -0400 Received: from 177.18.22.230.dynamic.adsl.gvt.net.br ([177.18.22.230] helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZTbiT-0005js-IC; Sun, 23 Aug 2015 20:18:09 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.85) (envelope-from ) id 1ZTbiM-0001wl-US; Sun, 23 Aug 2015 17:18:02 -0300 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sakari Ailus , Laurent Pinchart , Hans Verkuil Subject: [PATCH v7 38/44] [media] media: report if a pad is sink or source at debug msg Date: Sun, 23 Aug 2015 17:17:55 -0300 Message-Id: X-Mailer: git-send-email 2.4.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sometimes, it is important to see if the created pad is sink or source. Add info to track that. Signed-off-by: Mauro Carvalho Chehab diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index ad0827bf0982..24fee38730f5 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -527,8 +527,8 @@ void dvb_create_media_graph(struct dvb_adapter *adap) struct media_entity *entity, *tuner = NULL, *demod = NULL; struct media_entity *demux = NULL, *ca = NULL; struct media_interface *intf; - unsigned demux_pad = 1; - unsigned dvr_pad = 1; + unsigned demux_pad = 0; + unsigned dvr_pad = 0; if (!mdev) return; @@ -560,15 +560,19 @@ void dvb_create_media_graph(struct dvb_adapter *adap) /* Create demux links for each ringbuffer/pad */ if (demux) { - if (entity->type == MEDIA_ENT_T_DVB_TSOUT) { - if (!strncmp(entity->name, DVR_TSOUT, - sizeof(DVR_TSOUT))) - media_create_pad_link(demux, ++dvr_pad, - entity, 0, 0); - if (!strncmp(entity->name, DEMUX_TSOUT, - sizeof(DEMUX_TSOUT))) - media_create_pad_link(demux, ++demux_pad, - entity, 0, 0); + media_device_for_each_entity(entity, mdev) { + if (entity->type == MEDIA_ENT_T_DVB_TSOUT) { + if (!strncmp(entity->name, DVR_TSOUT, + strlen(DVR_TSOUT))) + media_create_pad_link(demux, + ++dvr_pad, + entity, 0, 0); + if (!strncmp(entity->name, DEMUX_TSOUT, + strlen(DEMUX_TSOUT))) + media_create_pad_link(demux, + ++demux_pad, + entity, 0, 0); + } } } diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index 05976c891c17..d30650e3562e 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -121,8 +121,11 @@ static void dev_dbg_obj(const char *event_name, struct media_gobj *gobj) struct media_pad *pad = gobj_to_pad(gobj); dev_dbg(gobj->mdev->dev, - "%s: id 0x%08x pad#%d: '%s':%d\n", - event_name, gobj->id, media_localid(gobj), + "%s: id 0x%08x %s%spad#%d: '%s':%d\n", + event_name, gobj->id, + pad->flags & MEDIA_PAD_FL_SINK ? " sink " : "", + pad->flags & MEDIA_PAD_FL_SOURCE ? "source " : "", + media_localid(gobj), pad->entity->name, pad->index); break; }