Update deps.

[apps/low-level-can-service.git] / src / isotp / isotp.h

diff --git a/src/isotp/isotp.h b/src/isotp/isotp.h
index c500f6e..74a4897 100644 (file)
--- a/src/isotp/isotp.h
+++ b/src/isotp/isotp.h
@@ -3,6 +3,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdio.h>
+
+#define CAN_MESSAGE_BYTE_SIZE 8
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,26 +16,21 @@ const uint16_t MAX_CAN_FRAME_SIZE;
 const uint8_t ISO_TP_DEFAULT_RESPONSE_TIMEOUT;
 const bool ISO_TP_DEFAULT_FRAME_PADDING_STATUS;
 
-typedef void (*LogShim)(const char* message);
-typedef bool (*SendCanMessageShim)(const uint16_t arbitration_id, const uint8_t* data,
-            const uint8_t size);
+typedef struct {
+    const uint16_t arbitration_id;
+    const uint8_t* payload;
+    const uint16_t size;
+} IsoTpMessage;
+
+typedef void (*LogShim)(const char* message, ...);
+typedef bool (*SendCanMessageShim)(const uint16_t arbitration_id,
+        const uint8_t* data, const uint8_t size);
 typedef bool (*SetTimerShim)(uint16_t time_ms, void (*callback));
 
-typedef void (*IsoTpMessageReceivedHandler)(const uint16_t arbitration_id,
-        const uint8_t* payload, const uint16_t size);
-typedef void (*IsoTpMessageSentHandler)(const bool success,
-        const uint16_t arbitration_id, const uint8_t* payload,
-        const uint16_t size);
-typedef void (*IsoTpCanFrameSentHandler)(const uint16_t arbitration_id,
-        const uint8_t* payload, const uint8_t size);
-
-// TODO this is really necessary and it would leak this library into the user's
-// code
-// typedef struct {
-    // const uint16_t arbitration_id;
-    // const uint8_t* payload;
-    // const uint16_t size;
-// } IsoTpMessage;
+typedef void (*IsoTpMessageReceivedHandler)(const IsoTpMessage* message);
+typedef void (*IsoTpMessageSentHandler)(const IsoTpMessage* message,
+        const bool success);
+typedef void (*IsoTpCanFrameSentHandler)(const IsoTpMessage* message);
 
 typedef struct {
     LogShim log;
@@ -42,7 +40,7 @@ typedef struct {
 
 typedef struct {
     IsoTpShims* shims;
-    uint16_t arb_id;
+    uint16_t arbitration_id;
     IsoTpMessageReceivedHandler message_received_callback;
     IsoTpMessageSentHandler message_sent_callback;
     IsoTpCanFrameSentHandler can_frame_sent_callback;
@@ -58,16 +56,16 @@ typedef struct {
 } IsoTpHandler;
 
 typedef enum {
-    PCI_SINGLE,
-    PCI_FIRST_FRAME,
-    PCI_CONSECUTIVE_FRAME,
-    PCI_FLOW_CONTROL_FRAME
+    PCI_SINGLE = 0x0,
+    PCI_FIRST_FRAME = 0x1,
+    PCI_CONSECUTIVE_FRAME = 0x2,
+    PCI_FLOW_CONTROL_FRAME = 0x3
 } IsoTpProtocolControlInformation;
 
 typedef enum {
-    PCI_FLOW_STATUS_CONTINUE,
-    PCI_FLOW_STATUS_WAIT,
-    PCI_FLOW_STATUS_OVERFLOW
+    PCI_FLOW_STATUS_CONTINUE = 0x0,
+    PCI_FLOW_STATUS_WAIT = 0x1,
+    PCI_FLOW_STATUS_OVERFLOW = 0x2
 } IsoTpFlowStatus;
 
 IsoTpShims isotp_init_shims(LogShim log,
@@ -89,18 +87,10 @@ IsoTpHandler isotp_init(IsoTpShims* shims,
  */
 void isotp_set_timeout(IsoTpHandler* handler, uint16_t timeout_ms);
 
-// TODO we have to make sure to copy the payload internall if it's more than 1
-// frame, the soure could go out of scope
-bool isotp_send(const uint8_t* payload, uint16_t payload_size);
-
-void isotp_receive_can_frame(const uint16_t arbitration_id, const uint8_t* data,
-        const uint8_t length);
-
 void isotp_destroy(IsoTpHandler* handler);
 
-void log_isotp_message(const uint16_t arbitration_id, const uint8_t* payload,
-        const uint16_t size);
-
+void isotp_message_to_string(const IsoTpMessage* message, char* destination,
+        size_t destination_length);
 
 #ifdef __cplusplus
 }