X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpce-322a%2Fprotocol.c;h=ee637e802dcb82b390276ab8a8169520f4643b15;hb=f2bbcc330a6bcb65500b298bec8c40974ed246d4;hp=90c1986b69e1b9a18dadbaa02fe509fe3f400038;hpb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;p=libsigrok.git

diff --git a/src/hardware/pce-322a/protocol.c b/src/hardware/pce-322a/protocol.c
index 90c1986b..ee637e80 100644
--- a/src/hardware/pce-322a/protocol.c
+++ b/src/hardware/pce-322a/protocol.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <string.h>
 #include "protocol.h"
 
 static int send_command(const struct sr_dev_inst *sdi, uint16_t command)
@@ -32,10 +33,7 @@ static int send_command(const struct sr_dev_inst *sdi, uint16_t command)
 	if (!(serial = sdi->conn))
 		return SR_ERR;
 
-	if (serial_write_nonblocking(serial, (const void *)buffer, 2) != 2)
-		return SR_ERR;
-
-	return SR_OK;
+	return serial_write_blocking(serial, (const void *)buffer, 2, 0);
 }
 
 static int send_long_command(const struct sr_dev_inst *sdi, uint32_t command)
@@ -51,10 +49,7 @@ static int send_long_command(const struct sr_dev_inst *sdi, uint32_t command)
 	if (!(serial = sdi->conn))
 		return SR_ERR;
 
-	if (serial_write_nonblocking(serial, (const void *)buffer, 4) != 4)
-		return SR_ERR;
-
-	return SR_OK;
+	return serial_write_blocking(serial, (const void *)buffer, 4, 0);
 }
 
 static void send_data(const struct sr_dev_inst *sdi, float sample)
@@ -140,15 +135,13 @@ static void process_memory_measurement(const struct sr_dev_inst *sdi)
 static void process_byte(const struct sr_dev_inst *sdi, const unsigned char c)
 {
 	struct dev_context *devc;
-	unsigned int i;
 
 	devc = sdi->priv;
 
 	if (devc->buffer_len < BUFFER_SIZE) {
 		devc->buffer[devc->buffer_len++] = c;
 	} else {
-		for (i = 1; i < BUFFER_SIZE; i++)
-			devc->buffer[i - 1] = devc->buffer[i];
+		memmove(devc->buffer, devc->buffer + 1, BUFFER_SIZE - 1);
 		devc->buffer[BUFFER_SIZE - 1] = c;
 	}
 
@@ -162,15 +155,13 @@ static void process_byte(const struct sr_dev_inst *sdi, const unsigned char c)
 static void process_usage_byte(const struct sr_dev_inst *sdi, uint8_t c)
 {
 	struct dev_context *devc;
-	unsigned int i;
 
 	devc = sdi->priv;
 
 	if (devc->buffer_len < MEM_USAGE_BUFFER_SIZE) {
 		devc->buffer[devc->buffer_len++] = c;
 	} else {
-		for (i = 1; i < MEM_USAGE_BUFFER_SIZE; i++)
-			devc->buffer[i - 1] = devc->buffer[i];
+		memmove(devc->buffer, devc->buffer + 1, MEM_USAGE_BUFFER_SIZE - 1);
 		devc->buffer[MEM_USAGE_BUFFER_SIZE - 1] = c;
 	}
 
@@ -193,15 +184,13 @@ static void process_usage_byte(const struct sr_dev_inst *sdi, uint8_t c)
 static void process_memory_byte(const struct sr_dev_inst *sdi, uint8_t c)
 {
 	struct dev_context *devc;
-	unsigned int i;
 
 	devc = sdi->priv;
 
 	if (devc->buffer_len < MEM_DATA_BUFFER_SIZE) {
 		devc->buffer[devc->buffer_len++] = c;
 	} else {
-		for (i = 1; i < MEM_DATA_BUFFER_SIZE; i++)
-			devc->buffer[i - 1] = devc->buffer[i];
+		memmove(devc->buffer, devc->buffer + 1, MEM_DATA_BUFFER_SIZE - 1);
 		devc->buffer[MEM_DATA_BUFFER_SIZE - 1] = c;
 	}