From f14dcdd0da1fef5eaf9d179be7110925bc5a1b3f Mon Sep 17 00:00:00 2001
From: Adrian Danis <Adrian.Danis@data61.csiro.au>
Date: Wed, 15 Jun 2016 17:51:06 +1000
Subject: [PATCH] arm-hyp: Add conditions to invocations

---
 libsel4/arch_include/arm/interfaces/sel4arch.xml          | 6 +++---
 libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libsel4/arch_include/arm/interfaces/sel4arch.xml b/libsel4/arch_include/arm/interfaces/sel4arch.xml
index c20bb6eb2..92fdbd333 100644
--- a/libsel4/arch_include/arm/interfaces/sel4arch.xml
+++ b/libsel4/arch_include/arm/interfaces/sel4arch.xml
@@ -19,11 +19,11 @@
 		</method>
 	</interface>
     <interface name="seL4_ARM_IOPageTable">
-        <method id="ARMIOPageTableMap" name="Map">
+        <method id="ARMIOPageTableMap" name="Map" config="CONFIG_ARM_SMMU">
             <param dir="in" name="iospace" type="seL4_ARM_IOSpace"/>
             <param dir="in" name="ioaddr" type="seL4_Word"/>
         </method>
-        <method id="ARMIOPageTableUnmap" name="Unmap">
+        <method id="ARMIOPageTableUnmap" name="Unmap" config="CONFIG_ARM_SMMU">
         </method>
     </interface>
 	<interface name="seL4_ARM_Page">
@@ -39,7 +39,7 @@
 			<param dir="in" name="attr" type="seL4_ARM_VMAttributes"/>
 		</method>
 		<method id="ARMPageUnmap" name="Unmap"/>
-        <method id="ARMPageMapIO" name="MapIO">
+        <method id="ARMPageMapIO" name="MapIO" config="CONFIG_ARM_SMMU">
             <param dir="in" name="iospace" type="seL4_ARM_IOSpace"/>
             <param dir="in" name="rights" type="seL4_CapRights"/>
             <param dir="in" name="ioaddr" type="seL4_Word"/>
diff --git a/libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml b/libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml
index 544ff48ca..e28150d21 100644
--- a/libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml
+++ b/libsel4/sel4_arch_include/aarch32/interfaces/sel4arch.xml
@@ -47,20 +47,20 @@
 		</method>
     </interface>
     <interface name="seL4_ARM_VCPU">
-        <method id="ARMVCPUSetTCB" name="SetTCB">
+        <method id="ARMVCPUSetTCB" name="SetTCB" config="CONFIG_ARM_HYPERVISOR_SUPPORT">
             <param dir="in" name="tcb" type="seL4_TCB" />
         </method>
-        <method id="ARMVCPUInjectIRQ" name="InjectIRQ">
+        <method id="ARMVCPUInjectIRQ" name="InjectIRQ" config="CONFIG_ARM_HYPERVISOR_SUPPORT">
             <param dir="in" name="virq" type="seL4_Uint16"/>
             <param dir="in" name="priority" type="seL4_Uint8"/>
             <param dir="in" name="group" type="seL4_Uint8"/>
             <param dir="in" name="index" type="seL4_Uint8"/>
         </method>
-        <method id="ARMVCPUReadReg" name="ReadRegs">
+        <method id="ARMVCPUReadReg" name="ReadRegs" config="CONFIG_ARM_HYPERVISOR_SUPPORT">
             <param dir="in" name="field" type="seL4_Uint32"/>
             <param dir="out" name="value" type="seL4_Uint32"/>
         </method>
-        <method id="ARMVCPUWriteReg" name="WriteRegs">
+        <method id="ARMVCPUWriteReg" name="WriteRegs" config="CONFIG_ARM_HYPERVISOR_SUPPORT">
             <param dir="in" name="field" type="seL4_Uint32"/>
             <param dir="in" name="value" type="seL4_Uint32"/>
         </method>