codec, device-hip: Dangling things

6 files changed, 56 insertions, 13 deletions

diff --git a/modules/codec/c++/rpc.h b/modules/codec/c++/rpc.h
index b21ecf8..e275102 100644
--- a/modules/codec/c++/rpc.h
+++ b/modules/codec/c++/rpc.h
@@ -4,23 +4,26 @@ namespace saw {
 template<typename T>
 class remote {
 		static_assert(always_false<T>, "Type of remote not supported");
+
+		template<typename Iface>
+		rpc_client<T,Iface> connect();
 };
 
-template<typename T>
+template<typename T, typename Iface>
 class rpc_client {
 		template<typename... T>
 		struct request {
 		private:
-				std::tuple<id<T>> ids_;
+				std::tuple<id<T>...> ids_;
 		public:
-				error_or<data<T>> wait();
+				error_or<data<schema::Tuple<T>...>> wait();
 		};
 		
 		template<typename... T>
 		request<T...> request_data(id<T>... data);
 };
 
-template<typename T>
+template<typename T, typename Iface>
 class rpc_server {
 };
 }
diff --git a/modules/device-hip/.nix/derivation.nix b/modules/device-hip/.nix/derivation.nix
index 6849e6e..dc9cd94 100644
--- a/modules/device-hip/.nix/derivation.nix
+++ b/modules/device-hip/.nix/derivation.nix
@@ -9,7 +9,7 @@
 let
 
 in stdenv.mkDerivation {
-  pname = "forstio-io_codec";
+  pname = "forstio-device-hip";
   inherit version;
   src = ./..;
 
diff --git a/modules/device-hip/SConstruct b/modules/device-hip/SConstruct
index 4e6e150..429656a 100644
--- a/modules/device-hip/SConstruct
+++ b/modules/device-hip/SConstruct
@@ -57,7 +57,7 @@ env.headers = [];
 env.targets = [];
 
 Export('env')
-SConscript('SConscript')
+SConscript('c++/SConscript')
 
 env.Alias('cdb', env.cdb);
 env.Alias('all', [env.targets]);
diff --git a/modules/device-hip/SConscript b/modules/device-hip/c++/SConscript
index 4ab02d6..4ab02d6 100644
--- a/modules/device-hip/SConscript
+++ b/modules/device-hip/c++/SConscript
diff --git a/modules/device-hip/c++/rpc.h b/modules/device-hip/c++/rpc.h
new file mode 100644
index 0000000..0bcda0c
--- /dev/null
+++ b/modules/device-hip/c++/rpc.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include <hip.h>
+
+namespace saw {
+namespace rmt {
+struct DeviceHip {};
+}
+
+template<>
+class remote<rmt::DeviceHip> {
+private:
+public:
+	template<typename Iface>
+	error_or<rpc_client<rmt::DeviceHip, Iface>> connect(){
+		return make_error<err::not_implemented>();
+	}
+};
+
+error_or<remote<rmt::DeviceHip>> create_remote(){
+	auto rc = hipInit(0);
+
+	return make_error<err::not_implemented>();
+}
+
+template<typename Iface>
+class rpc_client<rmt::DeviceHip, Iface> {
+public:
+	template<typename... T>
+	struct request {
+		std::tuple<id<T>...> ids;
+
+		error_or<data<schema::Tuple<T...>>> wait();
+	};
+};
+
+template<typename Iface>
+class rpc_server<rmt::DeviceHip, Iface> {
+private:
+	/**
+	 * Needs a variant ptr of all possible return types
+	 */
+	struct data_storage {
+	};
+	
+};
+}
diff --git a/modules/device-hip/rpc.h b/modules/device-hip/rpc.h
deleted file mode 100644
index b6421ba..0000000
--- a/modules/device-hip/rpc.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-namespace saw {
-namespace rmt {
-struct DeviceHip {};
-}
-}