X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpipistrello-ols%2Fprotocol.c;h=8f6f97f7d716e5aac585a72f49cf70a667517b6a;hb=HEAD;hp=aaff51150f15fdb138c5705b37b1ce0210afa072;hpb=7e463623382e1f574fde150b3fc88a65eaebb578;p=libsigrok.git

diff --git a/src/hardware/pipistrello-ols/protocol.c b/src/hardware/pipistrello-ols/protocol.c
index aaff5115..8f6f97f7 100644
--- a/src/hardware/pipistrello-ols/protocol.c
+++ b/src/hardware/pipistrello-ols/protocol.c
@@ -73,16 +73,13 @@ SR_PRIV int p_ols_open(struct dev_context *devc)
 
 	/* Note: Caller checks devc and devc->ftdic. */
 
-	/* Select interface B, otherwise communication will fail. */
 	ret = ftdi_set_interface(devc->ftdic, INTERFACE_B);
 	if (ret < 0) {
 		sr_err("Failed to set FTDI interface B (%d): %s", ret,
 		       ftdi_get_error_string(devc->ftdic));
 		return SR_ERR;
 	}
-	sr_dbg("FTDI chip interface B set successfully.");
 
-	/* Check for the device and temporarily open it. */
 	ret = ftdi_usb_open_desc(devc->ftdic, USB_VENDOR_ID, USB_DEVICE_ID,
 				 USB_IPRODUCT, NULL);
 	if (ret < 0) {
@@ -92,42 +89,33 @@ SR_PRIV int p_ols_open(struct dev_context *devc)
 			       ftdi_get_error_string(devc->ftdic));
 		return SR_ERR;
 	}
-	sr_dbg("FTDI device opened successfully.");
 
-	/* Purge RX/TX buffers in the FTDI chip. */
-	if ((ret = ftdi_usb_purge_buffers(devc->ftdic)) < 0) {
+	if ((ret = PURGE_FTDI_BOTH(devc->ftdic)) < 0) {
 		sr_err("Failed to purge FTDI RX/TX buffers (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
 		goto err_open_close_ftdic;
 	}
-	sr_dbg("FTDI chip buffers purged successfully.");
 
-	/* Reset the FTDI bitmode. */
 	ret = ftdi_set_bitmode(devc->ftdic, 0xff, BITMODE_RESET);
 	if (ret < 0) {
 		sr_err("Failed to reset the FTDI chip bitmode (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
 		goto err_open_close_ftdic;
 	}
-	sr_dbg("FTDI chip bitmode reset successfully.");
 
-	/* Set the FTDI latency timer to 16. */
 	ret = ftdi_set_latency_timer(devc->ftdic, 16);
 	if (ret < 0) {
 		sr_err("Failed to set FTDI latency timer (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
 		goto err_open_close_ftdic;
 	}
-	sr_dbg("FTDI chip latency timer set successfully.");
 
-	/* Set the FTDI read data chunk size to 64kB. */
 	ret = ftdi_read_data_set_chunksize(devc->ftdic, 64 * 1024);
 	if (ret < 0) {
 		sr_err("Failed to set FTDI read data chunk size (%d): %s.",
 		       ret, ftdi_get_error_string(devc->ftdic));
 		goto err_open_close_ftdic;
 	}
-	sr_dbg("FTDI chip read data chunk size set successfully.");
 
 	return SR_OK;
 
@@ -222,7 +210,7 @@ SR_PRIV struct sr_dev_inst *p_ols_get_metadata(uint8_t *buf, int bytes_read, str
 	uint8_t key, type, token;
 	GString *tmp_str, *devname, *version;
 	guchar tmp_c;
-	int index, i;
+	int index;
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->status = SR_ST_INACTIVE;
@@ -276,10 +264,8 @@ SR_PRIV struct sr_dev_inst *p_ols_get_metadata(uint8_t *buf, int bytes_read, str
 			break;
 		case 1:
 			/* 32-bit unsigned integer */
-			tmp_int = 0;
-			for (i = 0; i < 4; i++) {
-				tmp_int = (tmp_int << 8) | buf[index++];
-			}
+			tmp_int = RB32(&buf[index]);
+			index += sizeof(uint32_t);
 			sr_dbg("Got metadata key 0x%.2x value 0x%.8x.",
 			       key, tmp_int);
 			switch (token) {
@@ -339,10 +325,8 @@ SR_PRIV struct sr_dev_inst *p_ols_get_metadata(uint8_t *buf, int bytes_read, str
 		}
 	}
 
-	sdi->model = devname->str;
-	sdi->version = version->str;
-	g_string_free(devname, FALSE);
-	g_string_free(version, FALSE);
+	sdi->model = g_string_free(devname, FALSE);
+	sdi->version = g_string_free(version, FALSE);
 
 	return sdi;
 }
@@ -650,8 +634,7 @@ SR_PRIV int p_ols_receive_data(int fd, int revents, void *cb_data)
 			}
 
 			/* Send the trigger. */
-			packet.type = SR_DF_TRIGGER;
-			sr_session_send(sdi, &packet);
+			std_session_send_df_trigger(sdi);
 
 			/* Send post-trigger samples. */
 			packet.type = SR_DF_LOGIC;