msg API changes

Makefile

@@ -49,6 +49,7 @@ include misc/Makefile
 include net/Makefile
 include netinet/Makefile
 include posix/Makefile
+include phoenix/Makefile
 include pthread/Makefile
 include regex/Makefile
 include signal/Makefile

include/phoenix/attribute.h

@@ -0,0 +1,26 @@
+/*
+ * Phoenix-RTOS
+ *
+ * libphoenix
+ *
+ * phoenix/attribute.h
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Lukasz Leczkowski
+ *
+ * This file is part of Phoenix-RTOS.
+ *
+ * %LICENSE%
+ */
+
+#ifndef _LIBPHOENIX_PHOENIX_ATTRIBUTE_H_
+#define _LIBPHOENIX_PHOENIX_ATTRIBUTE_H_
+
+
+#include <sys/msg.h>
+
+/* Initializes `struct _attrAll` errors to `err` */
+void _phoenix_initAttrsStruct(struct _attrAll *attrs, int err);
+
+
+#endif

include/sys/file.h

@@ -32,15 +32,13 @@ enum { mtMount = 0xf50, mtUmount, mtSync, mtStat, mtMountPoint };
 
 
 typedef struct {
-	oid_t dev;
 	oid_t mnt;
 	unsigned long mode;
 	char fstype[16];
 } mount_i_msg_t;
 
 
 typedef struct {
-	int err;
 	oid_t oid;
 } mount_o_msg_t;
 

include/sys/ioctl.h

