From 602b7f58dd7668411c8a4032652b4552bd7fe934 Mon Sep 17 00:00:00 2001
From: Ambroise Vincent <ambroise.vincent@arm.com>
Date: Mon, 11 Feb 2019 14:13:43 +0000
Subject: libc: Update includes

Reflect the changes in the structure of libc.

NB: the include of stdarg.h in nvm_results_helpers.c is not in alphabetical
order because it needs to be included before stdio.h. Fixing this would require
further changes.

Change-Id: I07f62a3450802833408ff3e1f950fd3b643e5e33
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
---
 include/common/debug.h                                          | 6 ++++++
 include/common/param_header.h                                   | 2 +-
 include/drivers/console.h                                       | 2 +-
 include/lib/irq.h                                               | 1 +
 include/lib/power_management.h                                  | 1 -
 include/lib/tftf_lib.h                                          | 1 -
 include/runtime_services/secure_el0_payloads/secure_partition.h | 2 +-
 include/runtime_services/spci_helpers.h                         | 1 -
 8 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/common/debug.h b/include/common/debug.h
index 53eebf7..9b2d842 100644
--- a/include/common/debug.h
+++ b/include/common/debug.h
@@ -65,6 +65,12 @@ void mp_printf(const char *fmt, ...);
 # define VERBOSE(...)
 #endif
 
+#if ENABLE_BACKTRACE
+void backtrace(const char *cookie);
+#else
+#define backtrace(x)
+#endif
+
 /*
  * For the moment this panic function is very basic: report an error and
  * spin. This can be expanded in the future to provide more information.
diff --git a/include/common/param_header.h b/include/common/param_header.h
index 32763dd..7834cbb 100644
--- a/include/common/param_header.h
+++ b/include/common/param_header.h
@@ -36,7 +36,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <types.h>
+#include <stdint.h>
 
 /***************************************************************************
  * This structure provides version information and the size of the
diff --git a/include/drivers/console.h b/include/drivers/console.h
index abbe356..72decb9 100644
--- a/include/drivers/console.h
+++ b/include/drivers/console.h
@@ -14,7 +14,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <types.h>
+#include <stdint.h>
 
 int console_init(uintptr_t base_addr,
 		unsigned int uart_clk, unsigned int baud_rate);
diff --git a/include/lib/irq.h b/include/lib/irq.h
index 1628221..6a37e05 100644
--- a/include/lib/irq.h
+++ b/include/lib/irq.h
@@ -7,6 +7,7 @@
 #ifndef __IRQ_H__
 #define  __IRQ_H__
 
+#include <cdefs.h>
 #include <platform_def.h> /* For CACHE_WRITEBACK_GRANULE */
 #include <stdint.h>
 
diff --git a/include/lib/power_management.h b/include/lib/power_management.h
index d2d6901..3d8e961 100644
--- a/include/lib/power_management.h
+++ b/include/lib/power_management.h
@@ -11,7 +11,6 @@
 #include <psci.h>
 #include <spinlock.h>
 #include <stdint.h>
-#include <types.h>
 
 /* Set of states of an affinity node as seen by the Test Framework */
 typedef enum {
diff --git a/include/lib/tftf_lib.h b/include/lib/tftf_lib.h
index 58112b4..3f60fec 100644
--- a/include/lib/tftf_lib.h
+++ b/include/lib/tftf_lib.h
@@ -13,7 +13,6 @@
 #include <arch_helpers.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <sys/types.h>
 
 /*
  * Possible error codes for signaling the result of a test
diff --git a/include/runtime_services/secure_el0_payloads/secure_partition.h b/include/runtime_services/secure_el0_payloads/secure_partition.h
index 712337e..0a41dde 100644
--- a/include/runtime_services/secure_el0_payloads/secure_partition.h
+++ b/include/runtime_services/secure_el0_payloads/secure_partition.h
@@ -8,7 +8,7 @@
 #define SECURE_PARTITION_H
 
 #include <param_header.h>
-#include <types.h>
+#include <stdint.h>
 #include <utils_def.h>
 
 /*
diff --git a/include/runtime_services/spci_helpers.h b/include/runtime_services/spci_helpers.h
index 3452452..a64591e 100644
--- a/include/runtime_services/spci_helpers.h
+++ b/include/runtime_services/spci_helpers.h
@@ -18,7 +18,6 @@
 #ifndef __ASSEMBLY__
 
 #include <stdint.h>
-#include <types.h>
 
 int spci_service_handle_open(uint16_t client_id, uint16_t *handle,
 			     uint32_t uuid1, uint32_t uuid2,
-- 
cgit v1.2.3