SPM: Test open and close handle

The tests request valid and invalid handles and close them.

Change-Id: Ie421507d8dd4793e635e82f74c206529d9ba59d0
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/spm/cactus/cactus_service_loop.c b/spm/cactus/cactus_service_loop.c
index a6b576d..4b202ad 100644
--- a/spm/cactus/cactus_service_loop.c
+++ b/spm/cactus/cactus_service_loop.c
@@ -6,7 +6,6 @@
 
 #include <assert.h>
 #include <debug.h>
-#include <mm_svc.h>
 #include <sp_helpers.h>
 #include <sprt_svc.h>
 #include <spm_svc.h>
@@ -23,10 +22,10 @@
 	 * secure service requests.
 	 */
 	NOTICE("Cactus: Signal end of init to SPM\n");
-	event_status_code = SPM_SUCCESS;
+	event_status_code = SPRT_SUCCESS;
 
 	while (1) {
-		svc_values.arg0 = SP_EVENT_COMPLETE_AARCH64;
+		svc_values.arg0 = SPRT_REQUEST_COMPLETE_BLOCKING_AARCH64;
 		svc_values.arg1 = event_status_code;
 		int32_t event_id = sp_svc(&svc_values);
 
@@ -34,7 +33,7 @@
 
 		default:
 			NOTICE("Unhandled Service ID 0x%x\n", event_id);
-			event_status_code = SPM_NOT_SUPPORTED;
+			event_status_code = SPRT_NOT_SUPPORTED;
 			break;
 		}
 	}