linuxmsm/diag
0
0
Fork 0
mirror of https://github.com/linux-msm/diag.git synced 2026-02-25 13:11:48 -08:00
Code Issues Packages Projects Releases Wiki Activity

peripheral: Split data receive path in hdlc and raw

Browse Source 
Split the two code paths related to handling of HDLC encoded vs raw
packets coming from the remote processor, this in order to facilitate
further rework of the HDLC decoder.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson
2018-01-24 15:04:39 -08:00
parent e57aa9a1ad
commit 02ad780abc
1 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
peripheral.c
View File

@@ -83,9 +83,8 @@ static int diag_cmd_recv(int fd, void *data)
return 0;
}
static int diag_data_recv(int fd, void *data)
static int diag_data_recv_hdlc(int fd, struct peripheral *peripheral)
{
struct peripheral *peripheral = data;
uint8_t buf[4096];
size_t msglen;
size_t len;
@@ -95,34 +94,54 @@ static int diag_data_recv(int fd, void *data)
for (;;) {
n = read(fd, buf, sizeof(buf));
if (n < 0) {
if (errno != EAGAIN) {
warn("failed to read from data channel");
peripheral_close(peripheral);
}
break;
}
if (n < 0)
return -errno;
ptr = buf;
len = n;
for (;;) {
if (peripheral->features & DIAG_FEATURE_APPS_HDLC_ENCODE) {
msg = ptr;
msglen = len;
} else {
msg = hdlc_decode_one(&ptr, &len, &msglen);
if (!msg)
break;
}
msg = hdlc_decode_one(&ptr, &len, &msglen);
if (!msg)
break;
diag_forward_response(msg, msglen);
if (peripheral->features & DIAG_FEATURE_APPS_HDLC_ENCODE)
break;
}
}
/* Not reached */
}
static int diag_data_recv_raw(int fd, struct peripheral *peripheral)
{
uint8_t buf[4096];
ssize_t n;
for (;;) {
n = read(fd, buf, sizeof(buf));
if (n < 0)
return -errno;
diag_forward_response(buf, n);
}
/* Not reached */
}
static int diag_data_recv(int fd, void *data)
{
struct peripheral *peripheral = data;
ssize_t n;
if (peripheral->features & DIAG_FEATURE_APPS_HDLC_ENCODE)
n = diag_data_recv_raw(fd, peripheral);
else
n = diag_data_recv_hdlc(fd, peripheral);
if (n < 0 && n != -EAGAIN) {
warn("failed to read from data channel");
peripheral_close(peripheral);
}
return 0;
}