From patchwork Fri Sep 5 11:56:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 36817 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 67F70202E4 for ; Fri, 5 Sep 2014 11:57:26 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id a41sf2809556yho.0 for ; Fri, 05 Sep 2014 04:57:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=wWdZ6rOAkqnKJTgbIah5bUC40He1k/xRks90uOMhBEI=; b=DtPe9Y0Nk6rRxnFN/jyLVSCZEgpxVuedbQhbuRw0g3c9YY0XU3M9/DHQlwouWxE2OV TLCSLLHaljPco7ZWRiontEHXldFnnJN3hLEH0CkHIOfQBfiLGavCL1cdbKTC2Dd/9oEZ qDlfcZFP2W2kSiPno3H7sxpbY9N0WDEH+Wy3U1pLujt/KIwvaLpzNGCh6JBDPoFM/Fl7 PcIsAreif2xj9nz5J/HlmuS1+ceVBa+DM9IEOhszvepKjcqjLVFG7a87uEitTml0bDVd 1XH1fqLxjc/peqg4uV74eVb3a9iF5j67E6jof3ka9MBP490vsmKrd1fpn7kYd+M1VlMA IGiw== X-Gm-Message-State: ALoCoQmYcKIsnNsvqAUpuNN2ndR8+H8O0lgix73Ln6dorrsnQJoTMINi9fDeiatI67TZxVnUdgi1 X-Received: by 10.236.28.228 with SMTP id g64mr6547736yha.40.1409918246272; Fri, 05 Sep 2014 04:57:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.113 with SMTP id e104ls704103qgd.33.gmail; Fri, 05 Sep 2014 04:57:26 -0700 (PDT) X-Received: by 10.52.28.198 with SMTP id d6mr152622vdh.68.1409918246114; Fri, 05 Sep 2014 04:57:26 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id qi14si928106vdb.83.2014.09.05.04.57.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 04:57:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id le20so820812vcb.17 for ; Fri, 05 Sep 2014 04:57:26 -0700 (PDT) X-Received: by 10.53.5.163 with SMTP id cn3mr8141713vdd.3.1409918246011; Fri, 05 Sep 2014 04:57:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp71037vcb; Fri, 5 Sep 2014 04:57:25 -0700 (PDT) X-Received: by 10.42.212.146 with SMTP id gs18mr2062278icb.96.1409918243046; Fri, 05 Sep 2014 04:57:23 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id e3si1947037igl.1.2014.09.05.04.57.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 05 Sep 2014 04:57:23 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XPs8g-0002f1-QS; Fri, 05 Sep 2014 11:57:14 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XPs8f-0002eq-5F for edk2-devel@lists.sourceforge.net; Fri, 05 Sep 2014 11:57:13 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.176 as permitted sender) client-ip=209.85.212.176; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wi0-f176.google.com; Received: from mail-wi0-f176.google.com ([209.85.212.176]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1XPs8e-0007my-0B for edk2-devel@lists.sourceforge.net; Fri, 05 Sep 2014 11:57:13 +0000 Received: by mail-wi0-f176.google.com with SMTP id bs8so682482wib.9 for ; Fri, 05 Sep 2014 04:57:05 -0700 (PDT) X-Received: by 10.194.71.210 with SMTP id x18mr13822796wju.6.1409918225595; Fri, 05 Sep 2014 04:57:05 -0700 (PDT) Received: from ards-macbook-pro.local (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by mx.google.com with ESMTPSA id dc9sm1758798wib.5.2014.09.05.04.57.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 04:57:04 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, lersek@redhat.com, olivier.martin@arm.com Date: Fri, 5 Sep 2014 13:56:35 +0200 Message-Id: <1409918214-29584-6-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1409918214-29584-1-git-send-email-ard.biesheuvel@linaro.org> References: <1409918214-29584-1-git-send-email-ard.biesheuvel@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1XPs8e-0007my-0B Cc: peter.maydell@linaro.org, ilias.biris@linaro.org, christoffer.dall@linaro.org Subject: [edk2] [PATCH v7 05/24] ArmPkg: rename ArmArchTimerLib.h to ArmArchTimer.h X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The ArmArchTimerLib.h include file is not directly related to the TimerLib instance ArmArchTimerLib, so the name is confusing. Rename to ArmArchTimer.h instead. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Acked-by: Laszlo Ersek --- ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.c | 2 +- ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c | 2 +- ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.c | 2 +- ArmPkg/Drivers/TimerDxe/TimerDxe.c | 2 +- ArmPkg/Include/Library/{ArmArchTimerLib.h => ArmArchTimer.h} | 6 +++--- ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c | 2 +- ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimer.c | 2 +- ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename ArmPkg/Include/Library/{ArmArchTimerLib.h => ArmArchTimer.h} (88%) diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.c b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.c index 2e62a4f7742f..585695a7dd5c 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.c +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c index 99ee51fb6e2d..97f1ced41362 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.c b/ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.c index 3c85da616e94..3e7fa124ce48 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.c +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.c b/ArmPkg/Drivers/TimerDxe/TimerDxe.c index 329b085ec464..40ccf161be63 100644 --- a/ArmPkg/Drivers/TimerDxe/TimerDxe.c +++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/ArmPkg/Include/Library/ArmArchTimerLib.h b/ArmPkg/Include/Library/ArmArchTimer.h similarity index 88% rename from ArmPkg/Include/Library/ArmArchTimerLib.h rename to ArmPkg/Include/Library/ArmArchTimer.h index 1ecada383b29..eb7e87d3c4fc 100644 --- a/ArmPkg/Include/Library/ArmArchTimerLib.h +++ b/ArmPkg/Include/Library/ArmArchTimer.h @@ -12,8 +12,8 @@ **/ -#ifndef __ARM_ARCH_TIMER_LIB_H__ -#define __ARM_ARCH_TIMER_LIB_H__ +#ifndef __ARM_ARCH_TIMER_H__ +#define __ARM_ARCH_TIMER_H__ #define ARM_ARCH_TIMER_ENABLE (1 << 0) #define ARM_ARCH_TIMER_IMASK (1 << 1) @@ -112,4 +112,4 @@ ArmArchTimerSetCompareVal ( IN UINT64 Val ); -#endif // __ARM_ARCH_TIMER_LIB_H__ +#endif // __ARM_ARCH_TIMER_H__ diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c index 4fe7cb8d648f..ec4c39dbc989 100644 --- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c +++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #define TICKS_PER_MICRO_SEC (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U) diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimer.c b/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimer.c index fa4f7c741b15..6a461eb2e43e 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimer.c +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimer.c @@ -21,7 +21,7 @@ #include #include "AArch64Lib.h" #include "ArmLibPrivate.h" -#include +#include VOID EFIAPI diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c b/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c index 79083f56b708..bebdafce7dba 100644 --- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c +++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c @@ -21,7 +21,7 @@ #include #include "ArmV7Lib.h" #include "ArmLibPrivate.h" -#include +#include VOID EFIAPI