From 2c983f3c89f2b7b999df86d75790a0ae941abc02 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Wed, 25 Sep 2013 12:01:03 +0200
Subject: [PATCH] nova: remove native_cap method from cpu_session

Remove native_cap method which caused the cpu_session implementation of the
gdb server to fail.

Issue #478
---
 base-nova/include/cpu_session/client.h        |  3 ---
 .../nova_cpu_session/nova_cpu_session.h       |  7 +-----
 base-nova/src/core/cpu_session_extension.cc   | 12 ----------
 .../src/core/include/cpu_session_component.h  |  1 -
 base-nova/src/core/include/platform_thread.h  | 22 -------------------
 5 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/base-nova/include/cpu_session/client.h b/base-nova/include/cpu_session/client.h
index 8650c2f9b..2ea9217eb 100644
--- a/base-nova/include/cpu_session/client.h
+++ b/base-nova/include/cpu_session/client.h
@@ -73,9 +73,6 @@ namespace Genode {
 		void single_step(Thread_capability thread, bool enable) {
 			call<Rpc_single_step>(thread, enable); }
 
-		Native_capability native_cap(Thread_capability cap) {
-			return call<Rpc_native_cap>(cap); }
-
 		Affinity::Space affinity_space() const {
 			return call<Rpc_affinity_space>(); }
 
diff --git a/base-nova/include/nova_cpu_session/nova_cpu_session.h b/base-nova/include/nova_cpu_session/nova_cpu_session.h
index 290ffea7f..d77e72375 100644
--- a/base-nova/include/nova_cpu_session/nova_cpu_session.h
+++ b/base-nova/include/nova_cpu_session/nova_cpu_session.h
@@ -23,8 +23,6 @@ namespace Genode {
 	{
 		virtual ~Nova_cpu_session() { }
 
-		virtual Native_capability native_cap(Thread_capability cap) = 0;
-
 		virtual Native_capability pause_sync(Thread_capability) = 0;
 
 
@@ -32,13 +30,10 @@ namespace Genode {
 		 ** RPC declaration **
 		 *********************/
 
-		GENODE_RPC(Rpc_native_cap, Native_capability, native_cap,
-		           Thread_capability);
 		GENODE_RPC(Rpc_pause_sync, Native_capability, pause_sync,
 		           Thread_capability);
 
-		GENODE_RPC_INTERFACE_INHERIT(Cpu_session, Rpc_native_cap,
-		                             Rpc_pause_sync);
+		GENODE_RPC_INTERFACE_INHERIT(Cpu_session, Rpc_pause_sync);
 	};
 }
 
diff --git a/base-nova/src/core/cpu_session_extension.cc b/base-nova/src/core/cpu_session_extension.cc
index 72b46f583..09925c585 100644
--- a/base-nova/src/core/cpu_session_extension.cc
+++ b/base-nova/src/core/cpu_session_extension.cc
@@ -20,18 +20,6 @@
 using namespace Genode;
 
 
-Native_capability
-Cpu_session_component::native_cap(Thread_capability thread_cap)
-{
-	Object_pool<Cpu_thread_component>::Guard
-		thread(_thread_ep->lookup_and_lock(thread_cap));
-	if (!thread || !thread->platform_thread())
-		return Native_capability::invalid_cap();
-
-	return thread->platform_thread()->native_cap();
-}
-
-
 Native_capability
 Cpu_session_component::pause_sync(Thread_capability thread_cap)
 {
diff --git a/base-nova/src/core/include/cpu_session_component.h b/base-nova/src/core/include/cpu_session_component.h
index 79f54a7ec..3d0897ba8 100644
--- a/base-nova/src/core/include/cpu_session_component.h
+++ b/base-nova/src/core/include/cpu_session_component.h
@@ -204,7 +204,6 @@ namespace Genode {
 			 ** NOVA specific extensions **
 			 ******************************/
 
-			Native_capability native_cap(Thread_capability);
 			Native_capability pause_sync(Thread_capability);
 	};
 }
diff --git a/base-nova/src/core/include/platform_thread.h b/base-nova/src/core/include/platform_thread.h
index 16ea70215..7eb079b51 100644
--- a/base-nova/src/core/include/platform_thread.h
+++ b/base-nova/src/core/include/platform_thread.h
@@ -149,29 +149,7 @@ namespace Genode {
 				_pd = pd, _is_main_thread = is_main_thread;
 			}
 
-			/**
-			 * Return native EC cap with specific rights mask set.
-			 * If the cap is mapped the kernel will demote the
-			 * rights of the EC as specified by the rights mask.
-			 *
-			 * The cap is supposed to be returned to clients,
-			 * which they have to use as argument to identify
-			 * the thread to which they want attach portals.
-			 *
-			 * The demotion by the kernel during the map operation
-			 * takes care that the EC cap itself contains
-			 * no usable rights for the clients.
-			 */
-			Native_capability native_cap()
-			{
-				using namespace Nova;
-
-				return Native_capability(
-					_sel_ec(), Obj_crd::RIGHT_EC_RECALL);
-			}
-
 			void single_step(bool on);
-
 	};
 }