X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage%2Fmessage.hpp;h=e5e6769b8c3fa7fbe84cf4268014e2e8eb72a252;hb=0ff6413b6dc42849f87ce8caa17a91f44ede2f93;hp=e62b6c6bb3a96bb3832c096ddf7a01d5a985cfb1;hpb=2f60d294b3fa4e243fa67a738f9b82a0b428a7fc;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/message/message.hpp b/low-can-binding/can/message/message.hpp
index e62b6c6b..e5e6769b 100644
--- a/low-can-binding/can/message/message.hpp
+++ b/low-can-binding/can/message/message.hpp
@@ -29,27 +29,22 @@
 #define CAN_MESSAGE_SIZE 8
 
 #define MAX_BCM_CAN_FRAMES 257
+#define MAX_ISOTP_FRAMES 4096
 
-struct bcm_msg
-{
-	struct bcm_msg_head msg_head;
-	union {
-		struct canfd_frame fd_frames[MAX_BCM_CAN_FRAMES];
-		struct can_frame frames[MAX_BCM_CAN_FRAMES];
-	};
-};
 
 /**
- * @enum message_format_t
- * @brief The ID format for a CAN message.
+ * FLAGS
  */
-enum class message_format_t {
-	STANDARD, ///< STANDARD - standard 11-bit CAN arbitration ID. */
-	EXTENDED, ///< EXTENDED - an extended frame, with a 29-bit arbitration ID. */
-	J1939,	  ///< J1939 	- Format for j1939 messages
-	INVALID,  ///< INVALID  - INVALID code used at initialization to signify that it isn't usable'*/
-};
 
+#define INVALID_FLAG 0x0001
+#define CAN_PROTOCOL 0x0002
+#define J1939_PROTOCOL 0x0004
+#define J1939_ADDR_CLAIM_PROTOCOL 0x0008
+#define ISOTP_PROTOCOL 0x0010
+#define ISOTP_SEND 0x0020
+#define ISOTP_RECEIVE 0x0040
+#define CAN_PROTOCOL_WITH_FD_FRAME 0x0080
+#define FRAME_LAYOUT_IS_LE 0x0100 // LE stand for Little Endian
 
 /// @class message_t
 ///
@@ -57,30 +52,37 @@ enum class message_format_t {
 /// buffers. It is a wrapper of a can_frame struct with some sugar around it for binding purposes.
 class message_t {
 protected:
-	uint8_t length_; ///< length_ - the length of the data array (max 8). */
-	message_format_t format_; ///< format_ - the format of the message's ID.*/
+	uint32_t maxdlen_; ///< maxdlen_ - Max data length deduce from number of bytes read from the socket.*/
+	uint32_t length_; ///< length_ - the length of the data array. */
+	uint32_t flags_; ///< format_ - the format mask of the message that control which socketcan will used*/
 	std::vector<uint8_t> data_; ///< data_ - The message's data field with a size of 8 which is the standard about CAN bus messages.*/
 	uint64_t timestamp_; ///< timestamp_ - timestamp of the received message*/
 	int sub_id_; ///< sub_id_ - Subscription index. */
 
-
 public:
 	message_t();
-	message_t(uint8_t length, message_format_t format, std::vector<uint8_t>& data, uint64_t timestamp);
+	message_t(uint32_t maxdlen, uint32_t length, uint32_t flags, std::vector<uint8_t>& data, uint64_t timestamp);
+	virtual ~message_t() = default;
 
 	int get_sub_id() const;
 	const uint8_t* get_data() const;
 	const std::vector<uint8_t> get_data_vector() const;
-	uint8_t get_length() const;
+	const std::vector<uint8_t> get_data_vector(int start, int end) const;
+	uint32_t get_length() const;
 	uint64_t get_timestamp() const;
 
+	void set_data(std::vector<uint8_t> data);
 	void set_sub_id(int sub_id);
 	void set_timestamp(uint64_t timestamp);
-	message_format_t get_msg_format();
 	virtual bool is_set() = 0;
 	virtual std::string get_debug_message() = 0;
 	virtual uint32_t get_id() const = 0;
-	virtual struct bcm_msg get_bcm_msg() = 0;
-	virtual void set_bcm_msg(struct bcm_msg bcm_msg) = 0;
-
+	virtual void set_id(canid_t id) = 0;
+	uint32_t get_flags();
+	void set_flags(uint32_t flags);
+	void erase_flags();
+	uint32_t get_maxdlen();
+	void set_maxdlen(uint32_t maxdlen);
+	void set_length(uint32_t length);
+	void frame_swap();
 };