diff options
| author |   Christopher Peplin <chris.peplin@rhubarbtech.com> | 2013-12-31 16:03:43 -0500 |
|---|---|---|
| committer | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2013-12-31 16:12:36 -0500 |
| commit | 6bbc83bd1daac73f9e0dcccb848154a3c3b972fa (patch) | |
| tree | 9b8f6c4c26aff785fd9112d0e8e0ace6b05807fe | |
| parent | 10a35b0a7c380d77cdd24ac90d6aa0abd4601f3e (diff) | |
Move some functions to main isotp.h file to simplify includes for now.
| -rw-r--r-- | src/isotp/isotp.h | 6 | ||||
| -rw-r--r-- | src/isotp/receive.h | 3 | ||||
| -rw-r--r-- | tests/common.c | 3 | ||||
| -rw-r--r-- | tests/test_send.c | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/isotp/isotp.h b/src/isotp/isotp.h index 10352383..e3ec588a 100644 --- a/src/isotp/isotp.h +++ b/src/isotp/isotp.h @@ -111,6 +111,12 @@ void isotp_receive_can_frame(IsoTpShims* shims, IsoTpHandle* handle, void isotp_message_to_string(const IsoTpMessage* message, char* destination, size_t destination_length); +IsoTpHandle isotp_send(IsoTpShims* shims, const uint16_t arbitration_id, + const uint8_t* payload, uint16_t size, + IsoTpMessageSentHandler callback); + +IsoTpHandle isotp_receive(IsoTpShims* shims, const uint16_t arbitration_id, + IsoTpMessageReceivedHandler callback); #ifdef __cplusplus } diff --git a/src/isotp/receive.h b/src/isotp/receive.h index 3eee89e2..b7c17963 100644 --- a/src/isotp/receive.h +++ b/src/isotp/receive.h @@ -14,9 +14,6 @@ void isotp_complete_receive(IsoTpHandle* handle, IsoTpMessage* message); void isotp_handle_single_frame(IsoTpHandle* handle, IsoTpMessage* message); -IsoTpHandle isotp_receive(IsoTpShims* shims, const uint16_t arbitration_id, - IsoTpMessageReceivedHandler callback); - #ifdef __cplusplus } #endif diff --git a/tests/common.c b/tests/common.c index 4ad8eff1..247d8f3d 100644 --- a/tests/common.c +++ b/tests/common.c @@ -83,8 +83,7 @@ void can_frame_sent(const uint16_t arbitration_id, const uint8_t* payload, void setup() { SHIMS = isotp_init_shims(debug, mock_send_can, mock_set_timer); - // TODO - /* HANDLE = isotp_receive(&SHIMS, 0x2a, message_received); */ + HANDLE = isotp_receive(&SHIMS, 0x2a, message_received); last_message_sent_payload = malloc(MAX_ISO_TP_MESSAGE_SIZE); last_message_received_payload = malloc(MAX_ISO_TP_MESSAGE_SIZE); memset(last_can_payload_sent, 0, sizeof(last_can_payload_sent)); diff --git a/tests/test_send.c b/tests/test_send.c index 599552ae..0320576c 100644 --- a/tests/test_send.c +++ b/tests/test_send.c @@ -1,4 +1,4 @@ -#include <isotp/isotp.h> +#include <isotp/receive.h> #include <check.h> #include <stdint.h> #include <stdio.h> @@ -30,7 +30,7 @@ extern void setup(); START_TEST (test_send_empty_payload) { uint16_t arbitration_id = 0x2a; - IsoTpHandle foo = isotp_send(&SHIMS, arbitration_id, NULL, 0, message_sent); + IsoTpHandle handle = isotp_send(&SHIMS, arbitration_id, NULL, 0, message_sent); fail_unless(handle.success); fail_unless(handle.completed); ck_assert_int_eq(last_message_sent_arb_id, arbitration_id); |