X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fcenter-3xx%2Fprotocol.c;h=35fe15538642ee71fa43372d92ca0f07d11bf2ed;hb=861fa81fdd0e2031e798e6a637b66c6abe2df2d8;hp=b4d9ed5ba834162cc063e2bc47a9a3579ef0acce;hpb=869c83751149aa03cda072355c2b670569cdfc0d;p=libsigrok.git
diff --git a/src/hardware/center-3xx/protocol.c b/src/hardware/center-3xx/protocol.c
index b4d9ed5b..35fe1553 100644
--- a/src/hardware/center-3xx/protocol.c
+++ b/src/hardware/center-3xx/protocol.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -65,7 +64,7 @@ static void log_packet(const uint8_t *buf, int idx)
static int packet_parse(const uint8_t *buf, int idx, struct center_info *info)
{
int i;
- uint16_t temp_u16;
+ int16_t temp_i16;
log_packet(buf, idx);
@@ -90,9 +89,8 @@ static int packet_parse(const uint8_t *buf, int idx, struct center_info *info)
/* Byte 7+8/9+10/11+12/13+14: channel T1/T2/T3/T4 temperature. */
for (i = 0; i < NUM_CHANNELS; i++) {
- temp_u16 = buf[8 + (i * 2)];
- temp_u16 |= ((uint16_t)buf[7 + (i * 2)] << 8);
- info->temp[i] = (float)temp_u16;
+ temp_i16 = RB16S(&buf[7 + 2 * i]);
+ info->temp[i] = (float)temp_i16;
}
/* Byte 43: Specifies whether we need to divide the value(s) by 10. */
@@ -178,7 +176,7 @@ static gboolean handle_new_data(struct sr_dev_inst *sdi, int idx)
{
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
- int len, i, offset = 0, ret = FALSE;
+ int len, offset, ret = FALSE;
devc = sdi->priv;
serial = sdi->conn;
@@ -194,6 +192,7 @@ static gboolean handle_new_data(struct sr_dev_inst *sdi, int idx)
devc->buflen += len;
/* Now look for packets in that data. */
+ offset = 0;
while ((devc->buflen - offset) >= center_devs[idx].packet_size) {
if (center_devs[idx].packet_valid(devc->buf + offset)) {
handle_packet(devc->buf + offset, sdi, idx);
@@ -205,8 +204,8 @@ static gboolean handle_new_data(struct sr_dev_inst *sdi, int idx)
}
/* If we have any data left, move it to the beginning of our buffer. */
- for (i = 0; i < devc->buflen - offset; i++)
- devc->buf[i] = devc->buf[offset + i];
+ if (offset < devc->buflen)
+ memmove(devc->buf, devc->buf + offset, devc->buflen - offset);
devc->buflen -= offset;
return ret;
@@ -244,7 +243,7 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
}
if (sr_sw_limits_check(&devc->sw_limits))
- sdi->driver->dev_acquisition_stop(sdi);
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}