Skip to content

Commit

Permalink
Compilation fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sashacmc committed Dec 9, 2024
1 parent 45b7b0a commit 94060f5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/protocol/codec/serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// ZettaScale Zenoh Team, <[email protected]>
//

#include <inttypes.h>
#include <stdint.h>
#include <string.h>

Expand Down Expand Up @@ -108,7 +109,7 @@ size_t _z_serial_msg_deserialize(const uint8_t *src, size_t src_len, uint8_t *ds

uint32_t computed_crc = _z_crc32(dst, wire_size);
if (received_crc != computed_crc) {
_Z_DEBUG("CRC mismatch. Received: 0x%08lX, Computed: 0x%08lX", received_crc, computed_crc);
_Z_DEBUG("CRC mismatch. Received: 0x%08" PRIu32 ", Computed: 0x%08" PRIu32, received_crc, computed_crc);
return SIZE_MAX;
}

Expand Down
9 changes: 5 additions & 4 deletions src/system/common/serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
// ZettaScale Zenoh Team, <[email protected]>
//

#include "zenoh-pico/protocol/definitions/serial.h"

#include <stdint.h>

#if Z_FEATURE_LINK_SERIAL == 1

#include "zenoh-pico/protocol/definitions/serial.h"
#include "zenoh-pico/system/common/platform.h"
#include "zenoh-pico/system/common/serial.h"
#include "zenoh-pico/system/link/serial.h"
Expand All @@ -30,8 +31,7 @@ z_result_t _z_connect_serial(const _z_sys_net_socket_t sock) {
uint8_t header = _Z_FLAG_SERIAL_INIT;

_z_send_serial_internal(sock, header, NULL, 0);
uint8_t tmp;
size_t ret = _z_read_serial_internal(sock, &header, &tmp, sizeof(tmp));
size_t ret = _z_read_serial_internal(sock, &header, NULL, 0);
if (ret == SIZE_MAX) {
return _Z_ERR_TRANSPORT_RX_FAILED;
}
Expand Down Expand Up @@ -78,3 +78,4 @@ size_t _z_read_exact_serial(const _z_sys_net_socket_t sock, uint8_t *ptr, size_t

return n;
}
#endif // Z_FEATURE_LINK_SERIAL == 1

0 comments on commit 94060f5

Please sign in to comment.