From 9de31a58c0ba5d7045ee5a9e1436cb01906fc6de Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 19 Dec 2023 13:47:22 +0100
Subject: codec, device-hip: Dangling things

---
 modules/device-hip/.nix/derivation.nix |  2 +-
 modules/device-hip/SConscript          | 38 ---------------------------
 modules/device-hip/SConstruct          |  2 +-
 modules/device-hip/c++/SConscript      | 38 +++++++++++++++++++++++++++
 modules/device-hip/c++/rpc.h           | 47 ++++++++++++++++++++++++++++++++++
 modules/device-hip/rpc.h               |  7 -----
 6 files changed, 87 insertions(+), 47 deletions(-)
 delete mode 100644 modules/device-hip/SConscript
 create mode 100644 modules/device-hip/c++/SConscript
 create mode 100644 modules/device-hip/c++/rpc.h
 delete mode 100644 modules/device-hip/rpc.h

(limited to 'modules/device-hip')

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/SConscript b/modules/device-hip/SConscript
deleted file mode 100644
index 4ab02d6..0000000
--- a/modules/device-hip/SConscript
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/false
-
-import os
-import os.path
-import glob
-
-
-Import('env')
-
-dir_path = Dir('.').abspath
-
-# Environment for base library
-dev_hip_env = env.Clone();
-
-dev_hip_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-dev_hip_env.headers = sorted(glob.glob(dir_path + "/*.h"))
-
-env.sources += dev_hip_env.sources;
-env.headers += dev_hip_env.headers;
-
-## Shared lib
-objects_shared = []
-dev_hip_env.add_source_files(objects_shared, dev_hip_env.sources, shared=True);
-dev_hip_env.library_shared = dev_hip_env.SharedLibrary('#build/forstio-device-hip', [objects_shared]);
-
-## Static lib
-objects_static = []
-dev_hip_env.add_source_files(objects_static, dev_hip_env.sources, shared=False);
-dev_hip_env.library_static = dev_hip_env.StaticLibrary('#build/forstio-device-hip', [objects_static]);
-
-# Set Alias
-env.Alias('library_device-hip', [dev_hip_env.library_shared, dev_hip_env.library_static]);
-
-env.targets += ['library_device-hip'];
-
-# Install
-env.Install('$prefix/lib/', [dev_hip_env.library_shared, dev_hip_env.library_static]);
-env.Install('$prefix/include/forstio/device/hip/', [dev_hip_env.headers]);
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/c++/SConscript b/modules/device-hip/c++/SConscript
new file mode 100644
index 0000000..4ab02d6
--- /dev/null
+++ b/modules/device-hip/c++/SConscript
@@ -0,0 +1,38 @@
+#!/bin/false
+
+import os
+import os.path
+import glob
+
+
+Import('env')
+
+dir_path = Dir('.').abspath
+
+# Environment for base library
+dev_hip_env = env.Clone();
+
+dev_hip_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
+dev_hip_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+
+env.sources += dev_hip_env.sources;
+env.headers += dev_hip_env.headers;
+
+## Shared lib
+objects_shared = []
+dev_hip_env.add_source_files(objects_shared, dev_hip_env.sources, shared=True);
+dev_hip_env.library_shared = dev_hip_env.SharedLibrary('#build/forstio-device-hip', [objects_shared]);
+
+## Static lib
+objects_static = []
+dev_hip_env.add_source_files(objects_static, dev_hip_env.sources, shared=False);
+dev_hip_env.library_static = dev_hip_env.StaticLibrary('#build/forstio-device-hip', [objects_static]);
+
+# Set Alias
+env.Alias('library_device-hip', [dev_hip_env.library_shared, dev_hip_env.library_static]);
+
+env.targets += ['library_device-hip'];
+
+# Install
+env.Install('$prefix/lib/', [dev_hip_env.library_shared, dev_hip_env.library_static]);
+env.Install('$prefix/include/forstio/device/hip/', [dev_hip_env.headers]);
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 {};
-}
-}
-- 
cgit v1.2.3