From 26442f782b6251fb1e49097d393a8abd2b5fea38 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 23 Sep 2014 16:49:27 +0200
Subject: [PATCH] os: add 'clock_rate' to Rpi platform driver

---
 .../platform/rpi/platform_session/client.h     |  5 ++++-
 .../rpi/platform_session/platform_session.h    | 10 +++++++++-
 repos/os/src/drivers/platform/rpi/main.cc      |  8 ++++++++
 .../drivers/platform/rpi/property_command.h    | 18 ++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/repos/os/include/platform/rpi/platform_session/client.h b/repos/os/include/platform/rpi/platform_session/client.h
index d2a285599..cadad0e23 100644
--- a/repos/os/include/platform/rpi/platform_session/client.h
+++ b/repos/os/include/platform/rpi/platform_session/client.h
@@ -15,7 +15,7 @@
 #define _INCLUDE__PLATFORM_SESSION__CLIENT_H_
 
 #include <base/capability.h>
-#include <base/rpc.h>
+#include <base/rpc_client.h>
 #include <platform_session/platform_session.h>
 
 namespace Platform { struct Client; }
@@ -33,6 +33,9 @@ struct Platform::Client : Genode::Rpc_client<Platform::Session>
 
 	void power_state(Power power, bool enable) override {
 		call<Rpc_set_power_state>(power, enable); }
+
+	uint32_t clock_rate(Clock clock) {
+		return call<Rpc_get_clock_rate>(clock); }
 };
 
 #endif /* _INCLUDE__PLATFORM_SESSION__CLIENT_H_ */
diff --git a/repos/os/include/platform/rpi/platform_session/platform_session.h b/repos/os/include/platform/rpi/platform_session/platform_session.h
index b7c579cf8..dc078caf2 100644
--- a/repos/os/include/platform/rpi/platform_session/platform_session.h
+++ b/repos/os/include/platform/rpi/platform_session/platform_session.h
@@ -60,6 +60,13 @@ struct Platform::Session : Genode::Session
 	 */
 	virtual void power_state(Power, bool enable) = 0;
 
+	enum Clock { CLOCK_EMMC = 1 };
+
+	/**
+	 * Request clock rate
+	 */
+	virtual uint32_t clock_rate(Clock) = 0;
+
 
 	/*********************
 	 ** RPC declaration **
@@ -68,9 +75,10 @@ struct Platform::Session : Genode::Session
 	GENODE_RPC(Rpc_setup_framebuffer, void, setup_framebuffer, Framebuffer_info &);
 	GENODE_RPC(Rpc_get_power_state, bool, power_state, Power);
 	GENODE_RPC(Rpc_set_power_state, void, power_state, Power, bool);
+	GENODE_RPC(Rpc_get_clock_rate, uint32_t, clock_rate, Clock);
 
 	GENODE_RPC_INTERFACE(Rpc_setup_framebuffer, Rpc_set_power_state,
-	                     Rpc_get_power_state);
+	                     Rpc_get_power_state, Rpc_get_clock_rate);
 };
 
 #endif /* _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_ */
diff --git a/repos/os/src/drivers/platform/rpi/main.cc b/repos/os/src/drivers/platform/rpi/main.cc
index e25da6502..425ae3093 100644
--- a/repos/os/src/drivers/platform/rpi/main.cc
+++ b/repos/os/src/drivers/platform/rpi/main.cc
@@ -73,6 +73,14 @@ class Platform::Session_component : public Genode::Rpc_object<Platform::Session>
 			msg.append_no_response<Property_command::Set_power_state>(id, enable, true);
 			_mbox.call<Property_message>();
 		}
+
+		uint32_t clock_rate(Clock id)
+		{
+			auto &msg = _mbox.message<Property_message>();
+			auto const &res = msg.append<Property_command::Get_clock_rate>(id);
+			_mbox.call<Property_message>();
+			return res.hz;
+		}
 };
 
 
diff --git a/repos/os/src/drivers/platform/rpi/property_command.h b/repos/os/src/drivers/platform/rpi/property_command.h
index e9be42503..efd7ddad8 100644
--- a/repos/os/src/drivers/platform/rpi/property_command.h
+++ b/repos/os/src/drivers/platform/rpi/property_command.h
@@ -62,6 +62,24 @@ namespace Property_command {
 		};
 	};
 
+	struct Get_clock_rate
+	{
+		static uint32_t opcode() { return 0x00030002; };
+
+		struct Request
+		{
+			uint32_t const clock_id;
+
+			Request(uint32_t clock_id) : clock_id(clock_id) { }
+		};
+
+		struct Response
+		{
+			uint32_t const clock_id = 0;
+			uint32_t const hz       = 0;
+		};
+	};
+
 	struct Allocate_buffer
 	{
 		static uint32_t opcode() { return 0x00040001; };