diff options
| author | danh-arm <dan.handley@arm.com> | 2014-05-06 17:54:03 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-05-06 17:54:03 +0100 |
| commit | 408c37682a0233c8c4fa88700b603f0b09d6361f (patch) | |
| tree | 18133148dea88d9a2313113111b24b56e8130505 /services/std_svc/psci/psci_setup.c | |
| parent | b495bdef190acf166c713e138b61c5bb25402fc0 (diff) | |
| parent | 97043ac98e13a726dbf8b3b41654dca759e3da2c (diff) | |
Merge pull request #48 from danh-arm/dh/major-refactoring
dh/major refactoring
Diffstat (limited to 'services/std_svc/psci/psci_setup.c')
| -rw-r--r-- | services/std_svc/psci/psci_setup.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/services/std_svc/psci/psci_setup.c b/services/std_svc/psci/psci_setup.c index 4525d78d..71d3f1e7 100644 --- a/services/std_svc/psci/psci_setup.c +++ b/services/std_svc/psci/psci_setup.c @@ -28,15 +28,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <stdio.h> -#include <string.h> -#include <assert.h> +#include <arch.h> #include <arch_helpers.h> -#include <console.h> -#include <platform.h> -#include <psci_private.h> +#include <assert.h> +#include <bl_common.h> +#include <context.h> #include <context_mgmt.h> -#include <runtime_svc.h> +#include <platform.h> +#include <stddef.h> +#include "psci_private.h" /******************************************************************************* * Per cpu non-secure contexts used to program the architectural state prior @@ -45,7 +45,7 @@ * of relying on platform defined constants. Using PSCI_NUM_AFFS will be an * overkill. ******************************************************************************/ -static cpu_context psci_ns_context[PLATFORM_CORE_COUNT]; +static cpu_context_t psci_ns_context[PLATFORM_CORE_COUNT]; /******************************************************************************* * Routines for retrieving the node corresponding to an affinity level instance @@ -81,7 +81,7 @@ static int psci_aff_map_get_idx(unsigned long key, return mid; } -aff_map_node *psci_get_aff_map_node(unsigned long mpidr, int aff_lvl) +aff_map_node_t *psci_get_aff_map_node(unsigned long mpidr, int aff_lvl) { int rc; @@ -106,10 +106,10 @@ aff_map_node *psci_get_aff_map_node(unsigned long mpidr, int aff_lvl) int psci_get_aff_map_nodes(unsigned long mpidr, int start_afflvl, int end_afflvl, - mpidr_aff_map_nodes mpidr_nodes) + mpidr_aff_map_nodes_t mpidr_nodes) { int rc = PSCI_E_INVALID_PARAMS, level; - aff_map_node *node; + aff_map_node_t *node; rc = psci_check_afflvl_range(start_afflvl, end_afflvl); if (rc != PSCI_E_SUCCESS) @@ -285,7 +285,7 @@ int32_t psci_setup(void) { unsigned long mpidr = read_mpidr(); int afflvl, affmap_idx, max_afflvl; - aff_map_node *node; + aff_map_node_t *node; psci_ns_einfo_idx = 0; psci_plat_pm_ops = NULL; |