X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fisotp%2Fisotp.c;h=6de40c31707bbaa220fb53290a73ab7078ec0534;hb=330358c978ea3d324740a8dba884c4493fa339b8;hp=597ffe9d838ff754db9b07beafab919c2ae0876c;hpb=451ee4faa42eb304b27aeeef8c75387b4a12a614;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/isotp/isotp.c b/src/isotp/isotp.c
index 597ffe9d..6de40c31 100644
--- a/src/isotp/isotp.c
+++ b/src/isotp/isotp.c
@@ -2,40 +2,12 @@
 #include <isotp/receive.h>
 #include <bitfield/bitfield.h>
 
-const uint16_t MAX_ISO_TP_MESSAGE_SIZE = 4096;
-const uint16_t MAX_CAN_FRAME_SIZE = 8;
 const uint8_t ISO_TP_DEFAULT_RESPONSE_TIMEOUT = 100;
 const bool ISO_TP_DEFAULT_FRAME_PADDING_STATUS = true;
 
-void isotp_receive_can_frame(IsoTpHandler* handler,
-        const uint16_t arbitration_id, const uint8_t* data, const uint8_t length) {
-    if(arbitration_id != handler->arbitration_id){
-        return;
-    }
-
-    // TODO use CanMessage struct from canutil library - allocate payload buffer
-    // on stack, 8 bytes
-    // TODO  this function should receive uint64_t...
-    IsoTpProtocolControlInformation pci = (IsoTpProtocolControlInformation)
-            getBitField((uint64_t)data, 0, 2, false);
-
-    switch(pci) {
-        case PCI_SINGLE:
-            isotp_handle_single_frame(handler, arbitration_id, data, length);
-            break;
-        default:
-            handler->shims->log("Only single frame messages are supported");
-            break;
-    }
-}
-
-bool isotp_send(const uint8_t* payload, uint16_t payload_size) {
-     // we determine if it's single/multi frame and start the send
-}
-
-void isotp_set_timeout(IsoTpHandler* handler, uint16_t timeout_ms) {
-    handler->timeout_ms = timeout_ms;
-}
+/* void isotp_set_timeout(IsoTpHandler* handler, uint16_t timeout_ms) { */
+    /* handler->timeout_ms = timeout_ms; */
+/* } */
 
 IsoTpShims isotp_init_shims(LogShim log, SendCanMessageShim send_can_message,
         SetTimerShim set_timer) {
@@ -47,28 +19,87 @@ IsoTpShims isotp_init_shims(LogShim log, SendCanMessageShim send_can_message,
     return shims;
 }
 
-IsoTpHandler isotp_init(IsoTpShims* shims, uint16_t arbitration_id,
-        IsoTpMessageReceivedHandler message_received_callback,
-        IsoTpMessageSentHandler message_sent_callback,
-        IsoTpCanFrameSentHandler can_frame_sent_callback) {
-    IsoTpHandler handler = {
-        shims: shims,
+void isotp_message_to_string(const IsoTpMessage* message, char* destination,
+        size_t destination_length) {
+    snprintf(destination, destination_length, "ID: 0x%02x, Payload: 0x%02x%02x%02x%02x%02x%02x%02x%02x",
+            message->arbitration_id,
+            message->payload[0],
+            message->payload[1],
+            message->payload[2],
+            message->payload[3],
+            message->payload[4],
+            message->payload[5],
+            message->payload[6],
+            message->payload[7]);
+}
+
+IsoTpMessage isotp_continue_receive(IsoTpShims* shims,
+        IsoTpReceiveHandle* handle, const uint16_t arbitration_id,
+        const uint8_t data[], const uint8_t size) {
+    IsoTpMessage message = {
         arbitration_id: arbitration_id,
-        message_received_callback: message_received_callback,
-        message_sent_callback: message_sent_callback,
-        can_frame_sent_callback: can_frame_sent_callback,
-        timeout_ms: ISO_TP_DEFAULT_RESPONSE_TIMEOUT,
-        frame_padding: ISO_TP_DEFAULT_FRAME_PADDING_STATUS,
-        sending: false
+        completed: false,
+        payload: {0},
+        size: 0
     };
-    return handler;
+
+    if(size < 1) {
+        return message;
+    }
+
+    if(handle->arbitration_id != arbitration_id) {
+        if(shims->log != NULL)  {
+            shims->log("The arb ID 0x%x doesn't match the expected rx ID 0x%x",
+                    arbitration_id, handle->arbitration_id);
+        }
+        return message;
+    }
+
+    IsoTpProtocolControlInformation pci = (IsoTpProtocolControlInformation)
+            get_nibble(data, size, 0);
+
+    uint8_t payload_length = get_nibble(data, size, 1);
+    uint8_t payload[payload_length];
+    if(payload_length > 0 && size > 0) {
+        memcpy(payload, &data[1], payload_length);
+    }
+
+    // TODO this is set up to handle rx a response with a payload, but not to
+    // handle flow control responses for multi frame messages that we're in the
+    // process of sending
+
+    switch(pci) {
+        case PCI_SINGLE: {
+            if(payload_length > 0) {
+                memcpy(message.payload, payload, payload_length);
+            }
+            message.size = payload_length;
+            message.completed = true;
+            handle->success = true;
+            handle->completed = true;
+            isotp_handle_single_frame(handle, &message);
+            break;
+         }
+        default:
+            shims->log("Only single frame messages are supported");
+            break;
+    }
+    return message;
 }
 
-// TODO this would be better as a "isotp_message_to_string"
-void log_isotp_message(const uint16_t arbitration_id,
-        const uint8_t* payload, const uint16_t size) {
-    debug("ID: 0x%02x, Payload:", arbitration_id);
-    for(int i = 0; i < size; i++) {
-        debug("0x%x", payload[i]);
+bool isotp_continue_send(IsoTpShims* shims, IsoTpSendHandle* handle,
+        const uint16_t arbitration_id, const uint8_t data[],
+        const uint8_t size) {
+    // TODO this will need to be tested when we add multi-frame support,
+    // which is when it'll be necessary to pass in CAN messages to SENDING
+    // handles.
+    if(handle->receiving_arbitration_id != arbitration_id) {
+        if(shims->log != NULL) {
+            shims->log("The arb ID 0x%x doesn't match the expected tx continuation ID 0x%x",
+                    arbitration_id, handle->receiving_arbitration_id);
+        }
+        return false;
     }
+    return false;
 }
+