From 49a1bf00ee2d9a44461db177be9aeb96d98203da Mon Sep 17 00:00:00 2001
From: "david.maul" <david.maul@informatik.hs-fulda.de>
Date: Thu, 13 Feb 2025 02:14:40 +0100
Subject: [PATCH] fix: replace c++ enum definition with c enum definition
---
common/include/message.h | 67 +++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 31 deletions(-)
diff --git a/common/include/message.h b/common/include/message.h
index 171d463..0ee2b9a 100644
--- a/common/include/message.h
+++ b/common/include/message.h
@@ -1,47 +1,52 @@
#pragma once
#if defined(__KERNEL__)
- #include <linux/types.h>
- typedef u8 uint8_t;
- typedef u16 uint16_t;
- typedef u32 uint32_t;
- typedef u64 uint64_t;
- typedef s8 int8_t;
- typedef s16 int16_t;
- typedef s32 int32_t;
- typedef s64 int64_t;
+#include <linux/types.h>
+typedef u8 uint8_t;
+typedef u16 uint16_t;
+typedef u32 uint32_t;
+typedef u64 uint64_t;
+typedef s8 int8_t;
+typedef s16 int16_t;
+typedef s32 int32_t;
+typedef s64 int64_t;
#else
- #include <stdint.h>
- #include <stddef.h>
+#include <stddef.h>
+#include <stdint.h>
#endif
#define MAX_MESSAGE_DATA_SIZE 4096
-typedef enum message_data_type : uint32_t {
- INT8,
- UINT8,
- INT16,
- UINT16,
- INT32,
- UINT32,
- INT64,
- UINT64,
- FLOAT32,
- FLOAT64
-} message_data_type_t;
+enum message_data_type {
+ INT8,
+ UINT8,
+ INT16,
+ UINT16,
+ INT32,
+ UINT32,
+ INT64,
+ UINT64,
+ FLOAT32,
+ FLOAT64
+};
+typedef uint32_t message_data_type_t;
/**
* typedef message_t - Structure to hold a message with a measurement.
- * @measurement_id: The id of the measurement. Every sender should have a unique id.
- * @daemon_measurement_datatype: Datatype of the data. All values in `data` must be of this type.
- * @length: How many types of `datatype` are in `data`. Must not exceed (`length` * daemon_measurement_datatype_size(`datatype`)) > MAX_DAEMON_PACKET_DATA_SIZE.
+ * @measurement_id: The id of the measurement. Every sender should have a unique
+ * id.
+ * @daemon_measurement_datatype: Datatype of the data. All values in `data` must
+ * be of this type.
+ * @length: How many types of `datatype` are in `data`. Must not exceed
+ * (`length` * daemon_measurement_datatype_size(`datatype`)) >
+ * MAX_DAEMON_PACKET_DATA_SIZE.
* @data: The measurement data.
*/
typedef struct message {
- uint8_t measurement_id;
- message_data_type_t datatype;
- uint16_t length;
- uint8_t data[MAX_MESSAGE_DATA_SIZE];
+ uint8_t measurement_id;
+ message_data_type_t datatype;
+ uint16_t length;
+ uint8_t data[MAX_MESSAGE_DATA_SIZE];
} message_t;
/**
@@ -59,4 +64,4 @@ size_t message_data_type_size(message_data_type_t type);
*
* Returns 0 on success, -1 on error.
*/
-int message_check(message_t* message);
+int message_check(message_t *message);
--
GitLab