BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mic-985xx: style nits, var decl vs assignment, copy loop vs memmove

This commit is contained in:
Gerhard Sittig 2018-02-21 17:58:41 +01:00 committed by Uwe Hermann
parent 7a65106e00
commit c372070333
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hardware/mic-985xx/protocol.c
View File

@ -150,7 +150,7 @@ static void handle_new_data(struct sr_dev_inst *sdi, int idx)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
int len, i, offset = 0; int len, offset;
devc = sdi->priv; devc = sdi->priv;
serial = sdi->conn; serial = sdi->conn;
@ -166,6 +166,7 @@ static void handle_new_data(struct sr_dev_inst *sdi, int idx)
devc->buflen += len; devc->buflen += len;
/* Now look for packets in that data. */ /* Now look for packets in that data. */
offset = 0;
while ((devc->buflen - offset) >= mic_devs[idx].packet_size) { while ((devc->buflen - offset) >= mic_devs[idx].packet_size) {
if (mic_devs[idx].packet_valid(devc->buf + offset)) { if (mic_devs[idx].packet_valid(devc->buf + offset)) {
handle_packet(devc->buf + offset, sdi, idx); handle_packet(devc->buf + offset, sdi, idx);
@ -176,8 +177,8 @@ static void handle_new_data(struct sr_dev_inst *sdi, int idx)
} }
/* If we have any data left, move it to the beginning of our buffer. */ /* If we have any data left, move it to the beginning of our buffer. */
for (i = 0; i < devc->buflen - offset; i++) if (offset < devc->buflen)
devc->buf[i] = devc->buf[offset + i]; memmove(devc->buf, devc->buf + offset, devc->buflen - offset);
devc->buflen -= offset; devc->buflen -= offset;
} }