From patchwork Mon Jun 25 17:36:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 10487093 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 341636038C for ; Mon, 25 Jun 2018 17:38:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EA582228E for ; Mon, 25 Jun 2018 17:38:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1375B27EED; Mon, 25 Jun 2018 17:38:55 +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=-5.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6F252228E for ; Mon, 25 Jun 2018 17:38:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 30C44891FF; Mon, 25 Jun 2018 17:38:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id DFD136E36E for ; Mon, 25 Jun 2018 17:38:38 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id z137-v6so5222078wmc.0 for ; Mon, 25 Jun 2018 10:38:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dRejSH10wJfIkfLxUnUoGIE6rw3EsaCPXHbH+bEXOws=; b=fqFIr22qVP9kvGZsJen7fqZk0dJe0DX7noViEEOXuDB1hNByZ5dRFvZ6cLaGnRi13I c6OaSwyd6kW9eoZggLA5kOAzI195G2A5DZEIdYaiEshsX2+h6cWy8iXENGqyRVlVCjYx jx7gNCHto9s0ft5oEH2jViTWlbrb/gO/4E/R1/aghjDpV/k9Na2wSgKtFT1R6ij3sfCR jnYi7TKIfTix3E6mrMnl0SIX3vWVVs2Qo5wcN0xX8D1oAARV5D5EL8Y9u4CPzKUSpENd 4haUrqUQXpMvtsm9wjrF/j004nF+n3owV4wyUF4UkkQz0OLxAUDOef7bYd35zIQcYiZl /ypA== X-Gm-Message-State: APt69E3qzQTLV5pjIJpGuIget9jz382dG3CCnezsgu59pIK8cMlKpP5O 2tw4K3ZdFfNC4hIrV/6jEzintQ== X-Google-Smtp-Source: AAOMgpftJIcDQZbjmzILo90rppM1TWL9geoH5FEc5WhjnPyfvBgCv6cykR6PAJz6brlEtp9tuXmg4Q== X-Received: by 2002:a1c:4743:: with SMTP id u64-v6mr1671694wma.49.1529948317351; Mon, 25 Jun 2018 10:38:37 -0700 (PDT) Received: from arch-x1c3.cbg.collabora.co.uk ([2a00:5f00:102:0:9665:9cff:feee:aa4d]) by smtp.gmail.com with ESMTPSA id p8-v6sm6581019wrq.70.2018.06.25.10.38.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 10:38:36 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 09/10] drmdevice: convert the tabbed output into a tree Date: Mon, 25 Jun 2018 18:36:25 +0100 Message-Id: <20180625173626.8046-9-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180625173626.8046-1-emil.l.velikov@gmail.com> References: <20180625173626.8046-1-emil.l.velikov@gmail.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: emil.l.velikov@gmail.com MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Emil Velikov Making the output a little bit easier to parse by human beings. Signed-off-by: Emil Velikov --- tests/drmdevice.c | 78 +++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/tests/drmdevice.c b/tests/drmdevice.c index 0d75836f..e9e9d7f1 100644 --- a/tests/drmdevice.c +++ b/tests/drmdevice.c @@ -36,67 +36,67 @@ static void print_device_info(drmDevicePtr device, int i, bool print_revision) { printf("device[%i]\n", i); - printf("\tavailable_nodes %04x\n", device->available_nodes); - printf("\tnodes\n"); + printf("+->available_nodes %#04x\n", device->available_nodes); + printf("+->nodes\n"); for (int j = 0; j < DRM_NODE_MAX; j++) if (device->available_nodes & 1 << j) - printf("\t\tnodes[%d] %s\n", j, device->nodes[j]); + printf("| +->nodes[%d] %s\n", j, device->nodes[j]); - printf("\tbustype %04x\n", device->bustype); - printf("\tbusinfo\n"); + printf("+->bustype %04x\n", device->bustype); + printf("+->businfo\n"); if (device->bustype == DRM_BUS_PCI) { - printf("\t\tpci\n"); - printf("\t\t\tdomain\t%04x\n",device->businfo.pci->domain); - printf("\t\t\tbus\t%02x\n", device->businfo.pci->bus); - printf("\t\t\tdev\t%02x\n", device->businfo.pci->dev); - printf("\t\t\tfunc\t%1u\n", device->businfo.pci->func); - - printf("\tdeviceinfo\n"); - printf("\t\tpci\n"); - printf("\t\t\tvendor_id\t%04x\n", device->deviceinfo.pci->vendor_id); - printf("\t\t\tdevice_id\t%04x\n", device->deviceinfo.pci->device_id); - printf("\t\t\tsubvendor_id\t%04x\n", device->deviceinfo.pci->subvendor_id); - printf("\t\t\tsubdevice_id\t%04x\n", device->deviceinfo.pci->subdevice_id); + printf("| +->pci\n"); + printf("| +->domain %04x\n",device->businfo.pci->domain); + printf("| +->bus %02x\n", device->businfo.pci->bus); + printf("| +->dev %02x\n", device->businfo.pci->dev); + printf("| +->func %1u\n", device->businfo.pci->func); + + printf("+->deviceinfo\n"); + printf(" +->pci\n"); + printf(" +->vendor_id %04x\n", device->deviceinfo.pci->vendor_id); + printf(" +->device_id %04x\n", device->deviceinfo.pci->device_id); + printf(" +->subvendor_id %04x\n", device->deviceinfo.pci->subvendor_id); + printf(" +->subdevice_id %04x\n", device->deviceinfo.pci->subdevice_id); if (print_revision) - printf("\t\t\trevision_id\t%02x\n", device->deviceinfo.pci->revision_id); + printf(" +->revision_id %02x\n", device->deviceinfo.pci->revision_id); else - printf("\t\t\trevision_id\tIGNORED\n"); + printf(" +->revision_id IGNORED\n"); } else if (device->bustype == DRM_BUS_USB) { - printf("\t\tusb\n"); - printf("\t\t\tbus\t%03u\n", device->businfo.usb->bus); - printf("\t\t\tdev\t%03u\n", device->businfo.usb->dev); - - printf("\tdeviceinfo\n"); - printf("\t\tusb\n"); - printf("\t\t\tvendor\t%04x\n", device->deviceinfo.usb->vendor); - printf("\t\t\tproduct\t%04x\n", device->deviceinfo.usb->product); + printf("| +->usb\n"); + printf("| +->bus %03u\n", device->businfo.usb->bus); + printf("| +->dev %03u\n", device->businfo.usb->dev); + + printf("+->deviceinfo\n"); + printf(" +->usb\n"); + printf(" +->vendor %04x\n", device->deviceinfo.usb->vendor); + printf(" +->product %04x\n", device->deviceinfo.usb->product); } else if (device->bustype == DRM_BUS_PLATFORM) { char **compatible = device->deviceinfo.platform->compatible; - printf("\t\tplatform\n"); - printf("\t\t\tfullname\t%s\n", device->businfo.platform->fullname); + printf("| +->platform\n"); + printf("| +->fullname\t%s\n", device->businfo.platform->fullname); - printf("\tdeviceinfo\n"); - printf("\t\tplatform\n"); - printf("\t\t\tcompatible\n"); + printf("+->deviceinfo\n"); + printf(" +->platform\n"); + printf(" +->compatible\n"); while (*compatible) { - printf("\t\t\t\t%s\n", *compatible); + printf(" %s\n", *compatible); compatible++; } } else if (device->bustype == DRM_BUS_HOST1X) { char **compatible = device->deviceinfo.platform->compatible; - printf("\t\thost1x\n"); - printf("\t\t\tfullname\t%s\n", device->businfo.host1x->fullname); + printf("| +->host1x\n"); + printf("| +->fullname\t%s\n", device->businfo.host1x->fullname); - printf("\tdeviceinfo\n"); - printf("\t\tplatform\n"); - printf("\t\t\tcompatible\n"); + printf("+->deviceinfo\n"); + printf(" +->platform\n"); + printf(" +->compatible\n"); while (*compatible) { - printf("\t\t\t\t%s\n", *compatible); + printf(" %s\n", *compatible); compatible++; } } else {