1 files changed, 23 insertions, 8 deletions

diff --git a/libs/libgui/msg.c b/libs/libgui/msg.c
index 051072e..70a77a1 100644
--- a/libs/libgui/msg.c
+++ b/libs/libgui/msg.c
@@ -6,24 +6,39 @@
 #include <print.h>
 #include <sys.h>
 
-res msg_send(u32 pid, enum message_type type, void *data, u32 size)
+// TODO: Remove debug assertions?
+
+res msg_connect_bus(const char *bus, u32 *conn)
+{
+	res ret = io_control(IO_BUS, IOCTL_BUS_CONNECT_BUS, bus, conn);
+	assert(ret == EOK && *conn);
+	return EOK;
+}
+
+res msg_connect_conn(u32 conn)
+{
+	res ret = io_control(IO_BUS, IOCTL_BUS_CONNECT_CONN, conn);
+	assert(ret == EOK);
+	return ret;
+}
+
+res msg_send(enum message_type type, void *data, u32 size)
 {
-	assert((signed)pid != -1 && size >= sizeof(struct message_header));
-	char path[32] = { 0 };
-	snprintf(path, sizeof(path), "/proc/%d/msg", pid);
+	assert(size >= sizeof(struct message_header));
 	struct message_header *header = data;
 	header->magic = MSG_MAGIC;
-	header->src = getpid();
 	header->type = type;
-	return write(path, data, 0, size);
+	res ret = io_write(IO_BUS, (u8 *)data + sizeof(struct bus_header), 0, size);
+	assert(ret >= EOK);
+	return ret;
 }
 
 res msg_receive(void *buf, u32 size)
 {
-	int ret = read("/proc/self/msg", buf, 0, size);
+	res ret = io_read(IO_BUS, buf, 0, size);
 	struct message_header *header = buf;
 	if (header->magic == MSG_MAGIC)
 		return ret;
 	else
-		return -1;
+		return -EINVAL;
 }