From patchwork Wed Sep 3 11:17:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 36569 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A3C52204FF for ; Wed, 3 Sep 2014 11:18:54 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lf10sf82081272pab.5 for ; Wed, 03 Sep 2014 04:18:49 -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=gs4HYABX428S/cZEdD7qt59YAK4vcIhA1xzjwagKJ/WtdFe0+9aNnUv1qoD7LkHfFB Y186vsS0ro7159YXIMqaRxzJ4Krh/VecqTDqQJqKNsK2B6ilpDQ++YHvhVb3R27V1TrT lrRduA41ifBBZvYUb9WrPBkXCNHlcd4omnRxffkPYhd1dJrPDNFI+co0ubdElJ1tHnM4 8MO1f4ByP34hx62MuPAEDFZJtYRUb3eK88QUrFzp7MRGnZN3diOcfC5/PiIrE5K5XV/V aWuDOaWDHszEQwfBm6cmrykNU5hcgJbHpl+FW+bURi8S17j6wPL3h1AYt2DTn3LUy217 7qAQ== X-Gm-Message-State: ALoCoQkgvruwl57/qbd07gEct4oV3WCOsQSz/waoWtxtIvEOrLhe3wjsFUicK4R8uYfxAnWqR7/7 X-Received: by 10.66.66.170 with SMTP id g10mr22757900pat.12.1409743128361; Wed, 03 Sep 2014 04:18:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.6 with SMTP id s6ls2728088qgd.22.gmail; Wed, 03 Sep 2014 04:18:48 -0700 (PDT) X-Received: by 10.52.228.67 with SMTP id sg3mr29153769vdc.6.1409743128251; Wed, 03 Sep 2014 04:18:48 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id h9si723123vdw.30.2014.09.03.04.18.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Sep 2014 04:18:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id im17so8506428vcb.4 for ; Wed, 03 Sep 2014 04:18:48 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr25231241vdb.25.1409743128143; Wed, 03 Sep 2014 04:18:48 -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 uj3csp663940vcb; Wed, 3 Sep 2014 04:18:47 -0700 (PDT) X-Received: by 10.50.114.38 with SMTP id jd6mr35869067igb.25.1409743126929; Wed, 03 Sep 2014 04:18:46 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id t5si1660793igm.43.2014.09.03.04.18.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Sep 2014 04:18:46 -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-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XP8aF-0004Dn-0q; Wed, 03 Sep 2014 11:18:39 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XP8aD-0004Dd-Ti for edk2-devel@lists.sourceforge.net; Wed, 03 Sep 2014 11:18:37 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.48 as permitted sender) client-ip=74.125.82.48; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wg0-f48.google.com; Received: from mail-wg0-f48.google.com ([74.125.82.48]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1XP8aC-0005PH-Tf for edk2-devel@lists.sourceforge.net; Wed, 03 Sep 2014 11:18:37 +0000 Received: by mail-wg0-f48.google.com with SMTP id n12so8266475wgh.19 for ; Wed, 03 Sep 2014 04:18:30 -0700 (PDT) X-Received: by 10.194.90.114 with SMTP id bv18mr46737004wjb.63.1409743110671; Wed, 03 Sep 2014 04:18:30 -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 p1sm15258661wjy.22.2014.09.03.04.18.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Sep 2014 04:18:30 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, lersek@redhat.com, olivier.martin@arm.com Date: Wed, 3 Sep 2014 13:17:58 +0200 Message-Id: <1409743096-14919-6-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1409743096-14919-1-git-send-email-ard.biesheuvel@linaro.org> References: <1409743096-14919-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: 1XP8aC-0005PH-Tf Cc: peter.maydell@linaro.org, ilias.biris@linaro.org, christoffer.dall@linaro.org Subject: [edk2] [PATCH v6 05/23] 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.173 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 --- 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