From 35e98e5588d09145f7d0d4d98624f6b75321a187 Mon Sep 17 00:00:00 2001 From: Dan Handley Date: Wed, 9 Apr 2014 13:13:04 +0100 Subject: Make use of user/system includes more consistent Make codebase consistent in its use of #include "" syntax for user includes and #include <> syntax for system includes. Fixes ARM-software/tf-issues#65 Change-Id: If2f7c4885173b1fd05ac2cde5f1c8a07000c7a33 --- services/spd/tspd/tspd.mk | 3 +-- services/spd/tspd/tspd_common.c | 2 +- services/spd/tspd/tspd_helpers.S | 2 +- services/spd/tspd/tspd_main.c | 2 +- services/spd/tspd/tspd_pm.c | 2 +- services/std_svc/psci/psci_afflvl_off.c | 2 +- services/std_svc/psci/psci_afflvl_on.c | 2 +- services/std_svc/psci/psci_afflvl_suspend.c | 2 +- services/std_svc/psci/psci_common.c | 4 ++-- services/std_svc/psci/psci_entry.S | 2 +- services/std_svc/psci/psci_main.c | 2 +- services/std_svc/psci/psci_setup.c | 2 +- services/std_svc/std_svc_setup.c | 2 +- 13 files changed, 14 insertions(+), 15 deletions(-) (limited to 'services') diff --git a/services/spd/tspd/tspd.mk b/services/spd/tspd/tspd.mk index 532e168..02446a3 100644 --- a/services/spd/tspd/tspd.mk +++ b/services/spd/tspd/tspd.mk @@ -29,8 +29,7 @@ # TSPD_DIR := services/spd/tspd -SPD_INCLUDES := -Iinclude/bl32/payloads \ - -I${TSPD_DIR} +SPD_INCLUDES := -Iinclude/bl32/payloads SPD_SOURCES := tspd_common.c \ tspd_main.c \ diff --git a/services/spd/tspd/tspd_common.c b/services/spd/tspd/tspd_common.c index b806543..fcc2765 100644 --- a/services/spd/tspd/tspd_common.c +++ b/services/spd/tspd/tspd_common.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include "tspd_private.h" /******************************************************************************* * Given a secure payload entrypoint, register width, cpu id & pointer to a diff --git a/services/spd/tspd/tspd_helpers.S b/services/spd/tspd/tspd_helpers.S index 27fbb5a..f9a32aa 100644 --- a/services/spd/tspd/tspd_helpers.S +++ b/services/spd/tspd/tspd_helpers.S @@ -29,9 +29,9 @@ */ #include -#include #include #include +#include "tspd_private.h" .global tspd_enter_sp /* --------------------------------------------- diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index 543266e..90fa094 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -49,9 +49,9 @@ #include #include #include -#include #include #include +#include "tspd_private.h" /******************************************************************************* * Single structure to hold information about the various entry points into the diff --git a/services/spd/tspd/tspd_pm.c b/services/spd/tspd/tspd_pm.c index 4ebafc7..6a07aa2 100644 --- a/services/spd/tspd/tspd_pm.c +++ b/services/spd/tspd/tspd_pm.c @@ -39,8 +39,8 @@ #include #include #include -#include #include +#include "tspd_private.h" /******************************************************************************* * The target cpu is being turned on. Allow the TSPD/TSP to perform any actions diff --git a/services/std_svc/psci/psci_afflvl_off.c b/services/std_svc/psci/psci_afflvl_off.c index f6bd40c..0598f42 100644 --- a/services/std_svc/psci/psci_afflvl_off.c +++ b/services/std_svc/psci/psci_afflvl_off.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include "psci_private.h" typedef int (*afflvl_off_handler)(unsigned long, aff_map_node *); diff --git a/services/std_svc/psci/psci_afflvl_on.c b/services/std_svc/psci/psci_afflvl_on.c index 0878f21..700a4e9 100644 --- a/services/std_svc/psci/psci_afflvl_on.c +++ b/services/std_svc/psci/psci_afflvl_on.c @@ -36,8 +36,8 @@ #include #include #include -#include #include +#include "psci_private.h" typedef int (*afflvl_on_handler)(unsigned long, aff_map_node *, diff --git a/services/std_svc/psci/psci_afflvl_suspend.c b/services/std_svc/psci/psci_afflvl_suspend.c index fc6fe1f..ec7b89f 100644 --- a/services/std_svc/psci/psci_afflvl_suspend.c +++ b/services/std_svc/psci/psci_afflvl_suspend.c @@ -36,8 +36,8 @@ #include #include #include -#include #include +#include "psci_private.h" typedef int (*afflvl_suspend_handler)(unsigned long, aff_map_node *, diff --git a/services/std_svc/psci/psci_common.c b/services/std_svc/psci/psci_common.c index 8b49b77..fc10ab0 100644 --- a/services/std_svc/psci/psci_common.c +++ b/services/std_svc/psci/psci_common.c @@ -35,10 +35,10 @@ #include #include #include -#include #include #include -#include "debug.h" +#include +#include "psci_private.h" /* * SPD power management operations, expected to be supplied by the registered diff --git a/services/std_svc/psci/psci_entry.S b/services/std_svc/psci/psci_entry.S index bdd571e..8a73e8b 100644 --- a/services/std_svc/psci/psci_entry.S +++ b/services/std_svc/psci/psci_entry.S @@ -31,10 +31,10 @@ #include #include #include -#include #include #include #include +#include "psci_private.h" .globl psci_aff_on_finish_entry .globl psci_aff_suspend_finish_entry diff --git a/services/std_svc/psci/psci_main.c b/services/std_svc/psci/psci_main.c index c90929d..8692adf 100644 --- a/services/std_svc/psci/psci_main.c +++ b/services/std_svc/psci/psci_main.c @@ -34,10 +34,10 @@ #include #include #include -#include #include #include #include +#include "psci_private.h" /******************************************************************************* * PSCI frontend api for servicing SMCs. Described in the PSCI spec. diff --git a/services/std_svc/psci/psci_setup.c b/services/std_svc/psci/psci_setup.c index 4525d78..6325815 100644 --- a/services/std_svc/psci/psci_setup.c +++ b/services/std_svc/psci/psci_setup.c @@ -34,9 +34,9 @@ #include #include #include -#include #include #include +#include "psci_private.h" /******************************************************************************* * Per cpu non-secure contexts used to program the architectural state prior diff --git a/services/std_svc/std_svc_setup.c b/services/std_svc/std_svc_setup.c index 080836a..7d5527a 100644 --- a/services/std_svc/std_svc_setup.c +++ b/services/std_svc/std_svc_setup.c @@ -34,8 +34,8 @@ #include #include #include -#include #include +#include "psci/psci_private.h" /* Standard Service UUID */ DEFINE_SVC_UUID(arm_svc_uid, -- cgit v1.2.3