michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: socket: can: Convert between can_frame and zcan_frame

Browse source 
The socket-can code expects to have "struct can_frame" from
application when it calls send(). We then have to convert to
"struct zcan_frame" as that is what the driver expects.

Same thing when receiving data. We just convert to
"struct can_frame" and pass that to application.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2019-03-11 16:05:53 +02:00 • committed by Kumar Gala
commit 5a9fa72ef2
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
subsys/net/lib/sockets/sockets_can.c
View file

@ -151,6 +151,7 @@ ssize_t zcan_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
socklen_t addrlen)
{
struct sockaddr_can can_addr;
struct zcan_frame zframe;
s32_t timeout = K_FOREVER;
int ret;
@ -178,8 +179,13 @@ ssize_t zcan_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
dest_addr = (struct sockaddr *)&can_addr;
}
ret = net_context_sendto_new(ctx, buf, len, dest_addr, addrlen, NULL,
timeout, NULL, ctx->user_data);
NET_ASSERT(len == sizeof(struct can_frame));
can_copy_frame_to_zframe((struct can_frame *)buf, &zframe);
ret = net_context_sendto_new(ctx, (void *)&zframe, sizeof(zframe),
dest_addr, addrlen, NULL, timeout, NULL,
ctx->user_data);
if (ret < 0) {
errno = -ret;
return -1;
@ -193,6 +199,7 @@ static ssize_t zcan_recvfrom_ctx(struct net_context *ctx, void *buf,
struct sockaddr *src_addr,
socklen_t *addrlen)
{
struct zcan_frame zframe;
size_t recv_len = 0;
s32_t timeout = K_FOREVER;
struct net_pkt *pkt;
@ -229,7 +236,7 @@ static ssize_t zcan_recvfrom_ctx(struct net_context *ctx, void *buf,
recv_len = max_len;
}
if (net_pkt_read_new(pkt, buf, recv_len)) {
if (net_pkt_read_new(pkt, (void *)&zframe, sizeof(zframe))) {
errno = EIO;
return -1;
}
@ -240,6 +247,10 @@ static ssize_t zcan_recvfrom_ctx(struct net_context *ctx, void *buf,
net_pkt_cursor_init(pkt);
}
NET_ASSERT(recv_len == sizeof(struct can_frame));
can_copy_zframe_to_frame(&zframe, (struct can_frame *)buf);
return recv_len;
}