@@ -59,16 +59,19 @@ extern "C" {
 int ioctl(int fd, unsigned long cmd, ...);
 
 
-const void *ioctl_unpack(const msg_t *msg, unsigned long *request, id_t *id);
+const void *ioctl_unpack(msg_t *msg, unsigned long *request, id_t *id);
 
-const void *ioctl_unpackEx(const msg_t *msg, unsigned long *request, id_t *id, void **response_buf);
 
-pid_t ioctl_getSenderPid(const msg_t *msg);
+const void *ioctl_unpackEx(msg_t *msg, unsigned long *request, id_t *id, void **response_buf);
 
 
-void ioctl_setResponse(msg_t *msg, unsigned long request, int err, const void *data);
+static inline pid_t ioctl_getSenderPid(const msg_t *msg)
+{
+	return (pid_t)msg->pid;
+}
 
-void ioctl_setResponseErr(msg_t *msg, unsigned long request, int err);
+
+void ioctl_setResponse(msg_t *msg, unsigned long request, int err, const void *data);
 
 
 #ifdef __cplusplus

phoenix/Makefile

@@ -0,0 +1,9 @@
+#
+# Makefile for libphoenix/phoenix
+#
+# Copyright 2024 Phoenix Systems
+#
+# %LICENSE%
+#
+
+OBJS += $(addprefix $(PREFIX_O)phoenix/, attribute.o)

phoenix/attribute.c

@@ -0,0 +1,37 @@
+/*
+ * Phoenix-RTOS
+ *
+ * libphoenix
+ *
+ * phoenix/attribute
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Lukasz Leczkowski
+ *
+ * This file is part of Phoenix-RTOS.
+ *
+ * %LICENSE%
+ */
+
+#include <phoenix/attribute.h>
+
+
+void _phoenix_initAttrsStruct(struct _attrAll *attrs, int err)
+{
+	attrs->mode.err = err;
+	attrs->uid.err = err;
+	attrs->gid.err = err;
+	attrs->size.err = err;
+	attrs->blocks.err = err;
+	attrs->blocks.err = err;
+	attrs->ioblock.err = err;
+	attrs->type.err = err;
+	attrs->port.err = err;
+	attrs->pollStatus.err = err;
+	attrs->eventMask.err = err;
+	attrs->cTime.err = err;
+	attrs->mTime.err = err;
+	attrs->aTime.err = err;
+	attrs->links.err = err;
+	attrs->dev.err = err;
+}

sys/events.c

@@ -26,17 +26,17 @@ static struct {
 
 int eventsSend(event_t *event, int count)
 {
-	msg_t msg;
 	int err = -ENOSYS;
 
 	if (event_common.sink_open || (event_common.sink_open = (lookup("/dev/event/sink", NULL, &event_common.sink) == EOK))) {
-		msg.type = mtWrite;
-
-		msg.i.io.oid = event_common.sink;
-		msg.i.data = event;
-		msg.i.size = count * sizeof(event_t);
-		msg.o.data = NULL;
-		msg.o.size = 0;
+		msg_t msg = {
+			.type = mtWrite,
+			.oid = event_common.sink,
+			.i.data = event,
+			.i.size = count * sizeof(event_t),
+			.o.data = NULL,
+			.o.size = 0
+		};
 
 		err = msgSend(event_common.sink.port, &msg);
 	}

sys/ioctl.c

@@ -27,13 +27,13 @@
 #include <stdlib.h>
 
 
-const void *ioctl_unpack(const msg_t *msg, unsigned long *request, id_t *id)
+const void *ioctl_unpack(msg_t *msg, unsigned long *request, id_t *id)
 {
 	return ioctl_unpackEx(msg, request, id, NULL);
 }
 
 
-const void *ioctl_unpackEx(const msg_t *msg, unsigned long *request, id_t *id, void **response_buf)
+const void *ioctl_unpackEx(msg_t *msg, unsigned long *request, id_t *id, void **response_buf)
 {
 	size_t size;
 	const void *data = NULL;
@@ -44,7 +44,7 @@ const void *ioctl_unpackEx(const msg_t *msg, unsigned long *request, id_t *id, v
 	}
 
 	if (id != NULL) {
-		*id = ioctl->id;
+		*id = msg->oid.id;
 	}
 
 	size = IOCPARM_LEN(ioctl->request);
@@ -91,9 +91,8 @@ const void *ioctl_unpackEx(const msg_t *msg, unsigned long *request, id_t *id, v
 	}
 
 	if ((response_buf != NULL) && ((ioctl->request & IOC_OUT) != 0)) {
-		ioctl_out_t *ioctl_out = (ioctl_out_t *)msg->o.raw;
-		if (size <= (sizeof(msg->o.raw) - sizeof(ioctl_out_t))) {
-			*response_buf = ioctl_out->data;
+		if (size <= sizeof(msg->o.raw)) {
+			*response_buf = msg->o.raw;
 		}
 		else {
 			*response_buf = msg->o.data;
@@ -108,24 +107,16 @@ const void *ioctl_unpackEx(const msg_t *msg, unsigned long *request, id_t *id, v
 }
 
 
-pid_t ioctl_getSenderPid(const msg_t *msg)
-{
-	const ioctl_in_t *ioctl = (const ioctl_in_t *)msg->i.raw;
-	return (pid_t)ioctl->pid;
-}
-
-
 void ioctl_setResponse(msg_t *msg, unsigned long request, int err, const void *data)
 {
 	size_t size = IOCPARM_LEN(request);
 	void *dst;
-	ioctl_out_t *ioctl = (ioctl_out_t *)msg->o.raw;
 
-	ioctl->err = err;
+	msg->o.err = err;
 
 	if (((request & IOC_OUT) != 0) && (data != NULL)) {
-		if (size <= (sizeof(msg->o.raw) - sizeof(ioctl_out_t))) {
-			dst = ioctl->data;
+		if (size <= sizeof(msg->o.raw)) {
+			dst = msg->o.raw;
 		}
 		else {
 			dst = msg->o.data;
@@ -134,13 +125,3 @@ void ioctl_setResponse(msg_t *msg, unsigned long request, int err, const void *d
 		(void)memcpy(dst, data, size);
 	}
 }
-
-
-void ioctl_setResponseErr(msg_t *msg, unsigned long request, int err)
-{
-	ioctl_out_t *ioctl = (ioctl_out_t *)msg->o.raw;
-
-	(void)request;
-
-	ioctl->err = err;
-}