From patchwork Sat Jul 4 14:49:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11643729 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 88E1160D for ; Sat, 4 Jul 2020 14:57:06 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 620C82158C for ; Sat, 4 Jul 2020 14:57:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AP5+c+c6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 620C82158C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jrjb1-0005HU-Ij; Sat, 04 Jul 2020 14:56:51 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jrjV1-0003ES-QB for xen-devel@lists.xenproject.org; Sat, 04 Jul 2020 14:50:39 +0000 X-Inumbo-ID: a78974d2-be05-11ea-b7bb-bc764e2007e4 Received: from mail-wm1-x330.google.com (unknown [2a00:1450:4864:20::330]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a78974d2-be05-11ea-b7bb-bc764e2007e4; Sat, 04 Jul 2020 14:50:08 +0000 (UTC) Received: by mail-wm1-x330.google.com with SMTP id j18so34715268wmi.3 for ; Sat, 04 Jul 2020 07:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CVXjF5m55kSlusAor5YG6lDc3XbyrrRebQzgpXEfhAM=; b=AP5+c+c62PoQXfTA/LtPm4Xh/2BhHY+f3Lrq+ywLKxnRs/teD8SlK4rBeR1W21QVVg MX5/zdYcr6MAV0tTj6y2JwWtreM0kI/3HLVXeM5Km0zk4LkxkDr+JUBRTgKPd4JDTNTQ qN+mtEml6SPGpVvDH0gvcL2DaAmIUkHFVWrvjkbOj7nMpqfWvSbHnLG867tnERkfPaEt R2NVOPlavAmVmA4nXJZ+9rKOMoryjsy3gDMvjOfRq/6T+kmZOAFOqpsdRHndZbJgqOt0 X2QNL+czgbdip7AR/uSYj4AY75akrcM9UFux62yHvkIZB1h62OgvTkd3vwzX7RVlkGWT qEKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CVXjF5m55kSlusAor5YG6lDc3XbyrrRebQzgpXEfhAM=; b=lhRpyZUIAEbEPAHb/Nraug1SZ3LRVUHjXHNvI723mGVchXoIGW8irweJuOft/pw8TD DKKKCFturVMwwEbHO3DgN9ShNGtSIj/Vzb21wMUDzWEk1EfvDs/KW4JjAbUd8o/dv0F3 fqZ2vITH6vBldGkiWW5BDLs/nXuwLZpJmbzPk8P9Q6eN7S/QUVt/fxB8uBa/Lskiba+0 YJ6t2SNrpIgPSOgmRQ/gkcHmwamazUyWsUte5cART1KbcGgt2NClCwt/E5iLjKRL9AuQ QlWyAOE/TnmBUqI9cM72lf8XYJsWf67sMhO51lLrvy34OcsUeJrWa/thu2xPbFj4YEgx I6vQ== X-Gm-Message-State: AOAM533jGOYSyEKbNpsL9nB3hEIOUZP7hQ5Bh8cq5kBCZPenxoB8e03F ysb5Dnqwmvap+rmDLyUJ8y8= X-Google-Smtp-Source: ABdhPJymro0ZDYhdB5ObnYkjPPmmHwp/a0dtBWYIDo1/eOyMgDUzyUYBTppKmDKb9G4hobFLnzrm0w== X-Received: by 2002:a1c:18e:: with SMTP id 136mr10977102wmb.93.1593874208054; Sat, 04 Jul 2020 07:50:08 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id r10sm17135019wrm.17.2020.07.04.07.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 07:50:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, BALATON Zoltan Subject: [PATCH 10/26] hw/usb/hcd-ehci: Move few definitions from header to source Date: Sat, 4 Jul 2020 16:49:27 +0200 Message-Id: <20200704144943.18292-11-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200704144943.18292-1-f4bug@amsat.org> References: <20200704144943.18292-1-f4bug@amsat.org> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S. Tsirkin" , Mark Cave-Ayland , Jiaxun Yang , Gerd Hoffmann , "Edgar E. Iglesias" , Huacai Chen , Stefano Stabellini , xen-devel@lists.xenproject.org, Yoshinori Sato , Paul Durrant , Magnus Damm , Markus Armbruster , =?utf-8?q?Herv=C3=A9_Poussineau?= , Marcel Apfelbaum , Anthony Perard , Samuel Thibault , Leif Lindholm , Andrzej Zaborowski , Aleksandar Rikalo , Eduardo Habkost , Alistair Francis , "Dr. David Alan Gilbert" , Beniamino Galvani , Niek Linnenbank , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Radoslaw Biernacki , Igor Mitsyanko , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Paul Zimmerman , qemu-ppc@nongnu.org, David Gibson , Paolo Bonzini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Move definitions only useful for hcd-ehci.c to this source file. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/usb/hcd-ehci.h | 11 ----------- hw/usb/hcd-ehci.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 57b38cfc05..4577f5e31d 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -24,17 +24,6 @@ #include "hw/pci/pci.h" #include "hw/sysbus.h" -#ifndef EHCI_DEBUG -#define EHCI_DEBUG 0 -#endif - -#if EHCI_DEBUG -#define DPRINTF printf -#else -#define DPRINTF(...) -#endif - -#define MMIO_SIZE 0x1000 #define CAPA_SIZE 0x10 #define NB_PORTS 6 /* Max. Number of downstream ports */ diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 256fb91e0c..a0beee527c 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -36,6 +36,18 @@ #include "qemu/error-report.h" #include "sysemu/runstate.h" +#ifndef EHCI_DEBUG +#define EHCI_DEBUG 0 +#endif + +#if EHCI_DEBUG +#define DPRINTF printf +#else +#define DPRINTF(...) +#endif + +#define MMIO_SIZE 0x1000 + #define FRAME_TIMER_FREQ 1000 #define FRAME_TIMER_NS (NANOSECONDS_PER_SECOND / FRAME_TIMER_FREQ) #define UFRAME_TIMER_NS (FRAME_TIMER_NS / 8)