From patchwork Wed Sep 9 17:21:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 7147671 Return-Path: X-Original-To: patchwork-dri-devel@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 488089F380 for ; Wed, 9 Sep 2015 17:17:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 523E720A17 for ; Wed, 9 Sep 2015 17:17:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 61A9320567 for ; Wed, 9 Sep 2015 17:17:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B1EB6EC8F; Wed, 9 Sep 2015 10:17:33 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by gabe.freedesktop.org (Postfix) with ESMTPS id CEF316EC88 for ; Wed, 9 Sep 2015 10:17:31 -0700 (PDT) Received: by wicgb1 with SMTP id gb1so124888219wic.1 for ; Wed, 09 Sep 2015 10:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QazD+04FsXrkabcEsaEes8Rh4oX8jZ9Zphke2G1AWnM=; b=HcwsjQnUeRubOU8+1hLhCkzRhABAmGDpoT8nSygf1iBfstvkwcICwU7eH4aWe4vO9j Iqw8K5feWBVOyG7WxmtsjkbE00S8eRzRr+AdMhnFoORuNZkZkR3VLQXw70D2R2TDlfmi iiZcg5M8+aTRelcqP/Yawlv3CsstqQI19USFmznzgq2z1OIruZBOgm67IsGnNR87FgxI jHuHp0rI2Bh0Afzu+Vnbzo4G7maHlo9jz79zse8QXhP+pSD8y5Rm4uDBviiYCC6BV+qq sWO2ExKSi/TfourEEU0i0uXTg40frKIglNK9fc8RZiRs0OilALA9DI5Ypj/upuT3y98s DGKQ== X-Received: by 10.194.158.234 with SMTP id wx10mr31134388wjb.120.1441819050493; Wed, 09 Sep 2015 10:17:30 -0700 (PDT) Received: from arch-x220.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by smtp.gmail.com with ESMTPSA id j7sm11257042wjz.11.2015.09.09.10.17.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Sep 2015 10:17:29 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 08/12] xf86drm: move ifdef __linux__ guards where needed Date: Wed, 9 Sep 2015 18:21:29 +0100 Message-Id: <1441819293-25567-9-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1441819293-25567-1-git-send-email-emil.l.velikov@gmail.com> References: <1441819293-25567-1-git-send-email-emil.l.velikov@gmail.com> Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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 Signed-off-by: Emil Velikov --- xf86drm.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/xf86drm.c b/xf86drm.c index 8105b42..3d03cbf 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -2836,9 +2836,9 @@ char *drmGetRenderDeviceNameFromFd(int fd) return drmGetMinorNameForFD(fd, DRM_NODE_RENDER); } -#ifdef __linux__ static int drmParseSubsystemType(int maj, int min) { +#ifdef __linux__ char path[PATH_MAX + 1]; char link[PATH_MAX + 1] = ""; char *name; @@ -2857,10 +2857,15 @@ static int drmParseSubsystemType(int maj, int min) return DRM_BUS_PCI; return -EINVAL; +#else +#warning "Missing implementation of drmParseSubsystemType" + return -EINVAL; +#endif } static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info) { +#ifdef __linux__ char path[PATH_MAX + 1]; char data[128]; char *str; @@ -2893,6 +2898,10 @@ static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info) info->func = func; return 0; +#else +#warning "Missing implementation of drmParsePciBusInfo" + return -EINVAL; +#endif } static int drmCompareBusInfo(drmDevicePtr a, drmDevicePtr b) @@ -2942,6 +2951,7 @@ static int drmGetMaxNodeName(void) static int drmParsePciDeviceInfo(const char *d_name, drmPciDeviceInfoPtr device) { +#ifdef __linux__ char path[PATH_MAX + 1]; unsigned char config[64]; int fd, ret; @@ -2963,6 +2973,10 @@ static int drmParsePciDeviceInfo(const char *d_name, device->subdevice_id = config[46] | (config[47] << 8); return 0; +#else +#warning "Missing implementation of drmParsePciDeviceInfo" + return -EINVAL; +#endif } static void drmFreeDevice(drmDevicePtr *device) @@ -3139,20 +3153,3 @@ close_sysdir: closedir(sysdir); return ret; } -#else -void drmFreeDevices(drmDevicePtr devices[], int count) -{ - (void)devices; - (void)count; -} - -int drmGetDevices(drmDevicePtr devices[], int max_devices) -{ - (void)devices; - (void)max_devices; - return -EINVAL; -} - -#warning "Missing implementation of drmGetDevices/drmFreeDevices" - -#endif