misc: move drivers to proper subfolders

Author: zhiayang

Diff for: drivers/devices/makefile

@@ -0,0 +1,5 @@
+# Makefile for Orion-X4 userspace programs
+# Written in 2013
+
+all:
+	@find . -mindepth 1 -maxdepth 1 -type d -exec $(MAKE) -C {} \;

Diff for: drivers/ps2/.vscode/c_cpp_properties.json renamed to drivers/devices/ps2/.vscode/c_cpp_properties.json

@@ -11,7 +11,7 @@
                 "__orionx__",
                 "_DEBUG"
             ],
-            "compilerPath": "${workspaceFolder}/../../build/toolchain/bin/x86_64-orionx-g++",
+            "compilerPath": "${workspaceFolder:nx}/build/toolchain/bin/x86_64-orionx-g++",
             "intelliSenseMode": "clang-x64",
             "browse": {
                 "path": [

Diff for: drivers/ps2/makefile renamed to drivers/devices/ps2/makefile

@@ -0,0 +1,5 @@
+# Makefile for Orion-X4 userspace programs
+# Written in 2013
+
+all:
+	@find . -mindepth 1 -maxdepth 1 -type d -exec $(MAKE) -C {} \;

Diff for: drivers/ps2/source/keyboard.cpp renamed to drivers/devices/ps2/source/keyboard.cpp

@@ -0,0 +1,14 @@
+# Makefile for UnixCompatLibC.
+# Written in 2014
+
+CXXFLAGS	= -Wno-pragmas -O2 -std=c++17 -fno-strict-aliasing -Wall
+
+.PHONY: all
+
+all: $(INITRD_DIR)/drivers/ps2
+
+$(INITRD_DIR)/drivers/ps2: source/tarfs.cpp $(SYSROOT)/usr/lib/libc.a $(SYSROOT)/usr/lib/libnxsc.a
+	@echo "# tarfs"
+	@$(CXX) $(CXXFLAGS) -o $@ source/tarfs.cpp
+
+

Diff for: drivers/ps2/source/keyboard.h renamed to drivers/devices/ps2/source/keyboard.h

@@ -0,0 +1,24 @@
+// tarfs.cpp
+// Copyright (c) 2020, zhiayang
+// Licensed under the Apache License Version 2.0.
+
+#include <stdio.h>
+
+#include <utility>
+
+#include <nx/ipc.h>
+#include <svr/vfs.h>
+
+int main(int argc, char** argv)
+{
+	while(true)
+	{
+		if(nx::ipc::poll() == 0)
+			continue;
+
+		nx::ipc::message_body_t body;
+		auto client = nx::ipc::receive(&body);
+
+		// vfs::handleCall(client, std::move(body));
+	}
+}

Diff for: drivers/ps2/source/ps2.cpp renamed to drivers/devices/ps2/source/ps2.cpp

@@ -84,7 +84,67 @@ int main()
 	constexpr uint64_t update_time = 250'000'000;
 
 	printf("time for owo\n");
-	int foozle = 0;
+
+	{
+		syscall::kernel_log(2, "placebo", 7, "trying to vfs...", 16);
+
+		using namespace nx;
+
+		auto sel = "/proc/name/vfs-svr";
+		auto id = ipc::find_selector(ipc::selector_t(sel));
+		if(id == (uint64_t) -1)
+		{
+			printf("could not find vfs-svr\n");
+			abort();
+		}
+
+		auto tmp = ipc::collect_memory_ticket(ipc::create_memory_ticket(1024, 0));
+		assert(tmp.ptr != nullptr);
+
+		auto path = "/initrd/usr/test.txt";
+		auto plen = strlen(path);
+
+		memcpy(tmp.ptr, path, plen);
+
+		auto openMsg = vfs::msg::FnOpen {
+			vfs::msg::Header {
+				.op         = vfs::msg::OP_OPEN,
+				.sequence   = 1
+			},
+			/* flags: */ 0,
+			vfs::Buffer {
+				.memTicketId = tmp.ticketId,
+				.offset      = 0,
+				.length      = plen
+			}
+		};
+
+		ipc::send(id, openMsg);
+	again:
+		while(ipc::poll() == 0)
+			;
+
+		ipc::message_body_t body;
+		ipc::receive(&body);
+
+		auto reply = ipc::extract<vfs::msg::ResOpen>(body);
+		if(reply.op != vfs::msg::OP_OPEN)
+			goto again;
+
+		auto handle = reply.handle;
+		printf("** received handle: %lu\n", handle.id);
+
+		// vfs::handleCall(client, std::move(body));
+
+
+		// ipc::release_memory_ticket(tmp);
+	}
+
+
+
+
+
+
 	while(true)
 	{
 		auto ts = syscall::nanosecond_timestamp();

Diff for: drivers/ps2/source/ps2.h renamed to drivers/devices/ps2/source/ps2.h

@@ -34,7 +34,7 @@
 		},
 		{
 			"name": "ps2",
-			"path": "drivers/ps2"
+			"path": "drivers/devices/ps2"
 		},
 		{
 			"name": "tty-svr",